From d3a0051a665581a77803b872b1c04c8c7ed886a0 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Tue, 8 Nov 2011 19:31:19 +0000 Subject: [PATCH] Add USE=gtk3. Add more runtime dependencies. Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64 --- www-client/opera-next/ChangeLog | 6 +++++- www-client/opera-next/Manifest | 12 ++++++------ www-client/opera-next/metadata.xml | 3 ++- .../opera-next/opera-next-12.00.1116.ebuild | 15 +++++++++++---- 4 files changed, 24 insertions(+), 12 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 opera-next-12.00.1116.ebuild, + metadata.xml: + Add USE=gtk3. Add more runtime dependencies. 04 Nov 2011; Jeroen Roovers opera-next-12.00.1116.ebuild: Add LD_PRELOAD hack to prevent operapluginwrapper from segfaulting when diff --git a/www-client/opera-next/Manifest b/www-client/opera-next/Manifest index ebcd76f5ad19..3e56c3a48c57 100644 --- a/www-client/opera-next/Manifest +++ b/www-client/opera-next/Manifest @@ -32,13 +32,13 @@ EBUILD opera-next-12.00.1076.ebuild 5864 RMD160 765d6b2afd37a7fb8b7d9047b3453b0d EBUILD opera-next-12.00.1085.ebuild 5862 RMD160 1f40fad9ca05f95ef9ff8cfe18c58b4af55ca916 SHA1 a62fc19545637ef3f1d6001fe2c69fd06fa32982 SHA256 5ece8d7350b20a2d86104452bd69876980593edd2f761c8d8cc940e7cfaef19b EBUILD opera-next-12.00.1090.ebuild 5866 RMD160 a4cc520bcf5acae6f55876beecdad1208d5d1db2 SHA1 4623c2f0efdbeda20d2a953969400e88ce699577 SHA256 b07ede6e0646c899fb338503dd7be0620aaafc28ca39d2a56cfd280228bbf6e4 EBUILD opera-next-12.00.1105.ebuild 5715 RMD160 1d2f6d5278c91914f474df9325d9df691ec5520f SHA1 59eb0f0fd6ec57cce43efbeceea1550e7508e791 SHA256 7dbe17f3c7ad109b55e5a19104fcd1710f51783bddff4578f27968cb83e92e5b -EBUILD opera-next-12.00.1116.ebuild 5795 RMD160 2a7e31e7e1938a54ff1727513115222d35337cf1 SHA1 85b20726b5d8382445de5d6cfc01e7d2ee8c29e0 SHA256 7f973d98237f7ed3ef12722f131315f8d8af86b7cbc33ea6a623ffce9d011ead -MISC ChangeLog 10114 RMD160 627f807c5fc498255a2dc6e7b71c26732a266ca0 SHA1 a97214f7f3ee6ce718188209eb915c788fc57da5 SHA256 f77a6f5187910c4bc8d03154254a0d35e67a652a98ac184b7bb88fdae6e4a5e3 -MISC metadata.xml 1526 RMD160 0148fe23f26a0425e8cae068363e59fa36af7db5 SHA1 5153ce9757f7e664f6b6e52fd952441394620ee4 SHA256 ae8acdaecc24fd0c49c3eea1169613b531810f243e3488408d1e3100ec93c7bc +EBUILD opera-next-12.00.1116.ebuild 5969 RMD160 a7771bffd18ed049835a013fbfbc66eaf35b0144 SHA1 616206c462587780be822d54ea371c4a0f889c11 SHA256 d053c2664f3a7869a13a373f53e9263d61c24b20e85b501a945c61325eaffac8 +MISC ChangeLog 10255 RMD160 d7750d3dc37d8f5838203dfe06a6543c19aec538 SHA1 5f990e88229977bbfeec618bcd281b4fc8247d36 SHA256 638a843a25594a1722be66e5c2fbbafc1335fb11dfa66f3679926a569d7e6d69 +MISC metadata.xml 1638 RMD160 17ef00f7f0515dd445244bda48ddb4f3a8829597 SHA1 32894ca5e0efb115e4f98f27e46f547199e3dd74 SHA256 1479bc1f748e8186b8141d8a0eb7d45930c67f3fafd746527215e2ef1070be8a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk60GTAACgkQVWmRsqeSphO19gCeKYgSn+11kgkSwAvXxgwU4ZNR -8ZkAmgIrpEqYGwY0XOblslYa8hay6XsB -=FHzk +iEYEARECAAYFAk65g40ACgkQVWmRsqeSphNTWQCffDKG+OXHA63kCU5lJtV0x9cN +I6gAniy2L5yx7XBE6VVTxaerRr+5XGVI +=jMEn -----END PGP SIGNATURE----- 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. -Set runtime dependencies to support GTK+/GNOME desktop integration +Set runtime dependencies to support GTK+/GNOME version 2 desktop integration +Set runtime dependencies to support GTK+/GNOME version 3 desktop integration Set runtime dependencies to support KDE desktop integration 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 -- 2.26.2