Switch to mirrors in SRC_URI.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux i686

8 files changed, 17 insertions, 1192 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 3148e5d918ed..3d488712b8ae 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.639 2011/06/27 13:24:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.640 2011/06/28 06:45:28 jer Exp $
+
+  28 Jun 2011; Jeroen Roovers <jer@gentoo.org> -opera-11.50.1027.ebuild,
+  -opera-11.50.1067.ebuild, -opera-11.50.1068.ebuild, -opera-11.50.1071.ebuild,
+  -opera-11.50.1073.ebuild, opera-11.50.1074.ebuild:
+  Switch to mirrors in SRC_URI.
 
 *opera-11.50.1074 (27 Jun 2011)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 03f2d1b4e64b..7254e597abe6 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -4,37 +4,17 @@ Hash: SHA1
 DIST opera-11.11-2109.i386.freebsd.tar.xz 10308384 RMD160 f7387349f5c4d2d616d6604241eb338a82dd97b6 SHA1 62eb4beb5efd7fb43a42b841e279ae9c1f06f9b3 SHA256 5384fc3f2cd2aa47009da12898ad28dbbcdc9c2db6f4626a5a931a7c0edab09e
 DIST opera-11.11-2109.i386.linux.tar.xz 10289384 RMD160 dc5a929ea87e9818c6b43bbda4ac55dacaaa883d SHA1 4719065a71f7c37a5b39d58619cc5c1ec9bae689 SHA256 16b738b5b83cbcb5d2a72efeceaa5ef11122b7c0c6cc2988e13ec0fb97d671a0
 DIST opera-11.11-2109.x86_64.linux.tar.xz 11054024 RMD160 1f35dd5c69d7bcfc1152e8a3066919ad9503d63a SHA1 0407c2d747f60e1d6e9150b919f1554ac45dc639 SHA256 b5b2157315b9af6a41d0fef6d6b8d671d138105e694b8041c5ae9df89bc6edbb
