Punt Fedora tarballs in favor of packaging c_stubs/glibc-compat ourselves #138028 by je_fro.

Package-Manager: portage-2.1.1_pre1-r2

6 files changed, 56 insertions, 72 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 5a81c5ae3a91..6280beeb2955 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.466 2006/06/25 21:35:01 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.467 2006/06/27 00:02:23 vapier Exp $
+
+  27 Jun 2006; Mike Frysinger <vapier@gentoo.org> glibc-2.3.6-r4.ebuild,
+  glibc-2.4-r3.ebuild:
+  Punt Fedora tarballs in favor of packaging c_stubs/glibc-compat ourselves
+  #138028 by je_fro.
 
   25 Jun 2006; Guy Martin <gmsoft@gentoo.org> glibc-2.3.6-r4.ebuild:
   Stable on hppa.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 95cb3772df6b..dd1c0ac94395 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,3 +1,6 @@
+-----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
 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
@@ -444,13 +447,12 @@ DIST glibc-2.3.4.tar.bz2 13213560 RMD160 bb2bc1669de7c7b08903be5767753f75709e98c
 DIST glibc-2.3.5-patches-1.13.tar.bz2 24793 RMD160 1940f068e05222738a95baa566a0da78ca8eb3ab SHA256 167da2eba108780b54e6f6ec8e9c2f4caf30eb65121e916c6d8813bbb46a2216
 DIST glibc-2.3.5-patches-1.16.tar.bz2 28401 RMD160 ef56df1c2ed60df01b027f805755463a834f3760 SHA1 bf72729c0b2c7deda2314e88d3b619d28a3d3b95 SHA256 371dfd8f8dfc90be4fdd8057fb58090119db95d26aa550ac1a7b3bcc828e754b
 DIST glibc-2.3.5.tar.bz2 13583139 RMD160 ebdda60cd848fd5b30b5e3345fb481d3c5663540 SHA1 465cb1f4708dfa88606379cc1ebecb724c65f027 SHA256 de97b9c15d75ac86b7a079a20315100a5c9833bb3c217b448913041a5bd988a5
-DIST glibc-2.3.6-patches-1.15.tar.bz2 154688 RMD160 46247c4b55a12d3e82d666564217e06f7ef772f4 SHA1 77e3a3e9fe6649edebc82254aa69968c3324183b SHA256 ec4f09e040820b9c77efe4347ff6f12a24df777a179af2618a6c3abe059c148e
+DIST glibc-2.3.6-patches-1.16.tar.bz2 215499 RMD160 b84a693c3de85f47b7c4d5029ec4745d95e68513 SHA1 72e153cb6c8308bd536c886eeb588f756559c835 SHA256 28f562f1fb97c3be4141c4090475dfce0a2f6af968cbbe392a77eb9584eb52c0
 DIST glibc-2.3.6-patches-1.8.tar.bz2 132799 RMD160 fe94d79a0cd6ca8e860924fc3daafe550faa4244 SHA1 06e2242274a338821f327b4921b94988006685a6 SHA256 8a96a2fcd6800ab47f23d669fc9752978e0bfc0ff5f634351ae49a33c7a0060e
 DIST glibc-2.3.6.tar.bz2 14014977 RMD160 04b4f71cc3e89581e02ee2dbf5ab05f61e868bf1 SHA1 82d0487419f1bdbf2dee439c344e89d6af47e558 SHA256 e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e
