Remove old. Add beta2.

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

5 files changed, 77 insertions, 545 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 9477fdd200fd..559dd63d7c17 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,13 @@
 # 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.367 2009/07/16 13:49:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.368 2009/07/17 15:29:23 jer Exp $
+
+*opera-10.00_pre4492 (17 Jul 2009)
+
+  17 Jul 2009; Jeroen Roovers <jer@gentoo.org> -opera-10.00_pre4340.ebuild,
+  -opera-10.00_pre4345.ebuild, -opera-10.00_pre4394.ebuild,
+  +opera-10.00_pre4492.ebuild:
+  Remove old. Add beta2.
 
 *opera-10.00_pre4493 (16 Jul 2009)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index bf55ba0e880d..40ff83a3336b 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -8,23 +8,6 @@ AUX opera-9.50-pluginpath.patch 425 RMD160 53d3c9755eee6f836b9ca446512963de9c8c3
 AUX opera-freedesktop.patch 995 RMD160 9ebe36fa34b25a4ab151033a10f7b53494cb4a4a SHA1 e1613110be5c4c4061227776db590f069041f525 SHA256 dc5e4b56ae89049e9708fa3180f375b2de795219fff7d868b8dbbffd99fd7ec5
 AUX opera-gentoo.patch 2276 RMD160 6b68de743af9f420454e0555d242643dbcb45470 SHA1 7dbf662019b7e07df515d27f1519a0da86dce765 SHA256 bcfd73704420fd3bf4a191c1a018b4bb209031aab505544b5e95c24702b9ef01
 AUX opera-simplify-desktop.patch 637 RMD160 017fea605f8a81aa4f48b6cc3081c990fffa3842 SHA1 eb2011ef0d4f8754bb43b506e27ef7b622ab8e91 SHA256 c0009b41727023b3d03faa7c891764d886e92641cb57d8fa762353c9137e0a74
