Various bugfixes (including bug #19330).

3 files changed, 117 insertions, 1 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index ca70f33f2271..eaad852734d6 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,14 @@
 # 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.20 2003/04/19 16:11:13 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.21 2003/04/20 17:48:28 agenkin Exp $
+
+*opera-7.10_beta1-r2 (20 Apr 2003)
+
+  20 Apr 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Fixed download URL.
+  Added error-checking to the sed invocation in src_compile.
+  Made the ebuild depend on fontconfig-2.1.94-r1 or later to fix display under
+  xfree-4.3 (bug #19330).
 
 *opera-7.10_beta1-r1 (19 Apr 2003)
 
diff --git a/net-www/opera/files/digest-opera-7.10_beta1-r2 b/net-www/opera/files/digest-opera-7.10_beta1-r2
new file mode 100644
index 000000000000..3f99915ef9dd
--- /dev/null
+++ b/net-www/opera/files/digest-opera-7.10_beta1-r2
@@ -0,0 +1 @@
+MD5 87742c4731a2307d4bc60fec6d8367ac opera-7.1.0-20030410.1-static-qt.i386.tar.gz 5415693
diff --git a/net-www/opera/opera-7.10_beta1-r2.ebuild b/net-www/opera/opera-7.10_beta1-r2.ebuild
new file mode 100644
index 000000000000..784ab1cbef23
--- /dev/null
+++ b/net-www/opera/opera-7.10_beta1-r2.ebuild
@@ -0,0 +1,107 @@
+# 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.1 2003/04/20 17:48:28 agenkin 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/"
+LICENSE="OPERA"
+IUSE="gnome kde"
+
+# Dependencies may be augmented later (see below).
+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.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() {
+	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
+}