Make sure that all ebuilds have the fix for bug #314977. Remove old.
authorPaweł Hajdan <phajdan.jr@gentoo.org>
Wed, 14 Apr 2010 13:05:54 +0000 (13:05 +0000)
committerPaweł Hajdan <phajdan.jr@gentoo.org>
Wed, 14 Apr 2010 13:05:54 +0000 (13:05 +0000)
Package-Manager: portage-2.1.7.17/cvs/Linux i686

www-client/chromium/ChangeLog
www-client/chromium/Manifest
www-client/chromium/chromium-5.0.342.7.ebuild [deleted file]
www-client/chromium/chromium-5.0.342.9.ebuild
www-client/chromium/chromium-5.0.360.5.ebuild [deleted file]
www-client/chromium/chromium-5.0.366.2.ebuild [deleted file]
www-client/chromium/files/chromium-ffmpeg.patch [deleted file]
www-client/chromium/metadata.xml

index 5b66374ec9d7c07ebc13a72386bc02da4db10249..ddd051e0a5efa980003bded2185bd894e5f981e7 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.83 2010/04/13 18:03:30 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.84 2010/04/14 13:05:53 phajdan.jr Exp $
+
+  14 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-5.0.342.7.ebuild, chromium-5.0.342.9.ebuild,
+  -chromium-5.0.360.5.ebuild, -chromium-5.0.366.2.ebuild,
+  -files/chromium-ffmpeg.patch, metadata.xml:
+  Make sure that all ebuilds have the fix for bug #314977. Remove old.
 
   13 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-5.0.371.0.ebuild, chromium-9999.ebuild:
index 3654093a03aa5bc79cacd67ec944532ceda1f28a..fd18a727f194d905f6a53e6e6a9a6b3b03e23670 100644 (file)
@@ -1,20 +1,13 @@
 AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e14138cc838ae26191ef42116f3f614 SHA1 f9bac7a6840c060c921119051cd724b7b53ff2fd SHA256 d6f8e5dabf8b55c3fb9ae58920807758e5d1aa76f536efc6f53949208a567566
 AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af8 SHA1 1aa9701b329d970db00726ba883d7dd5448ba372 SHA256 2da9ffbbaff5d00045b49ae75658df3c9f536543d388caff7a18ff093a0b1cd6
-AUX chromium-ffmpeg.patch 994 RMD160 18382f56bf9df5926ead966de002ca39b73c70e9 SHA1 bbf217e4d0adc7eaeb11772fadebace8371291c1 SHA256 a10abccdd8c03ffc5ef016f41cbece38d7beff0df399bf8f3eb5f5ceb2d012cc
 AUX chromium-fix-make-build.patch 677 RMD160 b0dd0057d6f28e5d79b0bd9fd45b8e7cb79cbfcf SHA1 c7a7bf5fe81349f077a15458d66d53e1aa523f33 SHA256 8de8636ceedcbf0dc4f8494f48fd78baf261ef9334efe359d7e99bc668193c9e
 AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b
 AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506b SHA1 e96283b523a14e8fb369838b35051c8ba0cc6f96 SHA256 b92ba935589f01b28a4ddeb5fd7fd42f8f643eaf1e24cafc2458d97fa1489d8e
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
-DIST chromium-5.0.342.7.tar.bz2 155598620 RMD160 4afac79db21172596037c7aa03e797e722b1aaf4 SHA1 09fad49eb63863dcac515fc1c82aa51c8e2d7ebb SHA256 d3a2ad54b925da27dea290f421494b47a046123cb0659214f99502a0a86a4b3d
 DIST chromium-5.0.342.9.tar.bz2 155586284 RMD160 5ab3df8b19383c21d6279a96aa2e0c20074d58a2 SHA1 1823e1932fd68414042a3b5fc4537107ed3998bc SHA256 89a8072fc738afb7d6c5136f91deeeaa39de3d5285f3f471014af95038681903