-DIST opera-10.00-4340.freebsd5-static-qt3.i386.tar.bz2 9962747 RMD160 0e91c0d308a5024c0d37b0271f511c7f9445be7d SHA1 8905eac25b998728c25fbbc402f7ae19959a3dab SHA256 ff931e8eb0399cc125a05ef2ed0708f1347014c7169da3e1f95ae5a1f542a1d4
-DIST opera-10.00-4340.gcc4-qt4.i386.tar.bz2 7877668 RMD160 a07da1c22841c2a6ae713939e03ccb8212c55eba SHA1 38cbf8d74b8de4f63fe5d065bc4af0bdbc6e7b99 SHA256 8e7892d478f704fa9b0e8a8b674cae0baac8e0b4beb8aaa3f4bd7469a84d7cc6
-DIST opera-10.00-4340.gcc4-shared-qt3.i386.tar.bz2 7913506 RMD160 a895b130053c183384171729c8b567a315d1f874 SHA1 ec144ce36386b4e8303fc9ce1d83d9cc2b1aa618 SHA256 6616583b9b993bf53c27e82f8e6da167fc900f155493ff8604dad05055127b73
-DIST opera-10.00-4340.gcc4-shared-qt3.ppc.tar.bz2 7990321 RMD160 b95dbe15ca92d453f5a40ece33289b77cbd8fe85 SHA1 39ffbe986ef27e5ef429db14bdf85c4671376714 SHA256 927c162470d321b87492da8e476889070d302822de7ce1f1ea381916e26f588d
-DIST opera-10.00-4340.gcc4-shared-qt3.x86_64.tar.bz2 8572030 RMD160 e265750459cc82c70846d9326e8ab2f375ad4a9a SHA1 31b711b320a7ca6819c8a1146675e3d7c82f788e SHA256 2168956c673e546341af3d2a2518db8b2cf700b4f892efc8c744656ccccec5bf
-DIST opera-10.00-4340.gcc4-static-qt3.i386.tar.bz2 9812566 RMD160 56fb3ab9ec33ea2a8ad28bbc420026bcc031425c SHA1 e339bd6691e2a5bab8db2e566c3e523cfd7658b8 SHA256 62a8ccc2b0ddcd2627ab6a5ff1347d6b40f0042f54d73368021db6d74fb4ff8d
-DIST opera-10.00-4345.gcc4-qt4.i386.tar.bz2 7884916 RMD160 832c006e66c05df12699dffd13fb073617dbd659 SHA1 d1182c2dc6f5ce587b1830787dd35d7c4526b8dc SHA256 a04265ea9f0a7c37a25dad60bedf137802730ffca125f5b6633afe7f3eeb1130
-DIST opera-10.00-4345.gcc4-shared-qt3.i386.tar.bz2 7916342 RMD160 c68b3419da329e9e0f85c516484fc575c5c6a4a5 SHA1 71ec68272ec800a29456af524250bb528b4ad7e4 SHA256 2707d7bab3fb0165908b2d33d99bb7a850c45ed4e8b294abcfb09ed254edf054
-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
-DIST opera-10.00-4394.gcc4-shared-qt3.x86_64.tar.bz2 8626279 RMD160 62dba7fe1f6f8c15ddc21e2e36129d5d3a9e03e8 SHA1 584523cc6ef612b22f764097bfaaf76a449c376e SHA256 6d6c4538458c5c6114c38e372fbfcd11a86514d98ff0566dd8dc9bce3be8cc3c
-DIST opera-10.00-4394.gcc4-static-qt3.i386.tar.bz2 9876602 RMD160 c21700d44500cb35c549c60578445f17f53c8714 SHA1 f14a0db2b77b50c4b9362d721e947da8c0de0b95 SHA256 ae625865de120a97d4d49b4958c2345fc28d0763d77a005d175f596cdad5ec0a
 DIST opera-10.00-4440.freebsd5-shared-qt3.i386.tar.bz2 9734039 RMD160 e6357bcc03b30cdb5da43629948af5e441dcf083 SHA1 9d78fbdfd9f9de60acd66816a9546f70a3cab65a SHA256 fcc7ba27ec177a744a9cf5178a9475b16b4a714e5fae0d33eac225008fc02d07
 DIST opera-10.00-4440.gcc4-shared-qt3.i386.tar.bz2 9545030 RMD160 7711689e1045e34a2121f328a6529b5f62756264 SHA1 b7a58c588e484f985369eb712ea322dc956121ef SHA256 503841ff45735c0a7159c379656d09b4e1e47cd5d06af944e910513344666331
 DIST opera-10.00-4440.gcc4-shared-qt3.ppc.tar.bz2 9638292 RMD160 e7fcb8bf0aef99331105a5d340ed72f6e9420655 SHA1 434e73948eac661d87afacc9f741fb62d1c1113b SHA256 dee2c9e49f947564cd96b0d56d1ce900f2ac76ee9583fac60ff36e15fe9248bb
@@ -82,6 +65,14 @@ DIST opera-10.00-b1.gcc4-shared-qt3.i386.tar.bz2 6379639 RMD160 c775f171a17a1aaa
 DIST opera-10.00-b1.gcc4-shared-qt3.ppc.tar.bz2 6448810 RMD160 c333938c51a598fb7620a00f886b46048199ba64 SHA1 c361bc13a76378fe1ae282ae72d35f90b558a38f SHA256 3a9f96e156dafae96987fcd1b217d8e169a6ff6df10df1b4de74f210d4e2c5ca
 DIST opera-10.00-b1.gcc4-shared-qt3.x86_64.tar.bz2 7057976 RMD160 92ce81dd01fe865e895aa416b747032599aa0273 SHA1 246d724d4849d89e6a76464400c14769648c0c77 SHA256 bcf84ff047b592f371028de8ec8f6449fc649d74f69bbc2c1ba7a2dbbf475210
 DIST opera-10.00-b1.gcc4-static-qt3.i386.tar.bz2 8298037 RMD160 15eba42d27ebf5530161c73e726877d28ea33a40 SHA1 16604dd9e71951c49cb9a2a2490ed5b09fc79976 SHA256 468122db4fa8863111f88ea941d149a765154ea43e35b2de02b8dfc811675590
