add support for glibc-ports

Package-Manager: portage-2.1.2.7

3 files changed, 32 insertions, 23 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 1f4fe5933136..2533cf153597 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -460,7 +460,7 @@ DIST glibc-2.4-patches-1.19.tar.bz2 132880 RMD160 6df74db9b9e85220fba82658036ced
 DIST glibc-2.4.tar.bz2 15202445 RMD160 ee2712a0e6fab8e086958c1f23221f8d07af3de1 SHA1 35c636e4b474cda0f06e361d5e9caec092fd73d3 SHA256 27aaaaa78b4ab5da76bb29385dc9be087ba7b855a9102eaaa78ce3ec5e2e7fcd
 DIST glibc-2.5-patches-1.6.tar.bz2 533385 RMD160 4568b467d225b9fc3b5f6cdb93418264271b5150 SHA1 7a8d7826b48219420f6070f763040a1a187de3cc SHA256 11cc15bcdf416f2ecfbee8b444c3485d59a368f02c3a5f7589fe579e12bc5fbe
 DIST glibc-2.5.tar.bz2 15321839 RMD160 25a0a460c0db1e5b7c570e5087461696f2096fd2 SHA1 ec9a007c4875062099a4701ac9137fcdb5a71447 SHA256 9b2e12bb1eafb55ab2e5a868532b8e6ec39216c66c25b8998d7474bc4d4eb529
-DIST glibc-2.6-patches-1.0.tar.bz2 79487 RMD160 b34d4898a4bff0257926656e7a68e3b420eddcb6 SHA1 d197b1309737f8aed64fef823039395fe64dac85 SHA256 ed44292212f65c9fe573fae9089d530a2c6ea0b1f7842f16dceff757fb93eec4
+DIST glibc-2.6-patches-1.1.tar.bz2 83925 RMD160 f582d9ed2aba7d3f292d5f7e64ebf487af9ceac6 SHA1 3c4427b889d3b3bea30cfa9213aa0b8df9d27884 SHA256 8b9f7c5d2bf79e988277f37a220bfccdfb8f7b092cc56ba490b571b7c777ec45
 DIST glibc-2.6.tar.bz2 15637436 RMD160 9f201f54d41941df299ab88722f4095dd417a5e4 SHA1 33a7d9aab6f0a76161d59341273e46d9aae8fc01 SHA256 f773ae5762c193091df46244ce355e38d358e8f8be088be0dbf934a193063bba
 DIST glibc-fedora-20041219T2331.tar.bz2 761998 RMD160 cfc859a7e0a904cfb340c832267d3377e850cf6e SHA1 31e10b882bb9288831e1a1b2ed0ddece7099ffbd SHA256 e36ffa84388ebb746cb80c37d6fd1acc9e45e07b85c30b0a2ad9f511fae59cec
 DIST glibc-infopages-2.3.5.tar.bz2 1273846 RMD160 14a587e5df98ad113fa1499d2a958efbb47c437a SHA1 bb974b6dacd02161532717a9d8f97248acd6da14 SHA256 79a602955e3cf4288fa9967240b397281594acab18c263d2ef864e7d71aa54e1
@@ -480,6 +480,7 @@ DIST glibc-manpages-2.3.5.tar.bz2 22148 RMD160 ecd70af5f77deaa15a1f97df5c9ba6151
 DIST glibc-manpages-2.3.6-1.tar.bz2 22216 RMD160 a69fc155366d1b263acecd026718dc536c2b12b8 SHA1 10b7914a57f6510354b8d325d6ae18ff3547ba79 SHA256 2ba9c7fff2f02f888160dbadd013356fe4a6e9f3d71ac583f5ba6a1d73cb2ab6
 DIST glibc-ports-2.4.tar.bz2 381472 RMD160 72987098f9fbd5a1ad617bf2136081c0db80a429 SHA1 8b4d93bfbcd5b6a36e09ff08fe0c2a08adc1b886 SHA256 2fbbcaad8a9f8560485c398a9066959fe2713c8bc7e653ec476fb56fed21d19a
 DIST glibc-ports-2.5.tar.bz2 409372 RMD160 e7e29df135a5f0f72760d10e5ad46de038e40725 SHA1 7da6257e641759ed29c4d316700fce6f604bc812 SHA256 80c38a005325e7539012bd665fb8e06af9ee9bfc74efb236ebff121265bfd463
