From 1dddca76936b1e682c4e4039d02b19062c343abd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Hajdan?= Date: Fri, 11 Nov 2011 11:58:21 +0000 Subject: [PATCH] x86 stable wrt security bug #390113. Remove old. Package-Manager: portage-2.1.10.11/cvs/Linux i686 --- www-client/chromium/ChangeLog | 7 +- www-client/chromium/Manifest | 16 +- .../chromium/chromium-15.0.874.102.ebuild | 458 ------------------ .../chromium/chromium-15.0.874.106.ebuild | 458 ------------------ .../chromium/chromium-15.0.874.120.ebuild | 4 +- 5 files changed, 14 insertions(+), 929 deletions(-) delete mode 100644 www-client/chromium/chromium-15.0.874.102.ebuild delete mode 100644 www-client/chromium/chromium-15.0.874.106.ebuild diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 39c2c95f7cc6..aed4615e8619 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,11 @@ # 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.497 2011/11/10 23:49:09 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.498 2011/11/11 11:58:21 phajdan.jr Exp $ + + 11 Nov 2011; Pawel Hajdan jr + -chromium-15.0.874.102.ebuild, -chromium-15.0.874.106.ebuild, + chromium-15.0.874.120.ebuild: + x86 stable wrt security bug #390113. Remove old. 10 Nov 2011; Mike Gilbert chromium-9999-r1.ebuild: Apply workaround for bug 383371 to zip_internal.cc. Reported by godmachine-x6. diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 2dce81707b98..fe3821d9a535 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff AUX chromium-cups-r0.patch 726 RMD160 f3193ce9f987b6e5ad05a67d090ab4f9e1cb7b41 SHA1 8efd3479977e89429237d49fefbfcc63d250089e SHA256 800a669839ca7e033bb360b0cd9db92dde93505609c0b9184bf3901d2ec1535b @@ -11,27 +11,23 @@ AUX chromium.default 147 RMD160 4c0669585499b94c225e34e985e615d0299b66fb SHA1 1c AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf AUX extract_v8_version.py 731 RMD160 71b134c9b88902259cb20ec232b8da6c3d8a15de SHA1 3dc5d6f9437f4b0ffb584395e19663450384b53a SHA256 4011f1e2f44bd18ad1266dffc1d3fbc13a6430afade2b19240b31ee9437dcbda AUX nacl.gypi 98 RMD160 fa4806fbc8c2e19763c1905a3bc431022b247825 SHA1 df4cee39e1d49e10f9c075f5e6e9db28e8260926 SHA256 25bddd2eee7821e18ddda06f6e69552c359e1c04a10971ac3985556c3d8ef059 -DIST chromium-15.0.874.102.tar.bz2 151371123 RMD160 dfca6a43e773666334c5a40d50fc86c5ee3c335b SHA1 961392fbde1f99a40b860454565e8be3b752a3cf SHA256 63c94003a2152d9b7ec51e9126d6848c3d1ec7088ba6879f47f4b594b00ad878 -DIST chromium-15.0.874.106.tar.bz2 151367039 RMD160 853dc23730a821d51e32e19fd9fc2173dbd2d038 SHA1 424a6b76a93dfdf1cf2fb153041ecdf9f9533c2c SHA256 07d216782b20513d3550e6a2388d31784740264ba6977d66617058687885becf DIST chromium-15.0.874.120.tar.bz2 151131909 RMD160 97a453d189116336b5fb291b1efa8354f3297c29 SHA1 ba1df188fc786334cee8d623b3d6123599a802f7 SHA256 bdfc4533708249b50743acaae4f49772e56c8070ea2fc4af114694c40d8ed929 DIST chromium-16.0.912.21.tar.bz2 154072311 RMD160 d212ca36c9aabd622276e53777b93316f900c175 SHA1 809a1a6e0d2c8b036b8f7eb97c3fdf18e8af68cd SHA256 09417a33e9e620331f93c5e0904e3dbd8c4ca76a2766556702533b38aa4bd577 DIST chromium-16.0.912.32.tar.bz2 154126364 RMD160 be1928af8c0095f76a58a618f66b3b06f7e1ca6e SHA1 8d1fe0ab8bf8fa2d6332ef4ad0c2a3f255367f0c SHA256 e2cdff16e68a6b60e54c3f519e8af3256497192fe6d98400369906c915d06713 DIST chromium-17.0.928.0.tar.bz2 150539755 RMD160 306d46186a497c81461f539500f3c88e67fc5c85 SHA1 129b14bcd60121f32d5264e224535a867384a524 SHA256 471e7b96aa37aba4121f34db2a77de87fa3a6774e1376cc42ce7403cdb2f59ea DIST chromium-17.0.932.0.tar.bz2 156649015 RMD160 5ad608f601cec211343595b68f34ccc8dbe181b7 SHA1 d7414b0666aaf55cfa096e739bf539c4de3cf392 SHA256 61dabec8f17559de3b2ee6a537265850ccfaa8c36eb41e9cc4f135461e3f5b78 -EBUILD chromium-15.0.874.102.ebuild 14144 RMD160 9f257a04b01b597205249c2d92f56e7b7e8015e5 SHA1 e5d57b87eba007c47c94006035a0c9f71f108329 SHA256 1ec0d0831d223c130291c8936fd053ed7d8b4ff68fd473fdde5e36a81a99596f -EBUILD chromium-15.0.874.106.ebuild 14143 RMD160 ef3a52d44e4777aee44e2b835b234189fd381f00 SHA1 c0b6f25b143c90bc59f6a150371bdd6f8ce2b095 SHA256 e3ad615781dfa2b208054a6627378df0fc16f919c594823dc9f44d4fbee10665 -EBUILD chromium-15.0.874.120.ebuild 14142 RMD160 b497a33cf414b8ef7ef76000f0b7832b7f5f8c4e SHA1 dd4e3b80df8f83aa7091253a8c294e00aa3af730 SHA256 434f83bdedd27f6e8aaa0cb70ac13373f799b8dc048e70583af1164931fd9cdc +EBUILD chromium-15.0.874.120.ebuild 14144 RMD160 f1771e74345fb39d4bcffe8c35aaaf6694473ed6 SHA1 92005b4245be841b0e320848c9fc00db553740b1 SHA256 2d4371ea7325caf115f24f49341f8aec0b978738334a2e1272569b5ea04d8ff4 EBUILD chromium-16.0.912.21.ebuild 16515 RMD160 d728f26b57f2dd94066e64a8d0f3d90abd0b1512 SHA1 713ae33ba1e0353bb629984d2a954daccd6eef85 SHA256 b4051a317e5743363c2730a27a645dc9892d8c37a8719cc9112f41ee9aee5aba EBUILD chromium-16.0.912.32.ebuild 16586 RMD160 e29d4dc7be00d58d41d94a255248150b5cfd06c3 SHA1 1bb5ab45a737b1e591ccc3d96ec31045f229a1eb SHA256 ce270592808902eea3aa9808f3f66c7c50f764d6df7ad47879dac4142f3b90ff EBUILD chromium-17.0.928.0.ebuild 16551 RMD160 49104ce7304db68e7dca90f9610dd48ed3d8a5d4 SHA1 a002a02641d3b39054073f1dba7dbd64a989f4f2 SHA256 ebef48e9a561c86ed67ee9d36480e04baad3c50f76f85a1fbfb79334ac65cf92 EBUILD chromium-17.0.932.0.ebuild 17029 RMD160 686813435c19fba1aefc15f44b29bb0a08cc8ee6 SHA1 09c3d043305adf69fdab67534d150fc333fd00af SHA256 13cd9efe528714bf9d463204a57f4d57c800cb44dc971dc939c03a1ac20e9826 EBUILD chromium-9999-r1.ebuild 19023 RMD160 aa10c7121e489d5fa3bfd6bc6d5e855d1a72fd34 SHA1 43a56e4e329257f2277d2261327b0e81fc8bd48e SHA256 eb5b2bcc7c65ac0ecb89bddd7cad7469c14e2a592c9669293421af97fcb2f692 -MISC ChangeLog 108803 RMD160 51818681b75d6ce8385844ec0fbf0bbed3d88b19 SHA1 19c2a294f089c9b8bb6f1818b73cf7b82815ce06 SHA256 de2eaa99e482a752a35f773c67efd186e95495f2ed0ac854ded5b0f72b148d9b +MISC ChangeLog 109009 RMD160 f9b985ac8ddab3d9421fa3fade76e89c5affbff9 SHA1 24f4e6d176ead51a6aad237e496a4e00d0a47ed0 SHA256 05499063613e3ab24ad41b775e8275c2c2130edefdcbbc8ca49c88dc1b93b4ca MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk68YwIACgkQC77qH+pIQ6SAYwD/Tiy+6WmVdZ2+2VAxqZw5I9Vd -GleGcGKW9DECLBtWAksBALFdbWJkOKvzW/puPKZ+qSWURBm50Ulu6PMRcXePjC+m -=NusF +iEYEAREKAAYFAk69Dd4ACgkQuUQtlDBCeQLlNgCeOAdd2yXeOw53tbxFsDxQ6hhL +gFIAn20dZqu/3iQv7iQXZQ0e8r8U+bF/ +=4+7b -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-15.0.874.102.ebuild b/www-client/chromium/chromium-15.0.874.102.ebuild deleted file mode 100644 index ff766ab10685..000000000000 --- a/www-client/chromium/chromium-15.0.874.102.ebuild +++ /dev/null @@ -1,458 +0,0 @@ -# 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-15.0.874.102.ebuild,v 1.4 2011/10/28 13:50:45 phajdan.jr Exp $ - -EAPI="3" -PYTHON_DEPEND="2:2.6" - -inherit eutils fdo-mime flag-o-matic gnome2-utils linux-info 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" - -# en_US is ommitted on purpose from the list below. It must always be available. -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 nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th -tr uk vi zh_CN zh_TW" -for lang in ${LANGS}; do - IUSE+=" linguas_${lang}" -done - -RDEPEND="app-arch/bzip2 - dev-libs/dbus-glib - >=dev-libs/icu-4.4.1 - >=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 - virtual/jpeg - media-libs/libpng - >=media-libs/libwebp-0.1.2 - media-libs/speex - pulseaudio? ( media-sound/pulseaudio ) - cups? ( - dev-libs/libgcrypt - >=net-print/cups-1.3.11 - ) - sys-libs/zlib - x11-libs/gtk+:2 - x11-libs/libXinerama - x11-libs/libXScrnSaver - x11-libs/libXtst - kerberos? ( virtual/krb5 )" -DEPEND="${RDEPEND} - dev-lang/perl - >=dev-util/gperf-3.0.3 - >=dev-util/pkgconfig-0.23 - >=sys-devel/bison-2.4.3 - sys-devel/flex - >=sys-devel/make-3.81-r2 - test? ( - dev-python/pyftpdlib - dev-python/simplejson - )" -RDEPEND+=" - x11-misc/xdg-utils - virtual/ttf-fonts" - -gyp_use() { - if [[ $# -lt 2 ]]; then - echo "!!! usage: gyp_use " >&2 - return 1 - fi - if use "$1"; then echo "-D$2=1"; else echo "-D$2=0"; fi -} - -egyp() { - set -- build/gyp_chromium --depth=. "${@}" - echo "${@}" >&2 - "${@}" -} - -# Chromium uses different names for some langs, -# return Chromium name corresponding to a Gentoo lang. -chromium_lang() { - if [[ "$1" == "es_LA" ]]; then - echo "es_419" - else - echo "$1" - fi -} - -pkg_setup() { - CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" - - # 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 - - # Prevent user problems like bug #348235. - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)." - ewarn "You may experience really long compilation times and/or increased memory usage." - ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug." - fi - eshopts_pop - - # Warn if the kernel doesn't support features useful for sandboxing, - # bug #363907. - CONFIG_CHECK="~PID_NS ~NET_NS" - check_extra_config - - 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() { - cp "${FILESDIR}/nacl.gypi" chrome/ || die - - # 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}.c \ - chrome/common/zip.cc || die - - # Backport http://codereview.chromium.org/8038051, fix for bug #383121. - epatch "${FILESDIR}/${PN}-kerberos-r0.patch" - - 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/expat/*' \ - \! -path 'third_party/ffmpeg/*' \ - \! -path 'third_party/flac/flac.h' \ - \! -path 'third_party/gpsd/*' \ - \! -path 'third_party/harfbuzz/*' \ - \! -path 'third_party/hunspell/*' \ - \! -path 'third_party/iccjpeg/*' \ - \! -path 'third_party/launchpad_translations/*' \ - \! -path 'third_party/leveldb/*' \ - \! -path 'third_party/leveldatabase/*' \ - \! -path 'third_party/libjingle/*' \ - \! -path 'third_party/libphonenumber/*' \ - \! -path 'third_party/libvpx/*' \ - \! -path 'third_party/mesa/*' \ - \! -path 'third_party/modp_b64/*' \ - \! -path 'third_party/mongoose/*' \ - \! -path 'third_party/npapi/*' \ - \! -path 'third_party/openmax/*' \ - \! -path 'third_party/ots/*' \ - \! -path 'third_party/protobuf/*' \ - \! -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/undoview/*' \ - \! -path 'third_party/v8-i18n/*' \ - \! -path 'third_party/webdriver/*' \ - \! -path 'third_party/webgl_conformance/*' \ - \! -path 'third_party/webrtc/*' \ - \! -path 'third_party/yasm/*' \ - \! -path 'third_party/zlib/contrib/minizip/*' \ - -delete || die - - # Make sure the build system will use the right python, bug #344367. - # Only convert directories that need it, to save time. - python_convert_shebangs -q -r 2 build tools -} - -src_configure() { - local myconf="" - - # Never tell the build system to "enable" SSE2, it has a few unexpected - # additions, bug #336871. - myconf+=" -Ddisable_sse2=1" - - # Disable NaCl temporarily, this tarball doesn't have IRT. - myconf+=" -Ddisable_nacl=1" - - # Disable WebRTC until they make PulseAudio dependency optional, - # bug #377847. - myconf+=" -Denable_webrtc=0" - - # Use system-provided libraries. - # TODO: use_system_ffmpeg - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - # TODO: use_system_vpx - 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_libwebp=1 - -Duse_system_libxml=1 - -Duse_system_speex=1 - -Duse_system_xdg_utils=1 - -Duse_system_zlib=1" - - # Optional dependencies. - # TODO: linux_link_kerberos, bug #381289. - myconf+=" - $(gyp_use cups 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 use_kerberos) - $(gyp_use pulseaudio use_pulseaudio)" - - # Enable sandbox. - myconf+=" - -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox - -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - - if host-is-pax; then - # Prevent the build from failing (bug #301880). The performance - # difference is very small. - myconf+=" -Dv8_use_snapshot=0" - fi - - # Our system ffmpeg should support more codecs than the bundled one - # for Chromium. - # myconf+=" -Dproprietary_codecs=1" - - if ! use bindist; then - # Enable H.624 support in bundled ffmpeg. - myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome" - fi - - 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: check this again after - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed. - append-flags -fno-tree-sink - - myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" - 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 a build error with -Os, bug #352457. - replace-flags "-Os" "-O2" - - egyp ${myconf} || die -} - -src_compile() { - emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die - pax-mark m out/Release/chrome - if use test; then - emake {base,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die - pax-mark m out/Release/{base,crypto,googleurl,net}_unittests - 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 - - # For more info see bug #350347. - LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \ - '--gtest_filter=-ICUStringConversionsTest.*' - - LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake - LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake - - # NetUtilTest: bug #361885. - # NetUtilTest.GenerateFileName: some locale-related mismatch. - # UDP: unstable, active development. We should revisit this later. - LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \ - '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:NetUtilTest.GenerateFileName:*UDP*' -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome || die - doexe out/Release/chrome_sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" - - doexe out/Release/chromedriver || die - - # Install Native Client files on platforms that support it. - # insinto "${CHROMIUM_HOME}" - # case "$(tc-arch)" in - # amd64) - # doins native_client/irt_binaries/nacl_irt_x86_64.nexe || die - # doins out/Release/libppGoogleNaClPluginChrome.so || die - # ;; - # x86) - # doins native_client/irt_binaries/nacl_irt_x86_32.nexe || die - # doins out/Release/libppGoogleNaClPluginChrome.so || die - # ;; - # esac - - newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die - - # 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 || die - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die - - # Allow users to override command-line options, bug #357629. - dodir /etc/chromium || die - insinto /etc/chromium - newins "${FILESDIR}/chromium.default" "default" || die - - # Support LINGUAS, bug #332751. - local pak - for pak in out/Release/locales/*.pak; do - local pakbasename="$(basename ${pak})" - local pakname="${pakbasename%.pak}" - local langname="${pakname//-/_}" - - # Do not issue warning for en_US locale. This is the fallback - # locale so it should always be installed. - if [[ "${langname}" == "en_US" ]]; then - continue - fi - - local found=false - local lang - for lang in ${LANGS}; do - local crlang="$(chromium_lang ${lang})" - if [[ "${langname}" == "${crlang}" ]]; then - found=true - break - fi - done - if ! $found; then - ewarn "LINGUAS warning: no ${langname} in LANGS" - fi - done - local lang - for lang in ${LANGS}; do - local crlang="$(chromium_lang ${lang})" - local pakfile="out/Release/locales/${crlang//_/-}.pak" - if [ ! -f "${pakfile}" ]; then - ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)" - fi - if ! use linguas_${lang}; then - rm "${pakfile}" || die - fi - done - - insinto "${CHROMIUM_HOME}" - doins out/Release/chrome.pak || die - doins out/Release/resources.pak || die - - doins -r out/Release/locales || die - doins -r out/Release/resources || die - - newman out/Release/chrome.1 chromium.1 || die - newman out/Release/chrome.1 chromium-browser.1 || die - - # Chromium looks for these in its folder - # See media_posix.cc and base_paths_linux.cc - # dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die - # dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die - # dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die - doexe out/Release/libffmpegsumo.so || die - - # Install icons and desktop entry. - for SIZE in 16 22 24 32 48 64 128 256 ; do - insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps - newins chrome/app/theme/chromium/product_logo_${SIZE}.png \ - chromium-browser.png || die - done - local mime_types="text/html;text/xml;application/xhtml+xml;" - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 - make_desktop_entry chromium-browser "Chromium" chromium-browser \ - "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 - doins "${FILESDIR}"/chromium-browser.xml || die - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - # For more info see bug #292201, bug #352263, bug #361859. - elog - elog "Depending on your desktop environment, you may need" - elog "to install additional packages to get icons on the Downloads page." - elog - elog "For KDE, the required package is kde-base/oxygen-icons." - elog - elog "For other desktop environments, try one of the following:" - elog " - x11-themes/gnome-icon-theme" - elog " - x11-themes/tango-icon-theme" - - # For more info see bug #359153. - elog - elog "Some web pages may require additional fonts to display properly." - elog "Try installing some of the following packages if some characters" - elog "are not displayed properly:" - elog " - media-fonts/arphicfonts" - elog " - media-fonts/bitstream-cyberbit" - elog " - media-fonts/droid" - elog " - media-fonts/ipamonafont" - elog " - media-fonts/ja-ipafonts" - elog " - media-fonts/takao-fonts" - elog " - media-fonts/wqy-microhei" - elog " - media-fonts/wqy-zenhei" -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/www-client/chromium/chromium-15.0.874.106.ebuild b/www-client/chromium/chromium-15.0.874.106.ebuild deleted file mode 100644 index e5bf109f9230..000000000000 --- a/www-client/chromium/chromium-15.0.874.106.ebuild +++ /dev/null @@ -1,458 +0,0 @@ -# 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-15.0.874.106.ebuild,v 1.1 2011/10/26 23:24:26 floppym Exp $ - -EAPI="3" -PYTHON_DEPEND="2:2.6" - -inherit eutils fdo-mime flag-o-matic gnome2-utils linux-info 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" - -# en_US is ommitted on purpose from the list below. It must always be available. -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 nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th -tr uk vi zh_CN zh_TW" -for lang in ${LANGS}; do - IUSE+=" linguas_${lang}" -done - -RDEPEND="app-arch/bzip2 - dev-libs/dbus-glib - >=dev-libs/icu-4.4.1 - >=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 - virtual/jpeg - media-libs/libpng - >=media-libs/libwebp-0.1.2 - media-libs/speex - pulseaudio? ( media-sound/pulseaudio ) - cups? ( - dev-libs/libgcrypt - >=net-print/cups-1.3.11 - ) - sys-libs/zlib - x11-libs/gtk+:2 - x11-libs/libXinerama - x11-libs/libXScrnSaver - x11-libs/libXtst - kerberos? ( virtual/krb5 )" -DEPEND="${RDEPEND} - dev-lang/perl - >=dev-util/gperf-3.0.3 - >=dev-util/pkgconfig-0.23 - >=sys-devel/bison-2.4.3 - sys-devel/flex - >=sys-devel/make-3.81-r2 - test? ( - dev-python/pyftpdlib - dev-python/simplejson - )" -RDEPEND+=" - x11-misc/xdg-utils - virtual/ttf-fonts" - -gyp_use() { - if [[ $# -lt 2 ]]; then - echo "!!! usage: gyp_use " >&2 - return 1 - fi - if use "$1"; then echo "-D$2=1"; else echo "-D$2=0"; fi -} - -egyp() { - set -- build/gyp_chromium --depth=. "${@}" - echo "${@}" >&2 - "${@}" -} - -# Chromium uses different names for some langs, -# return Chromium name corresponding to a Gentoo lang. -chromium_lang() { - if [[ "$1" == "es_LA" ]]; then - echo "es_419" - else - echo "$1" - fi -} - -pkg_setup() { - CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" - - # 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 - - # Prevent user problems like bug #348235. - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)." - ewarn "You may experience really long compilation times and/or increased memory usage." - ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug." - fi - eshopts_pop - - # Warn if the kernel doesn't support features useful for sandboxing, - # bug #363907. - CONFIG_CHECK="~PID_NS ~NET_NS" - check_extra_config - - 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() { - cp "${FILESDIR}/nacl.gypi" chrome/ || die - - # 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}.c \ - chrome/common/zip.cc || die - - # Backport http://codereview.chromium.org/8038051, fix for bug #383121. - epatch "${FILESDIR}/${PN}-kerberos-r0.patch" - - 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/expat/*' \ - \! -path 'third_party/ffmpeg/*' \ - \! -path 'third_party/flac/flac.h' \ - \! -path 'third_party/gpsd/*' \ - \! -path 'third_party/harfbuzz/*' \ - \! -path 'third_party/hunspell/*' \ - \! -path 'third_party/iccjpeg/*' \ - \! -path 'third_party/launchpad_translations/*' \ - \! -path 'third_party/leveldb/*' \ - \! -path 'third_party/leveldatabase/*' \ - \! -path 'third_party/libjingle/*' \ - \! -path 'third_party/libphonenumber/*' \ - \! -path 'third_party/libvpx/*' \ - \! -path 'third_party/mesa/*' \ - \! -path 'third_party/modp_b64/*' \ - \! -path 'third_party/mongoose/*' \ - \! -path 'third_party/npapi/*' \ - \! -path 'third_party/openmax/*' \ - \! -path 'third_party/ots/*' \ - \! -path 'third_party/protobuf/*' \ - \! -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/undoview/*' \ - \! -path 'third_party/v8-i18n/*' \ - \! -path 'third_party/webdriver/*' \ - \! -path 'third_party/webgl_conformance/*' \ - \! -path 'third_party/webrtc/*' \ - \! -path 'third_party/yasm/*' \ - \! -path 'third_party/zlib/contrib/minizip/*' \ - -delete || die - - # Make sure the build system will use the right python, bug #344367. - # Only convert directories that need it, to save time. - python_convert_shebangs -q -r 2 build tools -} - -src_configure() { - local myconf="" - - # Never tell the build system to "enable" SSE2, it has a few unexpected - # additions, bug #336871. - myconf+=" -Ddisable_sse2=1" - - # Disable NaCl temporarily, this tarball doesn't have IRT. - myconf+=" -Ddisable_nacl=1" - - # Disable WebRTC until they make PulseAudio dependency optional, - # bug #377847. - myconf+=" -Denable_webrtc=0" - - # Use system-provided libraries. - # TODO: use_system_ffmpeg - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - # TODO: use_system_vpx - 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_libwebp=1 - -Duse_system_libxml=1 - -Duse_system_speex=1 - -Duse_system_xdg_utils=1 - -Duse_system_zlib=1" - - # Optional dependencies. - # TODO: linux_link_kerberos, bug #381289. - myconf+=" - $(gyp_use cups 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 use_kerberos) - $(gyp_use pulseaudio use_pulseaudio)" - - # Enable sandbox. - myconf+=" - -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox - -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - - if host-is-pax; then - # Prevent the build from failing (bug #301880). The performance - # difference is very small. - myconf+=" -Dv8_use_snapshot=0" - fi - - # Our system ffmpeg should support more codecs than the bundled one - # for Chromium. - # myconf+=" -Dproprietary_codecs=1" - - if ! use bindist; then - # Enable H.624 support in bundled ffmpeg. - myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome" - fi - - 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: check this again after - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed. - append-flags -fno-tree-sink - - myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" - 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 a build error with -Os, bug #352457. - replace-flags "-Os" "-O2" - - egyp ${myconf} || die -} - -src_compile() { - emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die - pax-mark m out/Release/chrome - if use test; then - emake {base,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die - pax-mark m out/Release/{base,crypto,googleurl,net}_unittests - 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 - - # For more info see bug #350347. - LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \ - '--gtest_filter=-ICUStringConversionsTest.*' - - LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake - LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake - - # NetUtilTest: bug #361885. - # NetUtilTest.GenerateFileName: some locale-related mismatch. - # UDP: unstable, active development. We should revisit this later. - LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \ - '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:NetUtilTest.GenerateFileName:*UDP*' -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome || die - doexe out/Release/chrome_sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" - - doexe out/Release/chromedriver || die - - # Install Native Client files on platforms that support it. - # insinto "${CHROMIUM_HOME}" - # case "$(tc-arch)" in - # amd64) - # doins native_client/irt_binaries/nacl_irt_x86_64.nexe || die - # doins out/Release/libppGoogleNaClPluginChrome.so || die - # ;; - # x86) - # doins native_client/irt_binaries/nacl_irt_x86_32.nexe || die - # doins out/Release/libppGoogleNaClPluginChrome.so || die - # ;; - # esac - - newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die - - # 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 || die - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die - - # Allow users to override command-line options, bug #357629. - dodir /etc/chromium || die - insinto /etc/chromium - newins "${FILESDIR}/chromium.default" "default" || die - - # Support LINGUAS, bug #332751. - local pak - for pak in out/Release/locales/*.pak; do - local pakbasename="$(basename ${pak})" - local pakname="${pakbasename%.pak}" - local langname="${pakname//-/_}" - - # Do not issue warning for en_US locale. This is the fallback - # locale so it should always be installed. - if [[ "${langname}" == "en_US" ]]; then - continue - fi - - local found=false - local lang - for lang in ${LANGS}; do - local crlang="$(chromium_lang ${lang})" - if [[ "${langname}" == "${crlang}" ]]; then - found=true - break - fi - done - if ! $found; then - ewarn "LINGUAS warning: no ${langname} in LANGS" - fi - done - local lang - for lang in ${LANGS}; do - local crlang="$(chromium_lang ${lang})" - local pakfile="out/Release/locales/${crlang//_/-}.pak" - if [ ! -f "${pakfile}" ]; then - ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)" - fi - if ! use linguas_${lang}; then - rm "${pakfile}" || die - fi - done - - insinto "${CHROMIUM_HOME}" - doins out/Release/chrome.pak || die - doins out/Release/resources.pak || die - - doins -r out/Release/locales || die - doins -r out/Release/resources || die - - newman out/Release/chrome.1 chromium.1 || die - newman out/Release/chrome.1 chromium-browser.1 || die - - # Chromium looks for these in its folder - # See media_posix.cc and base_paths_linux.cc - # dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die - # dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die - # dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die - doexe out/Release/libffmpegsumo.so || die - - # Install icons and desktop entry. - for SIZE in 16 22 24 32 48 64 128 256 ; do - insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps - newins chrome/app/theme/chromium/product_logo_${SIZE}.png \ - chromium-browser.png || die - done - local mime_types="text/html;text/xml;application/xhtml+xml;" - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 - make_desktop_entry chromium-browser "Chromium" chromium-browser \ - "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 - doins "${FILESDIR}"/chromium-browser.xml || die - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - # For more info see bug #292201, bug #352263, bug #361859. - elog - elog "Depending on your desktop environment, you may need" - elog "to install additional packages to get icons on the Downloads page." - elog - elog "For KDE, the required package is kde-base/oxygen-icons." - elog - elog "For other desktop environments, try one of the following:" - elog " - x11-themes/gnome-icon-theme" - elog " - x11-themes/tango-icon-theme" - - # For more info see bug #359153. - elog - elog "Some web pages may require additional fonts to display properly." - elog "Try installing some of the following packages if some characters" - elog "are not displayed properly:" - elog " - media-fonts/arphicfonts" - elog " - media-fonts/bitstream-cyberbit" - elog " - media-fonts/droid" - elog " - media-fonts/ipamonafont" - elog " - media-fonts/ja-ipafonts" - elog " - media-fonts/takao-fonts" - elog " - media-fonts/wqy-microhei" - elog " - media-fonts/wqy-zenhei" -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/www-client/chromium/chromium-15.0.874.120.ebuild b/www-client/chromium/chromium-15.0.874.120.ebuild index 1c86d66e239e..0a468f2e824d 100644 --- a/www-client/chromium/chromium-15.0.874.120.ebuild +++ b/www-client/chromium/chromium-15.0.874.120.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-15.0.874.120.ebuild,v 1.2 2011/11/10 22:08:08 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.874.120.ebuild,v 1.3 2011/11/11 11:58:21 phajdan.jr Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" @@ -14,7 +14,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}. LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio" # en_US is ommitted on purpose from the list below. It must always be available. -- 2.26.2