+DIST opera-10.00-b2-freebsd7-shared-qt3.i386.tar.bz2 6645871 RMD160 5352832d37e295554c2d88a25141b44097cb07aa SHA1 68e75ee3d5fa1fdac823c8ecb1d8e1414081f788 SHA256 4a74d7ef2a37ae01ef225a0b13063127ae830e76b4d6734902383459a5be3f50
+DIST opera-10.00-b2.gcc4-bundled-qt4.i386.tar.bz2 11443578 RMD160 9e6f75934934948cfbc209dbfb34fd5d7131ba1b SHA1 32295dee6b71b6aa7f40513d9d11435d3e91c381 SHA256 2aaeacf7fbea3bac62a2e88985a339334657b05a948ef1f3c1e202400c16464e
+DIST opera-10.00-b2.gcc4-bundled-qt4.x86_64.tar.bz2 12093579 RMD160 f9f0a1f983015d580f058145ec395fad41df7fdf SHA1 fb53427617536fab183e86045af4b7219939f35c SHA256 2a402bd5b7d28a3f5741059e97374a504d3ec040757e711e75f44590f7db8f6c
+DIST opera-10.00-b2.gcc4-qt4.i386.tar.bz2 6627175 RMD160 2179b98a7f4959743376979e3aeead70ea695966 SHA1 4e993704741d58a90d4678c60e8a9ee236a79461 SHA256 3513c7d611b30c9424ca188493cd8528bc709440f1ca47a4342ec7e7d08f0d9c
+DIST opera-10.00-b2.gcc4-qt4.x86_64.tar.bz2 7341424 RMD160 a6836305856fe69e0e0f5596f87d9924eb8a9664 SHA1 b10b158da3e6723afd54b5f60453d039a87389b5 SHA256 1c4c0dcdffd4510ef7bcaa7634ed3cf54a66b6ea14f6ec77bf3a6d5407ad2740
+DIST opera-10.00-b2.gcc4-shared-qt3.i386.tar.bz2 6542676 RMD160 d313f4144fc2d93d8ac6727dcb73e8790c421b35 SHA1 7ec5ed81bc2c81488d2f91aad46dcaabf17a471a SHA256 99585fd25fc2e4da8968eef9ebf59a26d23f687c66605340adaf10c622c295a8
+DIST opera-10.00-b2.gcc4-shared-qt3.ppc.tar.bz2 6728014 RMD160 8ba0f17658f32ca2084e23f48eb84d229d44e3c0 SHA1 e9cffd1ef148210c54ee53471b7078e3d684cf0b SHA256 aeb742e3520d477fef0b9d5413ebe584faeaa9e509fe19d312cbe8779bebda39
+DIST opera-10.00-b2.gcc4-shared-qt3.x86_64.tar.bz2 7339869 RMD160 01924927985e8776afd048300439d3a11820be5f SHA1 1ccd991373d33c3f2b1603e07fa71c55f8e82861 SHA256 67f198b9a7d865b7524a032600fc0c9f73becbc3e7c5c668f50ee39538686e22
 DIST opera-9.27-20080331.1-static-qt.i386-en.tar.bz2 6813669 RMD160 353adab3fa9a401720264738ea7494c184b0df2e SHA1 4fee1c05b31be9e11fbe78c127809c3f550b775a SHA256 3f76e709ee4896abb8aa5dfc5ce7c1b75f476faf947c1f6bb8b125d0726bc031
 DIST opera-9.27-20080331.1-static-qt.i386.freebsd-en.tar.bz2 6561843 RMD160 14264eb3e249e4c23625f9a8d521a84d382077fd SHA1 8853366a874cb18a6eff86b7ce5c63923984e0a3 SHA256 ac695d429e859f2764d4c3d80798b0bcce9a8670c83ebe61ef568d197bd61aab
 DIST opera-9.27-20080331.1-static-qt.ppc-en.tar.bz2 6860940 RMD160 5e109dabb20cc8d7afc6a2ef96e274f5e4eb973c SHA1 3a6e8d565ed3a2d0373be3e36324818a7e54fedb SHA256 f3dff4eae0092a55868aa778aa14000407a13e7909f0e493c1a38c58c2bdc56d
@@ -94,9 +85,6 @@ DIST opera-9.64.gcc4-shared-qt3.i386.tar.bz2 7346107 RMD160 f8f653ff28e161590a8c
 DIST opera-9.64.gcc4-shared-qt3.ppc.tar.bz2 7412197 RMD160 462de804d8d0227a9a7ffce38ed1cf594fa07ea2 SHA1 b3866c329f99e395f5468519acdfdce6b83b40d2 SHA256 1c3463507109a77600eb70bd09343958387445093bdd44f498080fad17f963c9
 DIST opera-9.64.gcc4-shared-qt3.x86_64.tar.bz2 7977427 RMD160 190e22a742eeba7300871a8f25372ba2349c3a22 SHA1 1c8c406a9b64706d07cba999c2958ca1112603c4 SHA256 09597b25e351ff09c4f98cbf1b687ee11bc3a763816824375e1f6555ed6b2899
 DIST opera-9.64.gcc4-static-qt3.i386.tar.bz2 9273212 RMD160 338c780de3d9495d3c27f6bba9b9122adb6b36e0 SHA1 3bbe6fd5ea852f6dae130ffad816034ebfb27e79 SHA256 056f3983497438878741c45ceade285387cd393d0b3469f0a8971223c1364dbf
