Revert broken linking behavior from upstream #429756 by Lars Wendler.

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

4 files changed, 71 insertions, 17 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index b2eacf39a81b..80a6680501a0 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.253 2012/08/03 16:05:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.254 2012/08/04 19:39:32 vapier Exp $
+
+  04 Aug 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/e2fsprogs-1.42.5-ldflags.patch, e2fsprogs-1.42.5.ebuild:
+  Revert broken linking behavior from upstream #429756 by Lars Wendler.
 
 *e2fsprogs-1.42.5 (03 Aug 2012)
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 212063cb5315..c30fc43c07eb 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -18,6 +18,7 @@ AUX e2fsprogs-1.42.1-libext2fs-config.patch 751 SHA256 503c1b94b993c1a762a32efaf
 AUX e2fsprogs-1.42.1-libext2fs-gettimeofday.patch 988 SHA256 a445e3e2806d11d8571ebcc5b1b3ec6f499b75f0e81cb34e8c9e4e914cff5c2a SHA512 77179fc0f0d84e9f4fc68ebf821a3eb4f4960f7911b225f46305710bad8a65bd011a3343b49f1293139e81f8ed18c10330a9c2de54a2a4779e08fbd7382742f9 WHIRLPOOL 623180029eb24aa7efcfdbbc943458facce7ef70548f8ea8b0d13cb8c88cb68be5fdfd12ab3a867bfaf5f8b406659aa79adffb22d89bcbe46e9d314d2d5b82ed
 AUX e2fsprogs-1.42.3-quota-time.patch 787 SHA256 75f9d148d7c7f5debfac78873f275b4d017b390b86c5dc5996ade784d622d19b SHA512 6a87f327de653af6998783ff3bd4401125ea5149b1f29821a557e613b23731db9d367c47e02d6324ad156494381a703f17d37c45ad370d10313fd292ce91aa25 WHIRLPOOL 0ac096a266f5f9d3852d31ed3fb83eb8b15752f4f8974b33816b10a3c7e615eca41f0c171aeeb56d33ca09e3ec2a0ef15a9457d1fe7d51c8b9be068fd2cf58a9
 AUX e2fsprogs-1.42.3-quotactl.patch 972 SHA256 5a7c22259678de68229cf5f95ab64434f345cc0cb78e291c233353dc6f896276 SHA512 87d69a10eb44036727d9cf370ed64cb2bf678f4dc14c8d168bc401dcd4332da1409b0afe65ba5a29221aeeab9403bbe3f53dbe60a205ab6ce6cdeaf84ad1afe2 WHIRLPOOL 01044a1dc776f15a3c465f8b320f31e6515e331e436ec85122ab31f9f1997b2d826aaa1bc65c1328a9cdaac37a515bd68bef741c1a08cee0df2f4605b2844473
+AUX e2fsprogs-1.42.5-ldflags.patch 1812 SHA256 909210a62600b71c1b1e6ae96b69cf9bbde72d7ac756a4ba61a4e8a22d4d9e82 SHA512 8f779e48049c9c9b93d5501d7d896db16dc5e6b8dddd1a43cb688ae7fa30b3eb2866c77efd7ddf43549b57a752be171c3e75b3774cbef1c8b62dff4769e298ce WHIRLPOOL 776fac0500f7b7dde2962ccebdcfb81b152c5b318f07d9a67c6fcd2f7cf009231bcfc48b7857c24de5bb26351f58c9c0a7829adb92e81a92144afc33deb122a2
 AUX fsck_ext2fs.8 3806 SHA256 fc1155e67f17aebc8762d75a25d25511a1463be3da05baf7a322d0b5f91938e0 SHA512 eacd1968267f320587e01f75a66ceaa5a9b899f368686df893b6335c25ce8f304ebb5852df6f1b22a125642720ab110fc3b0878bc3560c628e8beb3a4583ef08 WHIRLPOOL e8343c2ae959075b043998894486fa5a33d36e339e511ae22102b60c2c482900d73f3322dd2b8daf91b5009b3da0639aa192d3ff1183d31db748a1143af97a94
 AUX fsck_ext2fs.c 2797 SHA256 a7c3614e76c89ab7882191c14a469789d4b5b54f3c61c5888e5bd72840816e22 SHA512 525c88a3dd9178ef2dca056db9226a2bebf537b9a333cce32f2ef82d6d7a6a56a59dfc2ebf9aa3e891d9690fde13588cf619f89d6b806405810de5dcfcf08040 WHIRLPOOL d71a13f80694a39ae2faf4fafaaf0ce342a0963ca2fb5b4bce279c9a9816139fedeefb5a3c565b6c6829a237e39b7e4dcab54aacea8b72fc3f1ab0122c667ab0
 DIST e2fsprogs-1.41.12.tar.gz 4496194 SHA256 9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20 SHA512 9ca618ae21574cf25e9249b445cc8e89a4ddc9d717ba650af084979f95771e42026395148d7f38a9489402a81a8fbeb60524eb9cf8e9eec3b309fee7e6469bab WHIRLPOOL 24faf2a8cb8292f588d69f3e94c606df51fb16d05368ca3444b22472a613368809b3ecad6e519b2010753431da371e9d21eaf08e63c3d22fa5d107681de5c28a