+DIST glibc-ports-2.6.tar.bz2 431332 RMD160 275a10d95b5fa34a7c37469468eddbca928fa225 SHA1 ebc15149c8f6f492256cfab585f969a222e2f396 SHA256 398f56ad651939110ad6af88fdd3e92b5cb0583e6f612f2f12ba0134a22b1fac
 DIST glibc-powerpc-cpu-addon-v0.01.tgz 22422 RMD160 3483c94ec55819b36aa66fc60462317f8d15e4df SHA1 fd30cde7c7cb42baa2c8fa1ac88eeeeb509cac29 SHA256 0ffa9a432fffb9bfed99c529b631a27534ba848c7ec1d707732338b73a4a8ce9
 EBUILD glibc-2.2.5-r10.ebuild 4848 RMD160 ff477ac3838c642e486519921752fe5875258568 SHA1 ddee65186695b9edda104c90e20ee3251652bdbb SHA256 e46bd0faae0a206619506c37c4c87d2b50664321b8daf16a3d3d5c53721fc865
 MD5 3d4415031faaf438ed2a135f1f79409a glibc-2.2.5-r10.ebuild 4848
@@ -505,10 +506,10 @@ EBUILD glibc-2.5-r2.ebuild 38678 RMD160 78926527597f48be31b97b7009eb03eb9510c924
 MD5 570bc2ee7037348dce766832ef5ad170 glibc-2.5-r2.ebuild 38678
 RMD160 78926527597f48be31b97b7009eb03eb9510c924 glibc-2.5-r2.ebuild 38678
 SHA256 d6ace8ba4075875eb0c7ad330a014130af431f611763ac20daa41ffc0334e634 glibc-2.5-r2.ebuild 38678
-EBUILD glibc-2.6.ebuild 38621 RMD160 6ddf474b0c14757d41b70b536a80f7e01383ceec SHA1 81bb1ba60572d91d241b42d8a6e0a49d03486370 SHA256 947bd0eb1c2bd24162e6de3a22285d957127d34760737401bbe5a49d6f6f8f65
-MD5 19b5c108e6b555649c039dc5982e4392 glibc-2.6.ebuild 38621
-RMD160 6ddf474b0c14757d41b70b536a80f7e01383ceec glibc-2.6.ebuild 38621
-SHA256 947bd0eb1c2bd24162e6de3a22285d957127d34760737401bbe5a49d6f6f8f65 glibc-2.6.ebuild 38621
+EBUILD glibc-2.6.ebuild 38772 RMD160 99c6e6c12b136e43bac3821b9360082655ca6ca8 SHA1 69cc9f343e5baf82e3aac7c51782482b84ea3e50 SHA256 dd031f6651804827575ecddcf580a0caeeb9b4c1edc8f561c175de5390c88893
+MD5 15860d09eeb35ba4d986c5bd575efe14 glibc-2.6.ebuild 38772
+RMD160 99c6e6c12b136e43bac3821b9360082655ca6ca8 glibc-2.6.ebuild 38772
+SHA256 dd031f6651804827575ecddcf580a0caeeb9b4c1edc8f561c175de5390c88893 glibc-2.6.ebuild 38772
 MISC ChangeLog 101240 RMD160 386c3d9a978cf95ca9e4ecc3f01a6d3c9f45afaf SHA1 d163c88a46f821224f1428def479f844a683fff0 SHA256 22838c026d0dd82b274db842489b00629100874c1e4ad380aff5ad56831e76b6
 MD5 a2cee00af3ce0630157541a03b62eacf ChangeLog 101240
 RMD160 386c3d9a978cf95ca9e4ecc3f01a6d3c9f45afaf ChangeLog 101240
