Fix broken dlopen -ldl check, marked ~x64-freebsd

Package-Manager: portage-2.2.01.21313-prefix/cvs/Darwin i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 23 insertions, 9 deletions

diff --git a/app-admin/chrpath/ChangeLog b/app-admin/chrpath/ChangeLog
index bcd29332549f..f9d5ffa8012d 100644
--- a/app-admin/chrpath/ChangeLog
+++ b/app-admin/chrpath/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/chrpath
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.24 2012/01/09 19:51:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/ChangeLog,v 1.25 2012/11/12 19:19:21 grobian Exp $
+
+  12 Nov 2012; Fabian Groffen <grobian@gentoo.org> chrpath-0.13-r2.ebuild,
+  files/chrpath-0.13-multilib.patch:
+  Fix broken dlopen -ldl check, marked ~x64-freebsd
 
   09 Jan 2012; Brent Baude <ranger@gentoo.org> chrpath-0.13-r2.ebuild:
   Marking chrpath-0.13-r2 ppc for bug 391239
@@ -102,4 +106,3 @@
 
   05 Feb 2005; Tavis Ormandy <taviso@gentoo.org> +metadata.xml:
   initial import
-
diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
index 1957633d506f..6c3802f873ff 100644
--- a/app-admin/chrpath/Manifest
+++ b/app-admin/chrpath/Manifest
@@ -1,8 +1,18 @@
-AUX chrpath-0.13-multilib.patch 4130 SHA256 6abe262096db93bb62f0eccb8ed4da1a29f53076353da9dc4e1527165bd870c0 SHA512 01db700e609a1e3d328ed6bd4c0e63ca8d09b3d9c5136f026107936d76fcbd9ba11c6d55b6d4b92fcaf9eed8a29a2a960379b2729e54fa305c973abebe76b603 WHIRLPOOL f01b0ab2070359bba97f6e0a23b24735fed56f28020ed70416977bd7af8f73da6bfa870decaeea177a3c1e0aa7237301eec47cd85d1a6b42573315854a138d2e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX chrpath-0.13-multilib.patch 4129 SHA256 332b779882707da6558965eccf1ab220781124ff9b879da5023d2efb90b86434 SHA512 45f1a25a7abee84e955ffb13485480efb1f768cb225d35a57fae5fa6a75dac7d633aa7221aad81aa6fef2cf8f27f221dcaee972ad82e70677049f2f2fc6e9ff3 WHIRLPOOL a4fc4f3ea617d930cf3afedc78cdc2c6add3647c2ef53bfd7721deaff8007f5e6ec8fdc6325319286ebe3be39926c3576421b0f1d4229ed9f763763aef2d2403
 AUX chrpath-0.13-testsuite-1.patch 575 SHA256 f780b05ce1bc8b77012bb81dabdbd9ef7487643e767c734275f5d8f915355dd4 SHA512 0969af4defcf4b3650e4416c8d17d747f6a785b6a2f0cdd2105e6ff111c04ecbfc236c073e6f48096494b08c41d6077a332b02104ff3e07e60c542d706f7ef6c WHIRLPOOL 8fe7b3892ab4b7a31292dc70a69c620add39e1b826b2612233a171186f7f70022a5d3d19caef921a93888542f3e7e0b5b2034b5874742294ce34393bd7f0a400
 AUX chrpath-keepgoing.patch 1041 SHA256 6c45aa896835cea3df7b0edcadea2171e8e5833b4d40c99babab15b5648d219a SHA512 7bd459313f3cd83c86c63adf8a39df41c0454f6a689aab803d3211b5ffa295a72ce45a8ed7c3f61af0f705fc614c4ce48d86c6a5706b20c4d45265bbeafceb9c WHIRLPOOL 672b65fb60207d4b9325ab2a5a8f8c35ac2082d8cddd3ec03e631558dc0cebc9b1edcfef637b8e85fa8a1a8943e210ad8df234b96f88b1bcae5008365ee434d1
 DIST chrpath-0.13.tar.gz 125129 SHA256 c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b SHA512 9ec2ab2731fb553497996939b421130ae221d478dab8887c184ae91f7d3ae697688e7a30e3bea30cc0cf765f1dc8c7f47d2a1f4369b36079b4033e8d0303d75e WHIRLPOOL 7bd658095647ef13bbad2e07e14ea3d3b7d3de7bb71c272465701a5430a76ce33639a641f8964194c8a78c181401522d175181da6c73336392e5f8444d43f1e8
