bump

7 files changed, 24 insertions, 110 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index 589a551a6efd..288490cc78b4 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/opera
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.37 2003/10/11 20:18:39 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.38 2003/10/17 10:16:51 lanius Exp $
+
+*opera-7.21_pre1 (17 Oct 2003)
+
+  17 Oct 2003; Heinrich Wendel <lanius@gentoo.org> opera-7.21.ebuild,
+  opera-7.21_pre1.ebuild, opera-7.21_pre2.ebuild:
+  version bump, motif cleanups
 
   11 Oct 2003; Heinrich Wendel <lanius@gentoo.org> opera-7.21_pre2.ebuild:
   bug #10610
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index 9e6ca2e99499..843f6375513f 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,6 +1,6 @@
-MD5 fd01439fee60be686a6cc5b81af5097b ChangeLog 6659
+MD5 c9a667e38c02b37b4dfd508e30a6f7aa ChangeLog 6843
 MD5 0825bd32298b0f723104dfe91d0a7bc1 opera-6.12.ebuild 3343
-MD5 3c017850ee66d42b947c4bc3774d7bcc opera-7.21.ebuild 3238
+MD5 26cac7faf02df3f3feef52ba9f01d4b4 opera-7.21.ebuild 3441
 MD5 1b7c1f0c4e1dd14c6381cf8b4937fc09 opera-7.11-r2.ebuild 3717
 MD5 dd740427a5bf51df78900253dba8c6de opera-6.12_beta1.ebuild 2504
 MD5 060858a4f81b92854de461ed0e1f955b files/digest-opera-6.12_beta1 90
diff --git a/net-www/opera/files/digest-opera-7.21 b/net-www/opera/files/digest-opera-7.21
new file mode 100644
index 000000000000..447e61d7be93
--- /dev/null
+++ b/net-www/opera/files/digest-opera-7.21
@@ -0,0 +1,3 @@
+MD5 40a1287ffd0c7b9dfa60c278e15dce43 opera-7.21-20031013.1-static-qt.i386.tar.bz2 4724451
+MD5 d44dd518c4dbda1b7bc320de38dce7a9 opera-7.21-20031013.1-static-qt.ppc.tar.bz2 4781863
+MD5 45464228df4fcbaa7336fb12c579e839 opera-7.21-20031013.1-static-qt.sparc.tar.bz2 4733715
diff --git a/net-www/opera/files/digest-opera-7.21_pre1 b/net-www/opera/files/digest-opera-7.21_pre1
deleted file mode 100644
index d1aee621bef9..000000000000
--- a/net-www/opera/files/digest-opera-7.21_pre1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b86a419405f971bcc8bb81575f63794a opera-7.21-20031002.1-static-qt.i386.tar.bz2 4725258
-MD5 05f6d5509025373dfd10c96aa130239e opera-7.21-20031002.1-static-qt.ppc.tar.bz2 4781570
-MD5 a7d13b04be3f18b943ca051baedb5b00 opera-7.21-20031002.1-static-qt.sparc.tar.bz2 4731938
diff --git a/net-www/opera/files/digest-opera-7.21_pre2 b/net-www/opera/files/digest-opera-7.21_pre2
deleted file mode 100644
index 118ac308d9e9..000000000000
--- a/net-www/opera/files/digest-opera-7.21_pre2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0d1ff8507c7cba6ab4837b94b7f919a0 opera-7.21-20031003.1-static-qt.i386.tar.bz2 4724450
-MD5 56d09c707edd9f98e472b80231086a33 opera-7.21-20031003.1-static-qt.ppc.tar.bz2 4781374
-MD5 7ef2be148e49fa30c0142adcdbf827c8 opera-7.21-20031003.1-static-qt.sparc.tar.bz2 4732238
diff --git a/net-www/opera/opera-7.21_pre2.ebuild b/net-www/opera/opera-7.21.ebuild
index 96ca7b73c8dc..e03d1b3d6df6 100644
--- a/net-www/opera/opera-7.21_pre2.ebuild
+++ b/net-www/opera/opera-7.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.21_pre2.ebuild,v 1.2 2003/10/11 20:18:39 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.21.ebuild,v 1.1 2003/10/17 10:16:51 lanius Exp $
 
 # Here, like in the other .ebuilds, the static version is
 # forced for simplicity's sake
