Revert static-libs support for 9.8.1

Package-Manager: portage-2.1.10.44/cvs/Linux i686

3 files changed, 15 insertions, 18 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index eeb525455173..6b27abcadfcf 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.374 2012/03/02 21:15:55 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.375 2012/03/03 12:56:17 idl0r Exp $
+
+  03 Mar 2012; Christian Ruppert <idl0r@gentoo.org> bind-9.8.1_p1.ebuild:
+  Revert static-libs support for 9.8.1
 
   02 Mar 2012; Christian Ruppert <idl0r@gentoo.org> bind-9.8.1_p1.ebuild:
   Improve static-libs.. Actually that was meant for >=9.9.0 only but for some
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 7b5071502ebb..63d80436971c 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -21,18 +21,18 @@ DIST bind-geoip-1.3-readme.txt 10040 RMD160 073956324ed4780e0e0cdbf40ae259f85ebe
 DIST bind-sdb-ldap-1.1.0-fc14.patch.bz2 9477 RMD160 eb7507dc4b1da0064516d9e75dbc435553b1c9ce SHA1 8c269cd172c6d90df38dab201cdd105eff03cbe3 SHA256 fe043a573ba187dcc8b0f7313d4408236e6916ec246b0443b7e71b33c8303ae9
 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
 EBUILD bind-9.7.4_p1.ebuild 11513 RMD160 0af7e3e83715140bba315266f518ecefb888b5f3 SHA1 14028d20199a5f57f29a066dd214252cb11115d1 SHA256 50d14ace4eeac85c24b6d0444655d14717c75623cccd3ad321abe8b853cb0152
-EBUILD bind-9.8.1_p1.ebuild 12092 RMD160 68117d2d6d8bac169f275750bd826e90e933017b SHA1 41759a30d65d33ed07ce2930ec40dd29d18634ab SHA256 5365c915c20465948073e585ec9cba567dfad9a68a458dea1e4fcea92589dffb
+EBUILD bind-9.8.1_p1.ebuild 11878 RMD160 83d2f60debf14e78ecae8f26fb26d4e8b68f7b66 SHA1 37da261f3645b2984fb3ee0cd91efcd0e26023e2 SHA256 631a3e6a99c2dc35103fd114a24634c455f31e96c28a87374672a7dc0f960563
 EBUILD bind-9.9.0.ebuild 11959 RMD160 4c8f451e61ce0545feacc6a9aabafb3bb0e7a2a9 SHA1 6d9b5129e2cf10217b196265c3d6459a8214753b SHA256 f30e8849823a50d1301151a6a2d5bda6fbcbbf880bbef6958795b8e81be87803
-MISC ChangeLog 63014 RMD160 15329987d4cf3e84475a1d1bbc525c2945cf990e SHA1 1f2f04f1c62d24712cccc6a0353be6edbe039f44 SHA256 e093344e0c823dc9fef4916feb3ca8004ba0f5b79aa19f6a68cce54d62f2bf4a
+MISC ChangeLog 63128 RMD160 a6d00c184243c7e0c1eed8b01fd0823a27a538ed SHA1 8a457e4e46219d993a5ec90c3e733fc6c6738584 SHA256 043c12c18264b01fec213f58a22ca17514f497b54eb034a2bc96bf8a2bb4a1cd
 MISC metadata.xml 887 RMD160 3c0fdcaacc812fc3e558afbbdb91dd6efbf377f9 SHA1 73e55d5772ca66d165643bf389847234c32593d7 SHA256 c0a53163775c42b68ed319c68f18234d8e6d908b318066a0d533bf7bcd40ce7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPUTiRAAoJEMOx0zmdw4Z1RIAH/RjvKqmls5J6vq0xTz0L6mu3
-iG+Ap6nhRx0/l7lswah8LhWhqMxpF4mvjpkCZvgsE174Z7ssIcCMmdMAjMlOvPih
-8gxfl76/0L1nP5jBV6zvckMiIALdzCpcOrbwuqzDBjS2CwjAtbD/b9Kj2c9myDSG
-s2zJQm46iMa8az0papIqMav86F3r2d3/cXdu3PDxA/m0CY5yuju84KDOGhlcBQ1D
-FJJrphTRyM6CG3I5+zqikjnjULGTybuzxuegeSUx/IalczIO4xLkQTYd8BP3pXf4
-iCtiHvAgj3txY0xDNayoQhzX522FKmV/K/cXyC4VTG/iQdZ/4SxRPgtZK58oBB4=
-=L1D0
+iQEcBAEBCAAGBQJPUhT2AAoJEMOx0zmdw4Z1q5kH/1s4hkSne5pI1hAm6afschgb
+M9czB9m+QixASeZ7Y7kqkLDECyT2rK2NvN4Le4VPKQg7xCmc0VfL47GrsAjgNjEC
+9AO5JGlxWLRYPLRl6AOn2nmWNP8vIrLg/QgH9B5TIRbrZVsPPLBWjd8yTiGpNxfc
+wPXwc4xjrEaJnSz6754q6Nk0JrHgKvtF3sKMUXS5rhloht/enL5z91OEUPpdEU+H
+X9hdZaerVx+d5msxUKOGqXwaeFnAipie4AgVHjUPav8GFGTUGsNZC6wK92M+J8PV
+WGz5M3WosUhEQcN7SqOSpDN6kFxBZUAn39rxT2yQ771HEi83Pjw1Tzs+BvqbwsM=
+=2DfZ
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.8.1_p1.ebuild b/net-dns/bind/bind-9.8.1_p1.ebuild
index a1ae5cb338e6..41f1fa3f9ab4 100644
--- a/net-dns/bind/bind-9.8.1_p1.ebuild
+++ b/net-dns/bind/bind-9.8.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.1_p1.ebuild,v 1.9 2012/03/02 21:15:55 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.1_p1.ebuild,v 1.10 2012/03/03 12:56:17 idl0r Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -42,7 +42,7 @@ LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="berkdb caps dlz doc geoip gost gssapi idn ipv6 ldap mysql odbc pkcs11 postgres rpz sdb-ldap
-selinux ssl static-libs threads urandom xml"
+selinux ssl threads urandom xml"
 
 REQUIRED_USE="postgres? ( dlz )
 	berkdb? ( dlz )
@@ -168,7 +168,6 @@ src_configure() {
 		$(use_with pkcs11) \
 		$(use_enable caps linux-caps) \
 		$(use_with gost) \
-		$(use_enable static-libs static) \
 		${myconf}
 
 	# bug #151839
@@ -239,11 +238,6 @@ src_install() {
 	rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
 	rm -f "${D}"/usr/sbin/{dig,host,nslookup,dnssec-keygen,nsupdate}
 
-	# bug 405251, library archives aren't properly handled by --enable/disable-static
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
-	fi
-
 	dosym /var/bind/named.cache /var/bind/root.cache || die
 	dosym /var/bind/pri /etc/bind/pri || die
 	dosym /var/bind/sec /etc/bind/sec || die