Starting work on a unified ebuild for Opera.

5 files changed, 122 insertions, 55 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index 495b349ac901..d252ed90b23e 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2002/08/19 17:59:21 cybersystem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.10 2002/10/31 22:25:56 agenkin Exp $
+
+*opera-6.1 (31 October 2002)
+
+  31 October 2002; Arcady Genkin <agenkin@gentoo.org> opera-6.1.ebuild :
+
+  First version of the unified Opera ebuild.
 
 *opera-6.0 (19 August 2002)
 
diff --git a/net-www/opera/files/digest-opera-6.0_pre4-r2 b/net-www/opera/files/digest-opera-6.0_pre4-r2
deleted file mode 100644
index d2589497792e..000000000000
--- a/net-www/opera/files/digest-opera-6.0_pre4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51faf3870658b15bb923eef4762611c7 opera-6.0-20020110.2-shared_qt.i386.tar.gz 2704445
diff --git a/net-www/opera/files/digest-opera-6.1 b/net-www/opera/files/digest-opera-6.1
new file mode 100644
index 000000000000..560fdc07cf48
--- /dev/null
+++ b/net-www/opera/files/digest-opera-6.1
@@ -0,0 +1,3 @@
+MD5 f524bd416638d9e3e13bab700fcd4f30 opera-6.10-20021029.4-shared-qt.i386.tar.bz2 3374807
+MD5 e09ceabcb33505352eb8642ab59dbe24 opera-6.10-20021029.2-shared-qt.i386.tar.bz2 3193424
+MD5 0bbf000275745f51ece957c190e2bca0 opera-6.10-20021029.1-static-qt.i386.tar.bz2 4642353
diff --git a/net-www/opera/opera-6.0_pre4-r2.ebuild b/net-www/opera/opera-6.0_pre4-r2.ebuild
deleted file mode 100644
index 5041973332d2..000000000000
--- a/net-www/opera/opera-6.0_pre4-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-6.0_pre4-r2.ebuild,v 1.9 2002/10/04 06:20:51 vapier 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"
-SLOT="0"
-KEYWORDS="x86 -ppc sparc sparc64"
-LICENSE="OPERA"
-
-DEPEND="=x11-libs/qt-2*
-	=media-libs/libpng-1.0.12*"
-
-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:${D}/etc/X11: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}/opt/opera/bin \
-		--wrapperdir=${D}/opt/opera/share/bin \
-		--docdir=${D}/usr/share/doc/${P} \
-		--sharedir=${D}/opt/opera/share \
-		--plugindir=${D}/opt/opera/share/plugins || die
-	rm ${D}/usr/share/doc/${P}/help
-	dosym /usr/share/opera/help /usr/share/doc/${P}/help
-	dosed /usr/bin/opera
-
-	#install the icons
-	insinto /usr/share/icons /etc/X11/wmconfig /etc/X11/applnk/Internet /usr/share/pixmaps /usr/share/gnome/pixmaps
-	doins images/opera.xpm
-	insinto /etc/X11/wmconfig 
-	doins images/opera.xpm
-	insinto /etc/X11/applnk/Internet 
-	doins images/opera.xpm
-	insinto /usr/share/pixmaps 	
-	doins images/opera.xpm
-	
-	if [ "`use gnome`" ]
-	then
-		insinto /usr/share/gnome/pixmaps
-		doins images/opera.xpm
-	fi
-
-}
diff --git a/net-www/opera/opera-6.1.ebuild b/net-www/opera/opera-6.1.ebuild
new file mode 100644
index 000000000000..14787dc8df4e
--- /dev/null
+++ b/net-www/opera/opera-6.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-6.1.ebuild,v 1.1 2002/10/31 22:25:56 agenkin Exp $
+#
+# By default, the statically compiled version of opera will be
+# installed.  There are two other variations of the package that this
+# ebuild can install.  To pick one, set OPERA_VARIANT environment
+# variable to one of the following:
+#
+# 1. static-2.95  # Statically linked libraries, compiled with gcc 2.95.
+#		  # (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.
+#
+# Example of compiling a non-default varant:
+#
+#   env OPERA_VARIANT=shared-3.2 emerge opera
+#
+
+DESCRIPTION="Opera web browser, statically built."
+HOMEPAGE="http://www.opera.com/linux/"
+LICENSE="OPERA"
+
+DEPEND="virtual/glibc"
+RDEPEND="${DEPEND}
+	virtual/x11
+	x11-libs/lesstif"
+
+KEYWORDS="x86 -ppc sparc sparc64"
+SLOT="0"
+
+
+case "${OPERA_VARIANT}" in
+
+	shared-3.2)
+	    RDEPEND="${RDEPEND} =x11-libs/qt-3*"
+	    OPERA_VERSION="4-shared-qt"
+	    URL_DIR="shared/gcc-3.2/"
+	    ;;
+
+	shared-2.95)
+	    RDEPEND="${RDEPEND} =x11-libs/qt-3*"
+	    OPERA_VERSION="2-shared-qt"
+	    URL_DIR="shared/gcc-2.95/"
+	    ;;
+	
+	*)
+	    OPERA_VERSION="1-static-qt"
+	    URL_DIR="static/"
+	    ;;
+esac
+
+
+NV=6.10-20021029.${OPERA_VERSION}.i386
+SRC_URI="http://www.panix.com/opera/files/linux/610/final/en/i386/${URL_DIR}/opera-${NV}.tar.bz2"
+S=${WORKDIR}/opera-${NV}
+
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	sed -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:/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" \
+	    < install.sh >install.sh.hacked || die
+	mv install.sh.hacked install.sh
+	chmod +x install.sh
+
+}
+
+
+src_compile() {
+	# Nothing to compile.
+	true
+}
+
+
+src_install() {
+
+	dodir /etc
+	./install.sh --prefix="${D}"/opt/opera || die
+	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 /usr/share/gnome/pixmaps
+	doins images/opera.xpm
+	
+	if [ "`use gnome`" ]
+	then
+		insinto /usr/share/gnome/pixmaps
+		doins images/opera.xpm
+	fi
+
+	# Install a symlink /usr/bin/opera
+	dodir /usr/bin
+	dosym /opt/opera/bin/opera /usr/bin/opera
+
+}