Version bump. Add missing media-libs/nas dependency (possibly fixes bug #275401).

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

3 files changed, 255 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 00eca9614372..9faae6e8ad21 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.352 2009/06/24 16:35:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.353 2009/06/26 17:05:50 jer Exp $
+
+*opera-10.00_pre4453 (26 Jun 2009)
+
+  26 Jun 2009; Jeroen Roovers <jer@gentoo.org> +opera-10.00_pre4453.ebuild:
+  Version bump. Add missing media-libs/nas dependency (possibly fixes bug
+  #275401).
 
 *opera-10.00_pre4449 (24 Jun 2009)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index ee2aea26fa85..0bc33c35af5b 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -36,6 +36,14 @@ DIST opera-10.00-4449.gcc4-shared-qt3.i386.tar.bz2 9732294 RMD160 2ab0ce9ecd084f
 DIST opera-10.00-4449.gcc4-shared-qt3.ppc.tar.bz2 9797840 RMD160 801e1d31cd1d73e1c43f1c556204adc0d9532082 SHA1 3217d3ae5b438966be36ec91aa0aabc26a7d3f94 SHA256 c71cf1c88b8905e9156725b53f9293b19f4242c641833bf8fca7dd728d5e4df5
 DIST opera-10.00-4449.gcc4-shared-qt3.x86_64.tar.bz2 10416539 RMD160 403731d98942031d0e3e49d54590bb77cc821bdd SHA1 3971c86482b6d623100b53f64b9a108ef9dc6728 SHA256 50e51aae9184adc5c0afb07a5c94d1aa55aef9ca9240d059acd71785d6372ad2
 DIST opera-10.00-4449.gcc4-static-qt3.i386.tar.bz2 11625504 RMD160 0e71022e2a61c2d81aaeef229b2340aa1a585a91 SHA1 4b3d1ce7ebc318692a4f101887ff969879916945 SHA256 ee21d439663440a0f0731afaedf88cd9d602df25ba9d7e69802a1691c598311a
+DIST opera-10.00-4453.gcc4-bundled-qt4.i386.tar.bz2 14539621 RMD160 537832b6460540c40feab6255e01456636afdd55 SHA1 46fcf38849fcd5bb671366d4f8adece252233c05 SHA256 c0dfbf6c2a2d2ab1cc94e20f8d8febee175fcbeaf1992432fd143d6bcf8987de
+DIST opera-10.00-4453.gcc4-bundled-qt4.x86_64.tar.bz2 15221693 RMD160 c649928bf0bb8f80f13de328b36c10fa9cc0888f SHA1 e31420570e8a39922f98175467be59ad3023809d SHA256 244f12afd24846db962bad61659f4d38861dca70de6909b704d8d096a56b920e
+DIST opera-10.00-4453.gcc4-qt4.i386.tar.bz2 9733780 RMD160 8e0ca3af46b81096c90d755f47a0c916c4215a41 SHA1 6219f3691fb5bff871c8028c618912a9253c7ec2 SHA256 9f9173fbf17a9318866f56588d3a31cd5506b0d7b091a4c92b402f4a2b2ade65
+DIST opera-10.00-4453.gcc4-qt4.x86_64.tar.bz2 10474317 RMD160 9c6a7adcc4f2bf18bd1f42125eed6ff1849ee659 SHA1 9c89881900d1177e8b1e79d711f8c6858187918c SHA256 6f9e98b5738f19409aa1257b8c74926ffc691c23c684cd7d0090a352f4527b1a
+DIST opera-10.00-4453.gcc4-shared-qt3.i386.tar.bz2 9759836 RMD160 3f147b6e0221a7a67ddd1e6804ca5bb6bb417905 SHA1 c6959a729085e89c01c8feb2928bd1a14d861dab SHA256 8f70395d7310681602538fa90afaeaa322529c2cc6b74797ace78aa0b79652ec
+DIST opera-10.00-4453.gcc4-shared-qt3.ppc.tar.bz2 9847399 RMD160 8cdb5054a2a4baee015eeecb8eb6461b9df32cbb SHA1 a7a13f5e080e2f831d909cbfd87502d486aecc68 SHA256 4a770c60ac76c25a15e79616a195d086511c59ff4ab25cd991359b664809368a
+DIST opera-10.00-4453.gcc4-shared-qt3.x86_64.tar.bz2 10472090 RMD160 7c3759af615404a006f0b2b7ca675f395c71b5ea SHA1 1439ba11d329086dc57284d0297913fe27482221 SHA256 c9f06e1a3c139efc5d70b266266c913dfe51f00cc0c257f079ed08da8e39b66a
+DIST opera-10.00-4453.gcc4-static-qt3.i386.tar.bz2 11659096 RMD160 138cdcad71d65f85203cd34e26cb5412b4ae809f SHA1 a4cdf1e0aeb73b20edffe9c9843e81152eeaea38 SHA256 e20c1dfdc7a281733287d77f05f938c8b290c5e8918be44a07ccb545602dd19c
 DIST opera-10.00-b1-freebsd5-shared-qt3.i386.tar.bz2 6562405 RMD160 235ee2a570a05221c194bbb478bca3b1d8c1b3cb SHA1 ce618794f75438f0d7668b98a312855ea0e1f9ac SHA256 2554f6f68c2e180598ff1c6fc73c64fa1968a374ae62b1d2d540aaa6de6f0b56
 DIST opera-10.00-b1-freebsd5-static-qt3.i386.tar.bz2 8491058 RMD160 7121dfee4c9e94b4d3d40fe0d55d6f4d06bd7a0d SHA1 d0244f6998ffab869baae7c552d774b3d7eec751 SHA256 700a758f14a293e51999a5cad53d30732b99073162672c36b40abc711dca93fb
 DIST opera-10.00-b1.gcc4-bundled-qt4.i386.tar.bz2 11132463 RMD160 704d9df1c3dba8dc5c6a2ef08abc3a18e070d80d SHA1 37a79075d04c4c287ec138bb9def5ab3f791411c SHA256 adec320da74582c63dcd7267e8f6fcab787fab8a59dd00f54b59e4d6ec6d5be3
@@ -62,7 +70,8 @@ EBUILD opera-10.00_pre4394.ebuild 6597 RMD160 00dce84b665b0d4787236d8dda89726b3a
 EBUILD opera-10.00_pre4402.ebuild 6737 RMD160 5f63f84b93773c770075edd3838795cd2b21f9ce SHA1 6188bf8838710447529edb41c9be2e014a5b5c32 SHA256 a6e55fc1a880c58a378d1d8c32c755cdd773d5dfffa14ad6117346f92ea936ae
 EBUILD opera-10.00_pre4440.ebuild 5836 RMD160 bb8f26b7bb8b87f34f2ce8eb0ca5b6dc9c463ec6 SHA1 416cd41209ead72ca6393ebf1b38d7a178b4293f SHA256 44d27af4986fa174a4e147567a2fbf4b769675f5d3ef62402f011ee8419d4a5a
 EBUILD opera-10.00_pre4449.ebuild 6048 RMD160 84b9890a141b12ad36fd220aeadcb6409f5b57bd SHA1 0262a09a4324b94f862bcd274f3388fa62cc87bd SHA256 57df09e834a6e4cd23297f73b6af9dc3462afc22bf5078cc1925829a8b102a14
+EBUILD opera-10.00_pre4453.ebuild 6650 RMD160 8f01892138dc466b731a3063525af320f5b0529e SHA1 c0d5e03e4fbaa3ee37b847878b7c10c34229ad83 SHA256 adb2db82127a1e6a3cfc6f18b087cc98ad92d076caf73f57e6b67328b3f9b853
 EBUILD opera-9.27.ebuild 6053 RMD160 fa86d79c0a1beae6d3605467122c2a5451b21bff SHA1 32d8ea747f757e99ce0af0c456c4aed71a660689 SHA256 4b0d2bb5bbbdc1eb4cee89f717d6bdc556337fb4d7e7973c216292d1f4cd8fee
 EBUILD opera-9.64.ebuild 7896 RMD160 0c981a40e72c64929e06cb3643e0a04ab538202d SHA1 64fcac7617e01be342ac7b0c2c65a38b9a867d92 SHA256 6eb45e59ecf811df18afc8ff52cb48d3608060a5c76c883abfa8772388dd7806
-MISC ChangeLog 68187 RMD160 6aca8ab7f5fc444ed60412d9f8275b0e2f98013b SHA1 db2d9758db7f326e88c3535bbc166559669af32a SHA256 87d78c6334dc84027e385ab11a0e771af406300d5610df3d4eb0e21d69ac828a
+MISC ChangeLog 68386 RMD160 3b6e981412ebdf995bde6e9214a1d98e93f12f60 SHA1 41e507a16e4312c8fedd77fb47fb9a0d61ac7642 SHA256 0686bec0e664cf33026a06ca6efaeea6aa338d73b3e5d5a5ee68459e935c15e3
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-10.00_pre4453.ebuild b/www-client/opera/opera-10.00_pre4453.ebuild
new file mode 100644
index 000000000000..0a9501fd3d62
--- /dev/null
+++ b/www-client/opera/opera-10.00_pre4453.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4453.ebuild,v 1.1 2009/06/26 17:05:50 jer Exp $
+
+EAPI="2"
+
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="A standards-compliant graphical Web browser"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-9.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RESTRICT="mirror strip test"
+
+IUSE="elibc_FreeBSD gnome ia32 qt-static qt3"
+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 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/snapshot-${PV/*_pre/}/"
+O_P="${P/_pre/-}"
+
+SRC_URI="
+	amd64? (
+		!ia32? (
+			qt-static? (
+				qt3? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+				!qt3? ( ${O_U}x86_64-linux/${O_P}.gcc4-bundled-qt4.x86_64.tar.bz2 )
+			)
+			!qt-static? (
+				qt3? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+				!qt3? ( ${O_U}x86_64-linux/${O_P}.gcc4-qt4.x86_64.tar.bz2 )
+			)
+		)
+		ia32? (
+			qt-static? (
+				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-bundled-qt4.i386.tar.bz2 )
+			)
+		)
+			!qt-static? (
+				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
+			)
+	)
+	ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
+	x86? (
+		qt-static? (
+			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-bundled-qt4.i386.tar.bz2 )
+		)
+		!qt-static? (
+			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
+		)
+	)
+	"
+
+DEPEND=">=sys-apps/sed-4"
+
+RDEPEND="
+	media-libs/jpeg
+	media-libs/libexif
+	>=media-libs/fontconfig-2.1.94-r1
+	x11-libs/libXrandr
+	x11-libs/libXp
+	x11-libs/libXmu
+	x11-libs/libXi
+	x11-libs/libXft
+	x11-libs/libXext
+	x11-libs/libXcursor
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
+	amd64? (
+		ia32? (
+			qt-static? ( !qt3? ( media-libs/nas ) )
+			!qt-static? (
+				qt3? ( =x11-libs/qt-3*[-immqt] )
+				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+			)
+		)
+		!ia32? (
+			qt3? ( =x11-libs/qt-3*[-immqt] )
+			!qt3? (
+				qt-static? ( media-libs/nas )
+				!qt-static? ( x11-libs/qt-core x11-libs/qt-gui )
+			)
+		)
+	)
+	ppc? ( =x11-libs/qt-3*[-immqt] )
+	x86? (
+		qt-static? ( !qt3? ( media-libs/nas ) )
+		!qt-static? (
+			qt3? ( =x11-libs/qt-3*[-immqt] )
+			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+		)
+	)
+	"
+
+opera_linguas() {
+	# Remove unwanted LINGUAS:
+	local LINGUA
+	local LNGDIR="${D}/opt/opera/share/opera/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
+}
+
+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() {
+	epatch "${FILESDIR}/${PN}-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-simplify-desktop.patch"
+	epatch "${FILESDIR}/${PN}-freedesktop.patch"
+
+	# bug #181300:
+	if use elibc_FreeBSD; then
+		epatch "${FILESDIR}/${PN}-10.00-pluginpath-fbsd.patch"
+	else
+		epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
+	fi
+
+	sed -i 	-e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
+		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
+		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
+		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
+		install.sh || die "sed failed"
+}
+
+src_configure() {
+	# This workaround is sadly needed because gnome2.eclass doesn't check
+	# whether a configure script exists.
+	true
+}
+
+src_compile() {
+	# This workaround is sadly needed because gnome2.eclass doesn't check
+	# whether a Makefile exists.
+	true
+}
+
+src_install() {
+	# Prepare installation directories for Opera's installer script.
+	dodir /etc
+
+	# Opera's native installer.
+	./install.sh --prefix="${D}"/opt/opera || die "install.sh failed"
+
+	einfo "It is safe to ignore warnings about failed checksums"
+	einfo "and about files that would be ignored ..."
+	einfo "Completing the installation where install.sh abandoned us ..."
+
+	# java workaround
+	sed -i -e 's:LD_PRELOAD="${OPERA_JAVA_DIR}/libawt.so":LD_PRELOAD="$LD_PRELOAD"\:"${OPERA_JAVA_DIR}/libawt.so":' "${D}"/opt/opera/bin/opera
+
+	dosed /opt/opera/bin/opera
+	dosed /opt/opera/share/opera/java/opera.policy
+
+	# Adapt desktop file to Gnome when needed
+	use gnome && sed -i -e s:"GenericName\[":"Comment\[": "${D}"/usr/share/applications/opera.desktop
+
+	# Install a symlink /usr/bin/opera
+	dodir /usr/bin
+	dosym /opt/opera/bin/opera /usr/bin/opera
+
+	dodir /etc/revdep-rebuild
+	echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > "${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}"/opt/${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
+
+	# Add the Opera man dir to MANPATH:
+	insinto /etc/env.d
+	echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera
+
+	[[ -z MY_LINGUAS ]] || opera_linguas
+}
+
+pkg_postinst() {
+	use gnome && gnome2_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 /opt/opera/share/opera/locale/, then enter the"
+	elog "directory for the language you want and [Open] the .lng file."
+
+	elog
+	elog "To use the spellchecker (USE=spell) for languages other than English, do:"
+	elog " emerge app-dicts/myspell-[your language]"
+	elog " mkdir \${HOME}/.opera/dictionaries"
+	elog " cd \${HOME}/.opera/dictionaries"
+	elog " ln -s /usr/share/myspell/*.{aff,dic} ."
+	elog "A future release of Opera 10 should remedy this inconvenience."
+
+	if use elibc_FreeBSD; then
+		elog
+		elog "To improve shared memory usage please set:"
+		elog "$ sysctl kern.ipc.shm_allow_removed=1"
+	fi
+
+	elog
+	elog "The current Opera builds may still have issues with plugins, notably"
+	elog "www-plugins/adobe-flash. See also https://bugs.gentoo.org/198162"
+}
+
+pkg_postrm() {
+	use gnome && gnome2_pkg_postrm
+}