From 8b2597ba699857350e3149c14cc060b53168fe83 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Hajdan?= Date: Sat, 19 Jun 2010 16:30:14 +0000 Subject: [PATCH] Move gnome-keyring from RDEPEND to DEPEND. According to http://crbug.com/12351 it's a compile-time-only dependency. Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- www-client/chromium/ChangeLog | 7 ++++++- www-client/chromium/Manifest | 6 +++--- www-client/chromium/chromium-6.0.437.1.ebuild | 4 ++-- www-client/chromium/chromium-9999.ebuild | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 8b564f0531a8..f5dd8a1a584b 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,11 @@ # 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.118 2010/06/19 16:19:19 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.119 2010/06/19 16:30:14 phajdan.jr Exp $ + + 19 Jun 2010; Pawel Hajdan jr + chromium-6.0.437.1.ebuild, chromium-9999.ebuild: + Move gnome-keyring from RDEPEND to DEPEND. According to + http://crbug.com/12351 it's a compile-time-only dependency. 19 Jun 2010; Pawel Hajdan jr chromium-9999.ebuild: Do not apply a patch already applied upstream, bug #324675 by nixtrian diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index d4eddb7932d9..ab6c0f849487 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -12,7 +12,7 @@ DIST chromium-6.0.427.0.tar.bz2 179247836 RMD160 6b42d4145514557eba30b99a0799e18 DIST chromium-6.0.437.1.tar.bz2 124160031 RMD160 80ac4d434de50a923f11aebaf7755c9de4b16a5b SHA1 01440e58c29bc24f9dbf646391859475dd34b856 SHA256 82207de9036cbfe30e91f3e81c5faab35a2077b9007af89b8e87c2218d8ba269 EBUILD chromium-5.0.375.70.ebuild 5653 RMD160 accd9bebc41a61e8544e2d2073bfa8eb558cb8cc SHA1 c48b195937ea1c65bde66fdf9be0dabba470644c SHA256 68904b0221796b90cbf779d107dd81c7f31bcab12068e27fe22d24c38977133a EBUILD chromium-6.0.427.0.ebuild 5869 RMD160 3db0e8f2a551247e1bf370dcc09f22af48dbb628 SHA1 7499494a3540b3e802dd5cbc75f857d7075c9e1d SHA256 caf0867efaa0c786653342e0e0b62b52f49f3ac705590bac62b978d80963883c -EBUILD chromium-6.0.437.1.ebuild 6257 RMD160 dfcac562b59569258eb9559ed12e5babebd9c8ad SHA1 8c67b8a10afea8a2964894bce26453b71f12958f SHA256 6b856bb0f44e1fc4e0bbeb6614a1fc62ea67d603080cdd95c6dc0166267a0448 -EBUILD chromium-9999.ebuild 7897 RMD160 12b5bceb2c85b834e47d40f3dbc1cbb0e1eb732b SHA1 655ec0e7b9faeadd8be7db13cbac3c7fcd3d2e2c SHA256 79ad3f731ef9111af14e7ec0054557d036210e46c0d09a79052d37e1e734c2d6 -MISC ChangeLog 26657 RMD160 659654ddcec4f8201bd5dfc5fca41fe7925a5a5c SHA1 ea06048265b60365ee218e4b75b3ff06c33d8464 SHA256 40bfe9a07fab753a8e7211b7e15f0a45484f2669d94a102e04c1c567a36d1fb1 +EBUILD chromium-6.0.437.1.ebuild 6257 RMD160 794ae41a32cb52b8501b18406e4d48f3ecf4f876 SHA1 1bbd45716b4af4ace3320fcc7c08709459be1a03 SHA256 3a1a0761e5c37b11d5210df3c3b1781f015c08c15dd3b5565851fbf248f26d61 +EBUILD chromium-9999.ebuild 7897 RMD160 ab9d3fe8bb0b01fd60ed1fb2f26c6c4f1a017b2d SHA1 b0e283bd961c63ce1a6c9e563810c2e602ed3a75 SHA256 48ec2139c73491e4c657629a19d3d0534029d45eb55b67f1718ab950c7c1cbd7 +MISC ChangeLog 26884 RMD160 a4b5bb096be090a7c7eb00282a4601bd9a3f872f SHA1 26f01d6ca2c7b023443723cbeb3bf19e8b55856b SHA256 eea97e32ea0a7478a4f617ba3ec872bc181d468cc0abf608b3e4f43ad11ab057 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5 diff --git a/www-client/chromium/chromium-6.0.437.1.ebuild b/www-client/chromium/chromium-6.0.437.1.ebuild index 93019c7f7884..e0c957dc6a57 100644 --- a/www-client/chromium/chromium-6.0.437.1.ebuild +++ b/www-client/chromium/chromium-6.0.437.1.ebuild @@ -1,6 +1,6 @@ # 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.437.1.ebuild,v 1.3 2010/06/19 16:12:26 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.437.1.ebuild,v 1.4 2010/06/19 16:30:14 phajdan.jr Exp $ EAPI="2" @@ -21,7 +21,6 @@ RDEPEND="app-arch/bzip2 dev-libs/libxslt >=dev-libs/nss-3.12.3 >=gnome-base/gconf-2.24.0 - >=gnome-base/gnome-keyring-2.28.2 >=media-libs/alsa-lib-1.0.19 media-libs/jpeg:0 media-libs/libpng @@ -34,6 +33,7 @@ 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+=" || ( diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild index 7cd3b1003b0a..ffc519980720 100644 --- a/www-client/chromium/chromium-9999.ebuild +++ b/www-client/chromium/chromium-9999.ebuild @@ -1,6 +1,6 @@ # 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-9999.ebuild,v 1.60 2010/06/19 16:19:19 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.61 2010/06/19 16:30:14 phajdan.jr Exp $ EAPI="2" @@ -23,7 +23,6 @@ RDEPEND="app-arch/bzip2 dev-libs/libxslt >=dev-libs/nss-3.12.3 >=gnome-base/gconf-2.24.0 - >=gnome-base/gnome-keyring-2.28.2 >=media-libs/alsa-lib-1.0.19 media-libs/jpeg:0 media-libs/libpng @@ -36,6 +35,7 @@ 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+=" || ( -- 2.26.2