added depend for opera 7.11 to lesstif. this resolves bug 25767. openmotif no longer provides a key file

4 files changed, 133 insertions, 3 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index d2914ee5c3e3..1ec28c717355 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.23 2003/07/15 13:55:25 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.24 2003/08/06 14:25:12 lisa Exp $
+
+*opera-7.11-r2 (06 Aug 2003)
+
+  06 Aug 2003; Lisa Seelye <lisa@gentoo.org> opera-7.11-r2.ebuild:
+  added depend for opera 7.11 to lesstif. this resolves bug 25767. openmotif no
+  longer provides a key file. and bump to -r2
 
 *opera-7.11 (15 Jul 2003)
   
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index 3ae70c460b02..306c9a70c960 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -2,8 +2,8 @@ MD5 3cca08643d3717a3e25a22327709c0ba opera-7.10_beta1-r2.ebuild 3344
 MD5 94eb9b180337dadfa9cde6ef3791aac8 opera-6.12.ebuild 3289
 MD5 4c81d97aad3df1e220a9803b5773048b opera-7.11-r1.ebuild 3663
 MD5 94e274c2b055acea7fb22ee091399036 opera-7.11.ebuild 3438
-MD5 bc6e286f5db9dbd73f132a7c8619ca9e opera-7.11-r2.ebuild 3719
-MD5 9db78d023b60b837d51896c3fd9d96df ChangeLog 4772
+MD5 b060229a0600c022164b782118244875 opera-7.11-r2.ebuild 3715
+MD5 3c4ba24bc263a235440181f04a340ec0 ChangeLog 4768
 MD5 dcf898c2991b1489f05d197858cbb69a files/digest-opera-7.10_beta1-r2 90
 MD5 8a41aff7bbb8ba97081a39997364e07e files/10opera6 46
 MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
diff --git a/net-www/opera/files/digest-opera-7.11-r2 b/net-www/opera/files/digest-opera-7.11-r2
new file mode 100644
index 000000000000..b087549d8c1c
--- /dev/null
+++ b/net-www/opera/files/digest-opera-7.11-r2
@@ -0,0 +1,2 @@
+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/opera-7.11-r2.ebuild b/net-www/opera/opera-7.11-r2.ebuild
new file mode 100644
index 000000000000..ccf4f8e6c4a1
--- /dev/null
+++ b/net-www/opera/opera-7.11-r2.ebuild
@@ -0,0 +1,122 @@
+# 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-r2.ebuild,v 1.1 2003/08/06 14:25:12 lisa 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
+	>=x11-libs/lesstif-0.93.40" #lesstif resolves Bug 25767
+
+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
+}