-EBUILD opera-10.00_pre4340.ebuild 6451 RMD160 01e671fe8925f019e986e8a7558943afb2bb0944 SHA1 7121e4c590bd9d7446b7189e22eea08b60e508f1 SHA256 c89d46aa956f4b196e2cac433e680cd7aabad6b6b8ad7fe0419c9e45ec52b72d
-EBUILD opera-10.00_pre4345.ebuild 6363 RMD160 010f670f2fdc0751c04a3960672d2e028ba05af2 SHA1 66bad3bfd2ec222af50cde26bd0c399f9fd534ca SHA256 5a5b127f4abc3c2d7b186d54a1b2f3c0b95294d793140f8d9db05368e2bf03e9
-EBUILD opera-10.00_pre4394.ebuild 6599 RMD160 3faefcc72b7a2789a71f4ae0a9f054e8f1510f73 SHA1 a923730c06e3e241f0032a80036c654ebba1917f SHA256 b304b14c0e5b0772f170d9901dbb66977054413b96e6136b5cbe8ad8d12d833f
 EBUILD opera-10.00_pre4402.ebuild 6739 RMD160 922a9e7e09a60c992bc696002906f8c1e8c1bb7c SHA1 57761c93366cdcc8c5cd9eac3f773841eac777f4 SHA256 897d2590799fa71081d83a07cf57334e9066e897ce124c4a4fcba0228af8d3b6
 EBUILD opera-10.00_pre4440.ebuild 5838 RMD160 243ab65682f64f976fce12d42a8496e8ffc69abc SHA1 8b1f0c261b49f336be89f1c3008d35244d07f0af SHA256 c06d26e87b2f3b5329870e055d9ae4f963de5b4b89d55f63bdd1c1ee5c162811
 EBUILD opera-10.00_pre4449.ebuild 6050 RMD160 2c5a1b421f7b32734978e0d2517a2a8628afb866 SHA1 b0a18b056e616827ef6a3a3003a4dba94c22c3c3 SHA256 21ab513ed43e3fdebb0b043880f84953cebe03cd9313795a105db0b4d5ead9b6
@@ -104,8 +92,9 @@ EBUILD opera-10.00_pre4453.ebuild 6801 RMD160 9bebd15e2fecf6a856901fa055c26debae
 EBUILD opera-10.00_pre4458.ebuild 6924 RMD160 8b660bcb2e321baff95238855fec44391c3f5530 SHA1 fcd61520b541836413d82c34989c5a502bc2c4ad SHA256 26134c7c6cd3e8ec1ba7fcf7b2caefae95dbc94a8ed0a84b9b23190aecf59854
 EBUILD opera-10.00_pre4464.ebuild 6084 RMD160 d8ac2b32476b03374b46ddd7d6cab3035bb0ff82 SHA1 df5d0ba3d1da381a798db6a8055583519bf655b7 SHA256 1f6d65a6df9df34d5d279ef77de867bdf9bba4173e831254b583d56c4f88261f
 EBUILD opera-10.00_pre4478.ebuild 6880 RMD160 7206fde64772940710cd3f92bf15e3f072ba745d SHA1 1dedd2c439f945ef168530853b35f43c19dd87c2 SHA256 6a5f10db1f490624282309ffd923283d2c74277f09235c7e5081f85f1e4faa53