@@ -35,24 +36,24 @@ EBUILD e2fsprogs-1.41.7-r1.ebuild 4157 SHA256 8bf16f0634e1fa357fc2235f22c619328c
 EBUILD e2fsprogs-1.42.1.ebuild 4677 SHA256 1a0cce002b78b2cd1c93947b1cfde1b184b952e058609c0f1aacf974500c944e SHA512 abb727ab4b44634b49d2d52b98d8b3b58186b19347a871ea76f726f3935ce35ee5719813113243abdbb436efd4eab193dc1b3a2470baa7227d4bc2447d7ff3f3 WHIRLPOOL 65091506722d0d2f36392e46f8e5ed0ef37d4f97268da2d20a6cec35d7497fd7f384d7c866d0f5abcea9a3f6b79e69a140d9b39038be9e799ea41bb002897c6f
 EBUILD e2fsprogs-1.42.3.ebuild 4431 SHA256 c7d6a2dd48218a10866f32c39a2cb7840c9846d9dafe9691c2f5c7f6e7947f9c SHA512 498c6f720b1bc745a02c3fbbe6df09357a4ba1cff45c78b1c8a2c1015aac7f0f9a2b07f4cb3b7169b50327d42b247897a533af3f60369fa8ddad4d74eb353e6b WHIRLPOOL 74a3ff4e1e4446bf33de5b13b6a1d9807a87be51661aa4699705dd4d801611882f64cf67fed5f25713861510baa8b4497d4b15a130e113af93ac9f9928d9e0cf
 EBUILD e2fsprogs-1.42.4.ebuild 4329 SHA256 f9840190bdf5fd375a75032936629ac8bbe37e0ae5dbc085948d37158561c7f8 SHA512 f48129d0693fb8a553a07186aa68d9f6a0781995dab0b6a587fcf083e1adf84375d1dd125b81bcc02ee77985bc389ae04d0be122b1b82a84d2423cd19cb51514 WHIRLPOOL 35105adf9d46ff9496ec8867301b77e14b01cf01e4829e6fd010838d2ec44baf2f87252544acf5a1eec9fff84076d361dfc6a44cf630095c28ce035de27a3878
