Fixed usage of check-reqs (bug #395601)

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

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 9bd327642c0bc1e8ba1a2374fc782001a97618ed..1d835655eac49f9a0a501914f4e528e3e8619bd2 100644 (file)
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.111 2011/12/21 16:11:05 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.112 2011/12/22 08:36:53 polynomial-c Exp $
+
+  22 Dec 2011; Lars Wendler <polynomial-c@gentoo.org> firefox-9.0.ebuild:
+  Fixed usage of check-reqs (bug #395601). Thanks to Alphat-PC for report and
+  patch.
 
 *firefox-9.0 (21 Dec 2011)
 

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 74f0cc2ca8e6e8e61da77eeea3fcc887dcbb50ce..3fd0d22f505ccce272c7e9db9f215c4b182f0cf4 100644 (file)
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -330,23 +330,23 @@ DIST firefox-9.0.source.tar.bz2 74197197 RMD160 4631b103aa80ae2ae22b61453f4e02c8
 EBUILD firefox-3.6.20.ebuild 9443 RMD160 598a4b875d7ec39367750882dc8df9c77adf02f1 SHA1 2987918c26454a1dbd0b8b5a830f1440f68b14dd SHA256 c44ece9c3512785a7fb8b272b7690b13bbfb5e75e544cc8cc23f00f3197bb978
 EBUILD firefox-3.6.22.ebuild 9453 RMD160 0b3b6fdd5acd5c42813cd2451298f7066da72e5f SHA1 6e88d16611c5a18979fa7e446f6ec5243b13d316 SHA256 b44194eea13d067b5cc2cee77c4c887cb3231c9c6dcda4d186a003fd78ddad36
 EBUILD firefox-8.0.ebuild 11225 RMD160 7bf4cdf8c95998da45d89b1910d1d875d036066c SHA1 a59f28f69e2bae880a6270abcb53c6e6dad30aff SHA256 44145ac08dd2ed3d0814f1038e6b68d4a2ae63a1b0d476b1e303f5bb596fb010
-EBUILD firefox-9.0.ebuild 11324 RMD160 7be4072f39f4ce8e89e0749741328416f569b29c SHA1 acb32da812e8764c42fee40282b1ffc835ee7270 SHA256 6cd91ef37ad880e03e49a94fd59dfe839308eaa52385c3a22122ba217a09e865
-MISC ChangeLog 134665 RMD160 f2795cad13f88dcf74c01619d67e8eeb8d5f2e30 SHA1 a683a29e687c6d5ff4513f8479f2b3f6c8e181b4 SHA256 71969f78aa5e1ab3157d3390ac9e69370c19afd3087f63fe5eee0f78318efb27
+EBUILD firefox-9.0.ebuild 11336 RMD160 47dfe812770438a5a8ac3c506d3e4fc82ae92498 SHA1 41776cd3a64b72fb4fb0e626c29b2585044d912c SHA256 528cb0d4f7f0a2cc8ab82c27eb9508598e8e732e84108fe2d9eb52c3a923443b
+MISC ChangeLog 134827 RMD160 dccd18296801e7fa71299219d0cea352b24e3f0a SHA1 fea15ca1e28b214034740cb884e68038b5afdbb1 SHA256 77ace580988de0eb05332e7657ca1b37d2f01556b00e70c8df3c4d81d54c37c5
 MISC metadata.xml 937 RMD160 f372fe74ecc3ce2a64e8178e15dd2d1149c0cea1 SHA1 e59c357183b3980d403817a4ca7b34df963b00b3 SHA256 4c67b5290d23ad1812c96782de252ffc929b0a11ac42793ef23bfb537b01408f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO8gUfAAoJEPiazRVxLXTFwQ8P/0kPtszjnGtwljlwBGc4A4uG
-3XlLHX/700O1QjSadme3/fThsM9z3wV75Eq2XSFQAW1fNKUl26ZlS/Ueg/ThsniV
-U3lPiqz/+5KyR3rmoATwrQG5BCRS4pMe8XYkaNFrtC1d1GmXZBFI5gpO0bWO+Edp
-2qPI3roCGwKhBMb4Pr0Ffk2MZFF+6BAAv4szgSH43IwSQLPug4lbYYg204Nyk1tM
-jnWhF4qjmp3zrukETyUXMhMLpM5sbEaXWN77JJSgMDSZ2ssitxiXzwOFKFXv2dVI
-MLGfuDZ32tQoSrELE4YJ01DKiFHHj0YMsTRaA2SEtjioBIMIDBLLsbDvx7LXd0L4
-DgKnBpfErDyBat8Lnz7hB5iptww/A+f/8csvJdvozOiwIpJtOy38hDGLbkFxNy8i
-dQf+pX1Rh4oUsoTPohGOhGAU8yO11uJVU54ylXOk/pplbhgX/9JFj1EMbwJ/Z5Rt
-dr1i0OJkbV07wBeu27EG4EFVcwHJ8+jQqCY3LBFetHupboGWjp0o6BvEKAUaMOMF
-h36Iq+2K8voqDJH82OB+ntm8vnl7GCibl0M6+89OTRiMGkQXpVxEsGiI3Eq2anx/
-E3Qxb8jsBaJ0Bg7/9BvcOjm8+mdW6M2lKROSItjU1ZfVaoUs/twIrPAdFUCGxHoN
-vx5wqZotNrNP0AEezOBm
-=f23z
+iQIcBAEBCgAGBQJO8uwrAAoJEPiazRVxLXTF1dcQAJiGevuxWJaQLSMhNIkaIdJC
+7GCm9vggcwr6IhT4bMcv+UKHJV3tVeclvajXtxLZa1PPnLOfyt45k3wd/55mi9Uu
+5+pX1BLlZndZTmP36ixufysU2HsPkjwQdaDwFwKPPDurFf/ImJC2+ROf0r7hjLx0
+eI71vdgwhK5MtWzuoQVAnZ0H0x2uZ6WqUJj/uWHr5EYEvyRY41NL0GZzoJ839L5f
+bdP76WUp9nhCXDXMg9Rp00FiJ9mvBY8iKAdQKgfkVskP0zufl7NkW/+ziIUm/s12
+jcof5UApgneEHIDmZdRYY3kWNIkFLi8M389qQYyuHEjmV93bCFjG4HRKPC9/NGX3
+onj8ujyrcpXL5SSQaEUw1VhnRPqKD97Qztm2lJKF6iRUmmucLf8oe8OjJZF6FHeD
+/Z6yUImjvGGg3jEx632Jmtq99djPK+hn8vAQfRazgQAD5L/0BeN+pMRJVoK+Ga+2
+K/ATgQl39VMhY2bVIe/yByNrrL8uEH9+ir5JnkqQXJWQTJHj6Z5/EValC9dESt54
+/DNkSV19hJE80c/I+R5wZbgMNWe9/mOx/InFVkijrhwdBCircQ7M8VGj5i/am39T
+G7z13gdKKQ17okx+hfdTsWUbT1dj6Zu8OwfvrReYoSAdSHBsCVBQBJFgEnMKt5z0
+61xadsbWVY0U1VZPnwGY
+=8SW7
 -----END PGP SIGNATURE-----

diff --git a/www-client/firefox/firefox-9.0.ebuild b/www-client/firefox/firefox-9.0.ebuild
index e3b1417fe38aa8924b8d1d4b0325e249bd3a4fb3..595b512a00b2f85e328280dd03f95ccd821521a0 100644 (file)
--- a/www-client/firefox/firefox-9.0.ebuild
+++ b/www-client/firefox/firefox-9.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-9.0.ebuild,v 1.1 2011/12/21 16:11:05 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-9.0.ebuild,v 1.2 2011/12/22 08:36:53 polynomial-c Exp $
 
 EAPI="3"
 VIRTUALX_REQUIRED="pgo"
 WANT_AUTOCONF="2.1"
 
-inherit flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx nsplugins
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python virtualx nsplugins
 
 MAJ_FF_PV="$(get_version_component_range 1-2)" # 3.5, 3.6, 4.0, etc.
 FF_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
@@ -149,13 +149,12 @@ pkg_setup() {
        fi
 
        # Ensure we have enough disk space to compile
-       if use pgo ; then
+       if use pgo || use debug || use test ; then
                CHECKREQS_DISK_BUILD="8G"
-               check-reqs_pkg_setup
        else
                CHECKREQS_DISK_BUILD="4G"
-               check-reqs_pkg_setup
        fi
+       check-reqs_pkg_setup
 }
 
 src_unpack() {