Re-enable NaCl.
authorPaweł Hajdan <phajdan.jr@gentoo.org>
Wed, 12 Oct 2011 02:39:57 +0000 (02:39 +0000)
committerPaweł Hajdan <phajdan.jr@gentoo.org>
Wed, 12 Oct 2011 02:39:57 +0000 (02:39 +0000)
Package-Manager: portage-2.1.10.11/cvs/Linux i686

www-client/chromium/ChangeLog
www-client/chromium/Manifest
www-client/chromium/chromium-16.0.904.0-r1.ebuild [new file with mode: 0644]
www-client/chromium/chromium-9999-r1.ebuild

index 070515e70b8a46ad82280496d7e5b3497e4fe6ad..26b7fcf4455551492017b6ec7bff362622073fb1 100644 (file)
@@ -1,6 +1,12 @@
 # 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.462 2011/10/11 17:36:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.463 2011/10/12 02:39:57 phajdan.jr Exp $
+
+*chromium-16.0.904.0-r1 (12 Oct 2011)
+
+  12 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +chromium-16.0.904.0-r1.ebuild, chromium-9999-r1.ebuild:
+  Re-enable NaCl.
 
 *chromium-16.0.904.0 (11 Oct 2011)
 
index af30f997c14a6888e9ef65e5cb6fc5ec03d15e60..290abe68ef05f1ba721ab298a0ca6e4bcd13cfcb 100644 (file)
@@ -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-icu-compatibility-r0.patch 1659 RMD160 5d1fcc18d27b96f0c1b4f14b24dd8ab40ce917ca SHA1 517155769d0f421a4a81bffbcac39d17fa099956 SHA256 f70d99472d56e0aa7398b5638412d440d22943eb2c5962957f973e90992fdc99
@@ -20,14 +20,15 @@ EBUILD chromium-14.0.835.202.ebuild 13791 RMD160 68267fd5b04ef957f98ad41ece3e7d6
 EBUILD chromium-15.0.874.81.ebuild 14224 RMD160 6a2ee651876a66c268fbcc457e74c95c70f86aff SHA1 fe1efb11a3e295e45e86cd387471df281a1735ad SHA256 58716f63f49ca64867e629a26042cbf13efecd39b57911acd2199be9b9afad38
 EBUILD chromium-15.0.874.83.ebuild 14224 RMD160 df78a96ac7bd075a4a8f21fd24a1fc3bac6a3cea SHA1 4bd640fe84767ef334c0682ef544a76aef225631 SHA256 73d9c3db531079bbed5559e9076047b895f60e3a131fb6108a29822f3f623ab2
 EBUILD chromium-16.0.899.0.ebuild 13949 RMD160 5a5333ade34f2aacc504f70e16faf4b2ad4144b7 SHA1 06bb027a26c5517240ae9c2e4aef2a8eee7e5e70 SHA256 cd314d18256783329639ab69f9e088daad5c6fe5344a6c0e4a6c0c848c5a8cf4
+EBUILD chromium-16.0.904.0-r1.ebuild 14040 RMD160 73616a8f003006d5e435f1d118c9484d4ce11769 SHA1 7d1e9778e62961b07fdeb37051ac71f07a4c24c9 SHA256 d176bff6151f9d2ccb784ac052c408d2d1d9893cc3fcf57a4dacbb595a843af9
 EBUILD chromium-16.0.904.0.ebuild 13946 RMD160 f7bf502fa5c4e31d25c2369f565b8b1229d27d72 SHA1 7b68ef2bbf965010365e68f7140d5e39e13c908b SHA256 508c21b0b4cecf4e9d584fdd270036d4b89f54cdea04e3d479a962f1e0acbc2d
-EBUILD chromium-9999-r1.ebuild 16541 RMD160 ed80ff51c3dec61cd883172d20f1609d695394f9 SHA1 fd8b38c06e234a62ee34f371982d077f68da5519 SHA256 47b616e67c15998fd5e5cb2e80c3a8eb912e50c9fd341451a87743062cbceb01
-MISC ChangeLog 102005 RMD160 3bc34c19a2e70125b84fbd986eff43daf10dc017 SHA1 4eb58db6a261e879f9eeb4006b2b8d9face2f71f SHA256 6cdac3a5ef9232e1344d204c0762f750d85ba1c4ffd77bdb4c3c92117c553ac7
+EBUILD chromium-9999-r1.ebuild 16629 RMD160 293f84090ed0fd9125c0520d622da4dda549d06c SHA1 75eb3deed17a916ac378c5ca83fe211cec5d6df5 SHA256 d3cb996d63381254a1fa0a38bf564f86e52c8e535f481b1e4e35b6602082f898
+MISC ChangeLog 102180 RMD160 17254e7e229a49cc8ab097d1a4a788e661b4ddd5 SHA1 ef7f391d81f8d2f47ad399af4b8f57b8ac9b9384 SHA256 0c5d34372ee0c1fadc212769dcb828b759d46d28d85928e9e21d36fefe1a0a53
 MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6UfrMACgkQC77qH+pIQ6RntgD/afIwrSv2qakydfiI6MBo3m3Q