-DIST chromium-5.0.360.5.tar.bz2 160968726 RMD160 7d53b3ccf59b6759704607c349322cefffb1d68e SHA1 f38e6a5234f5b39ea9e2262f933057ae9e7e8c5e SHA256 44da030ce701510f0949e9483dfd9480089f8054d89373a538d05ab0f3dcc108
-DIST chromium-5.0.366.2.tar.bz2 162986774 RMD160 d18fc87d571d7c76bf59128438b52ce1122153a5 SHA1 cbf22badb06797972d94d3e4ca07fd4ac77de883 SHA256 11df6280383040bfb797ef0e64f6ca63281dfa18dcbb5612f71c3bd842555d0f
 DIST chromium-5.0.371.0.tar.bz2 165863288 RMD160 9b0e195db6049fbca1fd9f3ebd64846bb3978984 SHA1 6f188628ff55519eea4b644afc5f7c4e24716e33 SHA256 92f21bcc8adf2e2136727188aa170530467004d073fbad8ab8e4dcb1f1ea226d
-EBUILD chromium-5.0.342.7.ebuild 6565 RMD160 c36ab88fb6211e01358dbda562d54350be8d7e6b SHA1 be75a09d91e70ed7145affeada9e522ddc0356eb SHA256 97854c502c538ff1c8c1658ca5104c3a475ca749b250868b0f5dc7da29e23236
-EBUILD chromium-5.0.342.9.ebuild 6565 RMD160 7e4d556a9820abcdd46e0240d9116836b321bdcb SHA1 5e56e82d276b58298e76e015974aa2f888698c52 SHA256 7faab279b35573483cafc4ada425535f3f1552f53d3db20f306b9179e2a02b2e
-EBUILD chromium-5.0.360.5.ebuild 6565 RMD160 8bf565d0bacae19cd0e6ea407c81a888bc6f9aa5 SHA1 44484d9d2aba8f51a63a2f824b79fb2b9b83047f SHA256 646737d054efb4bf8793341c562afbf2181fc9a03d4d8ce34b2a3f65ddbb9e77
-EBUILD chromium-5.0.366.2.ebuild 6534 RMD160 8bc649c153aeed1df97e6a814e336e97654d837f SHA1 11b9f35fc7f7dedbbb9673ed9717d1954dcb6397 SHA256 ecabef1f0c9c8cad45349caa9734b7b0fa96285c177c3f19772a63be9ddbebaf
+EBUILD chromium-5.0.342.9.ebuild 6477 RMD160 501a5608b94501dbea4124afccc18ddfff4009bd SHA1 0a6ebcfc916645985431f1392c0f70373bd3dd47 SHA256 ca181e9d8051eaec05efe26b0dc87fd30e00eb1bd8d3dc2252df6d8238a6cf43
 EBUILD chromium-5.0.371.0.ebuild 6705 RMD160 4ecace29d830d36ea0eeca02272ba74258883f31 SHA1 f117fb77b34f0c7ccace47e04dfa06952f10e9f8 SHA256 df746bacaba24d923acd017f3f576b5c8775bfc72aae9cd9198bb4ef8152a12b
 EBUILD chromium-9999.ebuild 8458 RMD160 9e7583c0474b9b835421888030a99e16d7b83032 SHA1 c7558f2c1d697213e47fad7ff515f9a68a8b4de7 SHA256 2ffe1f4ff960a79a177cf2151daaa27db3b894bbfd353dbc2b83914fd251e811