@@ -535,13 +536,13 @@ SHA256 a49f96d87bda9dfbe73ac717c2a1dea7b4715c9c2e6031f404e3d7ee1209efea files/di
 MD5 bad11563ceda904710ef26f3c5377425 files/digest-glibc-2.5-r2 1280
 RMD160 d53b528ead8d76bfc42d9b51142058a2994e6d7f files/digest-glibc-2.5-r2 1280
 SHA256 bf7dd47ded105b17eff75fa0be15cec59e3fdb1809fb541f9ff492ea3e0d50aa files/digest-glibc-2.5-r2 1280
-MD5 93ccde17571ea62df86a19b79756c84d files/digest-glibc-2.6 756
-RMD160 27389b45285d97060f3efdf7e598104e59c47764 files/digest-glibc-2.6 756
-SHA256 38a853a0dc56b87d23f58e8dc193ae192956c4d3cfb321031cdf4f49d07e7281 files/digest-glibc-2.6 756
+MD5 002c38c36b10791e5e0aab97637eab28 files/digest-glibc-2.6 1006
+RMD160 0248c0c39189846f36bb0143df442e4e313a97f1 files/digest-glibc-2.6 1006
+SHA256 d7fd4b113a5a79210569f2942e6daa6d4809a71dcce490c490adba39cfd75b25 files/digest-glibc-2.6 1006
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGTqbJ8bi6rjpTunYRAgE0AJwM6zoGDUbcfwB905ymDTrZvhMb1wCgtL54
-d41LaABJBh8PmE99TWWFcys=
-=HmeI
+iD8DBQFGVMXE8bi6rjpTunYRAlmHAKCJlsVZXCm9WjsMZAsLJcHRln1plwCgtAeO
+loUgpj5T95ww9WJtTxSd7n4=
+=u/Ye
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/digest-glibc-2.6 b/sys-libs/glibc/files/digest-glibc-2.6
index d089cb13fdac..e47935612ddb 100644
--- a/sys-libs/glibc/files/digest-glibc-2.6
+++ b/sys-libs/glibc/files/digest-glibc-2.6
@@ -1,9 +1,12 @@
-MD5 7583065c0f45727e0ac60c31bf784efb glibc-2.6-patches-1.0.tar.bz2 79487
-RMD160 b34d4898a4bff0257926656e7a68e3b420eddcb6 glibc-2.6-patches-1.0.tar.bz2 79487
-SHA256 ed44292212f65c9fe573fae9089d530a2c6ea0b1f7842f16dceff757fb93eec4 glibc-2.6-patches-1.0.tar.bz2 79487
+MD5 f9bb53ad1473db626e6ee81d65a8e6b2 glibc-2.6-patches-1.1.tar.bz2 83925
+RMD160 f582d9ed2aba7d3f292d5f7e64ebf487af9ceac6 glibc-2.6-patches-1.1.tar.bz2 83925
+SHA256 8b9f7c5d2bf79e988277f37a220bfccdfb8f7b092cc56ba490b571b7c777ec45 glibc-2.6-patches-1.1.tar.bz2 83925
 MD5 0f471d7cb29dd07786082ad23f787949 glibc-2.6.tar.bz2 15637436
 RMD160 9f201f54d41941df299ab88722f4095dd417a5e4 glibc-2.6.tar.bz2 15637436
 SHA256 f773ae5762c193091df46244ce355e38d358e8f8be088be0dbf934a193063bba glibc-2.6.tar.bz2 15637436
 MD5 ed20ad629986c2746c77cda46fb0602c glibc-libidn-2.6.tar.bz2 101974
 RMD160 f4ee5fff7ff2c500c08e47390b88f77898314cf4 glibc-libidn-2.6.tar.bz2 101974
 SHA256 25adf6cf0de727bf02978192baddf8cbc77adfbacf15e1428163fbeb267b1862 glibc-libidn-2.6.tar.bz2 101974
