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

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

4 files changed, 72 insertions, 18 deletions

diff --git a/sys-libs/e2fsprogs-libs/ChangeLog b/sys-libs/e2fsprogs-libs/ChangeLog
index 4eae69b32a5d..5121a36ec11f 100644
--- a/sys-libs/e2fsprogs-libs/ChangeLog
+++ b/sys-libs/e2fsprogs-libs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/e2fsprogs-libs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.90 2012/08/03 16:05:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.91 2012/08/04 19:38:15 vapier Exp $
+
+  04 Aug 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/e2fsprogs-libs-1.42.5-ldflags.patch, e2fsprogs-libs-1.42.5.ebuild:
+  Revert broken linking behavior from upstream #429756 by Lars Wendler.
 
 *e2fsprogs-libs-1.42.5 (03 Aug 2012)
 
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index f8a3fb2c351e..b0f96d04d53e 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX e2fsprogs-libs-1.42.5-ldflags.patch 1812 SHA256 909210a62600b71c1b1e6ae96b69cf9bbde72d7ac756a4ba61a4e8a22d4d9e82 SHA512 8f779e48049c9c9b93d5501d7d896db16dc5e6b8dddd1a43cb688ae7fa30b3eb2866c77efd7ddf43549b57a752be171c3e75b3774cbef1c8b62dff4769e298ce WHIRLPOOL 776fac0500f7b7dde2962ccebdcfb81b152c5b318f07d9a67c6fcd2f7cf009231bcfc48b7857c24de5bb26351f58c9c0a7829adb92e81a92144afc33deb122a2
 DIST e2fsprogs-libs-1.41.12.tar.gz 490781 SHA256 2f2dfc223c3ccaf7064abf13b692561fdc103fa5fbeea895253fe169b6598d2b SHA512 14c95c878adf0977018ba3257665995c14ed5bc83f1a0d9f11cbccbae9a133f0ae3dd4867f2dd25c85e893d8754a2631b2295fc34e47aebaadd28ed519bf9a23 WHIRLPOOL 9962a44ac4bdfa95dd47dc06d53343b1af30c16dd42747d9ee913e8de9b100b976eed1996f20c1810c407bb15e2c41d59158ff6392007ac3f8f17c3477fa9f0e
 DIST e2fsprogs-libs-1.41.14.tar.gz 489703 SHA256 dbc7a138a3218d9b80a0626b5b692d76934d6746d8cbb762751be33785d8d9f5 SHA512 3199e8ee538cfb18f709bd32fae38dfd32b63758875e5a2c8553a3d0960adfd3eb3224b9888be8c1846d3a731deaebf0100e0027de3483a3157c53d385d4d693 WHIRLPOOL 7e1b8a4885d5f46b0cc6b167ace161fd420910c0d890e31987d6bbc95dd1e10a538222b25acaadf4a0334e2b22e75518843886f92696200624b14a7252ef1292
 DIST e2fsprogs-libs-1.41.7.tar.gz 494463 SHA256 b6d9c9ec405ad1d644cf35d57f0f1e878fa6af6ad45b97683de847ff49cbdf84 SHA512 01bf6571efc3b63b985bb45190553cbf0e486ddcf022715a2bdf36eb3e45ffada603ed52bf17d6920b9dc3e98ffc6758d2481a83b68bbf5d946c76173f7d14a8 WHIRLPOOL 058fc1278ff2427d956728ad2d132652e80b60570c20c904c6d6e2a15c4a9d00ec13340ad56114f82dd703ee87cd576c2f69eb3d40f1f16743430476c3e383b1
