fix plugin search path; bug #81747; stable on all previous arches

Package-Manager: portage-2.0.51-r15

4 files changed, 148 insertions, 16 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index 96a9b834bad7..0e77693c69f1 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/opera
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.91 2005/02/09 15:18:44 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.92 2005/02/14 12:29:39 lanius Exp $
+
+*opera-7.54-r3 (14 Feb 2005)
+
+  14 Feb 2005; Heinrich Wendel <lanius@gentoo.org> +opera-7.54-r3.ebuild:
+  fix plugin search path; bug #81747; stable on all previous arches
 
   09 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> opera-7.54-r2.ebuild:
   Stable on sparc wrt #73871
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index 78632071d2cf..a8a36e67a22b 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 33d3a979bdd2d746c854f31c1bfa3519 ChangeLog 14423
-MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 71ed9129b64caea832d14411a221daf2 opera-7.54.ebuild 4905
 MD5 a78685918d73793c27af245adc6d5c87 opera-7.60_alpha4.ebuild 3955
-MD5 1aa6ad36d0a2d5ba4e31d393468f034d opera-7.54-r1.ebuild 4903
+MD5 71ed9129b64caea832d14411a221daf2 opera-7.54.ebuild 4905
 MD5 1a12110201afabc0e2d32c430c3d286b opera-7.54-r2.ebuild 4912
+MD5 1aa6ad36d0a2d5ba4e31d393468f034d opera-7.54-r1.ebuild 4903
+MD5 a40d1466504f59409d41662508735c56 ChangeLog 14594
+MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 55a6adf7dac3cbe5c01efa31e8563496 opera-7.54-r3.ebuild 4983
 MD5 0bb743783b49ab8cfc992cce68a57129 files/digest-opera-7.54 372
 MD5 1017258128c35d96ee187880d7d56b77 files/digest-opera-7.60_alpha4 466
-MD5 8336a92d029cd448620bf4bbd4c55715 files/opera.desktop 135
 MD5 fd3a3140488e36606b9f45f45d2ae428 files/digest-opera-7.54-r1 372
 MD5 05a269373a205b54700e2265119951a0 files/digest-opera-7.54-r2 372
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCCinbKRy60XGEcJIRAvfbAKCnyu4l6+cHMKOZixau3GyKq9l01ACfXkWR
-6z0ZM2S5qAAtCIpe7XS5B7Y=
-=hevV
------END PGP SIGNATURE-----
+MD5 5913d93622610b2c5dee22006ffe72e1 files/digest-opera-7.54-r3 93
+MD5 8336a92d029cd448620bf4bbd4c55715 files/opera.desktop 135
diff --git a/net-www/opera/files/digest-opera-7.54-r3 b/net-www/opera/files/digest-opera-7.54-r3
new file mode 100644
index 000000000000..8188d2f22d87
--- /dev/null
+++ b/net-www/opera/files/digest-opera-7.54-r3
@@ -0,0 +1 @@
+MD5 3ba228b88e75258ce6fd570a0a46de23 opera-7.54-20050131.5-shared-qt.i386-en.tar.bz2 3663361
diff --git a/net-www/opera/opera-7.54-r3.ebuild b/net-www/opera/opera-7.54-r3.ebuild
new file mode 100644
index 000000000000..f9a8714b6c19
--- /dev/null
+++ b/net-www/opera/opera-7.54-r3.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.54-r3.ebuild,v 1.1 2005/02/14 12:29:39 lanius Exp $
+
+IUSE="static spell"
+
+OPERAVER="7.54-20050131"
+OPERAFTPDIR="754u2"
+
+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
+SRC_URI="
+	x86? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+	x86? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+	amd64? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 )
+	ppc? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )
+	sparc? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )"
+
+# ppc shared version does not work as it uses gcc-2.95 - lanius
+#	ppc? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 ) )
+#	ppc? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 ) )
+
+# amd64 shared libs require app-emulation/emul-linux-x86-qtlibs-1 which is not stable yet
+#	amd64? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+#	amd64? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+
+# sparc shared version does not work for me as it uses gcc-2.95 - eradicator
+#	sparc? ( static?  ( mirror://opera/linux/${OPERAFTPDIR}/final/en/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 ) )
+#	sparc? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/sparc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.sparc-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
+	media-libs/libexif
+	x11-libs/openmotif
+	spell? ( app-text/aspell )
+	amd64? ( app-emulation/emul-linux-x86-xlibs )
+	!amd64? ( !sparc? ( !static? ( =x11-libs/qt-3* ) ) )"
+
+#	static? (
+#		amd64? ( app-emulation/emul-linux-x86-xlibs ) )
+#	!static? (
+#		amd64? ( =app-emulation/emul-linux-x86-qtlibs-1* )
+#		!amd64? ( =x11-libs/qt-3* ) )
+
+SLOT="0"
+LICENSE="OPERA"
+KEYWORDS="x86 ~ppc sparc amd64"
+
+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:#\(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
+
+	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/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
+}
+
+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."
+	einfo
+	ewarn "This update will overwrite your search.ini if you"
+	ewarn "do not change the \"File Version\" to 4 in the file."
+}