-DIST opera-11.50-1027.i386.freebsd.tar.xz 10862228 RMD160 2b7c43738aa1aa5a1ff337d7f628594e555ad774 SHA1 edbd94dc587cc30087e2c225d483fae6e6e65ad9 SHA256 c4b62b72cca6447a4e67fe7fc6a00e49464b91bbe0fcece5ccc01b97bb84dfd3
-DIST opera-11.50-1027.i386.linux.tar.xz 10802300 RMD160 642959388d61f5b8d7d9e11fd2c786d6443bfa73 SHA1 829ad2683414e6ba33d437ba0dda063ca3974f0f SHA256 7f0c7a6ebf23b707761b86ed1691631f507a4b7b28ff499b4006895475fff832
-DIST opera-11.50-1027.x86_64.linux.tar.xz 11593196 RMD160 af35b45018e1636272f227a1945a759da204c32a SHA1 b1d57a27dc7fd70fab72cc7703112f1d7139ea8c SHA256 bcd1a162858b34b7f3265009d26c0aaaf3d218fb197b60037dfa74599e9af188
-DIST opera-11.50-1067.i386.freebsd.tar.xz 11184128 RMD160 31558929fd8397c0b22013c2f1d012ba5e6780ec SHA1 07af2489707b03f3b013c65a41ecbdc3356e6678 SHA256 e79f0302fa3e630a2207c1d36ca535a921535eced3a7ff5723ce5390c937afee
-DIST opera-11.50-1067.i386.linux.tar.xz 11115812 RMD160 1889279f8de2dd28c42853f8c7ecf45962c2c01f SHA1 c86341ab4abc96527c46e0be8079d0673b9c80f7 SHA256 fce987ff7c3a9f5f0d1031fdd3ec87eacc419b63e4813ac1e637e8d1c4ebcc02
-DIST opera-11.50-1067.x86_64.linux.tar.xz 11875504 RMD160 b005258cd66fd433a47e772626a6701a6235a238 SHA1 d72a4cf356d2f228ae5d03595a7bc94b9aedde93 SHA256 457182cf45646f65b8d9d89972cd9e023cd3fed7e57a8e6fef77a63e4de3ae2e
-DIST opera-11.50-1068.i386.freebsd.tar.xz 10962040 RMD160 0737ec2f56722041492842bebc032ed0b7827c61 SHA1 554cb9c23b318038c3eefe794d0deb9172bcbabd SHA256 22462964f825a5178b1b72e3c643f5026eeb6248aed05a5af1509de261b9875a
-DIST opera-11.50-1068.i386.linux.tar.xz 10898152 RMD160 057c56b52fe5a838afe182ad6f4bcfae230e5d95 SHA1 d96ed350f55755bc73108ef9c4be82f811faeec3 SHA256 89829b80946847f0c0cd96b1aa48422f16785a588fbdcf14e4dbaadde748625f
-DIST opera-11.50-1068.x86_64.linux.tar.xz 11657832 RMD160 182a317ba16edf39115a7625c7b4efd2c6a0c5c0 SHA1 c44365501d4a7f58224496a968c4ad42e59804b4 SHA256 57b32e1ad927a643defd1ec7ff79c043e18045d8e5659bf19f3a497c07891437
-DIST opera-11.50-1071.i386.freebsd.tar.xz 11144332 RMD160 b04e0003c8c1b9b4d4f52e825addebaa83736a09 SHA1 fe2aaf3e2b9a8bcfe3c75848bc68b626726da4ff SHA256 29baad96bbb5828bcd39869aaeeb61140d95002ca9f8532951f404b31250e744
-DIST opera-11.50-1071.i386.linux.tar.xz 11063700 RMD160 b965dbb088dcf358c8a3ca72dc134a3cd2fd1d35 SHA1 2326a7fbc88d167530788cf54ac16a1cfb044a29 SHA256 392bf02b5fe79bb94fb6a90fede71233da806d70fa2591ea3683a32416b5d506
-DIST opera-11.50-1071.x86_64.linux.tar.xz 11830256 RMD160 02ba4ac9ad4cf1430f561fb4b065b63f26654079 SHA1 46ff623db6033da316a616a004f983ad91f0bff3 SHA256 fb18de73391932e6eaaf2851eb535cbc37ac62df0674d1ce7afab014c7451454
-DIST opera-11.50-1073.i386.freebsd.tar.xz 11139244 RMD160 d1978fce6e17b9d8b5bb760010d20ff5d1a698f7 SHA1 409a303c04d0758bc3fa85901b09f99624d4169b SHA256 64b8021d1486c2a1dbafbef6f5fe309cd83db6f7e0308de1da1069042126a3f4
-DIST opera-11.50-1073.i386.linux.tar.xz 11070816 RMD160 3a3f140b3f964a3832d89cfaf9ae47a24beb28e2 SHA1 9a10d9ad65beeb7a4229cec81bd0f9a5d5353385 SHA256 2e7b318792706ca0c0028e1f67e0d860f677704635e16dff35399efd77e15130
-DIST opera-11.50-1073.x86_64.linux.tar.xz 11831096 RMD160 cd0990ad73817825124356ef6986ccf7fe96e31f SHA1 0e758ce5ddec4bb63f1e3ec02b39aafd073b913f SHA256 6656165a88888267cde70370ddf2cabdfdb1f5e7812beccffa6141d59f833c12
 DIST opera-11.50-1074.i386.freebsd.tar.xz 11144344 RMD160 150ac920272eded3b8191452da7c72f8431fe3a7 SHA1 22834084ca51f538b0cd4d1ea6d213fc75de794b SHA256 cc4450432071a6458096634eefbb49831fb6ccb02a1e31661244c7938dea3e97
 DIST opera-11.50-1074.i386.linux.tar.xz 11067576 RMD160 7117a13c3b6620eca07484a1314ad44dd0e659d3 SHA1 5f7a809c88be64d2c339af052e3c25723570bca2 SHA256 d936881411db5cca320e3eb4b921d0f99a32c5bb100278183533be0e8fda8f86
 DIST opera-11.50-1074.x86_64.linux.tar.xz 11828208 RMD160 904e4e7fdb1e86d0d32e5392e9a83f2cf5ecc3ae SHA1 87f6ef6fcee3788278e19fef9e84622746af87b3 SHA256 17681e7f6e01fba6c29c3ca1474e7df779a0b5db1834a334557fafbafa5cc753
 EBUILD opera-11.11.2109.ebuild 5982 RMD160 fa51701f78d7626f86aa6d2d4f6cf6053c575097 SHA1 1a21b68af084e24f601738adff9a2d5a0265880e SHA256 feec3fd2a5eacd098500de16febd5206aaeb8ffa8e4ad93b4d5a483848516e77
