simplify get_glibc_src_uri and add support for the powerpc cpu addon #130575

Package-Manager: portage-2.1_pre9-r1

3 files changed, 41 insertions, 39 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 688f4827a802..188e9af197f4 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a SHA1 d1dceb79689e9c627ebd630389ec1948d7a0a6e4 SHA256 0bc07eb47578d5bfb98774b18bf07aee2af44a7ccd947602c223b34e0d88394a size 2823
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
@@ -479,6 +476,7 @@ DIST glibc-manpages-2.3.4.tar.bz2 14759 RMD160 56a648a9eb327568c0e6681aaa47a5c7b
 DIST glibc-manpages-2.3.5.tar.bz2 22148 RMD160 ecd70af5f77deaa15a1f97df5c9ba6151e988d86 SHA256 b49a5cf3996e2671bc8246c9a077016b7d74cdbb8a4f6a6410247fcbe34d2b5a size 22148
 DIST glibc-manpages-2.3.6-1.tar.bz2 22216 RMD160 a69fc155366d1b263acecd026718dc536c2b12b8 SHA256 2ba9c7fff2f02f888160dbadd013356fe4a6e9f3d71ac583f5ba6a1d73cb2ab6 size 22216
 DIST glibc-ports-2.4.tar.bz2 381472 RMD160 72987098f9fbd5a1ad617bf2136081c0db80a429 SHA256 2fbbcaad8a9f8560485c398a9066959fe2713c8bc7e653ec476fb56fed21d19a size 381472
+DIST glibc-powerpc-cpu-addon-v0.01.tgz 22422 RMD160 3483c94ec55819b36aa66fc60462317f8d15e4df SHA256 0ffa9a432fffb9bfed99c529b631a27534ba848c7ec1d707732338b73a4a8ce9 size 22422
 EBUILD glibc-2.2.5-r10.ebuild 4523 RMD160 79112cc28a9e912d28026684c1f2a608d2bb0eb2 SHA1 de89feedd5c50110034da08a633a384e8adb61d5 SHA256 fb0b2e6b10af9bffc5ad734397404cfe6cd164a4fba17a07837e96c7a99f42ab size 4523
 MD5 f8bf77d5057759d82db6401f9ff5211c glibc-2.2.5-r10.ebuild 4523
 RMD160 79112cc28a9e912d28026684c1f2a608d2bb0eb2 glibc-2.2.5-r10.ebuild 4523
@@ -547,10 +545,10 @@ EBUILD glibc-2.4-r1.ebuild 42520 RMD160 6d415e820c41377d4ba87f2f863b2fa8c5ae832f
 MD5 8ac989868b7b6924964020838212c914 glibc-2.4-r1.ebuild 42520
 RMD160 6d415e820c41377d4ba87f2f863b2fa8c5ae832f glibc-2.4-r1.ebuild 42520
 SHA256 068f139a387f74eb44b364e1057ce7dca634938d00d2493f48473d7a350feebc glibc-2.4-r1.ebuild 42520
-EBUILD glibc-2.4-r2.ebuild 37563 RMD160 77dcf890e626f2ec3ff9404ff34b2b75b943aa1e SHA1 12ddf8c9dcd1941a8da83a904431e2a59192caf0 SHA256 06871b6265a9f1f7b6fd58b9daa9400da1a87ad6e86f22d273606bfaa2ab80b7 size 37563
-MD5 6257d7ca76a8afbc8aa20584e0ea687f glibc-2.4-r2.ebuild 37563
-RMD160 77dcf890e626f2ec3ff9404ff34b2b75b943aa1e glibc-2.4-r2.ebuild 37563
-SHA256 06871b6265a9f1f7b6fd58b9daa9400da1a87ad6e86f22d273606bfaa2ab80b7 glibc-2.4-r2.ebuild 37563
+EBUILD glibc-2.4-r2.ebuild 37895 RMD160 2b4c6f683c5db1cdcb007d5809185c30a9eab03b SHA1 541d0d361f92a5750173af3955f6493fa86a4bbe SHA256 0a12f6f7cd1b1fbef157b987330263521250a5c7da5d0a58f5adbb8619646a98 size 37895
+MD5 67a212ee5d140c3740c3200552ccd313 glibc-2.4-r2.ebuild 37895
+RMD160 2b4c6f683c5db1cdcb007d5809185c30a9eab03b glibc-2.4-r2.ebuild 37895
+SHA256 0a12f6f7cd1b1fbef157b987330263521250a5c7da5d0a58f5adbb8619646a98 glibc-2.4-r2.ebuild 37895
 MISC ChangeLog 91644 RMD160 f2b6032dae413c922a5c66ddcbd78e9472b3a33d SHA1 260472314c99a7f161d2c6a2d995df9777083be0 SHA256 6183ba3c3c9e14b875ed0352983ff615588911b9f9c57de44bddbadd40369a43 size 91644
 MD5 81980b9fdc84b5a369639d9145d83e93 ChangeLog 91644
 RMD160 f2b6032dae413c922a5c66ddcbd78e9472b3a33d ChangeLog 91644
