From cf61049f24694979e71357f847601834933d42d7 Mon Sep 17 00:00:00 2001 From: Paweł Hajdan Date: Sat, 31 Jul 2010 03:09:43 +0000 Subject: Version bump for dev channel release. Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- www-client/chromium/ChangeLog | 8 +- www-client/chromium/Manifest | 6 +- www-client/chromium/chromium-6.0.472.0.ebuild | 209 ------------------------- www-client/chromium/chromium-6.0.472.14.ebuild | 209 +++++++++++++++++++++++++ 4 files changed, 219 insertions(+), 213 deletions(-) delete mode 100644 www-client/chromium/chromium-6.0.472.0.ebuild create mode 100644 www-client/chromium/chromium-6.0.472.14.ebuild (limited to 'www-client') diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 627ff7adfa5b..c29f1985dd06 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -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.144 2010/07/29 15:15:17 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.145 2010/07/31 03:09:43 phajdan.jr Exp $ + +*chromium-6.0.472.14 (31 Jul 2010) + + 31 Jul 2010; Pawel Hajdan jr + -chromium-6.0.472.0.ebuild, +chromium-6.0.472.14.ebuild: + Version bump for dev channel release. 29 Jul 2010; Markos Chandras chromium-5.0.375.125.ebuild: diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 8b6dbd7f31b3..91297872d011 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -6,12 +6,12 @@ AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a DIST chromium-5.0.375.125.tar.bz2 163277364 RMD160 89a5e3656287ba89b2a24b6b9b9832a74530c8fe SHA1 7377d2acbef0b2823406c9c0a5b4e39e47aab5f3 SHA256 a3f957bfd4c7418782b0b15aca8b1ca46a2c84bb0d258965f4709fab7290fd94 DIST chromium-5.0.375.99.tar.bz2 163269200 RMD160 0164f7b0fa099ac30279e3886d1d46ef5ed531c8 SHA1 6943978ea3262bf9ee913cbc36b03202774607ff SHA256 cfe592d252de04fd5051b6282740fe69dc7c8c86e13b419eeb1962b1a0ece82e -DIST chromium-6.0.472.0.tar.bz2 123646233 RMD160 add3186a0b0dab069b9a9cfe778be289e41c2ac8 SHA1 620b26858b2e71f39139c09a92b6060314a8dbc7 SHA256 52f1765f0d40bee9a831e827df10910aac5d9ed8739845e8901c1864f4ee2e96 DIST chromium-6.0.472.11.tar.bz2 123374575 RMD160 9b7a99b2de642e7ac2ff668db74c8bccfa402bdc SHA1 0e601dc702891cea25732a768a38edc66bf2cadc SHA256 c3ddf5e36f686aa7681c853308cd1f2e58d55d9c1226c3401261a075e87ee97e +DIST chromium-6.0.472.14.tar.bz2 123294791 RMD160 8e35457ae212d88bc6fc251258ae6387490a606f SHA1 4b4343ff01eca34a5cfc7b2a0bb3056de1bed451 SHA256 8b628f73ce525cb0268a86586d3227edecc4cb89e2234ffde4f1960471f7cc74 EBUILD chromium-5.0.375.125.ebuild 5380 RMD160 4fc7932fb23120c1adb50b635c67f9105a99c58f SHA1 ea49b95b05c006da9fdc6f7703cccf00579b7b07 SHA256 be8cd66f87635823038a20b9eca02737bb84132300b8b1bebe0d99deb6e13dad EBUILD chromium-5.0.375.99.ebuild 5381 RMD160 18b82c91aa848061759f92b3c37f0f7da0bc7f3f SHA1 0cbed4ee5ae8b3b189a8d994cf982c5581f9be6a SHA256 2c67e43d3d407add70e1aa180d63bc1682ce742d3d4e2069e4bc5bb67eef3076 -EBUILD chromium-6.0.472.0.ebuild 6424 RMD160 be99ed53f7c7374a89f06dc447221c6d5b21c3a4 SHA1 ed5075b748e99a18fff74a0e607173e4833df632 SHA256 e95f71ed02e2f434a8f0302744825a30331af30395f8c06097015bde677aed5e EBUILD chromium-6.0.472.11.ebuild 6425 RMD160 d518813a459136919986394748db5fb4a9b978ea SHA1 5f8d831e1adcb993369adf1513913e061317f0d2 SHA256 5ad80be340db2ef4fdf596ea8b1c112c89f87d77bffff7766bfadb1fec0f04b7 +EBUILD chromium-6.0.472.14.ebuild 6425 RMD160 a70e65f41a1641042f73442a2e8a2d6c18116e15 SHA1 9dc14a89d99b55ac7cd4fb1cc09d252eb797a503 SHA256 4c7650c2865a5d1a36f5bc53cc1c818ee08467b8491e9719e4ed81401a8a7da5 EBUILD chromium-9999.ebuild 8068 RMD160 2abc72be9537bb6750b52425b6186421eaf344c1 SHA1 fedf4a0980f446e7a133c1b5a77f96e5b42fe2e1 SHA256 ec92818fbe1107bf132d9af3340d2ed8a433d6e5a34629d5a663541f30bfea83 -MISC ChangeLog 31647 RMD160 0b7fa45ba1a402436c98794dd48e7e034270b413 SHA1 4ee27490b60a3a8d545f947d23b445575d2f1714 SHA256 2d6f63482938da66a3d55936ebec124494d2c9a86bb4a3244f8494b15e82a900 +MISC ChangeLog 31840 RMD160 18fef8d63c38130f88ff24e86a0b4c192978480d SHA1 502163f5818aa21dd5549f32f801106556fec1fa SHA256 44a8377476d92ec3f6085b8f1d9725f1a005cb249c3138b376cd01f28f0b6fda MISC metadata.xml 378 RMD160 3309b2d1fb60157d0da1e22070ba3c448bd46b74 SHA1 0a8d13bb94e9836a14255b724b738c5df1f8ed7e SHA256 7d02fdca1b3c68d1202c720f1987713c28e38b1f9f3e30cbc3138c000572f08e diff --git a/www-client/chromium/chromium-6.0.472.0.ebuild b/www-client/chromium/chromium-6.0.472.0.ebuild deleted file mode 100644 index d3e5d1e21f86..000000000000 --- a/www-client/chromium/chromium-6.0.472.0.ebuild +++ /dev/null @@ -1,209 +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-6.0.472.0.ebuild,v 1.1 2010/07/22 00:14:21 phajdan.jr Exp $ - -EAPI="2" - -inherit eutils flag-o-matic multilib pax-utils 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="cups gnome sse2" - -RDEPEND="app-arch/bzip2 - >=dev-libs/libevent-1.4.13 - >=dev-libs/nss-3.12.3 - >=gnome-base/gconf-2.24.0 - gnome? ( >=gnome-base/gnome-keyring-2.28.2 ) - >=media-libs/alsa-lib-1.0.19 - media-libs/jpeg:0 - media-libs/libpng - media-video/ffmpeg[threads] - cups? ( >=net-print/cups-1.4.4 ) - sys-libs/zlib - >=x11-libs/gtk+-2.14.7 - x11-libs/libXScrnSaver" -DEPEND="${RDEPEND} - dev-lang/perl - >=dev-util/gperf-3.0.3 - >=dev-util/pkgconfig-0.23 - >=gnome-base/gnome-keyring-2.28.2 - sys-devel/flex" -RDEPEND+=" - || ( - x11-themes/gnome-icon-theme - x11-themes/oxygen-molecule - x11-themes/tango-icon-theme - x11-themes/xfce4-icon-theme - ) - x11-apps/xmessage - x11-misc/xdg-utils - virtual/ttf-fonts" - -get_chromium_home() { - echo "/usr/$(get_libdir)/chromium-browser" -} - -remove_bundled_lib() { - einfo "Removing bundled library $1 ..." - local out - out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \ - || die "failed to remove bundled library $1" - if [[ -z $out ]]; then - die "no files matched when removing bundled library $1" - fi -} - -src_prepare() { - # Disable VP8 until we have a recent enough system-provided ffmpeg. - epatch "${FILESDIR}"/${PN}-disable-vp8-r1.patch - - remove_bundled_lib "third_party/bzip2" - remove_bundled_lib "third_party/libevent" - remove_bundled_lib "third_party/libjpeg" - remove_bundled_lib "third_party/libpng" - # TODO: also remove third_party/libxml and third_party/libxslt when - # http://crbug.com/29333 is fixed. - # TODO: also remove third_party/zlib. For now the compilation fails if we - # remove it (minizip-related). -} - -src_configure() { - local myconf="" - - # Make it possible to build chromium on non-sse2 systems. - if use sse2; then - myconf="${myconf} -Ddisable_sse2=0" - else - myconf="${myconf} -Ddisable_sse2=1" - fi - - # Use system-provided libraries. - # TODO: use_system_libxml (http://crbug.com/29333). - # TODO: use_system_sqlite (http://crbug.com/22208). - # TODO: use_system_icu, use_system_hunspell (upstream changes needed). - # TODO: use_system_ssl when we have a recent enough system NSS. - myconf="${myconf} - -Duse_system_bzip2=1 - -Duse_system_ffmpeg=1 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_zlib=1" - - # The system-provided ffmpeg supports more codecs. Enable them in chromium. - myconf="${myconf} -Dproprietary_codecs=1" - - # The dependency on cups is optional, see bug #324105. - if use cups; then - myconf="${myconf} -Duse_cups=1" - else - myconf="${myconf} -Duse_cups=0" - fi - - # Enable sandbox. - myconf="${myconf} - -Dlinux_sandbox_path=$(get_chromium_home)/chrome_sandbox - -Dlinux_sandbox_chrome_path=$(get_chromium_home)/chrome" - - # Disable the V8 snapshot. It breaks the build on hardened (bug #301880), - # and the performance gain isn't worth it. - myconf="${myconf} -Dv8_use_snapshot=0" - - # Disable tcmalloc memory allocator. It causes problems, - # for example bug #320419. - myconf="${myconf} -Dlinux_use_tcmalloc=0" - - # Disable gpu rendering, it is incompatible with nvidia-drivers, - # bug #319331. - myconf="${myconf} -Denable_gpu=0" - - # Use target arch detection logic from bug #296917. - local myarch="$ABI" - [[ $myarch = "" ]] && myarch="$ARCH" - - if [[ $myarch = amd64 ]] ; then - myconf="${myconf} -Dtarget_arch=x64" - elif [[ $myarch = x86 ]] ; then - myconf="${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="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" - else - die "Failed to determine target arch, got '$myarch'." - fi - - if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then - myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44" - 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="${myconf} -Dwerror=" - - 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() { - dodir "$(get_chromium_home)" - - exeinto "$(get_chromium_home)" - pax-mark m out/Release/chrome - doexe out/Release/chrome - doexe out/Release/chrome_sandbox - fperms 4755 "$(get_chromium_home)/chrome_sandbox" - doexe out/Release/xdg-settings - doexe "${FILESDIR}"/chromium-launcher.sh - - insinto "$(get_chromium_home)" - doins out/Release/chrome.pak || die "installing chrome.pak failed" - doins out/Release/resources.pak || die "installing resources.pak failed" - - 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 - - # Chromium looks for these in its folder - # See media_posix.cc and base_paths_linux.cc - dosym /usr/$(get_libdir)/libavcodec.so.52 "$(get_chromium_home)" - dosym /usr/$(get_libdir)/libavformat.so.52 "$(get_chromium_home)" - dosym /usr/$(get_libdir)/libavutil.so.50 "$(get_chromium_home)" - - # Use system plugins by default. - dosym /usr/$(get_libdir)/nsbrowser/plugins "$(get_chromium_home)/plugins" - - # Install icon and desktop entry. - newicon out/Release/product_logo_48.png ${PN}-browser.png - dosym "$(get_chromium_home)/chromium-launcher.sh" /usr/bin/chromium - make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \ - "MimeType=text/html;text/xml;application/xhtml+xml;" - sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \ - || die "desktop file sed failed" - - # Install GNOME default application entry (bug #303100). - 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-6.0.472.14.ebuild b/www-client/chromium/chromium-6.0.472.14.ebuild new file mode 100644 index 000000000000..f0c956d563f0 --- /dev/null +++ b/www-client/chromium/chromium-6.0.472.14.ebuild @@ -0,0 +1,209 @@ +# 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-6.0.472.14.ebuild,v 1.1 2010/07/31 03:09:43 phajdan.jr Exp $ + +EAPI="2" + +inherit eutils flag-o-matic multilib pax-utils 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="cups gnome sse2" + +RDEPEND="app-arch/bzip2 + >=dev-libs/libevent-1.4.13 + >=dev-libs/nss-3.12.3 + >=gnome-base/gconf-2.24.0 + gnome? ( >=gnome-base/gnome-keyring-2.28.2 ) + >=media-libs/alsa-lib-1.0.19 + media-libs/jpeg:0 + media-libs/libpng + media-video/ffmpeg[threads] + cups? ( >=net-print/cups-1.4.4 ) + sys-libs/zlib + >=x11-libs/gtk+-2.14.7 + x11-libs/libXScrnSaver" +DEPEND="${RDEPEND} + dev-lang/perl + >=dev-util/gperf-3.0.3 + >=dev-util/pkgconfig-0.23 + >=gnome-base/gnome-keyring-2.28.2 + sys-devel/flex" +RDEPEND+=" + || ( + x11-themes/gnome-icon-theme + x11-themes/oxygen-molecule + x11-themes/tango-icon-theme + x11-themes/xfce4-icon-theme + ) + x11-apps/xmessage + x11-misc/xdg-utils + virtual/ttf-fonts" + +get_chromium_home() { + echo "/usr/$(get_libdir)/chromium-browser" +} + +remove_bundled_lib() { + einfo "Removing bundled library $1 ..." + local out + out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \ + || die "failed to remove bundled library $1" + if [[ -z $out ]]; then + die "no files matched when removing bundled library $1" + fi +} + +src_prepare() { + # Disable VP8 until we have a recent enough system-provided ffmpeg. + epatch "${FILESDIR}"/${PN}-disable-vp8-r1.patch + + remove_bundled_lib "third_party/bzip2" + remove_bundled_lib "third_party/libevent" + remove_bundled_lib "third_party/libjpeg" + remove_bundled_lib "third_party/libpng" + # TODO: also remove third_party/libxml and third_party/libxslt when + # http://crbug.com/29333 is fixed. + # TODO: also remove third_party/zlib. For now the compilation fails if we + # remove it (minizip-related). +} + +src_configure() { + local myconf="" + + # Make it possible to build chromium on non-sse2 systems. + if use sse2; then + myconf="${myconf} -Ddisable_sse2=0" + else + myconf="${myconf} -Ddisable_sse2=1" + fi + + # Use system-provided libraries. + # TODO: use_system_libxml (http://crbug.com/29333). + # TODO: use_system_sqlite (http://crbug.com/22208). + # TODO: use_system_icu, use_system_hunspell (upstream changes needed). + # TODO: use_system_ssl when we have a recent enough system NSS. + myconf="${myconf} + -Duse_system_bzip2=1 + -Duse_system_ffmpeg=1 + -Duse_system_libevent=1 + -Duse_system_libjpeg=1 + -Duse_system_libpng=1 + -Duse_system_zlib=1" + + # The system-provided ffmpeg supports more codecs. Enable them in chromium. + myconf="${myconf} -Dproprietary_codecs=1" + + # The dependency on cups is optional, see bug #324105. + if use cups; then + myconf="${myconf} -Duse_cups=1" + else + myconf="${myconf} -Duse_cups=0" + fi + + # Enable sandbox. + myconf="${myconf} + -Dlinux_sandbox_path=$(get_chromium_home)/chrome_sandbox + -Dlinux_sandbox_chrome_path=$(get_chromium_home)/chrome" + + # Disable the V8 snapshot. It breaks the build on hardened (bug #301880), + # and the performance gain isn't worth it. + myconf="${myconf} -Dv8_use_snapshot=0" + + # Disable tcmalloc memory allocator. It causes problems, + # for example bug #320419. + myconf="${myconf} -Dlinux_use_tcmalloc=0" + + # Disable gpu rendering, it is incompatible with nvidia-drivers, + # bug #319331. + myconf="${myconf} -Denable_gpu=0" + + # Use target arch detection logic from bug #296917. + local myarch="$ABI" + [[ $myarch = "" ]] && myarch="$ARCH" + + if [[ $myarch = amd64 ]] ; then + myconf="${myconf} -Dtarget_arch=x64" + elif [[ $myarch = x86 ]] ; then + myconf="${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="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" + else + die "Failed to determine target arch, got '$myarch'." + fi + + if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then + myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44" + 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="${myconf} -Dwerror=" + + 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() { + dodir "$(get_chromium_home)" + + exeinto "$(get_chromium_home)" + pax-mark m out/Release/chrome + doexe out/Release/chrome + doexe out/Release/chrome_sandbox + fperms 4755 "$(get_chromium_home)/chrome_sandbox" + doexe out/Release/xdg-settings + doexe "${FILESDIR}"/chromium-launcher.sh + + insinto "$(get_chromium_home)" + doins out/Release/chrome.pak || die "installing chrome.pak failed" + doins out/Release/resources.pak || die "installing resources.pak failed" + + 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 + + # Chromium looks for these in its folder + # See media_posix.cc and base_paths_linux.cc + dosym /usr/$(get_libdir)/libavcodec.so.52 "$(get_chromium_home)" + dosym /usr/$(get_libdir)/libavformat.so.52 "$(get_chromium_home)" + dosym /usr/$(get_libdir)/libavutil.so.50 "$(get_chromium_home)" + + # Use system plugins by default. + dosym /usr/$(get_libdir)/nsbrowser/plugins "$(get_chromium_home)/plugins" + + # Install icon and desktop entry. + newicon out/Release/product_logo_48.png ${PN}-browser.png + dosym "$(get_chromium_home)/chromium-launcher.sh" /usr/bin/chromium + make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \ + "MimeType=text/html;text/xml;application/xhtml+xml;" + sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \ + || die "desktop file sed failed" + + # Install GNOME default application entry (bug #303100). + dodir /usr/share/gnome-control-center/default-apps + insinto /usr/share/gnome-control-center/default-apps + doins "${FILESDIR}"/chromium.xml +} -- cgit v1.2.3-65-gdbad