Set better USE flag descriptions than the default ones. Back from gnome -> gtk and...

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 09786f6da677cacfa7f3944598b0796716c92ed7..b985999367ce6be37b3da9f1f06a8b86765243c1 100644 (file)
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.478 2010/05/20 03:00:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.479 2010/05/20 12:13:10 jer Exp $
+
+  20 May 2010; Jeroen Roovers <jer@gentoo.org>
+  opera-10.54_pre6336-r1.ebuild, metadata.xml:
+  Set better USE flag descriptions than the default ones. Back from gnome ->
+  gtk and enable USE=gtk by default for plugin support.
 
   20 May 2010; Jeroen Roovers <jer@gentoo.org>
   opera-10.54_pre6336-r1.ebuild:

diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 8b1a13aab519ea99bf302db27528b21324f27b47..8b16eeb26c86612c10d3574c6fa79d9a274d05fa 100644 (file)
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -20,6 +20,6 @@ DIST opera-10.54-6336.x86_64.linux.tar.bz2 14239967 RMD160 5fb6d0c4682e8584acb53
 EBUILD opera-10.10-r1.ebuild 4893 RMD160 2733461c1ddbceae8a1177fb931693aedaaf8a2d SHA1 1c95510bf92b10420c5739c1e45cdf80aee07627 SHA256 36e9ec97cb0e8d5b01a0765e56ff7fda46f80e0590ca4342aaada9632bc62d3a
 EBUILD opera-10.10.ebuild 4893 RMD160 6691d79a5f95c3e3d0701b4129a481875399d587 SHA1 2bd8f1a8e97f79607afc1f2ad0edf8a4c80c7f62 SHA256 8dc65519c765759956195bad7bd25bade46c222bfeb10d9e5057bf4f7bb90565
 EBUILD opera-10.53_pre6330-r1.ebuild 4598 RMD160 0f0c884992a7ab4e38e083927128356564bce117 SHA1 fb40b1f66ea4f5e3353728e33424d92a544c4ec9 SHA256 ea9515c2abee597a995e777ecce79df8311bea5db0f7fb48af2bca81508aa48c
-EBUILD opera-10.54_pre6336-r1.ebuild 4700 RMD160 b6dc80b6eb0b76fe605cf4eee3483fcb399c6a46 SHA1 42b3377775f8481649f8ffd7f5370d3536f6ce61 SHA256 c2f4edb76a1a2a4611a6fee1b50ddd4a6721dded48d318001203fce1a5a271e7
-MISC ChangeLog 92733 RMD160 77f13a4e6400e60afa39675c209b8dac0c12ae9e SHA1 709ae554cfa7d3f6b0730afeaa3cac3f93218f6d SHA256 ac822ac6478293b39f7638eb7f3fdd8ec3d35a626f9abe1072bb705649879769
-MISC metadata.xml 547 RMD160 dabb86bc4db85881b0ce910ac05e63d16342e787 SHA1 9acc7ec7a62017ed7c9acfca301a3ea75e4e88d9 SHA256 9f70a9db124893d6a56a40615dbe8cccd015b836067d570a9638a9bd9ec6217a
+EBUILD opera-10.54_pre6336-r1.ebuild 4698 RMD160 8561a27b1cb41494c4f40c90cfed6a74755b8335 SHA1 c8aa99b4f60c5f8a95e3fb043e7c00d537688030 SHA256 261486233a29209c86c96fdd8420c777b7ba45d53ea55ba1d6317ad1ba7b027d
+MISC ChangeLog 92961 RMD160 cead66e329d355791e2eb675492753d2af0fd629 SHA1 c3a3fb36bdd339ff421de602adcba189c160a54e SHA256 c8bc077f6077adca8ef6c3c0b8536a86b4d1ed3944c33e34c866f0edf71452db
+MISC metadata.xml 743 RMD160 61685a16eb9fd1ca552ab7e66d3fedc53065d07c SHA1 00c414231e86271bb71480b038cbc090910523af SHA256 a86f591c68a765a8f173de386303838b5f70422d1536bd3de8301217b9844ed9

diff --git a/www-client/opera/metadata.xml b/www-client/opera/metadata.xml
index 61783b2ac6db404c348cd4858a47db148cf901fe..16aaff0313566e61e77bffce819fef1671c1e836 100644 (file)
--- a/www-client/opera/metadata.xml
+++ b/www-client/opera/metadata.xml
@@ -13,5 +13,7 @@ Windows are also available.
 </longdescription>
 <use>
 <flag name='qt-static'>Install binaries statically linked to Qt</flag>
+<flag name='gtk'>Set runtime dependencies to support plugins, and supoort GNOME-like desktop integration</flag>
+<flag name='kde'>Set runtime dependencies to support KDE desktop integration</flag>
 </use>
 </pkgmetadata>

diff --git a/www-client/opera/opera-10.54_pre6336-r1.ebuild b/www-client/opera/opera-10.54_pre6336-r1.ebuild
index 4f881dd0930655293b19acc9bb454772016a6757..80272f033204b975e0fa92bd6fb69fb9a4573616 100644 (file)
--- a/www-client/opera/opera-10.54_pre6336-r1.ebuild
+++ b/www-client/opera/opera-10.54_pre6336-r1.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/opera/opera-10.54_pre6336-r1.ebuild,v 1.4 2010/05/20 03:00:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.54_pre6336-r1.ebuild,v 1.5 2010/05/20 12:13:10 jer Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.opera.com/"
 SLOT="0"
 LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gnome kde"
+IUSE="elibc_FreeBSD +gtk kde"
 
 RESTRICT="mirror test"
 
@@ -44,12 +44,13 @@ SRC_URI="
 DEPEND=">=sys-apps/sed-4"
 
 RDEPEND="
-       gnome? (
+       gtk? (
                =x11-libs/gtk+-2*
                dev-libs/atk
                dev-libs/glib
                media-libs/glitz
                media-libs/libpng
+               x11-libs/cairo
                x11-libs/pango
                x11-libs/pixman
        )
@@ -63,7 +64,6 @@ RDEPEND="
        sys-apps/util-linux
        sys-libs/zlib
        virtual/opengl
-       x11-libs/cairo
        x11-libs/libICE
        x11-libs/libSM
        x11-libs/libX11