-MISC ChangeLog 19061 RMD160 d854eb28216054490c012c6146f8469137918615 SHA1 d6332a861c2eef811000f265f07820c70bb7cae9 SHA256 ba5942a929debe17bff5bed0e6924eb1701de6d14abbe99dde8570468857af39
-MISC metadata.xml 674 RMD160 5904280e3a216e0d322f1649e14f52f68cd00a39 SHA1 c2310be724a3345e36f644b53b8cfa02d3abdbed SHA256 e05422220666ef456f98ada2f42078b37400b538a452c1e3cee2945d7769dc5c
+MISC ChangeLog 19349 RMD160 ee63a646751301f9c2e9cf111a67aae789b65893 SHA1 3f365cf8c8f0c66bc6596aaad60fb945b05610ff SHA256 e2256e9726cf5fea3cea0922d1cb861f9382ff942f451f09d57d708eb4e28bea
+MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
diff --git a/www-client/chromium/chromium-5.0.342.7.ebuild b/www-client/chromium/chromium-5.0.342.7.ebuild
deleted file mode 100644 (file)
index d05cfbe..0000000
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.342.7.ebuild,v 1.3 2010/04/05 15:23:11 phajdan.jr Exp $
-
-EAPI="2"
-inherit eutils flag-o-matic multilib portability toolchain-funcs
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist +ffmpeg +plugins-symlink"
-
-RDEPEND="app-arch/bzip2
-       >=dev-libs/libevent-1.4.13
-       dev-libs/libxml2
-       dev-libs/libxslt
-       >=dev-libs/nss-3.12.3
-       >=gnome-base/gconf-2.24.0
-       >=media-libs/alsa-lib-1.0.19
-       media-libs/jpeg:0
-       media-libs/libpng
-       ffmpeg? ( >=media-video/ffmpeg-0.5_p21602 )
-       sys-libs/zlib
-       >=x11-libs/gtk+-2.14.7
-       x11-libs/libXScrnSaver"
-#      dev-db/sqlite:3
-DEPEND="${RDEPEND}
-       >=dev-util/gperf-3.0.3
-       >=dev-util/pkgconfig-0.23
-       sys-devel/flex"
-RDEPEND+="
-       || (
-               x11-themes/gnome-icon-theme
-               x11-themes/tango-icon-theme
-               x11-themes/xfce4-icon-theme
-       )
-       x11-misc/xdg-utils
-       virtual/ttf-fonts"
-
-# Incompatible system plugins:
-# www-plugins/gecko-mediaplayer, bug #309231.
-RDEPEND+="
-       plugins-symlink? (
-               !www-plugins/gecko-mediaplayer[gnome]
-       )"
-
-pkg_setup() {
-       if [[ "${ROOT}" == "/" ]]; then
-               # Prevent user problems like bug 299777.
-               if ! grep -q /dev/shm <<< $(get_mounts); then
-                       eerror "You don't have tmpfs mounted at /dev/shm."
-                       eerror "${PN} isn't going to work in that configuration."
-                       eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
-                       eerror "run 'mount /dev/shm' and try again."
-                       die "/dev/shm is not mounted"
-               fi
-               if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-                       eerror "/dev/shm does not have correct permissions."
-                       eerror "${PN} isn't going to work in that configuration."
-                       eerror "Please run chmod 1777 /dev/shm and try again."
-                       die "/dev/shm has incorrect permissions"
-               fi
-       fi
-
-       elog "${PN} might crash occasionally. To get more useful backtraces"
-       elog "and submit better bug reports, please read"
-       elog "http://www.gentoo.org/proj/en/qa/backtraces.xml"
-
-       if ! use bindist; then
-               einfo
-               elog "You may not redistribute this build to any users on your network"
-               elog "or the internet."
-               elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-       fi
-}
-
-src_prepare() {
-       # Gentoo uses .kde4, not .kde
-       # TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
-       # would be better
-       sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
-               || die "kde proxy sed failed"
-       # Changing this in ~/include.gypi does not work
-       sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
-       # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
-       epatch "${FILESDIR}"/${PN}-drop_sse2.patch
-       if ! use bindist; then
-               # Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
-               epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
-       fi
-       # Fix build failure with libpng-1.4, bug 310959.
-       epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
-       # Prevent the make build from filling entire disk space on some systems,
-       # bug 297273.
-       epatch "${FILESDIR}"/${PN}-fix-make-build.patch
-
-       # Disable prefixing to allow linking against system zlib
-       sed -e '/^#include "mozzconf.h"$/d' \
-               -i third_party/zlib/zconf.h \
-               || die "zlib sed failed"
-}
-
-src_configure() {
-       export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-       # Fails to build on arm if we don't do this
-       use arm && append-flags -fno-tree-sink
-
-       # CFLAGS/LDFLAGS
-       mkdir -p "${S}"/.gyp
-       cat << EOF > "${S}"/.gyp/include.gypi
-{
-       'target_defaults': {
-               'cflags': [ '${CFLAGS// /','}' ],
-               'ldflags': [ '${LDFLAGS// /','}' ],
-       },
-}
-EOF
-       export HOME="${S}"
-
-       # Configuration options (system libraries)
-       local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
-       # -Duse_system_sqlite=1 : http://crbug.com/22208
-       # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
-
-       # Sandbox paths
-       myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
-       if use amd64 ; then
-               myconf="${myconf} -Dtarget_arch=x64"
-       fi
-
-       if use x86 ; then
-               myconf="${myconf} -Dtarget_arch=ia32"
-       fi
-
-       if use arm; then
-               myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-       fi
-
-       if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-               myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
-       fi
-
-       if use ffmpeg; then
-               myconf="${myconf} -Duse_system_ffmpeg=1"
-       fi
-
-       build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
-}
-
-src_compile() {
-       emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-               rootdir="${S}" \
-               CC=$(tc-getCC) \
-               CXX=$(tc-getCXX) \
-               AR=$(tc-getAR) \
-               RANLIB=$(tc-getRANLIB) \
-               || die "compilation failed"
-}
-
-src_install() {
-       # Chromium does not have "install" target in the build system.
-       export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-       dodir ${CHROMIUM_HOME}
-
-       exeinto ${CHROMIUM_HOME}
-       doexe out/Release/chrome
-       doexe out/Release/chrome_sandbox
-       fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
-       doexe out/Release/xdg-settings
-       doexe "${FILESDIR}"/chromium-launcher.sh
-
-       insinto ${CHROMIUM_HOME}
-       doins out/Release/chrome.pak
-
-       doins -r out/Release/locales
-       doins -r out/Release/resources
-
-       # chrome.1 is for chromium --help
-       newman out/Release/chrome.1 chrome.1
-       newman out/Release/chrome.1 chromium.1
-
-       if use ffmpeg; then
-               # 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}
-               dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
-               dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
-       fi
-
-       # Plugins symlink, optional wrt bug #301911
-       if use plugins-symlink; then
-               dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
-       fi
-
-       # Icon and desktop entry
-       newicon out/Release/product_logo_48.png ${PN}-browser.png
-       dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
-       make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
-       sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
-               || die "desktop file sed failed"
-       # Gnome default application entry
-       dodir /usr/share/gnome-control-center/default-apps
-       insinto /usr/share/gnome-control-center/default-apps
-       doins "${FILESDIR}"/chromium.xml
-}
index be510eea1effa7ecacc9309dc0f2bfd3258e3ac3..0be03dd26fa88fbb4f99929ffacef86c21053fbd 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.342.9.ebuild,v 1.1 2010/04/08 05:43:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.342.9.ebuild,v 1.2 2010/04/14 13:05:53 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic multilib portability toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist +ffmpeg +plugins-symlink"
+IUSE="bindist +plugins-symlink"
 
 RDEPEND="app-arch/bzip2
        >=dev-libs/libevent-1.4.13