+MD5 4b2b2b4a445b12d4ab9ef709b3fe267f glibc-ports-2.6.tar.bz2 431332
+RMD160 275a10d95b5fa34a7c37469468eddbca928fa225 glibc-ports-2.6.tar.bz2 431332
+SHA256 398f56ad651939110ad6af88fdd3e92b5cb0583e6f612f2f12ba0134a22b1fac glibc-ports-2.6.tar.bz2 431332
diff --git a/sys-libs/glibc/glibc-2.6.ebuild b/sys-libs/glibc/glibc-2.6.ebuild
index 50732fbdb440..8761f42b2f83 100644
--- a/sys-libs/glibc/glibc-2.6.ebuild
+++ b/sys-libs/glibc/glibc-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.6.ebuild,v 1.1 2007/05/19 07:26:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.6.ebuild,v 1.2 2007/05/23 22:52:37 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -16,7 +16,7 @@
 #  CHOST = CTARGET  - install into /
 #  CHOST != CTARGET - install into /usr/CTARGET/
 
-KEYWORDS="" #~alpha ~amd64 -arm -hppa ~ia64 -mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="" #DO NOT KEYWORD; WAIT FOR 2.6.1 ~alpha ~amd64 ~arm -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 BRANCH_UPDATE=""
 
@@ -27,7 +27,7 @@ GLIBC_MANPAGE_VERSION="none"
 GLIBC_INFOPAGE_VERSION="none"
 
 # Gentoo patchset
-PATCH_VER="1.0"
+PATCH_VER="1.1"
 
 GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo"
 GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc/XXX http://dev.gentoo.org/~vapier/dist/XXX"
@@ -64,7 +64,7 @@ GLIBC_RELEASE_VER=$(get_version_component_range 1-3)
 # Don't set this to :-, - allows BRANCH_UPDATE=""
 BRANCH_UPDATE=${BRANCH_UPDATE-$(get_version_component_range 4)}
 GLIBC_PORTS_VER=${GLIBC_RELEASE_VER}
-#GLIBC_LT_VER=${GLIBC_RELEASE_VER}
+GLIBC_LT_VER=""
 
 # (Recent snapshots fails with 2.6.5 and earlier with NPTL)
 NPTL_KERNEL_VERSION=${NPTL_KERNEL_VERSION:-"2.6.9"}
@@ -117,8 +117,12 @@ get_glibc_src_uri() {
 
 	GLIBC_SRC_URI="mirror://gnu/glibc/glibc-${GLIBC_RELEASE_VER}.tar.bz2
 	               mirror://gnu/glibc/glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2"
-	#               mirror://gnu/glibc/glibc-ports-${GLIBC_PORTS_VER}.tar.bz2
-	#               ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-${GLIBC_PORTS_VER}.tar.bz2
+
+	if [[ -n ${GLIBC_PORTS_VER} ]] ; then
+		GLIBC_SRC_URI="${GLIBC_SRC_URI}
+			mirror://gnu/glibc/glibc-ports-${GLIBC_PORTS_VER}.tar.bz2
+			ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-${GLIBC_PORTS_VER}.tar.bz2"
+	fi
 
 	if [[ -n ${BRANCH_UPDATE} ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI}
@@ -170,8 +174,8 @@ toolchain-glibc_src_unpack() {
 
 	cd "${S}"
 	[[ -n ${GLIBC_LT_VER} ]] && unpack glibc-linuxthreads-${GLIBC_LT_VER}.tar.bz2
+	[[ -n ${GLIBC_PORTS_VER} ]] && unpack_addon ports ${GLIBC_PORTS_VER}
 	unpack_addon libidn
-	#unpack_addon ports ${GLIBC_PORTS_VER}
 
 	if [[ -n ${PATCH_VER} ]] ; then
 		cd "${WORKDIR}"
@@ -277,9 +281,10 @@ toolchain-glibc_headers_compile() {
 	cd "${GBUILDDIR}"
 
 	# Pick out the correct location for build headers
-	local myconf="--disable-sanity-checks --enable-hacker-mode"
+	local ports="" myconf="--disable-sanity-checks --enable-hacker-mode"
+	[[ -n ${GLIBC_PORTS_VER} ]] && ports=",ports"
 	myconf="${myconf}
-		--enable-add-ons=nptl,ports
+		--enable-add-ons=nptl${ports}
 		--without-cvs
 		--enable-bind-now
 		--build=${CBUILD_OPT:-${CBUILD}}