diff options
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/ChangeLog | 9 | ||||
| -rw-r--r-- | www-client/chromium/chromium-37.0.2062.35.ebuild | 587 | ||||
| -rw-r--r-- | www-client/chromium/chromium-38.0.2114.2.ebuild (renamed from www-client/chromium/chromium-38.0.2101.0.ebuild) | 11 |
3 files changed, 14 insertions, 593 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 5c5d55cf6bc3..4d102fd4ad91 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-client/chromium # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1113 2014/07/31 04:20:28 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1114 2014/08/06 16:09:06 phajdan.jr Exp $ + +*chromium-38.0.2114.2 (06 Aug 2014) + + 06 Aug 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> + -chromium-37.0.2062.35.ebuild, -chromium-38.0.2101.0.ebuild, + +chromium-38.0.2114.2.ebuild: + Dev channel bump. Remove old. *chromium-37.0.2062.58 (31 Jul 2014) diff --git a/www-client/chromium/chromium-37.0.2062.35.ebuild b/www-client/chromium/chromium-37.0.2062.35.ebuild deleted file mode 100644 index cb104dc71477..000000000000 --- a/www-client/chromium/chromium-37.0.2062.35.ebuild +++ /dev/null @@ -1,587 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-37.0.2062.35.ebuild,v 1.1 2014/07/24 03:59:24 floppym Exp $ - -EAPI="5" -PYTHON_COMPAT=( python{2_6,2_7} ) - -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 multiprocessing pax-utils \ - portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}-lite.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="bindist cups gnome gnome-keyring kerberos neon pic pulseaudio selinux +tcmalloc" - -# Native Client binaries are compiled with different set of flags, bug #452066. -QA_FLAGS_IGNORED=".*\.nexe" - -# Native Client binaries may be stripped by the build system, which uses the -# right tools for it, bug #469144 . -QA_PRESTRIPPED=".*\.nexe" - -RDEPEND=">=app-accessibility/speech-dispatcher-0.8:= - app-arch/bzip2:= - app-arch/snappy:= - cups? ( - dev-libs/libgcrypt:0= - >=net-print/cups-1.3.11:= - ) - >=dev-libs/elfutils-0.149 - dev-libs/expat:= - dev-libs/glib:= - dev-libs/icu:= - >=dev-libs/jsoncpp-0.5.0-r1:= - >=dev-libs/libevent-1.4.13:= - dev-libs/libxml2:=[icu] - dev-libs/libxslt:= - dev-libs/nspr:= - >=dev-libs/nss-3.14.3:= - dev-libs/re2:= - gnome? ( >=gnome-base/gconf-2.24.0:= ) - gnome-keyring? ( gnome-base/libgnome-keyring:= ) - >=media-libs/alsa-lib-1.0.19:= - media-libs/flac:= - media-libs/fontconfig:= - media-libs/freetype:= - media-libs/harfbuzz:=[icu(+)] - media-libs/libexif:= - >=media-libs/libjpeg-turbo-1.2.0-r1:= - media-libs/libpng:0= - >=media-libs/libwebp-0.4.0:= - media-libs/speex:= - pulseaudio? ( media-sound/pulseaudio:= ) - sys-apps/dbus:= - sys-apps/pciutils:= - >=sys-libs/libcap-2.22:= - sys-libs/zlib:=[minizip] - virtual/udev - x11-libs/cairo:= - x11-libs/gdk-pixbuf:= - x11-libs/gtk+:2= - x11-libs/libdrm - x11-libs/libX11:= - x11-libs/libXcomposite:= - x11-libs/libXcursor:= - x11-libs/libXdamage:= - x11-libs/libXext:= - x11-libs/libXfixes:= - >=x11-libs/libXi-1.6.0:= - x11-libs/libXinerama:= - x11-libs/libXrandr:= - x11-libs/libXrender:= - x11-libs/libXScrnSaver:= - x11-libs/libXtst:= - x11-libs/pango:= - kerberos? ( virtual/krb5 ) - selinux? ( sec-policy/selinux-chromium )" -DEPEND="${RDEPEND} - !arm? ( - dev-lang/yasm - ) - dev-lang/perl - dev-perl/JSON - >=dev-util/gperf-3.0.3 - dev-util/ninja - sys-apps/hwids[usb(+)] - >=sys-devel/bison-2.4.3 - sys-devel/flex - virtual/pkgconfig" -# For nvidia-drivers blocker, see bug #413637 . -RDEPEND+=" - !=www-client/chromium-9999 - !<www-plugins/chrome-binary-plugins-37 - x11-misc/xdg-utils - virtual/ttf-fonts - tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )" - -# Python dependencies. The DEPEND part needs to be kept in sync -# with python_check_deps. -DEPEND+=" $(python_gen_any_dep ' - dev-python/simplejson[${PYTHON_USEDEP}] -')" -python_check_deps() { - has_version "dev-python/simplejson[${PYTHON_USEDEP}]" -} - -if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then - EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; -fi - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -Some web pages may require additional fonts to display properly. -Try installing some of the following packages if some characters -are not displayed properly: -- media-fonts/arphicfonts -- media-fonts/bitstream-cyberbit -- media-fonts/droid -- media-fonts/ipamonafont -- media-fonts/ja-ipafonts -- media-fonts/takao-fonts -- media-fonts/wqy-microhei -- media-fonts/wqy-zenhei - -Depending on your desktop environment, you may need -to install additional packages to get icons on the Downloads page. - -For KDE, the required package is kde-base/oxygen-icons. - -For other desktop environments, try one of the following: -- x11-themes/gnome-icon-theme -- x11-themes/tango-icon-theme -" - -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 python, bug #344367. - python-any-r1_pkg_setup - - chromium_suid_sandbox_check_kernel_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() { - # if ! use arm; then - # mkdir -p out/Release/gen/sdk/toolchain || die - # # Do not preserve SELinux context, bug #460892 . - # cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \ - # out/Release/gen/sdk/toolchain/linux_x86_newlib || die - # touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die - # fi - - epatch "${FILESDIR}/${PN}-angle-r0.patch" - epatch "${FILESDIR}/${PN}-ffmpeg-r2.patch" - - epatch_user - - # Remove most bundled libraries. Some are still needed. - build/linux/unbundle/remove_bundled_libraries.py \ - 'base/third_party/dmg_fp' \ - 'base/third_party/dynamic_annotations' \ - 'base/third_party/icu' \ - 'base/third_party/nspr' \ - 'base/third_party/superfasthash' \ - 'base/third_party/symbolize' \ - 'base/third_party/valgrind' \ - 'base/third_party/xdg_mime' \ - 'base/third_party/xdg_user_dirs' \ - 'breakpad/src/third_party/curl' \ - 'chrome/third_party/mozilla_security_manager' \ - 'courgette/third_party' \ - 'crypto/third_party/nss' \ - 'net/third_party/mozilla_security_manager' \ - 'net/third_party/nss' \ - 'third_party/WebKit' \ - 'third_party/angle' \ - 'third_party/brotli' \ - 'third_party/cacheinvalidation' \ - 'third_party/cld' \ - 'third_party/cros_system_api' \ - 'third_party/dom_distiller_js' \ - 'third_party/ffmpeg' \ - 'third_party/fips181' \ - 'third_party/flot' \ - 'third_party/hunspell' \ - 'third_party/iccjpeg' \ - 'third_party/icu/icu.isolate' \ - 'third_party/jinja2' \ - 'third_party/jstemplate' \ - 'third_party/khronos' \ - 'third_party/leveldatabase' \ - 'third_party/libaddressinput' \ - 'third_party/libjingle' \ - 'third_party/libphonenumber' \ - 'third_party/libsrtp' \ - 'third_party/libusb' \ - 'third_party/libvpx' \ - 'third_party/libwebm' \ - 'third_party/libxml/chromium' \ - 'third_party/libXNVCtrl' \ - 'third_party/libyuv' \ - 'third_party/lss' \ - 'third_party/lzma_sdk' \ - 'third_party/markupsafe' \ - 'third_party/mesa' \ - 'third_party/modp_b64' \ - 'third_party/mt19937ar' \ - 'third_party/npapi' \ - 'third_party/opus' \ - 'third_party/ots' \ - 'third_party/pdfium' \ - 'third_party/polymer' \ - 'third_party/ply' \ - 'third_party/protobuf' \ - 'third_party/pywebsocket' \ - 'third_party/qcms' \ - 'third_party/readability' \ - 'third_party/sfntly' \ - 'third_party/skia' \ - 'third_party/smhasher' \ - 'third_party/sqlite' \ - 'third_party/tcmalloc' \ - 'third_party/tlslite' \ - 'third_party/trace-viewer' \ - 'third_party/undoview' \ - 'third_party/usrsctp' \ - 'third_party/webdriver' \ - 'third_party/webrtc' \ - 'third_party/widevine' \ - 'third_party/x86inc' \ - 'third_party/zlib/google' \ - 'url/third_party/mozilla' \ - 'v8/src/third_party/valgrind' \ - --do-remove || 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" - - # Disable nacl, we can't build without pnacl (http://crbug.com/269560). - myconf+=" -Ddisable_nacl=1" - - # 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" - - # It would be awkward for us to tar the toolchain and get it untarred again - # during the build. - # myconf+=" -Ddisable_newlib_untar=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_hunspell (upstream changes needed). - # TODO: use_system_libsrtp (bug #459932). - # TODO: use_system_libvpx (http://crbug.com/347823). - # TODO: use_system_libusb (http://crbug.com/266149). - # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). - # TODO: use_system_protobuf (bug #503084). - # 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_harfbuzz=1 - -Duse_system_icu=1 - -Duse_system_jsoncpp=1 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_libwebp=1 - -Duse_system_libxml=1 - -Duse_system_libxslt=1 - -Duse_system_minizip=1 - -Duse_system_nspr=1 - -Duse_system_openssl=1 - -Duse_system_re2=1 - -Duse_system_snappy=1 - -Duse_system_speex=1 - -Duse_system_xdg_utils=1 - -Duse_system_zlib=1" - - # Needed for system icu - we don't need additional data files. - myconf+=" -Dicu_use_data_file_flag=0" - - # TODO: patch gyp so that this arm conditional is not needed. - if ! use arm; then - myconf+=" - -Duse_system_yasm=1" - fi - - # 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 tcmalloc use_allocator tcmalloc none)" - - # Use explicit library dependencies instead of dlopen. - # This makes breakages easier to detect by revdep-rebuild. - myconf+=" - -Dlinux_link_gsettings=1 - -Dlinux_link_libpci=1 - -Dlinux_link_libspeechd=1 - -Dlibspeechd_h_prefix=speech-dispatcher/" - - # TODO: use the file at run time instead of effectively compiling it in. - myconf+=" - -Dusb_ids_path=/usr/share/misc/usb.ids" - - # Save space by removing DLOG and DCHECK messages (about 6% reduction). - myconf+=" - -Dlogging_like_official_build=1" - - # Never use bundled gold binary. Disable gold linker flags for now. - myconf+=" - -Dlinux_use_bundled_binutils=0 - -Dlinux_use_bundled_gold=0 - -Dlinux_use_gold_flags=0" - - # Always support proprietary codecs. - myconf+=" -Dproprietary_codecs=1" - - # Set python version and libdir so that python_arch.sh can find libpython. - # Bug 492864. - myconf+=" - -Dpython_ver=${EPYTHON#python} - -Dsystem_libdir=$(get_libdir)" - - if ! use bindist; then - # Enable H.264 support in bundled ffmpeg. - myconf+=" -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 - target_arch=x64 - ffmpeg_target_arch=x64 - elif [[ $myarch = x86 ]] ; then - target_arch=ia32 - ffmpeg_target_arch=ia32 - elif [[ $myarch = arm ]] ; then - target_arch=arm - ffmpeg_target_arch=$(usex neon arm-neon arm) - # TODO: re-enable NaCl (NativeClient). - local CTARGET=${CTARGET:-${CHOST}} - if [[ $(tc-is-softfloat) == "no" ]]; then - - myconf+=" -Darm_float_abi=hard" - fi - filter-flags "-mfpu=*" - use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" - - if [[ ${CTARGET} == armv[78]* ]]; then - myconf+=" -Darmv7=1" - else - myconf+=" -Darmv7=0" - fi - myconf+=" -Dsysroot= - $(gyp_use neon arm_neon) - -Ddisable_nacl=1" - else - die "Failed to determine target arch, got '$myarch'." - fi - - myconf+=" -Dtarget_arch=${target_arch}" - - # 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=" - - # Disable fatal linker warnings, bug 506268. - myconf+=" -Ddisable_fatal_linker_warnings=1" - - # Avoid CFLAGS problems, bug #352457, bug #390147. - if ! use custom-cflags; then - replace-flags "-Os" "-O2" - strip-flags - - # Prevent linker from running out of address space, bug #471810 . - if use x86; then - filter-flags "-g*" - fi - fi - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB - - # Tools for building programs to be executed on the build system, bug #410883. - export AR_host=$(tc-getBUILD_AR) - export CC_host=$(tc-getBUILD_CC) - export CXX_host=$(tc-getBUILD_CXX) - export LD_host=${CXX_host} - - # Bug 491582. - export TMPDIR="${WORKDIR}/temp" - mkdir -m 755 "${TMPDIR}" || die - - local build_ffmpeg_args="" - if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then - build_ffmpeg_args+=" --disable-asm" - fi - - # Re-configure bundled ffmpeg. See bug #491378 for example reasons. - einfo "Configuring bundled ffmpeg..." - pushd third_party/ffmpeg > /dev/null || die - chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} -- ${build_ffmpeg_args} || die - chromium/scripts/copy_config.sh || die - chromium/scripts/generate_gyp.py || die - popd > /dev/null || die - - third_party/libaddressinput/chromium/tools/update-strings.py || die - - einfo "Configuring Chromium..." - build/linux/unbundle/replace_gyp_files.py ${myconf} || die - egyp_chromium ${myconf} || die -} - -eninja() { - if [[ -z ${NINJAOPTS+set} ]]; then - local jobs=$(makeopts_jobs) - local loadavg=$(makeopts_loadavg) - - if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then - NINJAOPTS+=" -j ${jobs}" - fi - if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then - NINJAOPTS+=" -l ${loadavg}" - fi - fi - set -- ninja -v ${NINJAOPTS} "$@" - echo "$@" - "$@" -} - -src_compile() { - local ninja_targets="chrome chrome_sandbox chromedriver" - - # Build mksnapshot and pax-mark it. - eninja -C out/Release mksnapshot || die - pax-mark m out/Release/mksnapshot - - # Even though ninja autodetects number of CPUs, we respect - # user's options, for debugging with -j 1 or any other reason. - eninja -C out/Release ${ninja_targets} || die - - pax-mark m out/Release/chrome -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome || die - - newexe out/Release/chrome_sandbox chrome-sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" - - 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 - - local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) - if [[ -n ${CHROMIUM_SUFFIX} ]]; then - sedargs+=( - -e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" - -e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" - -e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" - ) - fi - sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die - doexe chromium-launcher.sh - - # 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 - - dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${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 - doexe out/Release/libpdf.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 - - readme.gentoo_create_doc -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - readme.gentoo_print_elog -} diff --git a/www-client/chromium/chromium-38.0.2101.0.ebuild b/www-client/chromium/chromium-38.0.2114.2.ebuild index fd852bec8b96..09ca4f496d06 100644 --- a/www-client/chromium/chromium-38.0.2101.0.ebuild +++ b/www-client/chromium/chromium-38.0.2114.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-38.0.2101.0.ebuild,v 1.1 2014/07/23 17:39:17 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-38.0.2114.2.ebuild,v 1.1 2014/08/06 16:09:06 phajdan.jr Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7} ) @@ -170,8 +170,6 @@ src_prepare() { # touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die # fi - epatch "${FILESDIR}/${PN}-libaddressinput-r0.patch" - epatch_user # Remove most bundled libraries. Some are still needed. @@ -360,10 +358,12 @@ src_configure() { -Dpython_ver=${EPYTHON#python} -Dsystem_libdir=$(get_libdir)" + ffmpeg_branding="Chromium" if ! use bindist; then # Enable H.264 support in bundled ffmpeg. - myconf+=" -Dffmpeg_branding=Chrome" + ffmpeg_branding="Chrome" fi + myconf+=" -Dffmpeg_branding=${ffmpeg_branding}" # 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, @@ -446,7 +446,8 @@ src_configure() { # Re-configure bundled ffmpeg. See bug #491378 for example reasons. einfo "Configuring bundled ffmpeg..." pushd third_party/ffmpeg > /dev/null || die - chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} -- ${build_ffmpeg_args} || die + chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ + --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die chromium/scripts/copy_config.sh || die chromium/scripts/generate_gyp.py || die popd > /dev/null || die |