http://my.opera.com/desktopteam/blog/2011/03/18/post-beta-crash-fixes

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

3 files changed, 235 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 56fa8eea151c..69ade02c0473 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.611 2011/03/17 17:29:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.612 2011/03/18 15:42:33 jer Exp $
+
+*opera-11.10.2053 (18 Mar 2011)
+
+  18 Mar 2011; Jeroen Roovers <jer@gentoo.org> +opera-11.10.2053.ebuild:
+  http://my.opera.com/desktopteam/blog/2011/03/18/post-beta-crash-fixes
 
   17 Mar 2011; Jeroen Roovers <jer@gentoo.org> opera-11.01.1190.ebuild,
   opera-11.10.2048.ebuild:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 989e4d1081f6..1564b1adf490 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -4,7 +4,11 @@ DIST opera-11.01-1190.x86_64.linux.tar.xz 10648548 RMD160 9ddcb27eb30d4a3f4026fe
 DIST opera-11.10-2048.i386.freebsd.tar.xz 10213932 RMD160 52c0e2adc85e6c503649d10cfc944e6258087298 SHA1 4d3222fdb1f5cb54c3802b50b321f1213f6f96ad SHA256 0e85e64aafcc43fdb14d384d2d53a0f3aae2b1d38968bf23ba5b88190aba6a53
 DIST opera-11.10-2048.i386.linux.tar.xz 10219340 RMD160 e7165eaba314d6d4f2b60923e7750302dad1d9a0 SHA1 8d2be24f19ed3e59d1e27eb93a8304af0c492a02 SHA256 72c1165143c6ae8676c03ddd68e701be43c562ca5a76ad0d5999b135f0c2d1f9
 DIST opera-11.10-2048.x86_64.linux.tar.xz 10986376 RMD160 0404c3e5c41b46286f0899ed5e8c4a461a7d9683 SHA1 9312f5a5b0c965ee88fb8f7ff221d1a931722c84 SHA256 0f00f5f2f9aed37e7f7512034605dead733dbebd1aa74d24d9c352577acf7ccb
+DIST opera-11.10-2053.i386.freebsd.tar.xz 10218456 RMD160 ffd094f2224f68071eec9699aabc29375c24bde1 SHA1 a045f4b4d5750a4804be0e3c9a3d66df7fb68f8a SHA256 96cfea151fb595ef6b2e9ccf9c07ae392de913f6dcaedc8612e8fca0d8c30c30
+DIST opera-11.10-2053.i386.linux.tar.xz 10226356 RMD160 063c887649ab80cbc4237859566e912dc3cfa187 SHA1 21e6d2d8a61a589e1499bdd2b8602697cb60b22f SHA256 d65b7e0b8352f52fffa2cb493b1c3145508560b9f1a945f2cd6b1d8619dde6a4
+DIST opera-11.10-2053.x86_64.linux.tar.xz 10986500 RMD160 1f0d3ef78eae70e2476cf8463301cdece10c5668 SHA1 609f6711358e29037d24c09e3aa476584bc7a33d SHA256 a011108d800278677c7647ebd31893cbebf31069d9f5042fc7337ba222550b5a
 EBUILD opera-11.01.1190.ebuild 5811 RMD160 1c7a2f88e0d55e4999729a43c8971292b91500f8 SHA1 b1402dab2b7c9c0a1c4523e9d6158329ae690cd9 SHA256 940d812bffd1a6bf3dace72b44803c03315ac0d6e2e40de2a7c7dda4acdb56d4
 EBUILD opera-11.10.2048.ebuild 5947 RMD160 c27512befc39a2966fd10ce798b7f6724fd39ab5 SHA1 9589a62077ff24c1fa48aa8ddcc315539b5c0fa5 SHA256 80e5661d81a6e24334c85a30eb8e59b1f7d3acec5a646a36c43c7193a075c8d7
-MISC ChangeLog 117672 RMD160 e9005ea14427f0084ebeca628ecd6bd1778778cd SHA1 2c9ad75fb0e70fd556173d07dddcfa8030567348 SHA256 16808650ea144d68f9e1193d978ae01428408db993d2ef90e5d79143b402f730
+EBUILD opera-11.10.2053.ebuild 5960 RMD160 48670cd13f2af6d368e487730fd8b08c400ce059 SHA1 6e4e640628dd4e60d6668612905da1537dc86f6e SHA256 f8aef04ab336f4fc189cfa26b5bc29bf67db201d1ade013afa3696aa96fdcb64
+MISC ChangeLog 117851 RMD160 ffa6b6fbf9d3e691a76ec555ab9e6f7e98d13121 SHA1 206d79cb4b8071eac43643a14d2dae1a62eaebac SHA256 76ce968bb264a2e3d82c8d0eba0b7730ab0c3f6695365e5bba7bee43b680f0e8
 MISC metadata.xml 641 RMD160 b02a2c03b42c19da338fc0d2c2460ae393b832e3 SHA1 b9225680d057968296b8828308f76fa8d9ea9c56 SHA256 37369b30382e2fb8c54d23e112070997135689468d3cd865ed194a55bb87ed58
diff --git a/www-client/opera/opera-11.10.2053.ebuild b/www-client/opera/opera-11.10.2053.ebuild
new file mode 100644
index 000000000000..aa727ea13c2d
--- /dev/null
+++ b/www-client/opera/opera-11.10.2053.ebuild
@@ -0,0 +1,224 @@
+# 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.10.2053.ebuild,v 1.1 2011/03/18 15:42:33 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"
+
+RESTRICT="test"
+
+# http://snapshot.opera.com/unix/minor_11.01-1160/opera-11.01-1160.i386.linux.tar.xz
+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="betaplus_${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="
+	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 mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk 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() {
+	# Remove unwanted linguas
+	LNGDIR="share/${PN}/locale"
+	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}"
+		fi
+	done
+
+	# 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 locale in share/opera/locale/*; do
+		rm -f "${locale}/license.txt"
+		ln -sn /usr/share/opera/defaults/license.txt "${locale}/license.txt" \
+			|| die "ln -sn license.txt"
+	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/sh' > 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() {
+	# 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
+
+	# Set PaX markings for hardened/PaX (bug #344267)
+	pax-mark m \
+		"${D}/${OPREFIX}/opera/opera" \
+		"${D}/${OPREFIX}/opera/operaplugincleaner" \
+		"${D}/${OPREFIX}/opera/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/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
+
+	# 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
+}