http://my.opera.com/desktopteam/blog/2011/11/07/mail-goes-two-lined-and-grouped

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

4 files changed, 251 insertions, 7 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index cd0b6a0695cd..281f29070961 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # 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.656 2011/11/04 16:56:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.657 2011/11/08 13:37:46 jer Exp $
+
+*opera-11.60.1139 (08 Nov 2011)
+
+  08 Nov 2011; Jeroen Roovers <jer@gentoo.org> +opera-11.60.1139.ebuild:
+  http://my.opera.com/desktopteam/blog/2011/11/07/mail-goes-two-lined-and-group
+  ed
 
   04 Nov 2011; Jeroen Roovers <jer@gentoo.org> opera-11.60.1134.ebuild:
   Add LD_PRELOAD hack to prevent operapluginwrapper from segfaulting when
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index e35bdc226a98..f86ef46e1fe1 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -7,14 +7,18 @@ DIST opera-11.52-1100.x86_64.linux.tar.xz 11860188 RMD160 dbeb3375eb9443559bbda0
 DIST opera-11.60-1134.i386.freebsd.tar.xz 11376068 RMD160 6f2319a6881be04580391be2dca500e67d115ef9 SHA1 25297a7a34dfa7db871b5452e2cfdd0231e964e4 SHA256 83089cbb48f8ec9012c46a414d2df23fcfe7e43e47c7f424919d98fe6e371ded
 DIST opera-11.60-1134.i386.linux.tar.xz 11354084 RMD160 850b0a2c856a330ae07f02ca306aa422eda8cf95 SHA1 57bb2502ef7cf669e16ba334554b1bdf14acc507 SHA256 84d8fc217151040f9339e32ef573d7f53f8ffe60db8b5e1a07dde9ff38bb3cdd
 DIST opera-11.60-1134.x86_64.linux.tar.xz 12226704 RMD160 f7e6cad59b7bfce9dd03b6663c965cdd054319a4 SHA1 2dd4fae0107ecd5ba1e75cd758776b630711fccf SHA256 ce3e78400652a77162f9c9f10e559ba24693b3f5d9074a32932af8a25b6bb524
+DIST opera-11.60-1139.i386.freebsd.tar.xz 11586148 RMD160 40489c4b2105348a509e4029404cb35ad8cbbc8e SHA1 8e22861282cfae9c895a8642a0218a3744ce3a6b SHA256 4cc6a541fe0d67bf6b2789f3326dc1dab31c3c4afaa110d2f3a8184d2caf8a13
+DIST opera-11.60-1139.i386.linux.tar.xz 11554244 RMD160 5dfb938680e5e83c85179b0d0b8d80da000fc372 SHA1 0af2e2f00113a6435825085dc90fd18b71769b7d SHA256 9e0de4a17208f0ed89d61d07416edf413c40291235db804418d844eb1706430b
+DIST opera-11.60-1139.x86_64.linux.tar.xz 12433644 RMD160 6d414883855eec378a7335631e41226aa96e262d SHA1 12b64c57f685be791d56dabfdd4bd1c619596952 SHA256 add6d45cd0a7e53422d2023f1fe9329b50397cf73943ded5ff90bc59fea2032d
 EBUILD opera-11.52.1100.ebuild 5700 RMD160 643a472817d7a959cabd8a927de31e17d8815428 SHA1 1709aabca35aee159583918d29572475e1a7764b SHA256 bc156a0c65f58d895c47d71351a42fa48c8ff07c4ef968e1486b4ed1a464a51b
 EBUILD opera-11.60.1134.ebuild 5787 RMD160 aaf27885f0060c39b1f14c0b5ef54d92d13aa46c SHA1 48a748cf01be89f9bd3af2b6d5d07922fdb4f273 SHA256 c9d355b51629ae87088a2e702f827eb73a624e19bf490edb612c458dd68e7d4a
-MISC ChangeLog 125304 RMD160 1e72abd508b4b4f47efc3d84c34febb3e44655c8 SHA1 b5582eaae5f5c3c3ceff701d10923f7867dff588 SHA256 9d30eefbccb2ebfeb7bb80e1667094f5ed124db946ac542096a50f823290ce40
-MISC metadata.xml 620 RMD160 f8a12fd1775a3eedf492dad65b79198d452f60a4 SHA1 d537cfe0d1da51a92612821d24ac851174389340 SHA256 208c8c09c43c5092d2491833c97990cd5b3d8fce38e03d70d90f0ffbbee84282
+EBUILD opera-11.60.1139.ebuild 5914 RMD160 67904c987b61c9d93de3b5164207965afd28c30f SHA1 9bb5baa3880c0e4b5c95ff6bd58ecf112c0faac9 SHA256 4bbea81d811af19fa11121e7b057a30bc6ba9d1bc7a041f4f30814c5bba84790
+MISC ChangeLog 125496 RMD160 0b513bdb1f8d6e4f5c7472b7045a1c35b7743b45 SHA1 e467eec41f837b87a7647803c99769f2863ea23b SHA256 af028e6cc12eeaac1c82a7739fc0815530d45e1161b5456ecb94ecd1603e8fbc
+MISC metadata.xml 732 RMD160 28acd15c216329d807150c88fb0861eb1383c61c SHA1 9ff443c6f422e8b018d29d21948da71eda6a4295 SHA256 bd388fb8f6b0aa2cd98fcfc290b677df712be3ef14537102e02665ea2f0d871a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk60GTQACgkQVWmRsqeSphNWsQCeMzOUMheNu53yxmYm4X2ewQpv
-cCoAn39Xjmv4UDeGWGembenIfkBj/RwI
-=pE5Z
+iEYEARECAAYFAk65MLAACgkQVWmRsqeSphPuvACfflCkJtkWk/jjeywU5MmxWph8
+xRYAnAihvaMI14AFGxCOycIXfx5X415N
+=5nUO
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera/metadata.xml b/www-client/opera/metadata.xml
index 8e61e5273ef3..70b2c1e744e1 100644
--- a/www-client/opera/metadata.xml
+++ b/www-client/opera/metadata.xml
@@ -11,7 +11,8 @@ version runs on GNU/Linux and FreeBSD. Versions for Macintosh and
 Windows are also available.
 </longdescription>
 <use>
-<flag name='gtk'>Set runtime dependencies to support GTK+/GNOME desktop integration</flag>
+<flag name='gtk'>Set runtime dependencies to support GTK+/GNOME version 2 desktop integration</flag>
+<flag name='gtk3'>Set runtime dependencies to support GTK+/GNOME version 3 desktop integration</flag>
 <flag name='kde'>Set runtime dependencies to support KDE desktop integration</flag>
 </use>
 </pkgmetadata>
diff --git a/www-client/opera/opera-11.60.1139.ebuild b/www-client/opera/opera-11.60.1139.ebuild
new file mode 100644
index 000000000000..e20b8329ac1b
--- /dev/null
+++ b/www-client/opera/opera-11.60.1139.ebuild
@@ -0,0 +1,233 @@
+# 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.60.1139.ebuild,v 1.1 2011/11/08 13:37:46 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 ~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="tunny_${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="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
+	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} )
+	gtk3? ( ${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
+	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 'export LD_PRELOAD="/usr/'$(get_libdir)'/libgtk-x11-2.0.so"' >> ${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
+}