http://my.opera.com/desktopteam/blog/2010/12/14/stacking

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

5 files changed, 15 insertions, 426 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 0009e6a03342..f80e7fc9e4c8 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.571 2010/12/10 16:34:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.572 2010/12/14 17:46:11 jer Exp $
+
+*opera-11.00_pre1145 (14 Dec 2010)
+
+  14 Dec 2010; Jeroen Roovers <jer@gentoo.org> -opera-11.00_pre1128.ebuild,
+  -opera-11.00_pre1133.ebuild, -opera-11.00_pre1136.ebuild,
+  +opera-11.00_pre1145.ebuild:
+  http://my.opera.com/desktopteam/blog/2010/12/14/stacking
 
 *opera-11.00_pre1140 (10 Dec 2010)
 *opera-11.00_pre1136 (10 Dec 2010)
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index e4a3dce5b481..d06fc2879689 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,21 +2,14 @@ DIST opera-10.63-6450.i386.freebsd.tar.bz2 12748677 RMD160 abfbe4c691bf0b3b27397
 DIST opera-10.63-6450.i386.linux.tar.bz2 12669974 RMD160 874d658b884dd3c864429bb8fe1063e2794ee7fa SHA1 54c32fa2a4061ee21113c766a144f324432bdd36 SHA256 dd105d602a4b8897749a4cb9610f8bfe2d07d4f4cc9bf3905930c65592737259
 DIST opera-10.63-6450.ppc.linux.tar.bz2 13011405 RMD160 dc4147ccc051bfd45d02657f3203f6544ff0f5c8 SHA1 25804227a78c57fd6b56c8256ab4aa05e393d1c2 SHA256 a4255fcf362c6b05f3bec05425a644947842bf5de1b67c7246d7139b282d9e0d
 DIST opera-10.63-6450.x86_64.linux.tar.bz2 13801811 RMD160 e4770898d08bf3f42d571034290cdd66419577c7 SHA1 1982bcde8dcf272b8c1e14c20f44478815a1f7b9 SHA256 da8ae14cf317364ab0295102220246b205bf30c59c00cadb571395c90dda7c74
-DIST opera-11.00-1128.i386.linux.tar.bz2 11216112 RMD160 5e04b6640bfd939aa34e5e1b7bce82913d0022dc SHA1 65ba5e2747a6644a57d1de656615a80168533fb7 SHA256 a6ba3e071ea31ab0eafc5c7d7925dc9f7bf867991382c68d52f7b35effad9c44
-DIST opera-11.00-1128.x86_64.linux.tar.bz2 12471952 RMD160 bb8b47338832051107a6b7452739932e7aa57108 SHA1 462ed49d8bc73179af3b6cbb28c9cb784e1de2b9 SHA256 b07d74703dccf584453f9a4c45f196d4ef18ddebe928dd8f48d7d5ac076c7456
-DIST opera-11.00-1133.i386.freebsd.tar.bz2 11127572 RMD160 050d7b6a5c341994ada7706de094965adb0482d1 SHA1 a7c26b9ceca2082c9ccc896bf4bb3fca090d0723 SHA256 a063d7258651c5f867f35d5b72fec4a7dae4ca5febf15ccd177bbe5a42cf2836
-DIST opera-11.00-1133.i386.linux.tar.bz2 11320972 RMD160 76c26c7fe2cb6306c3f2e5604adddafa9674b5c8 SHA1 4a19bfc8091cc21f91bd26d0d48ffd44728138aa SHA256 3e00ea0a3f93875a64d3c50943e2b7319b776af6be4267aa0832f37d0505607a
-DIST opera-11.00-1133.x86_64.linux.tar.bz2 12577425 RMD160 6a0172ce8da343baf3e8e11e852e33a8a174a017 SHA1 054db9ca98ee5079719a854ce009972e98d00348 SHA256 d673b91e438d433f351ee10c2bedbc9f11c5fbeb0c3d29fdd13f1036305e8ffe
-DIST opera-11.00-1136.i386.freebsd.tar.bz2 10752773 RMD160 dc7f7364cd64be677810ea79f7ec88b258f737e3 SHA1 6ab1a2c305bc28b1bd6aad26fb137e0a0c0d0c06 SHA256 4f5064028cb8d2e87efa688bc3bc7920de42ec5fc31c4023523f03dca7958210
-DIST opera-11.00-1136.i386.linux.tar.bz2 11326999 RMD160 78b68d451101144a7bba073a79e56e9fa4c86d5a SHA1 7f2d5a0dbe7dd0de0c2c6ed485540b83ff9376f1 SHA256 0aa89668f6de80668ea1c9a6305b29b9b84dd3552cfb6718665f78744f7d5694
-DIST opera-11.00-1136.x86_64.linux.tar.bz2 12616564 RMD160 9af2e2281a28d8d51f7587c713537bd879a887cc SHA1 1ad8625c8025bea81c57a3b0fde0400a134ec687 SHA256 dcc5437ece3b0e1eb2c1dab937a51331675437804386ba8d1a2446de38ccb909
 DIST opera-11.00-1140.i386.freebsd.tar.bz2 10755885 RMD160 c69f2f692832661973b15f79f8652f43835ee969 SHA1 d8a1894248ea8bdd4679bbbe426a4d36a73f4576 SHA256 84d2da11c1866a4b1361af5a8417b0d4b8d7934531a0a93fa9021b2c603b9d3b
 DIST opera-11.00-1140.i386.linux.tar.bz2 11331938 RMD160 83e75e95eaa8853ab2bf8fc4bff6e01eb0dbb33c SHA1 ddfc584a6abeae79f0a77d3fd16ab6b344add884 SHA256 07b5f615f0fa1b8d6373b9d4458243ca1cab06d7e07634862e586920ec29df22
 DIST opera-11.00-1140.x86_64.linux.tar.bz2 12621834 RMD160 fd031ccbf15059b2bd2ebd198eb9f4b933b1c5f0 SHA1 54e1d4d51491438811ab179f91b2dceb993c8eae SHA256 f6129a94d5caf4a54e82a14086ce20fa9bbff01abcfe6a94f2306f432565acc2
