remove old versions; remove ppc shared version, it's built with gcc-2.95; bump to 7.60_alpha2

11 files changed, 28 insertions, 366 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index 07d38687fdc1..2a4d2bc40270 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/opera
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.81 2004/08/26 09:34:23 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.82 2004/10/26 17:59:30 lanius Exp $
+
+*opera-7.60_alpha2 (26 Oct 2004)
+
+  26 Oct 2004; <heino@gentoo.org> -opera-6.12.ebuild, -opera-7.11-r2.ebuild,
+  -opera-7.23-r1.ebuild, opera-7.54.ebuild, -opera-7.60_alpha1.ebuild,
+  +opera-7.60_alpha2.ebuild:
+  remove old versions; remove ppc shared version, it's built with gcc-2.95; bump
+  to 7.60_alpha
 
 *opera-7.60_alpha1 (26 Aug 2004)
 
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index d5fe557e40f3..3ffe3e3d29f3 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,13 +1,7 @@
-MD5 6bc54e68ebc4efff54d13094f092b6d5 opera-6.12.ebuild 3304
-MD5 c61bf5e3f147ebf6cbf1145849426ed4 opera-7.54.ebuild 4729
-MD5 989e7644163370c448b8c897a3cea327 opera-7.60_alpha1.ebuild 4663
-MD5 85383966c3542de9c8fb14f62be9b1b1 opera-7.23-r1.ebuild 3842
-MD5 e98a0549d46aadd78a43ba042539b497 opera-7.11-r2.ebuild 3670
-MD5 8e3724085d56e4f89cc1682e6cd21e81 ChangeLog 13070
+MD5 fe11763302728a8146c30c11ee88d0fd opera-7.54.ebuild 4905
+MD5 41528373d0d87004aa0924cde729b122 ChangeLog 13379
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
+MD5 b9a23a2218a45459f742276e0613422d opera-7.60_alpha2.ebuild 4807
 MD5 d5cf5836cd16a60b5103d4f43e83878d files/digest-opera-7.54 464
-MD5 cdbc7384c5701f01340c0361f35a7892 files/digest-opera-7.60_alpha1 370
-MD5 fd6b6eba741abd18ba590e9a5c0f225f files/digest-opera-7.11-r2 177
-MD5 9a8a982857424445242430340a70783c files/digest-opera-7.23-r1 558
+MD5 c3ee613bd8db50b95750e07d5f4ac62e files/digest-opera-7.60_alpha2 93
 MD5 8336a92d029cd448620bf4bbd4c55715 files/opera.desktop 135
