security bump; cleanups

(Portage version: 2.1_pre4-r1)

13 files changed, 87 insertions, 573 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 67d986b78d4f..0dd3311caf60 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.32 2006/01/03 22:18:04 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.33 2006/02/20 08:36:22 lanius Exp $
+
+  20 Feb 2006; Heinrich Wendel <lanius@gentoo.org> -opera-7.54-r3.ebuild,
+  -opera-8.00.ebuild, -opera-8.01.ebuild, -opera-8.02.ebuild,
+  -opera-8.50.ebuild, +opera-8.52.ebuild:
+  remove old ebuilds
+
+*opera-8.52 (20 Feb 2006)
+
+  20 Feb 2006; Heinrich Wendel <lanius@gentoo.org> +opera-8.52.ebuild:
+  security bump; cleanups
+
+  20 Feb 2006; Heinrich Wendel <lanius@gentoo.org> ChangeLog:
+  security bump
 
   03 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org> opera-8.51.ebuild:
   Add modular X dependencies, bug #115957
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 0b5945750d6a..dbc545d89ae9 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,27 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 86d017fca2637356c5d3243290a573f7 ChangeLog 18551
-MD5 05a269373a205b54700e2265119951a0 files/digest-opera-7.54-r3 372
-MD5 5fde404310e76e32c90caff003dbbbb8 files/digest-opera-8.00 368
-MD5 8cbbc6d9dbd635e9b74831ac4209f292 files/digest-opera-8.01 372
-MD5 db1b0b78bf60d8137b84e200dacf2de7 files/digest-opera-8.02 372
-MD5 2f86a42f50ba144aae2761dc9f922906 files/digest-opera-8.50 372
+MD5 dd56559359833314d07cd06258812761 ChangeLog 18955
+RMD160 9cab283bd7ae7efbb0163fbef6b151c3804b1525 ChangeLog 18955
+SHA256 f31a566a9830a1b591f2fa7b3fd29a1e9b9a14bd9ea720631cc8e988b47191ad ChangeLog 18955
 MD5 c800460b72166b0b4f1b9ceeae585ff7 files/digest-opera-8.51 372
+RMD160 8fa10f03df29dfeb5383c44601b8eaa3b77c7e45 files/digest-opera-8.51 372
+SHA256 bd26ddb435dbefe9a0e814afa2469d2e684a7668c7409f4846babb80ebf1e399 files/digest-opera-8.51 372
+MD5 d101ca4019c29dd4a392f2086cd8842a files/digest-opera-8.52 1300
+RMD160 55209f3ab6733fdb7b61b93784f8d677e4e942ef files/digest-opera-8.52 1300
+SHA256 62d9267728b2f90cba936ce69a5058778c47b0357e14b125a586e3cdb93ce31d files/digest-opera-8.52 1300
 MD5 fa357d1def9207d9e5e81038265b52cb files/opera-qt.2.patch 416
+RMD160 854a3785d852e5bc1f55b01d9c0e1a81d232d5f6 files/opera-qt.2.patch 416
+SHA256 b5cd33f7c861c0c0a6ac44fddb25be282e43b1661f9f379e037ee5808608d1a0 files/opera-qt.2.patch 416
 MD5 3fbc8c365c121ec93a041532f07942f7 files/opera-qt.patch 328
+RMD160 7f1eb091ff203e206d986be6bf4cfa84394e30d7 files/opera-qt.patch 328
+SHA256 d5cc337bef87f005e276faaecde049bc15313aef5ea6d2ad763d1d33deaf6f69 files/opera-qt.patch 328
 MD5 bafbdb86632b055a10fe826d16ea5b7f files/opera.desktop 147
+RMD160 4413b32af8f46f0dc0fe7271e528f81dd295832f files/opera.desktop 147
+SHA256 39bcc8d03bf27d048f98ebb92b5490a27538dcba22492907e45930573d4fa9b9 files/opera.desktop 147
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 c466a4f4004881b5d1f51c8e68a0d507 opera-7.54-r3.ebuild 4987
-MD5 654eabba23cdab9ffe12a45fe6338fcd opera-8.00.ebuild 4060
-MD5 5cf989c7a198572b29f4d57d00934eb0 opera-8.01.ebuild 4063
-MD5 e1adc02142d88ba1be45f5e4332630da opera-8.02.ebuild 4059
-MD5 56e1b3f606c1222b19901e26a5a6a364 opera-8.50.ebuild 4061
+RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 metadata.xml 253
+SHA256 8e0389110e0cd8cc331b484cde34c22dd93f9f49df16c2263eea4d8e84093976 metadata.xml 253
 MD5 db5e3f94df7716a6dd20d0a70442e4bf opera-8.51.ebuild 4247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDuwZXZ/iYVBmujdURApmYAJ0Wm/vgek0uX48wosLX62m5e8lQEwCg4viB
