revert previous commit: it breaks multilib-portage and the build system should overwrite LD if needed.

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

4 files changed, 24 insertions, 17 deletions

diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog
index b4c3086e0271..dbd04ada77f6 100644
--- a/media-libs/libvpx/ChangeLog
+++ b/media-libs/libvpx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libvpx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.57 2012/05/12 16:47:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.58 2012/05/12 18:06:50 aballier Exp $
+
+  12 May 2012; Alexis Ballier <aballier@gentoo.org> libvpx-1.1.0.ebuild,
+  libvpx-9999.ebuild:
+  revert previous commit: it breaks multilib-portage and the build system
+  should overwrite LD if needed.
 
   12 May 2012; Alexis Ballier <aballier@gentoo.org> libvpx-1.1.0.ebuild,
   libvpx-9999.ebuild:
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index e73b474e52c1..628c6cf1ced7 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -12,14 +12,14 @@ EBUILD libvpx-0.9.7-r1.ebuild 2132 RMD160 674cb73a25df2e72b124eb8fd275d1964086d7
 EBUILD libvpx-0.9.7.ebuild 2085 RMD160 03df67b8bcdb7568b5e9748b87d0f45319c17e88 SHA1 9f3f38136e360d535b31846d72c9ebd83cae370c SHA256 7250b3f9fe2ef8d8d992b2e988e50abaedfdd98297f946a54180a3fe265b07f5
 EBUILD libvpx-1.0.0-r1.ebuild 2427 RMD160 e5eeb537099f8dff200d3570f4cb92dc3395f84a SHA1 80c0d5af6982b2709af22e48d0ba8b2fd70149ca SHA256 534b6c91f92f1362e42b77edda6e9fed05a7a055d83a8cd9d3aee391b4fdf9ad
 EBUILD libvpx-1.0.0.ebuild 2110 RMD160 56685dac630bc1f2752cf3d624dbfc1850dcd107 SHA1 929c0f466f5ec7b5ee7b3d8e313ac8ffc502be56 SHA256 4f3d581f415b676e5b91829cde0a4d3c96ac50450cf9fcb5dbb69cb55095a216
-EBUILD libvpx-1.1.0.ebuild 2138 RMD160 4e94c86bcb6569aebcebabd60f196b1921a7674c SHA1 a0544398883febd6c5f1f0830d9d6bdbd2ae698c SHA256 2b5660c481e30a14d52545db07e9361f277d86ae667b7b7c11855b1a24c1175d
-EBUILD libvpx-9999.ebuild 2138 RMD160 558d23b956a58887933e33cb94a603e3c3c33fc7 SHA1 c24428b84ddeffe94f554fa81242c38578acb4bd SHA256 52028f9ac8cdd7ec378dcb8cfb81b0c129b2b13d561711a2c3e22eeb26c9c214
-MISC ChangeLog 8336 RMD160 b28b62de0548082f016c93fc8d3cc7281e2951d3 SHA1 2154b6d35fb3c9de205d1249fe33dc5bc15e2ed6 SHA256 e7c746c7d79cd1168c48ef65c9e2e1dd15872d7b048660ef6913b5376aaa0f68
+EBUILD libvpx-1.1.0.ebuild 2182 RMD160 c9693b5e3b15a0ac8141bb5223b483c16a4c38de SHA1 66cb7f5f851498e2816205c2c0278c28dd16b1d8 SHA256 b629fab77f6f15d3f565674ba0c02a27e2bc957d2d40ae5300d0918e8dbac5a8
+EBUILD libvpx-9999.ebuild 2182 RMD160 66868cb24beb7238106fb5c5ed74f9f2a47962bf SHA1 b58725d5ed8b490ad5a2b1c269d533ac784d5fd5 SHA256 bd2a17efa46d5fa732fc1024a4eda276a4476a5b79b343e9fa73630e0d72f54a
+MISC ChangeLog 8539 RMD160 5fbc04da4b6ebcd7f8389c5be923d943091da0e7 SHA1 ad7041504f57935a6f7ebafc96810a891da6cfad SHA256 db792bb820fc140a33450dd0bdeaa1d64c3bfa1003cc3b3dc98405085ebc1adf
 MISC metadata.xml 695 RMD160 8e4238e721088fcf128452964f42dec86b8b4334 SHA1 97fa71127c7465030e110b34e089954899bc5554 SHA256 9ce8ec472b7274e76137dcb0ee7881d478281161e56f5efc622b4a5eb85820e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+ulBAACgkQvFcC4BYPU0py6wCfQKKI3OPydTjbY55a0aJhr4t8
-zTsAoLO0ETFb+vsrI1NXHy4WC7icHTei
-=I49L
+iEYEARECAAYFAk+upsAACgkQvFcC4BYPU0pITwCgvp2FfCXz/ZpwsVPrsOxJUF7n
+LbIAn31SB2ZmbBH1odH+bYk9IkEQOYHq
+=uD1d
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libvpx/libvpx-1.1.0.ebuild b/media-libs/libvpx/libvpx-1.1.0.ebuild
index 9099e27c3d20..bbaf07dfb024 100644
--- a/media-libs/libvpx/libvpx-1.1.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.1.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.1.0.ebuild,v 1.7 2012/05/12 16:47:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.1.0.ebuild,v 1.8 2012/05/12 18:06:50 aballier Exp $
 
 EAPI=4
-inherit multilib
+inherit multilib toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
@@ -50,9 +50,10 @@ src_configure() {
 	# http://bugs.gentoo.org/show_bug.cgi?id=384585
 	addpredict /usr/share/snmp/mibs/.index
 
-	# Build with correct toolchain. The build system shall honour them with only
-	# this variable.
-	export CROSS="${CHOST}-"
+	# Build with correct toolchain.
+	tc-export CC AR NM
+	# Link with gcc by default, the build system should override this if needed.
+	export LD="${CC}"
 
 	./configure \
 		--prefix="${EPREFIX}"/usr \
diff --git a/media-libs/libvpx/libvpx-9999.ebuild b/media-libs/libvpx/libvpx-9999.ebuild
index 65a9b8754aad..b907619f7719 100644
--- a/media-libs/libvpx/libvpx-9999.ebuild
+++ b/media-libs/libvpx/libvpx-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.23 2012/05/12 16:47:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.24 2012/05/12 18:06:50 aballier Exp $
 
 EAPI=4
-inherit multilib
+inherit multilib toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
@@ -50,9 +50,10 @@ src_configure() {
 	# http://bugs.gentoo.org/show_bug.cgi?id=384585
 	addpredict /usr/share/snmp/mibs/.index
 
-	# Build with correct toolchain. The build system shall honour them with only
-	# this variable.
-	export CROSS="${CHOST}-"
+	# Build with correct toolchain.
+	tc-export CC AR NM
+	# Link with gcc by default, the build system should override this if needed.
+	export LD="${CC}"
 
 	./configure \
 		--prefix="${EPREFIX}"/usr \