+DIST opera-11.00-1145.i386.freebsd.tar.bz2 11116788 RMD160 c87826b140b80e3fc9beb166ab6b44906c292d57 SHA1 db12c3c4c03c5d3559849fcc7b83c5d78eaf7d35 SHA256 b3b26ba9ce6a808622c82b4dfd7d9e7bc5ea04eaf7694dae3af20b4a623e6ffb
+DIST opera-11.00-1145.i386.linux.tar.bz2 11311628 RMD160 9d91932011c6bc61ac29733747f4a4f4e9004586 SHA1 e7cd60b249135597187db8adfdcef30ededeb51a SHA256 a70bc6a80b7060eeb5bc26a090ad51442652588458e59aee3ecc543551a2d86f
+DIST opera-11.00-1145.x86_64.linux.tar.bz2 12593591 RMD160 4251a275a493e23c4d6cb3fb2372a352e05fed9c SHA1 96d83fb629b42557d325ffdf705a8583aaa7b029 SHA256 5c9deddf02f4689465102d387a57fe9f2d364431f688da8d9764f4493c5df448
 EBUILD opera-10.63.ebuild 5100 RMD160 a6524c149d2192b731de126a6965612ca9a6ef88 SHA1 e888db3f3378bd9f51307e2070a35f4cc69aea61 SHA256 cdcc5332914bfca888b55532ba7aa4dffe3b739983e3a1f61baea2293e12ad0c
-EBUILD opera-11.00_pre1128.ebuild 5270 RMD160 36100e5416422e41dd6dcd0186a93bbc47f3d22e SHA1 8999a918df4ffcf155d178ab69892d34a47990c0 SHA256 8b4fc1a7f3188b0b0a157f2d2041fbe9b8b580d622083859933125f8d67320d2
-EBUILD opera-11.00_pre1133.ebuild 5326 RMD160 a4149b9005af363192a75fab38562f54544c7c07 SHA1 4c84845c177270cff2261320e9ae691fdfe3be71 SHA256 ff1bbffe7b3f529a8bd357778f3115840b3187e2759372c6cfa4203ba569287d
-EBUILD opera-11.00_pre1136.ebuild 5332 RMD160 c1d8705a2bfa60e27d515a1f6193d82da7eccf77 SHA1 a4164e089935fe3ecb52d148c876d25014f5d97c SHA256 95fb927f99d1c48d28e13d41612737371b3b29c13aa562784c3e787a37ad0acc
 EBUILD opera-11.00_pre1140.ebuild 5326 RMD160 dde2bbfbc8c7a573f13a028b1f655315eabd2ad1 SHA1 34edc7b4d9bf2591a259afec6b0cdf49315055e4 SHA256 dd0a698d84ad61e523534bc362eae673466b4d59a47a3f6a558da2a368cf25cc
