Drop USE=pic usage.

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

4 files changed, 17 insertions, 36 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index beca40b0b958..0e52285ed1bd 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.603 2009/01/14 11:21:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.604 2009/01/26 18:41:34 vapier Exp $
+
+  26 Jan 2009; Mike Frysinger <vapier@gentoo.org> glibc-2.3.2-r12.ebuild,
+  glibc-2.3.5-r3.ebuild:
+  Drop USE=pic usage.
 
   14 Jan 2009; Mike Frysinger <vapier@gentoo.org>
   glibc-2.8_p20080602-r1.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index b7775db82881..515fb58f5011 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -181,8 +181,8 @@ DIST glibc-ports-2.6.tar.bz2 431332 RMD160 275a10d95b5fa34a7c37469468eddbca928fa
 DIST glibc-ports-2.7.tar.bz2 435392 RMD160 b9b96b357a394f29d5617aaa26a2c000bcf88874 SHA1 2186eac2248f1dd604f20a9dc8215ce12319d273 SHA256 3e481996259af87c3581da23481970a27de679e3c87cfa9a5a59751cd20c7b44
 DIST glibc-powerpc-cpu-addon-v0.01.tgz 22422 RMD160 3483c94ec55819b36aa66fc60462317f8d15e4df SHA1 fd30cde7c7cb42baa2c8fa1ac88eeeeb509cac29 SHA256 0ffa9a432fffb9bfed99c529b631a27534ba848c7ec1d707732338b73a4a8ce9
 EBUILD glibc-2.2.5-r10.ebuild 4845 RMD160 aac21107eada185cd0d732414543a4e52676fae6 SHA1 b9d514afa456f93233b0a437ae90512eb9784da0 SHA256 a91c13db667c4f2f5178eb9253d90e101ffb37c7db3b811f30692a681c4f19be
-EBUILD glibc-2.3.2-r12.ebuild 22512 RMD160 56d901a0b9199824d19c6494885654a473c01690 SHA1 e862fc60b500465dba6cbdb3dab5b0d0ac7b15cd SHA256 a7f875eb942a90e5ef158820633d62e978225c014f85fb8f636e8449826d45ca
-EBUILD glibc-2.3.5-r3.ebuild 39487 RMD160 a7cec305eddbfde1c6a7ce40146668859e43fad0 SHA1 899fc8bd33d25fc24a1d34f1e3b079ccfbb3c2e7 SHA256 e9477fa24dae7a0461dcd1f1a1e2068659648550733dfc1c58a5e77be40516a9
+EBUILD glibc-2.3.2-r12.ebuild 22126 RMD160 ea9d0512b19289efe37e52e8edec5d7044fb9fd2 SHA1 126ed425af51b84fe041e2702af08f6dcdd5e74f SHA256 a5db6f8c648045e9df462f69b360ae877efcdc1be6dd63f7bb91455b1bac5bd7
+EBUILD glibc-2.3.5-r3.ebuild 39024 RMD160 00d8523b78c0f417d326bca5795bd9eae6e279bc SHA1 bbdd9924c2d0805743eecd14bc524232424d6e5d SHA256 c6789db55f562cfb848bfd071133e03bcd81da85788ac6e5a0d92dcd5558654d
 EBUILD glibc-2.3.6-r4.ebuild 37386 RMD160 ed8c7cf317a1f44031a85350853608d17b06e444 SHA1 418e79c49ce0bc26ad5c9a328bbd5801d23db0dc SHA256 941cd518b2e1ee789ef830682b6fd797b0688594e0fecc82830269d1965501ef
 EBUILD glibc-2.3.6-r5.ebuild 37715 RMD160 29fd2bceb7fd7d3589aa192d11422f8056197972 SHA1 e3210051417ef99dbf1bb560023238e0e6128c13 SHA256 408d4beccd1b52ae72b809e1799f522653525e463238acd266327831465c1d5d
 EBUILD glibc-2.4-r4.ebuild 39174 RMD160 c55dd23f3ef070eed8b4d016423ed1c8dbec33af SHA1 e329575f86e774afacf1f0fddc4e943aadff6155 SHA256 1b0f5aa5164e9dc8c7a35b1f9bcf74554be5657c42ee607cf8aa32fe9c071a3a