@@ -627,14 +625,7 @@ MD5 7f238701dc80be184d3b46a3babaee2b files/digest-glibc-2.4-r1 1292
 RMD160 2973b76f09f44d280289e9dec583f88ee4c636b2 files/digest-glibc-2.4-r1 1292
 SHA256 2cee383fdb2b7f9d72d4a87fcc9ae92e952f2c5bdf5cf940054bc52cf27df25e files/digest-glibc-2.4-r1 1292
 size 1292 files/digest-glibc-2.4-r1 1292
-MD5 a1ba4459bc4cf2f57db3ac008bcaa7a6 files/digest-glibc-2.4-r2 1292
-RMD160 572986ee26cf0b1d29c6bedf71bd94b048658e31 files/digest-glibc-2.4-r2 1292
-SHA256 ca72e1129a94004d6b0cac4899c1ce754c7fdd99aeebe998fa00fa6d377291c1 files/digest-glibc-2.4-r2 1292
-size 1292 files/digest-glibc-2.4-r2 1292
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFERYnp2+ySkm8kpY0RAkIjAJoDf/qTlGyKVyHlDBoUzZ3MRXf8YACgpgA4
-xi14N6JM0EfOcMY7FmXImUc=
-=Mrlc
------END PGP SIGNATURE-----
+MD5 fd8122937b645a3a64c7a28293ef36b7 files/digest-glibc-2.4-r2 1569
+RMD160 9c3c55f33ed6a57f40ef0adb36eb5a43f2cc50b7 files/digest-glibc-2.4-r2 1569
+SHA256 135947d568535100cb005bd702affb3e62cf41068cee0c85d1720fcfcefd8593 files/digest-glibc-2.4-r2 1569
+size 1569 files/digest-glibc-2.4-r2 1569
diff --git a/sys-libs/glibc/files/digest-glibc-2.4-r2 b/sys-libs/glibc/files/digest-glibc-2.4-r2
index 90d0490916b6..18ae90af77db 100644
--- a/sys-libs/glibc/files/digest-glibc-2.4-r2
+++ b/sys-libs/glibc/files/digest-glibc-2.4-r2
@@ -13,3 +13,6 @@ SHA256 2f29ec2b2b2f75f787a1eed8fdea20aff212dc3bad97651ca376914c49181977 glibc-li
 MD5 7bb1b35654e94994925e66676acabd4e glibc-ports-2.4.tar.bz2 381472
 RMD160 72987098f9fbd5a1ad617bf2136081c0db80a429 glibc-ports-2.4.tar.bz2 381472
 SHA256 2fbbcaad8a9f8560485c398a9066959fe2713c8bc7e653ec476fb56fed21d19a glibc-ports-2.4.tar.bz2 381472
+MD5 f576b5601b86a89165c17fdddb92d1cc glibc-powerpc-cpu-addon-v0.01.tgz 22422
+RMD160 3483c94ec55819b36aa66fc60462317f8d15e4df glibc-powerpc-cpu-addon-v0.01.tgz 22422
+SHA256 0ffa9a432fffb9bfed99c529b631a27534ba848c7ec1d707732338b73a4a8ce9 glibc-powerpc-cpu-addon-v0.01.tgz 22422
diff --git a/sys-libs/glibc/glibc-2.4-r2.ebuild b/sys-libs/glibc/glibc-2.4-r2.ebuild
index 39164b9ef09c..4ad357c3a2ab 100644
--- a/sys-libs/glibc/glibc-2.4-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r2.ebuild,v 1.12 2006/04/19 00:49:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r2.ebuild,v 1.13 2006/04/20 23:06:53 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -35,8 +35,14 @@ FEDORA_VER="20060306T1239"
 FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
 FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}"
 
