Version bump to 9.7.0_p1. Remove bind-tools-9.6.1_p2. Use EAPI 3 and src_prepare/src_configure. Fix the sed for bug 151839.

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

2 files changed, 20 insertions, 10 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 2a242156a989..15df498070ce 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.154 2010/03/07 14:46:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.155 2010/05/12 23:09:25 idl0r Exp $
+
+*bind-tools-9.7.0_p1 (12 May 2010)
+
+  12 May 2010; Christian Ruppert <idl0r@gentoo.org>
+  -bind-tools-9.6.1_p2.ebuild, +bind-tools-9.7.0_p1.ebuild:
+  Version bump to 9.7.0_p1. Remove bind-tools-9.6.1_p2. Use EAPI 3 and
+  src_prepare/src_configure. Fix the sed for bug 151839.
 
   07 Mar 2010; Markus Meier <maekke@gentoo.org> bind-tools-9.4.3_p5.ebuild:
   amd64 stable, bug #301548
diff --git a/net-dns/bind-tools/bind-tools-9.6.1_p2.ebuild b/net-dns/bind-tools/bind-tools-9.7.0_p1.ebuild
index 070bde7e0671..89822ef32061 100644
--- a/net-dns/bind-tools/bind-tools-9.6.1_p2.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.7.0_p1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.6.1_p2.ebuild,v 1.1 2009/11/25 19:05:36 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.7.0_p1.ebuild,v 1.1 2010/05/12 23:09:25 idl0r Exp $
+
+EAPI="3"
 
 inherit eutils autotools
 
@@ -27,22 +29,21 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
+	# bug 122597
 	use idn && {
 		cd "${S}"/contrib/idn/idnkit-1.0-src
 		epatch "${FILESDIR}"/${PN}-configure.patch
-		cd -
+		cd "${S}"
 	}
 
+	# bug 231247
 	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch
 
 	# bug #151839
 	sed -i -e \
 		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
-		lib/isc/unix/socket.c || die
+		lib/isc/include/isc/socket.h || die
 
 	# bug 278364 (workaround)
 	epatch "${FILESDIR}/${PN}-9.6.1-parallel.patch"
@@ -50,7 +51,7 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local myconf=
 
 	has_version sys-libs/glibc || myconf="${myconf} --with-iconv"
@@ -61,7 +62,9 @@ src_compile() {
 		$(use_with ssl openssl) \
 		$(use_with xml libxml2) \
 		${myconf}
+}
 
+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"