Version bumped, bug #307917, #329947. Fixed init.d handling, bug #217790. Fixed CFLAGS issue, bug #240884.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

6 files changed, 88 insertions, 177 deletions

diff --git a/net-dns/maradns/ChangeLog b/net-dns/maradns/ChangeLog
index 229e6d2a9e70..0bd4da1b79f0 100644
--- a/net-dns/maradns/ChangeLog
+++ b/net-dns/maradns/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/maradns
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/ChangeLog,v 1.30 2010/04/11 12:18:49 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/ChangeLog,v 1.31 2010/07/29 00:16:04 matsuu Exp $
+
+*maradns-1.4.03 (29 Jul 2010)
+
+  29 Jul 2010; MATSUU Takuto <matsuu@gentoo.org> -maradns-1.2.12.09.ebuild,
+  -maradns-1.3.07.08.ebuild, -maradns-1.3.07.09.ebuild,
+  +maradns-1.4.03.ebuild, files/maradns.rc6:
+  Version bumped, bug #307917, #329947. Fixed init.d handling, bug #217790.
+  Fixed CFLAGS issue, bug #240884. Removed old versions.
 
   11 Apr 2010; <nixnut@gentoo.org> maradns-1.2.12.10.ebuild:
   ppc stable #270908
diff --git a/net-dns/maradns/files/maradns.rc6 b/net-dns/maradns/files/maradns.rc6
index 63fead5d7254..e4c8ba2a1afd 100644
--- a/net-dns/maradns/files/maradns.rc6
+++ b/net-dns/maradns/files/maradns.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/files/maradns.rc6,v 1.4 2008/01/06 03:10:37 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/files/maradns.rc6,v 1.5 2010/07/29 00:16:04 matsuu Exp $
 
 depend() {
 	need net
@@ -17,6 +17,7 @@ start() {
 
 stop() {
 	ebegin "Stopping maradns"
-	start-stop-daemon --stop --quiet --name maradns
+	start-stop-daemon --stop --quiet --name maradns \
+		--exec /usr/sbin/duende
 	eend $?
 }
diff --git a/net-dns/maradns/maradns-1.2.12.09.ebuild b/net-dns/maradns/maradns-1.2.12.09.ebuild
deleted file mode 100644
index dde28cc89e9a..000000000000
--- a/net-dns/maradns/maradns-1.2.12.09.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-1.2.12.09.ebuild,v 1.5 2008/01/16 16:06:31 welp Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Proxy DNS server with permanent caching"
-HOMEPAGE="http://www.maradns.org/"
-SRC_URI="mirror://sourceforge/maradns/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "s:PREFIX/man:PREFIX/share/man:" \
-		-e "s:PREFIX/doc/maradns-\$VERSION:PREFIX/share/doc/${PF}:" \
-		build/install.locations || die
-	sed -i -e "s:-O2:${CFLAGS}:" build/Makefile.linux || die
-}
-
-src_compile() {
-	./configure || die
-	emake CC="$(tc-getCC)" || die "compile problem"
-}
-
-src_install() {
-	dosbin server/maradns
-	# use authonly && newsbin server/maradns.authonly maradns
-	dosbin tcp/zoneserver
-
-	dobin tcp/getzone tcp/fetchzone tools/askmara tools/duende
-
-	doman doc/en/man/*.[1-9]
-
-	dodoc maradns.gpg.key
-	dodoc doc/en/{QuickStart,README,*.txt}
-	dohtml doc/en/*.html
-	dohtml -r doc/en/webpage
-	docinto examples; dodoc doc/en/examples/example_*
-
-	insinto /etc; newins doc/en/examples/example_mararc mararc
-	insinto /etc/maradns; newins doc/en/examples/example_csv2 db.example.net
-	keepdir /etc/maradns/logger
-
-	newinitd "${FILESDIR}"/maradns.rc6 maradns
-	newinitd "${FILESDIR}"/zoneserver.rc6 zoneserver
-}
-
-pkg_postinst() {
-	enewuser maradns 99 -1 /var/empty daemon
-}
diff --git a/net-dns/maradns/maradns-1.3.07.08.ebuild b/net-dns/maradns/maradns-1.3.07.08.ebuild
deleted file mode 100644
index 9b408d599dd4..000000000000
--- a/net-dns/maradns/maradns-1.3.07.08.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-1.3.07.08.ebuild,v 1.1 2008/01/06 03:10:36 matsuu Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Proxy DNS server with permanent caching"
-HOMEPAGE="http://www.maradns.org/"
-SRC_URI="http://www.maradns.org/download/1.3/${PV}/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "s:PREFIX/man:PREFIX/share/man:" \
-		-e "s:PREFIX/doc/maradns-\$VERSION:PREFIX/share/doc/${PF}:" \
-		build/install.locations || die
-	sed -i -e "s:-O2:${CFLAGS}:" build/Makefile.linux || die
-}
-
-src_compile() {
-	./configure || die
-	emake CC="$(tc-getCC)" || die "compile problem"
-}
-
-src_install() {
-	dosbin server/maradns
-	# use authonly && newsbin server/maradns.authonly maradns
-	dosbin tcp/zoneserver
-
-	dobin tcp/getzone tcp/fetchzone tools/askmara tools/duende
-
-	doman doc/en/man/*.[1-9]
-
-	dodoc maradns.gpg.key
-	dodoc doc/en/{QuickStart,README,*.txt}
-	dohtml doc/en/*.html
-	dohtml -r doc/en/webpage
-	docinto examples; dodoc doc/en/examples/example_*
-
-	insinto /etc; newins doc/en/examples/example_mararc mararc
-	insinto /etc/maradns; newins doc/en/examples/example_csv2 db.example.net
-	keepdir /etc/maradns/logger
-
-	newinitd "${FILESDIR}"/maradns.rc6 maradns
-	newinitd "${FILESDIR}"/zoneserver.rc6 zoneserver
-}
-
-pkg_postinst() {
-	enewuser maradns 99 -1 /var/empty daemon
-}
diff --git a/net-dns/maradns/maradns-1.3.07.09.ebuild b/net-dns/maradns/maradns-1.3.07.09.ebuild
deleted file mode 100644
index 3cc2cf20b71c..000000000000
--- a/net-dns/maradns/maradns-1.3.07.09.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-1.3.07.09.ebuild,v 1.1 2008/09/15 01:39:11 matsuu Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Proxy DNS server with permanent caching"
-HOMEPAGE="http://www.maradns.org/"
-SRC_URI="http://www.maradns.org/download/1.3/${PV}/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "s:PREFIX/man:PREFIX/share/man:" \
-		-e "s:PREFIX/doc/maradns-\$VERSION:PREFIX/share/doc/${PF}:" \
-		build/install.locations || die
-	sed -i -e "s:-O2:${CFLAGS}:" build/Makefile.linux || die
-}
-
-src_compile() {
-	./configure || die
-	emake CC="$(tc-getCC)" || die "compile problem"
-}
-
-src_install() {
-	dosbin server/maradns
-	# use authonly && newsbin server/maradns.authonly maradns
-	dosbin tcp/zoneserver
-
-	dobin tcp/getzone tcp/fetchzone tools/askmara tools/duende
-
-	doman doc/en/man/*.[1-9]
-
-	dodoc maradns.gpg.key
-	dodoc doc/en/{QuickStart,README,*.txt}
-	dohtml doc/en/*.html
-	dohtml -r doc/en/webpage
-	docinto examples; dodoc doc/en/examples/example_*
-
-	insinto /etc; newins doc/en/examples/example_mararc mararc
-	insinto /etc/maradns; newins doc/en/examples/example_csv2 db.example.net
-	keepdir /etc/maradns/logger
-
-	newinitd "${FILESDIR}"/maradns.rc6 maradns
-	newinitd "${FILESDIR}"/zoneserver.rc6 zoneserver
-}
-
-pkg_postinst() {
-	enewuser maradns 99 -1 /var/empty daemon
-}
diff --git a/net-dns/maradns/maradns-1.4.03.ebuild b/net-dns/maradns/maradns-1.4.03.ebuild
new file mode 100644
index 000000000000..95ec5fdae34b
--- /dev/null
+++ b/net-dns/maradns/maradns-1.4.03.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-1.4.03.ebuild,v 1.1 2010/07/29 00:16:04 matsuu Exp $
+
+EAPI="2"
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Proxy DNS server with permanent caching"
+HOMEPAGE="http://www.maradns.org/"
+SRC_URI="http://www.maradns.org/download/1.4/${PV}/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="authonly"
+
+DEPEND="dev-lang/perl"
+
+src_prepare() {
+	sed -i \
+		-e "s:PREFIX/man:PREFIX/share/man:" \
+		-e "s:PREFIX/doc/maradns-\$VERSION:PREFIX/share/doc/${PF}:" \
+		build/install.locations || die
+	sed -i \
+		-e "s:-O2:\$(CFLAGS):" \
+		-e "s:\$(CC):$(tc-getCC):g" \
+		-e "s:make:\$(MAKE):g" \
+		build/Makefile.linux || die
+	if use authonly ; then
+		sed -e "/provide dns/d" \
+			"${FILESDIR}/maradns.rc6" > "${T}/maradns.rc6" || die
+	else
+		cp "${FILESDIR}/maradns.rc6" "${T}/maradns.rc6" || die
+	fi
+}
+
+src_configure() {
+	local myconf
+	if use authonly ; then
+		myconf="${myconf} --authonly"
+	fi
+	./configure ${myconf} # || die
+}
+
+src_install() {
+	if use authonly ; then
+		newsbin server/maradns.authonly maradns || die
+	else
+		dosbin server/maradns || die
+	fi
+
+	dosbin tcp/zoneserver || die
+
+	dobin tcp/getzone tcp/fetchzone tools/askmara tools/duende || die
+
+	doman doc/en/man/*.[1-9] || die
+
+	dodoc maradns.gpg.key || die
+	dodoc doc/en/{QuickStart,README,*.txt} || die
+	dohtml doc/en/*.html || die
+	dohtml -r doc/en/webpage || die
+	docinto examples; dodoc doc/en/examples/example_* || die
+
+	insinto /etc; newins doc/en/examples/example_mararc mararc || die
+	insinto /etc/maradns; newins doc/en/examples/example_csv2 db.example.net || die
+	keepdir /etc/maradns/logger || die
+
+	newinitd "${T}"/maradns.rc6 maradns || die
+	newinitd "${FILESDIR}"/zoneserver.rc6 zoneserver || die
+}
+
+pkg_postinst() {
+	enewgroup maradns 99
+	enewuser duende 66 -1 -1 maradns
+	enewuser maradns 99 -1 -1 maradns
+}