From d9492b4905b53c8e7901b86be54d188dd595bac1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Hajdan?= Date: Thu, 10 Nov 2011 16:02:32 +0000 Subject: [PATCH] Restore cups USE flag for 17.x, and also run more tests. Package-Manager: portage-2.1.10.11/cvs/Linux i686 --- www-client/chromium/ChangeLog | 6 ++++- www-client/chromium/Manifest | 12 +++++----- .../chromium/chromium-17.0.932.0.ebuild | 22 ++++++++++++++----- www-client/chromium/chromium-9999-r1.ebuild | 11 +++++++--- 4 files changed, 35 insertions(+), 16 deletions(-) diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 01f2da555937..25c61193637a 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,10 @@ # 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.493 2011/11/10 07:53:44 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.494 2011/11/10 16:02:32 phajdan.jr Exp $ + + 10 Nov 2011; Pawel Hajdan jr + chromium-17.0.932.0.ebuild, chromium-9999-r1.ebuild: + Restore cups USE flag for 17.x, and also run more tests. 10 Nov 2011; Pawel Hajdan jr +files/chromium-cups-r0.patch, chromium-16.0.912.32.ebuild: diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index fdc7f64f6877..07862d9e2287 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -22,14 +22,14 @@ EBUILD chromium-15.0.874.106.ebuild 14143 RMD160 ef3a52d44e4777aee44e2b835b23418 EBUILD chromium-16.0.912.21.ebuild 16515 RMD160 d728f26b57f2dd94066e64a8d0f3d90abd0b1512 SHA1 713ae33ba1e0353bb629984d2a954daccd6eef85 SHA256 b4051a317e5743363c2730a27a645dc9892d8c37a8719cc9112f41ee9aee5aba EBUILD chromium-16.0.912.32.ebuild 16586 RMD160 e29d4dc7be00d58d41d94a255248150b5cfd06c3 SHA1 1bb5ab45a737b1e591ccc3d96ec31045f229a1eb SHA256 ce270592808902eea3aa9808f3f66c7c50f764d6df7ad47879dac4142f3b90ff EBUILD chromium-17.0.928.0.ebuild 16551 RMD160 49104ce7304db68e7dca90f9610dd48ed3d8a5d4 SHA1 a002a02641d3b39054073f1dba7dbd64a989f4f2 SHA256 ebef48e9a561c86ed67ee9d36480e04baad3c50f76f85a1fbfb79334ac65cf92 -EBUILD chromium-17.0.932.0.ebuild 16536 RMD160 1233fe43bbb7e29b77073be5016e27e79639c942 SHA1 633e9e0ebeb0087e93ccaef477c5cbe8bbdb2573 SHA256 edfad2a40f2945121e7c6a347994ffb9892484024d6dec5c70e1563210043da5 -EBUILD chromium-9999-r1.ebuild 18607 RMD160 3e3a22b0ab5e8e91291194f1f26a5daf0ef59133 SHA1 5936ee5264494754c5542489ee388c2dfcae133f SHA256 9a7e3e52a69732cd882d9369a6a18b02d31eb70cf7cacbe4d83eafe677d39a60 -MISC ChangeLog 108174 RMD160 0b4bf33edb583ea192fc1701859a3bb44278faa6 SHA1 0d47c9ed464e090c326745c0c3ec00e67cb34e67 SHA256 fbf5b1d55b5066110d8ccbb73dd73ee7375876088c1d0342e77d75fcda670558 +EBUILD chromium-17.0.932.0.ebuild 17029 RMD160 686813435c19fba1aefc15f44b29bb0a08cc8ee6 SHA1 09c3d043305adf69fdab67534d150fc333fd00af SHA256 13cd9efe528714bf9d463204a57f4d57c800cb44dc971dc939c03a1ac20e9826 +EBUILD chromium-9999-r1.ebuild 19014 RMD160 881b2e165e5826c722600f91b61c9add4da2fe92 SHA1 c0c2367afeea38b5d65535d1e05988580f81142b SHA256 c81768ddfae6e6ebaff831a189fd47f1b501935a5efdc6c12639b84b7ea40e61 +MISC ChangeLog 108344 RMD160 5058f69464be4f458fa370a4e04ee2ec52459b52 SHA1 35c452b17e4b186c489c9931b32d573c61550429 SHA256 865668a678a97b25172dec91eb23ce7d3cb071414a8facffe5dc983f3f9092ac MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREKAAYFAk67gw4ACgkQuUQtlDBCeQJC5QCeNPtJhKhpRuZwfIRqyGjAGP5d -dkQAn3KyphkqM3hCUj40hI2/PZ3DzKWu -=Md0S +iEYEAREKAAYFAk679aMACgkQuUQtlDBCeQIJIQCffd8/D35d51rMCg3KctlWL8f6 +8v4An1iq/tunXdm50OF72j96NSEqbgjC +=KD3B -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-17.0.932.0.ebuild b/www-client/chromium/chromium-17.0.932.0.ebuild index 0d6a249146a9..eae8344a9e5d 100644 --- a/www-client/chromium/chromium-17.0.932.0.ebuild +++ b/www-client/chromium/chromium-17.0.932.0.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-17.0.932.0.ebuild,v 1.1 2011/11/08 16:16:54 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-17.0.932.0.ebuild,v 1.2 2011/11/10 16:02:32 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 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 @@ -26,12 +26,15 @@ for lang in ${LANGS}; do done RDEPEND="app-arch/bzip2 + cups? ( + dev-libs/libgcrypt + >=net-print/cups-1.3.11 + ) >=dev-lang/v8-3.6.5.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 - dev-libs/libgcrypt dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 @@ -43,7 +46,6 @@ RDEPEND="app-arch/bzip2 media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex - >=net-print/cups-1.3.11 pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 @@ -175,6 +177,8 @@ src_prepare() { third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \ chrome/common/zip.cc || die + epatch "${FILESDIR}/${PN}-cups-r0.patch" + epatch_user # Remove most bundled libraries. Some are still needed. @@ -271,6 +275,7 @@ src_configure() { # Optional dependencies. # TODO: linux_link_kerberos, bug #381289. 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) @@ -327,8 +332,8 @@ src_compile() { emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die pax-mark m out/Release/chrome 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 + emake {base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests BUILDTYPE=Release V=1 || die + pax-mark m out/Release/{base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests fi } @@ -352,14 +357,19 @@ src_test() { LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \ '--gtest_filter=-ICUStringConversionsTest.*' + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake # NetUtilTest: bug #361885. # NetUtilTest.GenerateFileName: some locale-related mismatch. # UDP: unstable, active development. We should revisit this later. LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \ '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:NetUtilTest.GenerateFileName:*UDP*' + + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake } src_install() { diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild index ad69e19ea0fe..eac7c5b7154f 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.73 2011/11/09 18:56:01 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.74 2011/11/10 16:02:32 phajdan.jr Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -383,8 +383,8 @@ src_compile() { emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die pax-mark m out/Release/chrome 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 + emake {base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests BUILDTYPE=Release V=1 || die + pax-mark m out/Release/{base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests fi } @@ -408,14 +408,19 @@ src_test() { LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \ '--gtest_filter=-ICUStringConversionsTest.*' + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake # NetUtilTest: bug #361885. # NetUtilTest.GenerateFileName: some locale-related mismatch. # UDP: unstable, active development. We should revisit this later. LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \ '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:NetUtilTest.GenerateFileName:*UDP*' + + LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake } src_install() { -- 2.26.2