version bump

(Portage version: 2.0.51.22-r1)

5 files changed, 159 insertions, 15 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index ccd5fed10449..9fb3fabdae5e 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.15 2005/07/12 19:53:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.16 2005/08/04 08:30:55 lanius Exp $
+
+*opera-8.02 (04 Aug 2005)
+
+  04 Aug 2005; Heinrich Wendel <lanius@gentoo.org> +files/opera-qt.2.patch,
+  +opera-8.02.ebuild:
+  version bump
 
   12 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> opera-8.00.ebuild,
   opera-8.01.ebuild:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index c792bb0bde99..569c02adab55 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 5cf989c7a198572b29f4d57d00934eb0 opera-8.01.ebuild 4063
+MD5 654eabba23cdab9ffe12a45fe6338fcd opera-8.00.ebuild 4060
 MD5 1d5bd98070090c82a780eddf72d63bcb ChangeLog 16656
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 c466a4f4004881b5d1f51c8e68a0d507 opera-7.54-r3.ebuild 4987
-MD5 5cf989c7a198572b29f4d57d00934eb0 opera-8.01.ebuild 4063
-MD5 654eabba23cdab9ffe12a45fe6338fcd opera-8.00.ebuild 4060
+MD5 e546066979147825eb525817653e4214 opera-8.02.ebuild 4066
+MD5 fa357d1def9207d9e5e81038265b52cb files/opera-qt.2.patch 416
+MD5 5fde404310e76e32c90caff003dbbbb8 files/digest-opera-8.00 368
+MD5 8cbbc6d9dbd635e9b74831ac4209f292 files/digest-opera-8.01 372
+MD5 db1b0b78bf60d8137b84e200dacf2de7 files/digest-opera-8.02 372
 MD5 05a269373a205b54700e2265119951a0 files/digest-opera-7.54-r3 372
 MD5 3fbc8c365c121ec93a041532f07942f7 files/opera-qt.patch 328
 MD5 bafbdb86632b055a10fe826d16ea5b7f files/opera.desktop 147
