http://my.opera.com/desktopteam/blog/2011/09/02/new-wahoo-12-00-build-with-updated-core-and-speed-dial

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

9 files changed, 28 insertions, 1421 deletions

diff --git a/www-client/opera-next/ChangeLog b/www-client/opera-next/ChangeLog
index f0f1da13db26..27d998787cae 100644
--- a/www-client/opera-next/ChangeLog
+++ b/www-client/opera-next/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-client/opera-next
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.38 2011/08/16 19:59:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.39 2011/09/02 15:50:23 jer Exp $
+
+*opera-next-12.00.1054 (02 Sep 2011)
+
+  02 Sep 2011; Jeroen Roovers <jer@gentoo.org> -opera-next-11.50.1074.ebuild,
+  -opera-next-12.00.1017.ebuild, -opera-next-12.00.1020.ebuild,
+  -opera-next-12.00.1027.ebuild, -opera-next-12.00.1033.ebuild,
+  -opera-next-12.00.1033-r1.ebuild, -opera-next-12.00.1039.ebuild,
+  +opera-next-12.00.1054.ebuild:
+  http://my.opera.com/desktopteam/blog/2011/09/02/new-wahoo-12-00-build-with-up
+  dated-core-and-speed-dial
 
 *opera-next-12.00.1047 (16 Aug 2011)
 