-EBUILD opera-11.50.1027.ebuild 6292 RMD160 91b303df1138fb5d9832e5341ec81102cd44be35 SHA1 024656238e0a4e41db7796799a0944ac59d1de9b SHA256 8aecabed7bad98cc8b881894baf267ffd937429af1e3eaaef8ee868b822ade4c
-EBUILD opera-11.50.1067.ebuild 6195 RMD160 de15aa42928848d99c121cfc2afbcc2e79bc3ca5 SHA1 48b6a3d201a67bfb7e392c15113c94bacaf2136f SHA256 9f691dbef8a9014933373a37b520fb4176ddd6e2f73fb422f7739c8b18079038
-EBUILD opera-11.50.1068.ebuild 6184 RMD160 b82ca0e0e96c013d469bd7db75997e27b9636eac SHA1 3f29c1b9baa4e99afbc39d9d3787fc0ec091ecec SHA256 9519cf3ab340b890baeecc5f0e09a42f27013d40fe3abd296a4c773d7e0ce960
-EBUILD opera-11.50.1071.ebuild 6195 RMD160 e24c4e7c7527969215645a0ed38dbc384b5a7cae SHA1 1b690ccf8c9f42a76a9e31bad4732db3521877ee SHA256 fc1dcfe006ee87f688fe3ee1913fe75548a156abe6037ac41f7754d98b3ad139
-EBUILD opera-11.50.1073.ebuild 6195 RMD160 d7004f157fff610a57f8fbc5daa4a2dddb2e12ea SHA1 5f3c7ba73b9018e48368cd622db36a8cf4bc83e3 SHA256 c5af2ff2d12e6e03f9f89471bc53d71bcab7c2c1ba8349d063f6759965f56724
-EBUILD opera-11.50.1074.ebuild 6195 RMD160 92a9b5557395eabffbf3524b8f176920db6ecf5f SHA1 8d6e7fbdd86fbb8fb70dbcfd215907696ceed36a SHA256 6029bdc2f4581b5349dd3f9b133b1fa5a02f5460c511a3035edc6be262d107a5
-MISC ChangeLog 122403 RMD160 2a2f489c2da9fec574161258bb8635c9d53a4e29 SHA1 b68f2280140a1dd157684e4fb2e336a39dcc36e4 SHA256 ca2ad62df621f79928f6bf84373c68bcaf6fb2f9d8bfbd0a273baf51ede4706a
+EBUILD opera-11.50.1074.ebuild 6182 RMD160 e8b6bc7a75bf179a7ebda5c3c0c8d3d09665c5ba SHA1 1c8fdc5ff973eb0e1fc7f9a4222da78cd2119caa SHA256 db275194eaafca613869050c64f26e608ef3a75dd6b5cccfa411001cdaac136e
+MISC ChangeLog 122642 RMD160 bc5f54656bdca51a625f12314ea9079f9aebbf4c SHA1 025885b56acedfe56499ee52ccd50d3a2ea9d2c2 SHA256 db1f20cfef2757c913c78ae9794d80dd5bd957958709e876204ba649d899fd20
 MISC metadata.xml 641 RMD160 b02a2c03b42c19da338fc0d2c2460ae393b832e3 SHA1 b9225680d057968296b8828308f76fa8d9ea9c56 SHA256 37369b30382e2fb8c54d23e112070997135689468d3cd865ed194a55bb87ed58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4IhKYACgkQVWmRsqeSphOj3wCeKSMZsSf3dK8uGIx0zbzLYywY
