Version bump, bug 553584

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

4 files changed, 9 insertions, 236 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 27a2536f0de0..a2d6d0785db5 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.285 2015/05/26 03:01:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.286 2015/07/08 17:38:43 idl0r Exp $
+
+*bind-tools-9.10.2_p2 (08 Jul 2015)
+
+  08 Jul 2015; Christian Ruppert <idl0r@gentoo.org> -bind-tools-9.9.5.ebuild,
+  -bind-tools-9.10.2.ebuild, -bind-tools-9.10.2-r1.ebuild,
+  +bind-tools-9.10.2_p2.ebuild:
+  Version bump, bug 553584
 
 *bind-tools-9.10.2-r1 (26 May 2015)
 
diff --git a/net-dns/bind-tools/bind-tools-9.10.2.ebuild b/net-dns/bind-tools/bind-tools-9.10.2.ebuild
deleted file mode 100644
index fe89d5171ab7..000000000000
--- a/net-dns/bind-tools/bind-tools-9.10.2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 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.10.2.ebuild,v 1.3 2015/05/26 01:52:00 vapier Exp $
-
-EAPI="5"
-
-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="ISC BSD BSD-2 HPND JNIC RSA openssl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc gost gssapi idn ipv6 readline ssl urandom xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="gost? ( ssl )"
-
-DEPEND="ssl? ( dev-libs/openssl:0 )
-	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
-	xml? ( dev-libs/libxml2 )
-	idn? ( net-dns/idnkit )
-	gssapi? ( virtual/krb5 )
-	readline? ( sys-libs/readline )"
-RDEPEND="${DEPEND}
-	!<net-dns/bind-9.10.2"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-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 #220361
-	rm aclocal.m4
-	rm -rf 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 \
-		--without-python \
-		--disable-seccomp \
-		--without-libjson \
-		$(use_enable ipv6) \
-		$(use_with idn) \
-		$(usex idn --with-idnlib=-lidnkit '') \
-		$(use_with ssl openssl "${EPREFIX}"/usr) \
-		$(use_with xml libxml2) \
-		$(use_with gssapi) \
-		$(use_with readline) \
-		$(use_with gost) \
-		${myconf}
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_compile() {
-	local AR=$(tc-getAR)
-
-	emake AR=$AR -C lib/ || die "emake lib failed"
-	emake AR=$AR -C bin/delv/ || die "emake bin/delv failed"
-	emake AR=$AR -C bin/dig/ || die "emake bin/dig failed"
-	emake AR=$AR -C bin/nsupdate/ || die "emake bin/nsupdate failed"
-	emake AR=$AR -C bin/dnssec/ || die "emake bin/dnssec failed"
-}
-
-src_install() {
-	dodoc README CHANGES FAQ
-
-	cd "${S}"/bin/delv
-	dobin delv
-	doman delv.1
-
-	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
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	  revoke settime signzone verify; do
-		dobin dnssec-"${tool}"
-		doman dnssec-"${tool}".8
-		if use doc; then
-			dohtml dnssec-"${tool}".html
-		fi
-	done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.10.2-r1.ebuild b/net-dns/bind-tools/bind-tools-9.10.2_p2.ebuild
index b0e61f3ad904..002936d0c0c9 100644
--- a/net-dns/bind-tools/bind-tools-9.10.2-r1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.10.2_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.10.2-r1.ebuild,v 1.1 2015/05/26 03:01:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.10.2_p2.ebuild,v 1.1 2015/07/08 17:38:43 idl0r Exp $
 
 EAPI="5"
 
diff --git a/net-dns/bind-tools/bind-tools-9.9.5.ebuild b/net-dns/bind-tools/bind-tools-9.9.5.ebuild
deleted file mode 100644
index a1535f68e65a..000000000000
--- a/net-dns/bind-tools/bind-tools-9.9.5.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2014 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.5.ebuild,v 1.11 2014/08/02 18:20:08 ago Exp $
-
-EAPI="5"
-
-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="ISC BSD BSD-2 HPND JNIC RSA openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc gost gssapi idn ipv6 readline ssl urandom xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="gost? ( ssl )"
-
-DEPEND="ssl? ( dev-libs/openssl:0 )
-	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
-	xml? ( dev-libs/libxml2 )
-	idn? ( net-dns/idnkit )
-	gssapi? ( virtual/krb5 )
-	readline? ( sys-libs/readline )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-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 #220361
-	rm aclocal.m4
-	rm -rf 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 \
-		--without-python \
-		$(use_enable ipv6) \
-		$(use_with idn) \
-		$(use_with ssl openssl "${EPREFIX}"/usr) \
-		$(use_with xml libxml2) \
-		$(use_with gssapi) \
-		$(use_with readline) \
-		$(use_with gost) \
-		${myconf}
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_compile() {
-	local AR=$(tc-getAR)
-
-	emake AR=$AR -C lib/ || die "emake lib failed"
-	emake AR=$AR -C bin/dig/ || die "emake bin/dig failed"
-	emake AR=$AR -C bin/nsupdate/ || die "emake bin/nsupdate failed"
-	emake AR=$AR -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
-}