@@ -23,7 +23,7 @@ RDEPEND="app-arch/bzip2
        >=media-libs/alsa-lib-1.0.19
        media-libs/jpeg:0
        media-libs/libpng
-       ffmpeg? ( >=media-video/ffmpeg-0.5_p21602 )
+       >=media-video/ffmpeg-0.5_p21602[threads]
        sys-libs/zlib
        >=x11-libs/gtk+-2.14.7
        x11-libs/libXScrnSaver"
@@ -123,7 +123,7 @@ EOF
        export HOME="${S}"
 
        # Configuration options (system libraries)
-       local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
+       local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
        # -Duse_system_sqlite=1 : http://crbug.com/22208
        # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
 
@@ -146,10 +146,6 @@ EOF
                myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
        fi
 
-       if use ffmpeg; then
-               myconf="${myconf} -Duse_system_ffmpeg=1"
-       fi
-
        build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
 }
 
@@ -186,13 +182,11 @@ src_install() {
        newman out/Release/chrome.1 chrome.1
        newman out/Release/chrome.1 chromium.1
 
-       if use ffmpeg; then
-               # 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}
-               dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
-               dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
-       fi
+       # 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}
+       dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
+       dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
 
        # Plugins symlink, optional wrt bug #301911
        if use plugins-symlink; then
diff --git a/www-client/chromium/chromium-5.0.360.5.ebuild b/www-client/chromium/chromium-5.0.360.5.ebuild
deleted file mode 100644 (file)
index 2c0a9b0..0000000
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.360.5.ebuild,v 1.3 2010/04/05 15:23:11 phajdan.jr Exp $
-
-EAPI="2"
-inherit eutils flag-o-matic multilib portability toolchain-funcs
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist +ffmpeg +plugins-symlink"
-
-RDEPEND="app-arch/bzip2
-       >=dev-libs/libevent-1.4.13
-       dev-libs/libxml2
-       dev-libs/libxslt
-       >=dev-libs/nss-3.12.3
-       >=gnome-base/gconf-2.24.0
-       >=media-libs/alsa-lib-1.0.19
-       media-libs/jpeg:0
-       media-libs/libpng
-       ffmpeg? ( >=media-video/ffmpeg-0.5_p21602 )
-       sys-libs/zlib
-       >=x11-libs/gtk+-2.14.7
-       x11-libs/libXScrnSaver"
-#      dev-db/sqlite:3
-DEPEND="${RDEPEND}
-       >=dev-util/gperf-3.0.3
-       >=dev-util/pkgconfig-0.23
-       sys-devel/flex"
-RDEPEND+="
-       || (
-               x11-themes/gnome-icon-theme
-               x11-themes/tango-icon-theme
-               x11-themes/xfce4-icon-theme
-       )
-       x11-misc/xdg-utils
-       virtual/ttf-fonts"
-
-# Incompatible system plugins:
-# www-plugins/gecko-mediaplayer, bug #309231.
-RDEPEND+="
-       plugins-symlink? (
-               !www-plugins/gecko-mediaplayer[gnome]
-       )"
-
-pkg_setup() {
-       if [[ "${ROOT}" == "/" ]]; then
-               # Prevent user problems like bug 299777.
-               if ! grep -q /dev/shm <<< $(get_mounts); then
-                       eerror "You don't have tmpfs mounted at /dev/shm."
-                       eerror "${PN} isn't going to work in that configuration."
-                       eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
-                       eerror "run 'mount /dev/shm' and try again."
-                       die "/dev/shm is not mounted"
-               fi
-               if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-                       eerror "/dev/shm does not have correct permissions."
-                       eerror "${PN} isn't going to work in that configuration."
-                       eerror "Please run chmod 1777 /dev/shm and try again."
-                       die "/dev/shm has incorrect permissions"
-               fi
-       fi
-
-       elog "${PN} might crash occasionally. To get more useful backtraces"
-       elog "and submit better bug reports, please read"
-       elog "http://www.gentoo.org/proj/en/qa/backtraces.xml"
-
-       if ! use bindist; then
-               einfo
-               elog "You may not redistribute this build to any users on your network"
-               elog "or the internet."
-               elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-       fi
-}
-
-src_prepare() {
-       # Gentoo uses .kde4, not .kde
-       # TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
-       # would be better
-       sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
-               || die "kde proxy sed failed"
-       # Changing this in ~/include.gypi does not work
-       sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
-       # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
-       epatch "${FILESDIR}"/${PN}-drop_sse2.patch
-       if ! use bindist; then
-               # Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
-               epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
-       fi
-       # Fix build failure with libpng-1.4, bug 310959.
-       epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
-       # Prevent the make build from filling entire disk space on some systems,
-       # bug 297273.
-       epatch "${FILESDIR}"/${PN}-fix-make-build.patch
-
-       # Disable prefixing to allow linking against system zlib
-       sed -e '/^#include "mozzconf.h"$/d' \
-               -i third_party/zlib/zconf.h \
-               || die "zlib sed failed"
-}
-
-src_configure() {
-       export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-       # Fails to build on arm if we don't do this
-       use arm && append-flags -fno-tree-sink
-
-       # CFLAGS/LDFLAGS
-       mkdir -p "${S}"/.gyp
-       cat << EOF > "${S}"/.gyp/include.gypi
-{
-       'target_defaults': {
-               'cflags': [ '${CFLAGS// /','}' ],
-               'ldflags': [ '${LDFLAGS// /','}' ],
-       },
-}
-EOF
-       export HOME="${S}"
-
-       # Configuration options (system libraries)
-       local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
-       # -Duse_system_sqlite=1 : http://crbug.com/22208
-       # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
-
-       # Sandbox paths
-       myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
-       if use amd64 ; then
-               myconf="${myconf} -Dtarget_arch=x64"
-       fi
-
-       if use x86 ; then
-               myconf="${myconf} -Dtarget_arch=ia32"
-       fi
-
-       if use arm; then
-               myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-       fi
-
-       if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-               myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
-       fi
-
-       if use ffmpeg; then
-               myconf="${myconf} -Duse_system_ffmpeg=1"
-       fi
-
-       build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
-}
-
-src_compile() {
-       emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-               rootdir="${S}" \
-               CC=$(tc-getCC) \
-               CXX=$(tc-getCXX) \
-               AR=$(tc-getAR) \
-               RANLIB=$(tc-getRANLIB) \
-               || die "compilation failed"
-}
-
-src_install() {
-       # Chromium does not have "install" target in the build system.
-       export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-       dodir ${CHROMIUM_HOME}
-
-       exeinto ${CHROMIUM_HOME}
-       doexe out/Release/chrome
-       doexe out/Release/chrome_sandbox
-       fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
-       doexe out/Release/xdg-settings
-       doexe "${FILESDIR}"/chromium-launcher.sh
-
-       insinto ${CHROMIUM_HOME}
-       doins out/Release/chrome.pak
-
-       doins -r out/Release/locales
-       doins -r out/Release/resources
-
-       # chrome.1 is for chromium --help
-       newman out/Release/chrome.1 chrome.1
-       newman out/Release/chrome.1 chromium.1
-
-       if use ffmpeg; then
-               # 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}
-               dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
-               dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
-       fi
-
-       # Plugins symlink, optional wrt bug #301911
-       if use plugins-symlink; then
-               dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
-       fi
-
-       # Icon and desktop entry
-       newicon out/Release/product_logo_48.png ${PN}-browser.png
-       dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
-       make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
-       sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
-               || die "desktop file sed failed"
-       # Gnome default application entry
-       dodir /usr/share/gnome-control-center/default-apps
-       insinto /usr/share/gnome-control-center/default-apps
-       doins "${FILESDIR}"/chromium.xml
-}
diff --git a/www-client/chromium/chromium-5.0.366.2.ebuild b/www-client/chromium/chromium-5.0.366.2.ebuild
deleted file mode 100644 (file)
index d4ed45d..0000000
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.366.2.ebuild,v 1.4 2010/04/05 15:23:11 phajdan.jr Exp $
-
-EAPI="2"
-inherit eutils flag-o-matic multilib portability toolchain-funcs
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist +ffmpeg +plugins-symlink"
-
-RDEPEND="app-arch/bzip2
-       >=dev-libs/libevent-1.4.13
-       dev-libs/libxml2
-       dev-libs/libxslt
-       >=dev-libs/nss-3.12.3
-       >=gnome-base/gconf-2.24.0
-       >=media-libs/alsa-lib-1.0.19
-       media-libs/jpeg:0
-       media-libs/libpng
-       ffmpeg? ( >=media-video/ffmpeg-0.5_p21602 )
-       sys-libs/zlib
-       >=x11-libs/gtk+-2.14.7
-       x11-libs/libXScrnSaver"
-#      dev-db/sqlite:3
-DEPEND="${RDEPEND}
-       >=dev-util/gperf-3.0.3
-       >=dev-util/pkgconfig-0.23
-       sys-devel/flex"
-RDEPEND+="
-       || (
-               x11-themes/gnome-icon-theme
-               x11-themes/tango-icon-theme
-               x11-themes/xfce4-icon-theme
-       )
-       x11-misc/xdg-utils
-       virtual/ttf-fonts"
-
-# Incompatible system plugins:
-# www-plugins/gecko-mediaplayer, bug #309231.
-RDEPEND+="
-       plugins-symlink? (
-               !www-plugins/gecko-mediaplayer[gnome]
-       )"
-
-pkg_setup() {
-       if [[ "${ROOT}" == "/" ]]; then
-               # Prevent user problems like bug 299777.
-               if ! grep -q /dev/shm <<< $(get_mounts); then
-                       eerror "You don't have tmpfs mounted at /dev/shm."
-                       eerror "${PN} isn't going to work in that configuration."
-                       eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
-                       eerror "run 'mount /dev/shm' and try again."
-                       die "/dev/shm is not mounted"
-               fi
-               if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-                       eerror "/dev/shm does not have correct permissions."
-                       eerror "${PN} isn't going to work in that configuration."
-                       eerror "Please run chmod 1777 /dev/shm and try again."
-                       die "/dev/shm has incorrect permissions"
-               fi
-       fi
-
-       elog "${PN} might crash occasionally. To get more useful backtraces"
-       elog "and submit better bug reports, please read"
-       elog "http://www.gentoo.org/proj/en/qa/backtraces.xml"
-
-       if ! use bindist; then
-               einfo
-               elog "You may not redistribute this build to any users on your network"
-               elog "or the internet."
-               elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-       fi
-}
-
-src_prepare() {
-       # Gentoo uses .kde4, not .kde
-       # TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
-       # would be better
-       sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
-               || die "kde proxy sed failed"
-       # Changing this in ~/include.gypi does not work
-       sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
-       # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
-       epatch "${FILESDIR}"/${PN}-drop_sse2.patch
-       if ! use bindist; then
-               # Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
-               epatch "${FILESDIR}"/${PN}-ffmpeg.patch
-       fi
-       # Fix build failure with libpng-1.4, bug 310959.
-       epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
-       # Prevent the make build from filling entire disk space on some systems,
-       # bug 297273.
-       epatch "${FILESDIR}"/${PN}-fix-make-build.patch
-
-       # Disable prefixing to allow linking against system zlib
-       sed -e '/^#include "mozzconf.h"$/d' \
-               -i third_party/zlib/zconf.h \
-               || die "zlib sed failed"
-}
-
-src_configure() {
-       export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-       # Fails to build on arm if we don't do this
-       use arm && append-flags -fno-tree-sink
-
-       # CFLAGS/LDFLAGS
-       mkdir -p "${S}"/.gyp
-       cat << EOF > "${S}"/.gyp/include.gypi
-{
-       'target_defaults': {
-               'cflags': [ '${CFLAGS// /','}' ],
-               'ldflags': [ '${LDFLAGS// /','}' ],
-       },
-}
-EOF
-       export HOME="${S}"
-
-       # Configuration options (system libraries)
-       local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
-       # -Duse_system_sqlite=1 : http://crbug.com/22208
-       # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
-
-       # Sandbox paths
-       myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
-       if use amd64 ; then
-               myconf="${myconf} -Dtarget_arch=x64"
-       fi
-
-       if use x86 ; then
-               myconf="${myconf} -Dtarget_arch=ia32"
-       fi
-
-       if use arm; then
-               myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-       fi
-
-       if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-               myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
-       fi
-
-       if use ffmpeg; then
-               myconf="${myconf} -Duse_system_ffmpeg=1"
-       fi
-
-       build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
-}
-
-src_compile() {
-       emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-               rootdir="${S}" \
-               CC=$(tc-getCC) \
-               CXX=$(tc-getCXX) \
-               AR=$(tc-getAR) \
-               RANLIB=$(tc-getRANLIB) \
-               || die "compilation failed"
-}
-
-src_install() {
-       # Chromium does not have "install" target in the build system.
-       export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-       dodir ${CHROMIUM_HOME}
-
-       exeinto ${CHROMIUM_HOME}
-       doexe out/Release/chrome
-       doexe out/Release/chrome_sandbox
-       fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
-       doexe out/Release/xdg-settings
-       doexe "${FILESDIR}"/chromium-launcher.sh
-
-       insinto ${CHROMIUM_HOME}
-       doins out/Release/chrome.pak
-
-       doins -r out/Release/locales
-       doins -r out/Release/resources
-
-       # chrome.1 is for chromium --help
-       newman out/Release/chrome.1 chrome.1
-       newman out/Release/chrome.1 chromium.1
-
-       if use ffmpeg; then
-               # 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}
-               dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
-               dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
-       fi
-
-       # Plugins symlink, optional wrt bug #301911
-       if use plugins-symlink; then
-               dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
-       fi
-
-       # Icon and desktop entry
-       newicon out/Release/product_logo_48.png ${PN}-browser.png
-       dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
-       make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
-       sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
-               || die "desktop file sed failed"
-       # Gnome default application entry
-       dodir /usr/share/gnome-control-center/default-apps
-       insinto /usr/share/gnome-control-center/default-apps
-       doins "${FILESDIR}"/chromium.xml
-}
diff --git a/www-client/chromium/files/chromium-ffmpeg.patch b/www-client/chromium/files/chromium-ffmpeg.patch
deleted file mode 100644 (file)
index 8694cc6..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
---- third_party/ffmpeg/ffmpeg.gyp.orig 2010-04-03 18:29:54.000000000 +0200
-+++ third_party/ffmpeg/ffmpeg.gyp      2010-04-03 18:31:02.000000000 +0200
-@@ -55,6 +55,11 @@
-     'asm_library': 'ffmpegasm',
-   },
-   'conditions': [
-+    ['use_system_ffmpeg==1', {
-+      'defines': [
-+        'CHROMIUM_SYSTEM_FFMPEG',
-+      ],
-+    }],
-     ['OS!="win" and use_system_ffmpeg==0', {
-       'targets': [
-         {
---- net/base/mime_util.cc.orig 2010-04-03 18:32:32.000000000 +0200
-+++ net/base/mime_util.cc      2010-04-03 18:33:09.000000000 +0200
-@@ -189,7 +189,7 @@
-   "audio/ogg",
-   "application/ogg",
- 
--#if defined(GOOGLE_CHROME_BUILD)
-+#if defined(CHROMIUM_SYSTEM_FFMPEG)
-   // MPEG-4.
-   "video/mp4",
-   "video/x-m4v",
-@@ -208,7 +208,7 @@
- // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support
- // for more information.
- static const char* const supported_media_codecs[] = {
--#if defined(GOOGLE_CHROME_BUILD)
-+#if defined(CHROMIUM_SYSTEM_FFMPEG)
-   "avc1",
-   "mp4a",
- #endif
index c8ec44bc88965282423e784a0f800492372375f4..ca29e649f81e92a828a84eb7ae9e94393dd5e018 100644 (file)
@@ -12,7 +12,6 @@
        </maintainer>
        <longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
        <use>
-               <flag name='ffmpeg'>Add support for HTML5 audio/video tags via <pkg>media-video/ffmpeg</pkg></flag>
                <flag name='plugins-symlink'>Add support for system web browser plugins out of the box</flag>
        </use>
 </pkgmetadata>