Fix(hopefully) bug 114302, 134422, 134368. Thanks too Jakub Moc, Paul Varner, Frank Richter

Package-Manager: portage-2.1_rc2-r3

4 files changed, 49 insertions, 19 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index f1d074ab1ab9..5a8a0ed243f1 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.42 2006/05/26 15:26:01 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.43 2006/05/30 11:20:22 axxo Exp $
+
+  30 May 2006; Thomas Matthijs <axxo@gentoo.org>
+  +files/opera-8.54-install.patch, opera-8.54.ebuild:
+  Fix(hopefully) bug 114302, 134422, 134368. Thanks too Jakub Moc, Paul
+  Varner, Frank Richter
 
   26 May 2006; Thomas Matthijs <axxo@gentoo.org> files/digest-opera-8.54,
   Manifest:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 164573d1b018..6ea82d71ee4e 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,3 +1,7 @@
+AUX opera-8.54-install.patch 317 RMD160 e5a19508abfd85fcb1aed636fcd1c4b6127180cd SHA1 bef319cd22b608faa18c0d5a669101c36f38cd71 SHA256 5387e8273be40f545eed41e97f177d03e790693e8061507e86383f5fcb26a0bc
+MD5 32c3aecce554e4690a54912eb757eb1a files/opera-8.54-install.patch 317
+RMD160 e5a19508abfd85fcb1aed636fcd1c4b6127180cd files/opera-8.54-install.patch 317
+SHA256 5387e8273be40f545eed41e97f177d03e790693e8061507e86383f5fcb26a0bc files/opera-8.54-install.patch 317
 AUX opera-qt.2.patch 416 RMD160 854a3785d852e5bc1f55b01d9c0e1a81d232d5f6 SHA1 342514ac5280a1f82c0fbf77189dd7c9ddecc900 SHA256 b5cd33f7c861c0c0a6ac44fddb25be282e43b1661f9f379e037ee5808608d1a0
 MD5 fa357d1def9207d9e5e81038265b52cb files/opera-qt.2.patch 416
 RMD160 854a3785d852e5bc1f55b01d9c0e1a81d232d5f6 files/opera-qt.2.patch 416
@@ -26,14 +30,14 @@ EBUILD opera-8.52.ebuild 4525 RMD160 7b43ed136b8824d20a908ab981818f0e5ce2d74f SH
 MD5 47344b4f4787688b2af5c7ffa52709bc opera-8.52.ebuild 4525
 RMD160 7b43ed136b8824d20a908ab981818f0e5ce2d74f opera-8.52.ebuild 4525
 SHA256 f9a17238709e5c0f2b2d9cf41187f5c6929c2ee04dd962384825088d4f380fa2 opera-8.52.ebuild 4525