-DIST glibc-2.4-patches-1.16.tar.bz2 119684 RMD160 50113638e5a00da169862fb44b3d5d5cc6288cf7 SHA1 2fbe74b656d569fc05b3a91b5aff69ea55332eb4 SHA256 8ac49492575e66c037629ee3f23c2c1729b700a05f28d55565c946ccf18e840a
+DIST glibc-2.4-patches-1.17.tar.bz2 179314 RMD160 a537434c85cb9bd96c77f0bfeba8d7134f54d7ff SHA1 209e89b54aa70a6a785d9b8abbe07372741fe3cf SHA256 255c900f4b9e24e65ecefc6e65040a15122901f2482f98e29b1e361cb2d4faa9
 DIST glibc-2.4.tar.bz2 15202445 RMD160 ee2712a0e6fab8e086958c1f23221f8d07af3de1 SHA1 35c636e4b474cda0f06e361d5e9caec092fd73d3 SHA256 27aaaaa78b4ab5da76bb29385dc9be087ba7b855a9102eaaa78ce3ec5e2e7fcd
 DIST glibc-fedora-20041219T2331.tar.bz2 761998 RMD160 cfc859a7e0a904cfb340c832267d3377e850cf6e SHA1 31e10b882bb9288831e1a1b2ed0ddece7099ffbd SHA256 e36ffa84388ebb746cb80c37d6fd1acc9e45e07b85c30b0a2ad9f511fae59cec
-DIST glibc-fedora-20060501T0751.tar.bz2 727641 RMD160 4f6eeeac6f315a26c1a64f2c35587eca9106ef2d SHA1 2efa5c82e7aaa6c381664cc308db2f3cee5ddb73 SHA256 cfba2cded39fbd42643eaa1f1795221e0b11a503beec7d66ba31f3728526efec
 DIST glibc-hppa-patches-2004-06-04.tar.gz 9528 RMD160 df2b086cac83979033f274ccfe2b58e67ae73d0c SHA256 6efebc08997ff83487058f443c009417c646d756b55d760e4192748aa8dacf2e
 DIST glibc-hppa-patches-2004-08-24.tar.gz 9739 RMD160 1956d3d0e11c892521db1607699fadbd3bed9f9d SHA256 0254e1febd00a79674861f5523628b0ba08bc69259f98b5cde3655ce1c677c89
 DIST glibc-hppa-patches-2004-09-30.tar.gz 16407 RMD160 0f418fbe70ee7e0f8ecda56e09fce5c41a7609bf SHA256 14330b2429df38d86b0ca470155111a4add2563ce593c1e0e2adecb6d6a44e81
@@ -518,18 +520,18 @@ EBUILD glibc-2.3.6-r3.ebuild 42710 RMD160 5a6ba9bd1e2c6a47115fac3a1ec67da9db06b6
 MD5 c2e89fc966f597b9a2fc19e0168e28f4 glibc-2.3.6-r3.ebuild 42710
 RMD160 5a6ba9bd1e2c6a47115fac3a1ec67da9db06b684 glibc-2.3.6-r3.ebuild 42710
 SHA256 8965552b0fe2b092bb26ea191c89c8704ca3943a5c523377befb69f9a4c9d2e5 glibc-2.3.6-r3.ebuild 42710
