Use LD_* variables for 32bits too instead of the FreeBSD invention LD_32_*. We use LD_* everywhere on Gentoo and things like libtool wrappers have no clue

about LD_32_* and thus fail to run from the build directory.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 33 insertions, 7 deletions

diff --git a/sys-freebsd/freebsd-libexec/ChangeLog b/sys-freebsd/freebsd-libexec/ChangeLog
index b02f9cf98d2c..c4c1d727f731 100644
--- a/sys-freebsd/freebsd-libexec/ChangeLog
+++ b/sys-freebsd/freebsd-libexec/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-freebsd/freebsd-libexec
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.60 2013/08/26 20:42:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.61 2013/08/26 21:17:04 aballier Exp $
+
+  26 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  freebsd-libexec-9.2_rc3.ebuild, +files/freebsd-libexec-9.2-no_ld32.patch:
+  Use LD_* variables for 32bits too instead of the FreeBSD invention LD_32_*.
+  We use LD_* everywhere on Gentoo and things like libtool wrappers have no
+  clue
+  about LD_32_* and thus fail to run from the build directory.
+
 
 *freebsd-libexec-9.2_rc3 (26 Aug 2013)
 
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index 64097ff5bcf0..b341e9692d2b 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -5,6 +5,7 @@ AUX bootpd.confd 183 SHA256 c70c6a7a99470354a5f61bfe5c0f71325f4896e41da150e78222
 AUX bootpd.initd 553 SHA256 1fdc8470fda0acca9213c11e1e380110d36e992754709f754bec6ab04b77e7fa SHA512 a7522086d3c968485891fb658fee490f53582328dd07ee65f4b620b227f33f3bfb6637ad5758846eac7df11425f2e8ed681b70bc7f52bea2db0b4a29fca4b87d WHIRLPOOL a7725cfd975808759c91468f61b161701adaafbaab0e2675e9ebb33ed43b4840dfbe71cf4a203f3d9105cbaa02306258c6d12984c51a4e3e4866704b8b2d58a1
 AUX freebsd-libexec-7.2-pic.patch 348 SHA256 424ed7b69067d3a3a77ad387026548b77d41412f52ae17c737e96e57b6cb3b0f SHA512 c77297582efccd799f6d0e67c0976f1ee5551617abf2df9ccd0e2fc0abd7fb76ecaf7f5e019356034fb47d3cc39590a5eecd9b9868d2c356467e43e845638ab5 WHIRLPOOL 6407b4f3781b56aeb62252f87f7522e38930e24952610938a05cad24c0b56c62dac8b8b517c5805699432f3d3b4b59e31784def6aa38ca6b8a6c8aabace40712
 AUX freebsd-libexec-8.2-rtld.patch 1332 SHA256 0f0dc285b4797ab3be266db02f905ca72ffb39589c927311f74678acd9517e4d SHA512 9abbac7dfb703a05b3f6f1d3dc96db7df106355e3641eeb6fb446ea5f9ba15cfb9375e00bfa02b5ae26e4c9cdb52e14e2260981908c40e2c44549a43a2865ad6 WHIRLPOOL 41489254c1f800208bc0ff2548d109cd34a84c025f5428f85c7aada69c5cbbe3f165410cc58dff773b7e792c9c9145580423f55f120f0e29159b251fc7e99d0c
+AUX freebsd-libexec-9.2-no_ld32.patch 634 SHA256 ee5568c2ffbff4cf73c87401e5eb93165e813a2ff252d953a95fc4294dd2ace8 SHA512 df5421ad4d07d9f3d5f8dfd110eca588848ff55a63c70adf76f90746c1156ac50004a79bb626783ada8f96060fdd37e153e64da6ed43148c02a8eae4493c18d8 WHIRLPOOL d11ddc097a8ff171d143c655c1f2c9dd4ee3ff5e7bd6693bbd7c5d065e72c4d9e2c5a3521b9701ea0a3c7f5234fb174675373e68fb65cbb41c95133db6eb53f5
 AUX ftpd.pamd 192 SHA256 4b789fb18bc0d1f9b0a9b0f1bf5dac6d86166a7106e966e5f65ffd4faf5ce024 SHA512 d7e7f08ef05ccc63e63ddc65d79f96106dfa0ec2421ee9fbbb83966aaccb73d9868cb14467c1bdfaa9d12299a8ad27cbc725a33fec58e47b5b8212e52a7c18eb WHIRLPOOL 1d418e336dec5b6c34541c11068fd19ffe7546d338851f47359c50c18bc382c84230c0d751fa8185d48ca1c67250ba320fec895fc92f96c1d6909647db67a54a
 AUX rquotad.xinetd 162 SHA256 3f73f86e5a6ab3b6d25698f6179cdbe169b2fd01c682b45a9c8711f36bb317e5 SHA512 2cf16514f18abe2aeaa273fabc2dc94b09f31d02001ece5c82d9336c02d921e03dff6f82a613a4bffe57b5e415add2b82ef883a306907dd20ffe1bbe332b011f WHIRLPOOL 237667cbff4807d703a3c4c4eb8c2c5863d024a6263e3addf8d96ffa1461a8d1cda6318deee1de72146d27305b670b501da9ad4035880551dee5138b6798f6c6
 AUX rstatd.xinetd 218 SHA256 7bf526babdd46f03a6ea9ed12b5df16e5c2abc8aeb567214c8edb8ac327d4381 SHA512 febca8ab8248b1c103dd7be0806e3d678c5b5cf165a7b3bd0305bc905da228bf92392d65d44a765b7692f772befeedcbc3df205d32bb62ad5aa307f71a1c1011 WHIRLPOOL 76f8b1f3f85e97f27950549f62dc411e0620b25eba68c161c96a5252617c7c4beb0fecf94af9bc9cf931dff8fc4c750e780c41143a50b39d7538a30b7c0bd322
@@ -51,13 +52,13 @@ EBUILD freebsd-libexec-8.2.ebuild 1857 SHA256 df286327a737425ab4d190dca16008bb2d
 EBUILD freebsd-libexec-9.1-r2.ebuild 2430 SHA256 5de9072d6b316f50a089b249dbd02152e9de4d866972f13c21f1e3a3969c4582 SHA512 140ee3949ee749d37d187f54725fdbadc38d9d153cf7108fd687b2c8f8ea1a5fb31131e92aad9c863cf77e740205a38e06fbcef922c22e2c89b3d88b737d17ca WHIRLPOOL 9d349aeb4a2d4c59bb9b3f0aef2003f4d19209f8fe7a5e97f0749e643b9e28e30f5fd3923182fbe1998d169ce13ff18fb9a544df26a29d5f781b1af25a5a5e3f
 EBUILD freebsd-libexec-9.2_rc1.ebuild 2473 SHA256 9e61eeb2fe3d1c950479acfb0d64d8b3362cafa2518be6859cfb058c955a212f SHA512 b0c19884f3dc36ce73cc85b155c3e29798f6e0f1131b69c4a763c1b4975ad8f54ff1b2b92492ecab4b17480061229c60c58d463a8edf559d00f883e457963967 WHIRLPOOL acb876aad52b729a9428d73485bc7ee42ce07f2824d5645bb1ef7d94114f7dc3f71468dd9fbe7c525688b164dc6de98cc145da405a8d69674a5369a6d7cda12a
 EBUILD freebsd-libexec-9.2_rc2.ebuild 2473 SHA256 00403f456ae383c4fb03a8377ed2071e96abd5d31f92076cf40d8690cc44083e SHA512 a0aafc25afdf892deab5a619279e1b416652ee7d7d7d73a32e2e179fd7fa56823e012b1b5987a6bcec8c9626aefa66de50a37382a3cce51c582fd0c3e7403dd1 WHIRLPOOL 0e9e8f82769cd8d5d1ea5dcb21d4ca1c2155173ff8b98765524f2d853255a48aed1558d632db4019662295859575dc3228ec99d5b14184d43bc71c2e933b6a92
