Tweak sys-libs/timezone-data dependency based on USE=vanilla #331775 by Alonso Schaich.

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

4 files changed, 22 insertions, 16 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 75aa53bb00c8..865a0a252b88 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.703 2010/08/05 17:20:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.704 2010/08/09 18:06:27 vapier Exp $
+
+  09 Aug 2010; Mike Frysinger <vapier@gentoo.org> glibc-2.11.2.ebuild,
+  glibc-2.12.1.ebuild:
+  Tweak sys-libs/timezone-data dependency based on USE=vanilla #331775 by
+  Alonso Schaich.
 
 *glibc-2.12.1 (05 Aug 2010)
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 3f8f7b79351d..7d9d8fde5935 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -27,10 +27,8 @@ AUX nscd 1621 RMD160 f6d20c4c3814f70d7741f3fa2e0b53ba32c37960 SHA1 5751fe798024c
 AUX nsswitch.conf 503 RMD160 f375f92f6b41029c93382c39cef896261b140cfc SHA1 42f7f5cc3de75c69bf60d806ac8490106ea63326 SHA256 6c38b8642d5da884327ad678d0351d57be3621562253bd9711394bad87e45e2d
 DIST glibc-2.10.1-patches-6.tar.bz2 113352 RMD160 6874a93e993bb082fc4fd23582b5f6bd1044ec28 SHA1 2448fa11229deeaf7a2135510d35bbdbfe9f31e0 SHA256 36a838d5be4fb96f0471d288f172443df28867c301e7790667e1cb57615e6c04
 DIST glibc-2.10.1.tar.bz2 16106243 RMD160 ca102519ab32714e788a0db5dd43c2f9962c86e9 SHA1 cb478cf9d6e2c905a1a4f4a2cae44a320b8dc50b SHA256 cbad3e637eab613184405a87a2bf08a41991a0e512a3ced60d120effc73de667
-DIST glibc-2.11-patches-5.tar.bz2 106033 RMD160 57fc0ebbe7e7abf82af90dd8085a0a61a7c3ac8f SHA1 a03b9071d80a094acafbafa621c0033a100a6b87 SHA256 b628984de9123a33d03180ec53472e2f0209dabeadef9561eceee32f4cd9ecbe
 DIST glibc-2.11.2-patches-3.tar.bz2 104300 RMD160 5f8d0f6616e37fce84b76a185000fb5e4fa155de SHA1 b92296a4c3f51a2cd279cd6b7848ea272c71e821 SHA256 9941fa942afcd6e5224fad04192ffbcc47464965c02196a32067e529d53c504b
 DIST glibc-2.11.2.tar.bz2 15675392 RMD160 15d14fb6b0b58ec3fb7781efa2f8a558fcb99a7e SHA1 23b477f4816a97e007be1e98abc1ffe2af13ba9e SHA256 c2ac76ee363eed31b2a377489fb2818139f4668b5505ad583009eb9b0e228713
-DIST glibc-2.11.tar.bz2 15684114 RMD160 817ed8febe8876602d6fe37983505908046d0925 SHA1 f89c0651ca25423523c872a27b0ccf70f5670b6e SHA256 9ef10e498fac4acc458029898fd8fa76c3cedee1f63d23fedf0c579c505ed62c
 DIST glibc-2.12.1-patches-1.tar.bz2 81747 RMD160 d5d24bf849aeffd3c0e692c1a82ca456dce32557 SHA1 53cbac0f3e07d5644ec91e24d27e9500164efd21 SHA256 fe49200b2de30bf70469a9c910f50e731148d42bb3b070d1e6bf5d93688845cd
 DIST glibc-2.12.1.tar.bz2 15667516 RMD160 4a46745f4220f4253af0b882d0c2072499e17653 SHA1 ef5ca1e765719d3290bd24f94705f27534f3744b SHA256 759f115c52bc12c5bb453af559dcd456d32138250b7cc96e47804e3d0ec97407
 DIST glibc-2.2.5-manpages.tar.bz2 14667 RMD160 4f6e1fde042c19aca4718c8e06e19dc2786a1334 SHA1 7bb5615af98a8b5fb2ef91a47148fedef227c544 SHA256 03850134bd0c670d8b5fe5e3bad0dac2efdb7078ddf69e0dbcdba380f4d5697c