-MISC ChangeLog 110477 RMD160 5598bd68e1ad83e96d0b60034475f5ea9417c620 SHA1 695d66c289b5137631f04c8e07255ef8028c186a SHA256 f4785cbc56bd18b592d6bc9084ee5be80ac57b3bfae5cfe42a2f2f4e1f839da0
+EBUILD opera-11.00_pre1145.ebuild 5329 RMD160 454dcda598fbb8e3ccb66bda87fbd5de298d8666 SHA1 ac389fd3f5fb11d943abc70a14e03e10e37994d0 SHA256 e74a8229bf50ba74a223933dc73098d69b68062246f1f21c6ff476eb56a8474f
+MISC ChangeLog 110740 RMD160 3a92426593b2a74bb87c30bd57dca5b7ae85a50e SHA1 ad681b2b85b4b2d3e0d436aec4d60b0ac42b8854 SHA256 f0c71bac1a5bc61bfd4ee0925ca3c17a08e16ff8444269f11c0864a2475e1259
 MISC metadata.xml 651 RMD160 5b15e2f22dc49ee158b4c76f4760219c1f85c096 SHA1 1de6dff612ef2667f194ed57d352e09a0879fbc1 SHA256 84accea33d9ad1436d9a425ddf5de328d31af559b7c9764d54546d3b357c7a10