+# PPC cpu addon
+# http://penguinppc.org/dev/glibc/glibc-powerpc-cpu-addon.html
+PPC_CPU_ADDON_VER="0.01"
+PPC_CPU_ADDON_TARBALL="glibc-powerpc-cpu-addon-v${PPC_CPU_ADDON_VER}.tgz"
+PPC_CPU_ADDON_URI="http://penguinppc.org/dev/glibc/${PPC_CPU_ADDON_TARBALL}"
+
 GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo"
-GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc"
+GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc/XXX http://dev.gentoo.org/~vapier/dist/XXX"
 
 ### PUNT OUT TO ECLASS?? ###
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
@@ -126,39 +132,30 @@ get_glibc_src_uri() {
 
 	if [[ -n ${BRANCH_UPDATE} ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
-		[[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] &&
-			GLIBC_SRC_URI="${GLIBC_SRC_URI}
-				${GENTOO_TOOLCHAIN_DEV_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2"
+			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
+			${GENTOO_TOOLCHAIN_DEV_URI//XXX/glibc-${GLIBC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2}"
 	fi
 
 	if [[ -n ${PATCH_VER} ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2"
-		[[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] &&
-			GLIBC_SRC_URI="${GLIBC_SRC_URI}
-				${GENTOO_TOOLCHAIN_DEV_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2"
+			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
+			${GENTOO_TOOLCHAIN_DEV_URI//XXX/glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2}"
 	fi
 
 	if [[ ${GLIBC_MANPAGE_VERSION} != "none" ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
-		[[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] &&
-			GLIBC_SRC_URI="${GLIBC_SRC_URI}
-				${GENTOO_TOOLCHAIN_DEV_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
+			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
+			${GENTOO_TOOLCHAIN_DEV_URI//XXX/glibc-manpages-${GLIBC_MANPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2}"
 	fi
 
 	if [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI}
-			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
-		[[ -n ${GENTOO_TOOLCHAIN_DEV_URI} ]] &&
-			GLIBC_SRC_URI="${GLIBC_SRC_URI}
-				${GENTOO_TOOLCHAIN_DEV_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
+			${GENTOO_TOOLCHAIN_BASE_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2
+			${GENTOO_TOOLCHAIN_DEV_URI//XXX/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2}"
 	fi
 
-	if [[ -n ${FEDORA_URI} ]] ; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}"
-	fi
+	GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}"
+	GLIBC_SRC_URI="${GLIBC_SRC_URI} ${PPC_CPU_ADDON_URI}"
 
 	echo "${GLIBC_SRC_URI}"
 }
@@ -187,6 +184,10 @@ toolchain-glibc_src_unpack() {
 		cd "${S}"
 		rm -r "${WORKDIR}"/fedora
 	fi
+	if [[ -n ${PPC_CPU_ADDON_TARBALL} ]] ; then
+		cd "${S}"
+		unpack ${PPC_CPU_ADDON_TARBALL}
+	fi
 
 	if [[ -n ${PATCH_VER} ]] ; then
 		cd "${WORKDIR}"
@@ -837,6 +838,13 @@ glibc_do_configure() {
 		-e '/^,\*$/d')
 	popd > /dev/null
 
+	if [[ -n ${PPC_CPU_ADDON_VER} ]] && [[ $(tc-arch) == ppc* ]] ; then
+		ADDONS="${ADDONS},powerpc-cpu"
+		case $(get-flag mcpu) in
+			970|power4|power5|power5+) myconf="${myconf} --with-cpu=$(get-flag mcpu)"
+		esac
+	fi
+
 	use nls || myconf="${myconf} --disable-nls"
 	myconf="${myconf} $(use_enable hardened stackguard-randomization)"
 	if [[ $(<"${T}"/.ssp.compat) == "yes" ]] ; then