diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2010-05-20 02:56:07 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2010-05-20 02:56:07 +0000 |
| commit | 37a2d8b89bac1ef5149d55c7e83091cd07329ea8 (patch) | |
| tree | e56d537cab3d812ccc07a56b9204791ac5995e66 /www-client | |
| parent | QA: Fix SRC_URI (diff) | |
| download | gentoo-2-37a2d8b89bac1ef5149d55c7e83091cd07329ea8.tar.gz gentoo-2-37a2d8b89bac1ef5149d55c7e83091cd07329ea8.tar.bz2 gentoo-2-37a2d8b89bac1ef5149d55c7e83091cd07329ea8.zip | |
Do more multilib stuff (bug #318725). Split RDEPENDs according to toolkit/desktop environment of choice (bug #320513).
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/opera/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/opera/opera-10.54_pre6336-r1.ebuild | 26 |
2 files changed, 22 insertions, 11 deletions
diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index 208cc66692ac..ed3391279c7e 100644 --- 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/opera-10.54_pre6336-r1.ebuild b/www-client/opera/opera-10.54_pre6336-r1.ebuild index 76fc4bcff719..6b933b8cd347 100644 --- 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" |