-EBUILD glibc-2.3.6-r4.ebuild 37073 RMD160 94ea236e0ca619da33199e19a7aac0c1375ab1af SHA1 0734a13687e0b0e14184b370876b2da365430c72 SHA256 d325b1a72c80406475b91461d4cad622b7039801e0270abbabdbfd6166b22be0
-MD5 1ecf07d3b1230552dc98d8c489e6c0f9 glibc-2.3.6-r4.ebuild 37073
-RMD160 94ea236e0ca619da33199e19a7aac0c1375ab1af glibc-2.3.6-r4.ebuild 37073
-SHA256 d325b1a72c80406475b91461d4cad622b7039801e0270abbabdbfd6166b22be0 glibc-2.3.6-r4.ebuild 37073
-EBUILD glibc-2.4-r3.ebuild 38586 RMD160 8d63ddb2918ebfd2158e2ed7775093200a984532 SHA1 117af550f8c730fa775a9fee06f8dced756aadb9 SHA256 7ba418a5b9fc23b05e09d549ab98d41ed92f9b8ef068ccb58e9d947323ff7a8d
-MD5 e38164751f87e77f9e7bf67aecf7e8d4 glibc-2.4-r3.ebuild 38586
-RMD160 8d63ddb2918ebfd2158e2ed7775093200a984532 glibc-2.4-r3.ebuild 38586
-SHA256 7ba418a5b9fc23b05e09d549ab98d41ed92f9b8ef068ccb58e9d947323ff7a8d glibc-2.4-r3.ebuild 38586
-MISC ChangeLog 94487 RMD160 a4b71650f37729766810ebc380f30e853c7fd291 SHA1 b64c61c22d4baa4563f279e5f3970a238d95b7a9 SHA256 2c271589f113c9a54eb06925a92897411a8bf901a7e07467b92817b106493ebf
-MD5 11ae07b553822cc44442463fa5f8b267 ChangeLog 94487
-RMD160 a4b71650f37729766810ebc380f30e853c7fd291 ChangeLog 94487
-SHA256 2c271589f113c9a54eb06925a92897411a8bf901a7e07467b92817b106493ebf ChangeLog 94487
+EBUILD glibc-2.3.6-r4.ebuild 36652 RMD160 30eb3472b02e3833f439242f1ddccdc5613e26b1 SHA1 6e610dbe8aeee5b12f9a45fe328d8d08c1bca8af SHA256 28c2d442f33217199093217f78cd0aa84ddf2d33671c8a26626aee80f81c1914
+MD5 ca559a804c59ef059a7b2039bb910644 glibc-2.3.6-r4.ebuild 36652
+RMD160 30eb3472b02e3833f439242f1ddccdc5613e26b1 glibc-2.3.6-r4.ebuild 36652
+SHA256 28c2d442f33217199093217f78cd0aa84ddf2d33671c8a26626aee80f81c1914 glibc-2.3.6-r4.ebuild 36652
+EBUILD glibc-2.4-r3.ebuild 38167 RMD160 6caf8a91bb880163d280f124b3f8f6b10be09972 SHA1 38e20fca46e7f144e3853fd1fba0047d2928ba02 SHA256 19775adc10c46de4c72ff40b6e5b111c2afc96dccca1554436e161a92aa02ec3
+MD5 e8cf15ad9923bd44b0ef7fae24ea0efb glibc-2.4-r3.ebuild 38167
+RMD160 6caf8a91bb880163d280f124b3f8f6b10be09972 glibc-2.4-r3.ebuild 38167
+SHA256 19775adc10c46de4c72ff40b6e5b111c2afc96dccca1554436e161a92aa02ec3 glibc-2.4-r3.ebuild 38167
+MISC ChangeLog 94681 RMD160 3fa6b8fee8840b64dc34bb34312f26ed5a5d765f SHA1 ebeb2abe91553017724a1d1ad2887b766158dc8b SHA256 1824c864a822aede1b8f9b15e4ec7e29f2ba265cb592e5d741fe053b953c901f
+MD5 86da924e8cd881ec79448c5bfba4a2bb ChangeLog 94681
+RMD160 3fa6b8fee8840b64dc34bb34312f26ed5a5d765f ChangeLog 94681
+SHA256 1824c864a822aede1b8f9b15e4ec7e29f2ba265cb592e5d741fe053b953c901f ChangeLog 94681
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -567,9 +569,16 @@ SHA256 77ccc09d56cf5a8b4a7c2d847eb28074668e0319777e632be7a1c29e33a7db5c files/di
 MD5 a9b2d44d0396a4996c59e30664cd3643 files/digest-glibc-2.3.6-r3 1876
 RMD160 cc9d6cfcd8541c7dc518560eb50dfd8c61f98ab8 files/digest-glibc-2.3.6-r3 1876
 SHA256 8ec9b852e961654f255e4ae73c2fcc51482fb1b0519834688dba4614f8353216 files/digest-glibc-2.3.6-r3 1876