-EBUILD freebsd-libexec-9.2_rc3.ebuild 2473 SHA256 20b8686c1f8b27f46e7cad2a1e3dc5433f656a6017118e76654917f7eb83023c SHA512 6c034271ea919162a7483ba2be7e38edaf7c4174cb89423639fb90eccc85923b4718eacba7b0ffa95fccbb0aed5ee11b5728c2aebad7cfa5938a894f67cbbe13 WHIRLPOOL 96697bc3089230bdd9089295e4cd28cc10e1ab5148176f236e155176104e64a610343f55e400e6d008cbd80ed383690361be1e32d67ae94e893432f613ed1e07
-MISC ChangeLog 12658 SHA256 39e88f2f52a01329d05639acd9f9ab253b5eab7d03b39a994e10564b96cdab23 SHA512 59b39cfc8ea4af726d822662e304bbbd03618ec8ec231ee0987fca66afe41faff5715405cec32b099e931aeef836d99a8301f2b85513e92d1a25a5f2742ca350 WHIRLPOOL 432971e71f0ab863868dfcfd897f87a5b221c3f1fc03c5b68319ae3c68eefb3e39616aa3af919385d402374395a5d3a6d6e112af304e67a56d770663068b15c3
+EBUILD freebsd-libexec-9.2_rc3.ebuild 2524 SHA256 8503c74d2e874a16da2de64e9ed624009bbd29b550c90613cea720d43a6d1aac SHA512 8a14ce2f145473a064fab3fb32906a2f92d9dcf877f0ce44aeed6ad82768d52f00a91a48e23e92d707780d7adce7740d27420b33e81326b5c5e9e1c88c15d4e6 WHIRLPOOL 7c3a7a9096eeef62a386afd45ec60da6c5f851544129fe3baefd2d221b1089fdc7f8db64d8bd1f4c09bf59d07a4776c663222cda14d06a49f5dce6ad0b3a333a
+MISC ChangeLog 13012 SHA256 4aade82469fd9ed200da934a1169aae6d376da23881a3c18321b4598968e2752 SHA512 912d7c8876cbcf1490008304a58e8aefa2b676702fdd38632acf19458c99e27c2ad8f3cebf84208311b69d66572a67c112dc45d57052f5dd7d901e52a3361596 WHIRLPOOL 77b0b1901229a5f26514818fc8a6324ac8c12b681457cd295c663240df7ae403d1178e12dca82f675fd6037e390c7ad223ecab21e82eae12577a251eeca621d1
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlIbvb0ACgkQvFcC4BYPU0pHygCffaGB8Te/lVWTi15XyetlYhTY
-vFkAoIo7jMeRXkPxXeSAdUWrn2famVnF
-=fCEI
+iEYEAREIAAYFAlIbxdIACgkQvFcC4BYPU0r0AACfe8zZpNYZHpfJ0gz93R5mTAr0
+Yv8AoKVTjXzUcIwVY6MzwO4TDNO2N7Et
+=qUq4
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch
new file mode 100644
index 000000000000..d33000927424
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch
@@ -0,0 +1,15 @@
+Use LD_* variables for 32bits too instead of the FreeBSD invention LD_32_*.
+We use LD_* everywhere on Gentoo and things like libtool wrappers have no clue
+about LD_32_* and thus fail to run from the build directory.
+
+diff -uNr libexec.old/rtld-elf/rtld.h libexec/rtld-elf/rtld.h
+--- libexec.old/rtld-elf/rtld.h	2013-08-24 12:30:26.000000000 -0400
++++ libexec/rtld-elf/rtld.h	2013-08-26 17:10:19.000000000 -0400
+@@ -47,7 +47,6 @@
+ #define	_PATH_ELF_HINTS		"/var/run/ld-elf32.so.hints"
+ /* For running 32 bit binaries  */
+ #define	STANDARD_LIBRARY_PATH	"/lib32:/usr/lib32"
+-#define LD_ "LD_32_"
+ #endif
+ 
+ #ifndef STANDARD_LIBRARY_PATH
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc3.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc3.ebuild
index 6a82aded3663..285fb69bdb55 100644
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc3.ebuild
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc3.ebuild,v 1.1 2013/08/26 20:42:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-9.2_rc3.ebuild,v 1.2 2013/08/26 21:17:04 aballier Exp $
 
 EAPI=5
 
@@ -36,6 +36,8 @@ REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"
 
 IUSE="pam ssl kerberos ipv6 nis xinetd"
 
+PATCHES=( "${FILESDIR}/${PN}-9.2-no_ld32.patch" )
+
 pkg_setup() {
 	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
 	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "