Added fwdzone and roundrobin local use flags and changed ipv6 to use orig ipv6 patch; cleaned headers in other ebuilds

8 files changed, 120 insertions, 16 deletions

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index 07505783f630..13e4f8e0d9ba 100644
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/djbdns
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.22 2003/11/16 21:39:32 pyrania Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.23 2004/03/27 16:03:28 jhhudso Exp $
+
+  27 Mar 2004; Jared Hudson <jhhudso@gentoo.org> :
+  fwdzone and roundrobin local use flags added to enable their respective
+  patches. ipv6 will not work with roundrobin and fwdzone currently because the
+  only patch we have for that combines all three. The problem with this is that
+  fwdzone and roundrobin do not work together according to bug #31238. Due to this
+  we are now using the original ipv6 patch when applicable.
 
   16 Nov 2003; Markus Nigbur <pyrania@gentoo.org> djbdns-1.05-r8.ebuild,
   files/headtail.patch:
diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index f32d196c1d64..8caf91a4b292 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,11 +1,13 @@
-MD5 188096855028696985f1b9d839d1643f files/1.05-errno.patch 238
-MD5 3d85d57281612a4f73829a8efb9d6455 files/digest-djbdns-1.05-r3 133
-MD5 456c7b3cc5de829f4f03e627300e654f files/digest-djbdns-1.05-r7 266
-MD5 ba558b4a61ed71c23083aa1ec32c7cc9 files/digest-djbdns-1.05-r8 270
-MD5 2804eedf8bf07dacf67d094c5122c723 files/dnscache-setup 6007
-MD5 7c2a17103fedf0325d120a7d254432fa files/tinydns-setup 3209
-MD5 625d040d68fa3f87d67688c0e15eb2f4 files/headtail.patch 1781
-MD5 6fbe0382cc6c69648758b126e17bf3c1 djbdns-1.05-r8.ebuild 2037
 MD5 e9afd135fd162fac9ff2bb48ddd0358f djbdns-1.05-r3.ebuild 1707
 MD5 aa47e23fa2298c30e3f2f25f1adb9583 ChangeLog 4073
 MD5 aa40db304c1a6264fc775d3331229ee6 djbdns-1.05-r7.ebuild 1934
+MD5 46c9d5858fcf1baa48eebdb321438361 djbdns-1.05-r9.ebuild 2751
+MD5 6fbe0382cc6c69648758b126e17bf3c1 djbdns-1.05-r8.ebuild 2037
+MD5 3340189be9a5a23877b1c8bbb9edf4a3 files/digest-djbdns-1.05-r9 261
+MD5 ba558b4a61ed71c23083aa1ec32c7cc9 files/digest-djbdns-1.05-r8 270
+MD5 456c7b3cc5de829f4f03e627300e654f files/digest-djbdns-1.05-r7 266
+MD5 7c2a17103fedf0325d120a7d254432fa files/tinydns-setup 3209
+MD5 188096855028696985f1b9d839d1643f files/1.05-errno.patch 238
+MD5 625d040d68fa3f87d67688c0e15eb2f4 files/headtail.patch 1781
+MD5 3d85d57281612a4f73829a8efb9d6455 files/digest-djbdns-1.05-r3 133
+MD5 2804eedf8bf07dacf67d094c5122c723 files/dnscache-setup 6007
diff --git a/net-dns/djbdns/djbdns-1.05-r3.ebuild b/net-dns/djbdns/djbdns-1.05-r3.ebuild
index 4bd1edea4a98..e7435a84e398 100644
--- a/net-dns/djbdns/djbdns-1.05-r3.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r3.ebuild,v 1.12 2003/09/07 00:09:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r3.ebuild,v 1.13 2004/03/27 16:03:29 jhhudso Exp $
 
 DESCRIPTION="Excellent high-performance DNS services"
 SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
diff --git a/net-dns/djbdns/djbdns-1.05-r7.ebuild b/net-dns/djbdns/djbdns-1.05-r7.ebuild
index d3217397d2b4..df0ceea85bb3 100644
--- a/net-dns/djbdns/djbdns-1.05-r7.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r7.ebuild,v 1.2 2003/05/24 09:58:57 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r7.ebuild,v 1.3 2004/03/27 16:03:29 jhhudso Exp $
 
 inherit eutils
 
diff --git a/net-dns/djbdns/djbdns-1.05-r8.ebuild b/net-dns/djbdns/djbdns-1.05-r8.ebuild
index 485672c603ce..fb331b199ed0 100644
--- a/net-dns/djbdns/djbdns-1.05-r8.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r8.ebuild,v 1.7 2003/11/17 14:15:17 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r8.ebuild,v 1.8 2004/03/27 16:03:29 jhhudso Exp $
 
 IUSE="ipv6 static"
 
