<http://my.opera.com/desktopteam/blog/2010/06/22/nix-fixes-and-more>.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

3 files changed, 199 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 0649464f6820..ed565bc2a506 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,11 @@
 # 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.493 2010/06/19 13:34:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.494 2010/06/22 17:09:38 jer Exp $
+
+*opera-10.60_pre6378 (22 Jun 2010)
+
+  22 Jun 2010; Jeroen Roovers <jer@gentoo.org> +opera-10.60_pre6378.ebuild:
+  <http://my.opera.com/desktopteam/blog/2010/06/22/nix-fixes-and-more>.
 
 *opera-10.60_pre6374 (19 Jun 2010)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 25f670a7cf4f..3b02c9ec612d 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -21,10 +21,15 @@ DIST opera-10.60-6374.i386.freebsd.tar.bz2 13704655 RMD160 804f821bc3c12945aef48
 DIST opera-10.60-6374.i386.linux.tar.bz2 13702950 RMD160 02093514920900e8dc901999f20938f7afccb0c2 SHA1 38176434840fc89e8ce16f25f10080548b9ffb55 SHA256 fc67cf5e3916e485d8b02eaf11db38b7fd6e905204abe3007b8effa7aef2dfa1
 DIST opera-10.60-6374.ppc.linux.tar.bz2 14013423 RMD160 7546cef98348df9ac522309fb92dca2ee022f4bf SHA1 f2b4ab9c25541a15b4ccabf6d0b571f575eb99ce SHA256 f85d4219ee33550ad030e77215224027ac5de504014bf5691795bc26856d2924
 DIST opera-10.60-6374.x86_64.linux.tar.bz2 14764967 RMD160 ccc2a82d71a60e4fefe3eda962e6bb5c9cd72f44 SHA1 9f621447bfe6c4c540bf5ff5329244b6dbcd4207 SHA256 f2f89b66b254eb8ea61b92e8abec8b67b5a383a77307f0d51e9d85f1b6473b52
+DIST opera-10.60-6378.i386.freebsd.tar.bz2 13704975 RMD160 0cda74c12d669480c346c903cd176101037315a4 SHA1 70c00729cf21c2bae994b91db9e0f8d57a78900e SHA256 d446541e9697a6a44c61d94b9227fec99e37ba8b534171e6d3a441f706792fb2
+DIST opera-10.60-6378.i386.linux.tar.bz2 13705407 RMD160 619ab0f67a85c06bd181c259778fc4d348da8e05 SHA1 a7607ff44ddf02e6e30544d3ad5c40daa156d4d3 SHA256 a066c1f187ce3c427c1350e98c1e177e859e3f574ee90ae8413c1a6b11825429
+DIST opera-10.60-6378.ppc.linux.tar.bz2 14012651 RMD160 794d666ba0bcd05a9a70628544ef8a8933d7b73f SHA1 a224127040159109cd5804172f7f216d279ae05f SHA256 89a670a7665cd2dd6b1062674530a26e7632aab53ffd42db8a0051203fe68e97
+DIST opera-10.60-6378.x86_64.linux.tar.bz2 14764919 RMD160 60b52d65eea146e3ca5f37f1ab8d019c3de10bf5 SHA1 b415f9d1755f75014a8ef945a7371001681c391c SHA256 bfa12ba5845e641c2150bad690251af17079ddbb5fbd05644c9c2c5072be8be7
 EBUILD opera-10.10-r1.ebuild 4893 RMD160 2733461c1ddbceae8a1177fb931693aedaaf8a2d SHA1 1c95510bf92b10420c5739c1e45cdf80aee07627 SHA256 36e9ec97cb0e8d5b01a0765e56ff7fda46f80e0590ca4342aaada9632bc62d3a
 EBUILD opera-10.10.ebuild 4893 RMD160 6691d79a5f95c3e3d0701b4129a481875399d587 SHA1 2bd8f1a8e97f79607afc1f2ad0edf8a4c80c7f62 SHA256 8dc65519c765759956195bad7bd25bade46c222bfeb10d9e5057bf4f7bb90565
 EBUILD opera-10.60_pre6368.ebuild 4883 RMD160 96c7bd86a6e8793f062dc6210d587a7bdf0d7ffb SHA1 5533f3b0f57da31769601ef1ddaa65a60ab2408f SHA256 c5e5d713be8c1dc893af258469d88392378147a075a1e7bfb10805492978dd32
 EBUILD opera-10.60_pre6372.ebuild 4867 RMD160 28d75737d9d11aee7e4ae0274901788c63d68844 SHA1 ec757129f897d40e3d33c542d40fb4c55239ccdd SHA256 7d278b70edd2b28065065e2499d9920331cb7e7ec41197f1825121813839e127
 EBUILD opera-10.60_pre6374.ebuild 4867 RMD160 0236fb461ae89a3d11176b25d9e89651f26781f5 SHA1 f64fe131e3b7aa62f146ae36070eb54dc285f784 SHA256 94475802c9d7e0f3078191e8c44839770d6e73361ad662846c2a27d89d25eede