diff --git a/www-client/opera/opera-11.00_pre1128.ebuild b/www-client/opera/opera-11.00_pre1128.ebuild
deleted file mode 100644
index d32a21fee611..000000000000
--- a/www-client/opera/opera-11.00_pre1128.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.00_pre1128.ebuild,v 1.2 2010/12/09 17:28:13 jer Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="elibc_FreeBSD gtk kde +gstreamer"
-
-RESTRICT="test"
-
-O_PWD="dinner"
-O_V="${PV/_pre/-}"
-O_P="${PN}-${O_V}"
-O_HTTP="http://snapshot.opera.com/"
-O_U="${O_HTTP}unix/${O_PWD}_${O_V}/"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_P}.x86_64.linux.tar.bz2 )
-	x86? ( ${O_U}${O_P}.i386.linux.tar.bz2 )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-O_LINGUAS="
-	be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka
-	ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk vi zh-CN zh-HK
-	zh-TW
-"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
-done
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="
-	gtk? (
-		=x11-libs/gtk+-2*
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/cairo
-		x11-libs/pango
-		x11-libs/pixman
-	)
-	kde? (
-		kde-base/kdelibs
-	)
-	dev-libs/expat
-	media-libs/fontconfig
-	media-libs/freetype
-	gstreamer? ( media-plugins/gst-plugins-meta )
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libxcb
-	x11-libs/xcb-util
-"
-
-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}
-	if [[ ! -d ${S} ]]; then
-		cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
-		S="$(pwd)"
-		einfo "Setting WORKDIR to ${S}"
-	fi
-}
-
-src_prepare() {
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/opera/LICENSE share/opera/defaults/license.txt
-	rm -rf share/doc
-	for license in share/opera/locale/*/license.txt; do
-		rm -v "${license}"
-		ln -svn /usr/share/opera/defaults/license.txt "${license}" \
-			|| die "mv license"
-	done
-
-	# Remove package directory
-	rm -rf share/opera/package
-
-	# Leave libopera*.so only if the user chooses
-	if ! use gtk; then
-		rm lib/opera/liboperagtk.so || die "rm liboperagtk.so failed"
-	fi
-	if ! use kde; then
-		rm lib/opera/liboperakde4.so || die "rm liboperakde4.so failed"
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die "gunzip failed"
-
-	# Replace PREFIX and SUFFIX in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}::g" \
-		-e "s:@@{_SUFFIX}::g" \
-		-e "s:@@{USUFFIX}::g" \
-		share/mime/packages/opera-widget.xml \
-		share/man/man1/* \
-		share/applications/opera-browser.desktop \
-		share/applications/opera-widget-manager.desktop \
-		|| die "sed failed"
-
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/bash' > opera
-	echo 'export OPERA_DIR=/usr/share/opera' >> opera
-	echo 'exec '"${OPREFIX}"'/opera/opera "$@"' >> opera
-
-	# Fix libdir in defaults/pluginpath.ini
-	sed -i \
-		share/opera/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() {
-	# Remove unwanted linguas
-	LNGDIR="share/${PN}/locale"
-	einfo "Installing 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}"
-		fi
-	done
-
-	# 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/90opera
-}
-
-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/opera/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
-}
diff --git a/www-client/opera/opera-11.00_pre1136.ebuild b/www-client/opera/opera-11.00_pre1136.ebuild
deleted file mode 100644
index 447bcc82c04f..000000000000
--- a/www-client/opera/opera-11.00_pre1136.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.00_pre1136.ebuild,v 1.1 2010/12/10 16:34:51 jer Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk kde +gstreamer"
-
-RESTRICT="test"
-
-O_PWD="partytime"
-O_V="${PV/_pre/-}"
-O_P="${PN}-${O_V}"
-O_HTTP="http://snapshot.opera.com/"
-O_U="${O_HTTP}unix/${O_PWD}_${O_V}/"
-
-SRC_URI="
-	amd64? ( ${O_U}${O_P}.x86_64.linux.tar.bz2 )
-	x86? ( ${O_U}${O_P}.i386.linux.tar.bz2 )
-	x86-fbsd? ( ${O_U}${O_P}.i386.freebsd.tar.bz2 )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-O_LINGUAS="
-	be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka
-	ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk vi zh-CN zh-HK
-	zh-TW
-"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
-done
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="
-	gtk? (
-		=x11-libs/gtk+-2*
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/cairo
-		x11-libs/pango
-		x11-libs/pixman
-	)
-	kde? (
-		kde-base/kdelibs
-	)
-	dev-libs/expat
-	media-libs/fontconfig
-	media-libs/freetype
-	gstreamer? ( media-plugins/gst-plugins-meta )
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libxcb
-	x11-libs/xcb-util
-"
-
-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}
-	if [[ ! -d ${S} ]]; then
-		cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
-		S="$(pwd)"
-		einfo "Setting WORKDIR to ${S}"
-	fi
-}
-
-src_prepare() {
-	# Remove doc directory but keep the LICENSE under another name (bug #315473)
-	mv share/doc/opera/LICENSE share/opera/defaults/license.txt
-	rm -rf share/doc
-	for license in share/opera/locale/*/license.txt; do
-		rm -v "${license}"
-		ln -svn /usr/share/opera/defaults/license.txt "${license}" \
-			|| die "mv license"
-	done
-
-	# Remove package directory
-	rm -rf share/opera/package
-
-	# Leave libopera*.so only if the user chooses
-	if ! use gtk; then
-		rm lib/opera/liboperagtk.so || die "rm liboperagtk.so failed"
-	fi
-	if ! use kde; then
-		rm lib/opera/liboperakde4.so || die "rm liboperakde4.so failed"
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die "gunzip failed"
-
-	# Replace PREFIX and SUFFIX in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}::g" \
-		-e "s:@@{_SUFFIX}::g" \
-		-e "s:@@{USUFFIX}::g" \
-		share/mime/packages/opera-widget.xml \
-		share/man/man1/* \
-		share/applications/opera-browser.desktop \
-		share/applications/opera-widget-manager.desktop \
-		|| die "sed failed"
-
-	# Create /usr/bin/opera wrapper
-	echo '#!/bin/bash' > opera
-	echo 'export OPERA_DIR=/usr/share/opera' >> opera
-	echo 'exec '"${OPREFIX}"'/opera/opera "$@"' >> opera
-
-	# Fix libdir in defaults/pluginpath.ini
-	sed -i \
-		share/opera/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() {
-	# Remove unwanted linguas
-	LNGDIR="share/${PN}/locale"
-	einfo "Installing 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}"
-		fi
-	done
-
-	# 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/90opera
-}
-
-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/opera/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
-}
diff --git a/www-client/opera/opera-11.00_pre1133.ebuild b/www-client/opera/opera-11.00_pre1145.ebuild
index 64907af174e4..c82cd26e67aa 100644
--- a/www-client/opera/opera-11.00_pre1133.ebuild
+++ b/www-client/opera/opera-11.00_pre1145.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.00_pre1133.ebuild,v 1.2 2010/12/09 17:28:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.00_pre1145.ebuild,v 1.1 2010/12/14 17:46:11 jer Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ IUSE="elibc_FreeBSD gtk kde +gstreamer"
 
 RESTRICT="test"
 
-O_PWD="cup"
+O_PWD="tabbed"
 O_V="${PV/_pre/-}"
 O_P="${PN}-${O_V}"
 O_HTTP="http://snapshot.opera.com/"