-EBUILD chrpath-0.13-r2.ebuild 1198 SHA256 6fa042386ad4e97444aab1a4c37e663291248d99996b06311f8df4ad1e43355a SHA512 4ba5650115efdb50a2e7701369382f303eac811d8f88b6306daf49f0b747b6a4fc841baaf26331d96af42a81dda022a48da9002a7072c16c6d4d726f04c2121b WHIRLPOOL 6bf7fbac2bf1cea1632e88bf2caa7faba19714f39750154aa6d0d5210252503f86de707c78874fed68ca66944e6c5dcfccef586f89e321c6eb1aff4cb92cc949
+EBUILD chrpath-0.13-r2.ebuild 1212 SHA256 2e01171b3f78b36aaadee38023509a41faba6e37c054d9cfdae54afb33dc8098 SHA512 6ed4f5046f94d16f3f9c14b712ab52e70f7410c5adc4f33c3bd0177c3cff3541fe704ab02e633fb983bde228910ea23ae4ab92fd781ec28e48b1a80f9c52926e WHIRLPOOL 37abfa5fc7b305bb97d2468b52cab2a0f6dda54358a29a52315db10f8c97a179c2c8ea1e74aae8d6d3836c4b93a98abb0879b30887f04571d831154c915a34e5
 EBUILD chrpath-0.13.ebuild 777 SHA256 4dd3ad86be94f3a13a57e561b9038da08931cbd3654f9c9a6b96e172a5961b53 SHA512 2a8853cac93199083f29a1f112896648af0dde83a633af20e93945f2a4ca00147ed5f3845156b4eca10c50efde18b5331f1833f4ad67d14c86afe306aa240c6a WHIRLPOOL 605bc77b087e4f253c5d8c63400dabb675a0fc318ee011051e20fca3fc645891444485f4919caa547f261794c062a9a3db3c3c839f4c33f0823b84887dd25ffe
-MISC ChangeLog 4102 SHA256 3dbb31e763ed997a12ab2a4384de0dbb1019d2a86f59c06d191228ca107022d3 SHA512 fa221d435cdb0e4e51422af90cb75e26332c4534e5367bea561a964307754bbfd8d5ffe6e6fcd3b6505157bbe5d5f5dec85b78a974b2bf11dde5be6b99783b93 WHIRLPOOL 8955ed904b3bb852427415a51640812af6dc8b510ccdbe52e2c8411a0f9cb58a06dd94c715810f866e3821c130003690a308479c8f7a3b2ab0ba716d2249e6d9
+MISC ChangeLog 4267 SHA256 35d5519d285b865a78f71f4110dbbbadb7f673062e7e2bd7679f99e048dc485f SHA512 a57601db396f017b2457f05cd6a2cb7c2e91de6ac81cef2db54f6b37f3ae21106d7a715a048bc71e95b60676998fb9640b184ff325905d81428538e3cdd06afb WHIRLPOOL e9d23b8ca439df1a2d4dee1b854f099a37dd732dd8f4a5ee5247bf909c09660e67f2ebd13fdaede67714b31b366cfad72db05842c957d6b75c5ff1f1f7fc6373
 MISC metadata.xml 225 SHA256 3c78c095ab816f7d77c844d89c690163c08b505d6d7382195271b54a6b645d99 SHA512 1fdde313b88da74abee88501d319d418a64ba8240c767a6e5299f2139bcaf88d7aa641afae06b67ea6d39e13efeabd1ec82d747930d023fbc3166cc5107f6ac7 WHIRLPOOL 73eb6a0663c64c5c6968c504bca38cceee546f6996a2f0fdfbd30e28a5e86c21f4fa56121593c32236a7f4508b36712d784f173981605c16398fcf6c0a833eda
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (Darwin)
+
+iEYEAREIAAYFAlChS7oACgkQX3X2B8XHTolXeQCeNjRyp6SsvnT7hyLCWKWMRo62
+a8MAoI1XOH+93eXdBlfcy7RziJLz2DAa
+=lYzY
+-----END PGP SIGNATURE-----
diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
index 1d2293ead8d7..57ea5a84aaab 100644
--- a/app-admin/chrpath/chrpath-0.13-r2.ebuild
+++ b/app-admin/chrpath/chrpath-0.13-r2.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/app-admin/chrpath/chrpath-0.13-r2.ebuild,v 1.10 2012/01/09 19:51:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chrpath/chrpath-0.13-r2.ebuild,v 1.11 2012/11/12 19:19:21 grobian Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/chrpath/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ppc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/app-admin/chrpath/files/chrpath-0.13-multilib.patch b/app-admin/chrpath/files/chrpath-0.13-multilib.patch
index a0d54666ffe0..e7db0a124053 100644
--- a/app-admin/chrpath/files/chrpath-0.13-multilib.patch
+++ b/app-admin/chrpath/files/chrpath-0.13-multilib.patch
@@ -37,7 +37,7 @@ Index: chrpath-0.13/configure.ac
  
  dnl Checks for libraries.
  
-@@ -26,11 +27,18 @@ AC_CHECK_HEADERS([getopt.h elf.h fcntl.h
+@@ -26,11 +27,19 @@ AC_CHECK_HEADERS([getopt.h elf.h fcntl.h
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
  AC_C_BIGENDIAN
@@ -50,7 +50,8 @@ Index: chrpath-0.13/configure.ac
 +LDLIBS=
 +save_LIBS="$LIBS"
 +LIBS=
-+AC_SEARCH_LIBS([dlopen], [dl], [LDLIBS="-ldl"])
++AC_SEARCH_LIBS([dlopen], [dl])
++LDLIBS=${LIBS}
 +LIBS="${save_LIBS}"
 +AC_SUBST([LDLIBS])
 +