diff --git a/www-client/opera-next/Manifest b/www-client/opera-next/Manifest
index c43ea7de2931..b9a68f20fd32 100644
--- a/www-client/opera-next/Manifest
+++ b/www-client/opera-next/Manifest
@@ -1,46 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST opera-next-11.50-1074.i386.freebsd.tar.xz 11163176 RMD160 986dea489a1494c08c821fa8023d125200459cef SHA1 9547c3f9e273f9fa149975639d05f5e7089bf939 SHA256 e0ab37552f0233c789b95d94f65164f1e3b8af0500246fcdfe8ea97a6cf2dec7
-DIST opera-next-11.50-1074.i386.linux.tar.xz 11092584 RMD160 ade9e1094e0eaeab41a78e087c72e67d3b70f015 SHA1 633b86baffc8d9002f8b8c2afd36658bdb0f778d SHA256 dde4e447faa91a603e6713925e2bb99e452ae7306a44fe423860cbfc468549a3
-DIST opera-next-11.50-1074.x86_64.linux.tar.xz 11845592 RMD160 2c901da76fb3ccc9c618b79b0dc1fb7056531b8d SHA1 43eda198b21287bd8487862fb0abb064f188b63b SHA256 d4dee15432927b903bc931ab009c525bfcde23b22d1eeb20b745b5618c3a995a
-DIST opera-next-12.00-1017.i386.freebsd.tar.xz 11185548 RMD160 6a98a57dcb72f0750ffcc5c5102aeb9b50643acd SHA1 bee15947de2c3a8b3352fa43dfd17fbca09e9aec SHA256 a942906cc8edc0b528ab33269d72dbf26dc48bfe17a7870753b24915a43e3ff8
-DIST opera-next-12.00-1017.i386.linux.tar.xz 11113544 RMD160 c43afafc28591ad53d622f30a54eeeefc47db689 SHA1 2255f6dae7ab2c1ace0bc3106e319f7477229ff4 SHA256 6226602342f5146a6e1f48894c2b6d1ed9265f05a6f8f14444b89cc139f98968
-DIST opera-next-12.00-1017.x86_64.linux.tar.xz 11860500 RMD160 3bfe63ed2fcea71023b3e5ce832af433f063b6b5 SHA1 8e37dce43b960abfba9a80a26b851b0d248609f8 SHA256 328a5c699dd218ffed420b12787a2d4103fa92389438320e49163b50641a57e8
-DIST opera-next-12.00-1020.i386.freebsd.tar.xz 11200772 RMD160 2d1fccdee2c955fb04cebe70a8d03a4f101f915d SHA1 45fe3732d2e59398b7d213da283430dfe465ad08 SHA256 c27e2a334380d618973c88736e2d33be1ff3c29d4389ddc0e4b057b5475e0abf
-DIST opera-next-12.00-1020.i386.linux.tar.xz 11120708 RMD160 1b80140dcab7d07aeedb49e5333c0065fef8f614 SHA1 f097615edf44e20510af7e6077889781f5873630 SHA256 048ba4fe12901bdeb6d27a596eecf28c8fa00caf91ae7f50688f819ca64829d6
-DIST opera-next-12.00-1020.x86_64.linux.tar.xz 11882292 RMD160 ba930c537b4e8cf41996d8275b1c0ff5db25def2 SHA1 8905041d6c21505c14d9c3f6977dffb4405df589 SHA256 0d1bf58b3597d5b762b481feb1d7f15052d4bb4ae9e9b7504be525e7be8cafb4
-DIST opera-next-12.00-1027.i386.freebsd.tar.xz 11200792 RMD160 9e688a338c0ddaff7adad24eb20dd585cf26f3e1 SHA1 e3871a6e89d633803c80e43dae0b4d7bb0ab607d SHA256 8f40fcd156113925c7becebc6dabd688c6c44803f64854a0331ab7ecd15fe4b8
-DIST opera-next-12.00-1027.i386.linux.tar.xz 11131796 RMD160 17dbfad7bf996a40bd70a55d1215e67a5deff1d6 SHA1 30d28f494851af0786bb90ce05ee98b3ab3b4997 SHA256 3cb489d604ac983fb1575e967874c988bd6edc360f949f26c58837948a62cbc2
-DIST opera-next-12.00-1027.x86_64.linux.tar.xz 11896660 RMD160 ea34c79a19a6345264acbbc6c53236ce6fa8b212 SHA1 0a33a711d4798897cefc32ab011c05081c453c1c SHA256 1f508733b7b1d2904a1d540d435d74aa5e7d771b39a9b9a70e06747d88bd1933
-DIST opera-next-12.00-1033.i386.freebsd.tar.xz 11219012 RMD160 801d26cfa0b963d11d7b2dcf9404de2db4e95d0c SHA1 40cdde9ee3a705da5e5a1087aa1f55671800962f SHA256 30514d6ddcd29093d2a5ba4a15bbe70a2034da38b74a47111913c5686f3effb6
-DIST opera-next-12.00-1033.i386.linux.tar.xz 11145704 RMD160 006eb6bc0d1bcef69b31e7ad9cf43d6af7919743 SHA1 ac50354eeff4eaa5ef1483db0588b94c29725ad0 SHA256 b1e70e95afa944d6db20fba47590b67feb3d3ff7acc073c9f041f2ae1607585c
-DIST opera-next-12.00-1033.x86_64.linux.tar.xz 11910724 RMD160 9649dab59fdf2b4a673c9c6007dfae5764f60cdf SHA1 0775fb1b57e66ec3a2a9c2c5dc133f4443391c17 SHA256 cbec0a8cd1bf02ebee4ee882d84c8f1cbab8206320b43ef5ad163deae628354d
-DIST opera-next-12.00-1039.i386.freebsd.tar.xz 11232808 RMD160 da758f95555d39e33dac2c62effcae321a887bb4 SHA1 37b665c497c124131cbc4f6b767f16b5c5fdcf12 SHA256 424ab31eb2ca6da4ce4d49453cea9aeb70fa7b63a5ff82326bf4a967038f08e6
-DIST opera-next-12.00-1039.i386.linux.tar.xz 11172160 RMD160 0c2d47c084c267f1b35aa2232e4481cf3446fc9d SHA1 27d554545cdf7f419ace09ba4a7da6399ef2ee66 SHA256 4fe8a1553b51efc29db3596343a0679e4803f9f1963d26c7a6a2576e66664cb2
-DIST opera-next-12.00-1039.x86_64.linux.tar.xz 11932384 RMD160 af4d41db283c2564ed24f06489db8e554c15bbed SHA1 1e246f2b1233f7db70b5a39a24418c6742f081db SHA256 344d0fe18cbace00e72f05b46937f5e442976d09cb9d7f837f668ca6f68986ed
 DIST opera-next-12.00-1042.i386.freebsd.tar.xz 11232784 RMD160 da78aaa10ec8cb1414f15482bcd2807f8e9e6ad1 SHA1 24b0e485f8ac1743c799f12e37fce9e56eff0c8c SHA256 83480385ecd2f4df07a8796e9727d3ff61917af2d3da38bcf24e4454f4f82ae1
 DIST opera-next-12.00-1042.i386.linux.tar.xz 11164156 RMD160 b505eb3dd058b7d6798444dfb28805a84abcbba0 SHA1 54edbe6bb40ab7a54dfec11c176310aca65ee2e3 SHA256 d0802cfef9a94e48d0b7dcbec5e950600737c968be3eb90392b257d1bba400b8
 DIST opera-next-12.00-1042.x86_64.linux.tar.xz 11933032 RMD160 9f818af166586bfee71751ffd92d4f8cf8360d0b SHA1 23ec930c4888d29f7e496687363edf89c5e59e1b SHA256 ed8794fad0ad6c6ecfe9296fe5a0d5ac2f7d878f1aa80d50d009d26bdf9daca4
 DIST opera-next-12.00-1047.i386.freebsd.tar.xz 11240576 RMD160 d4ad7ea735675e54f4a567e6e461e071bf5c5930 SHA1 8a366b54886ae0104f823728db9e7176f2b78240 SHA256 8fc719b2bd35cb233cd156da9d3cd862121bf75647fd030c868c40aab210c4b7
 DIST opera-next-12.00-1047.i386.linux.tar.xz 11168232 RMD160 bd190a4d2e90250e64aeac71cac89e6206796939 SHA1 ff529aa486df5c08cd8a37bd5c87895f3bf4e175 SHA256 36bedc08fe5feb371731f301bfc9c1bc131802d4e64915ea286f7c1f2f38e88f
 DIST opera-next-12.00-1047.x86_64.linux.tar.xz 11931752 RMD160 214b954e62dfccf2c95bc581fee6a992c30d3f2a SHA1 ea8de68952c60acf94faf445f28c87aa1d36d016 SHA256 2b04ae1f14f39c80c394b673d66adfae522f8b29513fc7065028d7403d60439a