-SAqGvvk4oAS6YQ6CfcrJTdc=
-=Hd1L
------END PGP SIGNATURE-----
+RMD160 5fd55f41a37c9894e0b24e7e39e7b3f18d16a7b1 opera-8.51.ebuild 4247
+SHA256 f5ec80210c741c901db89218154bfe2cb9337e9e86f0d3800af1686bc6613437 opera-8.51.ebuild 4247
+MD5 644c7ded5a83a6fb5b647091857fb006 opera-8.52.ebuild 4458
+RMD160 2ff8c2c7e5db546acf64d07b7e3b1d8a02141818 opera-8.52.ebuild 4458
+SHA256 47792e8d424ccc7faaa7486bc68ce2284c4fa89e006c1a4bd921084f21aa21d7 opera-8.52.ebuild 4458
diff --git a/www-client/opera/files/digest-opera-7.54-r3 b/www-client/opera/files/digest-opera-7.54-r3
deleted file mode 100644
index a3299b5a230a..000000000000
--- a/www-client/opera/files/digest-opera-7.54-r3
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 afc1819c0377da89174ba2a47924b867 opera-7.54-20050131.1-static-qt.i386-en.tar.bz2 4863686
-MD5 3ba228b88e75258ce6fd570a0a46de23 opera-7.54-20050131.5-shared-qt.i386-en.tar.bz2 3663361
-MD5 c37cfe4f6b168a766dbe07b95d8914c7 opera-7.54-20050131.1-static-qt.ppc-en.tar.bz2 4926043
-MD5 8860c4d23384509e38c135ddfbaed2a5 opera-7.54-20050131.1-static-qt.sparc-en.tar.bz2 4872149
diff --git a/www-client/opera/files/digest-opera-8.00 b/www-client/opera/files/digest-opera-8.00
deleted file mode 100644
index bd2945ae9c0c..000000000000
--- a/www-client/opera/files/digest-opera-8.00
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 94d1d86f42d9aa912c288e47c4b3893f opera-8.0-20050415.1-static-qt.i386-en.tar.bz2 5176406
-MD5 3046e9c38f195f211a5fd4fd7bbf7da7 opera-8.0-20050415.5-shared-qt.i386-en.tar.bz2 3975323
-MD5 da6f20e3e881ca3c92024758dbe473d2 opera-8.0-20050415.1-static-qt.sparc-en.tar.bz2 5127313
-MD5 5fe172a95df147f709af5bff021edc15 opera-8.0-20050415.1-static-qt.ppc-en.tar.bz2 5280174
diff --git a/www-client/opera/files/digest-opera-8.01 b/www-client/opera/files/digest-opera-8.01
deleted file mode 100644
index 04ea22e29882..000000000000
--- a/www-client/opera/files/digest-opera-8.01
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 ea52b2cff58fb02a9c7c3dffa93c08e7 opera-8.01-20050615.1-static-qt.i386-en.tar.bz2 5841846
-MD5 cf2a3502687bdc57c06eca7b1fe1cc43 opera-8.01-20050615.5-shared-qt.i386-en.tar.bz2 4017675
-MD5 59909c2edfc7da7cbc52f1047975d485 opera-8.01-20050615.1-static-qt.sparc-en.tar.bz2 5722550
-MD5 9a04e99b99455dc3939adfb9502ce3f2 opera-8.01-20050615.1-static-qt.ppc-en.tar.bz2 5830852
diff --git a/www-client/opera/files/digest-opera-8.02 b/www-client/opera/files/digest-opera-8.02
deleted file mode 100644
index 98560832ff0a..000000000000
--- a/www-client/opera/files/digest-opera-8.02
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 7f85aef69221803413b859b9e04df959 opera-8.02-20050727.1-static-qt.i386-en.tar.bz2 5855649
-MD5 060bcdbf97f1c49d864971501032a5fe opera-8.02-20050727.5-shared-qt.i386-en.tar.bz2 4040154
-MD5 d633160f49342d6d9447778e2b4f1a63 opera-8.02-20050727.1-static-qt.sparc-en.tar.bz2 5725746
-MD5 dc38c98f658e6b8b964c868b45ba6297 opera-8.02-20050727.1-static-qt.ppc-en.tar.bz2 5867332
diff --git a/www-client/opera/files/digest-opera-8.50 b/www-client/opera/files/digest-opera-8.50
deleted file mode 100644
index 16983df968e9..000000000000
--- a/www-client/opera/files/digest-opera-8.50
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 e66b6e4460610b7cebacb6d33e255ed7 opera-8.50-20050916.1-static-qt.i386-en.tar.bz2 5800086
-MD5 a2678016990d5e27b3f54fa040282939 opera-8.50-20050916.1-static-qt.ppc-en.tar.bz2 5802272
-MD5 e747b84c36882ab0b4ea1bc4cc7837c4 opera-8.50-20050916.1-static-qt.sparc-en.tar.bz2 5698811
-MD5 cc3641de1b6643547d7e36221990f5cf opera-8.50-20050916.5-shared-qt.i386-en.tar.bz2 3968759
diff --git a/www-client/opera/files/digest-opera-8.52 b/www-client/opera/files/digest-opera-8.52
new file mode 100644
index 000000000000..17402ad62ade
--- /dev/null
+++ b/www-client/opera/files/digest-opera-8.52
@@ -0,0 +1,12 @@
+MD5 e051ee0f78dbf7fac407fad147e02d8b opera-8.52-20060201.1-static-qt.i386-en.tar.bz2 5812593
+RMD160 a118c275af20b625a00e2c79228354a46f25bf7e opera-8.52-20060201.1-static-qt.i386-en.tar.bz2 5812593
+SHA256 ea0723558d7407df434ef5ee39164cbcaa17ca16a1054d14e4aaaf1ab8334cb3 opera-8.52-20060201.1-static-qt.i386-en.tar.bz2 5812593
+MD5 42a515f683a31522484c3770618cd2dd opera-8.52-20060201.1-static-qt.ppc-en.tar.bz2 5811355
+RMD160 1173303c415b44e1646bcfbf8c2cfc4e115c25cb opera-8.52-20060201.1-static-qt.ppc-en.tar.bz2 5811355
+SHA256 8003f16fc53f4d0c9c0b6354813e83933a1dd2af21059bd22de6e8564544e9b5 opera-8.52-20060201.1-static-qt.ppc-en.tar.bz2 5811355
+MD5 2dec5155b24752517fbf1143d861f8f1 opera-8.52-20060201.1-static-qt.sparc-en.tar.bz2 5705143
+RMD160 8c4cbd3c4d86d220d85459e799b453ab5207899b opera-8.52-20060201.1-static-qt.sparc-en.tar.bz2 5705143
+SHA256 50466017378ee135adb7673b958fe7151d144112d5d8afc469bbef3a3745b191 opera-8.52-20060201.1-static-qt.sparc-en.tar.bz2 5705143
+MD5 a1847d8693025a16188bc3c165eff71a opera-8.52-20060201.5-shared-qt.i386-en.tar.bz2 3977438
+RMD160 949e56034999516ee409b78ecfed82aac52c3319 opera-8.52-20060201.5-shared-qt.i386-en.tar.bz2 3977438
+SHA256 2e9cd1cbe4a3750dc072634e916736ac8b055b4f4b0d91efcc0132ba5c47859b opera-8.52-20060201.5-shared-qt.i386-en.tar.bz2 3977438
diff --git a/www-client/opera/opera-7.54-r3.ebuild b/www-client/opera/opera-7.54-r3.ebuild
deleted file mode 100644
index 71df1925cc76..000000000000
--- a/www-client/opera/opera-7.54-r3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-7.54-r3.ebuild,v 1.1 2005/03/15 15:09:21 seemant Exp $
-
-IUSE="static spell"
-
-OPERAVER="7.54-20050131"
-OPERAFTPDIR="754u2"
-
-S=${WORKDIR}/${A/.tar.bz2/}
-
-DESCRIPTION="Opera web browser."
-HOMEPAGE="http://www.opera.com/linux/"
-
-# that's an ugly workaround for the broken src_uri syntax
-SRC_URI="
-	x86? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	x86? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	amd64? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 )
-	ppc? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )
-	sparc? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )"
-
-# ppc shared version does not work as it uses gcc-2.95 - lanius
-#	ppc? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 ) )
-#	ppc? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 ) )
-
-# amd64 shared libs require app-emulation/emul-linux-x86-qtlibs-1 which is not stable yet
-#	amd64? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-#	amd64? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-
-# sparc shared version does not work for me as it uses gcc-2.95 - eradicator
-#	sparc? ( static?  ( mirror://opera/linux/${OPERAFTPDIR}/final/en/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 ) )
-#	sparc? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/sparc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )"
-
-
-# Dependencies may be augmented later (see below).
-DEPEND=">=sys-apps/sed-4
-	amd64? ( sys-apps/linux32 )"
-
-RDEPEND="virtual/x11
-	>=media-libs/fontconfig-2.1.94-r1
-	media-libs/libexif
-	x11-libs/openmotif
-	spell? ( app-text/aspell )
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	!amd64? ( !sparc? ( !static? ( =x11-libs/qt-3* ) ) )"
-
-#	static? (
-#		amd64? ( app-emulation/emul-linux-x86-xlibs ) )
-#	!static? (
-#		amd64? ( =app-emulation/emul-linux-x86-qtlibs-1* )
-#		!amd64? ( =x11-libs/qt-3* ) )
-
-SLOT="0"
-LICENSE="OPERA"
-KEYWORDS="x86 ~ppc sparc amd64"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	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:#\(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
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-
-	# Opera's native installer.
-	if [ ${ARCH} = "amd64" ]; then
-		linux32 ./install.sh --prefix="${D}"/opt/opera || die
-	else
-		./install.sh --prefix="${D}"/opt/opera || die
-	fi
-
-	# 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
-
-	rm ${D}/opt/opera/share/doc/opera/help
-	dosym /opt/share/doc/opera/help /opt/opera/share/opera/help
-
-	dosed /opt/opera/bin/opera
-	dosed /opt/opera/share/opera/java/opera.policy
-
-	# Install the icons
-	insinto /usr/share/pixmaps
-	doins images/opera.xpm
-
-	# Install the menu entry
-	insinto /usr/share/applications
-	doins ${FILESDIR}/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 static; then
-			DIR=$OPERAVER.1
-		else
-			use sparc && DIR=$OPERAVER.2 || DIR=$OPERAVER.5
-		fi
-		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> ${D}/opt/opera/share/opera/ini/spellcheck.ini
-	fi
-}
-
-pkg_postinst() {
-	einfo "For localized language files take a look at:"
-	einfo "http://www.opera.com/download/languagefiles/index.dml?platform=linux"
-	einfo
-	einfo "To change the spellcheck language edit /opt/opera/share/opera/ini/spellcheck.ini"
-	einfo "and emerge app-text/aspell-language."
-	einfo
-	ewarn "This update will overwrite your search.ini if you"
-	ewarn "do not change the \"File Version\" to 4 in the file."
-}
diff --git a/www-client/opera/opera-8.00.ebuild b/www-client/opera/opera-8.00.ebuild
deleted file mode 100644
index d62188ff0fad..000000000000
--- a/www-client/opera/opera-8.00.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-8.00.ebuild,v 1.9 2005/07/12 19:53:39 eradicator Exp $
-
-inherit eutils
-
-IUSE="static spell qt kde"
-
-OPERAVER="8.0-20050415"
-OPERAFTPDIR="800/final/en"
-
-S=${WORKDIR}/${A/.tar.bz2/}
-
-DESCRIPTION="Opera web browser."
-HOMEPAGE="http://www.opera.com/linux/"
-
-# that's an ugly workaround for the broken src_uri syntax
-OPERA_URI="mirror://opera/linux/${OPERAFTPDIR}/"
-SRC_URI="
-	x86? ( static? ( ${OPERA_URI}/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	x86? ( !static? ( ${OPERA_URI}/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	amd64? ( static? ( ${OPERA_URI}/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	amd64? ( !static? ( ${OPERA_URI}/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	sparc? ( ${OPERA_URI}/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )
-	ppc? ( ${OPERA_URI}/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )"
-
-#	sparc? ( !static? ( ${OPERA_URI}/sparc/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )
-#	ppc? ( !static? ( ${OPERA_URI}/ppc-linux/en/${PN}-${OPERAVER}.3-shared-qt.ppc-en.tar.bz2 ) )
-
-# Dependencies may be augmented later (see below).
-DEPEND=">=sys-apps/sed-4
-	amd64? ( sys-apps/linux32 )"
-
-RDEPEND="virtual/x11
-	>=media-libs/fontconfig-2.1.94-r1
-	amd64? ( static? ( app-emulation/emul-linux-x86-xlibs )
-	         !static? ( app-emulation/emul-linux-x86-qtlibs ) )
-	!amd64? ( media-libs/libexif
-	          x11-libs/openmotif
-	          spell? ( app-text/aspell )
-	          x86? ( !static? ( =x11-libs/qt-3* ) )
-	          media-libs/jpeg )"
-
-SLOT="0"
-LICENSE="OPERA"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	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
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-
-	# Opera's native installer.
-	if [ ${ARCH} = "amd64" ]; then
-		linux32 ./install.sh --prefix="${D}"/opt/opera || die
-	else
-		./install.sh --prefix="${D}"/opt/opera || die
-	fi
-
-	# 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 images/opera.xpm
-
-	# Install the menu entry
-	insinto /usr/share/applications
-	doins ${FILESDIR}/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 static; then
-			DIR=$OPERAVER.1
-		else
-			use sparc && DIR=$OPERAVER.2 || DIR=$OPERAVER.5
-		fi
-		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> ${D}/opt/opera/share/opera/ini/spellcheck.ini
-	fi
-
-	if use qt || use kde; then
-		cd ${D}/opt/opera/bin
-		epatch ${FILESDIR}/opera-qt.patch
-	fi
-}
-
-pkg_postinst() {
-	einfo "For localized language files take a look at:"
-	einfo "http://www.opera.com/download/languagefiles/index.dml?platform=linux"
-	einfo
-	einfo "To change the spellcheck language edit /opt/opera/share/opera/ini/spellcheck.ini"
-	einfo "and emerge app-text/aspell-language."
-}
diff --git a/www-client/opera/opera-8.01.ebuild b/www-client/opera/opera-8.01.ebuild
deleted file mode 100644
index f7a1c406ff58..000000000000
--- a/www-client/opera/opera-8.01.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-8.01.ebuild,v 1.5 2005/07/12 19:53:39 eradicator Exp $
-
-inherit eutils
-
-IUSE="static spell qt kde"
-
-OPERAVER="8.01-20050615"
-OPERAFTPDIR="801/final/en"
-
-S=${WORKDIR}/${A/.tar.bz2/}
-
-DESCRIPTION="Opera web browser."
-HOMEPAGE="http://www.opera.com/linux/"
-
-# that's an ugly workaround for the broken src_uri syntax
-OPERA_URI="mirror://opera/linux/${OPERAFTPDIR}/"
-SRC_URI="
-	x86? ( static? ( ${OPERA_URI}/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	x86? ( !static? ( ${OPERA_URI}/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	amd64? ( static? ( ${OPERA_URI}/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	amd64? ( !static? ( ${OPERA_URI}/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	sparc? ( ${OPERA_URI}/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )
-	ppc? ( ${OPERA_URI}/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )"
-
-#	sparc? ( !static? ( ${OPERA_URI}/sparc/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )
-#	ppc? ( !static? ( ${OPERA_URI}/ppc-linux/en/${PN}-${OPERAVER}.3-shared-qt.ppc-en.tar.bz2 ) )
-
-# Dependencies may be augmented later (see below).
-DEPEND=">=sys-apps/sed-4
-	amd64? ( sys-apps/linux32 )"
-
-RDEPEND="virtual/x11
-	>=media-libs/fontconfig-2.1.94-r1
-	amd64? ( static? ( app-emulation/emul-linux-x86-xlibs )
-	         !static? ( app-emulation/emul-linux-x86-qtlibs ) )
-	!amd64? ( media-libs/libexif
-	          x11-libs/openmotif
-	          spell? ( app-text/aspell )
-	          x86? ( !static? ( =x11-libs/qt-3* ) )
-	          media-libs/jpeg )"
-
-SLOT="0"
-LICENSE="OPERA"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	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
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-
-	# Opera's native installer.
-	if [ ${ARCH} = "amd64" ]; then
-		linux32 ./install.sh --prefix="${D}"/opt/opera || die
-	else
-		./install.sh --prefix="${D}"/opt/opera || die
-	fi
-
-	# 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 images/opera.xpm
-
-	# Install the menu entry
-	insinto /usr/share/applications
-	doins ${FILESDIR}/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 static; then
-			DIR=$OPERAVER.1
-		else
-			use sparc && DIR=$OPERAVER.2 || DIR=$OPERAVER.5
-		fi
-		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> ${D}/opt/opera/share/opera/ini/spellcheck.ini
-	fi
-
-	if use qt || use kde; then
-		cd ${D}/opt/opera/bin
-		epatch ${FILESDIR}/opera-qt.patch
-	fi
-}
-
-pkg_postinst() {
-	einfo "For localized language files take a look at:"
-	einfo "http://www.opera.com/download/languagefiles/index.dml?platform=linux"
-	einfo
-	einfo "To change the spellcheck language edit /opt/opera/share/opera/ini/spellcheck.ini"
-	einfo "and emerge app-text/aspell-language."
-}
diff --git a/www-client/opera/opera-8.02.ebuild b/www-client/opera/opera-8.02.ebuild
deleted file mode 100644
index 0076f0c50c95..000000000000
--- a/www-client/opera/opera-8.02.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-8.02.ebuild,v 1.4 2005/08/11 00:00:53 tester Exp $
-
-inherit eutils
-
-IUSE="static spell qt kde"
-
-OPERAVER="8.02-20050727"
-OPERAFTPDIR="802/final/en"
-
-S=${WORKDIR}/${A/.tar.bz2/}
-
-DESCRIPTION="Opera web browser."
-HOMEPAGE="http://www.opera.com/linux/"
-
-# that's an ugly workaround for the broken src_uri syntax
-OPERA_URI="mirror://opera/linux/${OPERAFTPDIR}/"
-SRC_URI="
-	x86? ( static? ( ${OPERA_URI}/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	x86? ( !static? ( ${OPERA_URI}/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	amd64? ( static? ( ${OPERA_URI}/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	amd64? ( !static? ( ${OPERA_URI}/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	sparc? ( ${OPERA_URI}/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )
-	ppc? ( ${OPERA_URI}/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )"
-
-#	sparc? ( !static? ( ${OPERA_URI}/sparc/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )
-#	ppc? ( !static? ( ${OPERA_URI}/ppc-linux/en/${PN}-${OPERAVER}.3-shared-qt.ppc-en.tar.bz2 ) )
-
-# Dependencies may be augmented later (see below).
-DEPEND=">=sys-apps/sed-4
-	amd64? ( sys-apps/linux32 )"
-
-RDEPEND="virtual/x11
-	>=media-libs/fontconfig-2.1.94-r1
-	amd64? ( static? ( app-emulation/emul-linux-x86-xlibs )
-	         !static? ( app-emulation/emul-linux-x86-qtlibs ) )
-	!amd64? ( media-libs/libexif
-	          x11-libs/openmotif
-	          spell? ( app-text/aspell )
-	          x86? ( !static? ( =x11-libs/qt-3* ) )
-	          media-libs/jpeg )"
-
-SLOT="0"
-LICENSE="OPERA"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	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
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-
-	# Opera's native installer.
-	if [ ${ARCH} = "amd64" ]; then
-		linux32 ./install.sh --prefix="${D}"/opt/opera || die
-	else
-		./install.sh --prefix="${D}"/opt/opera || die
-	fi
-
-	# 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 images/opera.xpm
-
-	# Install the menu entry
-	insinto /usr/share/applications
-	doins ${FILESDIR}/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 static; then
-			DIR=$OPERAVER.1
-		else
-			use sparc && DIR=$OPERAVER.2 || DIR=$OPERAVER.5
-		fi
-		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> ${D}/opt/opera/share/opera/ini/spellcheck.ini
-	fi
-
-	if use qt || use kde; then
-		cd ${D}/opt/opera/bin
-		epatch ${FILESDIR}/opera-qt.2.patch
-	fi
-}
-
-pkg_postinst() {
-	einfo "For localized language files take a look at:"
-	einfo "http://www.opera.com/download/languagefiles/index.dml?platform=linux"
-	einfo
-	einfo "To change the spellcheck language edit /opt/opera/share/opera/ini/spellcheck.ini"
-	einfo "and emerge app-text/aspell-language."
-}
diff --git a/www-client/opera/opera-8.50.ebuild b/www-client/opera/opera-8.52.ebuild
index cb69f67bc753..aae559b91ef5 100644
--- a/www-client/opera/opera-8.50.ebuild
+++ b/www-client/opera/opera-8.52.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-8.50.ebuild,v 1.6 2005/10/25 04:00:35 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-8.52.ebuild,v 1.1 2006/02/20 08:36:22 lanius Exp $
 
 inherit eutils
 
-IUSE="static spell qt kde"
+IUSE="qt-static spell qt kde"
 
-OPERAVER="8.50-20050916"
-OPERAFTPDIR="850/final/en"
+OPERAVER="8.52-20060201"
+OPERAFTPDIR="852/final/en"
 
 S=${WORKDIR}/${A/.tar.bz2/}
 
@@ -17,33 +17,44 @@ HOMEPAGE="http://www.opera.com/linux/"
 # that's an ugly workaround for the broken src_uri syntax
 OPERA_URI="mirror://opera/linux/${OPERAFTPDIR}/"
 SRC_URI="
-	x86? ( static? ( ${OPERA_URI}/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	x86? ( !static? ( ${OPERA_URI}/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	amd64? ( static? ( ${OPERA_URI}/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	amd64? ( !static? ( ${OPERA_URI}/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	sparc? ( ${OPERA_URI}/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )
-	ppc? ( ${OPERA_URI}/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )"
+	x86? ( qt-static? ( ${OPERA_URI}i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+	x86? ( !qt-static? ( ${OPERA_URI}i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+	amd64? ( qt-static? ( ${OPERA_URI}i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+	amd64? ( !qt-static? ( ${OPERA_URI}i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+	sparc? ( ${OPERA_URI}sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )
+	ppc? ( ${OPERA_URI}ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )"
 
-#	sparc? ( !static? ( ${OPERA_URI}/sparc/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )
-#	ppc? ( !static? ( ${OPERA_URI}/ppc-linux/en/${PN}-${OPERAVER}.3-shared-qt.ppc-en.tar.bz2 ) )
+#	sparc? ( !qt-static? ( ${OPERA_URI}/sparc/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )
+#	ppc? ( !qt-static? ( ${OPERA_URI}/ppc-linux/en/${PN}-${OPERAVER}.3-shared-qt.ppc-en.tar.bz2 ) )
 
 # Dependencies may be augmented later (see below).
 DEPEND=">=sys-apps/sed-4
 	amd64? ( sys-apps/linux32 )"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( 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
+			  )
+			  virtual/x11
+			)
 	>=media-libs/fontconfig-2.1.94-r1
-	amd64? ( static? ( app-emulation/emul-linux-x86-xlibs )
-	         !static? ( app-emulation/emul-linux-x86-qtlibs ) )
-	!amd64? ( media-libs/libexif
-	          x11-libs/openmotif
+	amd64? ( qt-static? ( app-emulation/emul-linux-x86-xlibs )
+	         !qt-static? ( app-emulation/emul-linux-x86-qtlibs ) )
+	!amd64? ( virtual/motif
 	          spell? ( app-text/aspell )
-	          x86? ( !static? ( =x11-libs/qt-3* ) )
+	          x86? ( !qt-static? ( =x11-libs/qt-3* ) )
 	          media-libs/jpeg )"
 
 SLOT="0"
 LICENSE="OPERA-8.50"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 src_unpack() {
 	unpack ${A}
@@ -55,6 +66,7 @@ src_unpack() {
 	       -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:/usr/share/applications:${D}/usr/share/applications: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:' \
@@ -101,7 +113,7 @@ src_install() {
 
 	# enable spellcheck
 	if use spell; then
-		if use static; then
+		if use qt-static; then
 			DIR=$OPERAVER.1
 		else
 			use sparc && DIR=$OPERAVER.2 || DIR=$OPERAVER.5
@@ -109,10 +121,13 @@ src_install() {
 		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> ${D}/opt/opera/share/opera/ini/spellcheck.ini
 	fi
 
-	if use qt || use kde; then
-		cd ${D}/opt/opera/bin
-		epatch ${FILESDIR}/opera-qt.2.patch
-	fi
+	#if use qt || use kde; then
+	#	cd ${D}/opt/opera/bin
+	#	epatch ${FILESDIR}/opera-qt.2.patch
+	#fi
+
+	dodir /etc/env.d
+	echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > ${D}/etc/env.d/90opera
 }
 
 pkg_postinst() {