summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2008-04-07 19:24:20 +0000
committerJeroen Roovers <jer@gentoo.org>2008-04-07 19:24:20 +0000
commitb164caf0c8b6a351142e354915ac3d29f3e3daaa (patch)
treed061315d4b7b4b5c6f9c2097fc06380174037aae /www-client
parentKeyworded on alpha, bug #215839 (diff)
downloadgentoo-2-b164caf0c8b6a351142e354915ac3d29f3e3daaa.tar.gz
gentoo-2-b164caf0c8b6a351142e354915ac3d29f3e3daaa.tar.bz2
gentoo-2-b164caf0c8b6a351142e354915ac3d29f3e3daaa.zip
SPARC and PPC always get qt-static versions. Sorted generic dependencies. Formatted dependency list.
(Portage version: 2.1.4.4)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/opera/ChangeLog6
-rw-r--r--www-client/opera/opera-9.27.ebuild32
2 files changed, 24 insertions, 14 deletions
diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index ea434663de07..20d86742ae14 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/opera
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.213 2008/04/07 16:52:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.214 2008/04/07 19:24:20 jer Exp $
+
+ 07 Apr 2008; Jeroen Roovers <jer@gentoo.org> opera-9.27.ebuild:
+ SPARC and PPC always get qt-static versions. Sorted generic dependencies.
+ Formatted dependency list.
07 Apr 2008; Jeroen Roovers <jer@gentoo.org> -opera-9.26.ebuild:
Remove vulnerable version (bug #216022).
diff --git a/www-client/opera/opera-9.27.ebuild b/www-client/opera/opera-9.27.ebuild
index 2d6b23dd820d..996ed9b33315 100644
--- a/www-client/opera/opera-9.27.ebuild
+++ b/www-client/opera/opera-9.27.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.27.ebuild,v 1.4 2008/04/07 16:46:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.27.ebuild,v 1.5 2008/04/07 19:24:20 jer Exp $
GCONF_DEBUG="no"
@@ -22,6 +22,10 @@ O_VER="9.27-20080331"
O_FTP="927/final/${O_LNG}"
O_URI="mirror://opera/"
+
+# qt-shared versions do not work on ppc or sparc so they always get the
+# qt-static version:
+
SRC_URI="
qt-static? (
amd64? ( ${O_URI}linux/${O_FTP}/i386/static/${PN}-${O_VER}.1-static-qt.i386-${O_LNG}.tar.bz2 )
@@ -32,8 +36,8 @@ SRC_URI="
)
!qt-static? (
amd64? ( ${O_URI}linux/${O_FTP}/i386/shared/${PN}-${O_VER}.6-shared-qt.i386-${O_LNG}.tar.bz2 )
- ppc? ( ${O_URI}linux/${O_FTP}/ppc/shared/gcc-2.95/${PN}-${O_VER}.6-shared-qt.ppc-${O_LNG}.tar.bz2 )
- sparc? ( ${O_URI}linux/${O_FTP}/sparc/shared/gcc-2.95/${PN}-${O_VER}.2-shared-qt.sparc-${O_LNG}.tar.bz2 )
+ ppc? ( ${O_URI}linux/${O_FTP}/ppc/static/${PN}-${O_VER}.1-static-qt.ppc-${O_LNG}.tar.bz2 )
+ sparc? ( ${O_URI}linux/${O_FTP}/sparc/static/${PN}-${O_VER}.1-static-qt.sparc-${O_LNG}.tar.bz2 )
x86? ( ${O_URI}linux/${O_FTP}/i386/shared/${PN}-${O_VER}.6-shared-qt.i386-${O_LNG}.tar.bz2 )
x86-fbsd? ( ${O_URI}unix/freebsd/${O_FTP}/shared/${PN}-${O_VER}.4-shared-qt.i386.freebsd-${O_LNG}.tar.bz2 )
)
@@ -41,16 +45,17 @@ SRC_URI="
DEPEND=">=sys-apps/sed-4"
-RDEPEND="x11-libs/libXrandr
- x11-libs/libXp
- x11-libs/libXmu
- x11-libs/libXi
- x11-libs/libXft
- x11-libs/libXext
- x11-libs/libXcursor
- x11-libs/libX11
- x11-libs/libSM
+RDEPEND="
x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXp
+ x11-libs/libXrandr
>=media-libs/fontconfig-2.1.94-r1
amd64? ( qt-static? ( app-emulation/emul-linux-x86-xlibs )
!qt-static? ( app-emulation/emul-linux-x86-qtlibs ) )
@@ -59,7 +64,8 @@ RDEPEND="x11-libs/libXrandr
x86? ( !qt-static? ( =x11-libs/qt-3* ) )
media-libs/jpeg )
x86-fbsd? ( =virtual/libstdc++-3*
- !qt-static? ( =x11-libs/qt-3* ) )"
+ !qt-static? ( =x11-libs/qt-3* ) )
+ "
S=${WORKDIR}/${A/.tar.bz2/}-${O_SUFF}