-MD5 ece73584aa4db4b63b0f6c2559e6d338 files/digest-glibc-2.3.6-r4 1879
-RMD160 94e7d5df3f008d67356ea35052d88423d60a8352 files/digest-glibc-2.3.6-r4 1879
-SHA256 97fb02c2d62a62f388a1163abbc48421d18e616c9d7f0b4958cb1cbe183eaa16 files/digest-glibc-2.3.6-r4 1879
-MD5 193e535eb948bafc6a5c18460c1bb77a files/digest-glibc-2.4-r3 1858
-RMD160 e076ff904f555d1ea36dfa12360ad9bc40fc4057 files/digest-glibc-2.4-r3 1858
-SHA256 82cd6a40536b3dbf5edaffbff0756504cb2729e671cdc167c9a77f0edb17bf25 files/digest-glibc-2.4-r3 1858
+MD5 adc2dda23b88604f4f9a97907f2ba96d files/digest-glibc-2.3.6-r4 1596
+RMD160 508aab3efcce30ab2ea2e0d108ea35111fff8f85 files/digest-glibc-2.3.6-r4 1596
+SHA256 8fdefc1e339f41e75899b11a02b1068d84afd742fbf992ac13bb433ef39cf974 files/digest-glibc-2.3.6-r4 1596
+MD5 0839b75709d53cb72b9a3f6039d220a5 files/digest-glibc-2.4-r3 1575
+RMD160 c82aed2e0f3f556b051d7e3a1fc13c202f67bf2f files/digest-glibc-2.4-r3 1575
+SHA256 f22d43e9647ef7c83b51e5102caaca7e38b3d16783e6097b1a3cbe4b0957070e files/digest-glibc-2.4-r3 1575
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEoHbhamhnQswr0vIRAs/dAJwNMdkiwZDdTP/cvX54OXBKpUD7twCeKnzn
+pRHcvXqz0j+oOZhRovsVaKU=
+=zz0o
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.6-r4 b/sys-libs/glibc/files/digest-glibc-2.3.6-r4
index c3ea299b5b1c..ad1476604c08 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.6-r4
+++ b/sys-libs/glibc/files/digest-glibc-2.3.6-r4
@@ -1,12 +1,9 @@
-MD5 a6815507e9262cbbd4e10ce437b40a53 glibc-2.3.6-patches-1.15.tar.bz2 154688
-RMD160 46247c4b55a12d3e82d666564217e06f7ef772f4 glibc-2.3.6-patches-1.15.tar.bz2 154688
-SHA256 ec4f09e040820b9c77efe4347ff6f12a24df777a179af2618a6c3abe059c148e glibc-2.3.6-patches-1.15.tar.bz2 154688
+MD5 4ae76c31460f46b1f2071a9a4ba16961 glibc-2.3.6-patches-1.16.tar.bz2 215499
+RMD160 b84a693c3de85f47b7c4d5029ec4745d95e68513 glibc-2.3.6-patches-1.16.tar.bz2 215499
+SHA256 28f562f1fb97c3be4141c4090475dfce0a2f6af968cbbe392a77eb9584eb52c0 glibc-2.3.6-patches-1.16.tar.bz2 215499
 MD5 bfdce99f82d6dbcb64b7f11c05d6bc96 glibc-2.3.6.tar.bz2 14014977
 RMD160 04b4f71cc3e89581e02ee2dbf5ab05f61e868bf1 glibc-2.3.6.tar.bz2 14014977
 SHA256 e73ff5eddea95d09238b41d3c9c4d9ccddcf99fcc93d04956599c91c704f4a8e glibc-2.3.6.tar.bz2 14014977
-MD5 4614be8c9cb9dad6d1caef6d3ce96b46 glibc-fedora-20060501T0751.tar.bz2 727641
-RMD160 4f6eeeac6f315a26c1a64f2c35587eca9106ef2d glibc-fedora-20060501T0751.tar.bz2 727641
-SHA256 cfba2cded39fbd42643eaa1f1795221e0b11a503beec7d66ba31f3728526efec glibc-fedora-20060501T0751.tar.bz2 727641
 MD5 1c7fa36de8bdb130e4b697d25cc672cd glibc-infopages-2.3.6.tar.bz2 1298413
 RMD160 5a83ca63c4153e5677797c0c0043aec0b55a6fe3 glibc-infopages-2.3.6.tar.bz2 1298413
 SHA256 651701bb5d8431401fa0f2252ad1cd37f69dc3a2aa28e4ce3405b4417b5e2c22 glibc-infopages-2.3.6.tar.bz2 1298413
