dep fix: change >=qt-2 to =qt-2* to avoid installnig qt3 instead of qt2. incremented revision number. fixes bug

#508

6 files changed, 131 insertions, 2 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index d878828f5c0b..cd9f1d52641b 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/opera
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.1 2002/02/01 21:53:36 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.2 2002/02/03 21:00:18 danarmak Exp $
+
+*opera-5.0-r2
+ opera-6.0_pre3-r1 (3 Feb 2002)
+
+  3 Feb 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
+  
+  Added fix for bug #508 to both 5.0 and 6.0_pre3 ebuilds. This fixes the incorrect
+  dependency, which installed QT3 instead of QT2.
 
 *opera-6.0_pre3 (1 Feb 2002)
 
diff --git a/net-www/opera/files/digest-opera-5.0-r2 b/net-www/opera/files/digest-opera-5.0-r2
new file mode 100644
index 000000000000..4951171ccdb1
--- /dev/null
+++ b/net-www/opera/files/digest-opera-5.0-r2
@@ -0,0 +1 @@
+MD5 be5bf254a6b6ac36b32446cbc50de304 opera-5.0-dynamic.i386.tar.gz 1585508
diff --git a/net-www/opera/files/digest-opera-6.0_pre3-r1 b/net-www/opera/files/digest-opera-6.0_pre3-r1
new file mode 100644
index 000000000000..d2589497792e
--- /dev/null
+++ b/net-www/opera/files/digest-opera-6.0_pre3-r1
@@ -0,0 +1 @@
+MD5 51faf3870658b15bb923eef4762611c7 opera-6.0-20020110.2-shared_qt.i386.tar.gz 2704445
diff --git a/net-www/opera/opera-5.0-r1.ebuild b/net-www/opera/opera-5.0-r1.ebuild
index f4a189b60fce..5fb04423ea25 100644
--- a/net-www/opera/opera-5.0-r1.ebuild
+++ b/net-www/opera/opera-5.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-5.0-r1.ebuild,v 1.2 2001/12/29 17:41:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-5.0-r1.ebuild,v 1.3 2002/02/03 21:00:18 danarmak Exp $
 
 P=opera-5.0-dynamic.i386
 A=${P}.tar.gz
@@ -55,6 +55,13 @@ src_install() {
   fi
 
   if [ "`use kde`" ] ; then
+	if [ -z "$KDEDIR" ]; then
+	    if [ -n "$KDE2DIR" ]; then
+		export KDEDIR="$KDE2DIR"
+	    else
+		export KDEDIR="/usr/kde/2"
+	    fi
+	fi
 	dodir ${KDEDIR}/share/icons/{hi,lo}color
 	for i in 48x48 32x32 22x22
 	do
diff --git a/net-www/opera/opera-5.0-r2.ebuild b/net-www/opera/opera-5.0-r2.ebuild
new file mode 100644
index 000000000000..769895adaf81
--- /dev/null
+++ b/net-www/opera/opera-5.0-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-5.0-r2.ebuild,v 1.1 2002/02/03 21:00:18 danarmak Exp $
+
+P=opera-5.0-dynamic.i386
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
+DESCRIPTION="Opera webbrowser"
+SRC_URI="ftp://ftp.opera.com/pub/opera/linux/500/opera-5.0-dynamic.i386.tar.gz"
+HOMEPAGE="http://www.opera.com"
+
+DEPEND="=x11-libs/qt-2*"
+
+src_install() {
+
+  T=/usr
+  exeinto $T/bin
+  doexe opera
+
+  insinto $T/share/opera/buttons
+  doins buttons/*
+  insinto $T/share/opera/buttons/default
+  doins buttons/default/*
+  insinto $T/share/opera/buttons/defsmall
+  doins buttons/defsmall/*
+
+  insinto $T/share/opera/help
+  doins help/*
+
+  insinto $T/share/opera/images
+  doins images/*
+
+  insinto $T/share/opera/styles
+  doins styles/*
+
+  insinto $T/share/opera
+  doins opera.xpm opera.wmconfig opera.desktop opera_*.png
+  doins opera.adr
+
+  insinto /etc/skel/.opera
+  doins opera.adr
+
+  insinto /usr/X11R6/share/pixmaps
+  doins opera.xpm
+
+  insinto /etc/X11/wmconfig
+  doins opera.wmconfig
+
+  if [ "`use gnome`" ] ; then
+	insinto /opt/gnome/share/pixmaps
+	doins opera.xpm
+	insinto /opt/gnome/share/gnome/apps/Internet
+	doins opera.desktop
+  fi
+
+  if [ "`use kde`" ] ; then
+	if [ -z "$KDEDIR" ]; then
+	    if [ -n "$KDE2DIR" ]; then
+		export KDEDIR="$KDE2DIR"
+	    else
+		export KDEDIR="/usr/kde/2"
+	    fi
+	fi
+	dodir ${KDEDIR}/share/icons/{hi,lo}color
+	for i in 48x48 32x32 22x22
+	do
+	  cp opera_${i}.png ${D}/${KDEDIR}/share/icons/hicolor
+	  cp opera_${i}.png ${D}/${KDEDIR}/share/icons/locolor
+	done
+	insinto ${KDEDIR}/share/applnk/Internet
+	doins opera.desktop
+  fi
+  insinto /etc/env.d
+  doins ${FILESDIR}/10opera
+  dodoc LICENSE
+}
+
diff --git a/net-www/opera/opera-6.0_pre3-r1.ebuild b/net-www/opera/opera-6.0_pre3-r1.ebuild
new file mode 100644
index 000000000000..efd4ea2fe920
--- /dev/null
+++ b/net-www/opera/opera-6.0_pre3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Karl Trygve Kalleberg <karltk@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-6.0_pre3-r1.ebuild,v 1.1 2002/02/03 21:00:18 danarmak Exp $
+
+NV=6.0-20020110.2-shared_qt.i386
+S=${WORKDIR}/opera-${NV}
+DESCRIPTION="Opera webbrowser, version 6.0 TP"
+SRC_URI="ftp://ftp.opera.com/pub/opera/linux/600/tp3/opera-${NV}.tar.gz"
+HOMEPAGE="http://www.opera.com"
+
+DEPEND="=x11-libs/qt-2*"
+
+src_install() {
+
+	mv install.sh install.sh_orig
+	sed -e "s:/usr/share/pixmaps:${D}/usr/share/pixmaps:g" \
+		 -e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \
+		-e "s:/usr/share/icons:${D}/usr/share/icons:g" \
+		-e "s:/etc/X11/wmconfig:${D}/etc/X11/wmconfig:g" \
+		-e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
+		install.sh_orig > install.sh
+	chmod 755 install.sh
+	./install.sh \
+		--exec_prefix=${D}/usr/bin \
+		--wrapperdir=${D}/usr/share/opera/bin \
+		--docdir=${D}/usr/share/doc/${P} \
+		--sharedir=${D}/usr/share/opera \
+		--plugindir=${D}/usr/share/opera/plugins || die
+	rm ${D}/usr/share/doc/${P}/help
+	dosym /usr/share/opera/help /usr/share/doc/${P}/help
+	dosed /usr/bin/opera
+}
+