diff options
| -rw-r--r-- | www-client/chromium/ChangeLog | 8 | ||||
| -rw-r--r-- | www-client/chromium/Manifest | 25 | ||||
| -rw-r--r-- | www-client/chromium/chromium-11.0.696.57.ebuild | 336 | ||||
| -rw-r--r-- | www-client/chromium/chromium-9999-r1.ebuild | 48 | ||||
| -rw-r--r-- | www-client/chromium/files/dot-gclient | 9 |
5 files changed, 38 insertions, 388 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 2df1a8893994..da9138590088 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -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.354 2011/05/08 20:56:13 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.355 2011/05/09 06:57:31 phajdan.jr Exp $ + + 09 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> + -chromium-11.0.696.57.ebuild, chromium-9999-r1.ebuild, +files/dot-gclient: + Use LKGR to hopefully avoid transient problems like bug #365367. Simplify + src_unpack a bit. Add one more bundled library that we need (libphonenumber). + Remove old. 08 May 2011; Markos Chandras <hwoarang@gentoo.org> chromium-11.0.696.65.ebuild: diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 67ea12b4eceb..8f934bdc5fdc 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff AUX chromium-cups-r0.patch 1237 RMD160 601fc9a46027580a1817a77abfb47b2b59e212ca SHA1 9826e90746229c7c12d767bb3b6cbdbc5c300041 SHA256 594af80456d977a19949909a7c79cae706964f7ced47634c9c9b19478dc089a2 @@ -9,31 +9,20 @@ AUX chromium-system-vpx-r3.patch 1168 RMD160 3f59b6dfff335be21b55de70ccd9a77b008 AUX chromium-system-vpx-r4.patch 476 RMD160 ff7feff7dff9de28bdc4c80b43c9574d7769a288 SHA1 b87516b0dac8f65431fdce86f26a3c92cfc313af SHA256 6bf0801a8d4ff208f558fa5740adfbed6178d391314297c80e0c3a058910a10e AUX chromium-system-zlib-r0.patch 1318 RMD160 2debfc4f179a57119d5022305134307f4cbbe04d SHA1 036e7573b04046ee0275abcb99a7e7a8b490e47b SHA256 79668fbf6206cd958db328798298a0514d3a95683b41affd3a607a0ac95453e3 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a -DIST chromium-11.0.696.57.tar.bz2 145246561 RMD160 67a030d615a843e39ca36068333d1fab286a49fd SHA1 5f4a358026eb52570670ad43d38c84d7bf48bf14 SHA256 de29e2fafe5a9fdd1fc8f260fde012230cf7eabde651a2fcd042d3bc3aebee91 +AUX dot-gclient 253 RMD160 a768770d8e6f5b73395451277beea1cc9240fc3a SHA1 3eaf2074da58cfe4f2af3d08f59b27a16fe13dad SHA256 8c5750251ff681044cc584ef3768fe39c56c7877ade5fb9107298734126e62cf DIST chromium-11.0.696.65.tar.bz2 145320860 RMD160 f0e69a54fb96742d0ae0325a72b2640dab275700 SHA1 fcfac4ea7eeeac31f22c8d871f4ddf74f8ce97fd SHA256 041e21135481042565ef7a1bccaf35632fd70b3c7da5c4c787d324cde1a17587 DIST chromium-12.0.742.16.tar.bz2 150352189 RMD160 aecaf5475e7097f4a54959ea0a71c64981065387 SHA1 305054c6113d1881e85d8a076f155c0d9ac059fd SHA256 93d1d36e2c361a54f004518023111632bd9025e550dd835c9734b5e75e04ac95 DIST chromium-12.0.742.21.tar.bz2 150264103 RMD160 7df6bd5ebccfe19af8ca0a8f81b6e6e75fb9bd45 SHA1 9f3f64ee132787052fa4789472d77e8790f6ba6b SHA256 09061e607598d16b97947f3f771b044df6a4ef3ec79ef6fc9990f3513578ecd4 -EBUILD chromium-11.0.696.57.ebuild 10569 RMD160 1915cfa1a6cc719bc89690882695709df4ef1cd2 SHA1 69d8f9e36ad637115a3fc576225aaba8ff05b7c2 SHA256 0da808f90649507468c4c75dfd8be1aa9ede89142cc932245a902b2a74969fcc EBUILD chromium-11.0.696.65.ebuild 10572 RMD160 d42ce63e522ad9343f05f4154dcee15cf7ced734 SHA1 8b8285c3308c4b832b07181b17c649694c3a698a SHA256 c5d985befdbb6678716201d05506ae9937452b2b838ce22abd2f578c41577d10 EBUILD chromium-12.0.742.16.ebuild 11576 RMD160 6ca1a3079908b74ba87cd3e44d765321c5b95184 SHA1 3ba3df62187ff992185684f663e93f33ab15f76d SHA256 a172775846fb2edaa0abecb065c06846e12390884469ff5dadfcb580358f85a3 EBUILD chromium-12.0.742.21.ebuild 11565 RMD160 d169a2086062817bdd738e0e445a37017273e210 SHA1 5bc1c3d6b6de2295cfee5270db84dcf4dc5d573c SHA256 1ef8d4579043f568f585d5286cff7aabfdd1ef28f107369d6f1b0da722666591 -EBUILD chromium-9999-r1.ebuild 14256 RMD160 895f58ef3c890a267775394073d1ef8ec31704f7 SHA1 c822f7f3906da7d4b9ee45a5b03c38d129200a3b SHA256 201e5a95e26f685b70f3c52652bf8433c542ae1192f420c8e0131ff767edb50f -MISC ChangeLog 79115 RMD160 ad8a6ac15e5379c14c3e1956f366254198429c07 SHA1 3f3e0d85eee11bb3dd568d58ffb066e43d889d88 SHA256 a0f2ed5e72645fa6519c5c2c472a51d00fea914fc9720ca8122fe3f25605939d +EBUILD chromium-9999-r1.ebuild 13434 RMD160 004e5e15ce78ed7d29c55c3fabc38c5bb9090d28 SHA1 183d1d1938466ff0335eac3e6b7c0c950d06ec87 SHA256 19d0a6bde28a604396e8ae141740c191c56c0101215ec0d0e0b679e2cdf2ec9e +MISC ChangeLog 79420 RMD160 3675fdd261f465991f6fe7425bf915eb27daf176 SHA1 80f88be02832c6e69a31b73d7d86e57efa2bac95 SHA256 0b9d962c7629ba35ac0956680acbb797c269d9c1ca6fdc8ab3ef71ae85d72f3c MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJNxwN2AAoJEPqDWhW0r/LCNvcP/R+frN/mIk79gswbOeC+aGAs -6HPUFxIV/1xdHetnjNPthLH1qE9HRB/2rpSub6v1MnofRTCC3RAJuz+LaUfIT3ab -82iX47lqWl+OUU2eP/NXa5UBclHtXse7XzqE4GnUwGbZ09e8YBglm0u/9aYDlRwB -6r7vQ6BaW/bKFETmb7NTC2gh+8gahuBYSWYoABKvnmAN/pH0KHRmvd1EdhsT21cL -oRYTbnJ4XAnZW9+b4csvldPhT7fOMQm95kewKjpNc0CH7wnEWSX3K0To4yz3SpCe -3AASFrC1ODe8c+Ky4XtkaX+CKqAImsj31Dtx3BQ/EizOlJDtz7qACyxjByvp9ay3 -5SsHz4C1X01ZOlIFw8WNDPYVZPlCcrQpqMQO9ru689XGAtPRsEgXDpQYX18A4k5F -meUduA0jbasplFNn5R+rkZ0hvXy/tMgBN+WwwdcQj/kZFQ7pXYJVnBUyP4Z3cqKY -GuoOxyuxOoPumIicIExd4eYgUZPAAoLB+2GTQekK4/Q9i+qETYDloAOwk/99NV6r -XJCxTvuVwFbhFkMHOl3S1YYWIDiqziwFu9py3G/AipFL/7DlYbo5vuDwoyqOYOm8 -qrMWvrNj4E9d9acwAyZF3Wl52VSHAM6Bh6aIFRFcO6LJ0FFgqzYInU9+CoJzsewK -8Vq7NqZlWeMkD6b576V3 -=cSfo +iEYEARECAAYFAk3HkGgACgkQuUQtlDBCeQLZSQCggBplxrIz9HWmhQStKR2k7kW9 +hEIAn2aOWIMb07c3cqx0n9d2Wwd+yG47 +=RHP9 -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-11.0.696.57.ebuild b/www-client/chromium/chromium-11.0.696.57.ebuild deleted file mode 100644 index b7cbe181b6a5..000000000000 --- a/www-client/chromium/chromium-11.0.696.57.ebuild +++ /dev/null @@ -1,336 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.696.57.ebuild,v 1.3 2011/04/29 14:32:32 tomka 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 ~arm x86" -IUSE="cups gnome gnome-keyring" - -RDEPEND="app-arch/bzip2 - dev-libs/dbus-glib - >=dev-libs/icu-4.4.1 - >=dev-libs/libevent-1.4.13 - dev-libs/libxml2[icu] - dev-libs/libxslt - >=dev-libs/nss-3.12.3 - gnome? ( >=gnome-base/gconf-2.24.0 ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) - >=media-libs/alsa-lib-1.0.19 - media-libs/flac - virtual/jpeg - media-libs/libpng - >=media-libs/libvpx-0.9.5 - media-libs/speex - >=media-video/ffmpeg-0.6_p25767[threads] - cups? ( >=net-print/cups-1.3.11 ) - sys-libs/pam - sys-libs/zlib - x11-libs/gtk+:2 - x11-libs/libXScrnSaver - x11-libs/libXtst" -DEPEND="${RDEPEND} - dev-lang/perl - >=dev-util/gperf-3.0.3 - >=dev-util/pkgconfig-0.23 - sys-devel/flex - >=sys-devel/make-3.81-r2" -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 - "${@}" -} - -pkg_setup() { - CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB - - # Make sure the build system will use the right python, bug #344367. - python_set_active_version 2 - python_pkg_setup - - # Prevent user problems like bug #299777. - if ! grep -q /dev/shm <<< $(get_mounts); then - ewarn "You don't have tmpfs mounted at /dev/shm." - ewarn "${PN} may fail to start in that configuration." - ewarn "Please uncomment the /dev/shm entry in /etc/fstab," - ewarn "and run 'mount /dev/shm'." - fi - if [ `stat -c %a /dev/shm` -ne 1777 ]; then - ewarn "/dev/shm does not have correct permissions." - ewarn "${PN} may fail to start in that configuration." - ewarn "Please run 'chmod 1777 /dev/shm'." - fi - - # Prevent user problems like bug #348235. - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)." - ewarn "You may experience really long compilation times and/or increased memory usage." - ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug." - fi - eshopts_pop - - # Warn if the kernel doesn't support features useful for sandboxing, - # bug #363907. - CONFIG_CHECK="~PID_NS ~NET_NS" - PID_NS_WARNING="PID (process id) namespaces are needed for sandboxing." - NET_NS_WARNING="Network namespaces are needed for sandboxing." - check_extra_config -} - -src_prepare() { - # Make sure we don't use bundled libvpx headers. - epatch "${FILESDIR}/${PN}-system-vpx-r3.patch" - - # Backport FFmpeg compatibility patch, bug #355405. - epatch "${FILESDIR}/${PN}-ffmpeg-build-r0.patch" - - # Remove most bundled libraries. Some are still needed. - find third_party -type f \! -iname '*.gyp*' \ - \! -path 'third_party/WebKit/*' \ - \! -path 'third_party/angle/*' \ - \! -path 'third_party/cacheinvalidation/*' \ - \! -path 'third_party/cld/*' \ - \! -path 'third_party/expat/*' \ - \! -path 'third_party/ffmpeg/*' \ - \! -path 'third_party/flac/flac.h' \ - \! -path 'third_party/gpsd/*' \ - \! -path 'third_party/harfbuzz/*' \ - \! -path 'third_party/hunspell/*' \ - \! -path 'third_party/iccjpeg/*' \ - \! -path 'third_party/launchpad_translations/*' \ - \! -path 'third_party/libjingle/*' \ - \! -path 'third_party/libsrtp/*' \ - \! -path 'third_party/libvpx/libvpx.h' \ - \! -path 'third_party/libwebp/*' \ - \! -path 'third_party/mesa/*' \ - \! -path 'third_party/modp_b64/*' \ - \! -path 'third_party/npapi/*' \ - \! -path 'third_party/openmax/*' \ - \! -path 'third_party/ots/*' \ - \! -path 'third_party/protobuf/*' \ - \! -path 'third_party/skia/*' \ - \! -path 'third_party/speex/speex.h' \ - \! -path 'third_party/sqlite/*' \ - \! -path 'third_party/tcmalloc/*' \ - \! -path 'third_party/undoview/*' \ - \! -path 'third_party/zlib/contrib/minizip/*' \ - -delete || die - - # Make sure the build system will use the right python, bug #344367. - # Only convert directories that need it, to save time. - python_convert_shebangs -q -r 2 build tools -} - -src_configure() { - local myconf="" - - # Never tell the build system to "enable" SSE2, it has a few unexpected - # additions, bug #336871. - myconf+=" -Ddisable_sse2=1" - - # Use system-provided libraries. - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - myconf+=" - -Duse_system_bzip2=1 - -Duse_system_flac=1 - -Duse_system_ffmpeg=1 - -Duse_system_icu=1 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_libxml=1 - -Duse_system_speex=1 - -Duse_system_vpx=1 - -Duse_system_xdg_utils=1 - -Duse_system_zlib=1" - - # Optional dependencies. - myconf+=" - $(gyp_use cups use_cups) - $(gyp_use gnome use_gconf) - $(gyp_use gnome-keyring use_gnome_keyring) - $(gyp_use gnome-keyring linux_link_gnome_keyring)" - - # Enable sandbox. - myconf+=" - -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox - -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - - if host-is-pax; then - # Prevent the build from failing (bug #301880). The performance - # difference is very small. - myconf+=" -Dv8_use_snapshot=0" - fi - - # Our system ffmpeg should support more codecs than the bundled one - # for Chromium. - myconf+=" -Dproprietary_codecs=1" - - # Use target arch detection logic from bug #296917. - local myarch="$ABI" - [[ $myarch = "" ]] && myarch="$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 test; then - emake base_unittests BUILDTYPE=Release V=1 || die - pax-mark m out/Release/base_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 #350347. - LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \ - '--gtest_filter=-ICUStringConversionsTest.*' -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome - doexe out/Release/chrome_sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" - newexe "${FILESDIR}"/chromium-launcher-r1.sh chromium-launcher.sh || die - - # It is important that we name the target "chromium-browser", - # xdg-utils expect it; bug #355517. - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser || die - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die - - insinto "${CHROMIUM_HOME}" - doins out/Release/chrome.pak || die - doins out/Release/resources.pak || die - - doins -r out/Release/locales || die - doins -r out/Release/resources || die - - newman out/Release/chrome.1 chromium.1 || die - newman out/Release/chrome.1 chromium-browser.1 || die - - # Chromium looks for these in its folder - # See media_posix.cc and base_paths_linux.cc - 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 - - # Install icons and desktop entry. - for SIZE in 16 22 24 32 48 64 128 256 ; do - insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps - newins chrome/app/theme/chromium/product_logo_${SIZE}.png \ - chromium-browser.png || die - done - local mime_types="text/html;text/xml;application/xhtml+xml;" - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 - make_desktop_entry chromium-browser "Chromium" chromium-browser \ - "Network;WebBrowser" "MimeType=${mime_types}" - sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die - - # Install GNOME default application entry (bug #303100). - if use gnome; then - dodir /usr/share/gnome-control-center/default-apps || die - insinto /usr/share/gnome-control-center/default-apps - doins "${FILESDIR}"/chromium-browser.xml || die - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - # For more info see bug #292201, bug #352263, bug #361859. - elog - elog "Depending on your desktop environment, you may need" - elog "to install additional packages to get icons on the Downloads page." - elog - elog "For KDE, the required package is kde-base/oxygen-icons." - elog - elog "For other desktop environments, try one of the following:" - elog " - x11-themes/gnome-icon-theme" - elog " - x11-themes/tango-icon-theme" - - # For more info see bug #359153. - elog - elog "Some web pages may require additional fonts to display properly." - elog "Try installing some of the following packages if some characters" - elog "are not displayed properly:" - elog " - media-fonts/arphicfonts" - elog " - media-fonts/bitstream-cyberbit" - elog " - media-fonts/droid" - elog " - media-fonts/ipamonafont" - elog " - media-fonts/ja-ipafonts" - elog " - media-fonts/takao-fonts" - elog " - media-fonts/wqy-microhei" - elog " - media-fonts/wqy-zenhei" -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild index 28b98fdd4ac1..197fc4016eab 100644 --- a/www-client/chromium/chromium-9999-r1.ebuild +++ b/www-client/chromium/chromium-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.23 2011/05/07 13:45:22 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.24 2011/05/09 06:57:31 phajdan.jr Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" @@ -12,7 +12,6 @@ DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="http://chromium.org/" # subversion eclass fetches gclient, which will then fetch chromium itself ESVN_REPO_URI="http://src.chromium.org/svn/trunk/tools/depot_tools" -EGCLIENT_REPO_URI="http://src.chromium.org/svn/trunk/src/" LICENSE="BSD" SLOT="live" @@ -63,45 +62,27 @@ RDEPEND+=" src_unpack() { subversion_src_unpack - mv "${S}" "${WORKDIR}"/depot_tools + mv "${S}" "${WORKDIR}"/depot_tools || die - # Most subversion checks and configurations were already run - EGCLIENT="${WORKDIR}"/depot_tools/gclient - cd "${ESVN_STORE_DIR}" || die "gclient: can't chdir to ${ESVN_STORE_DIR}" + mkdir -p ${ESVN_STORE_DIR}/${PN} || die + cd ${ESVN_STORE_DIR}/${PN} || die - if [[ ! -d ${PN} ]]; then - mkdir -p "${PN}" || die "gclient: can't mkdir ${PN}." - fi - - cd "${PN}" || die "gclient: can't chdir to ${PN}" - - if [[ ! -f .gclient ]]; then - einfo "gclient config -->" - ${EGCLIENT} config ${EGCLIENT_REPO_URI} || die "gclient: error creating config" - fi + einfo "gclient config -->" + cp -f "${FILESDIR}/dot-gclient" .gclient || die + cat .gclient || die einfo "gclient sync start -->" - einfo " repository: ${EGCLIENT_REPO_URI}" - ${EGCLIENT} sync --nohooks || die + "${WORKDIR}/depot_tools/gclient" sync --force --nohooks || die einfo " working copy: ${ESVN_STORE_DIR}/${PN}" - mkdir -p "${S}" - # From export_tarball.py - CHROMIUM_EXCLUDES="--exclude=src/chrome/test/data - --exclude=src/chrome/tools/test/reference_build - --exclude=src/chrome_frame --exclude=src/gears/binaries - --exclude=src/net/data/cache_tests --exclude=src/o3d/documentation - --exclude=src/o3d/samples --exclude=src/third_party/lighttpd - --exclude=src/third_party/WebKit/LayoutTests - --exclude=src/webkit/data/layout_tests - --exclude=src/webkit/tools/test/reference_build" - rsync -rlpgo --exclude=".svn/" ${CHROMIUM_EXCLUDES} src/ "${S}" || die "gclient: can't export to ${S}." - - # Display correct svn revision in about box, and log new version + mkdir -p "${S}" || die + rsync -rlpgo --exclude=".svn/" src/ "${S}" || die + + # Display correct svn revision in about box, and log new version. CREV=$(subversion__svn_info "src" "Revision") - echo ${CREV} > "${S}"/build/LASTCHANGE.in || die "setting revision failed" + echo ${CREV} > "${S}"/build/LASTCHANGE.in || die . src/chrome/VERSION - elog "Installing/updating to version ${MAJOR}.${MINOR}.${BUILD}.${PATCH}_p${CREV} " + elog "Installing/updating to version ${MAJOR}.${MINOR}.${BUILD}.${PATCH} (Developer Build ${CREV})" } gyp_use() { @@ -179,6 +160,7 @@ src_prepare() { \! -path 'third_party/launchpad_translations/*' \ \! -path 'third_party/leveldb/*' \ \! -path 'third_party/libjingle/*' \ + \! -path 'third_party/libphonenumber/*' \ \! -path 'third_party/libsrtp/*' \ \! -path 'third_party/libvpx/libvpx.h' \ \! -path 'third_party/mesa/*' \ diff --git a/www-client/chromium/files/dot-gclient b/www-client/chromium/files/dot-gclient new file mode 100644 index 000000000000..f3e0fce4bbdd --- /dev/null +++ b/www-client/chromium/files/dot-gclient @@ -0,0 +1,9 @@ +solutions = [ + { "name" : "src", + "url" : "http://src.chromium.org/svn/trunk/src", + "custom_deps" : { + "src/third_party/WebKit/LayoutTests": None, + }, + "safesync_url": "http://chromium-status.appspot.com/lkgr", + }, +] |