From ee26b634a81dd65ba90400622f5f2566663c9c46 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Tue, 13 Nov 2012 16:40:26 +0000
Subject: http://my.opera.com/desktopteam/blog/2012/11/13/imperialentanglement

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key A792A613)
---
 www-client/opera/ChangeLog               |   8 +-
 www-client/opera/opera-12.11.1653.ebuild | 219 -------------------------------
 www-client/opera/opera-12.11.1657.ebuild | 219 +++++++++++++++++++++++++++++++
 3 files changed, 226 insertions(+), 220 deletions(-)
 delete mode 100644 www-client/opera/opera-12.11.1653.ebuild
 create mode 100644 www-client/opera/opera-12.11.1657.ebuild

(limited to 'www-client')

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 094e6743ecd7..c29aec80896c 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # 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.764 2012/11/12 21:03:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.765 2012/11/13 16:40:26 jer Exp $
+
+*opera-12.11.1657 (13 Nov 2012)
+
+  13 Nov 2012; Jeroen Roovers <jer@gentoo.org> -opera-12.11.1653.ebuild,
+  +opera-12.11.1657.ebuild:
+  http://my.opera.com/desktopteam/blog/2012/11/13/imperialentanglement
 
   12 Nov 2012; Jeroen Roovers <jer@gentoo.org> -opera-12.02.1578.ebuild:
   Old.
diff --git a/www-client/opera/opera-12.11.1653.ebuild b/www-client/opera/opera-12.11.1653.ebuild
deleted file mode 100644
index a70d8736afe3..000000000000
--- a/www-client/opera/opera-12.11.1653.ebuild
+++ /dev/null
@@ -1,219 +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-12.11.1653.ebuild,v 1.3 2012/11/09 17:29:58 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-12 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk kde +gstreamer multilib"
-
-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="19084_${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_LINGUAS="
-	af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
-	hi hr hu id it ja ka kk ko lt lv me mk ms nb nl nn pa pl pt pt-BR ro ru sk
-	sr sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
-"
-
-for O_LINGUA in ${O_LINGUAS}; do
-	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+:3 x11-libs/gtk+:2 ) )
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-"
-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} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-src_unpack() {
-	unpack ${A}
-	mv -v ${PN}* "${S}" || die
-}
-
-src_prepare() {
-	export OPREFIX="/usr/$(get_libdir)"
-	export QA_PREBUILT="${OPREFIX}/${PN}/.*"
-	export QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-	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
-	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
-		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
-	if use amd64 && ! use multilib; then
-		rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die
-
-	local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX=
-	if [[ ${PN} = opera-next ]]; then
-		OPERA_SUFFIX="-next"
-		OPERA__SUFFIX=" Next"
-		OPERA_USUFFIX="-NEXT"
-	fi
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \
-		-e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \
-		-e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \
-		share/man/man1/* \
-		share/mime/packages/* \
-		share/applications/${PN}-*.desktop \
-		|| die
-
-	# 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 $( list-paxables $( find "${D}"/${OPREFIX}/${PN}/ ) )
-}
-
-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-12.11.1657.ebuild b/www-client/opera/opera-12.11.1657.ebuild
new file mode 100644
index 000000000000..5b54fc5cc609
--- /dev/null
+++ b/www-client/opera/opera-12.11.1657.ebuild
@@ -0,0 +1,219 @@
+# 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-12.11.1657.ebuild,v 1.1 2012/11/13 16:40:26 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-12 LGPL-2 LGPL-3"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD gtk kde +gstreamer multilib"
+
+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="imperialentanglement_${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_LINGUAS="
+	af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
+	hi hr hu id it ja ka kk ko lt lv me mk ms nb nl nn pa pl pt pt-BR ro ru sk
+	sr sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
+"
+
+for O_LINGUA in ${O_LINGUAS}; do
+	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+:3 x11-libs/gtk+:2 ) )
+	x11-libs/pango
+	x11-libs/pixman
+"
+KDERDEPEND="
+	kde-base/kdelibs
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+"
+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} )
+	kde? ( ${KDERDEPEND} )
+	gstreamer? ( ${GSTRDEPEND} )
+"
+src_unpack() {
+	unpack ${A}
+	mv -v ${PN}* "${S}" || die
+}
+
+src_prepare() {
+	export OPREFIX="/usr/$(get_libdir)"
+	export QA_PREBUILT="${OPREFIX}/${PN}/.*"
+	export QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
+
+	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
+	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
+		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
+	if use amd64 && ! use multilib; then
+		rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die
+	fi
+
+	# Unzip the man pages before sedding
+	gunzip share/man/man1/* || die
+
+	local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX=
+	if [[ ${PN} = opera-next ]]; then
+		OPERA_SUFFIX="-next"
+		OPERA__SUFFIX=" Next"
+		OPERA_USUFFIX="-NEXT"
+	fi
+
+	# Replace PREFIX, SUFFIX and PN in various files
+	sed -i \
+		-e "s:@@{PREFIX}:/usr:g" \
+		-e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \
+		-e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \
+		-e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \
+		share/man/man1/* \
+		share/mime/packages/* \
+		share/applications/${PN}-*.desktop \
+		|| die
+
+	# 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 $( list-paxables $( find "${D}"/${OPREFIX}/${PN}/ ) )
+}
+
+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
+}
-- 
cgit v1.2.3-65-gdbad