Do more multilib stuff (bug #318725). Split RDEPENDs according to toolkit/desktop...

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

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 208cc66692acaf6126732d20a283cd18459ce69c..ed3391279c7e4259db2551ef668a7787e36c4336 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.476 2010/05/18 15:59:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.477 2010/05/20 02:56:07 jer Exp $
+
+  20 May 2010; Jeroen Roovers <jer@gentoo.org>
+  opera-10.54_pre6336-r1.ebuild:
+  Do more multilib stuff (bug #318725). Split RDEPENDs according to
+  toolkit/desktop environment of choice (bug #320513).
 
   18 May 2010; Jeroen Roovers <jer@gentoo.org>
   opera-10.53_pre6330-r1.ebuild, opera-10.54_pre6336-r1.ebuild, files/opera:

diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index b75f6545a4c21ddded1b5a54599a69856d85420e..7641ce5bd7a8416754b220b7c34f014437bb7498 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 4598 RMD160 f5df8035255257a54d6197453f654f23581c7563 SHA1 cdbc5be16751f7a58922e00e5e03460307b5e706 SHA256 f75cf53297c66c511ba5e8a604dd9d92f0371263961c8426394438022d12623d
-MISC ChangeLog 92412 RMD160 38392c7e1baf3291556ea9dc14dfab5a537bff2c SHA1 79f8c7511c8be1f9ccfe647f1211aaf12bb668f1 SHA256 940345d8f4e01208da07b552e459d5d4b4b65d10108583b71b3d1885a9ff6ff5
+EBUILD opera-10.54_pre6336-r1.ebuild 4696 RMD160 5981a61f042266b9cfc79294a56a010e303da431 SHA1 479436f970fb5d60ba4eb8c6a3349f2c22c458e4 SHA256 48c29b3dba7cfc8efc208a297dbaff2c41e518c04f5c55943b84e2b1025bfb3c
+MISC ChangeLog 92616 RMD160 7b967ced05bf255d1d875128e42b1ef66a321902 SHA1 99192e9f5005fafcc48a7d7c934f0de3b3b275b7 SHA256 ae756824ba089aef8da139077f1553a8568d0cbc27e2809fee7ef577d36b85c7
 MISC metadata.xml 547 RMD160 dabb86bc4db85881b0ce910ac05e63d16342e787 SHA1 9acc7ec7a62017ed7c9acfca301a3ea75e4e88d9 SHA256 9f70a9db124893d6a56a40615dbe8cccd015b836067d570a9638a9bd9ec6217a

diff --git a/www-client/opera/opera-10.54_pre6336-r1.ebuild b/www-client/opera/opera-10.54_pre6336-r1.ebuild
index 76fc4bcff719106a818bc841ce743194af650840..6b933b8cd3479593ba8fa8d7b3665f6c1e0cd934 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.2 2010/05/18 15:59:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.54_pre6336-r1.ebuild,v 1.3 2010/05/20 02:56:07 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"
+IUSE="elibc_FreeBSD gtk kde"
 
 RESTRICT="mirror test"
 
@@ -44,15 +44,22 @@ SRC_URI="
 DEPEND=">=sys-apps/sed-4"
 
 RDEPEND="
-       =x11-libs/gtk+-2*
-       dev-libs/atk
+       gtk? (
+               =x11-libs/gtk+-2*
+               dev-libs/atk
+               dev-libs/glib
+               media-libs/glitz
+               media-libs/libpng
+               x11-libs/pango
+               x11-libs/pixman
+       )
+       kde? (
+               kde-base/kdelibs
+       )
        dev-libs/expat
-       dev-libs/glib
        media-libs/fontconfig
        media-libs/freetype
-       media-libs/glitz
        media-plugins/gst-plugins-meta
-       media-libs/libpng
        sys-apps/util-linux
        sys-libs/zlib
        virtual/opengl
@@ -73,8 +80,6 @@ RDEPEND="
        x11-libs/libXrender
        x11-libs/libXt
        x11-libs/libxcb
-       x11-libs/pango
-       x11-libs/pixman
        x11-libs/xcb-util
        "
 
@@ -116,7 +121,8 @@ src_install() {
 
        # We install into usr instead of opt as Opera does not support the latter
        dodir /usr
-       mv lib/ share/ "${D}"/usr/ || die "mv lib/ share/ failed"
+       mv lib/  "${D}/${OPREFIX}" || die "mv lib/ failed"
+       mv share/ "${D}/usr/" || die "mv share/ failed"
 
        # Unzip the man pages before sedding
        gunzip "${D}"/usr/share/man/man1/* || die "gunzip failed"