-MD5 5fde404310e76e32c90caff003dbbbb8 files/digest-opera-8.00 368
-MD5 8cbbc6d9dbd635e9b74831ac4209f292 files/digest-opera-8.01 372
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1B/fArHZZzCEUG0RAifUAJ9rScow/bgatlJaSkR/h+RP9x+oBQCeMTDR
-n8uh/XAaqQZYyoDYXjisas4=
-=CAFQ
------END PGP SIGNATURE-----
diff --git a/www-client/opera/files/digest-opera-8.02 b/www-client/opera/files/digest-opera-8.02
new file mode 100644
index 000000000000..98560832ff0a
--- /dev/null
+++ b/www-client/opera/files/digest-opera-8.02
@@ -0,0 +1,4 @@
+MD5 7f85aef69221803413b859b9e04df959 opera-8.02-20050727.1-static-qt.i386-en.tar.bz2 5855649
+MD5 060bcdbf97f1c49d864971501032a5fe opera-8.02-20050727.5-shared-qt.i386-en.tar.bz2 4040154
+MD5 d633160f49342d6d9447778e2b4f1a63 opera-8.02-20050727.1-static-qt.sparc-en.tar.bz2 5725746
+MD5 dc38c98f658e6b8b964c868b45ba6297 opera-8.02-20050727.1-static-qt.ppc-en.tar.bz2 5867332
diff --git a/www-client/opera/files/opera-qt.2.patch b/www-client/opera/files/opera-qt.2.patch
new file mode 100644
index 000000000000..deadae40bc37
--- /dev/null
+++ b/www-client/opera/files/opera-qt.2.patch
@@ -0,0 +1,17 @@
+--- opera.org	2005-08-04 10:19:53.000000000 +0200
++++ opera	2005-08-04 10:20:17.000000000 +0200
+@@ -195,6 +195,13 @@
+     fi
+ done
+ 
++if [ -f ~/.qt/qtrc ]; then
++    STYLE="$(grep style= ~/.qt/qtrc | cut -c7-)"
++    if [ ! -z "$STYLE" ]; then
++        STYLE="-style '$STYLE'"
++    fi
++fi
++
+ # Running Opera
+-eval exec "'${OPERA_BINARYDIR}opera' $passflags"
++eval exec "'${OPERA_BINARYDIR}opera' $passflags $STYLE"
+ 
diff --git a/www-client/opera/opera-8.02.ebuild b/www-client/opera/opera-8.02.ebuild
new file mode 100644
index 000000000000..35c85611cc47
--- /dev/null
+++ b/www-client/opera/opera-8.02.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-8.02.ebuild,v 1.1 2005/08/04 08:30:55 lanius Exp $
+
+inherit eutils
+
+IUSE="static spell qt kde"
+
+OPERAVER="8.02-20050727"
+OPERAFTPDIR="802/final/en"
+
+S=${WORKDIR}/${A/.tar.bz2/}
+
+DESCRIPTION="Opera web browser."
+HOMEPAGE="http://www.opera.com/linux/"
+
+# that's an ugly workaround for the broken src_uri syntax
+OPERA_URI="mirror://opera/linux/${OPERAFTPDIR}/"
+SRC_URI="
+	x86? ( static? ( ${OPERA_URI}/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+	x86? ( !static? ( ${OPERA_URI}/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+	amd64? ( static? ( ${OPERA_URI}/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+	amd64? ( !static? ( ${OPERA_URI}/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+	sparc? ( ${OPERA_URI}/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )
+	ppc? ( ${OPERA_URI}/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )"
+
+#	sparc? ( !static? ( ${OPERA_URI}/sparc/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )
+#	ppc? ( !static? ( ${OPERA_URI}/ppc-linux/en/${PN}-${OPERAVER}.3-shared-qt.ppc-en.tar.bz2 ) )
+
+# Dependencies may be augmented later (see below).
+DEPEND=">=sys-apps/sed-4
+	amd64? ( sys-apps/linux32 )"
+
+RDEPEND="virtual/x11
+	>=media-libs/fontconfig-2.1.94-r1
+	amd64? ( static? ( app-emulation/emul-linux-x86-xlibs )
+	         !static? ( app-emulation/emul-linux-x86-qtlibs ) )
+	!amd64? ( media-libs/libexif
+	          x11-libs/openmotif
+	          spell? ( app-text/aspell )
+	          x86? ( !static? ( =x11-libs/qt-3* ) )
+	          media-libs/jpeg )"
+
+SLOT="0"
+LICENSE="OPERA"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":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:/opt/gnome/share:${D}/opt/gnome/share:g" \
+	       -e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
+	       -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
+		   -e 's:read str_answer:return 0:' \
+		   -e "s:/opt/kde:${D}/usr/kde:" \
+		   -e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
+	       install.sh || die
+}
+
+src_compile() {
+	true
+}
+
+src_install() {
+	# Prepare installation directories for Opera's installer script.
+	dodir /etc
+
+	# Opera's native installer.
+	if [ ${ARCH} = "amd64" ]; then
+		linux32 ./install.sh --prefix="${D}"/opt/opera || die
+	else
+		./install.sh --prefix="${D}"/opt/opera || die
+	fi
+
+	# java workaround
+	sed -i -e 's:LD_PRELOAD="${OPERA_JAVA_DIR}/libawt.so":LD_PRELOAD="$LD_PRELOAD"\:"${OPERA_JAVA_DIR}/libawt.so":' ${D}/opt/opera/bin/opera
+
+	dosed /opt/opera/bin/opera
+	dosed /opt/opera/share/opera/java/opera.policy
+
+	# Install the icons
+	insinto /usr/share/pixmaps
+	doins images/opera.xpm
+
+	# Install the menu entry
+	insinto /usr/share/applications
+	doins ${FILESDIR}/opera.desktop
+
+	# Install a symlink /usr/bin/opera
+	dodir /usr/bin
+	dosym /opt/opera/bin/opera /usr/bin/opera
+
+	# fix plugin path
+	echo "Plugin Path=/opt/opera/lib/opera/plugins" >> ${D}/etc/opera6rc
+
+	# enable spellcheck
+	if use spell; then
+		if use static; then
+			DIR=$OPERAVER.1
+		else
+			use sparc && DIR=$OPERAVER.2 || DIR=$OPERAVER.5
+		fi
+		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> ${D}/opt/opera/share/opera/ini/spellcheck.ini
+	fi
+
+	if use qt || use kde; then
+		cd ${D}/opt/opera/bin
+		epatch ${FILESDIR}/opera-qt.2.patch
+	fi
+}
+
+pkg_postinst() {
+	einfo "For localized language files take a look at:"
+	einfo "http://www.opera.com/download/languagefiles/index.dml?platform=linux"
+	einfo
+	einfo "To change the spellcheck language edit /opt/opera/share/opera/ini/spellcheck.ini"
+	einfo "and emerge app-text/aspell-language."
+}