diff --git a/net-www/opera/files/digest-opera-7.11-r2 b/net-www/opera/files/digest-opera-7.11-r2
deleted file mode 100644
index b087549d8c1c..000000000000
--- a/net-www/opera/files/digest-opera-7.11-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 686c2cee50abe4733e090ce787364105 opera-7.11-20030515.1-static-qt.ppc.tar.gz 5262293
-MD5 13be929a22777c2a8e65d592514f49e0 opera-7.11-20030515.1-static-qt.i386.tar.gz 5298426
diff --git a/net-www/opera/files/digest-opera-7.23-r1 b/net-www/opera/files/digest-opera-7.23-r1
deleted file mode 100644
index 891ebc4b47a5..000000000000
--- a/net-www/opera/files/digest-opera-7.23-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f3d22181a3016896b9bcc2c71afb28f7 opera-7.23-20031119.1-static-qt.i386-en.tar.bz2 4800860
-MD5 d9104ca2c582d0a5037ecc1b2841f2bb opera-7.23-20031119.5-shared-qt.i386-en.tar.bz2 3662307
-MD5 b77f3639b2ca2991258f19da90cb76d9 opera-7.23-20031119.1-static-qt.ppc-en.tar.bz2 4877536
-MD5 ea63173a19e7c6aa34dad69b44bc3a2f opera-7.23-20031119.2-shared-qt.ppc-en.tar.bz2 3567349
-MD5 749d895c4bd40e7f034a1b85adbdac75 opera-7.23-20031119.1-static-qt.sparc-en.tar.bz2 4808431
-MD5 0e62176847f55f16b813c9c8f467d2e1 opera-7.23-20031119.2-shared-qt.sparc-en.tar.bz2 3522234
diff --git a/net-www/opera/files/digest-opera-7.60_alpha1 b/net-www/opera/files/digest-opera-7.60_alpha1
deleted file mode 100644
index 0972125df028..000000000000
--- a/net-www/opera/files/digest-opera-7.60_alpha1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 ccd03a2a08e8ab4e8cb84fc6eee50bae opera-7.60-20040824.1-static-qt.i386-en.tar.bz2 5699838
-MD5 da4df3c5d65057eac4e063b4359fafa6 opera-7.60-20040824.5-shared-qt.i386-en.tar.bz2 4263818
-MD5 5f1728ce48d56f5c37e931afa2326026 opera-7.60-20040824.1-static-qt.ppc-en.tar.bz2 5824279
-MD5 6496d9871a2ca7337377ed3ecc298559 opera-7.60-20040824.2-shared-qt.ppc-en.tar.bz2 4327203
diff --git a/net-www/opera/files/digest-opera-7.60_alpha2 b/net-www/opera/files/digest-opera-7.60_alpha2
new file mode 100644
index 000000000000..f3db2dac5049
--- /dev/null
+++ b/net-www/opera/files/digest-opera-7.60_alpha2
@@ -0,0 +1 @@
+MD5 a7938217483f89de6ad7c43ca4e13fb4 opera-7.60-20041026.5-shared-qt.i386-en.tar.bz2 4347153
diff --git a/net-www/opera/opera-6.12.ebuild b/net-www/opera/opera-6.12.ebuild
deleted file mode 100644
index f4b1f44d9df6..000000000000
--- a/net-www/opera/opera-6.12.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-6.12.ebuild,v 1.7 2004/06/25 15:45:13 agriffis Exp $
-#
-# 1. static       # Statically linked libraries, default.
-# 2. shared-2.95  # Dynamically linked libaries, compiled with gcc 2.95.
-# 3. shared-3.2	  # Dynamically linked libraries, compiled with gcc 3.2.
-#
-# Note that the default variant should work for everybody, and is the
-# least likely to cause you any grief.	Only change the variant if you
-# know what you are doing.
-
-DESCRIPTION="Opera web browser."
-HOMEPAGE="http://www.opera.com/linux/"
-IUSE="gnome kde"
-
-# Dependencies may be augmented later (see below).
-RDEPEND="virtual/x11
-	x11-libs/openmotif" #lesstif resolves Bug 25767
-
-SLOT="0"
-LICENSE="OPERA"
-KEYWORDS="-* x86"
-
-#we can't modify (R)DEPEND info inside an if statement; that breaks metadata caching.
-#So I'm hard-coding the static version to be enabled.
-
-OPERA_VARIANT="static"
-
-if [ "$OPERA_VARIANT" = "shared-3.2" ]; then
-	    RDEPEND="${RDEPEND} =x11-libs/qt-3*"
-	    OPERA_VERSION="4-shared-qt"
-	    URL_DIR="shared/gcc-3.2/"
-elif [ "$OPERA_VARIANT" = "shared-2.95" ]; then
-	    RDEPEND="${RDEPEND} =x11-libs/qt-3*"
-	    OPERA_VERSION="2-shared-qt"
-	    URL_DIR="shared/gcc-2.95/"
-else
-	    OPERA_VERSION="1-static-qt"
-	    URL_DIR="static/"
-fi
-
-NV=6.12-20030305.${OPERA_VERSION}.i386
-SRC_URI="http://www.panix.com/opera/files/linux/612/final/en/i386/${URL_DIR}/opera-${NV}.tar.gz"
-S=${WORKDIR}/opera-${NV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -e "s:/etc:${D}/etc:g" \
-	    -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
-	    -e "s:read install_config:install_config=yes:" \
-	    -e "s:/opt/kde2:${D}/usr/kde/2:g" \
-	    -e "s:/opt/kde2:${D}/usr/kde/2:g" \
-	    -e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \
-	    -e "s:/usr/share/pixmaps:${D}/usr/share/pixmaps:g" \
-	    -e "s:/usr/share/icons:${D}/usr/share/icons:g" \
-	    -e "s:/etc/X11:${D}/etc/X11:g" \
-	    -e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
-	    -e 's:#\(LD_PRELOAD=.*libawt.so\):\1:' \
-	    -e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-	    -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-	    < install.sh >install.sh.hacked || die
-	mv install.sh.hacked install.sh
-	chmod +x install.sh
-
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-	if use kde
-	then
-		# Install stuff for KDE2, and then simply copy it over
-		# into the KDE3 directories.
-		dodir /usr/kde/2/share/icons/{locolor,hicolor}/{16x16,22x22,32x32,48x48}/apps
-		dodir /usr/kde/2/share/applnk/Internet
-	fi
-	if use gnome
-	then
-		dodir /usr/share/gnome/pixmaps
-		dodir /usr/share/gnome/apps/Internet
-	fi
-
-	# Opera's native installer.
-	./install.sh --prefix="${D}"/opt/opera || die
-	if use kde
-	then
-		cp -R ${D}/usr/kde/2 ${D}/usr/kde/3
-	fi
-	rm ${D}/opt/opera/share/doc/opera/help
-	dosym /opt/share/doc/opera/help /opt/opera/share/opera/help
-
-	dosed /opt/opera/bin/opera
-	dosed /opt/opera/share/opera/java/opera.policy
-
-	# Install the icons
-	insinto /usr/share/icons /etc/X11/wmconfig /etc/X11/applnk/Internet \
-		/usr/share/pixmaps
-	doins images/opera.xpm
-
-	# Install a symlink /usr/bin/opera
-	dodir /usr/bin
-	dosym /opt/opera/bin/opera /usr/bin/opera
-}
diff --git a/net-www/opera/opera-7.11-r2.ebuild b/net-www/opera/opera-7.11-r2.ebuild
deleted file mode 100644
index 7eb3e17e7f0f..000000000000
--- a/net-www/opera/opera-7.11-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.11-r2.ebuild,v 1.8 2004/06/25 15:45:13 agriffis Exp $
-#
-# 1. static       # Statically linked libraries, default.
-# 2. shared-2.95  # Dynamically linked libaries, compiled with gcc 2.95.
-# 3. shared-3.2	  # Dynamically linked libraries, compiled with gcc 3.2.
-#
-# Note that the default variant should work for everybody, and is the
-# least likely to cause you any grief.	Only change the variant if you
-# know what you are doing.
-#
-# Note 2: The OPERA_VARIANT mechanism is currently not working (everybody gets
-# the default variant).
-
-DESCRIPTION="Opera web browser."
-HOMEPAGE="http://www.opera.com/linux/"
-LICENSE="OPERA"
-IUSE="gnome kde"
-
-# Dependencies may be augmented later (see below).
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="virtual/x11
-	>=media-libs/fontconfig-2.1.94-r1
-	x11-libs/openmotif" #lesstif resolves Bug 25767
-
-KEYWORDS="x86 ~ppc" #please test on x86
-SLOT="0"
-
-#we can't modify (R)DEPEND info inside an if statement; that breaks metadata caching.
-#So I'm hard-coding the static version to be enabled.
-
-OPERA_VARIANT="static"
-
-if [ "$OPERA_VARIANT" = "shared-3.2" ]; then
-	    RDEPEND="${RDEPEND} =x11-libs/qt-3*"
-	    OPERA_VERSION="4-shared-qt"
-	    URL_DIR="shared/gcc-3.2/"
-elif [ "$OPERA_VARIANT" = "shared-2.95" ]; then
-	    RDEPEND="${RDEPEND} =x11-libs/qt-3*"
-	    OPERA_VERSION="2-shared-qt"
-	    URL_DIR="shared/gcc-2.95/"
-else
-	    OPERA_VERSION="1-static-qt"
-	    URL_DIR="static/"
-fi
-
-NV=7.11-20030515.${OPERA_VERSION}
-
-OPERA_URI="http://ftp.sunet.se/pub/www/browsers/Opera/linux/711/final/en"
-
-SRC_URI="ppc? ( ${OPERA_URI}/ppc/${URL_DIR}/opera-${NV}.ppc.tar.gz )"
-SRC_URI="${SRC_URI} x86? ( ${OPERA_URI}/i386/${URL_DIR}/opera-${NV}.i386.tar.gz )"
-
-S=${WORKDIR}/opera-${NV}.i386
-
-if use ppc
-then
-	S=${WORKDIR}/opera-${NV}.ppc
-fi
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e "s:/etc:${D}/etc:g" \
-	       -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
-	       -e "s:read install_config:install_config=yes:" \
-	       -e "s:/opt/kde2:${D}/usr/kde/2:g" \
-	       -e "s:/opt/kde2:${D}/usr/kde/2:g" \
-	       -e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \
-	       -e "s:/usr/share/pixmaps:${D}/usr/share/pixmaps:g" \
-	       -e "s:/usr/share/icons:${D}/usr/share/icons:g" \
-	       -e "s:/etc/X11:${D}/etc/X11:g" \
-	       -e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
-	       -e 's:#\(LD_PRELOAD=.*libawt.so\):\1:' \
-	       -e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-	       -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-	       install.sh || die
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-	if use kde
-	then
-		# Install stuff for KDE2, and then simply copy it over
-		# into the KDE3 directories.
-		dodir /usr/kde/2/share/icons/{locolor,hicolor}/{16x16,22x22,32x32,48x48}/apps
-		dodir /usr/kde/2/share/applnk/Internet
-	fi
-	if use gnome
-	then
-		dodir /usr/share/gnome/pixmaps
-		dodir /usr/share/gnome/apps/Internet
-	fi
-
-	# Opera's native installer.
-	./install.sh --prefix="${D}"/opt/opera || die
-	if use kde
-	then
-		cp -R ${D}/usr/kde/2 ${D}/usr/kde/3
-	fi
-	rm ${D}/opt/opera/share/doc/opera/help
-	dosym /opt/share/doc/opera/help /opt/opera/share/opera/help
-
-	dosed /opt/opera/bin/opera
-	dosed /opt/opera/share/opera/java/opera.policy
-
-	# Install the icons
-	insinto /usr/share/icons /etc/X11/wmconfig /etc/X11/applnk/Internet \
-		/usr/share/pixmaps
-	doins images/opera.xpm
-
-	# Install a symlink /usr/bin/opera
-	dodir /usr/bin
-	dosym /opt/opera/bin/opera /usr/bin/opera
-}
diff --git a/net-www/opera/opera-7.23-r1.ebuild b/net-www/opera/opera-7.23-r1.ebuild
deleted file mode 100644
index 5c6cd5a81907..000000000000
--- a/net-www/opera/opera-7.23-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.9 2004/06/25 15:45:13 agriffis Exp $
-
-IUSE="static operanom2"
-
-OPERAVER="7.23-20031119"
-
-S=${WORKDIR}/${A/.tar.bz2/}
-DESCRIPTION="Opera web browser."
-HOMEPAGE="http://www.opera.com/linux/"
-
-# that's an ugly workaround for the broken src_uri syntax
-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 ) )
-	sparc? ( !static? ( ftp://ftp.opera.com/pub/opera/linux/723/final/en/sparc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )"
-
-SLOT="0"
-LICENSE="OPERA"
-KEYWORDS="x86 ~ppc sparc ~amd64"
-
-# Dependencies may be augmented later (see below).
-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? (
-		amd64? ( =app-emulation/emul-linux-x86-qtlibs-1* )
-		!amd64? ( =x11-libs/qt-3* ) )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e "s:/etc:${D}/etc:g" \
-	       -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
-	       -e "s:read install_config:install_config=yes:" \
-	       -e "s:/opt/kde2:${D}/usr/kde/2:g" \
-	       -e "s:/opt/kde2:${D}/usr/kde/2:g" \
-	       -e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \
-	       -e "s:/usr/share/pixmaps:${D}/usr/share/pixmaps:g" \
-	       -e "s:/usr/share/icons:${D}/usr/share/icons:g" \
-	       -e "s:/etc/X11:${D}/etc/X11:g" \
-	       -e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
-	       -e 's:#\(LD_PRELOAD=.*libawt.so\):\1:' \
-	       -e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-	       -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-		   -e 's:chop "${DESTDIR}" "str_localdirexec"::' \
-		   -e 's:chop "${DESTDIR}" "str_localdirshare"::' \
-		   -e 's:chop "${DESTDIR}" "str_localdirplugin"::' \
-		   -e 's:read str_answer:return 0:' \
-	       install.sh || die
-
-	# Make mail and irc support optional
-	if use operanom2; then
-		einfo "Removing mail and chat support"
-		rm -f ${S}/lib/m2.so
-	fi
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-
-	# Opera's native installer.
-	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
-
-	dosed /opt/opera/bin/opera
-	dosed /opt/opera/share/opera/java/opera.policy
-
-	# Install the icons
-	insinto /usr/share/pixmaps
-	doins images/opera.xpm
-
-	# Install the menu entry
-	insinto /usr/share/applications
-	doins ${FILESDIR}/opera.desktop
-
-	# Install a symlink /usr/bin/opera
-	dodir /usr/bin
-	dosym /opt/opera/bin/opera /usr/bin/opera
-}
-
-pkg_postinst() {
-	einfo "For localized language files take a look at:"
-	einfo "http://www.opera.com/download/languagefiles/index.dml?platform=linux"
-}
diff --git a/net-www/opera/opera-7.54.ebuild b/net-www/opera/opera-7.54.ebuild
index 4ab9c06bbeca..656c49f2556e 100644
--- a/net-www/opera/opera-7.54.ebuild
+++ b/net-www/opera/opera-7.54.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.54.ebuild,v 1.4 2004/08/17 13:36:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.54.ebuild,v 1.5 2004/10/26 17:59:30 lanius Exp $
 
 IUSE="static spell"
 
@@ -17,10 +17,13 @@ SRC_URI="
 	x86? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
 	x86? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
 	amd64? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 )
