Use $(AR) rather than $(LD) for intermediate linking #437062 by corentin.labbe.

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 30 insertions, 17 deletions

diff --git a/sys-apps/pv/ChangeLog b/sys-apps/pv/ChangeLog
index c6f7926ca873..ccd8db52f69c 100644
--- a/sys-apps/pv/ChangeLog
+++ b/sys-apps/pv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pv/ChangeLog,v 1.57 2013/01/12 16:34:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pv/ChangeLog,v 1.58 2013/01/22 03:07:38 vapier Exp $
+
+  22 Jan 2013; Mike Frysinger <vapier@gentoo.org> pv-1.4.5.ebuild:
+  Use $(AR) rather than $(LD) for intermediate linking #437062 by
+  corentin.labbe.
 
 *pv-1.4.5 (12 Jan 2013)
 
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index 7209a232f5c1..a77344b2539a 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -6,13 +6,23 @@ DIST pv-1.4.4.tar.gz 109703 SHA256 f9acb55b47d714f6a65255270f92072dc98d807a11214
 DIST pv-1.4.5.tar.gz 109807 SHA256 ce9e65b58a8fbfe7064f08db39cbd048e133bd6a6ee603cd2a623bb06d114f0f SHA512 9081a7579cd98dae2eddce6a2ae8aa409b8335e4e5251e3389066c68f73de1981c1d6ee811c14d133346220f6e73d1edf96a96f171a18b0521bbdd43d414d6e9 WHIRLPOOL 9930b354a61676b06d544d815e81421375cb8d1d7a95372f1bf38a9ff98b944361eaf5b4cc9833f3c8f241963d176a7490b0c103124c2f9a0eb4303f180facb4
 EBUILD pv-1.3.9.ebuild 984 SHA256 d5ae96882284c22d8e9ef6bdd4d347f18b8949b1ec2c9554f4d8f2b98e28ffd1 SHA512 58c5714583a71987f672ad5ecb1df00dc0ac32a0a4315fe2e8b355e3cd770ef92d7c68cd5d3372702ff3a426f0b992e0d83e60788bb1c2457ce8ea8eb0c772fa WHIRLPOOL ecaa3cdc36d64a73728e2a8c7a294dc714124053d92f652ec9853d2ce22c560b724a115b25149e356b331f9d5efc070bd453cb4fa6f7af7964aaf0c7083555a9
 EBUILD pv-1.4.4.ebuild 1234 SHA256 4afd1ebfa553a713ce9b2d4efd06229de34b6c0d63de60d270a9e94ce036fbd0 SHA512 db71951e54d25d0fc70a04b2d93ef69ec4032c6ef05a5e7b58e7440afdceacaf4e898278c468e5fc2efe1e95ea0ec53c9e73aaf55825961bcc0d85a65e53ed30 WHIRLPOOL bebfaf5046f3deb632b0e24595c3a120a71ee4132de71492fdc29795e6889b6c63ee5ddf11d192abcc2983aeacaa8e879ffa0ff2648a32726bab3964bb32179f
-EBUILD pv-1.4.5.ebuild 1234 SHA256 2818e0a42e7e18d6ef4e63a5e07396731c9b79b701c813c29622b002bb271364 SHA512 190f96c94cb636da2283cf265fd11eda337cbcebeedb67a5d9889c3873f9250c836caf1a2fbd16160ed646a0dcafb899803e41888dff98053780044d1a6109ce WHIRLPOOL 7b47e673399336791d3eb0a33a0076e178b9619cd1c22d84f55ae64afa662dc37aa33e7e0fceae200ebfaf4879eab43bd41a81ecc9a0dd77e92ecc5b5a9eb052
-MISC ChangeLog 9685 SHA256 05750dee7526c4c88405d477c72cbc2e4936aa08e023fb0b3e3ee865574ba5f8 SHA512 a348987f669887271774890d3e1dc5252f83ca5ac2901ab4c9db68a4c7bff7a452539b2ddc32ca783a8eff5c5fea53a787613f0c929e59206c5efda3b7c3efde WHIRLPOOL 3294d5bf0ea8ebe8cc9b76712c1a0c681fe7efc7a856b701aaf6f946b1a3fc1c30c53376cc763f197d3ca2cc9148da9a3a9252afa1afd0a45f5aed5e95f2b587
+EBUILD pv-1.4.5.ebuild 1331 SHA256 665bf5469e93f1fd8d87593628ddd8c38bb79cd532f9fe0b20cf0365c0e37684 SHA512 28961a3bf45e2bc1b56920ddd4706187217f7e05fc295680794d7c3777e83e0b6796728676942d5585f20b5a9d6edec15da7d0179383519fec435ba65d104cd6 WHIRLPOOL b24911474cb3b2f9cbf1954ddcd7e2b313e6faf73f47f456843bf1cd92a455406806f17fd53ba9556eb58efc5b321659838c955049efd5bec86cd8162ad324db
+MISC ChangeLog 9840 SHA256 2916c602d2c03af6ceb60a9590e32f96ec3d987d33d105b2d63935154d1a95d9 SHA512 90c18f464e8218b5a6d80cc0a187a9ea219d243e9de5dddbe76ae6a6bbb523307182cba1e102973bc75880f541333885fb257e0e89bfb9e854a28fc725205f85 WHIRLPOOL fd81ae0e083aa7f77352fe70535cbb706a1486eee6047ce3093baebaa1b2c6d6c900eef4b39198d2e2bf1d3e03860e07a2d0ae60c13877719e1c7eefbaefbd97
 MISC metadata.xml 320 SHA256 d30479b98e223f17fe93dff80af5b5c8869619c5f055930a2caf379ea4191cb0 SHA512 b55a70843c649c4f8e5738d2c05c4e79cf455e94cb34891a8df5aed89278f45297c40cbffdf81a5b2aaef9fca9da281f41dcfe416d51a4f5fec182e87527da18 WHIRLPOOL 84be3b621427009a36e235e4a6a065a9ea359f68d1f7ffba1636d958eaca30f8424f67f07866ca90718e0643607df7b3a886b9b07ae3c1a80ade113ea403ca0b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDxkLQACgkQVWmRsqeSphP1AACeOnf2CmuiAQP3V9ERfuBVBlef
