Drop old /lib64 symlink migration as this has not been an issue for years.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

3 files changed, 22 insertions, 64 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 81bfd32217ef..108989db7d8a 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,5 +1,9 @@
 # ChangeLog for sys-libs/glibc
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.893 2012/09/26 05:21:41 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.894 2012/10/02 04:58:30 vapier Exp $
+
+  02 Oct 2012; Mike Frysinger <vapier@gentoo.org>
+  files/eblits/pkg_preinst.eblit:
+  Drop old /lib64 symlink migration as this has not been an issue for years.
 
   26 Sep 2012; Matt Turner <mattst88@gentoo.org> glibc-2.15-r2.ebuild:
   Stable on alpha, bug 430346.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 131a51b49a6e..d93a4940b57e 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -17,7 +17,7 @@ AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 SHA256 cf58ded8fbe9fcb3
 AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3 SHA512 50563c26e1fd2e71cb034c8a1b85e0e4075ac6467bae46d4cba0c105c940c5aa6531c39cf00c63ebf94be4e290ee485d7bd8239ff08dbc781db605b45c4aa38f WHIRLPOOL 2047148b53073bae4031ad864fc360112e2812115ec455142c82d4694a57387b49b36c98f400dd6f77f5dab3d419303faabe8183a16f0fd68387996c95888a43
 AUX eblits/common.eblit 9430 SHA256 9597a9a4e610ebbb42efe961cfe06b4a211555f1a0c81fd7cd3537559b784039 SHA512 0c8fdd76e106f1458d4d0b919bdf58bdd0ce6858627cf47fd1392ea35e7adbc96eea7b4edf4903ec683b98343f12ac706c87a4c2741ff7a1ace163cc1c1d744f WHIRLPOOL 330fcd622008f4255f8bf2193015d907f9dfeb1d4d1306a64a1fffbdd9c8d0fd12f0c874fa899dfac3fc586f51fb4743dddd9c58dc6e326c308d3aebf75a5edd
 AUX eblits/pkg_postinst.eblit 1081 SHA256 21c349d6999841b277dd00ed6f2bf4b33d14724510da3c15a99e775cb71bd180 SHA512 b491761a0923b779535b4a5abf6e00efb6f2c0bbb68e7fb01b2cad54034b63ddfa271afce16b17b17b53ac809ed869c55f94c44443d661052779770f4302318b WHIRLPOOL 8e3a3f35a4cefa903bc578d2fb6b22506f3ac94939f9ad1e703f470b13ba0fd3353061e38e3142ecb5c693749c84d4a1e4f4a5920e36ce20dc2f7e3b6b67ed9f
