summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2011-11-08 19:31:19 +0000
committerJeroen Roovers <jer@gentoo.org>2011-11-08 19:31:19 +0000
commita822fad7e36915cebfecb9b7ed1e8254715eea08 (patch)
treec887a644b7023b533bca8b42542a6aed451baf1a /www-client/opera-next
parentVersion bump (diff)
downloadgentoo-2-a822fad7e36915cebfecb9b7ed1e8254715eea08.tar.gz
gentoo-2-a822fad7e36915cebfecb9b7ed1e8254715eea08.tar.bz2
gentoo-2-a822fad7e36915cebfecb9b7ed1e8254715eea08.zip
Add USE=gtk3. Add more runtime dependencies.
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'www-client/opera-next')
-rw-r--r--www-client/opera-next/ChangeLog6
-rw-r--r--www-client/opera-next/metadata.xml3
-rw-r--r--www-client/opera-next/opera-next-12.00.1116.ebuild15
3 files changed, 18 insertions, 6 deletions
diff --git a/www-client/opera-next/ChangeLog b/www-client/opera-next/ChangeLog
index 002de2b479fe..a1a94c7740d2 100644
--- a/www-client/opera-next/ChangeLog
+++ b/www-client/opera-next/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/opera-next
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.50 2011/11/04 16:56:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.51 2011/11/08 19:31:19 jer Exp $
+
+ 08 Nov 2011; Jeroen Roovers <jer@gentoo.org> opera-next-12.00.1116.ebuild,
+ metadata.xml:
+ Add USE=gtk3. Add more runtime dependencies.
04 Nov 2011; Jeroen Roovers <jer@gentoo.org> opera-next-12.00.1116.ebuild:
Add LD_PRELOAD hack to prevent operapluginwrapper from segfaulting when
diff --git a/www-client/opera-next/metadata.xml b/www-client/opera-next/metadata.xml
index 2ea8dbb80747..6f7d0ab7b26d 100644
--- a/www-client/opera-next/metadata.xml
+++ b/www-client/opera-next/metadata.xml
@@ -25,7 +25,8 @@ display in your primary Opera browser. This ensures that your valuable data and
settings remain untouched when you try out our latest changes.
</longdescription>
<use>
-<flag name='gtk'>Set runtime dependencies to support GTK+/GNOME desktop integration</flag>
+<flag name='gtk'>Set runtime dependencies to support GTK+/GNOME version 2 desktop integration</flag>
+<flag name='gtk3'>Set runtime dependencies to support GTK+/GNOME version 3 desktop integration</flag>
<flag name='kde'>Set runtime dependencies to support KDE desktop integration</flag>
</use>
</pkgmetadata>
diff --git a/www-client/opera-next/opera-next-12.00.1116.ebuild b/www-client/opera-next/opera-next-12.00.1116.ebuild
index f1a9ddfb4d18..fdbffd37c064 100644
--- a/www-client/opera-next/opera-next-12.00.1116.ebuild
+++ b/www-client/opera-next/opera-next-12.00.1116.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/opera-next/opera-next-12.00.1116.ebuild,v 1.2 2011/11/04 16:56:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1116.ebuild,v 1.3 2011/11/08 19:31:19 jer Exp $
EAPI="4"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.opera.com/"
SLOT="0"
LICENSE="OPERA-11 LGPL-2 LGPL-3"
KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk kde +gstreamer"
+IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer"
O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
O_B="$(get_version_component_range 3)" # Build version, i.e. 1156
@@ -49,7 +49,8 @@ GTKRDEPEND="
dev-libs/glib:2
x11-libs/cairo
x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
+ gtk? ( x11-libs/gtk+:2 )
+ gtk3? ( x11-libs/gtk+:3 )
x11-libs/pango
x11-libs/pixman
"
@@ -61,8 +62,9 @@ KDERDEPEND="
GSTRDEPEND="
dev-libs/glib
dev-libs/libxml2
- media-plugins/gst-plugins-meta
+ media-libs/gst-plugins-base
media-libs/gstreamer
+ media-plugins/gst-plugins-meta
"
RDEPEND="
media-libs/fontconfig
@@ -76,7 +78,9 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXft
x11-libs/libXrender
+ x11-libs/libXt
gtk? ( ${GTKRDEPEND} )
+ gtk3? ( ${GTKRDEPEND} )
kde? ( ${KDERDEPEND} )
gstreamer? ( ${GSTRDEPEND} )
"
@@ -132,6 +136,9 @@ src_prepare() {
if ! use gtk; then
rm lib/${PN}/liboperagtk2.so || die
fi
+ if ! use gtk3; then
+ rm lib/${PN}/liboperagtk3.so || die
+ fi
if ! use kde; then
rm lib/${PN}/liboperakde4.so || die
fi