@@ -15,24 +16,24 @@ EBUILD e2fsprogs-libs-1.41.7.ebuild 1375 SHA256 1d0cb56ff0730d1e7ad90825df12610c
 EBUILD e2fsprogs-libs-1.42.1.ebuild 1704 SHA256 4afe77df603645a7b03d20ae71cc7502ad53f9cf2dc8b8fa5f77c8e4d1254972 SHA512 a578c51d584ded0f8e053585a2dd28605e91a357aa188d6d28250b6cf7c6bddaff652115165e6e59b6b06d260e6972ae1c48ac47c166f191b32eb3f195b09d45 WHIRLPOOL 798ea88dc21a1fbb68ad4ee19c56dde82bb0de9098f7a486b85480e71e928721ebcb3f4fb1b50ea5af1b7ad3384afdec899de8773509606745bc76e3c25b9c02
 EBUILD e2fsprogs-libs-1.42.3.ebuild 1704 SHA256 873cf3ab95e44a0dd1e6376bb1684dc642f2ced6eb1168ce83d8f1b858bdfe45 SHA512 6b02a64342ad52d788cc812e1aabee8a22c0122a7a0fe65b63a58aa536ab836e0afb203f7b541ee78bda36ff98e82239d4083e7ce3df9ab7e4639c138d55e122 WHIRLPOOL c0d59b1c7fb67fb353a9a6657b01a1c75596f0d38932db87b9dcc5c19141ff14302ce1c70f01492e72b636cf08c586a05c755d562670fae07294d22d1d759c46
 EBUILD e2fsprogs-libs-1.42.4.ebuild 1704 SHA256 8809bef5ef938700c042793e52b1602dd74bfa551b18abb238b99e29fea87e57 SHA512 83bd6574c46a801e0360174ea9a3ec0707e2c8e095489fcf2cd4a38079f6d567758a1eafd403f5ba18727552164468e65aeb522cca87a81789c3ecc5819b071c WHIRLPOOL de8cc6c19089ffebc26ba566ced82d75430c9ee925deeae0d6e489787b8a185df5f1e9141f4e5cb90d6b91d7a5cc5fd60650af98a029ed9ed675a136aed23de4
-EBUILD e2fsprogs-libs-1.42.5.ebuild 1704 SHA256 3b89ff5d2451e54a5120e9c3205f74a121379d01ce18044de100d5a0acef9359 SHA512 34d1e0aa7cf14a70b2e140c5bd2b3214ddef61ff8b543ed681a075523adc65d07d83ebcf64e95b584a2640da8c08cbdfb5845cbc37f8c3cec35f5c10acf2751d WHIRLPOOL 29533af0ac072c40dfca51f4d232c36b032e4c0449464caa50b42573d7a969e9466af2f4568f1c80000dca4e8022e3b30e6bc60ddba77083612ed9a80ac52243
+EBUILD e2fsprogs-libs-1.42.5.ebuild 1768 SHA256 5b1cb6254d57ab2af97a42abc14f21b7c1410f44b1da52fd3923b075fd120562 SHA512 23b00d47460fe40ac758981cb67dc042ab92e9f4dd6cb8366abefa6f90cb43fa59f31691991b06bcd23af46674d151d4873b2f1f87a2493812ade0ba478c05ec WHIRLPOOL 128d0140f3709a979529fca01bbc7582144cdc49d4bc9c6bea783c52e175b28282493227f2a1b79a170119977b57dfbd0a61f8bde018d50d9520bfee5627745a
 EBUILD e2fsprogs-libs-1.42.ebuild 1677 SHA256 f6d23a14c00c0e6e7c33c350f5bfe18b1b728dd5426b3487798447b99e58bd07 SHA512 1298178fdf3b304305e4384ca55aa272ae059ecd42736c16b7241cdf091e8b0e3d19848f7f5d4685e9dd36e2f82c7aaa19d17366faf382c40021f176ccd16488 WHIRLPOOL d065101e7df99885a9161700ade7738a87d9b6de545f2ce2cbba4b64f5ba6ba2f4abe62dc97f1355a8f22f70cb01a1bbb6c68faf90ad856cc5a2e8b58b705b97
