Add libXinerama dependency for qt4 build thanks to Piotr Szymaniak (bug #271990). Readd x86-fbsd.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 27 insertions, 8 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 96c9365d0e74..3ced4da7d8a8 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.346 2009/05/27 16:59:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.347 2009/06/02 07:18:06 jer Exp $
+
+  02 Jun 2009; Jeroen Roovers <jer@gentoo.org> opera-10.00_pre4394.ebuild:
+  Add libXinerama dependency for qt4 build thanks to Piotr Szymaniak (bug
+  #271990). Readd x86-fbsd.
 
   27 May 2009; Jeroen Roovers <jer@gentoo.org> -opera-10.00_pre4205.ebuild,
   -opera-10.00_pre4214.ebuild, -opera-10.00_pre4268.ebuild:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 378dd624a4f7..a7127c3da62c 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -19,6 +19,7 @@ DIST opera-10.00-4345.gcc4-shared-qt3.i386.tar.bz2 7916342 RMD160 c68b3419da329e
 DIST opera-10.00-4345.gcc4-shared-qt3.ppc.tar.bz2 7996057 RMD160 42998dde167fced54bc22fce15729fc0ea9b0680 SHA1 fe9c9bf523c7aab2aaf46b813e17aa56d72dbba6 SHA256 09a1d4be9a9443e9df12267cf919e4646fb7131eed7a3166b2927fd2f8e3e297
 DIST opera-10.00-4345.gcc4-shared-qt3.x86_64.tar.bz2 8576054 RMD160 0003404cdce43f4cfaf8f859e2d2a1770bcb76ce SHA1 d3d74f10c1161b5d1507ae1b67494c3c920f1ca0 SHA256 98a26a73380754095219bfc94dce90eb7d3c014072eeba5870ef5ef731dd2b67
 DIST opera-10.00-4345.gcc4-static-qt3.i386.tar.bz2 9820822 RMD160 4cd7ab13fb6cda667c5fed03a111631ee7fe247d SHA1 922f518b82275c5ef6512f086bc9c23b21d2ecda SHA256 dafff18e7d51d8464d67d1538b09a60aac6e4c3974d6be59b30544e72841ce3f
+DIST opera-10.00-4394.freebsd6-shared-qt3.i386.tar.bz2 8098382 RMD160 2fcc1443f623d350f81a7cc0f7f68431d907fc32 SHA1 6bc358ef900a69263f9e92c3c810fd7faa8c8c84 SHA256 d10f9936e0ac52b9033224a1987d8916011b1b271e7f01dc2363cd5c53ecd319
 DIST opera-10.00-4394.gcc4-qt4.i386.tar.bz2 10202166 RMD160 a49a400dbed88232d5915f8e1a8418f3c56d4cb5 SHA1 5c9a0a4848e968512988be86929c452b1400c912 SHA256 2f7f089027b9f1c45b8cf1994dc2bb4e564155c20198daa6e3b40c1e1b8a265e
 DIST opera-10.00-4394.gcc4-shared-qt3.i386.tar.bz2 7967423 RMD160 49e891777decd4f4f010dffc0131f38c08b78c39 SHA1 57c1ea848eb53177b35af7dd33eb0e2352efdeca SHA256 9ba954b54019b638ee696fff8d4a422553bb774ea2e8cd6bd7bc68a8a3b0233e
 DIST opera-10.00-4394.gcc4-shared-qt3.ppc.tar.bz2 8044122 RMD160 6a2fee957296d9da1882630c89037fc468d8abba SHA1 41a99e4ce6f38b7083370816398633d5dbab5ade SHA256 96cc5e38cfa678142d70cf10db53782a3007dde9a58c072882d2b76c83e2e99b
@@ -38,8 +39,8 @@ DIST opera-9.64.gcc4-shared-qt3.x86_64.tar.bz2 7977427 RMD160 190e22a742eeba7300
 DIST opera-9.64.gcc4-static-qt3.i386.tar.bz2 9273212 RMD160 338c780de3d9495d3c27f6bba9b9122adb6b36e0 SHA1 3bbe6fd5ea852f6dae130ffad816034ebfb27e79 SHA256 056f3983497438878741c45ceade285387cd393d0b3469f0a8971223c1364dbf
 EBUILD opera-10.00_pre4340.ebuild 6449 RMD160 a3cb684d1ec9038f1d77d913f46eac8ee762789d SHA1 6593a3361f7d77d1aca87adb4fbacc27d75be85c SHA256 dae4cc7e8183d9997ab3f57103531aa18cbc85eb4a8729fa58076bc925485542
 EBUILD opera-10.00_pre4345.ebuild 6361 RMD160 32e809e38f8d64279e4b692ab26c6284173158ba SHA1 61edccab7580e142840b1a6a1e674e4f53c35856 SHA256 b4cf9e3204c216368eb307b5f727b793382e86fddbc283f150818e767d8cdac0
-EBUILD opera-10.00_pre4394.ebuild 6361 RMD160 21748c1fe2f791d921df91047da54571a5979f80 SHA1 f2acb12b7a228d07e4259edc27e0be118aa864a3 SHA256 5ac0e7ea325d29085a9c97a5c19a721aa3536225c6b3477b1af2f23a8d48962c
+EBUILD opera-10.00_pre4394.ebuild 6597 RMD160 00dce84b665b0d4787236d8dda89726b3a6e8e47 SHA1 a0da5c0fd86ce2c0fc3384c471354279322b01f3 SHA256 9b259b1b804b68174c566aa5a55218788593df066ae66209c4416c6130b44c3c
 EBUILD opera-9.27.ebuild 6053 RMD160 fa86d79c0a1beae6d3605467122c2a5451b21bff SHA1 32d8ea747f757e99ce0af0c456c4aed71a660689 SHA256 4b0d2bb5bbbdc1eb4cee89f717d6bdc556337fb4d7e7973c216292d1f4cd8fee
 EBUILD opera-9.64.ebuild 7896 RMD160 0c981a40e72c64929e06cb3643e0a04ab538202d SHA1 64fcac7617e01be342ac7b0c2c65a38b9a867d92 SHA256 6eb45e59ecf811df18afc8ff52cb48d3608060a5c76c883abfa8772388dd7806
-MISC ChangeLog 67141 RMD160 a5694b8effa1cbb51723cd7d9e9083daee696354 SHA1 524c6881c9b973c8124faa0953e04483bf8ce395 SHA256 603003e8ced851f60e5fcb25a19b37b316c4f02a8577d4369a79035c47c04a8b
+MISC ChangeLog 67319 RMD160 66157059586754d7e7e44ce37206c1c4549c4a08 SHA1 207280698a3d5c0a35c082c82a6286bf968cc304 SHA256 fa7ab97314660a7499064e6a25463bd236a5e3a890f265df8c6817ec9034bb5b
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-10.00_pre4394.ebuild b/www-client/opera/opera-10.00_pre4394.ebuild
index 434cdd7848d6..efbbbfc8b901 100644
--- a/www-client/opera/opera-10.00_pre4394.ebuild
+++ b/www-client/opera/opera-10.00_pre4394.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4394.ebuild,v 1.1 2009/05/27 16:31:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4394.ebuild,v 1.2 2009/06/02 07:18:06 jer Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.opera.com/"
 
 SLOT="0"
 LICENSE="OPERA-9.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 RESTRICT="mirror strip test"
 
@@ -56,6 +56,7 @@ SRC_URI="
 			!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
 		)
 	)
