added beta4

11 files changed, 28 insertions, 281 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index 6b86b8465a1a..f5bb6348b09c 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,13 @@
 # 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.25 2003/08/09 15:59:49 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.26 2003/08/21 23:26:11 lanius Exp $
+
+*opera-7.11-r1 (22 Aug 2003)
+
+  22 Aug 2003; Heinrich Wendel <lanius@gentoo.org> opera-7.10_beta1-r2.ebuild,
+  opera-7.11-r1.ebuild, opera-7.11.ebuild, files/10opera, files/10opera6:
+  - added 7.20_beta4
+  - cleaned out ebuilds
 
 *opera-7.20_beta3 (09 Aug 2003)
 
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index a6775d430162..02e605ae5f88 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,17 +1,9 @@
 MD5 272c53a9949637427d9a911a926758a1 opera-6.12.ebuild 3290
-MD5 4c81d97aad3df1e220a9803b5773048b opera-7.11-r1.ebuild 3663
 MD5 c847c5f8e010850be1f341680ad6669e opera-7.20_beta3.ebuild 2892
-MD5 8863e0c3bee2242007df533dd5612310 .opera-7.11-r1.ebuild.swp 4096
-MD5 0a34540a04b08ec6fc711010b77f7e55 opera-7.11.ebuild 3439
 MD5 b060229a0600c022164b782118244875 opera-7.11-r2.ebuild 3715
-MD5 5401ea4d22c1eac0fd6c093dd8354e80 opera-7.20_beta4.ebuild 2893
-MD5 075f7e7a7df1f08d7176a3efcf603a6e ChangeLog 4939
-MD5 dcf898c2991b1489f05d197858cbb69a files/digest-opera-7.10_beta1-r2 90
-MD5 8a41aff7bbb8ba97081a39997364e07e files/10opera6 46
+MD5 fe80673962b5b533ceec6efa0c917540 opera-7.20_beta4.ebuild 2895
+MD5 534d1ae24b3a7963eabc363b1b4ea053 ChangeLog 5170
 MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
-MD5 1f1b13a3ff6cf4962e11f75d7591703c files/digest-opera-7.11 89
 MD5 335715e5501a61c037facefd461215ae files/digest-opera-7.20_beta3 90
 MD5 c06fc9c9e26bfa2b0fdc7c89bdac926e files/digest-opera-7.20_beta4 90
-MD5 fd6b6eba741abd18ba590e9a5c0f225f files/digest-opera-7.11-r1 177
 MD5 fd6b6eba741abd18ba590e9a5c0f225f files/digest-opera-7.11-r2 177
