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.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

6 files changed, 22 insertions, 194 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/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
-}