add kde/qt style by default, bug #92391

(Portage version: 2.0.51.19)

5 files changed, 30 insertions, 18 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index da7f8d399c6e..395fa4d7a15e 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,10 @@
 # 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.7 2005/05/04 06:21:19 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.8 2005/05/14 14:38:47 lanius Exp $
+
+  14 May 2005; Heinrich Wendel <lanius@gentoo.org> +files/opera-qt.patch,
+  opera-8.00.ebuild:
+  add kde/qt style by default, bug #92391
 
   04 May 2005; Heinrich Wendel <lanius@gentoo.org> opera-8.00.ebuild:
   bug #90575
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index cce1a8698e62..ea681a920f6a 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 51148a51327e942fc452fe5df7770df1 opera-8.00.ebuild 3884
+MD5 01426dd3966bd8b87bb4f3d62b8dfdae opera-8.00.ebuild 4000
 MD5 5463e4e9248ca2539d6c431f29746451 ChangeLog 15769
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 c466a4f4004881b5d1f51c8e68a0d507 opera-7.54-r3.ebuild 4987
-MD5 5fde404310e76e32c90caff003dbbbb8 files/digest-opera-8.00 368
+MD5 06ccbf91b7fae6ed2c219e85e1648178 files/digest-opera-8.00 92
 MD5 05a269373a205b54700e2265119951a0 files/digest-opera-7.54-r3 372
+MD5 3fbc8c365c121ec93a041532f07942f7 files/opera-qt.patch 328
 MD5 bafbdb86632b055a10fe826d16ea5b7f files/opera.desktop 147
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCeGpSevY57Fted3ERArI5AJ9Eng6Aaj3wIWOP5qvNZwg6/wYqCQCdFSjU
-sx1SEluyI7d8i0NPI92uPks=
-=NCl4
------END PGP SIGNATURE-----
diff --git a/www-client/opera/files/digest-opera-8.00 b/www-client/opera/files/digest-opera-8.00
index bd2945ae9c0c..429fb6be6e44 100644
--- a/www-client/opera/files/digest-opera-8.00
+++ b/www-client/opera/files/digest-opera-8.00
@@ -1,4 +1 @@
-MD5 94d1d86f42d9aa912c288e47c4b3893f opera-8.0-20050415.1-static-qt.i386-en.tar.bz2 5176406
 MD5 3046e9c38f195f211a5fd4fd7bbf7da7 opera-8.0-20050415.5-shared-qt.i386-en.tar.bz2 3975323
-MD5 da6f20e3e881ca3c92024758dbe473d2 opera-8.0-20050415.1-static-qt.sparc-en.tar.bz2 5127313
-MD5 5fe172a95df147f709af5bff021edc15 opera-8.0-20050415.1-static-qt.ppc-en.tar.bz2 5280174
diff --git a/www-client/opera/files/opera-qt.patch b/www-client/opera/files/opera-qt.patch
new file mode 100644
index 000000000000..b1f3e39a4e34
--- /dev/null
+++ b/www-client/opera/files/opera-qt.patch
@@ -0,0 +1,13 @@
+--- opera.org	2005-05-14 16:28:03.000000000 +0200
++++ opera	2005-05-14 16:28:46.000000000 +0200
+@@ -195,6 +195,9 @@
+     fi
+ done
+ 
++QTSTYLE=$(cat ~/.qt/qtrc | grep style=)
++STYLE=${QTSTYLE:6}
++
+ # Running Opera
+-eval exec "'${OPERA_BINARYDIR}opera' $passflags"
++eval exec "'${OPERA_BINARYDIR}opera' $passflags -style $STYLE"
+ 
diff --git a/www-client/opera/opera-8.00.ebuild b/www-client/opera/opera-8.00.ebuild
index 30e75cf5ff74..b3039756893c 100644
--- a/www-client/opera/opera-8.00.ebuild
+++ b/www-client/opera/opera-8.00.ebuild
@@ -1,8 +1,10 @@
 # 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.00.ebuild,v 1.4 2005/05/04 06:21:19 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-8.00.ebuild,v 1.5 2005/05/14 14:38:47 lanius Exp $
 
-IUSE="static spell"
+inherit eutils
+
+IUSE="static spell qt kde"
 
 OPERAVER="8.0-20050415"
 OPERAFTPDIR="800/final/en"
@@ -106,6 +108,11 @@ src_install() {
 		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.patch
+	fi
 }
 
 pkg_postinst() {