Fix KEYWORDS...

(Portage version: 2.1.10.65/cvs/Linux i686)

3 files changed, 135 insertions, 1 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index aa74a4b6d3e4..226dc3792e5b 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.219 2012/07/27 07:43:01 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.220 2012/07/28 20:11:07 idl0r Exp $
+
+*bind-tools-9.9.1_p2-r1 (28 Jul 2012)
+
+  28 Jul 2012; Christian Ruppert <idl0r@gentoo.org>
+  +bind-tools-9.9.1_p2-r1.ebuild, +files/bind-libxml2-2.8.x.patch:
+  Fix libxml2 detection, bug 425170, thanks to Bruno <bonbons67@internet.lu>.
 
   27 Jul 2012; Jeff Horelick <jdhore@gentoo.org> bind-tools-9.9.1_p2.ebuild:
   marked x86 per bug 428086
diff --git a/net-dns/bind-tools/bind-tools-9.9.1_p2-r1.ebuild b/net-dns/bind-tools/bind-tools-9.9.1_p2-r1.ebuild
new file mode 100644
index 000000000000..0c4b31ea47f5
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.9.1_p2-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.9.1_p2-r1.ebuild,v 1.1 2012/07/28 20:11:07 idl0r Exp $
+
+EAPI="4"
+
+inherit eutils autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc gssapi idn ipv6 readline ssl urandom xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+DEPEND="ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/idnkit )
+	gssapi? ( virtual/krb5 )
+	readline? ( sys-libs/readline )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# bug 231247
+	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug 425170
+	epatch "${FILESDIR}"/bind-libxml2-2.8.x.patch
+
+	# bug #220361
+	rm {aclocal,libtool}.m4
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=
+
+	if use urandom; then
+		myconf="${myconf} --with-randomdev=/dev/urandom"
+	else
+		myconf="${myconf} --with-randomdev=/dev/random"
+	fi
+
+	# bug 344029
+	append-cflags "-DDIG_SIGCHASE"
+
+	# localstatedir for nsupdate -l, bug 395785
+	tc-export BUILD_CC
+	econf \
+		--localstatedir=/var \
+		$(use_enable ipv6) \
+		$(use_with idn) \
+		$(use_with ssl openssl) \
+		$(use_with xml libxml2) \
+		$(use_with gssapi) \
+		$(use_with readline) \
+		${myconf}
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+	emake -C lib/ || die "emake lib failed"
+	emake -C bin/dig/ || die "emake bin/dig failed"
+	emake -C bin/nsupdate/ || die "emake bin/nsupdate failed"
+	emake -C bin/dnssec/ || die "emake bin/dnssec failed"
+}
+
+src_install() {
+	dodoc README CHANGES FAQ
+
+	cd "${S}"/bin/dig
+	dobin dig host nslookup
+	doman {dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate
+	dobin nsupdate
+	doman nsupdate.1
+	if use doc; then
+		dohtml nsupdate.html
+	fi
+
+	cd "${S}"/bin/dnssec
+	dobin dnssec-keygen
+	doman dnssec-keygen.8
+	if use doc; then
+		dohtml dnssec-keygen.html
+	fi
+}
diff --git a/net-dns/bind-tools/files/bind-libxml2-2.8.x.patch b/net-dns/bind-tools/files/bind-libxml2-2.8.x.patch
new file mode 100644
index 000000000000..539f5a47ca40
--- /dev/null
+++ b/net-dns/bind-tools/files/bind-libxml2-2.8.x.patch
@@ -0,0 +1,25 @@
+From d2da04f6e412b1c115ceb8c2fb857c724de1faa7 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Sat, 28 Jul 2012 21:42:36 +0200
+Subject: [PATCH] Detect libxml2-2.8.x
+
+---
+ configure.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 2c3f1f2..b0d5ff7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1222,7 +1222,7 @@ case "$use_libxml2" in
+ 		;;
+ 	auto|yes)
+ 		case X`(xml2-config --version) 2>/dev/null` in
+-		X2.[[67]].*)
++		X2.[[678]].*)
+ 			libxml2_libs=`xml2-config --libs`
+ 			libxml2_cflags=`xml2-config --cflags`
+ 			;;
+-- 
+1.7.3.4
+