Drop useless -rpath flags.

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

4 files changed, 25 insertions, 19 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 6ee0795bc119..df2ad5ab1acf 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.428 2012/03/12 18:03:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.429 2012/03/12 22:52:51 vapier Exp $
+
+  12 Mar 2012; Mike Frysinger <vapier@gentoo.org>
+  files/openssl-0.9.8h-ldflags.patch, files/openssl-1.0.0a-ldflags.patch:
+  Drop useless -rpath flags.
 
 *openssl-1.0.0h (12 Mar 2012)
 *openssl-0.9.8u (12 Mar 2012)
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 92bfe9130b4f..a21a0c844c90 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -4,9 +4,9 @@ Hash: SHA1
 AUX gentoo.config-0.9.8 4249 RMD160 a63c08a30dd294429c562b8e24bf2b13ba220f63 SHA1 737dbd27e39726c49e44f5e92e46bdf8a8ff9b4d SHA256 c14ff861759f4ebaeb57f37ae7df63af4dea1767eae07ef0eb42abd43cebc4a1
 AUX gentoo.config-1.0.0 4750 RMD160 2a6cf1e6be4b118ae27f2e6e24876e00a739c21a SHA1 cc79b4c1bb53d0fe9d30999d4f2c102f9d9b25e8 SHA256 de30cfb4034e4b4f4cdb7ff04ec67e3a604210a9818d2e31a1ce403be90b7b7c
 AUX openssl-0.9.8e-bsd-sparc64.patch 1484 RMD160 dd3d18caccd8167673a438cc83fa44f2e993949b SHA1 d07542663f934d5dc2f8f8b8985bde9b033aafdb SHA256 8a79f022a17a7fadb4eb708538b41a7a034e21ad84162beb1f7fa7cff5eb487e
-AUX openssl-0.9.8h-ldflags.patch 1000 RMD160 1e87b16d841360d790f06d714ea5f0111e83ca97 SHA1 72e7ccca848425d7cfc3f58f4476fb8fda4ec2d1 SHA256 00179ad3dc3fecc9193658202d7bb5c81169bbb2be59e8a90201ed43eacec805
+AUX openssl-0.9.8h-ldflags.patch 1048 RMD160 135fd775fb64d4e4e6bc06964142bcaad318b7cf SHA1 63baa0bce305decedcdc843cefabcda77e04d3e9 SHA256 2c7cca7b59efc9da5de2efebec2085933295c2875d221c54897dae770cca45de
 AUX openssl-0.9.8m-binutils.patch 684 RMD160 78ee10d906423a77aff91aac2166bb5f58c386e6 SHA1 b7514556196a730541b0c99754b4ef79484e27fe SHA256 1e4475f7183ec237d129b686d4ca5265bf7eb34642e7d9e77cbe8ad9a97b4876
-AUX openssl-1.0.0a-ldflags.patch 914 RMD160 1e057330b3fc84d7f799976c0ba5cce02f505f57 SHA1 9bada0fb576b4f78b046b77b77248b352e1953a6 SHA256 33f5d39e2b6464ed33654214a0148a6f6546fe319793ae04f54d2106422ddba1
+AUX openssl-1.0.0a-ldflags.patch 891 RMD160 2a5a70347c9419f28c31b399f5a0ed1b59b78fc3 SHA1 3b0302230dbd53fda2441b2f9b57b85fd8604162 SHA256 f04cef1b912681393236f9631792cd404783586c2fd8e0f011ace6236cc6dc4a
 AUX openssl-1.0.0d-alpha-fix-unalign.patch 1377 RMD160 9b2c72fd9c28883b823c2df90f89b32f3854d964 SHA1 2f28ebd219bbbc8e8780d72b7aa5763354de0452 SHA256 e5f1c60ea82f22d7f388ecc9db42aa872e1329a672e41297bec2bf9b7a662244
 AUX openssl-1.0.0d-alpha-typo.patch 235 RMD160 0cccd47a97bbcc9feddec767de61cba3fd7fdfd1 SHA1 03242d4019182608537a8b9019898a23949fbfcf SHA256 60d2cb4cae47b5d61aeca2b6e0ae45d82c3b2ba698df72d10ee26370abd354ab
 AUX openssl-1.0.0d-fbsd-amd64.patch 417 RMD160 a75ca3b792caa64e32732598f97872153db61464 SHA1 f196432d6ebac143cb39268ef65c3efd9fbc736f SHA256 c72d33d0ac88280fb444574f236fefd73db4b968d342b0fb4530cdffbe2fff5a
@@ -37,22 +37,22 @@ EBUILD openssl-1.0.0f-r1.ebuild 6910 RMD160 d58f4f441ffc45c3ed69e8ffbd4b7fe17b92
 EBUILD openssl-1.0.0f.ebuild 6922 RMD160 a91e88a91c36ee689442d15b779d7f9b3b31a634 SHA1 452ee8a70c0e34f577f024f5ae927e35243ad44e SHA256 0a0de0eecf49995c6094802116c1a4319261129b2263e1025d6205716803d7ec
 EBUILD openssl-1.0.0g.ebuild 6906 RMD160 05987220a871354539969e5723a69140990f3973 SHA1 a2e582e1dbbecbef7c4451520444b4b1035cd48e SHA256 5fcbd75cee413c53da5fd711c0703be1d2a12756a34239f17f03d1c4c6f767a8
 EBUILD openssl-1.0.0h.ebuild 6918 RMD160 442157e9183577bb196138c77ee0bde49a34515f SHA1 4deb6a16fce9709e62d2f771bdcef7347886d594 SHA256 08903a329b84088383e6031ce70177603228bc9ad87108088e4a48b6294a681d
