Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/www-client
diff options
context:
space:
mode:
Diffstat (limited to 'www-client')
-rw-r--r--www-client/chromium/ChangeLog10
-rw-r--r--www-client/chromium/Manifest18
-rw-r--r--www-client/chromium/chromium-12.0.742.91-r1.ebuild377
-rw-r--r--www-client/chromium/chromium-14.0.814.0.ebuild (renamed from www-client/chromium/chromium-14.0.797.0.ebuild)20
-rw-r--r--www-client/chromium/chromium-9999-r1.ebuild17
5 files changed, 48 insertions, 394 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index f4f07953150b..5f8e08aab38c 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,14 @@
# 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.396 2011/06/30 11:57:36 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.397 2011/07/17 00:25:26 phajdan.jr Exp $
+
+*chromium-14.0.814.0 (17 Jul 2011)
+
+ 17 Jul 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+ -chromium-12.0.742.91-r1.ebuild, -chromium-14.0.797.0.ebuild,
+ +chromium-14.0.814.0.ebuild, chromium-9999-r1.ebuild:
+ Version bump for dev channel release. Fixes bug #372561 by Florian Scandella
+ and an issue reported by zmedico in bug #366413. Remove old.
30 Jun 2011; Thomas Kahle <tomka@gentoo.org> chromium-12.0.742.112.ebuild:
x86 stable per bug 373451
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index adefa63e61cb..039fe464b2b7 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 1237 RMD160 601fc9a46027580a1817a77abfb47b2b59e212ca SHA1 9826e90746229c7c12d767bb3b6cbdbc5c300041 SHA256 594af80456d977a19949909a7c79cae706964f7ced47634c9c9b19478dc089a2
@@ -16,24 +16,22 @@ AUX chromium.default 147 RMD160 4c0669585499b94c225e34e985e615d0299b66fb SHA1 1c
AUX chromium.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf
DIST chromium-12.0.742.112.tar.bz2 151384207 RMD160 13d9092d79a324852b60e42979218f989000cad1 SHA1 181be3b00386d70e7cc8db88c4e782960a8d4e30 SHA256 b19ea97a7def45c9052ead5ad9f171a3ea1df29c17a5d237e0b78bdfdcefdfb2
-DIST chromium-12.0.742.91.tar.bz2 151259660 RMD160 eb0389f815c638897cf556df5b58eed081cc872b SHA1 bb1f84c48cad0846d7e34f78c047ee71fe8a37b0 SHA256 41995c953436086f2227c55ee8f30a53c2464a7358824b9c629d3985e5a00409
DIST chromium-13.0.782.32.tar.bz2 154629346 RMD160 772976bc9eb98986b0840a2c326ec72dde97a598 SHA1 8ba5f9a276e7890fb9dea1539eee0376f72a32e7 SHA256 9c6391df0b8a207066bc6f7b82b7e014ed5e7e24f989a0dcb8112dd2f6019368
DIST chromium-13.0.782.41.tar.bz2 155160413 RMD160 1af03144ed095c86690d315ed6fe5d242e537530 SHA1 bf6c6e583e35a10ad2d7d2ccd37fa581f701573f SHA256 ab0bd105a6ff4dd4eee80f9834710dab4ec419d143539161c3b5905a12fce65a
-DIST chromium-14.0.797.0.tar.bz2 202992403 RMD160 0e25866af3140a9ea7975ebf29a425b75bf23be5 SHA1 74b4f57925eb1bba992d1cb5ccdec1fe5008cefc SHA256 4e5bc0b32e539f8e0f5779b2e389c621d496dcadfb10e8e84ceb39ef2cfae1cd
DIST chromium-14.0.803.0.tar.bz2 203144509 RMD160 00e2886eff6616f3c39ee7aef7cd91fa776d967e SHA1 25f9b65e83d5f97d58baea0eb02cb249591c3f8e SHA256 97dd46cb3ad2f7890d7bf7256e9d694304e90f99b1c25ba134e7ea3e50f98722
+DIST chromium-14.0.814.0.tar.bz2 201797447 RMD160 1faf919cfdb4f52ef386db55bdfaa6c0bb8100eb SHA1 223f7ac1015779c60edab89816c3a6b3967c9880 SHA256 4432bd0fec023ca701adce135c71f4248b3b1f83e41730fe110725cfcf8225f6
EBUILD chromium-12.0.742.112.ebuild 12017 RMD160 b65af3dc698ef3b6f1ecec4eccf1865a697f19bc SHA1 53efd7ac54cae6976a3d0b248656aa7ab57599a3 SHA256 42057d8383c146334cd356b1f4516d8ca0755d96b42a6d08eb71507abc94876f
-EBUILD chromium-12.0.742.91-r1.ebuild 11924 RMD160 e875af5b3fe7da35660cd9d3f76183faa55150ce SHA1 0030a7576bdfa9ab78ecddfe46c9dc3b3770b47f SHA256 dca9bf82fae0be92651f5d7dd0e13788dd275422c82b62d06d9f674b6f282e6e
EBUILD chromium-13.0.782.32.ebuild 12842 RMD160 38a8c6713bb5118f73fda007165c9b50cd33881d SHA1 22a65c6dc551bcb49ff3a51463d9462eae39d88c SHA256 fa85b76a4c0346b8e9a53e2f4dfb6e2f64ee1ffa9cc2fa83f62f9fc1e5461513
EBUILD chromium-13.0.782.41.ebuild 12842 RMD160 55136b89a360354745f64401e94c61fffd502d0e SHA1 724b13eb96dae4a202fc74dc9b14860124c0a61d SHA256 39e9130ecb2bc1d8d2c4d67138bdd2dc037b464e0189c06ad90bd47f50d90b48
-EBUILD chromium-14.0.797.0.ebuild 12550 RMD160 7521dc16970a7d3339daaf4ff202f8d5facff80e SHA1 e573cef9d2a1d1f3a77cc780d9cdf673270da8ad SHA256 c47ec20fc846a964a05167aecec2b05bae859a39cd60cefc8ec042090b3495fe
EBUILD chromium-14.0.803.0.ebuild 12643 RMD160 cd4df3f84a2224db0dfac59dbf1cc3f2b810cb0d SHA1 d226426dd90852d94ba9410c47517da0b3768e98 SHA256 a8daf44320ccfe514ed4ccd0d56132de1759028c3736a3e85baa62a54d1e2c5e
-EBUILD chromium-9999-r1.ebuild 14676 RMD160 f0c9ba924b094e35c33ccc1e64fc726dc89a9e56 SHA1 d6b675647764582df209cf890316d2d885115596 SHA256 0353094cd3a4572743593c5de592e0668c12ddb85fbf763d4f263d3883469fe2
-MISC ChangeLog 88026 RMD160 7becf135b46b587fccbd34718a215f12e0f4061c SHA1 0444f30b9dfd09dfdf38bd184a75b8dd482707fe SHA256 8376eb182d73aafb28cfa1b579fca7f0eab1aef052faf6f9c2001f94735571d2
+EBUILD chromium-14.0.814.0.ebuild 12982 RMD160 61303da10a5f46f3635a7a74de32b25aa511e740 SHA1 f1c692366e66772d10d569016b43389e9daecd18 SHA256 6a68f81b87875701d685704cff85aa3a8143ca0634d7ad9250e6e384fec511d5
+EBUILD chromium-9999-r1.ebuild 15015 RMD160 55cdd2c19bdb5cc4f769f060823cf2d67993493a SHA1 1cf723e4a27c07da825e0faef301a12892640dbb SHA256 f8dd2b4bf5702badf9cd8495c504d8a17fc8f53ed5ac0f166afe3cc35eb505d0
+MISC ChangeLog 88385 RMD160 93a4644dfe2f2375d263833d53d8bcf548f311c7 SHA1 d5553a50ddee59d96c14818a4d2d5817ca102e6c SHA256 4adbd875a57af217b3803d49518ff8c9144ffb0d4f31292cf4d968e87c928b5d
MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk4MZL4ACgkQodBTJSDyo648QAD/V9KnE9ihgiKCkXDigfBK95wf
-OGPqYW44anw/N1yscvwA/0tI7L0i9LnICOAsHtASKdAC6qqfGHJVkZEw4q8HrYlj
-=yeGz
+iEYEAREKAAYFAk4iLAQACgkQuUQtlDBCeQLxrACfRvvVkuK23klmHNaqjxDTJTlY
+eYoAnjFlIUgvVl6yDcEMCMlSrUgXZJhF
+=3QaU
-----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-12.0.742.91-r1.ebuild b/www-client/chromium/chromium-12.0.742.91-r1.ebuild
deleted file mode 100644
index b44b273915e0..000000000000
--- a/www-client/chromium/chromium-12.0.742.91-r1.ebuild
+++ /dev/null
@@ -1,377 +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-12.0.742.91-r1.ebuild,v 1.3 2011/06/18 07:48:15 hwoarang 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://build.chromium.org/official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cups gnome gnome-keyring kerberos xinerama"
-
-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/libvpx-0.9.5
- >=media-libs/libwebp-0.1.2
- media-libs/speex
- cups? ( >=net-print/cups-1.3.11 )
- sys-libs/pam
- sys-libs/zlib
- x11-libs/gtk+:2
- x11-libs/libXScrnSaver
- x11-libs/libXtst"
-DEPEND="${RDEPEND}
- dev-lang/perl
- dev-lang/yasm
- >=dev-util/gperf-3.0.3
- >=dev-util/pkgconfig-0.23
- sys-devel/flex
- >=sys-devel/make-3.81-r2
- x11-libs/libXinerama
- test? (
- dev-python/pyftpdlib
- dev-python/simplejson
- virtual/krb5
- )"
-RDEPEND+="
- kerberos? ( virtual/krb5 )
- xinerama? ( x11-libs/libXinerama )
- x11-misc/xdg-utils
- virtual/ttf-fonts"
-
-gyp_use() {
- if [[ $# -lt 2 ]]; then
- echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&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
- "${@}"
-}
-
-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 #299777.
- if ! grep -q /dev/shm <<< $(get_mounts); then
- ewarn "You don't have tmpfs mounted at /dev/shm."
- ewarn "${PN} may fail to start in that configuration."
- ewarn "Please uncomment the /dev/shm entry in /etc/fstab,"
- ewarn "and run 'mount /dev/shm'."
- fi
- if [ `stat -c %a /dev/shm` -ne 1777 ]; then
- ewarn "/dev/shm does not have correct permissions."
- ewarn "${PN} may fail to start in that configuration."
- ewarn "Please run 'chmod 1777 /dev/shm'."
- fi
-
- # 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"
- PID_NS_WARNING="PID (process id) namespaces are needed for sandboxing."
- NET_NS_WARNING="Network namespaces are needed for sandboxing."
- check_extra_config
-}
-
-src_prepare() {
- # Make sure we don't use bundled libvpx headers.
- epatch "${FILESDIR}/${PN}-system-vpx-r4.patch"
-
- # Fix compilation with system zlib, bug #364205. To be upstreamed.
- epatch "${FILESDIR}/${PN}-system-zlib-r0.patch"
-
- # Fix compilation without CUPS, bug #364525. To be upstreamed.
- epatch "${FILESDIR}/${PN}-cups-r0.patch"
-
- # 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/libjingle/*' \
- \! -path 'third_party/libsrtp/*' \
- \! -path 'third_party/libvpx/libvpx.h' \
- \! -path 'third_party/mesa/*' \
- \! -path 'third_party/modp_b64/*' \
- \! -path 'third_party/npapi/*' \
- \! -path 'third_party/openmax/*' \
- \! -path 'third_party/ots/*' \
- \! -path 'third_party/protobuf/*' \
- \! -path 'third_party/skia/*' \
- \! -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/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"
-
- # Use system-provided libraries.
- # TODO: use_system_ffmpeg (bug #71931). That makes yasm unneeded.
- # TODO: use_system_hunspell (upstream changes needed).
- # 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_libwebp=1
- -Duse_system_libxml=1
- -Duse_system_speex=1
- -Duse_system_vpx=1
- -Duse_system_xdg_utils=1
- -Duse_system_yasm=1
- -Duse_system_zlib=1"
-
- # Optional dependencies.
- 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)"
-
- # 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.
- # TODO: uncomment when bug #371931 is fixed.
- # myconf+=" -Dproprietary_codecs=1"
-
- # Use target arch detection logic from bug #354601.
- case ${CHOST} in
- i?86-*) myarch=x86 ;;
- x86_64-*)
- if [[ $ABI = "" ]] ; then
- myarch=amd64
- else
- myarch="$ABI"
- fi ;;
- arm*-*) myarch=arm ;;
- *) die "Unrecognized CHOST: ${CHOST}"
- esac
-
- 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 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.
- # 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*:*UDP*'
-}
-
-src_install() {
- exeinto "${CHROMIUM_HOME}"
- doexe out/Release/chrome
- doexe out/Release/chrome_sandbox || die
- fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
- newexe "${FILESDIR}"/chromium-launcher-r1.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
-
- 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
- # TODO: uncomment when bug #371931 is fixed.
- #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/ffmpegsumo_nolink || 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}"
- sed -e "/^Exec/s/$/ %U/" -i "${D}"/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-14.0.797.0.ebuild b/www-client/chromium/chromium-14.0.814.0.ebuild
index a209d41d9f9e..49efc8c393c2 100644
--- a/www-client/chromium/chromium-14.0.797.0.ebuild
+++ b/www-client/chromium/chromium-14.0.814.0.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-14.0.797.0.ebuild,v 1.1 2011/06/21 18:18:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-14.0.814.0.ebuild,v 1.1 2011/07/17 00:25:26 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
@@ -118,6 +118,9 @@ src_prepare() {
# Make sure we don't use bundled libvpx headers.
epatch "${FILESDIR}/${PN}-system-vpx-r4.patch"
+ # Fix build without libgcrypt, bug #373079.
+ epatch "${FILESDIR}/${PN}-libgcrypt-r0.patch"
+
# Remove most bundled libraries. Some are still needed.
find third_party -type f \! -iname '*.gyp*' \
\! -path 'third_party/WebKit/*' \
@@ -276,8 +279,18 @@ src_install() {
doexe out/Release/chrome_sandbox || die
fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+ # Install Native Client files on platforms that support it.
insinto "${CHROMIUM_HOME}"
- doins out/Release/libppGoogleNaClPluginChrome.so || die
+ 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
@@ -358,7 +371,8 @@ src_install() {
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}"
+ "Network;WebBrowser"
+ "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
# Install GNOME default application entry (bug #303100).
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 515902c36fed..50f44145d3b5 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.33 2011/06/17 15:10:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.34 2011/07/17 00:25:26 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
@@ -305,8 +305,18 @@ src_install() {
doexe out/Release/chrome_sandbox || die
fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+ # Install Native Client files on platforms that support it.
insinto "${CHROMIUM_HOME}"
- doins out/Release/libppGoogleNaClPluginChrome.so || die
+ 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
sed "s:chromium-browser:chromium-browser${SUFFIX}:g" \
@@ -393,7 +403,8 @@ src_install() {
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${SUFFIX} "Chromium ${SLOT}" chromium-browser${SUFFIX} \
- "Network;WebBrowser" "MimeType=${mime_types}"
+ "Network;WebBrowser"
+ "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die
# Install GNOME default application entry (bug #303100).