-MISC ChangeLog 12533 SHA256 b7f8b02cec752da896a1883284c6f277294170d3a9ac9214163fa84e6e1a9cba SHA512 f1d551a78d37a283b167a6279c049603cc467bf83eb274cad57068589401c7e09e89903a59608e325c26d834718fbc1e17949dff4994088fc2334fe21e27a44f WHIRLPOOL 31dfd6247375b70adbaccf31062feb40e004df2c82428ce22b2f17bcd632c682b1c8d1d7ead5b7b596160ad0375e9c3d94afd16c5b91de38933bc89705d726c8
+MISC ChangeLog 12732 SHA256 026b84b747ed4e90edeb424491ea3cf2cc14e96eec1b7725fff26edd4366c0a0 SHA512 61cdb89eac1fc233c3afa1e26271c9021212b491baabdbb4430de2426c94440ea3830bc9b6ae4e38a0dcd9317ac97fc9c44aff0074428e005b1be9ac580de061 WHIRLPOOL e9eb5770d75b5d34c3823fce2c534bbdba0ba49fe37640fc2a353e51be9bcd55b2241937aa02bd383685ccd5fa7b9cced9e7c7cbf1d3a1e0218e26a0fc89cd4c
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQG/bbAAoJELEHsLL7fEFW31YQAJ8g+EYTPkLNp+p3lpjP51Cz
-pAW+pVQm0PcQmYM+244pHkgATEePRR8OnKjaBExpyP6GxkzDUbEqX3QMZE6JKIHo
-6HLsaUJH5vzzG50LZ/4dXLB9WpNvnGcncGCGbfYpNjax9224jed5Me9AEUbQHnsH
-UrSgL96YGdn0RP22oLnnkx9GkZ9Z2Wyy8Yi26C4kW8u4rOP4HSgLm9JRTcIzQaCI
-kGKpCuA4vGcWFR0MLv+29kegisBLCm9ZKeJxw9oOXXc1G49wd77ni04VjYD/1eQb
-KcdmM8YFHYbYC1LaFvzqbMc5FniNrDqGQHXESvzcKrOaUdkHOAHg/Awhlez4GGDH
-dX0Zfk18tYdkS5w2KZIkn93+xXcdvpuFiScSkCSvFdXBGW5qAiuC8lM3UQZpiUxI
-GltaQdB+wJKd+PMRXUpCGxXln9r1j68cM1CzCPp4lw8RLBH2ocemkxg9EIREmAx6
-K62he3UOf2D5NBm2vUTXlOEpMRIJsa7uCxAp9q73lIpYLNCn0o4cnjyD6YZe2A32
-OfNyYR2OmStrmOpG3qO6LI9w2v1iVRhHXwYKSnseJnL8dQ2vQ53mw/l4Xsb9NSoD
-RGtcWW4oByTmzTGmEEqfjvoaPoM8jbZuJKTzYsJz6OoK58qZxfwQiYlVJ7GR4ZYt
-7arVtWrMEGT1aofJl+nJ
-=cm72
+iQIcBAEBCAAGBQJQHXouAAoJELEHsLL7fEFWJAwP/19icIiRkSQbQRmb9xyHB3eH
+cCOMJUDZaxF8YILGGCL7j4EzaSG6ulbjJHyTVXAZgRUp3kbtYU4p70uNHBUjV6nM
+EdcU6D9nd3a7FirVp9v31hSKiHIAlkGjo7g2l3Yjxa2OBEuUtWzWWR/jdQ5+afbo
+sdSGZ7rrEsR9fMbfsFcHVSkZGqDzZDS4ST7bjLz7dIYRb2lvR7C9EBUoEBNXm0MM
+WdEYI8IqD5P1U2TcqdFqIKSUynltQvsScAPTaeRxHxC6xsLRbGzncii1WF9zpnS+
+RqjdlH6ZlUmOirsNKrFn0bD4yazK+0oYHQtth5/kk+sQ7IBQolPuo1u71J81PHNk
+ibgbXZrGM02Y2k0246ICdNVyrOz0x1ObNgiuLAXl1wypcK+2PlyBMQJaRwkPGVC0
+Ga6COQBHccMQzGwXJKDaobkgPSLUhiPobNz71PZ02yiasijwZ9ucUru42qFdsMtP
+5hM8AI4WOkk9W4iV7zssXlfKPjTmqUK/2YPE4oAkOwHSvo6lpA3I1tcQg3aII57p
+XKmYN/ltAouyrQ7zs0lgzRfh8ie7VZlvM2Ydu6Xss8HOA+MZEThJ2yH21edQgrOh
+HRDN7IjGt5WA4bYANIJA/Ougf7jMctQbpgoXX/8OWVMb+ais5np0UuIOnyMXdWud
+OJmOXXDtt0bc8LOOiCKK
+=nlJI
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.5.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.5.ebuild
index 1412b79bd346..aa5a6b62cdc3 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.5.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-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-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.5.ebuild,v 1.1 2012/08/03 16:05:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.5.ebuild,v 1.2 2012/08/04 19:38:15 vapier Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@ case ${PV} in
 *)      UP_PV=${PV} ;;
 esac
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -29,6 +29,7 @@ DEPEND="nls? ( sys-devel/gettext )
 S=${WORKDIR}/${P%_pre*}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.42.5-ldflags.patch #429756
 	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
 }
 
diff --git a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.5-ldflags.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.5-ldflags.patch
new file mode 100644
index 000000000000..d84d54a2e88b
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-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
+