@@ -64,9 +62,8 @@ DIST glibc-ports-2.5.tar.bz2 409372 RMD160 e7e29df135a5f0f72760d10e5ad46de038e40
 DIST glibc-ports-2.6.1.tar.bz2 431292 RMD160 aa6ba7bc58932c81416c3407a8dd0b5e61f5454a SHA1 f620103c8b02ced80a425c79691573f949bf5d6b SHA256 d094028bc6d6691f56b4efeff7cd7e1c7ca10733e0cb5efc36e8fb08d8324bf1
 DIST glibc-ports-2.7.tar.bz2 435392 RMD160 b9b96b357a394f29d5617aaa26a2c000bcf88874 SHA1 2186eac2248f1dd604f20a9dc8215ce12319d273 SHA256 3e481996259af87c3581da23481970a27de679e3c87cfa9a5a59751cd20c7b44
 EBUILD glibc-2.10.1-r1.ebuild 8161 RMD160 b21cba3d443ff63ebb776c9f15959c1e1e660136 SHA1 e08b8a9ef1f33e85912c5a9e70ce5fd885727bcd SHA256 19b9232a48a904243440581472a71f79bae7cc9674d26d875a6ab0b53ccee75d
-EBUILD glibc-2.11-r1.ebuild 8320 RMD160 6dad54929a17f654d0fae162ad1219ee702ac526 SHA1 4dabc2634a5d8a791fe580d08facb33189e0ec0a SHA256 0344b2ca86f354fd751e80bc687c2fa0a2f23c2700e421d30f84c594c2e7f760
-EBUILD glibc-2.11.2.ebuild 8296 RMD160 c0dfff4c8aba568ab0329e03d4f376a972a79cea SHA1 b6ccce682db7dcfaba48a834e6ebb3f2643c47c2 SHA256 d09cb2386e70cdd349bbafd56e7a8a8c9cdc5e68da3b0b74101b060c35956fac
-EBUILD glibc-2.12.1.ebuild 8289 RMD160 120c2d5b7d10c698dcdc2d940da775b62939cb65 SHA1 a1a1e3c59ef8b3d14df5860a550775b1f7aeb598 SHA256 9b08c0e5a5ba559b8cce72eaae721e56c2cdcb85b1d33631e14c38213f70083e
+EBUILD glibc-2.11.2.ebuild 8368 RMD160 c8bdcc47da6d08b97737cea9677463719288ad09 SHA1 4012f75dc4ba3086bf396fc31ee40c9a6ec9d7c1 SHA256 d79abe68ff582c1b4fd220b674682d4aeb37788776b35847ef29b99524764e3d
+EBUILD glibc-2.12.1.ebuild 8358 RMD160 80c58747be5e37c68ebaf757b6a7071f6c544e7f SHA1 e93c570f51ee48277b851ca0d12e992d0b26d72b SHA256 643eaafc3b7a6b9a58f350222df4b4ebdc3dce8f8833bdb63193886f071c3251
 EBUILD glibc-2.2.5-r10.ebuild 4847 RMD160 829dc6d11434ff2d8d202277595b0817b1a9ab28 SHA1 19523459701cabf750a777b17cbe0af34d4688dd SHA256 454a2b5d6201ab615f00c50987c7ac0328d22cc66db582851fcd27e2a967b17f
 EBUILD glibc-2.5-r4.ebuild 38684 RMD160 7cc84f40f23c1b78303a7b38d2579b8fde32efc1 SHA1 509f71b1d4c22105d6c30b5759711cb4a407fae8 SHA256 afe1d1ce196d191712767adf21dfb3c92d2bfc7a3c65e0f9c319d65701c2e6de
 EBUILD glibc-2.5.1.ebuild 38760 RMD160 0dad53d7789c5208233e3539eacba99e0841cbfe SHA1 3c03c80ab88d36bfb7a61e7b04c7e8c2f635aa1c SHA256 4ddf5f33c2de73283c4848787efc8acf5a3c6abc5a343aa553653e7480efca37