-xOpYPXis/72C0S1Fbh4A/2IkiF1vIWGVckeO24frCkoLMAczWJjzcVM7sWRFnHZ0
-=csyy
+iEYEAREKAAYFAk6U/g8ACgkQuUQtlDBCeQIRNQCeLv2YuTMpfVJy7bj7fannb+oq
+YWMAn1b/184xC7vRE42zJyR1vyJt58FP
+=oUfd
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-16.0.904.0-r1.ebuild b/www-client/chromium/chromium-16.0.904.0-r1.ebuild
new file mode 100644 (file)
index 0000000..f54c57a
--- /dev/null
@@ -0,0 +1,458 @@
+# 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-16.0.904.0-r1.ebuild,v 1.1 2011/10/12 02:39:57 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://build.chromium.org/official/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bindist chromedriver 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/elfutils
+       >=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/nacl-toolchain-newlib
+       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 <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
+       "${@}"
+}
+
+# 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() {
+       ln -s "/usr/$(get_libdir)/nacl-toolchain-newlib" \
+               "native_client/toolchain/linux_x86_newlib" || 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
+
+       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/lss/*' \
+               \! -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/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/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"
+
+       # 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 BUILDTYPE=Release V=1 || die
+       pax-mark m out/Release/chrome
+       if use chromedriver; then
+               emake chromedriver BUILDTYPE=Release V=1 || die
+       fi
+       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"
+
+       if use chromedriver; then
+               doexe out/Release/chromedriver || die
+       fi
+
+       # Install Native Client files on platforms that support it.
+       insinto "${CHROMIUM_HOME}"
+       case "$(tc-arch)" in
+               amd64)
+                       doins out/Release/nacl_irt_x86_64.nexe || die
+                       doins out/Release/libppGoogleNaClPluginChrome.so || die
+               ;;
+               x86)
+                       doins out/Release/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
+}
index 837af3182a213073b7de773578784b1c135bd801..65ae3d06776e2b7083d108da7e478d42851317a4 100644 (file)
@@ -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.56 2011/10/04 20:48:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.57 2011/10/12 02:39:57 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -27,6 +27,7 @@ done
 
 RDEPEND="app-arch/bzip2
        dev-libs/dbus-glib
+       dev-libs/elfutils
        >=dev-libs/icu-4.4.1
        >=dev-libs/libevent-1.4.13
        dev-libs/libxml2[icu]
@@ -52,6 +53,7 @@ RDEPEND="app-arch/bzip2
        x11-libs/libXtst
        kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
+       dev-lang/nacl-toolchain-newlib
        dev-lang/perl
        dev-python/simplejson
        >=dev-util/gperf-3.0.3
@@ -174,6 +176,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+       ln -s "/usr/$(get_libdir)/nacl-toolchain-newlib" \
+               "native_client/toolchain/linux_x86_newlib" || 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 \
@@ -200,6 +205,7 @@ src_prepare() {
                \! -path 'third_party/libjingle/*' \
                \! -path 'third_party/libphonenumber/*' \
                \! -path 'third_party/libvpx/*' \
+               \! -path 'third_party/lss/*' \
                \! -path 'third_party/mesa/*' \
                \! -path 'third_party/modp_b64/*' \
                \! -path 'third_party/mongoose/*' \
@@ -207,6 +213,7 @@ src_prepare() {
                \! -path 'third_party/openmax/*' \
                \! -path 'third_party/ots/*' \
                \! -path 'third_party/protobuf/*' \
+               \! -path 'third_party/scons-2.0.1/*' \
                \! -path 'third_party/sfntly/*' \
                \! -path 'third_party/skia/*' \
                \! -path 'third_party/smhasher/*' \
@@ -235,9 +242,6 @@ src_configure() {
        # additions, bug #336871.
        myconf+=" -Ddisable_sse2=1"
 
-       # Disable NaCl temporarily, this tarball doesn't have IRT.
-       myconf+=" -Ddisable_nacl=1"
-
        # Use system-provided libraries.
        # TODO: use_system_ffmpeg
        # TODO: use_system_hunspell (upstream changes needed).
@@ -366,17 +370,17 @@ src_install() {
        fi
 
        # 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
+       insinto "${CHROMIUM_HOME}"
+       case "$(tc-arch)" in
+               amd64)
+                       doins out/Release/nacl_irt_x86_64.nexe || die
+                       doins out/Release/libppGoogleNaClPluginChrome.so || die
+               ;;
+               x86)
+                       doins out/Release/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" \