From cd37e785c522fabaa25be0fb6d6b0dbbfdb4c5b7 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Wed, 14 Sep 2011 01:50:03 +0000 Subject: [PATCH] Refactor src_unpack. Set ESVN_REPO_URI to trunk. Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64 --- www-client/chromium/ChangeLog | 5 ++- www-client/chromium/Manifest | 10 ++--- www-client/chromium/chromium-9999-r1.ebuild | 47 +++++++++++++-------- 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 061f3485b518..25bd58d33290 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,9 @@ # 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.438 2011/09/13 06:05:55 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.439 2011/09/14 01:50:03 floppym Exp $ + + 14 Sep 2011; Mike Gilbert chromium-9999-r1.ebuild: + Refactor src_unpack. Set ESVN_REPO_URI to trunk. *chromium-14.0.835.162 (13 Sep 2011) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 57a7175e270e..58031d3bed1a 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -33,13 +33,13 @@ EBUILD chromium-14.0.835.159.ebuild 13179 RMD160 b097da8803e0e6c646a54ec260114f5 EBUILD chromium-14.0.835.162.ebuild 13179 RMD160 953ee6bd24599f27194859050fe65ad34211a347 SHA1 1d1afeee082a5eeac1ecc5104cf5720f0d58742d SHA256 dd2330d7a2befef68637810bdbc1549d04e890a35118416fa801d6a3fab4ed88 EBUILD chromium-15.0.874.1.ebuild 13552 RMD160 c9afbfd1c434f362f2f0320fc7a865ab8e95e7eb SHA1 3207cb2f4b1db40b41481fa956da60487c7c3849 SHA256 21d4c49520ddc9fa3d3830ba103cff76eea43cc5eb9d6f23722200aa3e14f4cf EBUILD chromium-15.0.874.5.ebuild 13552 RMD160 15f1a04a5da4805cc4ca9786bb49e28ba3ea7288 SHA1 ea408155a8f0892b41ab20b8370903677adc9b17 SHA256 3d2aeaa23a2ad41836947356379fbd7b81535307dc4ffad7a46f6bb12badaa26 -EBUILD chromium-9999-r1.ebuild 15975 RMD160 e2a8107ef6c564848a14d6834bc1ffe27891dd41 SHA1 0e7fd262da0679ce627520bb246ba3248fe0182f SHA256 5e419e8852bf00cbb5750da35741f0137269dc164debe23dd5ca8eea34e3090d -MISC ChangeLog 97287 RMD160 fd37dc35cb7f7dd80fdf2064b04cbcb7bedc3eff SHA1 6f239cc175e968b2042bfa802efcab3eb009f26a SHA256 823ce0942a05da628b983e082fb3e135d9a5937a7aec8ace2960a515e63f4c20 +EBUILD chromium-9999-r1.ebuild 16111 RMD160 b50ec92adcf8af4825b414ca1a3828e9dcdea8da SHA1 d62323d6646de9809e9f7551df3805e33af3b034 SHA256 b727cbd373b7ded569f88756cc0f97d7da6c5b0c0aa73703bd1bfbac8e35eee0 +MISC ChangeLog 97413 RMD160 fc5367094f7619c907658314e45c27a3098941d9 SHA1 57d8d9176c528180523b435082f1451a3d2634cf SHA256 240c19e22ea92c00a5fa405f58e0691b6fc0e00d6d17a3a3c9f655d4a063314e MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk5u8ssACgkQC77qH+pIQ6Rl5QEArxChxnrjNbjoTuzTwljV0Ri4 -lavruzgg7nFGr3QCcEMA/1hWdNzrIcS4hyFLuHVGNyXGu5l0O1tC5wq4PL81aEUT -=fNZf +iF4EAREIAAYFAk5wCFMACgkQC77qH+pIQ6QC5QEAm+cl5UKZwuE3g8O8R/Hwaji0 +WE1NuzlMKR6oy0jcdZ8A/0MmEqwCRF40Sb0gIbDFJ5VEO9SWsP890BLVaTyz21Jb +=54Yw -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild index b513618fab96..73de72592027 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.50 2011/09/03 22:50:34 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.51 2011/09/14 01:50:03 floppym Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" @@ -10,8 +10,7 @@ inherit eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib \ 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" +ESVN_REPO_URI="http://src.chromium.org/svn/trunk/src" LICENSE="BSD" SLOT="live" @@ -69,9 +68,24 @@ RDEPEND+=" x11-misc/xdg-utils virtual/ttf-fonts" +gclient_config() { + einfo "gclient config -->" + # Allow the user to keep their config if they know what they are doing. + if ! grep -q KEEP .gclient; then + cp -f "${FILESDIR}/dot-gclient" .gclient || die + fi + cat .gclient || die +} + +gclient_sync() { + einfo "gclient sync -->" + "${WORKDIR}/depot_tools/gclient" sync --nohooks --jobs=16 \ + --delete_unversioned_trees || die +} + gclient_runhooks() { - # Run all hooks except gyp_chromium - # Moved from src_unpack to avoid repoman warning about sed + # Run all hooks except gyp_chromium. + einfo "gclient runhooks -->" cp src/DEPS src/DEPS.orig || die sed -e 's:"python", "src/build/gyp_chromium":"true":' -i src/DEPS || die "${WORKDIR}/depot_tools/gclient" runhooks @@ -81,29 +95,26 @@ gclient_runhooks() { } src_unpack() { - subversion_src_unpack + # First grab depot_tools. + ESVN_REVISION= subversion_fetch "http://src.chromium.org/svn/trunk/tools/depot_tools" mv "${S}" "${WORKDIR}"/depot_tools || die - mkdir -p "${ESVN_STORE_DIR}/${PN}" || die cd "${ESVN_STORE_DIR}/${PN}" || die - einfo "gclient config -->" - cp -f "${FILESDIR}/dot-gclient" .gclient || die - cat .gclient || die - - einfo "gclient sync start -->" - "${WORKDIR}/depot_tools/gclient" sync --force --nohooks || die + gclient_config + gclient_sync gclient_runhooks - einfo " working copy: ${ESVN_STORE_DIR}/${PN}" + + subversion_wc_info mkdir -p "${S}" || die + einfo "Copying source to ${S}" 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 + echo "${ESVN_WC_REVISION}" > "${S}"/build/LASTCHANGE.in || die . src/chrome/VERSION - elog "Installing/updating to version ${MAJOR}.${MINOR}.${BUILD}.${PATCH} (Developer Build ${CREV})" + elog "Installing/updating to version ${MAJOR}.${MINOR}.${BUILD}.${PATCH} (Developer Build ${ESVN_WC_REVISION})" } gyp_use() { @@ -157,6 +168,8 @@ pkg_setup() { } src_prepare() { + epatch_user + # Remove most bundled libraries. Some are still needed. find third_party -type f \! -iname '*.gyp*' \ \! -path 'third_party/WebKit/*' \ -- 2.26.2