-EBUILD opera-next-11.50.1074.ebuild 6199 RMD160 790193982d0445f3087cea0b03dfe01e3febdbb8 SHA1 f70964c6766a606c1d3289354cfc89adef27d2c9 SHA256 c3400782dba0fd46968d2ef7c0d43a2692156212cb7b7c8e10ba4733c9944438
-EBUILD opera-next-12.00.1017.ebuild 6201 RMD160 d789458dbd1a8d4e35f03dfb4b8f40d3888c0415 SHA1 9da734fd4d669f0023e753e3f0345b0157320ec2 SHA256 4a3bcdf39cfdf1282ed2bc8317d9641d03a291b913860b73c673e35a1b14b549
-EBUILD opera-next-12.00.1020.ebuild 6186 RMD160 d110707d9cdd8fbc9ddd5bd6aea81ed1fe922e40 SHA1 8e16d17d0f7e4371d671b79f8358c1c00e1942d0 SHA256 f114223c77d02c55af3f55de0f313d72bc2304d7625a644450509e08e37bd82e
-EBUILD opera-next-12.00.1027.ebuild 6179 RMD160 f34a032afc90274ef4a9e255109e0a1ce890020a SHA1 d10b42a50aeecd9c22bdee271f5dde280d155128 SHA256 769648221cf591a131abf2206baba2e301b5a50c07c9bd96d434df8145235650
-EBUILD opera-next-12.00.1033-r1.ebuild 6514 RMD160 f28a03be2fb432e57b452f648a5a558d38dd8e0a SHA1 3a5036de2111c3607a233e841630a40d6508a0a7 SHA256 8e5f84bb94d777acd9634ec729705b2c858ba38da7fee11c010a31392ec95140
-EBUILD opera-next-12.00.1033.ebuild 6182 RMD160 0fb21fd9ebd851169e8e2a0b5d95a432146630c1 SHA1 ee3b38835627e387ea7021fafa2a640956c242ae SHA256 5da2ccd0cadd7dbac59fb0ce785ae17044ca4fba65edc0af64b4b834b8e60f4e
-EBUILD opera-next-12.00.1039.ebuild 5891 RMD160 cb7a9e7b42dcf9749afe37f9aada761dcb683827 SHA1 ff073969b75642a5f10c219a5d744db8aa9640fa SHA256 a9cc17e80aff866c0872cfc69529fb9d199e75a24751a2a32cd3af9fc9fe9117
+DIST opera-next-12.00-1054.i386.freebsd.tar.xz 11276900 RMD160 df6534d3b93efa550c841c8fb2db7bf7c1dd4a90 SHA1 21a43e43316bb4d192827a2248395f877ab90830 SHA256 73e037a1cd713bfd1e6e01419d4eb83fa623eed4514453e9c883fe29e2673e10
+DIST opera-next-12.00-1054.i386.linux.tar.xz 11201764 RMD160 224fbb3b76cd2459e836a21d7da336be4ca076e2 SHA1 d4d50dc2516185104169bd1f58433207d1986122 SHA256 607b6fb0a873d24701fe0571abda2bc711b53174795f00aeffc214a4f3e8ab24
+DIST opera-next-12.00-1054.x86_64.linux.tar.xz 11969604 RMD160 2b97f58673d3c4dbe8a61e45f4b3def06858d910 SHA1 af8676a26fa80ac19c11648f86f41748f7c3081b SHA256 ca1f5bcd6d5149ee6f3810d0c3495605ca11bb43ffe35f72c9f014478742a5a6
 EBUILD opera-next-12.00.1042-r1.ebuild 6065 RMD160 f7448d789cf5ea0bc2750347bbce2c50ca1ce5b9 SHA1 d018ca2d013d6ccf4f5473612e75263efe123fe6 SHA256 7afc244d3286a26fa5fa0f169587ca41a95e8cd8104142f8901b0a4a074bf36f
 EBUILD opera-next-12.00.1042.ebuild 5893 RMD160 f682c18d6313f95e340ff9cffca847d9538aa177 SHA1 45040adb7e36b5c90d259f1e8058f3f0da660621 SHA256 95ecf514091d93465aa7e5334aa15102e1490a1d12e7ef15e629d8605a30df54
 EBUILD opera-next-12.00.1047.ebuild 6061 RMD160 cf89bce579c85763153389e05ef235e638970c05 SHA1 c872339674e5bd3ac95f9049415b76c7bf53d09e SHA256 b162ff6368e08deee2c696749a25cc84ab39ce9efcfde447d9e4a417b0ebf4f2