-AUX eblits/pkg_preinst.eblit 3469 SHA256 7f947a83488dccd4c5169508d7c125d09fdd30ddd07d98b528ad12d83b9e2730 SHA512 a0fb0dfff49d92d610a293820ec472aa24ed84033208474eee6a0174aca12fab5708c0b2178f4c85b3b8603b9b1fb6ba4ebaf168b85b8725946081e138af4c6f WHIRLPOOL 5c5146750fc020f7ea6a02ae97d0592acbe73513966fcf3efb8318112074f445ebb7658d2b0b1d4797f84f88b26ea80bd9a1330576b2f7df195a87a0c1c322de
+AUX eblits/pkg_preinst.eblit 1482 SHA256 8cb09d3d334ac5ce68aab0c908647ff19c903fcb92e929b278852f79c2958382 SHA512 ed234503d5ba08420edc6e71754ba5c3faf30be7d0fb744f7e903d1672083802ee9a92cd42be7e62f8b79c96508252174bda2dcc504ea890d5c0cf024d6d3bc0 WHIRLPOOL 08e961083bf0ee4b95c852ff6199a8155eb4de9ffc06db5454dd1103b3522d4b5605b536cb09effbb33d79934c4d00370a45983dfcc35400b55449ad69034a72
 AUX eblits/pkg_setup.eblit 3886 SHA256 be9c3dcef8315e52163b98631ea2c170c805f9accbaf5268df292574978c8e71 SHA512 6123cb9a2226c899d8e268141399686f2c2d082c81fb0c3e30f8b06ddd41e5aefe95c345a7fddf2d60c9d751cc1784350285542cd1bc0198e203c9fd74fe7a0d WHIRLPOOL 30dec2dcf28966fec5a0acef5605eaf40e5a45a74d8256ab9645f2bd090ef6bfbd1f02b753d83aa875d7b37edb6f419e22f633adb41d766593e5c4da53097dc5
 AUX eblits/src_compile.eblit 6275 SHA256 7001e458cc781a72b0012906529736e2337e3657da26cfe69357048d86cfdefd SHA512 19d15f537d55c5b903583eef8b8fa1f3db3153b4e10d60cd358ad11760abad4fcf505ff9cae0e2c2323e6792bee5af4b2e526c82088335949cf3a9584dd08894 WHIRLPOOL 3a312bb8b26943b01c7691ad8da5520ac672ccd42e52eacb2ec74492a8d843fa486711bb3a831fcd00095f3a06e368dea678a63e644264ed564bb38642277e49
 AUX eblits/src_install.eblit 8266 SHA256 73b67fa750c616baa2b515327f6066f12d5f67cfe2c37fdf8434411d632e884f SHA512 8ee374519aaffd258f4c2e75003aad89fc26ee78b010d1fc6d19a3c60898af293d319eb982676adbef6c892629edd282aada75be2b29cc7d7393343eed98e497 WHIRLPOOL 3c82a37db8e59dde1d632e397f74e685821cce3bace7c46d4ece4c23374f6d92c94e4a3b2a742ad0b1915491751fd265ff56070ed14621b88d2ae393454b5935
@@ -74,23 +74,23 @@ EBUILD glibc-2.15-r3.ebuild 7989 SHA256 7458190b6bf4850842ebd6bae5e4d6223c3822cf
 EBUILD glibc-2.16.0.ebuild 7774 SHA256 a235772cb8ea9447ebd8980b79082654168a46ba54ef65ea7b0a025dc2200473 SHA512 18ff0218185ea867fc31a90133a3f240b5ff3d9c4767bd2ddd02e1f5a520c5e6b8012d68c37d4e24066cb66757f55411c93d2966cdbd832850c28b8ccd6af23b WHIRLPOOL a87ed7a708ed9d5f7d26694f29e57a9786ec256dfc1f5806b19ef413a3c01da13fa31f17617f03ef24775eedd446d8c953f4718157af674de463151b64ca5990
 EBUILD glibc-2.9_p20081201-r3.ebuild 7065 SHA256 72f88d32a5a6046bd14c98c927f21dd736f6aea400f3be4b0ef1aed98dda4ed4 SHA512 486a0bb8f6a255b5ec343f30190b08ae43316ea5baa0b16b133092457f86419e41076ccedea0dc60b27aaefde7c166db4e1a499e73c098f4ba18287633b6f6a0 WHIRLPOOL 0aa9955a865d1d2a5a6c54f9eb50fee4e352a8a9de50fc9c33e3cf25a0c5e3c6c7ddd078f76803f4df1af87217274458cec47e3697a2bdd5dbfe450b88f1ad48
 EBUILD glibc-9999.ebuild 6563 SHA256 a9b81ef5e8bfe3e1fcff66126aef1fa99eaa7b3f4b5c73eab6d1ed4758804ef8 SHA512 6f05f2f5941a4f66079f0470a91fb8fd95ae444a60991f2baf4c34afe1d648ab7be820bf8e26e36e66f42b072898c7afe5025640fb9efbb78d83c9d5f9ce95ae WHIRLPOOL 906562f43794e92329c3b793608b23ee307853e222063a321de629ccce0fbdb75f6ca8ee3d2dab60e242a7b723e2c4d6b86d2f1a3926103a3e49ad538ea34013