diff --git a/net-dns/djbdns/djbdns-1.05-r9.ebuild b/net-dns/djbdns/djbdns-1.05-r9.ebuild
new file mode 100644
index 000000000000..b58651aee742
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r9.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r9.ebuild,v 1.1 2004/03/27 16:03:29 jhhudso Exp $
+
+IUSE="ipv6 static fwdzone roundrobin"
+
+inherit eutils
+
+DESCRIPTION="Excellent high-performance DNS services"
+HOMEPAGE="http://cr.yp.to/djbdns.html"
+SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
+	fwdzone? ( http://www.skarnet.org/software/djbdns-fwdzone/djbdns-1.04-fwdzone.patch )
+	roundrobin? ( http://www.legend.co.uk/djb/dns/round-robin.patch )
+	ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test20.diff.bz2 )"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 sparc ~ppc alpha ~mips ~hppa"
+
+RDEPEND=">=sys-apps/daemontools-0.70
+	sys-apps/ucspi-tcp"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Warning that ipv6 may not be used with fwdzone or roundrobin currently
+	use ipv6 && ( use fwdzone || use roundrobin ) && \
+	eerror "ipv6 cannot currently be used with the fwdzone or roundrobin patch." && \
+	eerror && \
+	eerror "If you would like to see ipv6 support along with one of those other patches" && \
+	eerror "please submit a working patch that combines ipv6 with either fwdzone or " && \
+	eerror "roundrobin but not both at the same time, since the latter 2 patches are " && \
+	eerror "mutually exclusive according to bug #31238" && exit -1
+
+	use fwdzone && use roundrobin && \
+	eerror "fwdzone and roundrobin do not work together according to bug #31238" && exit -1
+
+	use fwdzone && epatch ${DISTDIR}/djbdns-1.04-fwdzone.patch
+	use roundrobin && epatch ${DISTDIR}/round-robin.patch
+	use ipv6 && epatch ${WORKDIR}/djbdns-1.05-test20.diff
+
+	epatch ${FILESDIR}/${PV}-errno.patch
+	epatch ${FILESDIR}/headtail.patch
+}
+
+src_compile() {
+	LDFLAGS=
+	use static && LDFLAGS="-static"
+	echo "gcc ${CFLAGS}" > conf-cc
+	echo "gcc ${LDFLAGS}" > conf-ld
+	echo "/usr" > conf-home
+	MAKEOPTS="-j1" emake || die "emake failed"
+}
+
+src_install() {
+	insinto /etc
+	doins dnsroots.global
+	into /usr
+	dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
+	      *-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
+	      dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
+
+	use ipv6 && dobin dnsip6 dnsip6q
+
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+
+	dobin ${FILESDIR}/dnscache-setup
+	dobin ${FILESDIR}/tinydns-setup
+}
+
+pkg_postinst() {
+	groupadd &>/dev/null nofiles
+	id &>/dev/null dnscache || \
+		useradd -g nofiles -d /nonexistent -s /bin/false dnscache
+	id &>/dev/null dnslog || \
+		useradd -g nofiles -d /nonexistent -s /bin/false dnslog
+	id &>/dev/null tinydns || \
+		useradd -g nofiles -d /nonexistent -s /bin/false tinydns
+
+	einfo "Use dnscache-setup and tinydns-setup to help you"
+	einfo "configure your nameservers!"
+}
diff --git a/net-dns/djbdns/files/digest-djbdns-1.05-r9 b/net-dns/djbdns/files/digest-djbdns-1.05-r9
new file mode 100644
index 000000000000..b6df35aca096
--- /dev/null
+++ b/net-dns/djbdns/files/digest-djbdns-1.05-r9
@@ -0,0 +1,4 @@
+MD5 3147c5cd56832aa3b41955c7a51cbeb2 djbdns-1.05.tar.gz 85648
+MD5 ac799440bacc9d283e1c228f84cf99d4 djbdns-1.04-fwdzone.patch 6479
+MD5 4c8558be4c763b039de9211368c01b06 round-robin.patch 3239
+MD5 3757ed6320dc5781ac8ade6a2eaa58d6 djbdns-1.05-test20.diff.bz2 18041
diff --git a/net-dns/djbdns/metadata.xml b/net-dns/djbdns/metadata.xml
new file mode 100644
index 000000000000..c5d67a611520
--- /dev/null
+++ b/net-dns/djbdns/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>jhhudso@gentoo.org</email>
+</maintainer>
+</pkgmetadata>