From: Jeroen Roovers <jer@gentoo.org>
Date: Sat, 10 Jul 2010 14:29:38 +0000 (+0000)
Subject: http://my.opera.com/desktopteam/blog/2010/07/09/maccrash
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=44678f3b958f50ed8dde79c2865ca1d31fc1ebe0;p=gentoo.git

my.opera.com/desktopteam/blog/2010/07/09/maccrash
Package-Manager: portage-2.2_rc67/cvs/Linux i686
---

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 1bef949c8690..d6e806d4b2dd 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.517 2010/07/08 23:46:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.518 2010/07/10 14:29:38 jer Exp $
+
+*opera-10.70_pre6396 (10 Jul 2010)
+
+  10 Jul 2010; Jeroen Roovers <jer@gentoo.org> +opera-10.70_pre6396.ebuild:
+  http://my.opera.com/desktopteam/blog/2010/07/09/maccrash
 
 *opera-10.70_pre6395 (08 Jul 2010)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 7fa0e796d218..f2b781a19107 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -16,9 +16,13 @@ DIST opera-10.60-6386.x86_64.linux.tar.bz2 13680030 RMD160 c1975c7a552fc50328210
 DIST opera-10.70-6395.i386.freebsd.tar.bz2 12720918 RMD160 434249a4c937725b2cbf426dd473acf69fb6932e SHA1 f4523d1e78f61d20bb4247fd7534ff09e8073dc6 SHA256 7228d7d2f1d23b9c36f2b560bb20622af775d064b90e7cde76c7aab2e3678184
 DIST opera-10.70-6395.i386.linux.tar.bz2 12652240 RMD160 51ec60ce4e54f2762c4a4d42e25410ae9e706ad1 SHA1 6592178cc9ffbe3ba8cb9ec7e10e0f8e748d5f99 SHA256 d5910317d49e69cb6c392086312209475d39bb45e3f6c87b9f148b8de64d34a6
 DIST opera-10.70-6395.x86_64.linux.tar.bz2 13682093 RMD160 bed6def768f2d7d1381704402238bfe608f8d5e0 SHA1 f74aaf9e447d8448e63bd7ca6833b8372f449622 SHA256 a94de29c06f5ac5d198aaa41d7c8eb02f9a612b783279bbff6ca75a812920096
+DIST opera-10.70-6396.i386.freebsd.tar.bz2 12721418 RMD160 5aaa36ec25316a95a8fae04dd3eee778a5887038 SHA1 a37e5107970e76be66530b97c44b82fcdd5fdff1 SHA256 e09d847d60acd5a4f1ef04e17c9b33f2785624d8aee6ae615d350c5e26fbaca0
+DIST opera-10.70-6396.i386.linux.tar.bz2 12654754 RMD160 80e8adac9b984fa018a1bf4af392e6d348231332 SHA1 531d758b062f61f644df925f8883641d8a44cfd8 SHA256 97dd6b2a4ff367bf79d3c1072b27ef3d86ed1e4b2d33de44971da854b8dc33d7
+DIST opera-10.70-6396.x86_64.linux.tar.bz2 13682161 RMD160 ae53e0047f80875ed03d44127ca484cfc750bac9 SHA1 ac9398b03008072a989fcf10e627f345e809d47d SHA256 4f79e6f91077d20d4c1dd3d2043beec6320f9a25b94b49d3fe19e69cbbf03d04
 EBUILD opera-10.11.ebuild 4931 RMD160 13ff28c49a332f816a6c6977f44b105f6063a7e6 SHA1 c3b88e01930c067585647ec7e527c35cd346dc72 SHA256 8d1bb4b49055f5542c3398233513ec51f95d8e7d565e46f74d1cd3b01d099fe3
 EBUILD opera-10.60-r1.ebuild 5116 RMD160 a2db2551d8231759b16c68d8b987dbb4b9d67105 SHA1 4d5dfd6568e98f345c62bf5c128b5f4dbfcdfaca SHA256 b4a9495b48e6fa1ba17f7e8ebf3a8a331f8ac7c9aa23c2d9e30406ba49a1df10
 EBUILD opera-10.60.ebuild 4884 RMD160 a3125d90cf4bdd16bd80ef36b14eff6a643046bf SHA1 2687a180ea3c9d1c5cbe90815e4a95d0c0cb6d17 SHA256 9b597ed777844ef7c980592d0f8cf703f455cd302620a9c42d6b91f46569173f
 EBUILD opera-10.70_pre6395.ebuild 5058 RMD160 7e66ac013104dab2576c8d406fd6d2b9d0a7dd8f SHA1 8c94c2b4554f89ea60afdc26baf80b1aa254aff0 SHA256 6ea0df548d871838e331fda6c6e146885b5dac02374d5d413bbb6a4f04dff07c
-MISC ChangeLog 99675 RMD160 6758bf273602b89650b062332f3a067dde6a06e0 SHA1 e0a2ab760123159ae7896e14d7779419af0ac061 SHA256 33f8875bb323a334e525d49bc58ab009b2f7dc9d372a67e7b9cf13ddf8bf916a
+EBUILD opera-10.70_pre6396.ebuild 5055 RMD160 8d20aad20a67e6b38efe5f79ae7baa22090b8aa0 SHA1 56a4825f5636e45df61ea914fc22fdef7fb62b64 SHA256 f3548a9e5ad8fee554a2958349bea0554d5a12a42991c41c8bd5021e20efbd46
+MISC ChangeLog 99847 RMD160 e940cf8d81c5f2a691c5986ef319601923bfb9d7 SHA1 a6d292e1f5dc9e247cc3dee2e737185e673013d2 SHA256 bb0f6e322997ad23fef19fa02b9161805694469ed76553655eba0772a506fb11
 MISC metadata.xml 722 RMD160 f424184eb789ae7afcf8c19a74de21a6029366d2 SHA1 5726f20bc46f15fd7a769293bda721afd2d3df8c SHA256 415493d83f3ebe328fd8a4038f90833cbcc0f983b43c01d9440782bbcfeb4e3a
diff --git a/www-client/opera/opera-10.70_pre6396.ebuild b/www-client/opera/opera-10.70_pre6396.ebuild
new file mode 100644
index 000000000000..c717f32cffe0
--- /dev/null
+++ b/www-client/opera/opera-10.70_pre6396.ebuild
@@ -0,0 +1,198 @@
+# 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.70_pre6396.ebuild,v 1.1 2010/07/10 14:29:38 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 ~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD gtk kde +gstreamer"
+
+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_V="${PV/_pre/-}"
+O_P="${PN}-${O_V}"
+O_U="http://snapshot.opera.com/unix/ozone_${O_V}/"
+
+SRC_URI="
+	amd64? ( ${O_U}${O_P}.x86_64.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
+		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
+	"
+
+opera_linguas() {
+	# Remove unwanted LINGUAS:
+	local LINGUA
+	local LNGDIR="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_prepare() {
+	# Remove "license directory" (bug #315473)
+	rm -rf "share/doc/opera"
+
+	# 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"
+
+	# 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" \
+		share/opera/defaults/pluginpath.ini \
+		|| die "sed pluginpath.ini failed"
+
+	# Remove linguas only when the user sets no linguas
+	[[ -z MY_LINGUAS ]] || opera_linguas
+
+	# 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 -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
+}
+
+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
+}
+
+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
+}