version bump, bug #61695

4 files changed, 142 insertions, 2 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index 2e3c8f91fa38..07d38687fdc1 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,11 @@
 # 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.80 2004/08/17 13:36:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.81 2004/08/26 09:34:23 lanius Exp $
+
+*opera-7.60_alpha1 (26 Aug 2004)
+
+  26 Aug 2004; Heinrich Wendel <lanius@gentoo.org> +opera-7.60_alpha1.ebuild:
+  version bump, bug #61695
 
   17 Aug 2004; Aron Griffis <agriffis@gentoo.org> opera-7.54.ebuild:
   Fix USE test in RDEPEND.  Should be !amd64? instead of plain !amd64
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index 4a9cc000270a..d5fe557e40f3 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,11 +1,13 @@
 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 cd249990f379eb0cb4ef6e083c75c4e6 ChangeLog 12932
+MD5 8e3724085d56e4f89cc1682e6cd21e81 ChangeLog 13070
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
 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 8336a92d029cd448620bf4bbd4c55715 files/opera.desktop 135
diff --git a/net-www/opera/files/digest-opera-7.60_alpha1 b/net-www/opera/files/digest-opera-7.60_alpha1
new file mode 100644
index 000000000000..0972125df028
--- /dev/null
+++ b/net-www/opera/files/digest-opera-7.60_alpha1
@@ -0,0 +1,4 @@
+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/opera-7.60_alpha1.ebuild b/net-www/opera/opera-7.60_alpha1.ebuild
new file mode 100644
index 000000000000..58e02a2bff1d
--- /dev/null
+++ b/net-www/opera/opera-7.60_alpha1.ebuild
@@ -0,0 +1,129 @@
+# 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 $
+
+IUSE="static spell"
+
+OPERAVER="7.60-20040824"
+OPERAFTPDIR="7.60-Preview-1"
+
+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? ( 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 ) )"
+
+# 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 )
+
+# 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 ) )
+
+# sparc shared version does not work for me as it uses gcc-2.95 - eradicator
+#	sparc? ( static?  ( mirror://opera/linux/${OPERAFTPDIR}/final/en/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 ) )
+#	sparc? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/sparc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )"
+
+
+# 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
+	spell? ( app-text/aspell )
+	amd64? ( app-emulation/emul-linux-x86-xlibs )
+	!amd64? ( !sparc? ( !static? ( =x11-libs/qt-3* ) ) )"
+
+#	static? (
+#		amd64? ( app-emulation/emul-linux-x86-xlibs ) )
+#	!static? (
+#		amd64? ( =app-emulation/emul-linux-x86-qtlibs-1* )
+#		!amd64? ( =x11-libs/qt-3* ) )
+
+SLOT="0"
+LICENSE="OPERA"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":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:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
+	       -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
+		   -e 's:read str_answer:return 0:' \
+		   -e "s:/opt/kde:${D}/usr/kde:" \
+	       install.sh || die
+}
+
+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
+
+	# java workaround
+	sed -i -e 's:LD_PRELOAD="${OPERA_JAVA_DIR}/libawt.so":LD_PRELOAD="$LD_PRELOAD"\:"${OPERA_JAVA_DIR}/libawt.so":' ${D}/opt/opera/bin/opera
+
+	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
+
+	# fix plugin path
+	echo "Plugin Path=/opt/opera/lib/opera/plugins" >> ${D}/etc/opera6rc
+
+	# enable spellcheck
+	if use spell; then
+		if use static; then
+			DIR=$OPERAVER.1
+		else
+			use sparc && DIR=$OPERAVER.2 || DIR=$OPERAVER.5
+		fi
+		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> ${D}/opt/opera/share/opera/ini/spellcheck.ini
+	fi
+}
+
+pkg_postinst() {
+	einfo "For localized language files take a look at:"
+	einfo "http://www.opera.com/download/languagefiles/index.dml?platform=linux"
+	einfo
+	einfo "To change the spellcheck language edit /opt/opera/share/opera/ini/spellcheck.ini"
+	einfo "and emerge app-text/aspell-language."
+}