-EBUILD e2fsprogs-1.42.5.ebuild 4270 SHA256 4acf427564a98c2ea223c1206290f2189052acbb38c19672ff1f78a1ad6cf53b SHA512 f22b6d2f854304f8f3e7ef7aef6846bc2dc4ec01a5c4013e83334ce13c562d6c2787fa80dd62cbc8d5eaf07bd9ad01c042caaa3a5dd65056d0a5294e503a1bff WHIRLPOOL 092c3dcc3425d97ec9078bb5868a215e284eb7001de0d001864d41633797b356446efed19df90296585e2b347424758a78a95ecd145acb0d7e949e3a5d349a55
+EBUILD e2fsprogs-1.42.5.ebuild 4327 SHA256 49c96b22e90e135da3df1f53a1fa645db6535fe0bac81a5094b275ddc9497fec SHA512 fc24fe21824977515276b1f3bcb9b43e2b55f8e728e8b583ef596e84ff8b053601d341dddc434290dfa707ddd5602df1489e88e541a5384d7f77f80e89cb1287 WHIRLPOOL 9d9046025e25b1cfb5717e0e06a998458e27e3d4d8150c623ef23470e942a6bbbf2fc054227736fbc8e7868cb7254dcbe6035ce121b15c51ffd00c340ccbd827
 EBUILD e2fsprogs-1.42.ebuild 4523 SHA256 aebb33bbb1d0f0b27e83503ac1fb8dc83aea140d2af77b34aece290ea5aa33b7 SHA512 0a2e7c9bb1942a3e754dfb5645ab84a54529f7e3fddc2147ca7ac28652110bcb35f06208c40d9ae301bd0647b6e817589f5f129fdcb56c2e75134dc478d1a7ce WHIRLPOOL 42ddae6fcd1b1bfcbdfc2a261d07925ef5a18d8903f1738f5ef6e8216befe97e1d20a3351a81cfaa18a44a24d299e72d32acb3216d058337443364a62dc77348
-MISC ChangeLog 37731 SHA256 340a3203e01969f01c2ea81258eebd9476b95c537c15f5e20431ec11fba68c6a SHA512 ec1548b5901fbda303458079524bd82cbd3d5a5b464e0983b9866924dc089007e4f895f17945abfa0e1ee64c020a44cdc2bd0f61d3e332e394596125827fa4c7 WHIRLPOOL aefd1e5ca2286b333b2f35e4154d27a938945c0301e0b3e5b639b11beb4556b4ad8b20f6bd973ae15780fae2359f167681d08081e534db55d3933122096cb936
+MISC ChangeLog 37920 SHA256 1728fa237622b437b958c811e5712dd78551965862c7385709c716c353ce4c31 SHA512 ef0aed1a1a094ebef5673ff6c3749f4033145c710b3b1c0d34b63a1db63b0c595ad5d11a6e38a5df6d474462b25d94adf671c9291b038e6f4bb44f1f3c676939 WHIRLPOOL 4ceb764f2f0c640ddbd711c7fef2aaf09d963ef4c06b89709d31d602e4b6fac8bfd4845fb7667b511135b8cec1eb9dad221de84be017d6a81f6b9d301031a612
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQG/bgAAoJELEHsLL7fEFWZ2QP/Ag715H+pHX3Qm1XXnWyS80l
-b9jBncV5RiI5Nac7rwSZJR/fGA7qMz/E32F78MGY8H+bYZaYkGar8NmgEL/iLLKB
-WBYZgrGvrPfF970P8Z0FbYxL86DqcTIjs0izMvL/PoeDEpNhmK5jbl1Ml7I/b5Zj
-Rp4IajoXkjJjfp0IUD9KAdjfFINHefJKcvFEYzWgw3SpBzQbZOziDcQp0agK4kwl
-x+X5KTCw4mazJIEbVR7B3saR2yfRP2EPf8271FxFYU5svdOHfl9ok1mK+hrLJIJK
-5TXTY7pgj0xMv7rhd44ApASY5iDkb70UI+rh9MKJruEIjPa5DTvEoJG0DaGqQUPN
-R98yJa531jvNUOQRt1VY1d7pby9TR+wJy4zKKemfU42mylOa4kze8j2xU6MOVnhO
-wwDJkXKQ1vNntSEe2UthfTe8ex15iA5IXBjWnM505SVHa/gXTgW6Gctuem45P53l
-OhDZbGVGJEBCIldeECLwxq4sgbQbxWKMFSMEUgHQEAwy1QEvq4jixeosxxh//Qbk
-0KCzch4gLa56yhGuhJI9sE7kkRfZ7JD+dt86ofbpEC3lGF07mk9QwZz8g7hHQJvi
-p5ZktMBfsly92Tqr0QD9JeLPRWP9n0L072vYbLR0bxzr7QbfouFzMLxMKpyy80ZL
-by67YjMLOChjPU3vMvfx
-=l7no
+iQIcBAEBCAAGBQJQHXp7AAoJELEHsLL7fEFWls4QAMJv2y7bwst0mtIlGged7yvG
+TGOPFYnx0PqNJnrSN+DiX38nCHwj/SX7jJ2EXo/8pnkhm0ogwBmgu8s9OZxxfjpP
+G53LMFdBkJXUmXQ4RCQfb0ONHd/vlFWc8m5813HHhk55feGLnWFIYN5ou8qCCkTO
+hTVhS+IOknd11SdxRJ7oaYn0cq2btlfmWu8kTjbjLOWAOJSBHzH3rrbAgRvPPC8I
+Yfl1P9pvSMbYq1rh8jOcpARJuJyJVQYcam8bfgv7D9d5I1w3y7foqiBDgHp24Eze
+oCz4e4YJyjgmwpBcjDFqiL1DyOy11eYiz5hSU6lqTB7yR7wR9WgLt8Utn+qPH6a4
+yOxwyJA5mY1IjIrOq9XOWlGGnMIODOXkdPjfcvLpczcv9HidodJVp2glo036aMUU
+0jsu6Ou854seH32X6NG0J1muq5H5yCyxc0YFfA6YiLI7eWo7us2frccqCP32+8GW
+b4+8F8TJECjpZN5/0xdSHuiXvl0/hXjyfXoiJ1Avn3y1sJOjcIzpNQxJ3XF0p6x5
+5QRfN5r+65GWthnuw7DxdhlxsH+91xk16XGKIDXRdWPg3buLBGFMymVL2oHWrJUn
+CkI72mBjvgY6jnsmpLS6kqEjkJ9joNStMSE1znGYJ3+pM2xnmKwTZyeauIKkasaK
+dMqNTUVQVALz1YmUfPAG
+=2BAp
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.5.ebuild
index 55549a3966ec..6820b834d9cc 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.5.ebuild,v 1.1 2012/08/03 16:05:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.5.ebuild,v 1.2 2012/08/04 19:39:32 vapier Exp $
 
 EAPI=3
 
