From: Paweł Hajdan Date: Mon, 24 Oct 2011 14:20:54 +0000 (+0000) Subject: Maintainability cleanup: always build chromedriver to reduce number of USE flags... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=61d04e84b60468063470e268fcb2fa8329780b52;p=gentoo.git Maintainability cleanup: always build chromedriver to reduce number of USE flags (testability); reduce number of differences between live and non-live ebuild. Package-Manager: portage-2.1.10.11/cvs/Linux i686 --- diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 92936fa20e55..abe281b95c07 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,13 @@ # 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.474 2011/10/21 21:26:43 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.475 2011/10/24 14:20:54 phajdan.jr Exp $ + + 24 Oct 2011; Pawel Hajdan jr + chromium-15.0.874.102.ebuild, chromium-16.0.912.4.ebuild, + chromium-9999-r1.ebuild: + Maintainability cleanup: always build chromedriver to reduce number of USE + flags (testability); reduce number of differences between live and non-live + ebuild. *chromium-16.0.912.4 (21 Oct 2011) *chromium-15.0.874.102 (21 Oct 2011) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 55b44afb4160..35a2e71ec51a 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff AUX chromium-icu-compatibility-r0.patch 1659 RMD160 5d1fcc18d27b96f0c1b4f14b24dd8ab40ce917ca SHA1 517155769d0f421a4a81bffbcac39d17fa099956 SHA256 f70d99472d56e0aa7398b5638412d440d22943eb2c5962957f973e90992fdc99 @@ -17,16 +17,18 @@ DIST chromium-16.0.912.0.tar.bz2 154388454 RMD160 93459c8dfcc9024e82d43411500bc2 DIST chromium-16.0.912.4.tar.bz2 154512361 RMD160 8819d50c05b4eae4da7f70010d9af6251499dfd2 SHA1 aace46aef9e57880efa6e73b3f7943e46e1bef28 SHA256 18456509f7d33cc988fde4ad3fe1498ff54aa7c383285ce4422a7bf539eaf156 EBUILD chromium-14.0.835.202.ebuild 13789 RMD160 7a3c1f7d22f9285e5f89ec3a557d5dbf7e7cb118 SHA1 bc2a1024a5c347b283c4d932f7c2fcb29d24b64a SHA256 3b81df285e1053d7b7850edb5fcc79523f79ed236a269d1ca55c60df4d8338bb EBUILD chromium-15.0.874.100.ebuild 14256 RMD160 0ccedd6afe484844a8bc32753dbbc025c6772c59 SHA1 151dec37489bb19c546309d773b2cea3cc9df62d SHA256 99b66cc4eae4cb903db33bee80fdd666853b36139a9db86eac8272589921233a -EBUILD chromium-15.0.874.102.ebuild 14256 RMD160 6b8c5c1bda06120c3b305307696a63b16b62609f SHA1 271431080a0b09da6cde45c1eb70a7d7a85b9fd2 SHA256 5a25e88973946641053d82c544b01fca4a5169f84b932307d3820ea25e7ea8a5 +EBUILD chromium-15.0.874.102.ebuild 14146 RMD160 0f3be4e7f9014d3f6147e5fb08d83b383438e48e SHA1 16bc976e5e8dc20841a90b77e5d24f2db06b45f3 SHA256 a9d60ffe739b5cdec2f2a7e7cdc7521bb2603331d5d8a83bf7fec66fcd71b4e4 EBUILD chromium-16.0.912.0.ebuild 15531 RMD160 27e59c752973378d9969872536ad17f2ce05defb SHA1 7c93d6425a228d77b0680d2b8c52a31beb515fbf SHA256 71458295f6d5d399f52d89e9e1e279e2b693502e85e1a192dc0ba191fd463a95 -EBUILD chromium-16.0.912.4.ebuild 15562 RMD160 d852a36f87545f104ab232b6214cc1cafcb83d80 SHA1 b2ae1ac3a9300a3954fe5ce57941e0830826448b SHA256 0330193bc6e01bc5862f1eb26df12558e5a89bffb91bb14605ccf20df87999dd -EBUILD chromium-9999-r1.ebuild 18114 RMD160 351f6440c42c0293651332eb240e4de6c0d111fb SHA1 ff2f6b6177f6acc173aa3368b2e31fdff19b9921 SHA256 f9e13f8a12609c15fc66f3a034b9e1ffb1c96846ef01e67506b4b9fafe60dcbf -MISC ChangeLog 104646 RMD160 077a1714b22606cbd318f5f6810d402e1eeaed86 SHA1 cf89314b27bc2a20b99f60f9999a9c2b52ef6654 SHA256 ede1d114234e37488cb13f78c7d2e2a330495a077f15add72971ce5009565360 +EBUILD chromium-16.0.912.4.ebuild 15480 RMD160 960ac59265d804d5aef7e12024a3645e4f674128 SHA1 5c90f0d0f5a3a09d5d8374edc1d9c5c289045926 SHA256 378b74a63774420eb7c14708712feded7bc6e141cc2eb2cb9708fbaa9933510d +EBUILD chromium-9999-r1.ebuild 17998 RMD160 2f6b35b70de797e2e0e0a19e62234aa868f60ed4 SHA1 5768086623816f951b6f2344c3659dfbc10d5d07 SHA256 751af1a7e32c225fd90e424cdf96646c9ae8afce93a3a4129b7e957d5730a30e +MISC ChangeLog 104957 RMD160 349607794ab756d7156e07f17b1b6795b9203479 SHA1 fbd56dd902bd7419895257db50818741b0315a3f SHA256 e6f838e5938dba80248c280ef67491b59792a65b04184c13542133a271c9a87d +MISC chromium-9999-r1.ebuild.orig 18114 RMD160 351f6440c42c0293651332eb240e4de6c0d111fb SHA1 ff2f6b6177f6acc173aa3368b2e31fdff19b9921 SHA256 f9e13f8a12609c15fc66f3a034b9e1ffb1c96846ef01e67506b4b9fafe60dcbf +MISC chromium-9999-r1.ebuild.rej 617 RMD160 e9885b59991c9025b0bc63632228ee52cc8aaae8 SHA1 a11c2f94237b070fc671b446423d49d09ae5710b SHA256 19782aa0d2f1379d430a897ceba40921637f5a4b4df62dcd0a3e2438cae951f2 MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk6h45wACgkQC77qH+pIQ6SLswD/SPg8GZKyrgm1veQULIb9ji4f -8k85lMxvgdCnphEYhXIA/R9BXGlg35bwctGiPePDyqa2R50chVXOkMFrhbr+TqLA -=2cuR +iEYEAREKAAYFAk6ldFAACgkQuUQtlDBCeQKeLgCeKmuAT88uhULBaenPPv86KlK8 +7iIAn1vz59VH6WJ4riu1kMZDEHIO7iOl +=e5yE -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-15.0.874.102.ebuild b/www-client/chromium/chromium-15.0.874.102.ebuild index a453aac7b658..9c9bc248c9b4 100644 --- a/www-client/chromium/chromium-15.0.874.102.ebuild +++ b/www-client/chromium/chromium-15.0.874.102.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-15.0.874.102.ebuild,v 1.1 2011/10/21 21:26:43 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.874.102.ebuild,v 1.2 2011/10/24 14:20:54 phajdan.jr Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" @@ -15,7 +15,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}. LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="bindist chromedriver cups gnome gnome-keyring kerberos pulseaudio" +IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio" # en_US is ommitted on purpose from the list below. It must always be available. LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr @@ -271,11 +271,8 @@ src_configure() { } src_compile() { - emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die + emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die pax-mark m out/Release/chrome - if use chromedriver; then - emake chromedriver BUILDTYPE=Release V=1 || die - fi if use test; then emake {base,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die pax-mark m out/Release/{base,crypto,googleurl,net}_unittests @@ -318,9 +315,7 @@ src_install() { doexe out/Release/chrome_sandbox || die fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" - if use chromedriver; then - doexe out/Release/chromedriver || die - fi + doexe out/Release/chromedriver || die # Install Native Client files on platforms that support it. # insinto "${CHROMIUM_HOME}" diff --git a/www-client/chromium/chromium-16.0.912.4.ebuild b/www-client/chromium/chromium-16.0.912.4.ebuild index e2d519b212ae..3da4104b001e 100644 --- a/www-client/chromium/chromium-16.0.912.4.ebuild +++ b/www-client/chromium/chromium-16.0.912.4.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-16.0.912.4.ebuild,v 1.1 2011/10/21 21:26:43 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.912.4.ebuild,v 1.2 2011/10/24 14:20:54 phajdan.jr Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -15,7 +15,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}. LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="bindist chromedriver cups gnome gnome-keyring kerberos pulseaudio" +IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio" # en_US is ommitted on purpose from the list below. It must always be available. LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr @@ -56,14 +56,15 @@ RDEPEND="app-arch/bzip2 DEPEND="${RDEPEND} dev-lang/nacl-toolchain-newlib dev-lang/perl + dev-python/simplejson >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 - dev-python/simplejson >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 test? ( dev-python/pyftpdlib )" RDEPEND+=" + !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts" @@ -321,11 +322,8 @@ src_configure() { } src_compile() { - emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die + emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die pax-mark m out/Release/chrome - if use chromedriver; then - emake chromedriver BUILDTYPE=Release V=1 || die - fi if use test; then emake {base,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die pax-mark m out/Release/{base,crypto,googleurl,net}_unittests @@ -368,9 +366,7 @@ src_install() { doexe out/Release/chrome_sandbox || die fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" - if use chromedriver; then - doexe out/Release/chromedriver || die - fi + doexe out/Release/chromedriver || die # Install Native Client files on platforms that support it. insinto "${CHROMIUM_HOME}" diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild index 8a368d97dc05..5ec21b76604b 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.62 2011/10/19 16:33:01 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.63 2011/10/24 14:20:54 phajdan.jr Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -15,7 +15,7 @@ ESVN_REPO_URI="http://src.chromium.org/svn/trunk/src" LICENSE="BSD" SLOT="live" KEYWORDS="" -IUSE="bindist chromedriver cups gnome gnome-keyring kerberos pulseaudio" +IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio" # en_US is ommitted on purpose from the list below. It must always be available. LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr @@ -62,9 +62,7 @@ DEPEND="${RDEPEND} >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 - test? ( - dev-python/pyftpdlib - )" + test? ( dev-python/pyftpdlib )" RDEPEND+=" !=www-client/chromium-9999 x11-misc/xdg-utils @@ -374,11 +372,8 @@ src_configure() { } src_compile() { - emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die + emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die pax-mark m out/Release/chrome - if use chromedriver; then - emake chromedriver BUILDTYPE=Release V=1 || die - fi if use test; then emake {base,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die pax-mark m out/Release/{base,crypto,googleurl,net}_unittests @@ -421,9 +416,7 @@ src_install() { doexe out/Release/chrome_sandbox || die fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" - if use chromedriver; then - doexe out/Release/chromedriver || die - fi + doexe out/Release/chromedriver || die # Install Native Client files on platforms that support it. insinto "${CHROMIUM_HOME}"