-MISC ChangeLog 50375 SHA256 baddd2c4a8923554812bae0bf258784be1bce48e022c106c04d1bb865b3ee190 SHA512 7711c290220dc1200d6fc83c2195c950ef4f25015a5b6dbac6aa9eaca752563ec4d3c2bbc7713fe59dc121ed8125a47d5f71aa520aab7f1965f9a4c3f6e8d24f WHIRLPOOL 3d6e64b26cfabff4184284ea770494999524af8f4ebde9c694357f38e7aea238533dca6e05ac7ad3f8866d0ea24a4d3534fed669394eca9e15ed737301a5f7c9
+MISC ChangeLog 50535 SHA256 b339be03447988db8af1ca50f10361785a26dea514ed29272ad379283a8d710c SHA512 7b89809ffe078c636c1652f84767a18a9ffca40983e01667cf38975ed9a420563ec561eff2d478d5ed5a4f5a86864ebb37c068b0978e6d05cd6955b14f30fd64 WHIRLPOOL 7bf7bf87424d1806e41481efe94f3956d1c1642dfd40325f028bc45d7c8e418ba9f0490d5eccf770832e2388628f7296eed827928b2e92943f62d01475d25f68
 MISC ChangeLog-2007 108587 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17 SHA512 405c93cd08d102ad1a9e40975563e645e982b5baa238280c38118b46b7c828ca924c73766c254cf24eaff255b16b3f4c8133d2e174cf3e47b704ff49d754640e WHIRLPOOL 4ab79bcd243bd4281898e93987b49a2dc44fb7ef2df9073708dd12223bd01f595dab8f08f342bd5dd8d0fc955ee031b11ce70e1cdc118f7dcc5b63f90d785e9b
 MISC metadata.xml 406 SHA256 e6cbc11651d304035d704081701900a8b373ee3a0ed2f3f4a7e3f3a8d926a731 SHA512 3afe4ea0be7d1707571c23a7aae8490620a83d748ad672a18ce602503f37179cfc12d3bed0c18398c2cc8e74005d2c51ac320fd1722364e5df2cb3599488c164 WHIRLPOOL 1c3f5e0cc851c976259c6749f6a611d6cf415a063b2229e65ae9dea80e623a52514acbf977b3e439009379c4ea9aa491e6c423c7aac70a1c8fd573c4f40816dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQYpDxAAoJEA/daC2XTKcqshwQALTwqpeYV3HB+9vsh+MIZoJ4