-EBUILD opera-8.54.ebuild 4529 RMD160 0c1fce60466bac81ef9ad09b813f7454ff0c757b SHA1 bfcc7143581960527411e75ca9fdd01e62b1c47f SHA256 cc0dd1347a7983d3278acabd1405d665095a324990262a4d01837f0e63c20b2a
-MD5 ecdc37dcf35f6d49aba9d65f947cb5e3 opera-8.54.ebuild 4529
-RMD160 0c1fce60466bac81ef9ad09b813f7454ff0c757b opera-8.54.ebuild 4529
-SHA256 cc0dd1347a7983d3278acabd1405d665095a324990262a4d01837f0e63c20b2a opera-8.54.ebuild 4529
-MISC ChangeLog 20014 RMD160 bfb86597b7cd0b0a3bb7e80bc9c1831b2fd8700a SHA1 6de3a1e5b905d43f0a6f82699424634d22e24419 SHA256 703a0715ccc9bb15ec8a6454a753c90876d0c790282c03f0f0ffd5f495f0488d
-MD5 399f2106bf9c36fc2cf221e9082975a8 ChangeLog 20014
-RMD160 bfb86597b7cd0b0a3bb7e80bc9c1831b2fd8700a ChangeLog 20014
-SHA256 703a0715ccc9bb15ec8a6454a753c90876d0c790282c03f0f0ffd5f495f0488d ChangeLog 20014
+EBUILD opera-8.54.ebuild 4738 RMD160 a5276dedb35af3e51f117b4c524df8542fa44f34 SHA1 d38265050d40909e654e3f8f38950d7574da4e17 SHA256 e0bf4f9817bc1fb710d5d82b50d61821dd40467ada0c2de118986c8ae003e4bb
+MD5 5b5f07f37b774c9282ae45295a5cdc40 opera-8.54.ebuild 4738
+RMD160 a5276dedb35af3e51f117b4c524df8542fa44f34 opera-8.54.ebuild 4738
+SHA256 e0bf4f9817bc1fb710d5d82b50d61821dd40467ada0c2de118986c8ae003e4bb opera-8.54.ebuild 4738
+MISC ChangeLog 20214 RMD160 f3aafa0bf83a6195d58d77063b4650f8a15cf042 SHA1 c47f4f6646067c334aac9cd1b66c5ecb62855f7c SHA256 4ff369cbdb3b802b2c8747cdd93ca895a62d0f793fd9c74fd73dfdedbb52aaf0
+MD5 cc9054f1a46b7d7c9f44c96e17cd7649 ChangeLog 20214
+RMD160 f3aafa0bf83a6195d58d77063b4650f8a15cf042 ChangeLog 20214
+SHA256 4ff369cbdb3b802b2c8747cdd93ca895a62d0f793fd9c74fd73dfdedbb52aaf0 ChangeLog 20214
 MISC metadata.xml 220 RMD160 7ff7ad4c6e8d172bcfc712cdea261e851838129c SHA1 0718289f296f6229a8833cf44f48cc0f683b682b SHA256 4e10c895f4654efa60587dd3c2febe6c18471fbf752cde4a12fbe884b3cfa287
 MD5 db97f8b4a8ea79d4f2660a1fdb6d4a01 metadata.xml 220
 RMD160 7ff7ad4c6e8d172bcfc712cdea261e851838129c metadata.xml 220
diff --git a/www-client/opera/files/opera-8.54-install.patch b/www-client/opera/files/opera-8.54-install.patch
new file mode 100644
index 000000000000..007974e8d0a2
--- /dev/null
+++ b/www-client/opera/files/opera-8.54-install.patch
@@ -0,0 +1,12 @@
+--- install.sh.orig	2006-05-30 13:11:54.000000000 +0200
++++ install.sh	2006-05-30 13:12:28.000000000 +0200
+@@ -1835,6 +1835,9 @@
+ 
+ xdg()
+ {   # http://standards.freedesktop.org
++
++	return; # Handled by ebuild.
++
+     UDD=''
+     for BIN_DIR in `pathdirs`; do
+ 	test -x ${BIN_DIR}/update-desktop-database || continue
diff --git a/www-client/opera/opera-8.54.ebuild b/www-client/opera/opera-8.54.ebuild
index 05953eac300d..ed043b0ba7e9 100644
--- a/www-client/opera/opera-8.54.ebuild
+++ b/www-client/opera/opera-8.54.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-8.54.ebuild,v 1.3 2006/05/26 04:40:14 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-8.54.ebuild,v 1.4 2006/05/30 11:20:22 axxo Exp $
 
-inherit eutils
+inherit eutils gnome2
 
-IUSE="qt-static spell qt kde"
+IUSE="qt-static spell gnome"
 
 OPERAVER="8.54-20060330"
 OPERAFTPDIR="854/final/en"
@@ -59,6 +59,7 @@ KEYWORDS="~amd64 ppc ~sparc x86"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch "${FILESDIR}/${P}-install.patch"
 	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" \
@@ -100,6 +101,10 @@ src_install() {
 	# Install the icons
 	insinto /usr/share/pixmaps
 	doins images/opera.xpm
+	for res in 16x16 22x22 32x32 48x48 ; do
+		insinto /usr/share/icons/hicolor/${res}/apps/
+		newins images/opera_${res}.png opera.png
+	done
 
 	# Install the menu entry
 	insinto /usr/share/applications
@@ -122,19 +127,23 @@ src_install() {
 		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
-
-	dodir /etc/env.d
-	echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > ${D}/etc/env.d/90opera
+	dodir /etc/revdep-rebuild
+	echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > ${D}/etc/revdep-rebuild/90opera
 }
 
 pkg_postinst() {
+	if use gnome; then
+		gnome2_pkg_postinst
+	fi
 	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."
 }
+
+pkg_postrm() {
+	if use gnome; then
+		gnome2_pkg_postrm
+	fi
+}