+	x86-fbsd? ( ${O_U}intel-freebsd/${O_P}.freebsd6-shared-qt3.i386.tar.bz2 )
 	"
 
 DEPEND=">=sys-apps/sed-4"
@@ -76,23 +77,36 @@ RDEPEND="
 	x11-libs/libICE
 	x86? (
 		qt-static? (
-			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+			!qt3? (
+				x11-libs/libXinerama
+				x11-libs/qt-core
+				x11-libs/qt-gui
+			)
 		)
 		!qt-static? (
 			qt3? ( =x11-libs/qt-3*[-immqt] )
-			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+			!qt3? (
+				x11-libs/libXinerama
+				x11-libs/qt-core
+				x11-libs/qt-gui
+			)
 		)
 	)
 	ppc? ( =x11-libs/qt-3*[-immqt] )
 	amd64? (
 		ia32? (
 			qt-static? (
-				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+				!qt3? (
+					x11-libs/libXinerama
+					x11-libs/qt-core
+					x11-libs/qt-gui
+				)
 			)
 			!qt-static? ( =x11-libs/qt-3*[-immqt] )
 		)
 		!ia32? ( =x11-libs/qt-3*[-immqt] )
 	)
+	x86-fbsd? ( =x11-libs/qt-3*[-immqt] )
 	"
 
 opera_linguas() {