-MISC ChangeLog 7577 RMD160 f105a2d3a2fb5890ddab2fb7200f29e8ed9f720e SHA1 774a93396ecf643336e2bdad452356992eb4783c SHA256 c187444572b38530c089097f3aabd4399927c8de89191facb68bd7b7a427098f
+EBUILD opera-next-12.00.1054.ebuild 6068 RMD160 caa4d42e4a0e8a726c0170608e74aa12a7f6522a SHA1 61eb01e530a65333edddebf89755f42a0e97f739 SHA256 a410dae1dad6cfa7c3048e88ab310fe551f9982a56ed91d89e26330e51ab27ce
+MISC ChangeLog 8030 RMD160 01387d18d9e6b6216e5190534c1c921d292e9423 SHA1 827466f12f25a812d1ac040b751d6c8b9f243c93 SHA256 454cc7b158415e5ce1f5a72489e78df35e294f16958717a10803a8a3fd39c627
 MISC metadata.xml 1547 RMD160 465d146bcfdb6553f7f0ab2dddd68c4dcb2e7731 SHA1 1afb7e0ccc0833ba0eb73be38b282b66ad629ff6 SHA256 5cfc6e7cbf3c454d563eb407b4569f0f5a9b3ce7770026d6055f27211d481915
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5KzDoACgkQVWmRsqeSphNq5gCeLxZKAw3MLk68RCxaL3SJMPrV
-CNgAn1uId/eyp1btQ/5qyxIG7SqfvmDe
-=iBB1
+iEYEARECAAYFAk5g+0UACgkQVWmRsqeSphPCtACfSR2CZ7rAqVjICBgiXeQNcZMK
+y4QAn2YTpJxvwLkzUn7/kUPZ/L3BFnhK
+=LZuF
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera-next/opera-next-11.50.1074.ebuild b/www-client/opera-next/opera-next-11.50.1074.ebuild
deleted file mode 100644
index 4deb1b21a653..000000000000
--- a/www-client/opera-next/opera-next-11.50.1074.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-11.50.1074.ebuild,v 1.1 2011/06/27 13:27:50 jer Exp $
-
-EAPI="3"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
-
-DESCRIPTION="A fast and secure web browser and Internet suite"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-11 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk kde +gstreamer"
-
-O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
-O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
-
-O_D="rc5_${O_V}-${O_B}"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
-	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi
-hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te
-th tl tr uk uz vi zh-CN zh-TW zu"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
-done
-
-DEPEND="
-	>=sys-apps/sed-4
-	app-arch/xz-utils
-"
-GTKRDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-GSTRDEPEND="
-	dev-libs/glib
-	dev-libs/libxml2
-	media-plugins/gst-plugins-meta
-	media-libs/gstreamer
-"
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	gtk? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-
-pkg_setup() {
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-	elog "If you seek support, please file a bug report at"
-	elog "https://bugs.gentoo.org and post the output of"
-	elog " \`emerge --info =${CATEGORY}/${P}'"
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv -v ${PN}* "${S}" || die
-}
-
-src_prepare() {
-	local LNGDIR="share/${PN}/locale"
-
-	# Count linguas
-	count() { echo ${#}; }
-	local lingua_count=$(count ${O_LINGUAS} en)
-	local locale_count=$(count ${LNGDIR}/*)
-	[[ ${lingua_count} = ${locale_count} ]] \
-		|| die "Number of LINGUAS does not match number of locales"
-	unset count
-
-	# Remove unwanted linguas
-	einfo "Keeping these locales (linguas): ${LINGUAS}."
-	for LINGUA in ${O_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
-		fi
-	done
-
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
-	rm -rf share/doc
-	for locale in share/${PN}/locale/*; do
-		rm -f "${locale}/license.txt"
-		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
-			|| die "ln -sn license.txt"
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	# Leave libopera*.so only if the user chooses
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk.so || die "rm liboperagtk.so failed"
-	fi
-	if ! use kde; then
-		rm lib/${PN}/liboperakde4.so || die "rm liboperakde4.so failed"
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die "gunzip failed"
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}::g" \
-		-e "s:@@{_SUFFIX}::g" \
-		-e "s:@@{USUFFIX}::g" \
-		-e "s:opera:${PN}:g" \
-		share/man/man1/* \
-		share/applications/${PN}-browser.desktop \
-		|| die "sed failed"
-
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/sh' > ${PN}
-	echo 'export OPERA_DIR=/usr/share/'"${PN}" >> ${PN}
-	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
-		>> ${PN}
-	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
-
-	# Fix libdir in defaults/pluginpath.ini
-	sed -i \
-		share/${PN}/defaults/pluginpath.ini \
-		-e "s|/usr/lib32|${OPREFIX}|g" \
-		-e '/netscape/{s|[0-1]|2|g}' \
-		|| die "sed pluginpath.ini failed"
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" lib/${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 \
-				"$i" \
-				-e 's/libz\.so\.3/libz.so.1/g'
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] \
-			&& die "failed to change libz.so.3 to libz.so.1"
-	fi
-}
-
-src_install() {
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	mv lib/ "${D}/${OPREFIX}" || die "mv lib/ failed"
-	mv share/ "${D}/usr/" || die "mv share/ failed"
-
-	# Install startup scripts
-	dobin ${PN} || die "dobin failed"
-
-	# Stop revdep-rebuild from checking opera binaries
-	dodir /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
-		> "${D}"/etc/revdep-rebuild/90${PN}
-
-	# Set PaX markings for hardened/PaX (bug #344267)
-	pax-mark m \
-		"${D}/${OPREFIX}/${PN}/${PN}" \
-		"${D}/${OPREFIX}/${PN}/operaplugincleaner" \
-		"${D}/${OPREFIX}/${PN}/operapluginwrapper"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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 /usr/share/${PN}/locale/, then enter the"
-	elog "directory for the language you want and [Open] the .lng file."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/opera-next/opera-next-12.00.1017.ebuild b/www-client/opera-next/opera-next-12.00.1017.ebuild
deleted file mode 100644
index a9c3941b613a..000000000000
--- a/www-client/opera-next/opera-next-12.00.1017.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1017.ebuild,v 1.1 2011/07/07 15:09:21 jer Exp $
-
-EAPI="3"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
-
-DESCRIPTION="A fast and secure web browser and Internet suite"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-11 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk kde +gstreamer"
-
-O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
-O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
-
-O_D="wahoo_${O_V}-${O_B}"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
-	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi
-hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te
-th tl tr uk uz vi zh-CN zh-TW zu"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
-done
-
-DEPEND="
-	>=sys-apps/sed-4
-	app-arch/xz-utils
-"
-GTKRDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-GSTRDEPEND="
-	dev-libs/glib
-	dev-libs/libxml2
-	media-plugins/gst-plugins-meta
-	media-libs/gstreamer
-"
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	gtk? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-
-pkg_setup() {
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-	elog "If you seek support, please file a bug report at"
-	elog "https://bugs.gentoo.org and post the output of"
-	elog " \`emerge --info =${CATEGORY}/${P}'"
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv -v ${PN}* "${S}" || die
-}
-
-src_prepare() {
-	local LNGDIR="share/${PN}/locale"
-
-	# Count linguas
-	count() { echo ${#}; }
-	local lingua_count=$(count ${O_LINGUAS} en)
-	local locale_count=$(count ${LNGDIR}/*)
-	[[ ${lingua_count} = ${locale_count} ]] \
-		|| die "Number of LINGUAS does not match number of locales"
-	unset count
-
-	# Remove unwanted linguas
-	einfo "Keeping these locales (linguas): ${LINGUAS}."
-	for LINGUA in ${O_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
-		fi
-	done
-
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
-	rm -rf share/doc
-	for locale in share/${PN}/locale/*; do
-		rm -f "${locale}/license.txt"
-		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
-			|| die "ln -sn license.txt"
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	# Leave libopera*.so only if the user chooses
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk.so || die "rm liboperagtk.so failed"
-	fi
-	if ! use kde; then
-		rm lib/${PN}/liboperakde4.so || die "rm liboperakde4.so failed"
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die "gunzip failed"
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}::g" \
-		-e "s:@@{_SUFFIX}::g" \
-		-e "s:@@{USUFFIX}::g" \
-		-e "s:opera:${PN}:g" \
-		share/man/man1/* \
-		share/applications/${PN}-browser.desktop \
-		|| die "sed failed"
-
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/sh' > ${PN}
-	echo 'export OPERA_DIR=/usr/share/'"${PN}" >> ${PN}
-	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
-		>> ${PN}
-	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
-
-	# Fix libdir in defaults/pluginpath.ini
-	sed -i \
-		share/${PN}/defaults/pluginpath.ini \
-		-e "s|/usr/lib32|${OPREFIX}|g" \
-		-e '/netscape/{s|[0-1]|2|g}' \
-		|| die "sed pluginpath.ini failed"
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" lib/${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 \
-				"$i" \
-				-e 's/libz\.so\.3/libz.so.1/g'
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] \
-			&& die "failed to change libz.so.3 to libz.so.1"
-	fi
-}
-
-src_install() {
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	mv lib/ "${D}/${OPREFIX}" || die "mv lib/ failed"
-	mv share/ "${D}/usr/" || die "mv share/ failed"
-
-	# Install startup scripts
-	dobin ${PN} || die "dobin failed"
-
-	# Stop revdep-rebuild from checking opera binaries
-	dodir /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
-		> "${D}"/etc/revdep-rebuild/90${PN}
-
-	# Set PaX markings for hardened/PaX (bug #344267)
-	pax-mark m \
-		"${D}/${OPREFIX}/${PN}/${PN}" \
-		"${D}/${OPREFIX}/${PN}/operaplugincleaner" \
-		"${D}/${OPREFIX}/${PN}/operapluginwrapper"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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 /usr/share/${PN}/locale/, then enter the"
-	elog "directory for the language you want and [Open] the .lng file."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/opera-next/opera-next-12.00.1020.ebuild b/www-client/opera-next/opera-next-12.00.1020.ebuild
deleted file mode 100644
index b3aac23da1ec..000000000000
--- a/www-client/opera-next/opera-next-12.00.1020.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1020.ebuild,v 1.1 2011/07/14 10:46:20 jer Exp $
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
-
-DESCRIPTION="A fast and secure web browser and Internet suite"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-11 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk kde +gstreamer"
-
-O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
-O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
-
-O_D="stickybucket_${O_V}-${O_B}"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
-	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi
-hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te
-th tl tr uk uz vi zh-CN zh-TW zu"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
-done
-
-DEPEND="
-	>=sys-apps/sed-4
-	app-arch/xz-utils
-"
-GTKRDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-GSTRDEPEND="
-	dev-libs/glib
-	dev-libs/libxml2
-	media-plugins/gst-plugins-meta
-	media-libs/gstreamer
-"
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	gtk? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-
-pkg_setup() {
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-	elog "If you seek support, please file a bug report at"
-	elog "https://bugs.gentoo.org and post the output of"
-	elog " \`emerge --info =${CATEGORY}/${P}'"
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv -v ${PN}* "${S}" || die
-}
-
-src_prepare() {
-	local LNGDIR="share/${PN}/locale"
-
-	# Count linguas
-	count() { echo ${#}; }
-	local lingua_count=$(count ${O_LINGUAS} en)
-	local locale_count=$(count ${LNGDIR}/*)
-	[[ ${lingua_count} = ${locale_count} ]] \
-		|| die "Number of LINGUAS does not match number of locales"
-	unset count
-
-	# Remove unwanted linguas
-	einfo "Keeping these locales (linguas): ${LINGUAS}."
-	for LINGUA in ${O_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
-		fi
-	done
-
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
-	rm -rf share/doc
-	for locale in share/${PN}/locale/*; do
-		rm -f "${locale}/license.txt"
-		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
-			|| die "ln -sn license.txt"
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	# Leave libopera*.so only if the user chooses
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk.so || die "rm liboperagtk.so failed"
-	fi
-	if ! use kde; then
-		rm lib/${PN}/liboperakde4.so || die "rm liboperakde4.so failed"
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die "gunzip failed"
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}::g" \
-		-e "s:@@{_SUFFIX}::g" \
-		-e "s:@@{USUFFIX}::g" \
-		-e "s:opera:${PN}:g" \
-		share/man/man1/* \
-		share/applications/${PN}-browser.desktop \
-		|| die "sed failed"
-
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/sh' > ${PN}
-	echo 'export OPERA_DIR=/usr/share/'"${PN}" >> ${PN}
-	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
-		>> ${PN}
-	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
-
-	# Fix libdir in defaults/pluginpath.ini
-	sed -i \
-		share/${PN}/defaults/pluginpath.ini \
-		-e "s|/usr/lib32|${OPREFIX}|g" \
-		-e '/netscape/{s|[0-1]|2|g}' \
-		|| die "sed pluginpath.ini failed"
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" lib/${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 \
-				"$i" \
-				-e 's/libz\.so\.3/libz.so.1/g'
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] \
-			&& die "failed to change libz.so.3 to libz.so.1"
-	fi
-}
-
-src_install() {
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	mv lib/ "${D}/${OPREFIX}" || die "mv lib/ failed"
-	mv share/ "${D}/usr/" || die "mv share/ failed"
-
-	# Install startup scripts
-	dobin ${PN}
-
-	# Stop revdep-rebuild from checking opera binaries
-	dodir /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
-		> "${D}"/etc/revdep-rebuild/90${PN}
-
-	# Set PaX markings for hardened/PaX (bug #344267)
-	pax-mark m \
-		"${D}/${OPREFIX}/${PN}/${PN}" \
-		"${D}/${OPREFIX}/${PN}/operaplugincleaner" \
-		"${D}/${OPREFIX}/${PN}/operapluginwrapper"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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 /usr/share/${PN}/locale/, then enter the"
-	elog "directory for the language you want and [Open] the .lng file."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/opera-next/opera-next-12.00.1027.ebuild b/www-client/opera-next/opera-next-12.00.1027.ebuild
deleted file mode 100644
index 44132650d349..000000000000
--- a/www-client/opera-next/opera-next-12.00.1027.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1027.ebuild,v 1.1 2011/07/20 15:59:49 jer Exp $
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
-
-DESCRIPTION="A fast and secure web browser and Internet suite"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-11 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk kde +gstreamer"
-
-O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
-O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
-
-O_D="27444_${O_V}-${O_B}"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
-	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi
-hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te
-th tl tr uk uz vi zh-CN zh-TW zu"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
-done
-
-DEPEND="
-	>=sys-apps/sed-4
-	app-arch/xz-utils
-"
-GTKRDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-GSTRDEPEND="
-	dev-libs/glib
-	dev-libs/libxml2
-	media-plugins/gst-plugins-meta
-	media-libs/gstreamer
-"
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	gtk? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-
-pkg_setup() {
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-	elog "If you seek support, please file a bug report at"
-	elog "https://bugs.gentoo.org and post the output of"
-	elog " \`emerge --info =${CATEGORY}/${P}'"
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv -v ${PN}* "${S}" || die
-}
-
-src_prepare() {
-	local LNGDIR="share/${PN}/locale"
-
-	# Count linguas
-	count() { echo ${#}; }
-	local lingua_count=$(count ${O_LINGUAS} en)
-	local locale_count=$(count ${LNGDIR}/*)
-	[[ ${lingua_count} = ${locale_count} ]] \
-		|| die "Number of LINGUAS does not match number of locales"
-	unset count
-
-	# Remove unwanted linguas
-	einfo "Keeping these locales (linguas): ${LINGUAS}."
-	for LINGUA in ${O_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
-		fi
-	done
-
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
-	rm -rf share/doc
-	for locale in share/${PN}/locale/*; do
-		rm -f "${locale}/license.txt"
-		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
-			|| die "ln -sn license.txt"
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	# Leave libopera*.so only if the user chooses
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk.so || die "rm liboperagtk.so failed"
-	fi
-	if ! use kde; then
-		rm lib/${PN}/liboperakde4.so || die "rm liboperakde4.so failed"
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die "gunzip failed"
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}::g" \
-		-e "s:@@{_SUFFIX}::g" \
-		-e "s:@@{USUFFIX}::g" \
-		-e "s:opera:${PN}:g" \
-		share/man/man1/* \
-		share/applications/${PN}-browser.desktop \
-		|| die "sed failed"
-
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/sh' > ${PN}
-	echo 'export OPERA_DIR=/usr/share/'"${PN}" >> ${PN}
-	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
-		>> ${PN}
-	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
-
-	# Fix libdir in defaults/pluginpath.ini
-	sed -i \
-		share/${PN}/defaults/pluginpath.ini \
-		-e "s|/usr/lib32|${OPREFIX}|g" \
-		-e '/netscape/{s|[0-1]|2|g}' \
-		|| die "sed pluginpath.ini failed"
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" lib/${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 \
-				"$i" \
-				-e 's/libz\.so\.3/libz.so.1/g'
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] \
-			&& die "failed to change libz.so.3 to libz.so.1"
-	fi
-}
-
-src_install() {
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	mv lib/ "${D}/${OPREFIX}" || die "mv lib/ failed"
-	mv share/ "${D}/usr/" || die "mv share/ failed"
-
-	# Install startup scripts
-	dobin ${PN}
-
-	# Stop revdep-rebuild from checking opera binaries
-	dodir /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
-		> "${D}"/etc/revdep-rebuild/90${PN}
-
-	# Set PaX markings for hardened/PaX (bug #344267)
-	pax-mark m \
-		"${D}/${OPREFIX}/${PN}/${PN}" \
-		"${D}/${OPREFIX}/${PN}/operaplugincleaner" \
-		"${D}/${OPREFIX}/${PN}/operapluginwrapper"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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 /usr/share/${PN}/locale/, then enter the"
-	elog "directory for the language you want and [Open] the .lng file."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/opera-next/opera-next-12.00.1033-r1.ebuild b/www-client/opera-next/opera-next-12.00.1033-r1.ebuild
deleted file mode 100644
index b10cc949f30e..000000000000
--- a/www-client/opera-next/opera-next-12.00.1033-r1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1033-r1.ebuild,v 1.1 2011/08/02 17:02:34 jer Exp $
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
-
-DESCRIPTION="A fast and secure web browser and Internet suite"
-HOMEPAGE="http://my.opera.com/ruario/blog/2011/06/29/i-need-feedback-from-gentoo-and-sabayon-users"
-SLOT="0"
-LICENSE="OPERA-11 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk kde +gstreamer"
-
-O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
-O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
-
-O_D="QRESYNC_${O_V}-${O_B}"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
-	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi
-hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te
-th tl tr uk uz vi zh-CN zh-TW zu"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
-done
-
-DEPEND="
-	>=sys-apps/sed-4
-	app-arch/xz-utils
-"
-GTKRDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-GSTRDEPEND="
-	dev-libs/glib
-	dev-libs/libxml2
-	media-plugins/gst-plugins-meta
-	media-libs/gstreamer
-"
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	gtk? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-
-pkg_setup() {
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-	elog "If you seek support, please file a bug report at"
-	elog "https://bugs.gentoo.org and post the output of"
-	elog " \`emerge --info =${CATEGORY}/${P}'"
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv -v ${PN}* "${S}" || die
-}
-
-src_prepare() {
-	local LNGDIR="share/${PN}/locale"
-
-	# Count linguas
-	count() { echo ${#}; }
-	local lingua_count=$(count ${O_LINGUAS} en)
-	local locale_count=$(count ${LNGDIR}/*)
-	[[ ${lingua_count} = ${locale_count} ]] \
-		|| die "Number of LINGUAS does not match number of locales"
-	unset count
-
-	# Remove unwanted linguas
-	einfo "Keeping these locales (linguas): ${LINGUAS}."
-	for LINGUA in ${O_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
-		fi
-	done
-
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
-	rm -rf share/doc
-	for locale in share/${PN}/locale/*; do
-		rm -f "${locale}/license.txt"
-		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
-			|| die "ln -sn license.txt"
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	# Leave libopera*.so only if the user chooses
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk2.so || die "rm liboperagtk.so failed"
-	fi
-	if ! use kde; then
-		rm lib/${PN}/liboperakde4.so || die "rm liboperakde4.so failed"
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die "gunzip failed"
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}::g" \
-		-e "s:@@{_SUFFIX}::g" \
-		-e "s:@@{USUFFIX}::g" \
-		-e "s:opera:${PN}:g" \
-		share/man/man1/* \
-		share/applications/${PN}-browser.desktop \
-		|| die "sed failed"
-
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/sh' > ${PN}
-	echo 'export OPERA_DIR=/usr/share/'"${PN}" >> ${PN}
-	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
-		>> ${PN}
-	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" lib/${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 \
-				"$i" \
-				-e 's/libz\.so\.3/libz.so.1/g'
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] \
-			&& die "failed to change libz.so.3 to libz.so.1"
-	fi
-}
-
-src_install() {
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	mv lib/ "${D}/${OPREFIX}" || die "mv lib/ failed"
-	mv share/ "${D}/usr/" || die "mv share/ failed"
-
-	# Install startup scripts
-	dobin ${PN}
-
-	# Stop revdep-rebuild from checking opera binaries
-	dodir /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
-		> "${D}"/etc/revdep-rebuild/90${PN}
-
-	# Set PaX markings for hardened/PaX (bug #344267)
-	pax-mark m \
-		"${D}/${OPREFIX}/${PN}/${PN}" \
-		"${D}/${OPREFIX}/${PN}/operaplugincleaner" \
-		"${D}/${OPREFIX}/${PN}/operapluginwrapper"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	elog "Contrary to all previous ebuilds, this experimental ebuild does not"
-	elog "change the default plugin paths as found in"
-	elog "</usr/share/${PN}/defaults/pluginpath.ini>."
-	elog
-	elog "To help test the assumption that changing the default pluginpath.ini"
-	elog "causes the problems with www-plugins/adobe-flash, please move your"
-	elog "\$HOME/.${PN} directory aside, launch ${PN} and try out"
-	elog "some websites that offer Adobe Flash content."
-	elog
-	elog "If you find this ebuild, and moving away your \$HOME/.${PN} directory"
-	elog "fixes the issue, then please file a new bug report with all the usual"
-	elog "information, or visit"
-	elog "${HOMEPAGE}"
-	elog "and report your findings there, but always mention this special ebuild."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/opera-next/opera-next-12.00.1033.ebuild b/www-client/opera-next/opera-next-12.00.1033.ebuild
deleted file mode 100644
index eeba6ab6ca26..000000000000
--- a/www-client/opera-next/opera-next-12.00.1033.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1033.ebuild,v 1.1 2011/07/27 15:27:01 jer Exp $
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
-
-DESCRIPTION="A fast and secure web browser and Internet suite"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-11 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk kde +gstreamer"
-
-O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
-O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
-
-O_D="QRESYNC_${O_V}-${O_B}"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
-	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi
-hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te
-th tl tr uk uz vi zh-CN zh-TW zu"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
-done
-
-DEPEND="
-	>=sys-apps/sed-4
-	app-arch/xz-utils
-"
-GTKRDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-GSTRDEPEND="
-	dev-libs/glib
-	dev-libs/libxml2
-	media-plugins/gst-plugins-meta
-	media-libs/gstreamer
-"
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	gtk? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-
-pkg_setup() {
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-	elog "If you seek support, please file a bug report at"
-	elog "https://bugs.gentoo.org and post the output of"
-	elog " \`emerge --info =${CATEGORY}/${P}'"
-	echo -e \
-		" ${GOOD}****************************************************${NORMAL}"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv -v ${PN}* "${S}" || die
-}
-
-src_prepare() {
-	local LNGDIR="share/${PN}/locale"
-
-	# Count linguas
-	count() { echo ${#}; }
-	local lingua_count=$(count ${O_LINGUAS} en)
-	local locale_count=$(count ${LNGDIR}/*)
-	[[ ${lingua_count} = ${locale_count} ]] \
-		|| die "Number of LINGUAS does not match number of locales"
-	unset count
-
-	# Remove unwanted linguas
-	einfo "Keeping these locales (linguas): ${LINGUAS}."
-	for LINGUA in ${O_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
-		fi
-	done
-
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
-	rm -rf share/doc
-	for locale in share/${PN}/locale/*; do
-		rm -f "${locale}/license.txt"
-		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
-			|| die "ln -sn license.txt"
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	# Leave libopera*.so only if the user chooses
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk2.so || die "rm liboperagtk.so failed"
-	fi
-	if ! use kde; then
-		rm lib/${PN}/liboperakde4.so || die "rm liboperakde4.so failed"
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die "gunzip failed"
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}::g" \
-		-e "s:@@{_SUFFIX}::g" \
-		-e "s:@@{USUFFIX}::g" \
-		-e "s:opera:${PN}:g" \
-		share/man/man1/* \
-		share/applications/${PN}-browser.desktop \
-		|| die "sed failed"
-
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/sh' > ${PN}
-	echo 'export OPERA_DIR=/usr/share/'"${PN}" >> ${PN}
-	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
-		>> ${PN}
-	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
-
-	# Fix libdir in defaults/pluginpath.ini
-	sed -i \
-		share/${PN}/defaults/pluginpath.ini \
-		-e "s|/usr/lib32|${OPREFIX}|g" \
-		-e '/netscape/{s|[0-1]|2|g}' \
-		|| die "sed pluginpath.ini failed"
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" lib/${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 \
-				"$i" \
-				-e 's/libz\.so\.3/libz.so.1/g'
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] \
-			&& die "failed to change libz.so.3 to libz.so.1"
-	fi
-}
-
-src_install() {
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	mv lib/ "${D}/${OPREFIX}" || die "mv lib/ failed"
-	mv share/ "${D}/usr/" || die "mv share/ failed"
-
-	# Install startup scripts
-	dobin ${PN}
-
-	# Stop revdep-rebuild from checking opera binaries
-	dodir /etc/revdep-rebuild
-	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
-		> "${D}"/etc/revdep-rebuild/90${PN}
-
-	# Set PaX markings for hardened/PaX (bug #344267)
-	pax-mark m \
-		"${D}/${OPREFIX}/${PN}/${PN}" \
-		"${D}/${OPREFIX}/${PN}/operaplugincleaner" \
-		"${D}/${OPREFIX}/${PN}/operapluginwrapper"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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 /usr/share/${PN}/locale/, then enter the"
-	elog "directory for the language you want and [Open] the .lng file."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug #334993)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/opera-next/opera-next-12.00.1039.ebuild b/www-client/opera-next/opera-next-12.00.1054.ebuild
index 2ab2c2c244c7..578493cf90d2 100644
--- a/www-client/opera-next/opera-next-12.00.1039.ebuild
+++ b/www-client/opera-next/opera-next-12.00.1054.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1039.ebuild,v 1.1 2011/08/03 18:25:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1054.ebuild,v 1.1 2011/09/02 15:50:23 jer Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ IUSE="elibc_FreeBSD gtk kde +gstreamer"
 O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
 O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
 
-O_D="lejon_${O_V}-${O_B}"
+O_D="twelvereturns_${O_V}-${O_B}"
 O_P="${PN}-${O_V}-${O_B}"
 O_U="http://snapshot.opera.com/unix/"
 
@@ -147,9 +147,15 @@ src_prepare() {
 		-e "s:@@{USUFFIX}::g" \
 		-e "s:opera:${PN}:g" \
 		share/man/man1/* \
-		share/applications/${PN}-browser.desktop \
+		share/applications/${PN}-*.desktop \
 		|| die "sed failed"
 
+	# Replace "Opera" with "Opera Next"
+	if [[ ${PN} = opera-next ]]; then
+		sed -i share/applications/${PN}-*.desktop \
+			-e "/^Name=Opera\|^ Next/s:Opera:& Next:" || die
+	fi
+
 	# Create /usr/bin/opera wrapper
 	echo '#!/bin/sh' > ${PN}
 	echo 'export OPERA_DIR=/usr/share/'"${PN}" >> ${PN}