~amd64

3 files changed, 29 insertions, 10 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index dc8e754c2685..c8cde8438d98 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/opera
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.54 2004/04/10 21:33:22 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.55 2004/04/13 18:30:48 kugelfang Exp $
+
+  13 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> opera-7.23-r1.ebuild,
+  opera-7.50_alpha3:
+  Minor changes to (r)depend for correct packages on amd64, amd64-specific
+  call of install.sh, marked ~amd64
 
   10 Apr 2004; Heinrich Wendel <lanius@gentoo.org> opera-7.50_alpha3.ebuild:
   exchange static !static, it was in the wrong order, bug #47377
diff --git a/net-www/opera/opera-7.23-r1.ebuild b/net-www/opera/opera-7.23-r1.ebuild
index 1dfefaac3a6a..4037380d41c6 100644
--- a/net-www/opera/opera-7.23-r1.ebuild
+++ b/net-www/opera/opera-7.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.23-r1.ebuild,v 1.5 2004/03/22 21:06:33 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.23-r1.ebuild,v 1.6 2004/04/13 18:30:48 kugelfang Exp $
 
 IUSE="static operanom2"
 
@@ -14,6 +14,8 @@ HOMEPAGE="http://www.opera.com/linux/"
 SRC_URI="
 	x86? ( static? ( ftp://ftp.opera.com/pub/opera/linux/723/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
 	x86? ( !static?	( ftp://ftp.opera.com/pub/opera/linux/723/final/en/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+	amd64? ( static? ( ftp://ftp.opera.com/pub/opera/linux/723/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+	amd64? ( !static? ( ftp://ftp.opera.com/pub/opera/linux/723/final/en/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
 	ppc? ( static? ( ftp://ftp.opera.com/pub/opera/linux/723/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 ) )
 	ppc? ( !static? ( ftp://ftp.opera.com/pub/opera/linux/723/final/en/ppc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 ) )
 	sparc? ( static?  ( ftp://ftp.opera.com/pub/opera/linux/723/final/en/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 ) )
@@ -21,16 +23,17 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="OPERA"
-KEYWORDS="x86 ~ppc sparc"
+KEYWORDS="x86 ~ppc sparc ~amd64"
 
 # Dependencies may be augmented later (see below).
-DEPEND=">=sys-apps/sed-4"
+DEPEND=">=sys-apps/sed-4
+	amd64? ( sys-apps/linux32 )"
 
 RDEPEND="virtual/x11
 	>=media-libs/fontconfig-2.1.94-r1
 	media-libs/libexif
 	x11-libs/openmotif
-	!static? ( =x11-libs/qt-3* )"
+	!static? ( amd64? ( =app-emulation/emul-linux-x86-qtlibs-1* ) : ( =x11-libs/qt-3* ) )"
 
 src_unpack() {
 	unpack ${A}
@@ -70,7 +73,11 @@ src_install() {
 	dodir /etc
 
 	# Opera's native installer.
-	./install.sh --prefix="${D}"/opt/opera || die
+	if [ ${ARCH} = "amd64" ]; then
+		linux32 ./install.sh --prefix="${D}"/opt/opera || die
+	else
+		./install.sh --prefix="${D}"/opt/opera || die
+	fi
 
 	rm ${D}/opt/opera/share/doc/opera/help
 	dosym /opt/share/doc/opera/help /opt/opera/share/opera/help
diff --git a/net-www/opera/opera-7.50_alpha3.ebuild b/net-www/opera/opera-7.50_alpha3.ebuild
index 4f3818a66370..c00a0be6de91 100644
--- a/net-www/opera/opera-7.50_alpha3.ebuild
+++ b/net-www/opera/opera-7.50_alpha3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.50_alpha3.ebuild,v 1.3 2004/04/10 21:33:22 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.50_alpha3.ebuild,v 1.4 2004/04/13 18:30:48 kugelfang Exp $
 
 IUSE="static"
 
@@ -15,19 +15,22 @@ HOMEPAGE="http://www.opera.com/linux/"
 SRC_URI="
 	x86? ( !static? ( http://snapshot.opera.com/unix/7.50-Preview-3/intel-linux/en/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
 	x86? ( static? ( http://snapshot.opera.com/unix/7.50-Preview-3/intel-linux/en/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+	amd64? ( !static? ( http://snapshot.opera.com/unix/7.50-Preview-3/intel-linux/en/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+	amd64? ( static? ( http://snapshot.opera.com/unix/7.50-Preview-3/intel-linux/en/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
 	ppc? ( !static? ( http://snapshot.opera.com/unix/7.50-Preview-3/ppc-linux/en/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 ) )
 	ppc? ( static? ( http://snapshot.opera.com/unix/7.50-Preview-3/ppc-linux/en/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 ) )
 	sparc? ( !static? ( http://snapshot.opera.com/unix/7.50-Preview-3/sparc-linux/en/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 )  )
 	sparc? ( static? ( http://snapshot.opera.com/unix/7.50-Preview-3/sparc-linux/en/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 ) )"
 
 # Dependencies may be augmented later (see below).
-DEPEND=">=sys-apps/sed-4"
+DEPEND=">=sys-apps/sed-4
+	amd64? ( sys-apps/linux32 )"
 
 RDEPEND="virtual/x11
 	>=media-libs/fontconfig-2.1.94-r1
 	media-libs/libexif
 	x11-libs/openmotif
-	!static? ( =x11-libs/qt-3* )"
+	!static? ( amd64? ( =app-emulation/emul-linux-x86-qtlibs-1* ) : ( =x11-libs/qt-3* ) )"
 
 SLOT="0"
 LICENSE="OPERA"
@@ -57,7 +60,11 @@ src_install() {
 	dodir /etc
 
 	# Opera's native installer.
-	./install.sh --prefix="${D}"/opt/opera || die
+	if [ ${ARCH} = "amd64" ]; then
+		linux32 ./install.sh --prefix="${D}"/opt/opera || die
+	else
+		./install.sh --prefix="${D}"/opt/opera || die
+	fi
 
 	rm ${D}/opt/opera/share/doc/opera/help
 	dosym /opt/share/doc/opera/help /opt/opera/share/opera/help