-MISC ChangeLog 95855 RMD160 978587256adc3b91322a5b0bbc19379bf65de763 SHA1 f9f3b7fa79ffc2b4a664a2f6e4a5eeca8f1a0b3e SHA256 96a487e39bf9cee768177363ea288e9061a3df1892c112458209ca9af58d64c9
+EBUILD opera-10.60_pre6378.ebuild 4867 RMD160 acac7b968443810ebbde4b30f988f2e3745efc8e SHA1 66b845181247923a0c432b25d9f204af58a930c3 SHA256 65f4293cc7a6592852b9ef87349705f4b5d6f3c25e4f95230c08646d4adcbaa6
+MISC ChangeLog 96040 RMD160 b00d55c3877d50ce3f17c20a62ad11113884a1a1 SHA1 0d5f916b8c1c89eb668bab8ed45caf8ef7a0d4c0 SHA256 fe53b6c29d6ecb2f1cac3d68eb52bd97279ab33908432ce0bc4a43e6658554d7
 MISC metadata.xml 722 RMD160 f424184eb789ae7afcf8c19a74de21a6029366d2 SHA1 5726f20bc46f15fd7a769293bda721afd2d3df8c SHA256 415493d83f3ebe328fd8a4038f90833cbcc0f983b43c01d9440782bbcfeb4e3a
diff --git a/www-client/opera/opera-10.60_pre6378.ebuild b/www-client/opera/opera-10.60_pre6378.ebuild
new file mode 100644
index 000000000000..de57489caddb
--- /dev/null
+++ b/www-client/opera/opera-10.60_pre6378.ebuild
@@ -0,0 +1,187 @@
+# 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-10.60_pre6378.ebuild,v 1.1 2010/06/22 17:09:39 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 ~ppc ~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD gtk kde"
+
+RESTRICT="mirror test"
+
+OPREFIX="/usr/$(get_libdir)"
+
+QA_DT_HASH="${OPREFIX}/${PN}/.*"
+QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
+
+MY_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 MY_LINGUA in ${MY_LINGUAS}; do
+	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
+done
+
+O_U="http://snapshot.opera.com/unix/16640_${PV/_pre/-}/"
+O_P="${P/_pre/-}"
+
+SRC_URI="
+	amd64? ( ${O_U}${O_P}.x86_64.linux.tar.bz2 )
+	ppc? ( ${O_U}${O_P}.ppc.linux.tar.bz2 )
+	x86? ( ${O_U}${O_P}.i386.linux.tar.bz2 )
+	x86-fbsd? ( ${O_U}${O_P}.i386.freebsd.tar.bz2 )
+"
+
+DEPEND=">=sys-apps/sed-4"
+
+RDEPEND="
+	gtk? (
+		=x11-libs/gtk+-2*
+		dev-libs/atk
+		dev-libs/glib
+		media-libs/glitz
+		media-libs/libpng
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/pixman
+	)
+	kde? (
+		kde-base/kdelibs
+	)
+	dev-libs/expat
+	media-libs/fontconfig
+	media-libs/freetype
+	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
+	"
+
+opera_linguas() {
+	# Remove unwanted LINGUAS:
+	local LINGUA
+	local LNGDIR="${D}usr/share/${PN}/locale"
+	einfo "Keeping these locales: ${LINGUAS}."
+	for LINGUA in ${MY_LINGUAS}; do
+		if ! use linguas_${LINGUA/-/_}; then
+			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
+			rm -r "${LINGUA}"
+		fi
+	done
+}
+
+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_install() {
+	# Remove "license directory" (bug #315473)
+	rm -rf "share/doc/opera"
+
+	# 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"
+
+	# Unzip the man pages before sedding
+	gunzip "${D}"/usr/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" \
+		"${D}"/usr/share/mime/packages/opera-widget.xml \
+		"${D}"/usr/share/man/man1/* \
+		"${D}"/usr/share/applications/opera-browser.desktop \
+		"${D}"/usr/share/applications/opera-widget-manager.desktop || die "sed failed"
+
+	# Sed libdir in opera script
+	sed "${FILESDIR}"/opera \
+		-e "s|OPERA_LIBDIR|${OPREFIX}|g" > opera \
+		|| die "sed opera script failed"
+
+	# Sed libdir in defaults/pluginpath.ini
+	sed -i \
+		-e "s|/usr/lib32|${OPREFIX}|g" \
+		"${D}"/usr/share/opera/defaults/pluginpath.ini \
+		|| die "sed pluginpath.ini 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
+
+	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
+	if use elibc_FreeBSD; then
+		scanelf -qR -N libz.so.3 -F "#N" "${D}"${OPREFIX}/${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 -e 's/libz\.so\.3/libz.so.1/g' "$i"
+		done
+		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
+	fi
+
+	[[ -z MY_LINGUAS ]] || opera_linguas
+}
+
+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
+}