http://my.opera.com/desktopteam/blog/2012/01/24/opera-11-61

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

5 files changed, 21 insertions, 459 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 45f1d8c82d07..c9dee499fd90 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.684 2012/01/23 23:58:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.685 2012/01/24 10:49:52 jer Exp $
+
+  24 Jan 2012; Jeroen Roovers <jer@gentoo.org> -opera-11.61.1236.ebuild,
+  -opera-11.61.1237.ebuild, opera-11.61.1250.ebuild:
+  http://my.opera.com/desktopteam/blog/2012/01/24/opera-11-61
 
 *opera-11.61.1250 (23 Jan 2012)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index fbd273184021..369764c097ba 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -4,23 +4,18 @@ Hash: SHA1
 DIST opera-11.60-1185.i386.freebsd.tar.xz 11537236 RMD160 9b8dc467f698cf540c0f537a98677930a077a0c4 SHA1 befc0d908b76d930bf9a0ac753ccfc2b086189fb SHA256 eb38671f9b5e06ba7b905bd9ff22262e9ef335c37414bbb0ea4234aa2b2ba46d
 DIST opera-11.60-1185.i386.linux.tar.xz 11505432 RMD160 f645c292f34a08a2bc44107f3ca57f4f0a1a55bd SHA1 96e3366afff3b738db9fadbd1046623827afaf00 SHA256 a73584938a558d1b9c6f250d1bf127b02fc6ca5c0378c4ee3009c178fe1c8a74
 DIST opera-11.60-1185.x86_64.linux.tar.xz 12347432 RMD160 50de639af506a0493843763cadc2c8e74d201538 SHA1 dc6d2cf74ed98dfb3625529a03a6d9107a4d01cf SHA256 a3ede13b6abe92633e4728773b472c8e0571717161ced7935ac3bc7ff728c642
-DIST opera-11.61-1236.i386.freebsd.tar.xz 11528172 RMD160 b4798c191af1d2bf7ae90c7d9e193fcb676b4967 SHA1 52d4b6d38d5605e8a1571f24fe77ced6ae463bb9 SHA256 a4b77ae115ca6f66a10eaa85fae6404cac39441bf58ec98e45e5cec038ffd0fb
-DIST opera-11.61-1236.i386.linux.tar.xz 11490396 RMD160 b63310ae33d6b3c8fe0b72866a197104e8c4ebae SHA1 49f1d312de1b860ee3262b9098240a968adf6c06 SHA256 46eedc14fecd608056a64e886760929d3f377d75263452c318bebb72bf43a95d
-DIST opera-11.61-1237.x86_64.linux.tar.xz 12318040 RMD160 4b2cb125e44a7867f60e8fd53a5d981c0f5e8e10 SHA1 7308fdbfc35c601f72a418e2b1578850c53ca014 SHA256 ca9bc43003a8aed4b904f6527b9fe42b35daa7afaf6c7f4a724d86e1dd0a2fa1
 DIST opera-11.61-1250.i386.freebsd.tar.xz 11542444 RMD160 985a7bf4e82b09e8da3cb529019df78f227bac21 SHA1 154e73851169f1a1150bcf0256529c6b05cce42e SHA256 36edb035a3b77ca1a4e63d54eb9d3aa05579443f29390bdfdb87f136bf5d1b8b
 DIST opera-11.61-1250.i386.linux.tar.xz 11490920 RMD160 7715b98548457260a838944b30b8e16de6915cec SHA1 504f05eeab4e2ef07b82ce8090c30bf49d108237 SHA256 cc4b814cd23c20e076a579b74ade72eb49c3b5e236ebd3cd95ca04251a2c853d
 DIST opera-11.61-1250.x86_64.linux.tar.xz 12319616 RMD160 36b8fe9df9717673a1252b0a1ecd72c18d36ad0f SHA1 32256a638430a8298fea12fd909c773431063430 SHA256 e5a7de9bc0092fcd8213e50d887c127b0933127dcc167d1848720f07d4085f91
 EBUILD opera-11.60.1185.ebuild 5874 RMD160 7b3b4af0b9c79819e7497c2469c150e6a880672e SHA1 d4e4d0297b094cb1cc37b066b6b76f26470b8413 SHA256 e11305f5594a97bfeb1e7daecef9aa2c76c6ef90da1c41a5451f2172a1ee6aef