-MD5 b56102c48f17d2598ec64771e7f3f5bc files/10opera 32
diff --git a/net-www/opera/files/10opera b/net-www/opera/files/10opera
deleted file mode 100644
index a29e276306a5..000000000000
--- a/net-www/opera/files/10opera
+++ /dev/null
@@ -1 +0,0 @@
-OPERADIR=/usr/X11R6/share/opera
diff --git a/net-www/opera/files/10opera6 b/net-www/opera/files/10opera6
deleted file mode 100644
index 1a3a5a4009a3..000000000000
--- a/net-www/opera/files/10opera6
+++ /dev/null
@@ -1,2 +0,0 @@
-OPERA_DIR=/opt/opera/share
-PATH=/opt/opera/bin
\ No newline at end of file
diff --git a/net-www/opera/files/digest-opera-7.10_beta1-r2 b/net-www/opera/files/digest-opera-7.10_beta1-r2
deleted file mode 100644
index 3f99915ef9dd..000000000000
--- a/net-www/opera/files/digest-opera-7.10_beta1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 87742c4731a2307d4bc60fec6d8367ac opera-7.1.0-20030410.1-static-qt.i386.tar.gz 5415693
diff --git a/net-www/opera/files/digest-opera-7.11 b/net-www/opera/files/digest-opera-7.11
deleted file mode 100644
index 823a1fd70f96..000000000000
--- a/net-www/opera/files/digest-opera-7.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 13be929a22777c2a8e65d592514f49e0 opera-7.11-20030515.1-static-qt.i386.tar.gz 5298426
diff --git a/net-www/opera/files/digest-opera-7.11-r1 b/net-www/opera/files/digest-opera-7.11-r1
deleted file mode 100644
index b087549d8c1c..000000000000
--- a/net-www/opera/files/digest-opera-7.11-r1
+++ /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.20_beta4 b/net-www/opera/files/digest-opera-7.20_beta4
new file mode 100644
index 000000000000..32d634c24f68
--- /dev/null
+++ b/net-www/opera/files/digest-opera-7.20_beta4
@@ -0,0 +1 @@
+MD5 5b60a59030dd5b5187b19b531a103457 opera-7.20-20030821.1-static-qt.i386.tar.bz2 5039181
diff --git a/net-www/opera/opera-7.11-r1.ebuild b/net-www/opera/opera-7.11-r1.ebuild
deleted file mode 100644
index 09cef9025323..000000000000
--- a/net-www/opera/opera-7.11-r1.ebuild
+++ /dev/null
@@ -1,121 +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.11-r1.ebuild,v 1.1 2003/07/15 13:55:25 pvdabeel 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"
-
-KEYWORDS="-* ~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.11.ebuild b/net-www/opera/opera-7.11.ebuild
deleted file mode 100644
index 40059acf88d1..000000000000
--- a/net-www/opera/opera-7.11.ebuild
+++ /dev/null
@@ -1,111 +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.11.ebuild,v 1.3 2003/06/08 05:21:24 seemant 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"
-
-KEYWORDS="-* ~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}.i386
-SRC_URI="http://opera.online.no/linux/711/final/en/i386/${URL_DIR}/opera-${NV}.tar.gz"
-S=${WORKDIR}/opera-${NV}
-
-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.10_beta1-r2.ebuild b/net-www/opera/opera-7.20_beta4.ebuild
index 1917e50e36bc..07b58d3cd8c2 100644
--- a/net-www/opera/opera-7.10_beta1-r2.ebuild
+++ b/net-www/opera/opera-7.20_beta4.ebuild
@@ -1,14 +1,9 @@
 # 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.10_beta1-r2.ebuild,v 1.2 2003/06/08 05:21:24 seemant 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.
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.20_beta4.ebuild,v 1.1 2003/08/21 23:26:11 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/"
@@ -19,34 +14,26 @@ IUSE="gnome kde"
 DEPEND=">=sys-apps/sed-4"
 
 RDEPEND="virtual/x11
-	>=media-libs/fontconfig-2.1.94-r1"
+	>=media-libs/fontconfig-2.1.94-r1
+	=media-libs/libexif-0.5.9"  #for libexif.so.8
 
-KEYWORDS="-* ~x86"
+KEYWORDS="-*" #please test! This is for x86 only!!
 SLOT="0"
+OPERAVER="7.20-20030821"
+OPERATYPE="1-static-qt"
 
-#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
+SRC_URI="http://snapshot.opera.com/unix/intel-linux/445-20030821-7.20-B4//${PN}-${OPERAVER}.${OPERATYPE}.i386.tar.bz2"
+S=${WORKDIR}/opera-${OPERAVER}.${OPERATYPE}.i386
 
-NV=7.1.0-20030410.${OPERA_VERSION}.i386
-SRC_URI="http://opera.online.no/linux/710/beta1/en/i386/${URL_DIR}/opera-${NV}.tar.gz"
-S=${WORKDIR}/opera-${NV}
 
 src_unpack() {
+	ewarn "This package is designed for an i386-based processor."
+	ewarn "Usage on another platform is at your own risk."
+	ewarn "If you want to abort this installation, press CTRL+C now"
+	ewarn "Pausing for 15 seconds..."
+	sleep 15s
+
 	unpack ${A}
 	cd ${S}
 	sed -i -e "s:/etc:${D}/etc:g" \
@@ -63,7 +50,6 @@ src_unpack() {
 	       -e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
 	       -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
 	       install.sh || die
-
 }
 
 src_compile() {