it seems the strange libpthread-not-installed bug was an ebuild quirk and not a portage quirk. it should hopefully be fixed now. i've also added a safety function to 2.3.4.20040808 and 2.3.4.20041006 that will prevent glibc from installing if libpthread is missing, which will likely be expanded further in the future.

4 files changed, 39 insertions, 20 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 1fa902eefe2c..0faec323f9f8 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.275 2004/10/13 17:16:12 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.276 2004/10/13 17:31:46 lv Exp $
 
   13 Oct 2004; Guy Martin <gmsoft@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
   Moved Lv's latest patch into do_arch{ia64|amd64}_patches() to avoid breakage
@@ -13,11 +13,16 @@
   12 Oct 2004; Guy Martin <gmsoft@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
   Stable on hppa.
 
+  13 Oct 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040808-r1.ebuild,
+  glibc-2.3.4.20041006.ebuild:
+  it seems the strange libpthread-not-installed bug was an ebuild quirk and not
+  a portage quirk. it should hopefully be fixed now. i've also added a safety
+  function to 2.3.4.20040808 and 2.3.4.20041006 that will prevent glibc from
+  installing if libpthread is missing, which will likely be expanded further in
+  the future. re-keyworded 2.3.4.20041006 ~amd64.
+
   12 Oct 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20041006.ebuild:
-  a portage quirk seems to be installing and then uninstalling libpthread on
-  amd64, so i'm re-keywording -amd64 until this is fixed. if you havent snagged
-  this bug, you should be safe. if you have nptl in USE, you -should- be able to
-  simply emerge glibc twice and portage will stop removing libpthread.
+  keyworded -amd64 for libpthread bug.
 
   11 Oct 2004; <solar@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
   marked 20040808-r1 stable x86 for 2004.3
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index c79ceabbd6da..835d7d2f05df 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,15 +1,12 @@
-MD5 d84fa79a8d382391bdea0af555ca3a6e ChangeLog 56983
 MD5 7cf88dee2671dcc30659d07241b8d918 glibc-2.2.5-r9.ebuild 10915
+MD5 3603fa6448052edcf78a329d10746461 glibc-2.3.2-r12.ebuild 20530
 MD5 daf5c4924c0a0ccc6e55f7588b1b4d52 glibc-2.3.3.20040420-r2.ebuild 21765
 MD5 af6f1491a70a6ee80e8d867d8ee0f98f glibc-2.3.4.20040619-r2.ebuild 20997
-MD5 03a3adcb2e3850069836fccbacf1868e glibc-2.3.4.20041006.ebuild 25787
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 3603fa6448052edcf78a329d10746461 glibc-2.3.2-r12.ebuild 20530
-MD5 8b57470f4f20fe2c5012000d49adc632 glibc-2.3.4.20040808-r1.ebuild 22453
+MD5 5122e445282113710a19229850a8e46b glibc-2.3.4.20040808-r1.ebuild 22602
+MD5 b8dfa198500ad361914d30ba2140f789 ChangeLog 57183
+MD5 af48e018ae0d492a4e254bc49cb04236 glibc-2.3.4.20041006.ebuild 25931
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
-MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
-MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r2 307
-MD5 2f05d3181e9a9ded61e074147af47e8e files/digest-glibc-2.3.4.20040808-r1 382
 MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
 MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
 MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221
@@ -25,6 +22,9 @@ MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
 MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
 MD5 f3cca6c94da241279d9867de19ff65d2 files/digest-glibc-2.3.4.20041006 382
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312
+MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
+MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r2 307
+MD5 2f05d3181e9a9ded61e074147af47e8e files/digest-glibc-2.3.4.20040808-r1 382
 MD5 f75ebd335c4b882013cc12229d39c9f7 files/2.2.5/glibc-2.2.5-alpha-gcc3-fix.diff 475
 MD5 843eaa26ae2c49e894aa365b6f463546 files/2.2.5/glibc-2.2.5-alpha-pcdyn-fix.diff 471
 MD5 5182f441608833569cb9e78536baf8af files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff 2210
@@ -117,8 +117,8 @@ MD5 340825c77e38e88e0ceaa12f154cbfa3 files/2.3.4/glibc-2.3.4.20040808-i386-got-f
 MD5 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347
 MD5 1185022e9a50560d1bf9116a0461e011 files/2.3.4/mips-sysdep-cancel.diff 2402
 MD5 9ee1438ba6ac30363130330c996dbb84 files/2.3.4/glibc-2.3.4-dl_execstack-PaX-support.patch 1443
+MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch 3080
 MD5 7fca8a203196513f13e519903dedbfd5 files/2.3.4/glibc-2.3.4-getcontext.patch 9854
 MD5 d490f38bd9ca9c48a9799f1e48629f6e files/2.3.4/glibc-2.3.4-mips-generate-syscall_h.patch 8230
-MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch 3080
 MD5 e78cc048b738241cda35941e87da7b66 files/2.3.4/glibc-2.3.3-mdns-resolver.diff 10379
 MD5 fe21fd44628b90f50e5024462cf4c348 files/2.3.4/glibc-2.3.4-res_init.patch 3417
diff --git a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
index 111862fff961..9da45cef8ec2 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.6 2004/10/13 17:16:12 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.7 2004/10/13 17:31:46 lv Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -602,9 +602,9 @@ src_install() {
 		install || die
 	# now, strip everything but the thread libs #46186
 	mkdir ${T}/thread-backup
-	mv ${D}/lib/lib{pthread,thread_db}* ${T}/thread-backup/
+	mv ${D}/$(get_libdir)/lib{pthread,thread_db}* ${T}/thread-backup/
 	env -uRESTRICT prepallstrip
-	mv ${T}/thread-backup/* ${D}/lib/
+	mv ${T}/thread-backup/* ${D}/$(get_libdir)/ || die
 
 	# If librt.so is a symlink, change it into linker script (Redhat)
 	if [ -L "${D}/usr/lib/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ]; then
@@ -692,6 +692,8 @@ EOF
 	insinto /etc
 	doins ${FILESDIR}/locales.build
 
+	must_exist /$(get_libdir)/ libpthread.so.0
+
 	# this whole section is useless, it fails if sandbox is LOADED, not if it's
 	# enabled. but forcing sandbox not to load isnt an option...
 	if use makecheck; then
@@ -783,3 +785,9 @@ pkg_postinst() {
 		/sbin/init U &> /dev/null
 	fi
 }
+
+
+must_exist() {
+	test -e ${D}/${1}/${2} || die "${1}/${2} was not installed"
+}
+
diff --git a/sys-libs/glibc/glibc-2.3.4.20041006.ebuild b/sys-libs/glibc/glibc-2.3.4.20041006.ebuild
index 3c8d9790d560..7fe49ed21f0f 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041006.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041006.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041006.ebuild,v 1.4 2004/10/12 04:10:03 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041006.ebuild,v 1.5 2004/10/13 17:31:46 lv Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -40,7 +40,7 @@ SRC_URI="http://dev.gentoo.org/~lv/${PN}-${BASE_PV}.tar.bz2
 
 LICENSE="LGPL-2"
 SLOT="2.2"
-KEYWORDS="-* ~x86 -amd64 ~hppa ~ppc64 ~ppc"
+KEYWORDS="-* ~x86 ~amd64 ~hppa ~ppc64 ~ppc"
 IUSE="nls pic build nptl nptlonly erandom hardened multilib debug userlocales"
 RESTRICT="nostrip" # we'll handle stripping ourself #46186
 
@@ -712,11 +712,11 @@ src_install() {
 	mkdir -p ${T}/thread-backup
 	mv ${D}/$(get_libdir)/lib{pthread,thread_db}* ${T}/thread-backup/
 	if use !nptlonly && want_nptl ; then
-		mkdir -o ${T}/thread-backup/tls
+		mkdir -p ${T}/thread-backup/tls
 		mv ${D}/$(get_libdir)/tls/lib{pthread,thread_db}* ${T}/thread-backup/tls
 	fi
 	env -uRESTRICT prepallstrip
-	cp -R ${T}/thread-backup/* ${D}/lib/
+	cp -R -- ${T}/thread-backup/* ${D}/$(get_libdir)/ || die
 
 	# If librt.so is a symlink, change it into linker script (Redhat)
 	if [ -L "${D}/usr/$(get_libdir)/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ]; then
@@ -799,6 +799,12 @@ EOF
 	# This is our new config file for building locales
 	insinto /etc
 	doins ${FILESDIR}/locales.build
+
+	must_exist /$(get_libdir)/ libpthread.so.0
+}
+
+must_exist() {
+	test -e ${D}/${1}/${2} || die "${1}/${2} was not installed"
 }
 
 fix_lib64_symlinks() {