-EBUILD opera-11.61.1236.ebuild 5482 RMD160 2cf1ec784eaa0d33c0f33a26fc4d923d4e2695fc SHA1 82ef0ab2ac80a9b9d5bfeb55dc40bd744e7b2788 SHA256 395e06a6ee5a1d814529707aebca846c9b8106d7f54256593ba8606cf060142b
-EBUILD opera-11.61.1237.ebuild 5421 RMD160 a10ab7040731c3dd402ace5d0ad600e7bf067c72 SHA1 488f7bc56a92e699b616536948e6a7d87b215e4f SHA256 2d45d842fe60b0c5358605a384e4c03eced602df61be0201f23d7fa72726e759
-EBUILD opera-11.61.1250.ebuild 5543 RMD160 717f1678bf253479f84099a634692006b7332cfb SHA1 b921cb3e1e54716cdadbe31062aa642a1cb065d9 SHA256 d1d1fcad048ebc632c5995fc219d2611f6fae5f4f70b944e145157aba85b2566
-MISC ChangeLog 18211 RMD160 fd4fb7862a6ae3ece509c9d79b58ca45826eb83c SHA1 7667d94ba6cafce1ba92bd95fcbc2fbabaf3143b SHA256 9bdb9703d9f6c74b1647faf63ea104092fd43489d5f22d0825ab561c2d9ce0e6
+EBUILD opera-11.61.1250.ebuild 5700 RMD160 129f10639d54c61bf6eeebd2c2e6785dea143539 SHA1 ec077fc5d24951a09001c2567171192882c00982 SHA256 a7a1fc74117844dfaaa2532847ee84f649d9aca869115662861f7034a8f90b0b
+MISC ChangeLog 18400 RMD160 ef97b114fe973b63794f1c3964a5ca4de90ee5d4 SHA1 aa331ddae46247127df722811099211feca81f6c SHA256 c8d085e626ae881f9846e585690adc084be7913f25f5e48d5d5fd496a3b22323
 MISC ChangeLog-2010 112299 RMD160 e786fcfeb4ac57db285ff420ccd9705b7c1f298c SHA1 09aef1136180ae363fd3c6bdbd3eb27f996f80c5 SHA256 5c3b5c58119b4a6b1911d840892c42234f25dae57452287fb0a9e6cca78ed171
 MISC metadata.xml 732 RMD160 28acd15c216329d807150c88fb0861eb1383c61c SHA1 9ff443c6f422e8b018d29d21948da71eda6a4295 SHA256 bd388fb8f6b0aa2cd98fcfc290b677df712be3ef14537102e02665ea2f0d871a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8d9EgACgkQVWmRsqeSphNlmQCbBjTWqWTBFt2AiY5j7jVOnQLI
-X98An3tum2WjPwLJk5Uug+3nyVVIe8OJ
-=/QDM
+iEYEARECAAYFAk8ejNoACgkQVWmRsqeSphM4kgCfedUbMZYYG5XtBKbU4Qyu3oTo
+IrkAn3FPSgf7Tn8k18m+mpGX/HhpGHXa
+=UBVX
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera/opera-11.61.1236.ebuild b/www-client/opera/opera-11.61.1236.ebuild
deleted file mode 100644
index 3de48938582a..000000000000
--- a/www-client/opera/opera-11.61.1236.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.61.1236.ebuild,v 1.1 2012/01/13 17:32:28 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="~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk gtk3 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="jason_${O_V}-${O_B}"
-O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
-
-SRC_URI="
-	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
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-GSTRDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-libs/gst-plugins-base
-	media-libs/gstreamer
-	media-plugins/gst-plugins-meta
-"
-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
-	x11-libs/libXt
-	gtk? ( ${GTKRDEPEND} )
-	gtk3? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-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
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	# Optional libraries
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk2.so || die
-	fi
-	if ! use gtk3; then
-		rm lib/${PN}/liboperagtk3.so || die
-	fi
-	if ! use kde; then
-		rm lib/${PN}/liboperakde4.so || die
-	fi
-	if ! use gstreamer; then
-		rm -r lib/${PN}/gstreamer || die
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die
-
-	# 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}-*.desktop \
-		|| die
-
-	# 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}
-	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
-	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 share/ "${D}/usr/" || die
-
-	# 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() {
-	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.61.1237.ebuild b/www-client/opera/opera-11.61.1237.ebuild
deleted file mode 100644
index e44cd28494a9..000000000000
--- a/www-client/opera/opera-11.61.1237.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.61.1237.ebuild,v 1.1 2012/01/13 17:32:28 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"
-IUSE="elibc_FreeBSD gtk gtk3 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="jason_${O_V}-1236"
-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 )
-"
-
-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
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core
-	x11-libs/qt-gui
-"
-GSTRDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-libs/gst-plugins-base
-	media-libs/gstreamer
-	media-plugins/gst-plugins-meta
-"
-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
-	x11-libs/libXt
-	gtk? ( ${GTKRDEPEND} )
-	gtk3? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-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
-	done
-
-	# Remove package directory
-	rm -rf share/${PN}/package
-
-	# Optional libraries
-	if ! use gtk; then
-		rm lib/${PN}/liboperagtk2.so || die
-	fi
-	if ! use gtk3; then
-		rm lib/${PN}/liboperagtk3.so || die
-	fi
-	if ! use kde; then
-		rm lib/${PN}/liboperakde4.so || die
-	fi
-	if ! use gstreamer; then
-		rm -r lib/${PN}/gstreamer || die
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die
-
-	# 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}-*.desktop \
-		|| die
-
-	# 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}
-	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
-	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 share/ "${D}/usr/" || die
-
-	# 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() {
-	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.61.1250.ebuild b/www-client/opera/opera-11.61.1250.ebuild
index 356af75a1c0b..546bbead8d9e 100644
--- a/www-client/opera/opera-11.61.1250.ebuild
+++ b/www-client/opera/opera-11.61.1250.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.61.1250.ebuild,v 1.1 2012/01/23 23:58:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.61.1250.ebuild,v 1.2 2012/01/24 10:49:52 jer Exp $
 
 EAPI="4"
 
@@ -17,16 +17,22 @@ IUSE="elibc_FreeBSD gtk gtk3 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="plunger_${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 )
 "
 
+O_D="${O_V/./}"
+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}/.*"