+EBUILD opera-10.00_pre4492.ebuild 6815 RMD160 a6e6e6db1c69c124b47a2555a69f2d41a1d64800 SHA1 b7d1f3c3696c6fbc2880f5c641a29c6f08c9c8aa SHA256 f74391510bc02ce52648d16f4a7e661b9300ab7c74e4b91a547df6fa59785abc
 EBUILD opera-10.00_pre4493.ebuild 6880 RMD160 57f024e53b2dd1269e3e3a3e5c36c6e45139d5fa SHA1 f8d3f6a2a8de698dce3412c8c941197625b5c3f4 SHA256 cf016704d6a311979ccfc52da17bf9a01b850250820c4011c582e66355abe18e
 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 70930 RMD160 9675094bfbea8347e0b578970fc1c7d22e9d1473 SHA1 340d32a1fdf8391efd4654f9196b359548e737c9 SHA256 27152f6d9d81194090a2047e83c55e283b8fe1ea5d1c42a31c0686802755fb5d
+MISC ChangeLog 71159 RMD160 97b7dc307601da7678bc74d2c441eb3b79e5a5dc SHA1 9bc1dd39356e2bde166dade627b088a7c566ad1e SHA256 6bea3ad4e37572cc4b818146ac4ceef05b66dfb149447cf7b891fcf5cc3efe99
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-10.00_pre4345.ebuild b/www-client/opera/opera-10.00_pre4345.ebuild
deleted file mode 100644
index d5a5867f6ded..000000000000
--- a/www-client/opera/opera-10.00_pre4345.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# 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_pre4345.ebuild,v 1.3 2009/07/09 18:57:05 jer Exp $
-
-EAPI="2"
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-10.00"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RESTRICT="mirror strip test"
-
-IUSE="elibc_FreeBSD gnome ia32 qt-static qt3"
-MY_LINGUAS="be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka ko lt mk nb nl nn pl pt pt-BR ru sv ta te tr uk zh-CN zh-TW"
-
-for MY_LINGUA in ${MY_LINGUAS}; do
-	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
-done
-
-O_U="http://snapshot.opera.com/unix/snapshot-${P##*_pre}/"
-O_P="${P/_pre/-}"
-
-SRC_URI="
-	qt-static? (
-		ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-		x86? (
-			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-			)
-		amd64? (
-			ia32? (
-				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-			)
-			!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-		)
-	)
-	!qt-static? (
-		ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-		x86? (
-			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-		)
-		amd64? (
-			ia32? (
-				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-			)
-			!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-		)
-	)
-	"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="
-	media-libs/jpeg
-	media-libs/libexif
-	>=media-libs/fontconfig-2.1.94-r1
-	x11-libs/libXrandr
-	x11-libs/libXp
-	x11-libs/libXmu
-	x11-libs/libXi
-	x11-libs/libXft
-	x11-libs/libXext
-	x11-libs/libXcursor
-	x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE
-	x86? (
-		qt-static? (
-			!qt3? ( 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 )
-		)
-	)
-	ppc? ( =x11-libs/qt-3*[-immqt] )
-	amd64? (
-		ia32? (
-			qt-static? (
-				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
-			)
-			!qt-static? ( =x11-libs/qt-3*[-immqt] )
-		)
-		!ia32? ( =x11-libs/qt-3*[-immqt] )
-	)
-	"
-
-opera_linguas() {
-	# Remove unwanted LINGUAS:
-	local LINGUA
-	local LNGDIR="${D}/opt/opera/share/opera/locale"
-	einfo "Keeping these locales: ${LINGUAS}."
-	for LINGUA in ${MY_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}"
-		fi
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-	if [[ ! -d ${S} ]]; then
-		cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
-		S="$(pwd)"
-		einfo "Setting WORKDIR to ${S}"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-simplify-desktop.patch"
-	epatch "${FILESDIR}/${PN}-freedesktop.patch"
-
-	# bug #181300:
-	if use elibc_FreeBSD; then
-		epatch "${FILESDIR}/${PN}-10.00-pluginpath-fbsd.patch"
-	else
-		epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
-	fi
-
-	sed -i 	-e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
-		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
-		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-		install.sh || die "sed failed"
-}
-
-src_configure() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a configure script exists.
-	true
-}
-
-src_compile() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a Makefile exists.
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-
-	# Opera's native installer.
-	./install.sh --prefix="${D}"/opt/opera || die "install.sh failed"
-
-	einfo "It is safe to ignore warnings about failed checksums"
-	einfo "and about files that would be ignored ..."
-	einfo "Completing the installation where install.sh abandoned us ..."
-
-	# 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
-
-	dosed /opt/opera/bin/opera
-	dosed /opt/opera/share/opera/java/opera.policy
-
-	# Adapt desktop file to Gnome when needed
-	use gnome && sed -i -e s:"GenericName\[":"Comment\[": "${D}"/usr/share/applications/opera.desktop
-
-	# Install a symlink /usr/bin/opera
-	dodir /usr/bin
-	dosym /opt/opera/bin/opera /usr/bin/opera
-
-	dodir /etc/revdep-rebuild
-	echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > "${D}"/etc/revdep-rebuild/90opera
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${PN}/ | \
-		while read i; do
-			if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
-			then
-				export SANITY_CHECK_LIBZ_FAILED=1
-				break
-			fi
-			sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i"
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
-	fi
-
-	# Add the Opera man dir to MANPATH:
-	insinto /etc/env.d
-	echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera
-
-	[[ -z MY_LINGUAS ]] || opera_linguas
-}
-
-pkg_postinst() {
-	use gnome && gnome2_pkg_postinst
-
-	elog "To change the UI language, choose [Tools] -> [Preferences], open the"
-	elog "[General] tab, click on [Details...] then [Choose...] and point the"
-	elog "file chooser at /opt/opera/share/opera/locale/, then enter the"
-	elog "directory for the language you want and [Open] the .lng file."
-
-	elog
-	elog "To use the spellchecker (USE=spell) for languages other than English, do:"
-	elog " emerge app-dicts/myspell-[your language]"
-	elog " mkdir \${HOME}/.opera/dictionaries"
-	elog " cd \${HOME}/.opera/dictionaries"
-	elog " ln -s /usr/share/myspell/*.{aff,dic} ."
-	elog "A future release of Opera 10 should remedy this inconvenience."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	elog
-	elog "The current Opera builds may still have issues with plugins, notably"
-	elog "www-plugins/adobe-flash. See also https://bugs.gentoo.org/198162"
-}
-
-pkg_postrm() {
-	use gnome && gnome2_pkg_postrm
-}
diff --git a/www-client/opera/opera-10.00_pre4394.ebuild b/www-client/opera/opera-10.00_pre4394.ebuild
deleted file mode 100644
index 0e2654cde0a3..000000000000
--- a/www-client/opera/opera-10.00_pre4394.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# 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.3 2009/07/09 18:57:05 jer Exp $
-
-EAPI="2"
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-10.00"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RESTRICT="mirror strip test"
-
-IUSE="elibc_FreeBSD gnome ia32 qt-static qt3"
-MY_LINGUAS="be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka ko lt mk nb nl nn pl pt pt-BR ru sv ta te tr uk zh-CN zh-TW"
-
-for MY_LINGUA in ${MY_LINGUAS}; do
-	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
-done
-
-O_U="http://snapshot.opera.com/unix/snapshot-${P##*_pre}/"
-O_P="${P/_pre/-}"
-
-SRC_URI="
-	qt-static? (
-		ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-		x86? (
-			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-			)
-		amd64? (
-			ia32? (
-				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-			)
-			!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-		)
-	)
-	!qt-static? (
-		ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-		x86? (
-			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-		)
-		amd64? (
-			ia32? (
-				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-			)
-			!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"
-
-RDEPEND="
-	media-libs/jpeg
-	media-libs/libexif
-	>=media-libs/fontconfig-2.1.94-r1
-	x11-libs/libXrandr
-	x11-libs/libXp
-	x11-libs/libXmu
-	x11-libs/libXi
-	x11-libs/libXft
-	x11-libs/libXext
-	x11-libs/libXcursor
-	x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE
-	x86? (
-		qt-static? (
-			!qt3? (
-				x11-libs/libXinerama
-				x11-libs/qt-core
-				x11-libs/qt-gui
-			)
-		)
-		!qt-static? (
-			qt3? ( =x11-libs/qt-3*[-immqt] )
-			!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/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() {
-	# Remove unwanted LINGUAS:
-	local LINGUA
-	local LNGDIR="${D}/opt/opera/share/opera/locale"
-	einfo "Keeping these locales: ${LINGUAS}."
-	for LINGUA in ${MY_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}"
-		fi
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-	if [[ ! -d ${S} ]]; then
-		cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
-		S="$(pwd)"
-		einfo "Setting WORKDIR to ${S}"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-simplify-desktop.patch"
-	epatch "${FILESDIR}/${PN}-freedesktop.patch"
-
-	# bug #181300:
-	if use elibc_FreeBSD; then
-		epatch "${FILESDIR}/${PN}-10.00-pluginpath-fbsd.patch"
-	else
-		epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
-	fi
-
-	sed -i 	-e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
-		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
-		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-		install.sh || die "sed failed"
-}
-
-src_configure() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a configure script exists.
-	true
-}
-
-src_compile() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a Makefile exists.
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-
-	# Opera's native installer.
-	./install.sh --prefix="${D}"/opt/opera || die "install.sh failed"
-
-	einfo "It is safe to ignore warnings about failed checksums"
-	einfo "and about files that would be ignored ..."
-	einfo "Completing the installation where install.sh abandoned us ..."
-
-	# 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
-
-	dosed /opt/opera/bin/opera
-	dosed /opt/opera/share/opera/java/opera.policy
-
-	# Adapt desktop file to Gnome when needed
-	use gnome && sed -i -e s:"GenericName\[":"Comment\[": "${D}"/usr/share/applications/opera.desktop
-
-	# Install a symlink /usr/bin/opera
-	dodir /usr/bin
-	dosym /opt/opera/bin/opera /usr/bin/opera
-
-	dodir /etc/revdep-rebuild
-	echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > "${D}"/etc/revdep-rebuild/90opera
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${PN}/ | \
-		while read i; do
-			if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
-			then
-				export SANITY_CHECK_LIBZ_FAILED=1
-				break
-			fi
-			sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i"
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
-	fi
-
-	# Add the Opera man dir to MANPATH:
-	insinto /etc/env.d
-	echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera
-
-	[[ -z MY_LINGUAS ]] || opera_linguas
-}
-
-pkg_postinst() {
-	use gnome && gnome2_pkg_postinst
-
-	elog "To change the UI language, choose [Tools] -> [Preferences], open the"
-	elog "[General] tab, click on [Details...] then [Choose...] and point the"
-	elog "file chooser at /opt/opera/share/opera/locale/, then enter the"
-	elog "directory for the language you want and [Open] the .lng file."
-
-	elog
-	elog "To use the spellchecker (USE=spell) for languages other than English, do:"
-	elog " emerge app-dicts/myspell-[your language]"
-	elog " mkdir \${HOME}/.opera/dictionaries"
-	elog " cd \${HOME}/.opera/dictionaries"
-	elog " ln -s /usr/share/myspell/*.{aff,dic} ."
-	elog "A future release of Opera 10 should remedy this inconvenience."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	elog
-	elog "The current Opera builds may still have issues with plugins, notably"
-	elog "www-plugins/adobe-flash. See also https://bugs.gentoo.org/198162"
-}
-
-pkg_postrm() {
-	use gnome && gnome2_pkg_postrm
-}
diff --git a/www-client/opera/opera-10.00_pre4340.ebuild b/www-client/opera/opera-10.00_pre4492.ebuild
index 5bcea5bfc9e3..27069c07ff4d 100644
--- a/www-client/opera/opera-10.00_pre4340.ebuild
+++ b/www-client/opera/opera-10.00_pre4492.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_pre4340.ebuild,v 1.4 2009/07/09 18:57:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4492.ebuild,v 1.1 2009/07/17 15:29:23 jer Exp $
 
 EAPI="2"
 
@@ -16,47 +16,48 @@ LICENSE="OPERA-10.00"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 RESTRICT="mirror strip test"
+QA_DT_HASH="opt/${PN}/.*"
 
-IUSE="elibc_FreeBSD gnome ia32 qt-static qt3"
-MY_LINGUAS="be bg cs da de el en en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka ko lt mk nb nl nn pl pt pt-BR ru sv ta te tr uk zh-CN zh-TW"
+IUSE="elibc_FreeBSD gnome ia32 qt3 qt-static"
+MY_LINGUAS="zh-CN zh-HK zh-TW"
 
 for MY_LINGUA in ${MY_LINGUAS}; do
 	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
 done
 
-O_U="http://snapshot.opera.com/unix/snapshot-${P##*_pre}/"
-O_P="${P/_pre/-}"
+O_U="mirror://opera/"
+
+# 1) Please check for missing (qt3/qt-static) builds
+# 2) and only then update the build number manually
+OPERABUILD="b2"
+O_P="${P/_pre*/}-${OPERABUILD}"
 
 SRC_URI="
-	qt-static? (
-		ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-		x86? (
-			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
+	amd64? (
+		!ia32? (
+			qt-static? ( ${O_U}linux/1000b2/beta2/en/x86_64/${O_P}.gcc4-bundled-qt4.x86_64.tar.bz2 )
+			!qt-static? (
+				qt3? ( ${O_U}linux/1000b2/beta2/en/x86_64/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+				!qt3? ( ${O_U}linux/1000b2/beta2/en/x86_64/${O_P}.gcc4-qt4.x86_64.tar.bz2 )
 			)
-		amd64? (
-			ia32? (
-				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
+		)
+		ia32? (
+			qt-static? ( ${O_U}linux/1000b2/beta2/en/i386/${O_P}.gcc4-bundled-qt4.i386.tar.bz2 )
+			!qt-static? (
+				qt3? ( ${O_U}linux/1000b2/beta2/en/i386/shared/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+				!qt3? ( ${O_U}linux/1000b2/beta2/en/i386/${O_P}.gcc4-qt4.i386.tar.bz2 )
 			)
-			!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
 		)
 	)
-	!qt-static? (
-		ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-		x86? (
-			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-		)
-		amd64? (
-			ia32? (
-				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-			)
-			!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+	ppc? ( ${O_U}linux/1000b2/beta2/en/ppc/shared/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
+	x86? (
+		qt-static? ( ${O_U}linux/1000b2/beta2/en/i386/${O_P}.gcc4-bundled-qt4.i386.tar.bz2 )
+		!qt-static? (
+			qt3? ( ${O_U}linux/1000b2/beta2/en/i386/shared/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+			!qt3? ( ${O_U}linux/1000b2/beta2/en/i386/${O_P}.gcc4-qt4.i386.tar.bz2 )
 		)
 	)
-	x86-fbsd? ( ${O_U}intel-freebsd/${O_P}.freebsd5-static-qt3.i386.tar.bz2 )
+	x86-fbsd? ( ${O_U}unix/freebsd/1000b2/en/intel/shared/${O_P}-freebsd7-shared-qt3.i386.tar.bz2 )
 	"
 
 DEPEND=">=sys-apps/sed-4"
@@ -75,25 +76,31 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libSM
 	x11-libs/libICE
-	x86? (
-		qt-static? (
-			!qt3? ( 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 )
-		)
-	)
-	ppc? ( =x11-libs/qt-3*[-immqt] )
 	amd64? (
 		ia32? (
-			qt-static? (
+			qt-static? ( media-libs/nas )
+			!qt-static? (
+				qt3? ( =x11-libs/qt-3*[-immqt] )
+				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+			)
+		)
+		!ia32? (
+			qt-static? ( media-libs/nas )
+			!qt-static? (
+				qt3? ( =x11-libs/qt-3*[-immqt] )
 				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
 			)
-			!qt-static? ( =x11-libs/qt-3*[-immqt] )
 		)
-		!ia32? ( =x11-libs/qt-3*[-immqt] )
 	)
+	ppc? ( =x11-libs/qt-3*[-immqt] )
+	x86? (
+		qt-static? ( media-libs/nas )
+		!qt-static? (
+			qt3? ( =x11-libs/qt-3*[-immqt] )
+			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+		)
+	)
+	x86-fbsd? ( =x11-libs/qt-3*[-immqt] )
 	"
 
 opera_linguas() {
@@ -109,6 +116,12 @@ opera_linguas() {
 	done
 }
 
+pkg_setup() {
+	elog "${WARN}If you seek support, please file a bug report at${NORMAL}"
+	elog "${WARN}https://bugs.gentoo.org and post the output of${NORMAL}"
+	elog "${WARN} \`emerge --info =${CATEGORY}/${P}'${NORMAL}"
+}
+
 src_unpack() {
 	unpack ${A}
 	if [[ ! -d ${S} ]]; then
@@ -130,24 +143,17 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
 	fi
 
-	sed -i 	-e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
+	sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
 		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
 		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
 		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
 		install.sh || die "sed failed"
 }
 
-src_configure() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a configure script exists.
-	true
-}
-
-src_compile() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a Makefile exists.
-	true
-}
+# These workarounds are sadly needed because gnome2.eclass doesn't check
+# whether a configure/Makefile script exists.
+src_configure() { :; }
+src_compile() { :; }
 
 src_install() {
 	# Prepare installation directories for Opera's installer script.