@@ -75,12 +72,12 @@ EBUILD glibc-2.7-r2.ebuild 12945 RMD160 8099396dc1820a98341f410e31d7d20c77daa928
 EBUILD glibc-2.8_p20080602-r1.ebuild 13488 RMD160 6b58dc46eb346a67557e5ce6b84a10a3688d649a SHA1 a89f61f4add7950715fedd27a4cc9fb68599f4c1 SHA256 f560d233bb3b0bcdda61fe6d052f54c253d43c9b31f7a2070e9b2f4003131b30
 EBUILD glibc-2.9_p20081201-r2.ebuild 7772 RMD160 ad3a0203d514fea907712ada8a9c3970267aa823 SHA1 690094c7a7b7c5a0b016f41ba519d4ecaa8a1cea SHA256 bb909d9117328ca426af80e6b6d78cb3a96b0efe03d511ead4bf8d62341f42a2
 EBUILD glibc-2.9_p20081201-r3.ebuild 7806 RMD160 6d696692a2e122bfdc149aea75368cea00bce92c SHA1 0df0da8ccd0a95084f849bdb92bfc3389efba74f SHA256 995c0e939cc7146e347d3f8caafbf4ad720a7caa7dfd0a9562f5a2877533a45c
-MISC ChangeLog 127437 RMD160 e0dbdf82e7adba9c6e477b924392d6222847628f SHA1 9aac7c6c7d695e7fca064ceeb5d7afa8064baf00 SHA256 fc6663044747dc3c3926527089173d8ba7da718444ed7b1aa1fd659f9cc167e4
+MISC ChangeLog 127624 RMD160 f696db592580f1293aa83832ede05d9062a27dc6 SHA1 97e8c9299ff42c732d279f30a84fc963b7f53857 SHA256 58b7eda7a48c0cc10836553e8c35ff0e143a3d4f8c3dbe66f708ba17d54101bd
 MISC metadata.xml 539 RMD160 cf4d236b54a77b3cea382d53e4e61721bd14169b SHA1 b54ad589378da193ddc89676f8468c6d1b79521f SHA256 d7cb6dd119c81b5bf12c360af3705ca31a56ffa8bec999b44faa63c183719c31
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkxa8vMACgkQTwhj9JtAlp485gEAonfIm1ChmjNXAsuPMoifmrcR
-rNtIW84QxsgrrXoSd3QA/3w18pF4lopMciLq3g+g6ilnoa7xIwhgZ8zykGAWMr0D
-=XOKA
+iF4EAREIAAYFAkxgQ/wACgkQTwhj9JtAlp46/wD/WWdOdTlMj+UMY1wB5tdPTyP7
+dPieGgUWKmOdMnSpJT0A/0V2K6UnkBKPl8bupHTQzMajCaa0TLMi6PpqgiCUh8B3
+=bJ3m
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.11.2.ebuild b/sys-libs/glibc/glibc-2.11.2.ebuild
index 557fea85776a..ad930091284d 100644
--- a/sys-libs/glibc/glibc-2.11.2.ebuild
+++ b/sys-libs/glibc/glibc-2.11.2.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/sys-libs/glibc/glibc-2.11.2.ebuild,v 1.12 2010/07/30 05:35:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.11.2.ebuild,v 1.13 2010/08/09 18:06:27 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -103,8 +103,10 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
-	DEPEND="${DEPEND} >=sys-libs/timezone-data-2007c"
-	RDEPEND="${RDEPEND} sys-libs/timezone-data"
+	DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )"
+	RDEPEND="${RDEPEND}
+		vanilla? ( !sys-libs/timezone-data )
+		!vanilla? ( sys-libs/timezone-data )"
 fi
 
 SRC_URI=$(
diff --git a/sys-libs/glibc/glibc-2.12.1.ebuild b/sys-libs/glibc/glibc-2.12.1.ebuild
index 4d53f4aaa829..6e37981a8afe 100644
--- a/sys-libs/glibc/glibc-2.12.1.ebuild
+++ b/sys-libs/glibc/glibc-2.12.1.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/sys-libs/glibc/glibc-2.12.1.ebuild,v 1.1 2010/08/05 17:20:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.12.1.ebuild,v 1.2 2010/08/09 18:06:27 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -103,8 +103,10 @@ if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
 	DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )"
 	[[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers"
 else
-	DEPEND="${DEPEND} >=sys-libs/timezone-data-2007c"
-	RDEPEND="${RDEPEND} sys-libs/timezone-data"
+	DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )"
+	RDEPEND="${RDEPEND}
+		vanilla? ( !sys-libs/timezone-data )
+		!vanilla? ( sys-libs/timezone-data )"
 fi
 
 SRC_URI=$(