Remove the old.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7-JeR i686

8 files changed, 8 insertions, 1504 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 8d12c7d6fe6e..76365bad7a82 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.291 2008/10/08 15:53:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.292 2008/10/09 04:34:02 jer Exp $
+
+  09 Oct 2008; Jeroen Roovers <jer@gentoo.org> -opera-9.60_pre2424.ebuild,
+  -opera-9.60_pre2426.ebuild, -opera-9.60_pre2430.ebuild,
+  -opera-9.60_pre2436.ebuild, -opera-9.60_pre2440.ebuild,
+  -opera-9.60_pre2444.ebuild:
+  Remove the old.
 
   08 Oct 2008; Jeroen Roovers <jer@gentoo.org> opera-9.60.ebuild:
   Fix amd64 SRC_URI thanks to Dmitry Ivankov (bug #240536).
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index d3d19db2ba79..b2920389f35e 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -19,38 +19,7 @@ DIST opera-9.52-2091.gcc4-shared-qt3.i386.tar.bz2 7017619 RMD160 819ecc3a2ca51e4
 DIST opera-9.52-2091.gcc4-shared-qt3.ppc.tar.bz2 7092910 RMD160 79d7c68053fdf1195710365ae115b9784448633c SHA1 30e6f8d464d7b3093c51c775301e18f37fd89910 SHA256 79c34e57c706bfec4b798243016920731c766ec39f3db10037cd4fcbad2d9f59
 DIST opera-9.52-2091.gcc4-shared-qt3.x86_64.tar.bz2 7620867 RMD160 1cc06937eb80940529bdc9bb0c89289803fe4e5d SHA1 60c2196432f5f1a84b9ea6d71ad3b387d755d559 SHA256 af6f5d22fea0a186210ebdce5c9ef89dc6c6d7fa7fc45256917288086f096f1a
 DIST opera-9.52-2091.gcc4-static-qt3.i386.tar.bz2 8918389 RMD160 653a13a453e78765761041f16e21b57a8b0eafef SHA1 d74e9b9ef7dcad1ea1a52563a64aec6b3945bfe8 SHA256 9120c08a313f01cda21a8c095bc442eec9095a4bf1eb53a0b06b4fabd0849845
-DIST opera-9.60-2426.freebsd5-shared-qt3.i386.tar.bz2 6001035 RMD160 e6e76a802f67895f36dc8d8f471d6413c75e3520 SHA1 21a0a3dfdff2ec865befdd8f51ca0e415970612b SHA256 0795a1b9878eb07ce49976826f592c6da4eccce241da279f5ed206d5d63723b8
-DIST opera-9.60-2426.gcc4-qt4.i386.tar.bz2 8091821 RMD160 dff029d143c3e5c604a6c762d6faf27186eb2f8f SHA1 758b44ccc2918e1c0ab5c5cb06f39d0571f0f868 SHA256 f17d634fa3d6028ddaad4bdeddd6a9af1cc051ee012a3ecf75ef62a9a170939f
-DIST opera-9.60-2426.gcc4-shared-qt3.i386.tar.bz2 5857639 RMD160 3e26486ff6b058c679fdea1390e065197d99dceb SHA1 02488ba09b404e4db3007e205a5aeb0d675446dd SHA256 56a6806ba9737d74e3898decf11f1941f3f0d8a572a013f8638e0a43ee2252b3
-DIST opera-9.60-2426.gcc4-shared-qt3.ppc.tar.bz2 5933256 RMD160 ff4c1dee44e54ccded66f99357e940a9fc6a925e SHA1 21c20f05353aa8ae4bd4f8f6038ad1ccfe4356dc SHA256 544de1afd6655ddd45806ae4d66f063d1717609f59c592f9ead0efd2dfe6fc45
-DIST opera-9.60-2426.gcc4-shared-qt3.x86_64.tar.bz2 6469662 RMD160 cf5987ed65aefc59addf404318c81ff922fdc7cb SHA1 84cef723c4a9ad0fdacd54866353385cb5d0506d SHA256 6f3f844cba186b3030d749305782780f2c955c7f36418b0b2766bcf5ddb3dad8
-DIST opera-9.60-2426.gcc4-static-qt3.i386.tar.bz2 7767094 RMD160 dfa17a2fc9147c961974f886d9c33d2b5e3fa8de SHA1 3bd36be2543eea8da0ee6007dc6d04a4d27ae42b SHA256 af383dd3c2a954be5252a8d7d213df5c711fcb9c1cabfae189040ff85ffbfdf1
-DIST opera-9.60-2430.freebsd5-shared-qt3.i386.tar.bz2 6010107 RMD160 9270da1a04a8f9f6adfcb738063d259dadf8830b SHA1 4ea637b151ee63aad3792e5eb7b8077aef7e35dd SHA256 f1c4379992500ecff526166d090d0716d0a91c8b237e9f66d2b4b5902cc7e014
-DIST opera-9.60-2430.gcc4-qt4.i386.tar.bz2 8096854 RMD160 5750857bd71857a1ac2dca551835b103de70d036 SHA1 cfd9124fbf53695f952de666aeace8fd3ac452ed SHA256 f0a605aaefbd7ed2e65d3469c8fc7b392108dff40bfcebb7e1aa911eea9a755d
-DIST opera-9.60-2430.gcc4-shared-qt3.i386.tar.bz2 5861982 RMD160 9a65a06efb95a6ac27c967f893406896d543a4ef SHA1 b4ece7f877f1522d6ccd7a74b3f06c8566370db1 SHA256 0abb1b199b560f6f59abfaaa959955ef946f339ab232e6ad2ec364aeead18aef
-DIST opera-9.60-2430.gcc4-shared-qt3.ppc.tar.bz2 5938552 RMD160 56016c91af681252ad57e2153e899ec5175fa7f5 SHA1 89a1ab457e09203543a41c3a3761a91c35d26205 SHA256 3b2c4305634c33cf81a3d1d4a65f7778eb9763afd811b6f7c6e1a930fec052bc
-DIST opera-9.60-2430.gcc4-shared-qt3.x86_64.tar.bz2 6471904 RMD160 d5a07ee184fed2137453bd4584ee93499fe1dd86 SHA1 45a65d12e432fd851a14e9afe7a22f12c05db491 SHA256 4eb375f5438a6e325d7998dfcf1edf1fab9d318b1de8c1ff3a616289181b423e
-DIST opera-9.60-2430.gcc4-static-qt3.i386.tar.bz2 7766909 RMD160 5be5e60d0876d76d176177be1cccbee6abdb8cd9 SHA1 fbb51adf0fff4e5163cd0403d4b98294981f0040 SHA256 9eddd252b7c8e716a920faceab1cb2dc824b9423a24c5dde5462893da2579162
-DIST opera-9.60-2436.freebsd5-shared-qt3.i386.tar.bz2 6909025 RMD160 72a234da91bc7066b4b1ecd0a6f63a87d6394055 SHA1 003eb391568968c40b889e9009be7bdfe3e7dfba SHA256 125bfa5fa661828445b10dcfe19a5b4aa19818183ef41abfc04c51d422951e68
-DIST opera-9.60-2436.gcc4-qt4.i386.tar.bz2 6743516 RMD160 efb378886b5a9e0e8daabfd85f3365738a7695c3 SHA1 7b30ad6beb26bae6f9f71a8693465a3c0d254724 SHA256 d6505083f0b95fb9abb466c028628e6d9045223805256a018590dc614387ec71
-DIST opera-9.60-2436.gcc4-shared-qt3.i386.tar.bz2 6780570 RMD160 5246ef78a0f6e7b7255e9e97a4b1a49a165a13d8 SHA1 c1bd2ad25af87bdb0e85decc659be1e168e012f2 SHA256 16eba03d454408a7869d641b40c8b5a430d5cfc1bb0a35a7bf59ed02b30c06e7
-DIST opera-9.60-2436.gcc4-shared-qt3.ppc.tar.bz2 6835278 RMD160 5403fc29e53963ca59f2793a7c7bd5d4b7e952f2 SHA1 e5cf3c17bb271f448289bcea00b942e8f135dd56 SHA256 9e680812b7096357a2ec3aad99aad1611618bde0c23c10f002174a72444b0cae
-DIST opera-9.60-2436.gcc4-shared-qt3.x86_64.tar.bz2 7392203 RMD160 de0df9ea7b06466071e768f2297e7a49928942a6 SHA1 a4da3990b14be86714f5869c7ea3d82fd0e6dc09 SHA256 e333414df1eae08ac2eb0f06cd6394f97dd7a6701ef01bb19895bd3819a319b1
-DIST opera-9.60-2436.gcc4-static-qt3.i386.tar.bz2 8679805 RMD160 98b5e552a3745cd4ce9a833839e8d5f2b99867ad SHA1 277016274fcbc1a7ab563b599191f780deb32f13 SHA256 07e9ccd06c2e3590d1e81ffadfcf6eac41dbc5b88d3028ed45e77c25ea4f1557
-DIST opera-9.60-2440.freebsd5-shared-qt3.i386.tar.bz2 7347021 RMD160 9c2d20aa7524f0d2e81a900e946c19a5cd7b0c13 SHA1 8729949fc4a7a693d0a67d7b2fc9120437f7f89c SHA256 e5cd811fe079e48b93566cdf7440268f7621ca626839d8ccb4357200fc4144bb
-DIST opera-9.60-2440.gcc4-qt4.i386.tar.bz2 9441173 RMD160 4d6fee832f22b57eb886a2bb5ab49ae01e0f0656 SHA1 f454ad09d366bba8fa57d11f4d496bd5bcb22496 SHA256 4aecf08fc0862ef8c23635cffd43bf717e3a50a0fbe83a3586277e1d211d1190
-DIST opera-9.60-2440.gcc4-shared-qt3.i386.tar.bz2 7220064 RMD160 71acfc948b1ee19da07ee377bdf5f7240856fcdd SHA1 913629ad315428e9df13f862fca34eecfce12a6d SHA256 9418110a7769995a3dd1e8bd26441301b7488f51aa5ee6f271fb104653f6e9e3
-DIST opera-9.60-2440.gcc4-shared-qt3.ppc.tar.bz2 7284991 RMD160 ab81de44f8544186dcf5ae826d8367ab78af2324 SHA1 e836eeea23168d7c46cf209d30d97c6d67eb906a SHA256 8269977e8d802d97c269020cad51cfc4397bc51129b17c35aff976545e1e28a0
-DIST opera-9.60-2440.gcc4-shared-qt3.x86_64.tar.bz2 7827862 RMD160 b32c8b1325cb10512fb54641b5d46aedc151c80c SHA1 b4fe4a0c641029a31998197885705bba1e348663 SHA256 d6bdbd694446e301f084a3e728c9771fcabb851874c50b65f88c71fbc01f9b15
-DIST opera-9.60-2440.gcc4-static-qt3.i386.tar.bz2 9147461 RMD160 3233e91052e04c7890adc706146d20b4cebd3dd3 SHA1 27d416ebefe6f800c254f8fa144428e14bac060b SHA256 595e3b3710c355075c3728924459231e3dda334f27aebf4f00340bfc37f2129f
-DIST opera-9.60-2444.freebsd5-shared-qt3.i386.tar.bz2 7342693 RMD160 5a6c43869123949310d565fd2d14075006b3b66d SHA1 6a0ffacb5557ab708d4aa153e36e73bd3c5edade SHA256 ff5a9f022f6dbab5faabd1195c0af5edd091218377b93698ee1c0c88562a6d04
-DIST opera-9.60-2444.gcc4-qt4.i386.tar.bz2 9440112 RMD160 47d2dfd13b792a69ca65ccdfed8a58a4385c565b SHA1 d93748e4161591e28bf5400567075b057c92d127 SHA256 0803824397ab4ad3f2e5780a8932e19d0ee08c02ef8d4c201d606a5164683fdc
-DIST opera-9.60-2444.gcc4-shared-qt3.i386.tar.bz2 7218947 RMD160 e1b41000bba8ab3b804377202e337ded6084b274 SHA1 229137e8f5f373d36b39d348e992774bc0ce094d SHA256 b136be1f245d159a947c3b3f44934c33fa51e1cceaaa64137896ecbce427d4e5
-DIST opera-9.60-2444.gcc4-shared-qt3.ppc.tar.bz2 7282185 RMD160 a1ba27d545a18edf4c8a734212d2f0d61754b0f8 SHA1 0dad99dd89495ffb76a1334e9924124288ddd38a SHA256 697b851188725f1f3b4d2412e0c0aabea65740d3ee7240338e75d0fc34267660
-DIST opera-9.60-2444.gcc4-shared-qt3.x86_64.tar.bz2 7825070 RMD160 9302b27ae78062b5f560021689f5949d1a5614a5 SHA1 fef45219fac04d9630f73355d6fe6f2d4b9fe07f SHA256 30f7165821179ba38c2c72b9eea10abc8b56e538601b92d19203776dd99799fd
-DIST opera-9.60-2444.gcc4-static-qt3.i386.tar.bz2 9142543 RMD160 ed1404eab43c07ef3494109dd310bf9606e6b5ad SHA1 c805abcc32b3b79f09b9162e268d9375703ac0bd SHA256 4f6f097ebaf3ba95f5bd35a2d7087800a4cf4e739e47e2297edb339c7797f30f
 DIST opera-9.60-freebsd5-shared-qt3.i386.tar.bz2 6717427 RMD160 ed06d7ff3ef4f8cf335dff6aac81916436b6f101 SHA1 39a30762102bc3dac1db463c7ba511808f89c551 SHA256 238665c176ab82f3da5719c2b24412aad38154ceb4401da863aadb9d7319d9bf
-DIST opera-9.60-freebsd5-static-qt3.i386.tar.bz2 8642807 RMD160 fa4313c0a94e22856219cecfaa959f9b07e8140f SHA1 14b1dc8d90c18614f29e903f323b7f9285d7460d SHA256 fd3354b9c9d4d2fa9640ded124103fb8d6dc047e0a36f74631b43f7868b49374
 DIST opera-9.60.gcc4-qt4.i386.tar.bz2 8805058 RMD160 2078250af3230901e58b4752a80f037c6c5fa9af SHA1 df58d25b6fe60c00e05bd1846a1b9891954cfe90 SHA256 445f72e5fdaa0be1000bdf1533335f12d943756b40fc9b966d10372206c00996
 DIST opera-9.60.gcc4-shared-qt3.i386.tar.bz2 6578087 RMD160 de866a16e7ea620071e29a731715523967c3b329 SHA1 acc8ebd61cfa25fd9feb8292727547c2714ddb13 SHA256 4481d47bcb2ec7f64749afb96d4054a816471678d91bc67b1b5f723e8014ce56
 DIST opera-9.60.gcc4-shared-qt3.ppc.tar.bz2 6647827 RMD160 d24a0af13340c72a101669322b3e7d1c43d7977b SHA1 a0c21c5c8b8c336605e21fba1bd45b2075e001fc SHA256 e2a23cdf56d95d2a8c69a4b71e64143d3e1122a193879b201656574f1942a939
@@ -59,11 +28,5 @@ DIST opera-9.60.gcc4-static-qt3.i386.tar.bz2 8489100 RMD160 d7c391de79f9ade7c96b
 EBUILD opera-9.27.ebuild 5937 RMD160 fe418d4b5a2f34664f46bb6bcee56b27f3d182e0 SHA1 bda2f3ec16759f92c4227203a3a22927cd3b811e SHA256 fff41046fb4e6c58fc1c4cb73df98857c1c2ea89a9c6131aa03f3ce6aee19e98
 EBUILD opera-9.52.ebuild 7332 RMD160 7d52e5124559fe06984017a23c5e9f513d801be5 SHA1 ceb20bc6ecd0fef8f58db346c27c726ace4fb4ec SHA256 179dae5f51aedc9e92006294994747d16b286ce29b1f17e8a12e5d292c0c3054
 EBUILD opera-9.60.ebuild 7649 RMD160 45e729d9b50cd081bd2826ba2024510ea9c87f6a SHA1 1c4e1e9444a7b198d7b59ff588cf5e7432e7d343 SHA256 8c005bee94f0cc63fd5d7305f809957ab365c46c4d4ffe2dbe0db9f20b8a468a
-EBUILD opera-9.60_pre2424.ebuild 7243 RMD160 4296f757d57f955b8ef16521e3ec91e116db9206 SHA1 3ece7ed59301a70d2ee52e2a69f6a840379fae24 SHA256 cf3423d5ca6754255488e35e9a5265e0eb3d9d60edb22768396d72ca01aed323
-EBUILD opera-9.60_pre2426.ebuild 6872 RMD160 17ac883d8e1ed5aa24f6b0f7f61b4930cd05e875 SHA1 531f55174e5b605777c4704cf68b1eeacdb71274 SHA256 5414a8fedfe4ed7e3a2591c209dee6a7d0a740ce8e3364abad52627c2981986d
-EBUILD opera-9.60_pre2430.ebuild 6872 RMD160 d1dd6b7855217da963d2242c841f77791d59fc8b SHA1 ddf08e9a66bdcca3734070480e06f3ef8ad96087 SHA256 373b74394f9abc907877f867f98672aa1dcc005678a44ec8bc157a249f267fa0
-EBUILD opera-9.60_pre2436.ebuild 6950 RMD160 caaafca9c8d74aefd8ec9f7a0fb9439bc6bec720 SHA1 a174fa040fbd70ac16d269b8d199800e0cab7961 SHA256 65de0384167c93ea924dda48eb97e71ea5b43026003e628171ee88ca74c7be3e
-EBUILD opera-9.60_pre2440.ebuild 7573 RMD160 e174bf51ecf4af1ac4387f3ffc02b5247cb7de4b SHA1 308cf21fa2a933254a8792614e8e50326121ddf5 SHA256 50d045ec15f211fe6290e1ff4227bde376f9af990a3860e36e33f5cea64a3724
-EBUILD opera-9.60_pre2444.ebuild 7573 RMD160 9aff4a52ec346b5f0ad787068e509b33ae89c710 SHA1 3ad7faa7e5e5d77fe6935a21f03d5bb875af86ee SHA256 0f7f0dc47dad2f123bc0cde337b0a6e02dbeada146a6e5a3369253755a3f0f38
-MISC ChangeLog 58808 RMD160 449a2c96bbe362796da8be5ee823eadd5693306a SHA1 2053ae8b94b915814229b1224401b668af9a5c13 SHA256 37a2a201d1ccfc6b5dc1db14acc06d4d9664844ff64632a880e4d56e123b85ae
+MISC ChangeLog 59048 RMD160 8515678b4b742b57b3b9a300d8deaacad9ef4786 SHA1 c2cfacd346152f1f3083fc28a88e2ebc0de12e9f SHA256 9c25335ceb15fb5c16821ffe762e65c8d7bcad6927a4f71af453d7b290ce2665
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-9.60_pre2424.ebuild b/www-client/opera/opera-9.60_pre2424.ebuild
deleted file mode 100644
index 6b802b63dad6..000000000000
--- a/www-client/opera/opera-9.60_pre2424.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.60_pre2424.ebuild,v 1.1 2008/09/10 12:59:50 jer Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-9.0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RESTRICT="strip test"
-
-IUSE="elibc_FreeBSD gnome ia32 qt-static qt3-static spell"
-MY_LINGUAS="cs de en en-GB es-ES es-LA fi fr hu it ja nb nl nn pl pt ru sv tr uk zh-CN"
-
-for MY_LINGUA in ${MY_LINGUAS}; do
-	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
-done
-
-O_URI="mirror://opera/"
-O_FTP="/960/beta1/en/"
-O_SUFF="2424"
-O_VER="${PN}-9.60"
-
-SRC_URI="
-	ppc? ( ${O_URI}linux${O_FTP}ppc/shared/${O_VER}.gcc4-shared-qt3.ppc.tar.bz2 )
-	x86-fbsd? (
-		qt-static? ( ${O_URI}unix/freebsd/960b1/en/intel/static/${O_VER}-freebsd5-static-qt3.i386.tar.bz2 )
-		!qt-static? ( ${O_URI}unix/freebsd/960b1/en/intel/shared/${O_VER}-freebsd5-shared-qt3.i386.tar.bz2 )
-	)
-	qt-static? (
-		qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}linux${O_FTP}i386/static/${O_VER}.gcc4-static-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}linux${O_FTP}x86_64/shared/${O_VER}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}linux${O_FTP}i386/static/${O_VER}.gcc4-static-qt3.i386.tar.bz2 )
-		)
-		!qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}linux${O_FTP}i386/${O_VER}.gcc4-qt4.i386.tar.bz2 )
-				!ia32? ( ${O_URI}linux${O_FTP}x86_64/shared/${O_VER}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}linux${O_FTP}i386/${O_VER}.gcc4-qt4.i386.tar.bz2 )
-		)
-	)
-	!qt-static? (
-		qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}linux${O_FTP}i386/shared/${O_VER}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}linux${O_FTP}x86_64/shared/${O_VER}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}linux${O_FTP}i386/shared/${O_VER}.gcc4-shared-qt3.i386.tar.bz2 )
-		)
-		!qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}linux${O_FTP}i386/shared/${O_VER}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}linux${O_FTP}x86_64/shared/${O_VER}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}linux${O_FTP}i386/shared/${O_VER}.gcc4-shared-qt3.i386.tar.bz2 )
-		)
-	)
-	"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="media-libs/libexif
-	media-libs/jpeg
-	>=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-static? ( =x11-libs/qt-3* ) ) )
-	amd64? (
-		ia32? ( app-emulation/emul-linux-x86-qtlibs )
-		!ia32? ( =x11-libs/qt-3* )
-	)
-	ppc? ( =x11-libs/qt-3* )
-	spell? ( app-text/aspell )
-	x86-fbsd? (
-		=virtual/libstdc++-3*
-		!qt-static? ( !qt3-static? ( =x11-libs/qt-3* ) )
-	)
-	"
-
-opera_cd() {
-	cd "${WORKDIR}"/${O_VER}* || die "failed to enter work directory"
-	S="$(pwd)"
-	einfo "Working in ${S}"
-}
-
-src_unpack() {
-	unpack ${A}
-	opera_cd
-
-	epatch "${FILESDIR}/${PN}-9.00-install.patch"
-
-	# bug #181300:
-	if use elibc_FreeBSD; then
-		epatch "${FILESDIR}/${PN}-9.50-pluginpath-fbsd.patch"
-	else
-		epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch"
-	fi
-
-	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" \
-		-e "s:/usr/share/icons:${D}/usr/share/icons:g" \
-		-e "s:/etc/X11:${D}/etc/X11:g" \
-		-e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
-		-e "s:/opt/gnome/share:${D}/opt/gnome/share:g" \
-		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-		-e 's:read str_answer:return 0:' \
-		-e "s:/opt/kde:${D}/usr/kde:" \
-		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
-		install.sh || die "sed failed"
-
-}
-
-src_compile() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a configure script or Makefile exists.
-	true
-}
-
-src_install() {
-	opera_cd
-	# 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
-
-	# Install the icons
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/opera.xpm
-
-	local res
-	for res in 16x16 22x22 32x32 48x48 ; do
-		insinto /usr/share/icons/hicolor/${res}/apps
-		doins usr/share/icons/hicolor/${res}/apps/opera.png
-	done
-
-	# Install the menu entry
-	make_desktop_entry opera Opera /usr/share/pixmaps/opera.xpm 'Network;WebBrowser;Email;FileTransfer;IRCClient'
-
-	# 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 spell; then
-		if use qt-static; then
-			DIR=${P}.1
-		else
-			use sparc && DIR=${P}.2 || DIR=${P}.5
-		fi
-		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> "${D}"/opt/opera/share/opera/ini/spellcheck.ini
-	fi
-
-	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
-
-	# 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
-}
-
-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 non-English simply do"
-	elog "$ emerge app-dicts/aspell-[your language]."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	elog "The Opera betas may still have issues with plugins, notably"
-	elog "net-www/netscape-flash. See also https://bugs.gentoo.org/198162"
-}
-
-pkg_postrm() {
-	use gnome && gnome2_pkg_postrm
-}
diff --git a/www-client/opera/opera-9.60_pre2426.ebuild b/www-client/opera/opera-9.60_pre2426.ebuild
deleted file mode 100644
index 8a690d1afb7f..000000000000
--- a/www-client/opera/opera-9.60_pre2426.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.60_pre2426.ebuild,v 1.1 2008/09/13 13:17:24 jer Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-9.0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RESTRICT="mirror strip test"
-
-IUSE="elibc_FreeBSD gnome ia32 qt-static qt3-static spell"
-MY_LINGUAS="de en nl"
-
-for MY_LINGUA in ${MY_LINGUAS}; do
-	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
-done
-
-O_SUFF="2426"
-O_P="${PN}-9.60-${O_SUFF}"
-O_URI="http://snapshot.opera.com/unix/snapshot-${O_SUFF}/"
-
-SRC_URI="
-	x86-fbsd? ( ${O_URI}intel-freebsd/${O_P}.freebsd5-shared-qt3.i386.tar.bz2 )
-	ppc? ( ${O_URI}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-	qt-static? (
-		qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-		)
-		!qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-		)
-	)
-	!qt-static? (
-		qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-		)
-		!qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-		)
-	)
-	"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="media-libs/libexif
-	media-libs/jpeg
-	>=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-static? ( =x11-libs/qt-3* ) ) )
-	amd64? (
-		ia32? ( app-emulation/emul-linux-x86-qtlibs )
-		!ia32? ( =x11-libs/qt-3* )
-	)
-	ppc? ( =x11-libs/qt-3* )
-	spell? ( app-text/aspell )
-	x86-fbsd? (
-		=virtual/libstdc++-3*
-		!qt-static? ( !qt3-static? ( =x11-libs/qt-3* ) )
-	)
-	"
-
-opera_cd() {
-	cd "${WORKDIR}"/${O_P}* || die "failed to enter work directory"
-	S="$(pwd)"
-	einfo "Working in ${S}"
-}
-
-src_unpack() {
-	unpack ${A}
-	opera_cd
-
-	epatch "${FILESDIR}/${PN}-9.00-install.patch"
-
-	# bug #181300:
-	if use elibc_FreeBSD; then
-		epatch "${FILESDIR}/${PN}-9.50-pluginpath-fbsd.patch"
-	else
-		epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch"
-	fi
-
-	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" \
-		-e "s:/usr/share/icons:${D}/usr/share/icons:g" \
-		-e "s:/etc/X11:${D}/etc/X11:g" \
-		-e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
-		-e "s:/opt/gnome/share:${D}/opt/gnome/share:g" \
-		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-		-e 's:read str_answer:return 0:' \
-		-e "s:/opt/kde:${D}/usr/kde:" \
-		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
-		install.sh || die "sed failed"
-
-}
-
-src_compile() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a configure script or Makefile exists.
-	true
-}
-
-src_install() {
-	opera_cd
-	# 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
-
-	# Install the icons
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/opera.xpm
-
-	local res
-	for res in 16x16 22x22 32x32 48x48 ; do
-		insinto /usr/share/icons/hicolor/${res}/apps
-		doins usr/share/icons/hicolor/${res}/apps/opera.png
-	done
-
-	# Install the menu entry
-	make_desktop_entry opera Opera /usr/share/pixmaps/opera.xpm 'Network;WebBrowser;Email;FileTransfer;IRCClient'
-
-	# 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 spell; then
-		if use qt-static; then
-			DIR=${P}.1
-		else
-			use sparc && DIR=${P}.2 || DIR=${P}.5
-		fi
-		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> "${D}"/opt/opera/share/opera/ini/spellcheck.ini
-	fi
-
-	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
-
-	# 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
-}
-
-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 non-English simply do"
-	elog "$ emerge app-dicts/aspell-[your language]."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	elog "The Opera betas may still have issues with plugins, notably"
-	elog "net-www/netscape-flash. See also https://bugs.gentoo.org/198162"
-}
-
-pkg_postrm() {
-	use gnome && gnome2_pkg_postrm
-}
diff --git a/www-client/opera/opera-9.60_pre2430.ebuild b/www-client/opera/opera-9.60_pre2430.ebuild
deleted file mode 100644
index 900a17753d7f..000000000000
--- a/www-client/opera/opera-9.60_pre2430.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.60_pre2430.ebuild,v 1.1 2008/09/19 14:15:35 jer Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-9.0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RESTRICT="mirror strip test"
-
-IUSE="elibc_FreeBSD gnome ia32 qt-static qt3-static spell"
-MY_LINGUAS="de en nl"
-
-for MY_LINGUA in ${MY_LINGUAS}; do
-	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
-done
-
-O_SUFF="2430"
-O_P="${PN}-9.60-${O_SUFF}"
-O_URI="http://snapshot.opera.com/unix/snapshot-${O_SUFF}/"
-
-SRC_URI="
-	x86-fbsd? ( ${O_URI}intel-freebsd/${O_P}.freebsd5-shared-qt3.i386.tar.bz2 )
-	ppc? ( ${O_URI}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-	qt-static? (
-		qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-		)
-		!qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-		)
-	)
-	!qt-static? (
-		qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-		)
-		!qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-		)
-	)
-	"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="media-libs/libexif
-	media-libs/jpeg
-	>=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-static? ( =x11-libs/qt-3* ) ) )
-	amd64? (
-		ia32? ( app-emulation/emul-linux-x86-qtlibs )
-		!ia32? ( =x11-libs/qt-3* )
-	)
-	ppc? ( =x11-libs/qt-3* )
-	spell? ( app-text/aspell )
-	x86-fbsd? (
-		=virtual/libstdc++-3*
-		!qt-static? ( !qt3-static? ( =x11-libs/qt-3* ) )
-	)
-	"
-
-opera_cd() {
-	cd "${WORKDIR}"/${O_P}* || die "failed to enter work directory"
-	S="$(pwd)"
-	einfo "Working in ${S}"
-}
-
-src_unpack() {
-	unpack ${A}
-	opera_cd
-
-	epatch "${FILESDIR}/${PN}-9.00-install.patch"
-
-	# bug #181300:
-	if use elibc_FreeBSD; then
-		epatch "${FILESDIR}/${PN}-9.50-pluginpath-fbsd.patch"
-	else
-		epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch"
-	fi
-
-	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" \
-		-e "s:/usr/share/icons:${D}/usr/share/icons:g" \
-		-e "s:/etc/X11:${D}/etc/X11:g" \
-		-e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
-		-e "s:/opt/gnome/share:${D}/opt/gnome/share:g" \
-		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-		-e 's:read str_answer:return 0:' \
-		-e "s:/opt/kde:${D}/usr/kde:" \
-		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
-		install.sh || die "sed failed"
-
-}
-
-src_compile() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a configure script or Makefile exists.
-	true
-}
-
-src_install() {
-	opera_cd
-	# 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
-
-	# Install the icons
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/opera.xpm
-
-	local res
-	for res in 16x16 22x22 32x32 48x48 ; do
-		insinto /usr/share/icons/hicolor/${res}/apps
-		doins usr/share/icons/hicolor/${res}/apps/opera.png
-	done
-
-	# Install the menu entry
-	make_desktop_entry opera Opera /usr/share/pixmaps/opera.xpm 'Network;WebBrowser;Email;FileTransfer;IRCClient'
-
-	# 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 spell; then
-		if use qt-static; then
-			DIR=${P}.1
-		else
-			use sparc && DIR=${P}.2 || DIR=${P}.5
-		fi
-		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> "${D}"/opt/opera/share/opera/ini/spellcheck.ini
-	fi
-
-	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
-
-	# 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
-}
-
-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 non-English simply do"
-	elog "$ emerge app-dicts/aspell-[your language]."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	elog "The Opera betas may still have issues with plugins, notably"
-	elog "net-www/netscape-flash. See also https://bugs.gentoo.org/198162"
-}
-
-pkg_postrm() {
-	use gnome && gnome2_pkg_postrm
-}
diff --git a/www-client/opera/opera-9.60_pre2436.ebuild b/www-client/opera/opera-9.60_pre2436.ebuild
deleted file mode 100644
index 34bdebe4e923..000000000000
--- a/www-client/opera/opera-9.60_pre2436.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.60_pre2436.ebuild,v 1.1 2008/09/26 17:29:58 jer Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-9.0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RESTRICT="mirror strip test"
-
-IUSE="elibc_FreeBSD gnome ia32 qt-static qt3-static spell"
-MY_LINGUAS="be bg cs da de el en en-GB es-ES es-LA fi fr fr-CA fy hi hr hu id it
-ja ka ko lt mk nb"
-
-for MY_LINGUA in ${MY_LINGUAS}; do
-	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
-done
-
-O_SUFF="2436"
-O_P="${PN}-9.60-${O_SUFF}"
-O_URI="http://snapshot.opera.com/unix/snapshot-${O_SUFF}/"
-
-SRC_URI="
-	x86-fbsd? ( ${O_URI}intel-freebsd/${O_P}.freebsd5-shared-qt3.i386.tar.bz2 )
-	ppc? ( ${O_URI}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-	qt-static? (
-		qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-		)
-		!qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-		)
-	)
-	!qt-static? (
-		qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-		)
-		!qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-		)
-	)
-	"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="media-libs/libexif
-	media-libs/jpeg
-	>=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-static? ( =x11-libs/qt-3* ) ) )
-	amd64? (
-		ia32? ( app-emulation/emul-linux-x86-qtlibs )
-		!ia32? ( =x11-libs/qt-3* )
-	)
-	ppc? ( =x11-libs/qt-3* )
-	spell? ( app-text/aspell )
-	x86-fbsd? (
-		=virtual/libstdc++-3*
-		!qt-static? ( !qt3-static? ( =x11-libs/qt-3* ) )
-	)
-	"
-
-opera_cd() {
-	cd "${WORKDIR}"/${O_P}* || die "failed to enter work directory"
-	S="$(pwd)"
-	einfo "Working in ${S}"
-}
-
-src_unpack() {
-	unpack ${A}
-	opera_cd
-
-	epatch "${FILESDIR}/${PN}-9.00-install.patch"
-
-	# bug #181300:
-	if use elibc_FreeBSD; then
-		epatch "${FILESDIR}/${PN}-9.50-pluginpath-fbsd.patch"
-	else
-		epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch"
-	fi
-
-	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" \
-		-e "s:/usr/share/icons:${D}/usr/share/icons:g" \
-		-e "s:/etc/X11:${D}/etc/X11:g" \
-		-e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
-		-e "s:/opt/gnome/share:${D}/opt/gnome/share:g" \
-		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-		-e 's:read str_answer:return 0:' \
-		-e "s:/opt/kde:${D}/usr/kde:" \
-		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
-		install.sh || die "sed failed"
-
-}
-
-src_compile() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a configure script or Makefile exists.
-	true
-}
-
-src_install() {
-	opera_cd
-	# 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
-
-	# Install the icons
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/opera.xpm
-
-	local res
-	for res in 16x16 22x22 32x32 48x48 ; do
-		insinto /usr/share/icons/hicolor/${res}/apps
-		doins usr/share/icons/hicolor/${res}/apps/opera.png
-	done
-
-	# Install the menu entry
-	make_desktop_entry opera Opera /usr/share/pixmaps/opera.xpm 'Network;WebBrowser;Email;FileTransfer;IRCClient'
-
-	# 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 spell; then
-		if use qt-static; then
-			DIR=${P}.1
-		else
-			use sparc && DIR=${P}.2 || DIR=${P}.5
-		fi
-		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> "${D}"/opt/opera/share/opera/ini/spellcheck.ini
-	fi
-
-	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
-
-	# 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
-}
-
-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 non-English simply do"
-	elog "$ emerge app-dicts/aspell-[your language]."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	elog "The Opera betas may still have issues with plugins, notably"
-	elog "net-www/netscape-flash. See also https://bugs.gentoo.org/198162"
-}
-
-pkg_postrm() {
-	use gnome && gnome2_pkg_postrm
-}
diff --git a/www-client/opera/opera-9.60_pre2440.ebuild b/www-client/opera/opera-9.60_pre2440.ebuild
deleted file mode 100644
index 08b4ebfa676b..000000000000
--- a/www-client/opera/opera-9.60_pre2440.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.60_pre2440.ebuild,v 1.2 2008/10/06 16:58:28 jer Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-9.0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RESTRICT="mirror strip test"
-
-IUSE="elibc_FreeBSD gnome ia32 qt-static qt3-static spell"
-MY_LINGUAS="be bg cs da de el en en-GB es-ES es-LA fi fr fr-CA fy hi hr hu id it
-ja ka ko lt mk nb nl nn pl pt pt-BR ru sv tr uk zh-CN zh-TW"
-
-for MY_LINGUA in ${MY_LINGUAS}; do
-	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
-done
-
-O_SUFF="2440"
-O_P="${PN}-9.60-${O_SUFF}"
-O_URI="http://snapshot.opera.com/unix/snapshot-${O_SUFF}/"
-
-SRC_URI="
-	x86-fbsd? ( ${O_URI}intel-freebsd/${O_P}.freebsd5-shared-qt3.i386.tar.bz2 )
-	ppc? ( ${O_URI}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-	qt-static? (
-		qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-		)
-		!qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-		)
-	)
-	!qt-static? (
-		qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-		)
-		!qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-		)
-	)
-	"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="media-libs/libexif
-	media-libs/jpeg
-	>=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-static? ( =x11-libs/qt-3* ) ) )
-	amd64? (
-		ia32? ( app-emulation/emul-linux-x86-qtlibs )
-		!ia32? ( =x11-libs/qt-3* )
-	)
-	ppc? ( =x11-libs/qt-3* )
-	spell? ( app-text/aspell )
-	x86-fbsd? (
-		=virtual/libstdc++-3*
-		!qt-static? ( !qt3-static? ( =x11-libs/qt-3* ) )
-	)
-	"
-
-opera_cd() {
-	cd "${WORKDIR}"/${O_P}* || die "failed to enter work directory"
-	S="$(pwd)"
-	einfo "Working in ${S}"
-}
-
-src_unpack() {
-	unpack ${A}
-	opera_cd
-
-	#epatch "${FILESDIR}/${PN}-9.00-install.patch"
-	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}-9.50-pluginpath-fbsd.patch"
-	else
-		epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch"
-	fi
-
-#	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" \
-#		-e "s:/usr/share/icons:${D}/usr/share/icons:g" \
-#		-e "s:/etc/X11:${D}/etc/X11:g" \
-#		-e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
-#		-e "s:/opt/gnome/share:${D}/opt/gnome/share:g" \
-#		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-#		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-#		-e 's:read str_answer:return 0:' \
-#		-e "s:/opt/kde:${D}/usr/kde:" \
-#		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
-#		install.sh || die "sed failed"
-
-	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_compile() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a configure script or Makefile exists.
-	true
-}
-
-src_install() {
-	opera_cd
-	# 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
-
-	# Install the icons
-#	insinto /usr/share/pixmaps
-#	doins usr/share/pixmaps/opera.xpm
-
-#	local res
-#	for res in 16x16 22x22 32x32 48x48 ; do
-#		insinto /usr/share/icons/hicolor/${res}/apps
-#		doins usr/share/icons/hicolor/${res}/apps/opera.png
-#	done
-
-	# Install the menu entry
-#	make_desktop_entry opera Opera /usr/share/pixmaps/opera.xpm 'Network;WebBrowser;Email;FileTransfer;IRCClient'
-
-	# 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
-
-	# fix plugin path
-	echo "Plugin Path=/opt/opera/lib/opera/plugins" >> "${D}"/etc/opera6rc
-
-	# enable spellcheck
-	if use spell; then
-		if use qt-static; then
-			DIR=${P}.1
-		else
-			use sparc && DIR=${P}.2 || DIR=${P}.5
-		fi
-		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> "${D}"/opt/opera/share/opera/ini/spellcheck.ini
-	fi
-
-	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
-
-	# 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
-}
-
-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 non-English simply do"
-	elog "$ emerge app-dicts/aspell-[your language]."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	elog "The Opera betas may still have issues with plugins, notably"
-	elog "net-www/netscape-flash. See also https://bugs.gentoo.org/198162"
-}
-
-pkg_postrm() {
-	use gnome && gnome2_pkg_postrm
-}
diff --git a/www-client/opera/opera-9.60_pre2444.ebuild b/www-client/opera/opera-9.60_pre2444.ebuild
deleted file mode 100644
index c3ea200b6972..000000000000
--- a/www-client/opera/opera-9.60_pre2444.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.60_pre2444.ebuild,v 1.1 2008/10/06 16:58:28 jer Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-9.0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RESTRICT="mirror strip test"
-
-IUSE="elibc_FreeBSD gnome ia32 qt-static qt3-static spell"
-MY_LINGUAS="be bg cs da de el en en-GB es-ES es-LA fi fr fr-CA fy hi hr hu id it
-ja ka ko lt mk nb nl nn pl pt pt-BR ru sv tr uk zh-CN zh-TW"
-
-for MY_LINGUA in ${MY_LINGUAS}; do
-	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
-done
-
-O_SUFF="2444"
-O_P="${PN}-9.60-${O_SUFF}"
-O_URI="http://snapshot.opera.com/unix/snapshot-${O_SUFF}/"
-
-SRC_URI="
-	x86-fbsd? ( ${O_URI}intel-freebsd/${O_P}.freebsd5-shared-qt3.i386.tar.bz2 )
-	ppc? ( ${O_URI}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-	qt-static? (
-		qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-		)
-		!qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-		)
-	)
-	!qt-static? (
-		qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-		)
-		!qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-		)
-	)
-	"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="media-libs/libexif
-	media-libs/jpeg
-	>=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-static? ( =x11-libs/qt-3* ) ) )
-	amd64? (
-		ia32? ( app-emulation/emul-linux-x86-qtlibs )
-		!ia32? ( =x11-libs/qt-3* )
-	)
-	ppc? ( =x11-libs/qt-3* )
-	spell? ( app-text/aspell )
-	x86-fbsd? (
-		=virtual/libstdc++-3*
-		!qt-static? ( !qt3-static? ( =x11-libs/qt-3* ) )
-	)
-	"
-
-opera_cd() {
-	cd "${WORKDIR}"/${O_P}* || die "failed to enter work directory"
-	S="$(pwd)"
-	einfo "Working in ${S}"
-}
-
-src_unpack() {
-	unpack ${A}
-	opera_cd
-
-	#epatch "${FILESDIR}/${PN}-9.00-install.patch"
-	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}-9.50-pluginpath-fbsd.patch"
-	else
-		epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch"
-	fi
-
-#	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" \
-#		-e "s:/usr/share/icons:${D}/usr/share/icons:g" \
-#		-e "s:/etc/X11:${D}/etc/X11:g" \
-#		-e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
-#		-e "s:/opt/gnome/share:${D}/opt/gnome/share:g" \
-#		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-#		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-#		-e 's:read str_answer:return 0:' \
-#		-e "s:/opt/kde:${D}/usr/kde:" \
-#		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
-#		install.sh || die "sed failed"
-
-	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_compile() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a configure script or Makefile exists.
-	true
-}
-
-src_install() {
-	opera_cd
-	# 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
-
-	# Install the icons
-#	insinto /usr/share/pixmaps
-#	doins usr/share/pixmaps/opera.xpm
-
-#	local res
-#	for res in 16x16 22x22 32x32 48x48 ; do
-#		insinto /usr/share/icons/hicolor/${res}/apps
-#		doins usr/share/icons/hicolor/${res}/apps/opera.png
-#	done
-
-	# Install the menu entry
-#	make_desktop_entry opera Opera /usr/share/pixmaps/opera.xpm 'Network;WebBrowser;Email;FileTransfer;IRCClient'
-
-	# 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
-
-	# fix plugin path
-	echo "Plugin Path=/opt/opera/lib/opera/plugins" >> "${D}"/etc/opera6rc
-
-	# enable spellcheck
-	if use spell; then
-		if use qt-static; then
-			DIR=${P}.1
-		else
-			use sparc && DIR=${P}.2 || DIR=${P}.5
-		fi
-		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> "${D}"/opt/opera/share/opera/ini/spellcheck.ini
-	fi
-
-	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
-
-	# 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
-}
-
-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 non-English simply do"
-	elog "$ emerge app-dicts/aspell-[your language]."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	elog "The Opera betas may still have issues with plugins, notably"
-	elog "net-www/netscape-flash. See also https://bugs.gentoo.org/198162"
-}
-
-pkg_postrm() {
-	use gnome && gnome2_pkg_postrm
-}