diff --git a/sys-libs/glibc/files/digest-glibc-2.4-r3 b/sys-libs/glibc/files/digest-glibc-2.4-r3
index d95e34e9bd13..b81d50b3ee9f 100644
--- a/sys-libs/glibc/files/digest-glibc-2.4-r3
+++ b/sys-libs/glibc/files/digest-glibc-2.4-r3
@@ -1,12 +1,9 @@
-MD5 83f949baa2aca7066f895f7a88d05d21 glibc-2.4-patches-1.16.tar.bz2 119684
-RMD160 50113638e5a00da169862fb44b3d5d5cc6288cf7 glibc-2.4-patches-1.16.tar.bz2 119684
-SHA256 8ac49492575e66c037629ee3f23c2c1729b700a05f28d55565c946ccf18e840a glibc-2.4-patches-1.16.tar.bz2 119684
+MD5 160304ebce38bc3ae192e246a195b2d7 glibc-2.4-patches-1.17.tar.bz2 179314
+RMD160 a537434c85cb9bd96c77f0bfeba8d7134f54d7ff glibc-2.4-patches-1.17.tar.bz2 179314
+SHA256 255c900f4b9e24e65ecefc6e65040a15122901f2482f98e29b1e361cb2d4faa9 glibc-2.4-patches-1.17.tar.bz2 179314
 MD5 7e9a88dcd41fbc53801dbe5bdacaf245 glibc-2.4.tar.bz2 15202445
 RMD160 ee2712a0e6fab8e086958c1f23221f8d07af3de1 glibc-2.4.tar.bz2 15202445
 SHA256 27aaaaa78b4ab5da76bb29385dc9be087ba7b855a9102eaaa78ce3ec5e2e7fcd glibc-2.4.tar.bz2 15202445
-MD5 4614be8c9cb9dad6d1caef6d3ce96b46 glibc-fedora-20060501T0751.tar.bz2 727641
-RMD160 4f6eeeac6f315a26c1a64f2c35587eca9106ef2d glibc-fedora-20060501T0751.tar.bz2 727641
-SHA256 cfba2cded39fbd42643eaa1f1795221e0b11a503beec7d66ba31f3728526efec glibc-fedora-20060501T0751.tar.bz2 727641
 MD5 e2d892b40d654c523ab26a26b7dd86a1 glibc-libidn-2.4.tar.bz2 102305
 RMD160 76b2e15e7613c4ac8db3bf90e90929c0e369ab04 glibc-libidn-2.4.tar.bz2 102305
 SHA256 2f29ec2b2b2f75f787a1eed8fdea20aff212dc3bad97651ca376914c49181977 glibc-libidn-2.4.tar.bz2 102305
diff --git a/sys-libs/glibc/glibc-2.3.6-r4.ebuild b/sys-libs/glibc/glibc-2.3.6-r4.ebuild
index f16f08f639f6..5e44a6933bdd 100644
--- a/sys-libs/glibc/glibc-2.3.6-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6-r4.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.3.6-r4.ebuild,v 1.16 2006/06/25 21:35:01 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r4.ebuild,v 1.17 2006/06/27 00:02:23 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -27,13 +27,7 @@ GLIBC_MANPAGE_VERSION="2.3.6-1"
 GLIBC_INFOPAGE_VERSION="2.3.6"
 
 # Gentoo patchset
-PATCH_VER="1.15"
-
-# Fedora addons (like c_stubs) ... sniped from RHEL's glibc-2.4-4.src.rpm
-# http://download.fedora.redhat.com/pub/fedora/linux/core/
-FEDORA_VER="20060501T0751"
-FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
-FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}"
+PATCH_VER="1.16"
 
 GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo"
 GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc/XXX http://dev.gentoo.org/~vapier/dist/XXX"
