Fix geoip patching.

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

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 05349132a34e29c5d44cf69579008b77e4060499..4d9b7ad737b3598f9d5c218798e1f8154cab75df 100644 (file)
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.269 2010/05/13 00:13:32 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.270 2010/05/13 15:28:54 idl0r Exp $
+
+  13 May 2010; Christian Ruppert <idl0r@gentoo.org> bind-9.7.0_p1.ebuild:
+  Fix geoip patching.
 
   13 May 2010; Christian Ruppert <idl0r@gentoo.org> bind-9.6.1_p3-r1.ebuild,
   bind-9.7.0_p1.ebuild:

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 9f4af6df58684882e1809dc8793c44232f91ef4e..5852c85f9e44dde62f30c78c15857cf3f2c5fd5a 100644 (file)
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -25,13 +25,13 @@ DIST bind-sdb-ldap-1.1.0.tar.bz2 5883 RMD160 ec2f684f278e5fa72158486a14dfce3005a
 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
 EBUILD bind-9.4.3_p5.ebuild 9208 RMD160 6e7ff13da934a07ba7973e886b0ac03aa7033fb0 SHA1 8320223ec6b82e8988ca23f994457175c25caef0 SHA256 ae0e300cc78a666ef49c7f84432c14f4238b7017e7b579054e54397c28946e3e
 EBUILD bind-9.6.1_p3-r1.ebuild 9833 RMD160 9152069d6213e852b990a057c7521181e5a8316b SHA1 7de6d1de13394e66415e321e7c8485d5207acedb SHA256 1359dc52e547955d89232c086cbb7e9cc33e47bf63ff5bb322dfec2a5cfb383e
-EBUILD bind-9.7.0_p1.ebuild 10460 RMD160 6b9a46bdc0062341d84cc61a5e69ab493b2b3ca4 SHA1 253bb7e5fb4529a33bb69b89cd2be5e4a3407bb2 SHA256 9eb07c2970faa6c1e365569e77c31e7a7079890d5cfe15a68ac9b17f89a7e55d
-MISC ChangeLog 44119 RMD160 2e993a5b5bb5da414d57c0244e8378665bf507d3 SHA1 8178e33c1b3dc406b7ae779f59ef07d92b50ca15 SHA256 f63a4787a4008bade3e6b0dfc7980935d373790ef2d39ae538c79c5eb65c402c
+EBUILD bind-9.7.0_p1.ebuild 10483 RMD160 a75dd6a99d49079b2388570204a242b13e1dab20 SHA1 ef97eb745beced8f7750de59ee8169a279e479bd SHA256 4666dfd1446356ad3af73b5ad9e6c9c7db2e09783fd21addda06b827bb81c078
+MISC ChangeLog 44216 RMD160 9c71571bbb496e7372cf93915b5cdf2e0d0309d0 SHA1 dbf1c5088b79fd3640131d79fccd1faaafd87dd7 SHA256 5569944a216819c7b3dd934e03266d4c19d0ed16cc472fc9e8732573cbb20cee
 MISC metadata.xml 647 RMD160 63aeb182631d45c774bdc08f11901147028f6d7c SHA1 9aff80992005daa758d373c4e3311ff8c3ae3ef9 SHA256 9417c62e0e5817e26d36ab5efd87f126781dbf445d9a1beb3abb899b8cb4806a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvrRDYACgkQixe2jn+ufTgo+ACbBg+8ygBSpVciuHgD26wBQsg/
-YQYAn1qB1zRCCUYDLabOvQ8HjIOoB5oD
-=NaK6
+iEYEARECAAYFAkvsGsAACgkQixe2jn+ufTjYXQCfc+tBRKCx8MJSrj7A6cTJxkvw
+zPMAnRX1OcDSg/2DX0DBDJtY/y6Xlybf
+=5MYl
 -----END PGP SIGNATURE-----

diff --git a/net-dns/bind/bind-9.7.0_p1.ebuild b/net-dns/bind/bind-9.7.0_p1.ebuild
index fdf43a41a8a58a2e71186cfced1275dacb1e4769..efad2fb9f0c99d1a8b73f6884470763d2a0ffe08 100644 (file)
--- a/net-dns/bind/bind-9.7.0_p1.ebuild
+++ b/net-dns/bind/bind-9.7.0_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.0_p1.ebuild,v 1.2 2010/05/13 00:13:32 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.7.0_p1.ebuild,v 1.3 2010/05/13 15:28:54 idl0r Exp $
 
 EAPI="3"
 
@@ -94,10 +94,11 @@ src_prepare() {
        use sdb-ldap && epatch "${WORKDIR}"/sdb-ldap/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
 
        if use geoip; then
+               cp "${DISTDIR}"/${GEOIP_P}.patch "${S}" || die
                sed -i -e 's/-RELEASEVER=3/-RELEASEVER=1/' \
                        -e 's/+RELEASEVER=3-geoip-1.3/+RELEASEVER=1-geoip-1.3/' \
-                       "${DISTDIR}"/${GEOIP_P}.patch || die
-               epatch "${DISTDIR}"/${GEOIP_P}.patch
+                       ${GEOIP_P}.patch || die
+               epatch ${GEOIP_P}.patch
        fi
 
        # bug #220361