@@ -16,17 +16,17 @@ DEPEND=">=sys-apps/sed-4"
 RDEPEND="virtual/x11
 	>=media-libs/fontconfig-2.1.94-r1
 	media-libs/libexif
-	>=x11-libs/lesstif-0.93.40" #lesstif resolves Bug 25767
+	|| ( x11-libs/lesstif x11-libs/openmotif )"
 
 KEYWORDS="~x86 ~ppc ~sparc"
 SLOT="0"
 
-OPERAVER="7.21-20031003"
+OPERAVER="7.21-20031013"
 OPERATYPE="1-static-qt"
 
-SRC_URI="x86? ( http://snapshot.opera.com/unix/7.21-Preview-2/intel-linux/${PN}-${OPERAVER}.${OPERATYPE}.i386.tar.bz2 )
-	ppc? ( http://snapshot.opera.com/unix/7.21-Preview-2/ppc-linux/${PN}-${OPERAVER}.${OPERATYPE}.ppc.tar.bz2 )
-	sparc? ( http://snapshot.opera.com/unix/7.21-Preview-2/sparc-linux/${PN}-${OPERAVER}.${OPERATYPE}.sparc.tar.bz2 )"
+SRC_URI="x86? ( ftp://ftp.opera.com/pub/opera/linux/721/final/en/i386/static/${PN}-${OPERAVER}.${OPERATYPE}.i386.tar.bz2 )
+	ppc? ( ftp://ftp.opera.com/pub/opera/linux/721/final/en/ppc/static/${PN}-${OPERAVER}.${OPERATYPE}.ppc.tar.bz2 )
+	sparc? ( ftp://ftp.opera.com/pub/opera/linux/721/final/en/sparc/static/${PN}-${OPERAVER}.${OPERATYPE}.sparc.tar.bz2 )"
 
 S=${WORKDIR}/${A/.tar.bz2/}
 
@@ -93,6 +93,12 @@ src_install() {
 	# Install a symlink /usr/bin/opera
 	dodir /usr/bin
 	dosym /opt/opera/bin/opera /usr/bin/opera
+
+	# install correct motifwrapper
+	if [ "`has_version 'x11-libs/openmotif-2.2*'`" ]; then
+		rm ${D}/opt/opera/lib/opera/plugins/operamotifwrapper
+		cp ${S}/plugins/operamotifwrapper-3 ${D}/opt/opera/lib/opera/plugins
+	fi
 }
 
 pkg_postinst() {
diff --git a/net-www/opera/opera-7.21_pre1.ebuild b/net-www/opera/opera-7.21_pre1.ebuild
deleted file mode 100644
index 96f762ec3f84..000000000000
--- a/net-www/opera/opera-7.21_pre1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.21_pre1.ebuild,v 1.1 2003/10/04 17:08:25 lanius Exp $
-
-# Here, like in the other .ebuilds, the static version is
-# forced for simplicity's sake
-
-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
-	media-libs/libexif
-	>=x11-libs/lesstif-0.93.40" #lesstif resolves Bug 25767
-
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
-
-OPERAVER="7.21-20031002"
-OPERATYPE="1-static-qt"
-
-SRC_URI="x86? ( http://snapshot.opera.com/unix/7.21-Preview-1/intel-linux/${PN}-${OPERAVER}.${OPERATYPE}.i386.tar.bz2 )
-	ppc? ( http://snapshot.opera.com/unix/7.21-Preview-1/ppc-linux/${PN}-${OPERAVER}.${OPERATYPE}.ppc.tar.bz2 )
-	sparc? ( http://snapshot.opera.com/unix/7.21-Preview-1/sparc-linux/${PN}-${OPERAVER}.${OPERATYPE}.sparc.tar.bz2 )"
-
-S=${WORKDIR}/${A/.tar.bz2/}
-
-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"::' \
-	       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
-}