-sMIAmwdFje1jnSZl1Ra1Xlu3mcI7qI3F
-=kUk1
+iQIcBAEBCAAGBQJQ/gNvAAoJELEHsLL7fEFWcTUQAJ4g5iZfXARmFRd/l9ExjiEw
+/wHMqBWLAIdMwc2H6ODmzyUzCWXgerfVxlPLs9o1wGIBDJVstN6WBFoeDRmo/hBd
++8ZnncU2Ez1zjp2mn0VnFD+vhRoawzf6wpNg7Jc2io95UwwMss7NP2wbkkMpWDnb
+N1tSAkULux5cyNX/hKNdHe9bd5quisdw1jDtCzBqMdectZj4FHGYWQPN6SzfEigQ
+MiRR5mKxY/RRro6e02vLXc+Ft/uCYSrgyctp0avnBTnTtb45GxQEGibX22n4P4IP
+GtvVlLrkgYgqtAngNrc2elvoL/Lf5wiQlpcZ/gM7GpVN/0rNN3Dcf16wvwUaGvHz
+oMfcrmSM6eb2sTqkQQwl9ywYoej8mblbhONIfqcMN2yTqG9YuCnW4WHLaNyTkLwg
+EvhYiyCjlHjDCxSn5IXMJj7EcKBrPdSAssd2+g4UNebipOvhUE4mY+PIQGWmWGcA
+YrXqOPfd6G1dgaF2qEKinR1HmN/Q+dDCQnc1OhqOVW6+zpXgrrp9w2tpNQ2IwXEU
+Q4iXY6wXbdQozdn1CyVDGrnr6lBpb51vR73ZoXPG7pYM5bdZ7mE42lceRhSAyvJH
+x8Pga/2fxtT7HLSjr7/AOJv3qQA6WIZOPt56hnwW8wbY5rTzN5xPjQ2zKc7WHTMr
+ZppT2C4UKVhTSd6S9sns
+=Kt/E
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pv/pv-1.4.5.ebuild b/sys-apps/pv/pv-1.4.5.ebuild
index 1abdd357a127..5e4de5732017 100644
--- a/sys-apps/pv/pv-1.4.5.ebuild
+++ b/sys-apps/pv/pv-1.4.5.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-apps/pv/pv-1.4.5.ebuild,v 1.1 2013/01/12 16:34:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pv/pv-1.4.5.ebuild,v 1.2 2013/01/22 03:07:38 vapier Exp $
 
 EAPI=4
 inherit toolchain-funcs
@@ -12,22 +12,25 @@ SRC_URI="http://www.ivarch.com/programs/sources/${P}.tar.gz"
 LICENSE="Artistic-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x86-solaris"
-
 IUSE="debug nls"
-PV_LINGUAS="de fr pl pt"
-for lingua in ${PV_LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
+
+PV_LINGUAS=( de fr pl pt )
+IUSE+=" ${PV_LINGUAS[@]/#/linguas_}"
 
 DOCS=( README doc/NEWS doc/TODO )
 
 src_prepare() {
 	sed -i configure -e 's|CFLAGS="-g -Wall"|:|g' || die
+	# These should produce the same end result (working `pv`).
+	sed -i \
+		-e 's:$(LD) $(LDFLAGS) -o:$(AR) rc:' \
+		autoconf/make/modules.mk~ || die
 }
 
 src_configure() {
+	tc-export AR
 	local lingua
-	for lingua in ${PV_LINGUAS}; do
+	for lingua in ${PV_LINGUAS[@]}; do
 		if ! use linguas_${lingua}; then
 			sed -i configure -e "/ALL_LINGUAS=/s:${lingua}::g" || die
 		fi
@@ -41,7 +44,3 @@ src_test() {
 	fi
 	default
 }
-
-src_compile() {
-	emake LD="$(tc-getLD)"
-}