@@ -39,6 +39,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.42.5-ldflags.patch #429756
 	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
 	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
 	epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.5-ldflags.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.5-ldflags.patch
new file mode 100644
index 000000000000..d84d54a2e88b
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.5-ldflags.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/429756
+https://sourceforge.net/tracker/?func=detail&aid=3542572&group_id=2406&atid=102406
+
+From 949c2c19e969185c69f0960549a559ed22afdd24 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 4 Aug 2012 15:12:29 -0400
+Subject: [PATCH] Revert "Link shared libraries with local libraries instead
+ of system ones"
+
+This reverts commit a7c17431b9fbf767235d614cfe2e4f22ee0d6771.
+---
+ lib/Makefile.elf-lib     |    4 ++--
+ lib/Makefile.solaris-lib |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
+index c66281c..c24636c 100644
+--- a/lib/Makefile.elf-lib
++++ b/lib/Makefile.elf-lib
+@@ -24,8 +24,8 @@ image:		$(ELF_LIB)
+ 
+ $(ELF_LIB): $(OBJS)
+ 	$(E) "	GEN_ELF_SOLIB $(ELF_LIB)"
+-	$(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(ELF_OTHER_LIBS) \
+-		$(LDFLAGS) -Wl,-soname,$(ELF_SONAME) $(OBJS))
++	$(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
++		-Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
+ 	$(Q) $(MV) elfshared/$(ELF_LIB) .
+ 	$(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
+ 	$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \
+diff --git a/lib/Makefile.solaris-lib b/lib/Makefile.solaris-lib
+index 66f2b4c..92bdbe2 100644
+--- a/lib/Makefile.solaris-lib
++++ b/lib/Makefile.solaris-lib
+@@ -24,8 +24,8 @@ image:		$(ELF_LIB)
+ 
+ $(ELF_LIB): $(OBJS)
+ 	$(E) "	GEN_ELF_SOLIB $(ELF_LIB)"
+-	$(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(ELF_OTHER_LIBS) \
+-		$(LDFLAGS) -Wl,-h,$(ELF_SONAME) $(OBJS))
++	$(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
++		-Wl,-h,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
+ 	$(Q) $(MV) elfshared/$(ELF_LIB) .
+ 	$(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
+ 	$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \
+-- 
+1.7.9.7
+