http://my.opera.com/desktopteam/blog/2011/01/20/another-11-01-snapshot-with-even-more-crashfixes

(Portage version: 2.2.0_alpha17/cvs/Linux i686)

3 files changed, 12 insertions, 229 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 735496484737..55e9eb1c8939 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,13 @@
 # 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.587 2011/01/17 19:39:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.588 2011/01/20 12:40:27 jer Exp $
+
+*opera-11.01.1175 (20 Jan 2011)
+
+  20 Jan 2011; Jeroen Roovers <jer@gentoo.org> -opera-11.01.1160.ebuild,
+  -opera-11.01.1164.ebuild, +opera-11.01.1175.ebuild:
+  http://my.opera.com/desktopteam/blog/2011/01/20/another-11-01-snapshot-with-e
+  ven-more-crashfixes
 
 *opera-11.01.1170 (17 Jan 2011)
 
diff --git a/www-client/opera/opera-11.01.1164.ebuild b/www-client/opera/opera-11.01.1164.ebuild
deleted file mode 100644
index 3b11f04c0d40..000000000000
--- a/www-client/opera/opera-11.01.1164.ebuild
+++ /dev/null
@@ -1,225 +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.01.1164.ebuild,v 1.1 2011/01/11 18:13:45 jer Exp $
-
-EAPI="3"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
-
-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"
-
-# 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_U="http://snapshot.opera.com/"
-O_P="${PN}-${O_V}-${O_B}"
-O_D="earlofpudding_${O_V}-${O_B}"
-
-SRC_URI="
-	amd64? ( ${O_U}unix/${O_D}/${O_P}.x86_64.linux.tar.xz )
-	x86? ( ${O_U}unix/${O_D}/${O_P}.i386.linux.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 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
-	app-arch/xz-utils
-"
-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}
-	mv -v ${PN}* "${S}" || die
-}
-
-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
-
-	# 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
-}
diff --git a/www-client/opera/opera-11.01.1160.ebuild b/www-client/opera/opera-11.01.1175.ebuild
index 22ec264de85c..027c4d7db453 100644
--- a/www-client/opera/opera-11.01.1160.ebuild
+++ b/www-client/opera/opera-11.01.1175.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.01.1160.ebuild,v 1.1 2011/01/08 16:43:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.01.1175.ebuild,v 1.1 2011/01/20 12:40:27 jer Exp $
 
 EAPI="3"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.opera.com/"
 
 SLOT="0"
 LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="elibc_FreeBSD gtk kde +gstreamer"
 
 RESTRICT="test"
@@ -22,11 +22,12 @@ O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
 
 O_U="http://snapshot.opera.com/"
 O_P="${PN}-${O_V}-${O_B}"
-O_D="minor_${O_V}-${O_B}"
+O_D="tannen_${O_V}-${O_B}"
 
 SRC_URI="
 	amd64? ( ${O_U}unix/${O_D}/${O_P}.x86_64.linux.tar.xz )
 	x86? ( ${O_U}unix/${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)"