-UU1Iab8Lws4hcLqomsUUN247EvpG5cl00rInJwMbaVBpc29tl9V8hPAOGAjwm5wv
-aXlGtIY3ZA0t3S1GCFKHfmPDh3FdvNfJvYMhfnDZeb/0RaXp7qwWzWuTUFrC2pc3
-86IkNgcyldeKwKfKf44JoNMk/XJUa1kIMdlOcxX/bKpDUSVC/c0GV72zE0/oflJh
-W01dGg0vEGHViubU69Q95PteSfGj/Q2UDtdcgKAxlCfUmBr4JTiBDaoED6V5x4ed
-sjsx10ckZPQVZ8YX2pu4gXSmPGh0c59SfHSSn2aA9E0trOFgTWPaPd9xdSm7JA07
-HIVlM6FM5CeXnUoMGqwJa6wwxANwGDkzsZFp6RPWUdMkPqB32Gc9f7ZIPG7Mjsoa
-Cq9fEsb5NNboHHr4V0MQyLAfCzt+B0+G4w9eNMUQe7DXcXXjw7/YMwVLlCBvwQlr
-0Vj37XJdAEgeAj1LF6UbGaaCiY/FC/+3Fft6s4+X3CAfq50ogoHg65XnnOU2sfCA
-SVlxogZN6K6MKIdLAS5e85iqUZe00jM5PDpZMA8k6bPSnHCyHwifdBeoIVw/jg9j
-S+dTduWLHBf8KFYPqnh6SvQTszUNEQmqkrOgTrnF3eMl2sijbD5HLAtsdntDKuow
-z+5MBw4BIB2BuD0EIQCH
-=GGBq
+iQIcBAEBCAAGBQJQanR7AAoJELEHsLL7fEFWahAP/2UGINiDZ3cG4bh9WLyUsQQT
+yoRSl9DQJH4XrMPM8uwSvOIZF6QIo4R6Ili0aeeKKqcxw6++N3ehlSNkjNT0H+ss
+Qyd8R+N1KLitOg6SP//pfkzKEG/3AJh9CkIdVdFRsJcV1Nk551BNbFq1Ko6pnMrY
+71lckwTVj+E8j4YQZbU7WG2VEr8dm0MVZ3r4wtmqVa1n/yHCYLIORZshFaSewFqT
+zDcKF53dhl5foalPCl9YCXvNKCAh9OsZcyOrZ8DtzYrU9kG6M5B1K6ZQB9//qSvT
+/9ptVtHuhawZ4dVo3JARVr/MPIw2LUxQu9pF144Ox27tfZNgScqWrdm4Jm78XVbM
+MaH1HDJkz1M4MZw6YRIuCktJneG/0I/DFW4s1rcEiJvMqXt6FlxoEhkzEDZeSOWl
+gqGyrqDnIeCerwErSFeiyrOAJgDOBHyvC/6T2TpDzTRM3wxOxZf3T+xcAkVMgKuE
+ypwJCYxciHB6zXnK5NKkbEqXF31FcLexytVRwP1Z/BREWJkVvl2cHk5pc7aJDTw1
+ieHgwV9cZ8O/VLoNDejFOyDPb7P5MYtQ0u7Siw0twzrkQSYZje3OmRkraIIz5uRZ
+OF9vR/ltLXakjJY17dMZqif1rLUz/A9SlUh5nSv7IKiHZRbXFB3pBNakc/FMppR8
+cOpxk0I3/gDqzj7ZO5FA
+=kimf
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
index 8b2998ef9818..ec87806699ad 100644
--- a/sys-libs/glibc/files/eblits/pkg_preinst.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
@@ -1,57 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.4 2011/11/16 16:07:46 vapier Exp $
-
-fix_lib64_symlinks() {
-	# the original Gentoo/AMD64 devs decided that since 64bit is the native
-	# bitdepth for AMD64, lib should be used for 64bit libraries. however,
-	# this ignores the FHS and breaks multilib horribly... especially
-	# since it wont even work without a lib64 symlink anyways. *rolls eyes*
-	# see bug 59710 for more information.
-	# Travis Tilley <lv@gentoo.org> (08 Aug 2004)
-	if [ -L ${ROOT}/lib64 ] ; then
-		ewarn "removing /lib64 symlink and moving lib to lib64..."
-		ewarn "dont hit ctrl-c until this is done"
-		rm ${ROOT}/lib64
-		# now that lib64 is gone, nothing will run without calling ld.so
-		# directly. luckily the window of brokenness is almost non-existant
-		use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
-		use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64
-		# all better :)
-		ldconfig
-		ln -s lib64 ${ROOT}/lib
-		einfo "done! :-)"
-		einfo "fixed broken lib64/lib symlink in ${ROOT}"
-	fi
-	if [ -L ${ROOT}/usr/lib64 ] ; then
-		rm ${ROOT}/usr/lib64
-		mv ${ROOT}/usr/lib ${ROOT}/usr/lib64
-		ln -s lib64 ${ROOT}/usr/lib
-		einfo "fixed broken lib64/lib symlink in ${ROOT}/usr"
-	fi
-	if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then
-		rm ${ROOT}/usr/X11R6/lib64
-		mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64
-		ln -s lib64 ${ROOT}/usr/X11R6/lib
-		einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6"
-	fi
-}
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.5 2012/10/02 04:58:30 vapier Exp $
 
 eblit-glibc-pkg_preinst() {
 	# nothing to do if just installing headers
 	just_headers && return
 
-	# PPC64+others may want to eventually be added to this logic if they
-	# decide to be multilib compatible and FHS compliant. note that this
-	# chunk of FHS compliance only applies to 64bit archs where 32bit
-	# compatibility is a major concern (not IA64, for example).
-
-	# amd64's 2005.0 is the first amd64 profile to not need this code.
-	# 2005.0 is setup properly, and this is executed as part of the
-	# 2004.3 -> 2005.0 upgrade script.
-	# It can be removed after 2004.3 has been purged from portage.
-	{ use amd64 || use ppc64; } && [ "$(get_libdir)" == "lib64" ] && ! has_multilib_profile && fix_lib64_symlinks
-
 	# prepare /etc/ld.so.conf.d/ for files
 	mkdir -p "${ROOT}"/etc/ld.so.conf.d