fix plugin search path, bug #51070 and spellcheck search path, bug #51183

4 files changed, 28 insertions, 13 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index dad7548091bb..13bb8bc486f2 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for net-www/opera
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.61 2004/05/23 00:46:28 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.62 2004/05/24 13:32:23 lanius Exp $
 
   23 May 2004; Danny van Dyk <kugelfang@gentoo.org> opera-7.50.ebuild:
   Fixed BUG #51281: Missing dependency for static version on amd64.
 
+  24 May 2004; Heinrich Wendel <lanius@gentoo.org> opera-7.50-r1.ebuild:
+  fix plugin search path, bug #51070 and spellcheck search path, bug #51183
+
   14 May 2004; Heinrich Wendel <lanius@gentoo.org> opera-7.50.ebuild:
   fix bug #51070
 
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index 912ad557443e..882e20bbb1aa 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,11 +1,11 @@
-MD5 a71fb4ecf9c0d73cb834f33cc087710c ChangeLog 10519
-MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 5f73745f3ea4dea663aee6a41b11162d opera-6.12.ebuild 3335
-MD5 e717c585919f1e6db3c5be9c218474a9 opera-7.11-r2.ebuild 3711
 MD5 5d0800451456126fff5ec532817d83bd opera-7.23-r1.ebuild 3860
-MD5 d48739b4e3f9747b087da61d5b9521c8 opera-7.50.ebuild 3469
+MD5 e717c585919f1e6db3c5be9c218474a9 opera-7.11-r2.ebuild 3711
+MD5 0836c4b052aa3cc3450409f4f9b13b2a opera-7.50-r1.ebuild 3818
+MD5 89bafa6c34c469e57069b75f96009e8b ChangeLog 10666
+MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
 MD5 fd6b6eba741abd18ba590e9a5c0f225f files/digest-opera-7.11-r2 177
 MD5 9a8a982857424445242430340a70783c files/digest-opera-7.23-r1 558
+MD5 0084aae5ea2c92ac79c91b3467225005 files/digest-opera-7.50-r1 558
 MD5 8336a92d029cd448620bf4bbd4c55715 files/opera.desktop 135
-MD5 0084aae5ea2c92ac79c91b3467225005 files/digest-opera-7.50 558
diff --git a/net-www/opera/files/digest-opera-7.50 b/net-www/opera/files/digest-opera-7.50-r1
index 089ff5b1ee43..089ff5b1ee43 100644
--- a/net-www/opera/files/digest-opera-7.50
+++ b/net-www/opera/files/digest-opera-7.50-r1
diff --git a/net-www/opera/opera-7.50.ebuild b/net-www/opera/opera-7.50-r1.ebuild
index 7e92d864ab09..3995d060064f 100644
--- a/net-www/opera/opera-7.50.ebuild
+++ b/net-www/opera/opera-7.50-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.50.ebuild,v 1.3 2004/05/23 00:46:28 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.50-r1.ebuild,v 1.1 2004/05/24 13:32:23 lanius Exp $
 
 IUSE="static"
 
@@ -31,15 +31,14 @@ RDEPEND="virtual/x11
 	>=media-libs/fontconfig-2.1.94-r1
 	media-libs/libexif
 	x11-libs/openmotif
-	static? (
-		amd64? ( app-emulation/emul-linux-x86-xlibs ) )
 	!static? (
 		amd64? ( =app-emulation/emul-linux-x86-qtlibs-1* )
-		!amd64? ( =x11-libs/qt-3* ) )"
+		!amd64? ( =x11-libs/qt-3* ) )
+	app-text/aspell"
 
 SLOT="0"
 LICENSE="OPERA"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 
 src_unpack() {
 	unpack ${A}
@@ -77,8 +76,6 @@ src_install() {
 	dosed /opt/opera/bin/opera
 	dosed /opt/opera/share/opera/java/opera.policy
 
-	sed -i -e "s:/usr/lib/opera/plugins:/opt/opera/lib/opera/plugins" ${D}/opt/opera/bin/opera
-
 	# Install the icons
 	insinto /usr/share/pixmaps
 	doins images/opera.xpm
@@ -90,9 +87,24 @@ src_install() {
 	# 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 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
+
 }
 
 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."
 }