@@ -197,12 +197,12 @@ EBUILD glibc-2.8_p20080602-r1.ebuild 13020 RMD160 71c71c5ca214db0ec33617eabaf582
 EBUILD glibc-2.8_p20080602.ebuild 13122 RMD160 24e7c63d244c59932fcd666d2113288fa4c3f8f6 SHA1 4727d39df371b840aef55b59ec4543f86c7d8557 SHA256 69e5f4eba4dcd81de1af44c4806ddbafa9f00e333a4a84639958430fa78dfc68
 EBUILD glibc-2.9_p20081201-r1.ebuild 13207 RMD160 dd9fc5c71514924d278fbc0f55fc1bf7eefbe0b5 SHA1 2cca5235cc1b11034efad9365bc460ac42cb2e5a SHA256 2f1ff2bbae284c4b682b1dfd32be0c23c63cae942589cce50f43c22e6fae9256
 EBUILD glibc-2.9_p20081201.ebuild 13018 RMD160 fd40079b29ba5981ca48339cd0d87c83044785fc SHA1 b08d8dee985457f5a1842d607595ee699a3e686d SHA256 b27fa3b409df01d9bc1b63b472ceb3a1dcbd1309fd8c607684ad6f6303415b36
-MISC ChangeLog 113923 RMD160 bf24027b2992f4fd166e388b845f195d3fab5924 SHA1 3100db579f2587f8591e2c9fd40a5837f849f995 SHA256 90de9e0c00d4c59666f602db8e3671e8c41744e0d2b2dc503112e74e8af58764
+MISC ChangeLog 114045 RMD160 d28c6937fe823ae8f23c9154be0b24bac8312fb6 SHA1 c0538592dfcbb0db5151efdb2319e14357f67480 SHA256 5d395bc0438fadb6e2da6648e7b9b90ea619f4d361c646f6d247f6d016720f6b
 MISC metadata.xml 1112 RMD160 1aa9770356149948593ebe35a1bd3940dd72fca2 SHA1 40514cc45c26bab671d78aa1567441bf72b0c6cc SHA256 4acea698dc4f66c17f4f3f81b28cd6b32f5425fd49f380df4a016489f786b1f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkltytkACgkQn/5bYzqsSmHU8QCggtItN57LB3X/kycJz8DbZhmC
-E2EAn1P4mZ2OvzT037D8wfTfx+EWBuwK
-=AM3F
+iEYEARECAAYFAkl+A+UACgkQn/5bYzqsSmHIugCcCFz4sSOFzi8hSce1lQYqZYVV
+v3wAn25AxOXo8KPXPs7PShF5MVXdZ+T4
+=GIgJ
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.3.2-r12.ebuild b/sys-libs/glibc/glibc-2.3.2-r12.ebuild
index 36ed9cb7b968..7c27fe52f738 100644
--- a/sys-libs/glibc/glibc-2.3.2-r12.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r12.ebuild,v 1.24 2008/06/01 02:34:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r12.ebuild,v 1.25 2009/01/26 18:41:34 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -40,7 +40,7 @@ LICENSE="LGPL-2"
 	&& SLOT="${CTARGET}-2.2" \
 	|| SLOT="2.2"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc s390 sh sparc x86"
-IUSE="build nls nptl pic userlocales"
+IUSE="build nls nptl userlocales"
 RESTRICT="strip" # we'll handle stripping ourself #46186
 
 # We need new cleanup attribute support from gcc for NPTL among things ...
@@ -671,18 +671,6 @@ EOF
 	# This is our new config file for building locales
 	doins ${FILESDIR}/locales.build
 
-	if use pic
-	then
-		find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \;
-		find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \;
-		find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}/lib \;
-		find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}/lib \;
-		for i in ${D}/lib/*.map
-		do
-			mv ${i} ${i%.map}_pic.map
-		done
-	fi
-
 	# Is this next line actually needed or does the makefile get it right?
 	# It previously has 0755 perms which was killing things.
 	fperms 4755 /usr/lib/misc/pt_chown
diff --git a/sys-libs/glibc/glibc-2.3.5-r3.ebuild b/sys-libs/glibc/glibc-2.3.5-r3.ebuild
index 256580ea0884..56c6d35ddb0a 100644
--- a/sys-libs/glibc/glibc-2.3.5-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r3.ebuild,v 1.34 2008/09/05 20:23:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r3.ebuild,v 1.35 2009/01/26 18:41:34 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -48,7 +48,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 LICENSE="LGPL-2"
 
-IUSE="nls pic build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp linuxthreads-tls profile"
+IUSE="nls build nptl nptlonly erandom hardened userlocales multilib selinux glibc-compat20 glibc-omitfp linuxthreads-tls profile"
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -372,17 +372,6 @@ toolchain-glibc_src_install() {
 		rm -rf ${D}/nptl
 	fi
 
-	if use pic && [[ $(tc-arch) != "amd64" ]] ; then
-		find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}$(alt_libdir)/soinit.o \;
-		find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}$(alt_libdir)/sofini.o \;
-		find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}$(alt_libdir) \;
-		find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}$(alt_libdir) \;
-
-		for i in ${D}$(alt_libdir)/*.map; do
-			mv ${i} ${i%.map}_pic.map
-		done
-	fi
-
 	# We'll take care of the cache ourselves
 	rm -f ${D}/etc/ld.so.cache