-MISC ChangeLog 64577 RMD160 dc33acd30c82f8478685f56474e7d7bfc2c0f61f SHA1 3ed970692193c5604a1e6c24bc4f648d3202505b SHA256 873c3f50a67bd9086c3319558093b066b1e97edc4354d4d401141eeee8b249d9
+MISC ChangeLog 64731 RMD160 9dcd5f594cb94f4bab1641f4a3d9d91d65a52540 SHA1 8073372962fa4d987993b749bbd0b8ec8ea152d3 SHA256 66589ac6c1fdad0507ae490418a8b5b51a4e10730a2f18a4eae30a03c17f23aa
 MISC metadata.xml 374 RMD160 9aeb5b3f983a6274f0aa03bd395b7d12b937ca62 SHA1 bc9aa89e74d572266aef36b2f17101098d11997d SHA256 ce29618473c02511695f6767087277e246b2d252ef6e662dbc65e9df44722f5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPXjplAAoJELEHsLL7fEFWqBUP/ivNtWr6G3YSYLZy3RwJ1Q3O
-4HsEk1TwPdTmBIWX4p3wgRdnshogpTW13sfEhjlwFwgnsP7ok/f/OpCICbwMqHtU
-L91HsBoyAoUegmetCcu504rSUgjiMgB0DFIjEmEFpP8H8/s7EH30ySEba9wHATUA
-qmPBY35qHDPnCcsKcP+Mp0ONmMTq4JoZeJRxyyqNQMdWUin7xrKmwR3bu73n8buh
-r0VT6TagZATwt4+Pjj2XyR8+Y1p1z0zEJgVbACOK1PK3tyrASih+yIR5GETdynIl
-NlptiEZaHv5Zv6+RmzRGwgeKmsjxCse1n40OAGQVu/q9ULveDP9mdE+odnw3D+K6
-lPtA3yyEd5EYmkluUNMQv2o1etz0TQYm10JBOF7rJxnn8Q2GgZiXG6iHVAU3vLyv
-lTflgEZeYArtaNXPit4IRQiolOMabOYIow6Th0pxOQ977bLDwC7dwwFjTZzrS5Ux
-9bbk8qN++FabSHcbxkKAbA2iROtu2aWrt3VtZ5FYr6v3xsY+L09uqejvp2ZLbcH7
-ORVOdCWlenYPiOBtfNoOgCAFSzd7NYYrcgo3Lp/QeegyT7INEYxfC06+y9I1pfdY
-+1v8SZSd7+cJWpg0g62x7H0vagzS2frbSvPkZruI89xV8lB/JPL0idELutYBCBRC
-ryfQkUOWe1GiZ6A5tq0r
-=vdC1
+iQIcBAEBAgAGBQJPXn5PAAoJELEHsLL7fEFW9BYP/2OvQftiwuCsb2/UOTPBJ0gY
+ICQsDzeQjOA79GqJhFMDaZZunbw93xj+yoEX5ODkd4KLIpd0P85Y1QXQRUBMNBBa
+K0TPdzrSwq8HR0k1FYIFFc/+Qy8Fj0UY6/7zR00nippClaumUKcGBI+gvxP6Knxz
+0fSNca1M/irEHt3S2VwRbMoXDtzDTdMTHaMm/EebzAA2UiKerJj8axpaF+3yZW19
+HwVALeiVCvhd1PzqCsJSzc/E0aneHfoYKM4pj1MwmBvGdXiFOYD3MdvI4HdIp60/
+CdlHSpteS2rcoxDruJmSjrpWP4/YFtFu7cRGVgEkn2WpRCr51pLuhsDlaf3TOZni
+ly9qXPJFzJoIzAX5eaYjuvOnV9jq13uA/MRBz9gDstfiJOC+PzzYhXdkZ//ZU/yl
+gbvOYB1jNTaRmBUrqb2yQ71EVKKIYBp9Sbam6CiJdvPEjnMizOzbbBck5h6xxs6/
+r7+oeXWAjEzqrx8VcXde0+4hn5EWtTa86vOJkoYAd9qW37rSs9ZBx0AjZnjgWMqa
+2zkn81oWzSg2bRIYWwmkgqXIT9W3UXZJCf5QGD6+hMsKi8aW5G374fCaSzr/F9Sv
+M0oGBtf4HrxMvFd1lCvBm3bqWxGVMYgMWHbnDGmT66Z6UkxL1EaOZJ4OLxVtvvnp
+uP3r6ZvLrAyi9pMrLcqh
+=9iii
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch b/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch
index 462af70d7c36..254d20594bb2 100644
--- a/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch
+++ b/dev-libs/openssl/files/openssl-0.9.8h-ldflags.patch
@@ -2,6 +2,8 @@ http://bugs.gentoo.org/181438
 
 make sure we respect LDFLAGS
 
+also make sure we don't add useless -rpath flags to the system libdir
+
 --- openssl-0.9.8h/Makefile.org
 +++ openssl-0.9.8h/Makefile.org
 @@ -180,6 +181,7 @@
@@ -19,7 +21,7 @@ make sure we respect LDFLAGS
  	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
  
 -DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
++DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS)"
  
  #This is rather special.  It's a special target with which one can link
  #applications without bothering with any features that have anything to
diff --git a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch b/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
index 290cdf92e8c0..c0b3bc3fdde8 100644
--- a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
+++ b/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
@@ -17,7 +17,7 @@ http://bugs.gentoo.org/327421
  	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
  
 -DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
++DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS)"
  
  #This is rather special.  It's a special target with which one can link
  #applications without bothering with any features that have anything to