diff options
author | 2013-02-06 03:47:08 +0000 | |
---|---|---|
committer | 2013-02-06 03:47:08 +0000 | |
commit | 600fe8419ca075f165f337188f691f4af01dc98f (patch) | |
tree | b5e0e565e97f78d04e31dd8442b2d697d79c1c78 /www-client | |
parent | added CPPFLAGS=-DHAS_ISBLANK to fix issue with space in programs (diff) | |
download | historical-600fe8419ca075f165f337188f691f4af01dc98f.tar.gz historical-600fe8419ca075f165f337188f691f4af01dc98f.tar.bz2 historical-600fe8419ca075f165f337188f691f4af01dc98f.zip |
Add an upper bound on v8 due to API change. Reported by Mr_Bones_.
Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/chromium/ChangeLog | 6 | ||||
-rw-r--r-- | www-client/chromium/Manifest | 12 | ||||
-rw-r--r-- | www-client/chromium/chromium-24.0.1312.52.ebuild | 514 | ||||
-rw-r--r-- | www-client/chromium/chromium-24.0.1312.56.ebuild | 3 |
4 files changed, 12 insertions, 523 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index fa853e043b92..1a7a9590deb7 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/chromium # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.803 2013/02/06 02:32:42 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.804 2013/02/06 03:47:06 floppym Exp $ + + 06 Feb 2013; Mike Gilbert <floppym@gentoo.org> -chromium-24.0.1312.52.ebuild, + chromium-24.0.1312.56.ebuild: + Add an upper bound on v8 due to API change. Reported by Mr_Bones_. *chromium-25.0.1364.68 (06 Feb 2013) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index e46e61990f76..46dee63a2422 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -34,28 +34,26 @@ AUX chromium-webkit-zlib-r0.patch 1750 SHA256 7a44c63d96b6fd4b12afcd06a81f410ff1 AUX chromium-zlib-r0.patch 511 SHA256 ec2795bfc47c516401fd2c9648caa3b06e64794392b41a11b2664d9968171534 SHA512 d06c7551d1976404b07f4cbcb5f385cbc565884d34d3fd49bd4c1c2b96e2b660f4d8f778c5f7ac9bd34d66ad46a1f1235d89f1c2b026fbc3bd9c2b7ab7087fc4 WHIRLPOOL a394e499ca1bb3304716087f1a7b6e91847fbc7425e6d0e1bad00acb9a0e8690559687726fe41d49031f51e3eccdcbcd290a27e366613dfce4d2e89aab92375d AUX chromium.default 147 SHA256 de16d72d77ac9fe04f781df4f50dfb714ba33574755932df950c1d9472b589d9 SHA512 26cdfd05da7f33ba94cd710ae52a1b345cdea4928500af791cff10ca8f9f44036497d9520f690d4d40be5774e77cf9be77f21233b7f804b1dee7d81b8382a9fa WHIRLPOOL 162deb65f97efca4db35dae64e46e0cd21d02a3dd1ae0ec6fa2f9ee7660fbeeb771a1afa3d07cb0d904cd8d7c16ff4b462bc6be3cf9a4143833e909ab89ac5fd AUX dot-gclient 253 SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf SHA512 96d4ffd01fec2773d7beaf2bc82b8eb969556f6e859e39136b4044521c5b8bfd36c13a7f2fcc64613935d4703d8ede8a56c7ce581a7732642cb8ee71039c801e WHIRLPOOL 6a65521487fa353a22f192c567b487c77a405e068c88898e0d8045b3de26bdd54ed736f104e495598e0cc8703d3f6abc80f8b2ea1e254007dfb18f50294e8c07 -DIST chromium-24.0.1312.52.tar.bz2 186302423 SHA256 f30df8b0f4c999185bb11d873f0caa5d8bc581eb4f37ce0fe85fb7900a01d711 SHA512 9908614f0237c986354e2a303d76945d1875526ad6a13ec8082b463fa02b7dcda8dcb1f59e0bd77940dd4109b9ececc0470df922919e9625fa2710b2a261cbc8 WHIRLPOOL 7fc9dc20ae63473b5c8b5301a712e5d233af7d48732d8be6ccaef706642b6a087efc883774871264a61d77028125ebf41039b1e2ec45bf31b9fe00e4eb8d16ce DIST chromium-24.0.1312.56.tar.bz2 186319895 SHA256 120bc74c72498916f44efebe32703e2a52e45ba7e6c536f465144816270b2c11 SHA512 4446396da443daa408a7fa23c721ab0a8331b9bf2ecc11ad072e4e98a2aa6968dce47a5fa58521e08215a6ea35e66b6032a94103a1c2b0df40fb1de5816e7a8b WHIRLPOOL f6850adfa853e217bf33c43b8b15e5446a1688527f53ef31855d019c16092a524b6a31342db713d4af10cbed54d59dddfbc36c3c9f9b32eba87526b89cbfe593 DIST chromium-25.0.1364.58-lite.tar.bz2 125415539 SHA256 f6431601339f5de8bbdecb3fd3b7e4133cec8bb9ca0b90f28c251a35bccdf1bb SHA512 67952a02b39bfc711fdff89e449a5b084dac31770e05026f0e8752203f9f6aa212d92f47a32946de799f916ba9414e721d8b528a6e8bb1ae6009aaa01f124ae5 WHIRLPOOL 61fd1f8307ef374cb4feca3ac27b0a90b6389fd4432c3fe8e0a73e5700a6a78e52bc6793399ce834d775e6655d9c1d476141512edda922ec3343dc8f8d6a86ac DIST chromium-25.0.1364.68-lite.tar.bz2 125813064 SHA256 06516106a90ec7e14fb70edb314a3b6d4456ba1b311e4e9449b512900e9eaea5 SHA512 889aabe3a21b5697c1d4054bda6290d12f0c4ff97894d56d02c6318d51ee7017838d3f395416fcbc10e9bd22aee9c5a2b3826699118b6415b5c1eddae014db5c WHIRLPOOL 7ee341518d9347b4402c29e9b3ee91a3ca6df854efdd426cbc07305d40a0900f49a11c8600c0658d9313a1d01d24fa782b414d314fa24a8d349b3d19645be475 DIST chromium-26.0.1384.2-lite.tar.xz 103884752 SHA256 624d5ffc6939818172c8c76c49d736e0a2171133e5be39a55a32e6413ed3b82b SHA512 5989b337a6aac03418531c4b681980debbd7f291ea982065110657cc45f6f2f0549f0c40f0d212d21ec8e9fed10ff589ac111f03d3b00a1bc69c73ea62443f1d WHIRLPOOL 6729eb5354879872d417d04812b29e0ce7f62fe9a00f0efa95f77d09e97cd3f5b8ff7bae96ca68654e4e29395cbc05ece66b963df932c9d968bc790f626a0a3e DIST chromium-26.0.1386.0-lite.tar.xz 104034868 SHA256 1e99751df931f877327506cba1b1958c670abe449f88f0e3880bb418370d389f SHA512 9781ce24973835e39a0078a3feb162f830cc4e590fc7446314d02cbcb1b793ac5b95c5808f6576506f6da35afe53948ed8b39460c972b073278ebb3a7b0a37fd WHIRLPOOL 9af7bf3fcf03823f040f007e4adff223ea162d816f7789802220e42ef667aa702e18c12859e7293cad7ca518523aa74ef2d80af150f51789df13475e5bd65d25 DIST chromium-26.0.1403.0.tar.xz 140497404 SHA256 8eef12f629a22220e79797ed7c716a805f920092b46ca64b364fdb21db803d2e SHA512 a9160797e2996d2aa87d1f219ef323c43fddc3ea9db909e1d327c59fa7164f8f453fa0c381647daf09d78a1cc968a9a059a1ca700dfdf44e282934f7c364f16c WHIRLPOOL 6312ca67494008d23ce273d6f2572e949e734bf0b440954c53a3a9d7f4c194dcd7ade8f522824a142420779224b529fe26420d6a159bbb6a9249c6d8413d90b4 -EBUILD chromium-24.0.1312.52.ebuild 15868 SHA256 65f300829a756d014096cd034453a3a7a8a15fab194df7586f426715b0c8c207 SHA512 e55b9bf028646fdc1780674de3b9dbd8b19b5a83f9d3cc7dd6a2317f0dde79b9fba170ea9b41a50c7fa140d6d0cdc341bbc998fd183a00a897dc2a86c079cf1c WHIRLPOOL 209630457c9a4352282b091a8d67b5404d0fe2695a328207df76d149257a6c4fd723b98aac6718b54fa966d876f3cca3d8b4f374dbf09031db1a2eca98a84587 -EBUILD chromium-24.0.1312.56.ebuild 15868 SHA256 a1c1a269c9e1f4e423e4dd7eca56f76253059b2bb0aa3beec92ff6de12fbee9c SHA512 6d80ed07889d34aa719f310a7bd69f5279e3a3cef0aac1f12ca8248b11a6151b3af7b563b12e296a8f73f537abe0830bc21de52d1a79bf2160e3e7d581d2b92d WHIRLPOOL fa15d18d5aa17181afbdac9b56d4403ddc98359765c4ce5ff6986ff5115f0fac9909980fd8b11bf9132684e23d7625a50f0d478603bb108103bb4370ace43120 +EBUILD chromium-24.0.1312.56.ebuild 15894 SHA256 2c424357982477c1abb83d0e9bd6debc5a3f63d86c457a3ca449ec1f4c65d698 SHA512 89699bacea4c51ad0e123d08a71358809cba030f1ae87b57c7eca2530b6b849b7118169c0c9fad485ccb637a0c8080633f6262bedbcd8b47c6eeb3d5c9deda6e WHIRLPOOL d01b505a2603d48bea2801f6b92ce1ab22a35b32ed43597e4bd772c243a5e6cb352572d6ec202f27dacee4b9533f788d27e31c02818de84729d8459e1ff7b980 EBUILD chromium-25.0.1364.58.ebuild 16223 SHA256 3ffe656053de68d6d911332c2c32ade3ad15283f38614384d7fa1c65215806b6 SHA512 4dda11731a0c01915dff453a334413f8aab3e2c33159d824babceaf5fee2d15c56772d7621e75554b1b0e906c5ff2a001a94fea1189b78f558cb2922e32ea040 WHIRLPOOL 9af10b16d93d27b48f456abed8139880ff4989f3dd2dbd499babcae1a11a23bb3ea39c7f5d9c02a0d9eb3017934a39c9ba47d66b4e251fcd636b64ca3e6dc776 EBUILD chromium-25.0.1364.68.ebuild 16223 SHA256 2536b65035fa8ee2bc14ebd5370905359a9dd3c6982522a5e62b84cb498e671c SHA512 50ec63147c55df0f6cce44ddcdcf8d42d0b0291912f1d248b3382dc419404df93af536c357429164878f7225f0120c89423b8da14703d1bfa7238794be67c5d9 WHIRLPOOL cc3a2a7eb7e68511e4cfc94dc0a4c3c5200a0ab1fd2a728f41481a3fb07d49cc19c7abded6e072971ea10d9d6ac6fc192232111372fb86433c86ccec6545a505 EBUILD chromium-26.0.1384.2.ebuild 15686 SHA256 96b65ef658b0df34e3f8d625d6b673f9e51eba6e500f217eed9ec0728fe578e6 SHA512 ed1ec1e145aae265f668c9817b52c6e9ba3d3b5e797363027b4d29ce29a17d8903fb1d981354ecea59028ab0af99dcfa288ff13ff1db171921d246ff5d5b071b WHIRLPOOL f7ad67f1281ceb60fcadd2c46a1974b87b671336c6f981179622260eb4246b4a124c7a4cdbcaa87890826360e74b35176d8504f43bd2610fc2845a70167c9abf EBUILD chromium-26.0.1386.0.ebuild 15843 SHA256 4dbeb02dec06f6c9f455d40ad6b3249151a2afddc8c97e60758fad957d351062 SHA512 abf641a14b20cbe95e358ccdf244a335a0eaef334cbb049c7cf6492ddd4d5b6d50cd90ede6db7b09cafe3a3fdc4e7f83e4ee01f0d5fbdd2a82ea8d86dc35d8e6 WHIRLPOOL 048003587244d0a3407483de8b1dc5a7d50db2bdc0a1c9972403eb08a59e85a525236c63bd148f3e155e41b73e969b0542fe0bb1eb0e75d071696a63c281db16 EBUILD chromium-26.0.1403.0.ebuild 15295 SHA256 1da093f37dbea13cd14a5b757f88a4e49bfc838c0786cbd8969e226fe4fa7470 SHA512 f92f1e6f9d0d9764a50d258830552f4632e3c91eeac30a3261a41f138251d00a9ed4ed53501bd3d7a847343134492f463af48be4af5c204ec27db77ee73ad650 WHIRLPOOL d9333fedd4505bf76eb21b296844054f13ea2820809cf96929131447f32059aaecc2e8287de8e3ad6c0f4bb1fa0e2a8dadc91969af496c91c487502e9807c639 EBUILD chromium-9999-r1.ebuild 17038 SHA256 9fd18601a4014a09a6c117a60b2fed7d15f2820c6d0bbaf29baa4a9e470a0ef6 SHA512 b705f0c35481c1dcaa86a4ad9d860541d45e770b127571f6631edecd9cc199c2879557160555998e2ebfaee1ae778fcb3f9a180a2a2a43346c5ebebbe0b9dfa1 WHIRLPOOL 8838a43430fc299610e8d09ec024899607b0e52b2865b69d1e22a6a19d72b1a210483083282a7310b9e1af22450868d351b0d57ad6524d5798c7569a16086205 -MISC ChangeLog 53087 SHA256 18ff55cf3c5481c7308d5a97f959b7edc7aea8bca9eeb052a615862d0c8eb1a7 SHA512 95897719fd36a3f8b7a6d1c85023f0b248cc90e81d3e2c5655832d3202ad6c6ef0b1614c92c9fb2d276e9b87e8beacad38d944ba2ba3c77a6b094f42c605719e WHIRLPOOL a6f06fd367850b13ddd48f43e8308841f54cdce859c0502b02484bc2fd2ec0356aff2e1b6635db91f3de8eb0c568b005e37f40879ae93708300c3410f5c9ca34 +MISC ChangeLog 53269 SHA256 11ce2bfb4ea9f9ac15b79c246a4e04f99eeef6754ed38167e38ea55513d6a0a7 SHA512 e19665bb6894bf2e5bce20cecd322150623fb96403aa29ab2d718573dca31fc569f3c268f22c7fafac5e31bb48d92a77a142e559c81eb8d9d4006f481cf53a71 WHIRLPOOL 7e646acd1590455a5a844306cc66b385845638f542cc43058dd52f4c87034c9a2c6f9c2d645f519f55fe9ac21bb1f2b2a449d9805db190a5b5ba7ea52b030a43 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b MISC metadata.xml 516 SHA256 e5ca0cf3ef65ca054555c35bbb492d02b40138a907fae82aaa236f774fdef32f SHA512 580852722eb6ce8c660ea05b4b9a6a6ca04582c1438401e92425b6733e7a9423f048818153f59394081df6f89bee349da2b3c97a61e030f995df5ae00bc41b58 WHIRLPOOL 03ac4c1574b769bdeebe082281809af638223bdcbdea1bc2faef86f484e0f26298be769f6311023642257d49eb3d31f223c445b07dba5c6aa699775fcedff8ad -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlERwMsACgkQC77qH+pIQ6TNbQD/eVaaRf85pSOhAR9pn5x7Pv6w -lOfqmNmCstkOJzChKT0BAMJJz6fpxImbnCQhzpQmmttN/a34cz125I7uPyyS7CLb -=9TmB +iF4EAREIAAYFAlER0jsACgkQC77qH+pIQ6Qo2QD+KIAq7Id1QwHj1JX8PWSltM7Q +CNAH1WcNhDrJhzBfC9gA/iBQJb+owHFFkseejjR8X4WQGifaPsp6uqm47NLWbi60 +=1Bnc -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-24.0.1312.52.ebuild b/www-client/chromium/chromium-24.0.1312.52.ebuild deleted file mode 100644 index 8d82118a28f5..000000000000 --- a/www-client/chromium/chromium-24.0.1312.52.ebuild +++ /dev/null @@ -1,514 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-24.0.1312.52.ebuild,v 1.3 2013/01/11 10:05:59 ago Exp $ - -EAPI="5" -PYTHON_DEPEND="2:2.6" - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he - hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr - sv sw ta te th tr uk vi zh_CN zh_TW" - -inherit chromium eutils flag-o-matic multilib \ - pax-utils portability python toolchain-funcs versionator virtualx - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc" - -RDEPEND="app-arch/bzip2 - cups? ( - dev-libs/libgcrypt - >=net-print/cups-1.3.11 - ) - >=dev-lang/v8-3.14.5:= - >=dev-libs/elfutils-0.149 - dev-libs/expat - >=dev-libs/icu-49.1.1-r1 - >=dev-libs/libevent-1.4.13 - dev-libs/libxml2[icu] - dev-libs/libxslt - >=dev-libs/nss-3.12.3 - gnome? ( >=gnome-base/gconf-2.24.0 ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) - >=media-libs/alsa-lib-1.0.19 - media-libs/flac - >=media-libs/libjpeg-turbo-1.2.0-r1 - media-libs/libpng - media-libs/libvpx - >=media-libs/libwebp-0.2.0_rc1 - media-libs/opus - media-libs/speex - pulseaudio? ( media-sound/pulseaudio ) - sys-apps/dbus - sys-libs/zlib[minizip] - virtual/udev - virtual/libusb:1 - x11-libs/gtk+:2 - x11-libs/libXinerama - x11-libs/libXScrnSaver - x11-libs/libXtst - kerberos? ( virtual/krb5 ) - selinux? ( - sec-policy/selinux-chromium - sys-libs/libselinux - )" -DEPEND="${RDEPEND} - !arm? ( - >=dev-lang/nacl-toolchain-newlib-0_p9093 - dev-lang/yasm - ) - dev-lang/perl - dev-python/ply - dev-python/simplejson - >=dev-util/gperf-3.0.3 - >=sys-devel/bison-2.4.3 - sys-devel/flex - >=sys-devel/make-3.81-r2 - virtual/pkgconfig - test? ( dev-python/pyftpdlib )" -RDEPEND+=" - !=www-client/chromium-9999 - x11-misc/xdg-utils - virtual/ttf-fonts" - -if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then - EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; -fi - -pkg_setup() { - if [[ "${SLOT}" == "0" ]]; then - CHROMIUM_SUFFIX="" - else - CHROMIUM_SUFFIX="-${SLOT}" - fi - CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB - - # Make sure the build system will use the right python, bug #344367. - python_set_active_version 2 - python_pkg_setup - - if ! use selinux; then - chromium_suid_sandbox_check_kernel_config - fi - - if use bindist; then - elog "bindist enabled: H.264 video support will be disabled." - else - elog "bindist disabled: Resulting binaries may not be legal to re-distribute." - fi -} - -src_prepare() { - if ! use arm; then - ebegin "Preparing NaCl newlib toolchain" - pushd "${T}" >/dev/null || die - mkdir sdk || die - cp -a /usr/$(get_libdir)/nacl-toolchain-newlib sdk/nacl-sdk || die - mkdir -p "${S}"/native_client/toolchain/.tars || die - tar czf "${S}"/native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk || die - popd >/dev/null || die - eend $? - fi - - # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371. - # sed -i '1i#define OF(x) x' \ - # third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die - - epatch "${FILESDIR}/${PN}-arm-r0.patch" - - # Fix build without NaCl glibc toolchain. - epatch "${FILESDIR}/${PN}-ppapi-r0.patch" - - # Fix build without NaCl pnacl toolchain. - epatch "${FILESDIR}/${PN}-no-pnacl-r0.patch" - - # Missing gyp files in tarball. - # https://code.google.com/p/chromium/issues/detail?id=144823 - if [[ -e chrome/test/data/nacl/nacl_test_data.gyp ]]; then - die "tarball fixed, please remove workaround" - fi - - mkdir -p chrome/test/data/nacl - cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF - { - 'targets': [ - { - 'target_name': 'nacl_tests', - 'type': 'none', - }, - ], - } - EOF - - epatch_user - - # Remove most bundled libraries. Some are still needed. - find third_party -type f \! -iname '*.gyp*' \ - \! -path 'third_party/WebKit/*' \ - \! -path 'third_party/angle/*' \ - \! -path 'third_party/cacheinvalidation/*' \ - \! -path 'third_party/cld/*' \ - \! -path 'third_party/cros_system_api/*' \ - \! -path 'third_party/ffmpeg/*' \ - \! -path 'third_party/flac/flac.h' \ - \! -path 'third_party/flot/*' \ - \! -path 'third_party/gpsd/*' \ - \! -path 'third_party/harfbuzz/*' \ - \! -path 'third_party/harfbuzz-ng/*' \ - \! -path 'third_party/hunspell/*' \ - \! -path 'third_party/hyphen/*' \ - \! -path 'third_party/iccjpeg/*' \ - \! -path 'third_party/jsoncpp/*' \ - \! -path 'third_party/khronos/*' \ - \! -path 'third_party/leveldatabase/*' \ - \! -path 'third_party/libjingle/*' \ - \! -path 'third_party/libphonenumber/*' \ - \! -path 'third_party/libsrtp/*' \ - \! -path 'third_party/libusb/libusb.h' \ - \! -path 'third_party/libva/*' \ - \! -path 'third_party/libvpx/libvpx.h' \ - \! -path 'third_party/libxml/chromium/*' \ - \! -path 'third_party/libXNVCtrl/*' \ - \! -path 'third_party/libyuv/*' \ - \! -path 'third_party/lss/*' \ - \! -path 'third_party/mesa/*' \ - \! -path 'third_party/modp_b64/*' \ - \! -path 'third_party/mongoose/*' \ - \! -path 'third_party/mt19937ar/*' \ - \! -path 'third_party/npapi/*' \ - \! -path 'third_party/openmax/*' \ - \! -path 'third_party/opus/opus.h*' \ - \! -path 'third_party/ots/*' \ - \! -path 'third_party/protobuf/*' \ - \! -path 'third_party/pywebsocket/*' \ - \! -path 'third_party/qcms/*' \ - \! -path 'third_party/re2/*' \ - \! -path 'third_party/scons-2.0.1/*' \ - \! -path 'third_party/sfntly/*' \ - \! -path 'third_party/skia/*' \ - \! -path 'third_party/smhasher/*' \ - \! -path 'third_party/speex/speex.h' \ - \! -path 'third_party/sqlite/*' \ - \! -path 'third_party/tcmalloc/*' \ - \! -path 'third_party/tlslite/*' \ - \! -path 'third_party/trace-viewer/*' \ - \! -path 'third_party/undoview/*' \ - \! -path 'third_party/v8-i18n/*' \ - \! -path 'third_party/webdriver/*' \ - \! -path 'third_party/webgl_conformance/*' \ - \! -path 'third_party/webrtc/*' \ - \! -path 'third_party/widevine/*' \ - -delete || die - - local v8_bundled="$(chromium_bundled_v8_version)" - local v8_installed="$(chromium_installed_v8_version)" - einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}" - - # Remove bundled v8. - find v8 -type f \! -iname '*.gyp*' -delete || die - - # The implementation files include v8 headers with full path, - # like #include "v8/include/v8.h". Make sure the system headers - # will be used. - # TODO: find a solution that can be upstreamed. - rmdir v8/include || die - ln -s /usr/include v8/include || die -} - -src_configure() { - local myconf="" - - # Never tell the build system to "enable" SSE2, it has a few unexpected - # additions, bug #336871. - myconf+=" -Ddisable_sse2=1" - - # Optional tcmalloc. Note it causes problems with e.g. NVIDIA - # drivers, bug #413637. - myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)" - - # Disable glibc Native Client toolchain, we don't need it (bug #417019). - myconf+=" -Ddisable_glibc=1" - - # TODO: also build with pnacl - myconf+=" -Ddisable_pnacl=1" - - # Make it possible to remove third_party/adobe. - echo > "${T}/flapper_version.h" || die - myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h" - - # Use system-provided libraries. - # TODO: use_system_ffmpeg - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_libsrtp (bug #348600). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - myconf+=" - -Duse_system_bzip2=1 - -Duse_system_flac=1 - -Duse_system_icu=1 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_libusb=1 - -Duse_system_libvpx=1 - -Duse_system_libwebp=1 - -Duse_system_libxml=1 - -Duse_system_minizip=1 - -Duse_system_opus=1 - -Duse_system_speex=1 - -Duse_system_v8=1 - -Duse_system_xdg_utils=1 - -Duse_system_yasm=1 - -Duse_system_zlib=1" - - # Optional dependencies. - # TODO: linux_link_kerberos, bug #381289. - myconf+=" - $(gyp_use cups) - $(gyp_use gnome use_gconf) - $(gyp_use gnome-keyring use_gnome_keyring) - $(gyp_use gnome-keyring linux_link_gnome_keyring) - $(gyp_use kerberos) - $(gyp_use pulseaudio) - $(gyp_use selinux selinux)" - - # Use explicit library dependencies instead of dlopen. - # This makes breakages easier to detect by revdep-rebuild. - myconf+=" - -Dlinux_link_gsettings=1" - - if ! use selinux; then - # Enable SUID sandbox. - myconf+=" - -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox - -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - fi - - # Never use bundled gold binary. Disable gold linker flags for now. - myconf+=" - -Dlinux_use_gold_binary=0 - -Dlinux_use_gold_flags=0" - - if ! use bindist; then - # Enable H.624 support in bundled ffmpeg. - myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome" - fi - - # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . - # Note: these are for Gentoo use ONLY. For your own distribution, - # please get your own set of keys. Feel free to contact chromium@gentoo.org - # for more info. - myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc - -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com - -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu" - - local myarch="$(tc-arch)" - if [[ $myarch = amd64 ]] ; then - myconf+=" -Dtarget_arch=x64" - elif [[ $myarch = x86 ]] ; then - myconf+=" -Dtarget_arch=ia32" - elif [[ $myarch = arm ]] ; then - # TODO: re-enable NaCl (NativeClient). - myconf+=" -Dtarget_arch=arm - -Darmv7=0 - -Darm_neon=0 - -Ddisable_nacl=1" - else - die "Failed to determine target arch, got '$myarch'." - fi - - # Make sure that -Werror doesn't get added to CFLAGS by the build system. - # Depending on GCC version the warnings are different and we don't want - # the build to fail because of that. - myconf+=" -Dwerror=" - - # Avoid CFLAGS problems, bug #352457, bug #390147. - if ! use custom-cflags; then - replace-flags "-Os" "-O2" - strip-flags - fi - - egyp_chromium ${myconf} || die -} - -src_compile() { - local test_targets - for x in base cacheinvalidation crypto \ - googleurl gpu media net printing sql; do - test_targets+=" ${x}_unittests" - done - - local make_targets="chrome chromedriver" - if ! use selinux; then - make_targets+=" chrome_sandbox" - fi - if use test; then - make_targets+=$test_targets - fi - - # See bug #410883 for more info about the .host mess. - emake ${make_targets} BUILDTYPE=Release V=1 \ - CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \ - CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \ - LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \ - AR.host="$(tc-getAR)" || die - - pax-mark m out/Release/chrome - if use test; then - for x in $test_targets; do - pax-mark m out/Release/${x} - done - fi -} - -src_test() { - # For more info see bug #350349. - local mylocale='en_US.utf8' - if ! locale -a | grep -q "$mylocale"; then - eerror "${PN} requires ${mylocale} locale for tests" - eerror "Please read the following guides for more information:" - eerror " http://www.gentoo.org/doc/en/guide-localization.xml" - eerror " http://www.gentoo.org/doc/en/utf-8.xml" - die "locale ${mylocale} is not supported" - fi - - # For more info see bug #370957. - if [[ $UID -eq 0 ]]; then - die "Tests must be run as non-root. Please use FEATURES=userpriv." - fi - - runtest() { - local cmd=$1 - shift - local filter="--gtest_filter=$(IFS=:; echo "-${*}")" - einfo "${cmd}" "${filter}" - LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}" - } - - local excluded_base_unittests=( - "ICUStringConversionsTest.*" # bug #350347 - "MessagePumpLibeventTest.*" # bug #398591 - ) - runtest out/Release/base_unittests "${excluded_base_unittests[@]}" - - runtest out/Release/cacheinvalidation_unittests - runtest out/Release/crypto_unittests - runtest out/Release/googleurl_unittests - runtest out/Release/gpu_unittests - - # TODO: re-enable when we get the test data in a separate tarball. - # runtest out/Release/media_unittests - - # local excluded_net_unittests=( - # "NetUtilTest.IDNToUnicode*" # bug 361885 - # "NetUtilTest.FormatUrl*" # see above - # "DnsConfigServiceTest.GetSystemConfig" # bug #394883 - # "CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269 - # "URLFetcher*" # bug #425764 - # "HTTPSOCSPTest.*" # bug #426630 - # "HTTPSEVCRLSetTest.*" # see above - # "HTTPSCRLSetTest.*" # see above - #) - # runtest out/Release/net_unittests "${excluded_net_unittests[@]}" - - runtest out/Release/printing_unittests - runtest out/Release/sql_unittests -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome || die - - if ! use selinux; then - doexe out/Release/chrome_sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" - fi - - doexe out/Release/chromedriver || die - - if ! use arm; then - doexe out/Release/nacl_helper{,_bootstrap} || die - insinto "${CHROMIUM_HOME}" - doins out/Release/nacl_irt_*.nexe || die - doins out/Release/libppGoogleNaClPluginChrome.so || die - fi - - newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die - if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then - sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die - sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die - sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die - fi - - # It is important that we name the target "chromium-browser", - # xdg-utils expect it; bug #355517. - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die - - # Allow users to override command-line options, bug #357629. - dodir /etc/chromium || die - insinto /etc/chromium - newins "${FILESDIR}/chromium.default" "default" || die - - pushd out/Release/locales > /dev/null || die - chromium_remove_language_paks - popd - - insinto "${CHROMIUM_HOME}" - doins out/Release/*.pak || die - - doins -r out/Release/locales || die - doins -r out/Release/resources || die - - newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die - newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die - - doexe out/Release/libffmpegsumo.so || die - - # Install icons and desktop entry. - local branding size - for size in 16 22 24 32 48 64 128 256 ; do - case ${size} in - 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; - *) branding="chrome/app/theme/chromium" ;; - esac - newicon -s ${size} "${branding}/product_logo_${size}.png" \ - chromium-browser${CHROMIUM_SUFFIX}.png - done - - local mime_types="text/html;text/xml;application/xhtml+xml;" - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 - mime_types+="x-scheme-handler/ftp;" # bug #412185 - mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 - make_desktop_entry \ - chromium-browser${CHROMIUM_SUFFIX} \ - "Chromium${CHROMIUM_SUFFIX}" \ - chromium-browser${CHROMIUM_SUFFIX} \ - "Network;WebBrowser" \ - "MimeType=${mime_types}\nStartupWMClass=chromium-browser" - sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die - - # Install GNOME default application entry (bug #303100). - if use gnome; then - dodir /usr/share/gnome-control-center/default-apps || die - insinto /usr/share/gnome-control-center/default-apps - newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die - if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then - sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ - "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml - fi - fi -} diff --git a/www-client/chromium/chromium-24.0.1312.56.ebuild b/www-client/chromium/chromium-24.0.1312.56.ebuild index dde19a323b0d..21c06089e86d 100644 --- a/www-client/chromium/chromium-24.0.1312.56.ebuild +++ b/www-client/chromium/chromium-24.0.1312.56.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/www-client/chromium/chromium-24.0.1312.56.ebuild,v 1.3 2013/01/23 10:45:09 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-24.0.1312.56.ebuild,v 1.4 2013/02/06 03:47:06 floppym Exp $ EAPI="5" PYTHON_DEPEND="2:2.6" @@ -27,6 +27,7 @@ RDEPEND="app-arch/bzip2 >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.14.5:= + <dev-lang/v8-3.16.11 >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 |