Add geoip back in 9.7.0 also add --with-geoip switch to 9.7.0 and 9.6.1.

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

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 026447dcaa66b16b87a93de32eae5e84f55e1d4e..05349132a34e29c5d44cf69579008b77e4060499 100644 (file)
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,10 @@
 # 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.268 2010/05/12 23:34:42 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.269 2010/05/13 00:13:32 idl0r Exp $
+
+  13 May 2010; Christian Ruppert <idl0r@gentoo.org> bind-9.6.1_p3-r1.ebuild,
+  bind-9.7.0_p1.ebuild:
+  Add geoip back in 9.7.0 also add --with-geoip switch to 9.7.0 and 9.6.1.
 
 *bind-9.7.0_p1 (12 May 2010)
 

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index cab411400aefbcdc99233ad7d656cf9b6f31ef19..9f4af6df58684882e1809dc8793c44232f91ef4e 100644 (file)
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -24,14 +24,14 @@ DIST bind-geoip-1.3.patch 54070 RMD160 5d01a20104b572588507aea4b8f6cbf66f68a973
 DIST bind-sdb-ldap-1.1.0.tar.bz2 5883 RMD160 ec2f684f278e5fa72158486a14dfce3005a62602 SHA1 fae539a29615fda56a2dcb55a1e01d335835b980 SHA256 afe9cc6a99c20f1dc1929b0a30ff815b0aac509a6c12f8df432853c856d35754
 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 9786 RMD160 93bc22fc3ff7e6e56547480792088ad1508616ab SHA1 c9290bb280e0ec4f714703d7f0423d0a3c5ab278 SHA256 40e5079f60ba90922354267324ba4be6c4e81d4ed6813ba61e6a715434c45696
-EBUILD bind-9.7.0_p1.ebuild 10266 RMD160 237584243580ef0d77aa40827c87d275e2b24cd6 SHA1 0f831547878c755b3e9baf717f1204f74bd19f77 SHA256 3b833c12768e6e85abfd7fc6b8aa6cb207b9166402dd3c10947b6efe0e664493
-MISC ChangeLog 43942 RMD160 9e9bfd27dee2c62418e63a80413cfe4306c49b88 SHA1 8ac72659d437f43eb30bc9372c9225c31d3a1072 SHA256 5d7ba0080607d0b07a66ddcb4936105c43714ed839972791e8d0c7253443166f
+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
 MISC metadata.xml 647 RMD160 63aeb182631d45c774bdc08f11901147028f6d7c SHA1 9aff80992005daa758d373c4e3311ff8c3ae3ef9 SHA256 9417c62e0e5817e26d36ab5efd87f126781dbf445d9a1beb3abb899b8cb4806a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvrOxkACgkQixe2jn+ufTgG6ACdHuA8VPnXLMITwvWVTGqmpMov
-cjYAn0kZMkW0FV7eePPNDnVwxvQq/3HS
-=7pHC
+iEYEARECAAYFAkvrRDYACgkQixe2jn+ufTgo+ACbBg+8ygBSpVciuHgD26wBQsg/
+YQYAn1qB1zRCCUYDLabOvQ8HjIOoB5oD
+=NaK6
 -----END PGP SIGNATURE-----

diff --git a/net-dns/bind/bind-9.6.1_p3-r1.ebuild b/net-dns/bind/bind-9.6.1_p3-r1.ebuild
index 647035e5d4d84291fb00509a18c90929b504142c..da5f071f11b5cf92d181599a6a2454026fbd4f19 100644 (file)
--- a/net-dns/bind/bind-9.6.1_p3-r1.ebuild
+++ b/net-dns/bind/bind-9.6.1_p3-r1.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.6.1_p3-r1.ebuild,v 1.3 2010/05/12 23:34:42 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.1_p3-r1.ebuild,v 1.4 2010/05/13 00:13:32 idl0r Exp $
 
 EAPI="2"
 
@@ -149,6 +149,8 @@ src_configure() {
                myconf="${myconf} --with-randomdev=/dev/random"
        fi
 
+       use geoip && myconf="${myconf} --with-geoip"
+
        # bug #158664
        gcc-specs-ssp && replace-flags -O[23s] -O
        export BUILD_CC="${CBUILD}-gcc"

diff --git a/net-dns/bind/bind-9.7.0_p1.ebuild b/net-dns/bind/bind-9.7.0_p1.ebuild
index e036fab028bfee4cda711566ffc9e97a1a8fee8c..fdf43a41a8a58a2e71186cfced1275dacb1e4769 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.1 2010/05/12 23:34:42 idl0r Exp $
+# $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 $
 
 EAPI="3"
 
@@ -11,23 +11,23 @@ MY_P="${PN}-${MY_PV}"
 
 SDB_LDAP_VER="1.1.0"
 
-#GEOIP_PV=1.3
-#GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/"
-#GEOIP_P="bind-geoip-${GEOIP_PV}"
+GEOIP_PV=1.3
+GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/"
+GEOIP_P="bind-geoip-${GEOIP_PV}"
 
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
 HOMEPAGE="http://www.isc.org/software/bind"
 SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
        sdb-ldap? ( mirror://gentoo/bind-sdb-ldap-${SDB_LDAP_VER}.tar.bz2 )
-       doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-#      geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_P}-readme.txt
-#                       ${GEOIP_SRC_URI_BASE}/files/${GEOIP_P}.patch )"
+       doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+       geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_P}-readme.txt
+                        ${GEOIP_SRC_URI_BASE}/files/${GEOIP_P}.patch )"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads
-       resolvconf urandom sdb-ldap xml" # geoip"
+       resolvconf urandom sdb-ldap xml geoip"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
        mysql? ( >=virtual/mysql-4.0 )
@@ -36,8 +36,8 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
        idn? ( net-dns/idnkit )
        postgres? ( virtual/postgresql-base )
        threads? ( >=sys-libs/libcap-2.1.0 )
-       xml? ( dev-libs/libxml2 )"
-#      geoip? ( >=dev-libs/geoip-1.4.6 )"
+       xml? ( dev-libs/libxml2 )
+       geoip? ( >=dev-libs/geoip-1.4.6 )"
 
 RDEPEND="${DEPEND}
        selinux? ( sec-policy/selinux-bind )
@@ -93,7 +93,12 @@ src_prepare() {
        # Upstream URL: http://bind9-ldap.bayour.com/
        use sdb-ldap && epatch "${WORKDIR}"/sdb-ldap/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
 
-#      use geoip && epatch "${DISTDIR}"/${GEOIP_P}.patch
+       if use geoip; then
+               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
+       fi
 
        # bug #220361
        rm {aclocal,libtool}.m4
@@ -149,6 +154,8 @@ src_configure() {
                myconf="${myconf} --with-randomdev=/dev/random"
        fi
 
+       use geoip && myconf="${myconf} --with-geoip"
+
        # bug #158664
        gcc-specs-ssp && replace-flags -O[23s] -O
 
@@ -198,7 +205,7 @@ src_install() {
                tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
        fi
 
-#      use geoip && dodoc "${DISTDIR}"/${GEOIP_P}-readme.txt
+       use geoip && dodoc "${DISTDIR}"/${GEOIP_P}-readme.txt
 
        insinto /etc/bind
        newins "${FILESDIR}"/named.conf-r4 named.conf || die