remove dead code: bug #379659 should be fixed in this release and sync -9999 with current release.

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

4 files changed, 23 insertions, 15 deletions

diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog
index 3e47a5c4f564..b4c3086e0271 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.56 2012/05/12 16:34:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.57 2012/05/12 16:47:06 aballier Exp $
+
+  12 May 2012; Alexis Ballier <aballier@gentoo.org> libvpx-1.1.0.ebuild,
+  libvpx-9999.ebuild:
+  remove dead code: bug #379659 should be fixed in this release and sync -9999
+  with current release.
 
   12 May 2012; Alexis Ballier <aballier@gentoo.org> libvpx-1.1.0.ebuild:
   Use the CROSS variable for setting the toolchain prefix instead of forcing to
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 408bca7bbfde..e73b474e52c1 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 2251 RMD160 8a79551bbc028583b8afc10754822acfd97a4d23 SHA1 da2035327d521c2b350481ade292b12311b9db7e SHA256 00137be1d3ac62198a4badfa3ce4452012fa67424746c8daed29342901f27b92
-EBUILD libvpx-9999.ebuild 1946 RMD160 82b66c3f4b4e854286d9c7738ead474730fde554 SHA1 5aa10defe6e6c76220df792db48a6be3c1799b7d SHA256 2628ed740884a4d583454528c90a2ef0bf15df7c2897ba33d1f4f38b1af9d67c
-MISC ChangeLog 8137 RMD160 dfa51c6b98103896e99d0baceba0bf48e884fb4a SHA1 24b9c4fdac73c5d625705861708c60688adcefe3 SHA256 0f7f6ff6aca3d24f7036d9f9d8cb13edc8780c4daad0383f8cea27f28d02c578
+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
 MISC metadata.xml 695 RMD160 8e4238e721088fcf128452964f42dec86b8b4334 SHA1 97fa71127c7465030e110b34e089954899bc5554 SHA256 9ce8ec472b7274e76137dcb0ee7881d478281161e56f5efc622b4a5eb85820e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+ukQMACgkQvFcC4BYPU0pWbgCgjkvwcdNtPrSq9x7pRt/H+HI8
-WRsAniLW3eyIXnYg9rSQr34QTfAXN9dF
-=ys4s
+iEYEARECAAYFAk+ulBAACgkQvFcC4BYPU0py6wCfQKKI3OPydTjbY55a0aJhr4t8
+zTsAoLO0ETFb+vsrI1NXHy4WC7icHTei
+=I49L
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libvpx/libvpx-1.1.0.ebuild b/media-libs/libvpx/libvpx-1.1.0.ebuild
index 626fad00c1f4..9099e27c3d20 100644
--- a/media-libs/libvpx/libvpx-1.1.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.1.0.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/media-libs/libvpx/libvpx-1.1.0.ebuild,v 1.6 2012/05/12 16:34:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.1.0.ebuild,v 1.7 2012/05/12 16:47:06 aballier Exp $
 
 EAPI=4
 inherit multilib
@@ -50,9 +50,6 @@ src_configure() {
 	# http://bugs.gentoo.org/show_bug.cgi?id=384585
 	addpredict /usr/share/snmp/mibs/.index
 
-	# http://bugs.gentoo.org/379659 http://gerrit.chromium.org/gerrit/#change,18142
-	export LC_ALL=C
-
 	# Build with correct toolchain. The build system shall honour them with only
 	# this variable.
 	export CROSS="${CHOST}-"
@@ -77,7 +74,6 @@ src_configure() {
 		$(use_enable ssse3) \
 		$(use_enable static-libs static ) \
 		$(use_enable threads multithread) \
-		${myconf} \
 		|| die
 }
 
diff --git a/media-libs/libvpx/libvpx-9999.ebuild b/media-libs/libvpx/libvpx-9999.ebuild
index 4e49d02d3029..65a9b8754aad 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.22 2012/03/02 16:39:04 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.23 2012/05/12 16:47:06 aballier Exp $
 
 EAPI=4
-inherit multilib toolchain-funcs
+inherit multilib
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
@@ -44,16 +44,23 @@ src_configure() {
 	#then feeds it with yasm flags without checking...) bug 345161
 	unset AS
 
+	# build verbose by default
+	MAKEOPTS="${MAKEOPTS} verbose=yes"
+
 	# http://bugs.gentoo.org/show_bug.cgi?id=384585
 	addpredict /usr/share/snmp/mibs/.index
 
-	tc-export CC
+	# Build with correct toolchain. The build system shall honour them with only
+	# this variable.
+	export CROSS="${CHOST}-"
+
 	./configure \
 		--prefix="${EPREFIX}"/usr \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--enable-pic \
 		--enable-vp8 \
 		--enable-shared \
+		--extra-cflags="${CFLAGS}" \
 		$(use_enable altivec) \
 		$(use_enable debug debug-libs) \
 		$(use_enable debug) \