-	ppc? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 ) )
-	ppc? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 ) )
+	ppc? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )
 	sparc? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )"
 
+# ppc shared version does not work as it uses gcc-2.95 - lanius
+#	ppc? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 ) )
+#	ppc? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 ) )
+
 # amd64 shared libs require app-emulation/emul-linux-x86-qtlibs-1 which is not stable yet
 #	amd64? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
 #	amd64? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
diff --git a/net-www/opera/opera-7.60_alpha1.ebuild b/net-www/opera/opera-7.60_alpha2.ebuild
index 58e02a2bff1d..3278ef9aebca 100644
--- a/net-www/opera/opera-7.60_alpha1.ebuild
+++ b/net-www/opera/opera-7.60_alpha2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.60_alpha1.ebuild,v 1.1 2004/08/26 09:34:23 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.60_alpha2.ebuild,v 1.1 2004/10/26 17:59:30 lanius Exp $
 
 IUSE="static spell"
 
-OPERAVER="7.60-20040824"
-OPERAFTPDIR="7.60-Preview-1"
+OPERAVER="7.60-20041026"
+OPERAFTPDIR="7.60-Preview-2"
 
 S=${WORKDIR}/${A/.tar.bz2/}
 
@@ -17,11 +17,12 @@ SRC_URI="
 	x86? ( static? ( http://snapshot.opera.com/unix/${OPERAFTPDIR}/intel-linux/en/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
 	x86? ( !static? ( http://snapshot.opera.com/unix/${OPERAFTPDIR}/intel-linux/en/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
 	amd64? ( http://snapshot.opera.com/unix/${OPERAFTPDIR}/intel-linux/en/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 )
-	ppc? ( static? ( http://snapshot.opera.com/unix/${OPERAFTPDIR}/ppc-linux/en/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 ) )
-	ppc? ( !static? ( http://snapshot.opera.com/unix/${OPERAFTPDIR}/ppc-linux/en/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 ) )"
+	ppc? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )
+	sparc? ( http://snapshot.opera.com/unix/${OPERAFTPDIR}/intel-linux/en//${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )"
 
-# no sparc version in this release
-#	sparc? ( http://snapshot.opera.com/unix/${OPERAFTPDIR}/intel-linux/en//${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )
+# ppc shared version does not work as it uses gcc-2.95 - lanius
+#	ppc? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 ) )
+#	ppc? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 ) )
 
 # amd64 shared libs require app-emulation/emul-linux-x86-qtlibs-1 which is not stable yet
 #	amd64? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )