added beta7

7 files changed, 24 insertions, 138 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index 482865c4456e..8b2e6584e4dd 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.30 2003/08/26 16:54:32 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.31 2003/08/29 09:52:13 lanius Exp $
+
+*opera-7.20_beta7 (29 Aug 2003)
+
+  29 Aug 2003; Heinrich Wendel <lanius@gentoo.org> opera-7.20_beta4.ebuild,
+  opera-7.20_beta5.ebuild, opera-7.20_beta7.ebuild:
+  added beta7
 
 *opera-7.20_beta4 (26 Aug 2003)
 
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index 8ad541438663..cb5e0f096c31 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,11 +1,9 @@
-MD5 c06fc9c9e26bfa2b0fdc7c89bdac926e files/digest-opera-7.20_beta4 90
-MD5 060858a4f81b92854de461ed0e1f955b files/digest-opera-6.12_beta1 90
-MD5 fd6b6eba741abd18ba590e9a5c0f225f files/digest-opera-7.11-r2 177
-MD5 c65d380cc10c67cff771c348bf7e992c files/digest-opera-7.20_beta5 90
-MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
-MD5 0fe7da11bf675bbecad5db583352793b opera-7.20_beta4.ebuild 3096
-MD5 b060229a0600c022164b782118244875 opera-7.11-r2.ebuild 3715
-MD5 8eae66e0bd11902ec7303a818ce38560 opera-7.20_beta5.ebuild 2976
-MD5 f118f6601d3bf113995833cba8d40667 ChangeLog 5828
 MD5 94eb9b180337dadfa9cde6ef3791aac8 opera-6.12.ebuild 3289
+MD5 ab2f350d77a1b062f053734086ceb4a3 opera-7.20_beta7.ebuild 2800
+MD5 b060229a0600c022164b782118244875 opera-7.11-r2.ebuild 3715
+MD5 d896aec4e385770cbf2d4b104037d4e9 ChangeLog 6004
 MD5 7bae5c1115cbae449099217feafc29f4 opera-6.12_beta1.ebuild 2448
+MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
+MD5 abbb8a4512000d2cc8b8b8fbda3ff1cd files/digest-opera-7.20_beta7 270
+MD5 fd6b6eba741abd18ba590e9a5c0f225f files/digest-opera-7.11-r2 177
+MD5 060858a4f81b92854de461ed0e1f955b files/digest-opera-6.12_beta1 90
diff --git a/net-www/opera/files/digest-opera-7.20_beta4 b/net-www/opera/files/digest-opera-7.20_beta4
deleted file mode 100644
index 32d634c24f68..000000000000
--- a/net-www/opera/files/digest-opera-7.20_beta4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b60a59030dd5b5187b19b531a103457 opera-7.20-20030821.1-static-qt.i386.tar.bz2 5039181
diff --git a/net-www/opera/files/digest-opera-7.20_beta5 b/net-www/opera/files/digest-opera-7.20_beta5
deleted file mode 100644
index 4a706a8a6f15..000000000000
--- a/net-www/opera/files/digest-opera-7.20_beta5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 790fb5f68397023ffb2fc6b3773fba2f opera-7.20-20030825.1-static-qt.i386.tar.bz2 5058864
diff --git a/net-www/opera/files/digest-opera-7.20_beta7 b/net-www/opera/files/digest-opera-7.20_beta7
new file mode 100644
index 000000000000..490b02fe5f56
--- /dev/null
+++ b/net-www/opera/files/digest-opera-7.20_beta7
@@ -0,0 +1,3 @@
+MD5 5abaa90caf74b95cf7ca2e25dd7f2698 opera-7.20-20030827.1-static-qt.i386.tar.bz2 5066256
+MD5 8a21c7d4c02f79302b2a1e3c69e0d3b8 opera-7.20-20030827.1-static-qt.ppc.tar.bz2 4885931
+MD5 9f4ecf5d125553d4a853bd66bffb683a opera-7.20-20030827.1-static-qt.sparc.tar.bz2 4825319
diff --git a/net-www/opera/opera-7.20_beta4.ebuild b/net-www/opera/opera-7.20_beta4.ebuild
deleted file mode 100644
index c38f4975149c..000000000000
--- a/net-www/opera/opera-7.20_beta4.ebuild
+++ /dev/null
@@ -1,110 +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.20_beta4.ebuild,v 1.4 2003/08/27 15:50:33 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"
-
-if [ `use x86` ]; then
-	ARCH="intel"
-	ARCH2="i386"
-	OPERAVER="7.20-20030821"
-	DIR="445-20030821-7.20-B4"
-elif [ `use ppc` ]; then
-	ARCH="ppc"
-	ARCH2="ppc"
-	OPERAVER="7.20-20030822"
-	DIR="445-20030822-7.20-B4"
-elif [ `use sparc` ]; then
-	ARCH="sparc"
-	ARCH2="sparc"
-	OPERAVER="7.20-20030822"
-	DIR="445-20030822-7.20-B4"
-fi
-
-if [ "$OPERA_VARIANT" = "shared" ]; then
-        RDEPEND="${RDEPEND} =x11-libs/qt-3*"
-        OPERATYPE="2-shared-qt"
-else
-        OPERATYPE="1-static-qt"
-fi
-
-SRC_URI="http://snapshot.opera.com/unix/${ARCH}-linux/${DIR}/${PN}-${OPERAVER}.${OPERATYPE}.${ARCH2}.tar.bz2"
-S=${WORKDIR}/opera-${OPERAVER}.${OPERATYPE}.${ARCH2}
-
-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.20_beta5.ebuild b/net-www/opera/opera-7.20_beta7.ebuild
index 949ae305b992..a0a2aafcc561 100644
--- a/net-www/opera/opera-7.20_beta5.ebuild
+++ b/net-www/opera/opera-7.20_beta7.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.20_beta5.ebuild,v 1.1 2003/08/26 16:54:32 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.20_beta7.ebuild,v 1.1 2003/08/29 09:52:13 lanius Exp $
 
 # Here, like in the other .ebuilds, the static version is
 # forced for simplicity's sake
@@ -18,31 +18,22 @@ RDEPEND="virtual/x11
 	media-libs/libexif
 	>=x11-libs/lesstif-0.93.40" #lesstif resolves Bug 25767
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~sparc"
 SLOT="0"
 
 if [ `use x86` ]; then
-	ARCH="intel"
-	ARCH2="i386"
-	OPERAVER="7.20-20030825"
-	DIR="447-20030825-7.20-B5"
+	ARCH="i386"
 elif [ `use ppc` ]; then
 	ARCH="ppc"
-	ARCH2="ppc"
 elif [ `use sparc` ]; then
 	ARCH="sparc"
-	ARCH2="sparc"
 fi
 
-if [ "$OPERA_VARIANT" = "shared" ]; then
-        RDEPEND="${RDEPEND} =x11-libs/qt-3*"
-        OPERATYPE="2-shared-qt"
-else
-        OPERATYPE="1-static-qt"
-fi
+OPERAVER="7.20-20030827"
+OPERATYPE="1-static-qt"
 
-SRC_URI="http://snapshot.opera.com/unix/${ARCH}-linux/${DIR}/${PN}-${OPERAVER}.${OPERATYPE}.${ARCH2}.tar.bz2"
-S=${WORKDIR}/opera-${OPERAVER}.${OPERATYPE}.${ARCH2}
+SRC_URI="ftp://ftp.task.gda.pl/pub/opera/linux/720/beta7/en/${ARCH}/static${DIR}/${PN}-${OPERAVER}.${OPERATYPE}.${ARCH}.tar.bz2"
+S=${WORKDIR}/opera-${OPERAVER}.${OPERATYPE}.${ARCH}
 
 src_unpack() {
 	unpack ${A}