Version bump to 9.7.0_p1. Remove bind-tools-9.6.1_p2. Use EAPI 3 and src_prepare...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index 2a242156a98984e12a0848bc6e763f29b1be3086..15df498070ce3a0e46c6b52d1d0f7da9861f1035 100644 (file)
--- 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/Manifest b/net-dns/bind-tools/Manifest
index 12dc8f21f97d240fb018b85be6a4ede40c33cfad..d6d7a7c3b13528c821fe556eaa4372bfcdda8622 100644 (file)
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -6,18 +6,18 @@ AUX bind-tools-9.6.1-parallel.patch 386 RMD160 a48bdcf7fe020e55c64a692852b6ca718
 AUX bind-tools-configure.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 DIST bind-9.4.3-P4.tar.gz 6545707 RMD160 e8757d67dbdeb6c0f2c88860214a48c1bd6c8132 SHA1 16686bec02960ba5541852031352acdc12971b7e SHA256 6374354f72a25335ae54799e84f2f0f90b94e8849084ef50709ea8eef8534fc9
 DIST bind-9.4.3-P5.tar.gz 6447497 RMD160 680146e4120aaa89f2899d4205c17fee5e9e4aa9 SHA1 9b7f0bd84be0f91fe1085cedc91c7c14f1e0f97a SHA256 7ca93553d1f488af1b21ab26f0297be5c7b7b5920d29ad9743382bf3623b2939
-DIST bind-9.6.1-P2.tar.gz 6601674 RMD160 7842404116ec75cd11a73276e9d534bd9ff8c171 SHA1 0169c7898790b72ee3b5a1e090c2bdf68792b952 SHA256 8ad9593ae7ae6903150cfd9202200c26a1caf47816becdd5821b5360d544fc30
 DIST bind-9.6.1-P3.tar.gz 6508797 RMD160 ff444f39d7cf9673497e43c18c40dd77af121851 SHA1 9cb2bfb933083ab4e85aa884ca0dff7b0ae5cfb2 SHA256 869f5079a900b280c051d4c9cf7eefea000a0e70ccec9e6fcddd79e3caa10198
+DIST bind-9.7.0-P1.tar.gz 7125947 RMD160 200aa067596e09f6f06e8830d0a46f02d324db26 SHA1 6713d65c1455845a9ced6cb4bd705a2575986e42 SHA256 d84b63f71bfc249e5bf1a14ba34af37981b2ee6068d1224066062cfa5d086fcf
 EBUILD bind-tools-9.4.3_p4.ebuild 2083 RMD160 5f2718d0676b74b5a0d8c39e0107ef8756fd9e6b SHA1 673822794bc34794c9da4715b95a7e81e645c203 SHA256 74cf6e4eae2dd934af41af5ee3582c8c2c9e26495726253df57fb6ceb61e2f06
 EBUILD bind-tools-9.4.3_p5.ebuild 2085 RMD160 00c72268bef2844d7ece125b7bea0bbc52c63524 SHA1 e0c6f662bae766b9c7eaaba1de4d76603254d312 SHA256 0f1d39b9bc58e63ddc82510c785714f6debdc8002341d74beedda854bc021a35
-EBUILD bind-tools-9.6.1_p2.ebuild 2072 RMD160 e305b525a8697906c94f2850075e0642feaf2c14 SHA1 e7231388be5460ce5adbe0d95ef5fd7b029e14d3 SHA256 eba23d068544d49f12f225530aaae3494cb7046f9bfdc0cbd118c165455d080e
 EBUILD bind-tools-9.6.1_p3.ebuild 2070 RMD160 921e4474eb7c0d9343eb30f238b1a23f04a7532e SHA1 3de42e1bfea0a65cde8144f6e65c9d267f6a491d SHA256 2c199731199487d764b40e07a3637b509e5b07709e23943ce1d88cac9c880696
-MISC ChangeLog 22134 RMD160 1143d0abc19a7354dba8bf1817f298f7a3b8112a SHA1 d25d71dbd9868b860aea48d606cb3522694a7075 SHA256 8ea36c4119b49e084745b0114c8f4b7b22e2d83913645e5dd2e8fa9a2e0b38b6
+EBUILD bind-tools-9.7.0_p1.ebuild 2118 RMD160 44f5b4198a45c4af4830dc25b02e1779056cbe58 SHA1 461ba9bf01ccc6e365f4dbfd0acc74702463998c SHA256 31440fe7934d97392507aecb514fa5089ce0fb5436a289c2721c47df8e42b709
+MISC ChangeLog 22410 RMD160 10502a1236f0442bbe5f66f78c556b3688a5b09c SHA1 404396be81d1776515eb01dc924f307d12647c34 SHA256 7399d6dd613ce220c131aaf7c5c0f0fa401102bd7f0178bf1577a99cdec77c20
 MISC metadata.xml 334 RMD160 5bf93af61fefc6ad5d6c78fa595fcd70bd35c3a9 SHA1 0f537e70e9ddba477f8cd430f6d24589ba268755 SHA256 5a6b75435f504f86c0ff197f0374e59fbb00c9eb351e39336d07ed67ed54b92d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuTvAAACgkQkKaRLQcq0GInjQCbBzVt1v9Y51ZkAPBfqsu3KgFi
-0ZkAmwaoLFmKlqzlb7XUu+WPPwA65uGd
-=+VVZ
+iEYEARECAAYFAkvrNSsACgkQixe2jn+ufTgEzwCfUXyNhEgYpNGzOg0KODVGXTEB
+gGcAn04sCXxMVlbluzXUfD78VyEEUr4k
+=7Mi3
 -----END PGP SIGNATURE-----

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
similarity index 89%
rename from net-dns/bind-tools/bind-tools-9.6.1_p2.ebuild
rename to net-dns/bind-tools/bind-tools-9.7.0_p1.ebuild
index 070bde7e0671357a91c53d964d2c0018264fcd0f..89822ef3206151a2d7588f4198e7914c5948dc06 100644 (file)
--- 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"