-P98AnipJavdupOC78MpcJsVDEyYpK6wM
-=mLjo
+iEYEARECAAYFAk4JeIwACgkQVWmRsqeSphNPnACeNEOZ6ATSWI/IMO/ZlK64bw8m
+T98AoIF9F91dCPTB7Rfl2L9htpo5lKxq
+=F9dU
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera/opera-11.50.1027.ebuild b/www-client/opera/opera-11.50.1027.ebuild
deleted file mode 100644
index 4caeb3badafa..000000000000
--- a/www-client/opera/opera-11.50.1027.ebuild
+++ /dev/null
@@ -1,236 +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/opera-11.50.1027.ebuild,v 1.2 2011/06/04 17:51:13 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="${O_V/.}b1"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="mirror://opera/"
-
-SRC_URI="
-	amd64? ( ${O_U}linux/${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}linux/${O_D}/${O_P}.i386.linux.tar.xz )
-	x86-fbsd? ( ${O_U}unix/${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 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 pl pt pt-BR ro ru sk sr sv ta te th tl tr
-	uk uz vi zh-CN zh-TW
-"
-
-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/mime/packages/${PN}-widget.xml \
-		share/man/man1/* \
-		share/applications/${PN}-browser.desktop \
-		share/applications/${PN}-widget-manager.desktop \
-		|| die "sed failed"
-
-	# Create /usr/bin/${PN} 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} ${PN}-widget-manager || 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/opera-11.50.1067.ebuild b/www-client/opera/opera-11.50.1067.ebuild
deleted file mode 100644
index ebaa1f22dde8..000000000000
--- a/www-client/opera/opera-11.50.1067.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/opera-11.50.1067.ebuild,v 1.1 2011/06/23 18:47:43 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="rc1_${O_V}-${O_B}/Opera"
-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/opera-11.50.1068.ebuild b/www-client/opera/opera-11.50.1068.ebuild
deleted file mode 100644
index 187f560d55df..000000000000
--- a/www-client/opera/opera-11.50.1068.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/opera-11.50.1068.ebuild,v 1.1 2011/06/24 16:13:47 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="rc2_${O_V}-${O_B}/Opera"
-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 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 pl pt pt-BR ro ru sk sr sv ta te th tl tr
-uk uz vi zh-CN zh-TW"
-
-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/opera-11.50.1071.ebuild b/www-client/opera/opera-11.50.1071.ebuild
deleted file mode 100644
index 3fef969e0355..000000000000
--- a/www-client/opera/opera-11.50.1071.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/opera-11.50.1071.ebuild,v 1.1 2011/06/25 13:45:18 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="rc3_${O_V}-${O_B}/Opera"
-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/opera-11.50.1073.ebuild b/www-client/opera/opera-11.50.1073.ebuild
deleted file mode 100644
index 5cb768bc6715..000000000000
--- a/www-client/opera/opera-11.50.1073.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/opera-11.50.1073.ebuild,v 1.1 2011/06/26 10:25:49 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="rc4_${O_V}-${O_B}/Opera"
-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/opera-11.50.1074.ebuild b/www-client/opera/opera-11.50.1074.ebuild
index a97a40cb81bb..98fb0fe893dc 100644
--- a/www-client/opera/opera-11.50.1074.ebuild
+++ b/www-client/opera/opera-11.50.1074.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/opera-11.50.1074.ebuild,v 1.1 2011/06/27 13:24:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.50.1074.ebuild,v 1.2 2011/06/28 06:45:28 jer Exp $
 
 EAPI="3"
 
@@ -17,14 +17,14 @@ 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}/Opera"
+O_D="${O_V/./}"
 O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
+O_U="mirror://opera/"
 
 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 )
+	amd64? ( ${O_U}linux/${O_D}/${O_P}.x86_64.linux.tar.xz )
+	x86? ( ${O_U}linux/${O_D}/${O_P}.i386.linux.tar.xz )
+	x86-fbsd? ( ${O_U}unix/${O_D}/${O_P}.i386.freebsd.tar.xz )
 "
 
 OPREFIX="/usr/$(get_libdir)"