@@ -148,8 +142,6 @@ get_glibc_src_uri() {
 			${GENTOO_TOOLCHAIN_DEV_URI//XXX/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2}"
 	fi
 
-	GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}"
-
 	echo "${GLIBC_SRC_URI}"
 }
 
@@ -167,19 +159,14 @@ toolchain-glibc_src_unpack() {
 	unpack glibc-linuxthreads-${GLIBC_RELEASE_VER}.tar.bz2
 	unpack glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2
 
-	if [[ -n ${FEDORA_TARBALL} ]] ; then
-		# only pull out the stuff we actually want
-		mkdir "${WORKDIR}"/fedora
-		cd "${WORKDIR}"/fedora || die
-		unpack ${FEDORA_TARBALL}
-		mv c_stubs "${S}"/ || die
-		cd "${S}"
-		rm -r "${WORKDIR}"/fedora
-	fi
-
 	if [[ -n ${PATCH_VER} ]] ; then
 		cd "${WORKDIR}"
 		unpack glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
+		# pull out all the addons
+		local d
+		for d in extra/*/configure ; do
+			mv "${d%/configure}" "${S}" || die "moving ${d}"
+		done
 	fi
 
 	# XXX: We should do the branchupdate, before extracting the manpages and
diff --git a/sys-libs/glibc/glibc-2.4-r3.ebuild b/sys-libs/glibc/glibc-2.4-r3.ebuild
index de83355e389d..a641f1dabc31 100644
--- a/sys-libs/glibc/glibc-2.4-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.4-r3.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-r3.ebuild,v 1.9 2006/06/24 09:35:51 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r3.ebuild,v 1.10 2006/06/27 00:02:23 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -27,13 +27,7 @@ GLIBC_MANPAGE_VERSION="none"
 GLIBC_INFOPAGE_VERSION="none"
 
 # Gentoo patchset
-PATCH_VER="1.16"
-
-# Fedora addons (like c_stubs) ... sniped from RHEL's glibc-2.4-4.src.rpm
-# http://download.fedora.redhat.com/pub/fedora/linux/core/
-FEDORA_VER="20060501T0751"
-FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
-FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}"
+PATCH_VER="1.17"
 
 # PPC cpu addon
 # http://penguinppc.org/dev/glibc/glibc-powerpc-cpu-addon.html
@@ -161,7 +155,6 @@ get_glibc_src_uri() {
 
 	[[ -n ${LT_VER} ]] && GLIBC_SRC_URI="${GLIBC_SRC_URI} ${LT_URI}"
 
-	GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}"
 	GLIBC_SRC_URI="${GLIBC_SRC_URI} ${PPC_CPU_ADDON_URI}"
 
 	echo "${GLIBC_SRC_URI}"
@@ -190,15 +183,6 @@ toolchain-glibc_src_unpack() {
 	unpack_addon libidn
 	unpack_addon ports
 
-	if [[ -n ${FEDORA_TARBALL} ]] ; then
-		# only pull out the stuff we actually want
-		mkdir "${WORKDIR}"/fedora
-		cd "${WORKDIR}"/fedora || die
-		unpack ${FEDORA_TARBALL}
-		mv c_stubs "${S}"/ || die
-		cd "${S}"
-		rm -r "${WORKDIR}"/fedora
-	fi
 	if [[ -n ${PPC_CPU_ADDON_TARBALL} ]] ; then
 		cd "${S}"
 		unpack ${PPC_CPU_ADDON_TARBALL}
@@ -207,6 +191,11 @@ toolchain-glibc_src_unpack() {
 	if [[ -n ${PATCH_VER} ]] ; then
 		cd "${WORKDIR}"
 		unpack glibc-${PATCH_GLIBC_VER:-${GLIBC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
+		# pull out all the addons
+		local d
+		for d in extra/*/configure ; do
+			mv "${d%/configure}" "${S}" || die "moving ${d}"
+		done
 	fi
 
 	# XXX: We should do the branchupdate, before extracting the manpages and