Bug #271292: Add a warning that you might want BIND installed for some of the functionality, not it is NOT an actual requirement (the dnstouch tool is very useful in other setups). Also make repoman happy and clean up old ebuilds.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

7 files changed, 24 insertions, 200 deletions

diff --git a/net-dns/ndu/ChangeLog b/net-dns/ndu/ChangeLog
index 6d48f3ee6197..3f568de76f41 100644
--- a/net-dns/ndu/ChangeLog
+++ b/net-dns/ndu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/ndu
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ChangeLog,v 1.14 2007/04/22 13:56:11 dertobi123 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ChangeLog,v 1.15 2009/07/31 09:12:36 robbat2 Exp $
+
+  31 Jul 2009; Robin H. Johnson <robbat2@gentoo.org> -ndu-0.4.ebuild,
+  -ndu-0.4-r1.ebuild, -ndu-0.4-r2.ebuild, -ndu-0.4-r3.ebuild,
+  ndu-0.4-r4.ebuild:
+  Bug #271292: Add a warning that you might want BIND installed for some of
+  the functionality, not it is NOT an actual requirement (the dnstouch tool
+  is very useful in other setups). Also make repoman happy and clean up old
+  ebuilds.
 
   22 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> ndu-0.4-r4.ebuild:
   ppc stable, bug #173858
diff --git a/net-dns/ndu/Manifest b/net-dns/ndu/Manifest
index 962096a45eee..4d470d909f71 100644
--- a/net-dns/ndu/Manifest
+++ b/net-dns/ndu/Manifest
@@ -1,9 +1,5 @@
 AUX ndu-0.4-binary-locations.patch 426 RMD160 a3d11f1ae0160bf999b47214e30db575fd2031e5 SHA1 9e41eeba831fe4a4634426d8f8d6fd159709dced SHA256 c6561a2648dfd3ce86bef0bbaae53d4cca3622268b8e6694213c2332ae56407f
 DIST ndu-0.4.tar.gz 16118 RMD160 f9273a4428dd30a0bca3416cfcab15aa5fb04aa3 SHA1 10719a426e16291e351ad057784474a0b606078f SHA256 27a2f523cee765db142b5582087866a90050fa00f1b365c800305204fc0c6d40
-EBUILD ndu-0.4-r1.ebuild 1096 RMD160 098f021f6c8fa636bf955c0d70f7d0255985102f SHA1 d0f77651be0e43a503b26e4df630336fc51ea2ea SHA256 6fdd7ac17371a60bebf56a7d4e68fe2b7d886a809cd769e5a238dbe9436dabb6
-EBUILD ndu-0.4-r2.ebuild 1661 RMD160 e149b3eb776453fb8affa1d11954e31e5cb0c1a1 SHA1 3b0072e564702729e1380e278d712b9d49726800 SHA256 66f5416bb12f02c6dcb8df3eba32a445761b1e8ccedd5993c30de0a3f5f463a1
-EBUILD ndu-0.4-r3.ebuild 1671 RMD160 da0f555c5eb8cdc1b5721858eb59a14065283db7 SHA1 9f426cc48d449d7362a624c388eae9b0836a27ee SHA256 4eb40560a87cc0e2500047e55b2348d32e49a6b26a21013334aab64fc55d013b
-EBUILD ndu-0.4-r4.ebuild 1709 RMD160 217a86ec6029ff2eee5091aafed62ac22e592ee2 SHA1 fbf5c896f88f53ecdced8673b9dcf62d96e46824 SHA256 22ffa592a4fd5c311ee1132d88c52c1c991466dbacae9c8af944f9b9a1199bfa
-EBUILD ndu-0.4.ebuild 1102 RMD160 a80483334d167ed28aa848d8e0945737e1545bae SHA1 8728f45f055906573af80a959c5cb5ac49e35063 SHA256 d0fe3a22f5400bf4660ed8394d47ad46e707f031974a9dd094baa81ddc1dffac
-MISC ChangeLog 1644 RMD160 b5a01dcd44b705170a5a9751c3a9984c9fe22ef1 SHA1 f9e9f8fc350e791a8a8f6535408e073211b92914 SHA256 feee9418f2ad190d4e7f11e708924b134da4735171b0ce1352fc5b39579490be
+EBUILD ndu-0.4-r4.ebuild 1902 RMD160 2f04ec52619dfc0771908df33cd6a1486ac118c1 SHA1 1b37eede5a3d3b4a9d7273e4745b0509a32f2ecc SHA256 5d64bc2820793e7976d5f3af64d33cca2d76c16739373e0ed362e5fb35726895
+MISC ChangeLog 2034 RMD160 f1b925304ed298da9f37c7b050a5c97c3656621d SHA1 3b49deaedce7e8c0de19ae06201e2f36dfbc6017 SHA256 9cfe927791f43aaf8b24f8a6f649747af8e0ade19468e99fe404279ca0c9420b
 MISC metadata.xml 279 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f SHA1 98caf044b8fce3f5ff202c7f7b71f0dcb9d51947 SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543
diff --git a/net-dns/ndu/ndu-0.4-r1.ebuild b/net-dns/ndu/ndu-0.4-r1.ebuild
deleted file mode 100644
index 4fd92cde68a1..000000000000
--- a/net-dns/ndu/ndu-0.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ndu-0.4-r1.ebuild,v 1.3 2005/02/13 03:38:27 robbat2 Exp $
-
-DESCRIPTION="DNS serial number incrementer and reverse zone builder"
-URI_BASE="http://uranus.it.swin.edu.au/~jn/linux/"
-SRC_URI="${URI_BASE}/${P}.tar.gz"
-HOMEPAGE="${URI_BASE}/dns.htm"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-DEPEND="sys-apps/sed virtual/libc"
-RDEPEND="virtual/libc"
-
-src_compile() {
-	cd ${S}/src
-	sed -i 's|gcc|$(CXX)|g' Makefile
-	sed -i 's|#define CONFIG_PATH "/etc/"|#define CONFIG_PATH "/etc/bind/"|g' ndc.c
-	emake
-	sed -i 's|VISUAL|EDITOR|g' dnsedit
-	cd ${S}
-	sed -i 's|0.0.127.in-addr.arpa|127.in-addr.arpa|g' ndu.conf
-	echo '## if you use a chrooted setup, then you need to uncomment these lines:' >>ndu.conf
-	echo '#process "/chroot/dns/named.conf"' >>ndu.conf
-	echo '#chroot "/chroot/dns"' >>ndu.conf
-}
-
-src_install () {
-	into /usr
-	dosbin src/{dnsedit,ndu}
-	dobin src/dnstouch
-	into /
-	insinto /etc/bind
-	doins ndu.conf
-	dodoc README INSTALL
-}
diff --git a/net-dns/ndu/ndu-0.4-r2.ebuild b/net-dns/ndu/ndu-0.4-r2.ebuild
deleted file mode 100644
index 059055e82e7d..000000000000
--- a/net-dns/ndu/ndu-0.4-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ndu-0.4-r2.ebuild,v 1.3 2005/09/26 04:28:14 robbat2 Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="DNS serial number incrementer and reverse zone builder"
-URI_BASE="http://uranus.it.swin.edu.au/~jn/linux/"
-SRC_URI="${URI_BASE}/${P}.tar.gz"
-HOMEPAGE="${URI_BASE}/dns.htm"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-DEPEND="sys-apps/sed
-		virtual/libc"
-RDEPEND="virtual/libc
-		sys-apps/ed" # dnstouch calls ed to do the dirty work
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/src
-	# use the correct compiler
-	sed -e 's|gcc|$(CXX)|g' -i Makefile
-	# set correct config pathes
-	sed -e 's|#define CONFIG_PATH "/etc/"|#define CONFIG_PATH "/etc/bind/"|g' -i ndu.cpp
-	sed -e 's|"/etc/ndu.conf"|"/etc/bind/ndu.conf"|g' -i dnstouch.cpp
-	# hack up something to work around bug #73858
-	sed -e 's|execlp("ed", "ed", filename, 0);|execlp("ed", "ed", "-s", filename, 0);|g' -i dnstouch.cpp
-	# use the correct editor
-	sed -e 's|VISUAL|EDITOR|g' -i dnsedit
-
-	cd ${S}
-	# match our bind config
-	sed -e 's|0.0.127.in-addr.arpa|127.in-addr.arpa|g' -i ndu.conf
-	# document the support for the chrooted BIND setup
-	echo '// if you use a chrooted setup, then you need to uncomment these lines:' >>ndu.conf
-	echo '//process "/chroot/dns/named.conf"' >>ndu.conf
-	echo '//chroot "/chroot/dns"' >>ndu.conf
-}
-
-src_compile() {
-	cd ${S}/src
-	emake CFLAGS="${CFLAGS}" CXX="$(tc-getCXX)"
-}
-
-src_install () {
-	into /usr
-	dosbin src/{dnsedit,ndu}
-	dobin src/dnstouch
-	into /
-	insinto /etc/bind
-	doins ndu.conf
-	dodoc README INSTALL
-}
diff --git a/net-dns/ndu/ndu-0.4-r3.ebuild b/net-dns/ndu/ndu-0.4-r3.ebuild
deleted file mode 100644
index 63c14d071b7f..000000000000
--- a/net-dns/ndu/ndu-0.4-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ndu-0.4-r3.ebuild,v 1.1 2005/12/12 03:42:09 robbat2 Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="DNS serial number incrementer and reverse zone builder"
-URI_BASE="http://uranus.it.swin.edu.au/~jn/linux/"
-SRC_URI="${URI_BASE}/${P}.tar.gz"
-HOMEPAGE="${URI_BASE}/dns.htm"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-DEPEND="sys-apps/sed
-		virtual/libc"
-RDEPEND="virtual/libc
-		sys-apps/ed" # dnstouch calls ed to do the dirty work
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/src
-	# use the correct compiler
-	sed -e 's|gcc|$(CXX)|g' -i Makefile
-	# set correct config pathes
-	sed -e 's|#define CONFIG_PATH "/etc/"|#define CONFIG_PATH "/etc/bind/"|g' -i ndu.cpp
-	sed -e 's|"/etc/ndu.conf"|"/etc/bind/ndu.conf"|g' -i dnstouch.cpp
-	# hack up something to work around bug #73858
-	sed -e 's|execlp("ed", "ed", filename, 0);|execlp("ed", "ed", "-s", filename, 0);|g' -i dnstouch.cpp
-	# use the correct editor
-	sed -e 's|VISUAL|EDITOR|g' -i dnsedit
-
-	cd ${S}
-	# match our bind config
-	sed -e 's|0.0.127.in-addr.arpa|127.in-addr.arpa|g' -i ndu.conf
-	# document the support for the chrooted BIND setup
-	echo '// if you use a chrooted setup, then you need to uncomment these lines:' >>ndu.conf
-	echo '//process "/chroot/dns/named.conf"' >>ndu.conf
-	echo '//chroot "/chroot/dns"' >>ndu.conf
-}
-
-src_compile() {
-	cd ${S}/src
-	emake CFLAGS="${CFLAGS}" CXX="$(tc-getCXX)"
-}
-
-src_install () {
-	into /usr
-	dosbin src/{dnsedit,ndu,dnstouch}
-	dobin src/dnstouch
-	into /
-	insinto /etc/bind
-	doins ndu.conf
-	dodoc README INSTALL
-}
diff --git a/net-dns/ndu/ndu-0.4-r4.ebuild b/net-dns/ndu/ndu-0.4-r4.ebuild
index a3aa41010298..79b408dba457 100644
--- a/net-dns/ndu/ndu-0.4-r4.ebuild
+++ b/net-dns/ndu/ndu-0.4-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ndu-0.4-r4.ebuild,v 1.4 2007/04/22 13:56:11 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ndu-0.4-r4.ebuild,v 1.5 2009/07/31 09:12:36 robbat2 Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,9 +19,9 @@ RDEPEND="virtual/libc
 src_unpack() {
 	unpack ${A}
 
-	epatch ${FILESDIR}/${P}-binary-locations.patch
+	epatch "${FILESDIR}"/${P}-binary-locations.patch
 
-	cd ${S}/src
+	cd "${S}"/src
 	# use the correct compiler
 	sed -e 's|gcc|$(CXX)|g' -i Makefile
 	# set correct config pathes
@@ -32,7 +32,7 @@ src_unpack() {
 	# use the correct editor
 	sed -e 's|VISUAL|EDITOR|g' -i dnsedit
 
-	cd ${S}
+	cd "${S}"
 	# match our bind config
 	sed -e 's|0.0.127.in-addr.arpa|127.in-addr.arpa|g' -i ndu.conf
 	# document the support for the chrooted BIND setup
@@ -42,7 +42,7 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${S}/src
+	cd "${S}"/src
 	emake CFLAGS="${CFLAGS}" CXX="$(tc-getCXX)"
 }
 
@@ -54,3 +54,9 @@ src_install () {
 	doins ndu.conf
 	dodoc README INSTALL
 }
+
+pkg_postinst() {
+	elog "The ndu binary expects to read your configuration"
+	elog "from /etc/bind/named.conf, however the other binaries"
+	elog "are useful with BIND locally installed."
+}
diff --git a/net-dns/ndu/ndu-0.4.ebuild b/net-dns/ndu/ndu-0.4.ebuild
deleted file mode 100644
index e0fc996843dd..000000000000
--- a/net-dns/ndu/ndu-0.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ndu-0.4.ebuild,v 1.7 2005/02/13 03:38:27 robbat2 Exp $
-
-DESCRIPTION="DNS serial number incrementer and reverse zone builder"
-URI_BASE="http://uranus.it.swin.edu.au/~jn/linux/"
-SRC_URI="${URI_BASE}/${P}.tar.gz"
-HOMEPAGE="${URI_BASE}/dns.htm"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="sys-apps/sed virtual/libc"
-RDEPEND="net-dns/bind virtual/libc"
-
-src_compile() {
-	cd ${S}/src
-	sed -i 's|gcc|$(CXX)|g' Makefile
-	sed -i 's|#define CONFIG_PATH "/etc/"|#define CONFIG_PATH "/etc/bind/"|g' ndc.c
-	emake
-	sed -i 's|VISUAL|EDITOR|g' dnsedit
-	cd ${S}
-	sed -i 's|0.0.127.in-addr.arpa|127.in-addr.arpa|g' ndu.conf
-	echo '## if you use a chrooted setup, then you need to uncomment these lines:' >>ndu.conf
-	echo '#process "/chroot/dns/named.conf"' >>ndu.conf
-	echo '#chroot "/chroot/dns"' >>ndu.conf
-}
-
-src_install () {
-	into /usr
-	dosbin src/{dnsedit,ndu}
-	dobin src/dnstouch
-	into /
-	insinto /etc/bind
-	doins ndu.conf
-	dodoc README INSTALL
-}