diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2011-08-30 23:41:44 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2011-08-30 23:41:44 +0000 |
| commit | a41246720409d26bbbb79c381962b0985bfcf7bd (patch) | |
| tree | b35df28e6c3e9abaa2c044d38446e970eca34085 /www-client | |
| parent | Version bump to 3.0.2 (uses Gtk+ 3); add ncurses USE flag; remove static libr... (diff) | |
| download | historical-a41246720409d26bbbb79c381962b0985bfcf7bd.tar.gz historical-a41246720409d26bbbb79c381962b0985bfcf7bd.tar.bz2 historical-a41246720409d26bbbb79c381962b0985bfcf7bd.zip | |
Add workaround for bug 380801
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/ChangeLog | 5 | ||||
| -rw-r--r-- | www-client/chromium/Manifest | 10 | ||||
| -rw-r--r-- | www-client/chromium/chromium-9999-r1.ebuild | 15 |
3 files changed, 22 insertions, 8 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index e27b0fdff34f..a87d2f3e2ca3 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/chromium # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.424 2011/08/30 21:13:33 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.425 2011/08/30 23:41:44 floppym Exp $ + + 30 Aug 2011; Mike Gilbert <floppym@gentoo.org> chromium-9999-r1.ebuild: + Add workaround for bug 380801 30 Aug 2011; Mike Gilbert <floppym@gentoo.org> chromium-15.0.865.0.ebuild, chromium-9999-r1.ebuild: diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index d6f20fffa4d5..c31cbebe65d1 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -31,13 +31,13 @@ EBUILD chromium-14.0.835.109.ebuild 13182 RMD160 65d12c9dd3950c39f501113806ff26a EBUILD chromium-14.0.835.94.ebuild 13181 RMD160 96edd70db1ae17b49992bc77bb428e001e477274 SHA1 798675014fdb734a4d8aaf01b7b1dee904798765 SHA256 282f3fa36035387afafec19e0ef11c326dbe5a93e4a2bae2c513133810cebd73 EBUILD chromium-15.0.861.0.ebuild 13774 RMD160 988860d0a6d6b2506402ace556ecce9fc6fadaee SHA1 7a7dfcb1b774616936d19eb45de940b5eafcec39 SHA256 d03f44c0c388c87fccc0fc894c9efe1cdbe8ace6ebba86400762541d93a1825d EBUILD chromium-15.0.865.0.ebuild 13648 RMD160 11a3b1c9f752c8feff2dd6098eb1cc074c0f0d92 SHA1 dd823a624ff08e9ea10ad6e551e147478bf649b3 SHA256 9c3be3e10a62cff3724a1e6cf9b481226249c1f13ecad2ab8ae1542b13fa3092 -EBUILD chromium-9999-r1.ebuild 15635 RMD160 e0b28997f20748b9dfb7f4f42d155e362abe9a65 SHA1 b022665bdec7129e51ad30eeb14b1c5dc5b120d1 SHA256 9a391a636e04e66102c5c8f6802e864f526493ece0e090ba4487421102278e1f -MISC ChangeLog 94812 RMD160 593c63cb930add1f6fd176d9a90d0dc7cb70ebf9 SHA1 60de5dd87ba6644cc79776ad1b425e775d0891bd SHA256 ff9b40eac821591c6af9c70f2d8368d408e3fb27a1aa52235c7f0dea33e7b12b +EBUILD chromium-9999-r1.ebuild 15960 RMD160 87d1c3ec85ac48f7499bfb5dedbc4e8ce9d5c522 SHA1 0b4081abcae5583d3a60ef1bfdbc1075986f7b60 SHA256 16e9f774ca44fd9b5440c495ba2ece05fdc99cf1fb4bf962fdca91e7e0b6704c +MISC ChangeLog 94919 RMD160 743ff6fffcaefd51fd3ddfde1f2cfde85101f647 SHA1 3938863c5fd1eb7cdb6aa254c4ba3f1c08eee0d9 SHA256 6b113e794a97869d81180b574e31e665a4cb64da29475c0a55604ffde428488b MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk5dUoYACgkQC77qH+pIQ6SBLgEAj7T0E/MhYfAba0mOUAV09b0d -HzXukgGyz3NAMVjdoh4A/1TNWJlv5kgTvRMyyf7mBsFJBKjX1NI7Yg5lofzq3FHE -=pNDj +iF4EAREIAAYFAk5ddUUACgkQC77qH+pIQ6QcFgD/dyuhRMzYE2j2Z01Dy5a40RGY +V0EGZoyIs0jLDyewsPsA/jrvmqpDpO40OO0D9usAp/g39024urTqF+no+h9erAF2 +=QR6I -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild index d7b587c62adc..b1d6fb3d09f6 100644 --- a/www-client/chromium/chromium-9999-r1.ebuild +++ b/www-client/chromium/chromium-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.47 2011/08/30 21:13:33 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.48 2011/08/30 23:41:44 floppym Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" @@ -68,6 +68,17 @@ RDEPEND+=" x11-misc/xdg-utils virtual/ttf-fonts" +gclient_runhooks() { + # Run all hooks except gyp_chromium + # Moved from src_unpack to avoid repoman warning about sed + cp src/DEPS src/DEPS.orig || die + sed -e 's:"python", "src/build/gyp_chromium":"true":' -i src/DEPS || die + "${WORKDIR}/depot_tools/gclient" runhooks + local ret=$? + mv src/DEPS.orig src/DEPS || die + [[ ${ret} -eq 0 ]] || die "gclient runhooks failed" +} + src_unpack() { subversion_src_unpack mv "${S}" "${WORKDIR}"/depot_tools || die @@ -81,7 +92,7 @@ src_unpack() { einfo "gclient sync start -->" "${WORKDIR}/depot_tools/gclient" sync --force --nohooks || die - "$(PYTHON)" src/build/download_nacl_irt.py || die # bug #366413 + gclient_runhooks einfo " working copy: ${ESVN_STORE_DIR}/${PN}" mkdir -p "${S}" || die |