Version bump <http://my.opera.com/desktopteam/blog/2010/03/20/new-opera-unix-packages-arrive-deb-rpm-tar>.

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

5 files changed, 25 insertions, 184 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 0a9ace65d9c4..d8d666904b1c 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,14 @@
 # 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.455 2010/03/12 02:28:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.456 2010/03/21 23:22:37 jer Exp $
+
+*opera-10.51_pre6252 (21 Mar 2010)
+
+  21 Mar 2010; Jeroen Roovers <jer@gentoo.org> -opera-10.50_pre6240.ebuild,
+  -opera-10.50_pre6242.ebuild, +opera-10.51_pre6252.ebuild, +files/opera:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2010/03/20/new-opera-unix-packages-a
+  rrive-deb-rpm-tar>.
 
 *opera-10.51_pre6248 (12 Mar 2010)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index bea905c8c993..1d7ee742cde2 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,3 +1,4 @@
+AUX opera 119 RMD160 57ecc76b5ce383acdc8e69163eab5461059045fd SHA1 fa772ae15b64ab77b3db3161f3595659716b0ac7 SHA256 a50cc11a45a7ee31d0b948ebaec62ef85c1baa04b679d62dbb4ea120c35e48a3
 AUX opera-10.00-pluginpath-fbsd.patch 341 RMD160 735a872421680b1468e2694f9ed41a56d0f23f60 SHA1 41ba2709c1fa585491221f924b3cd000768cd7c2 SHA256 0af425e1845617d7a5f23b1a991c7d306ea2b62b548a2201aa6f0b0ad060d023
 AUX opera-10.00-pluginpath.patch 439 RMD160 9fc1bcb8430d185d040a811c2714077eaad159af SHA1 37a6b63d4d1d34e8f43f6ba838d09ceec6cfd607 SHA256 b34e438bab40599b70a7dfd4946a82e718fb46de0384062b41c51db5a047db4c
 AUX opera-10.50-paths.patch 1926 RMD160 5da0594d0e51e6bbef17180437b6530de4c1b07e SHA1 7c193a03730619d8217b0545b4deaa5d47e65364 SHA256 ac9f07071b4c1f199c0fd64ea7fee3db9a0c1bce4db017e3f10aabfb9c50c870
@@ -13,22 +14,18 @@ DIST opera-10.20-4744.gcc4-bundled-qt4.i386.tar.bz2 16706241 RMD160 75a1e23d18e4
 DIST opera-10.20-4744.gcc4-bundled-qt4.x86_64.tar.bz2 17487833 RMD160 68a6b54f2adb00ea39ddf3fce9d6f645a306e3e4 SHA1 8db87855b5ff70248997c4b03d3e4ceedeee9f64 SHA256 fa6de10d1920135cac53eaff6ab58a5b2096476b5f557bf3b7f36716bec72f98
 DIST opera-10.20-4744.gcc4-qt4.i386.tar.bz2 11884785 RMD160 aa05575b484206d9be554625d8b57c663c457b19 SHA1 9044d368b31be4273a29ea1ef1dbe674e05b7e75 SHA256 481a720c7ff0fecae8e80f16649d13347edb629015aed8e702810192d75fe25f
 DIST opera-10.20-4744.gcc4-qt4.x86_64.tar.bz2 12734457 RMD160 3d17082f9d0f27e75514ba3f38d1ae176e3d12d5 SHA1 9ee55a4eac4ffdfb86c0e8eaf4abbb1d6cc918ef SHA256 9933080087966a358c6dbff579957fc966dcbeb2eeb090bc9fc595e07908d20a
-DIST opera-10.50-6240.i386.freebsd.tar.bz2 12128935 RMD160 c94f531c3d2c5f7e3919f58fd55740f24448ff39 SHA1 19edd4465045fe06aeb791544f9227a4ad2c8a9e SHA256 34ef59b625fa187f69a008a40b8f8eadb7223a32f2681c78c1ee1ed259cc309f
-DIST opera-10.50-6240.i386.linux.tar.bz2 12064720 RMD160 f9f699c55ff79d19e6208c13c91a49bdf7c7697f SHA1 80bc49205483d9620ed923ddbd7a87f0233c0423 SHA256 6da6709ff4426e5c149871082b7f454ee318d3baf9eee012378b1fee52c2433f
-DIST opera-10.50-6240.x86_64.linux.tar.bz2 12932930 RMD160 78303ad8fe53546cfdf561d9e758d4d3f822ed05 SHA1 fe7fe0ffc0914c70855bbcf2052d637557336f20 SHA256 b92e59ba843b3d217c1068c73c5c7793ad2bff18648f8e3edc1bcf30a6f7a10a
-DIST opera-10.50-6242.i386.freebsd.tar.bz2 12129735 RMD160 d2375b9201b7c3db896721dec3c04e68ce299dfd SHA1 3d224f1bfbd7caa543e6b49cf0541ae523bc9736 SHA256 f2bc4cece897c33d9c1057f62e47a33e1556c9a687e043b9298d27c3385a156f
-DIST opera-10.50-6242.i386.linux.tar.bz2 12063785 RMD160 8d4642ea560de173f2573936013b1bec5e714e55 SHA1 a45efb0a0e1b53c427bb8ee85fe4b1ae2de1cfb3 SHA256 7b4c97ee73b54da3058701d308082f84301c417c466ae99fd1d6795db66c3724
-DIST opera-10.50-6242.ppc.linux.tar.bz2 12117606 RMD160 56ed6d34f0928653e2dccfbe97ed563cdb13a0a5 SHA1 bd7095343aea5378232b96b58ceec6c8ffeb025c SHA256 3ad80705ff2f09d14181dcfd4b98d81a3b807bd5c1f796a542cb262923b224ad
-DIST opera-10.50-6242.x86_64.linux.tar.bz2 12936702 RMD160 65c05cd71ab5053ecfdf4bba753fc7fcba253ffd SHA1 f87fbe7e600d6b06e7a646c579ce712a22f1abeb SHA256 f9571d4cd18d002a12510d215f958b249e53124563e62f0e9f44b61a7f3e6e8c
 DIST opera-10.51-6248.i386.freebsd.tar.bz2 12080569 RMD160 5b2a7ed9c2df24cde34da6eca5ea8dd1305bb304 SHA1 d6d89065cbc963665ffae3d4beff2be5a0a44782 SHA256 76474c4b44b51f2254f688589fa892f9fed8c0cf1911af469a51011cd4e2fbfc
 DIST opera-10.51-6248.i386.linux.tar.bz2 12054923 RMD160 b61ec92da4c4aeaff23f1a70239b2c28c5ad3acd SHA1 c070f4e42a973004f14b27538efcbdc2c03f0169 SHA256 2d74fe85da2581d15dba2238389fce8fe6bc02bf1053509de36b864f2c4e83c8
 DIST opera-10.51-6248.ppc.linux.tar.bz2 12122371 RMD160 069be6f91fcd2846c495b270489e7a8331c9eb5d SHA1 db32ccc7def61d10278bb3af70910fefa596e239 SHA256 60668e6cf7bceec0c2464fe69ae97f32480aa5644a254ab2b200ad01f20824cc
 DIST opera-10.51-6248.x86_64.linux.tar.bz2 12938455 RMD160 85d53519d9f7ec7f271bfaf0f79afc47eaeae4cf SHA1 5edbe6b75e31ad3996fecf4e4e3f50eeb23ec161 SHA256 f93db8a04234b4f1308e7a7557f338e6eb4218d14a926a3838fc4f670c4c90b7
+DIST opera-10.51-6252.i386.freebsd.tar.bz2 13077712 RMD160 ad806794fa1e3e121825b2fcd9fcdbdd9fbba659 SHA1 bec204bf8ff543282b8e7a61ce3c77ce6760779d SHA256 c2dc6a2c77b736845562c75898475010e96466aebf1f6f7aafac2ea3f1de0619
+DIST opera-10.51-6252.i386.linux.tar.bz2 13013072 RMD160 98fc07e9f40c4cd2e9cd57726d3d7a4b0bb617c6 SHA1 4088704b41baf93fb919b364325c42931b229900 SHA256 6d9002fb7ee622e4c51d527c7efbb1866449a3e86c5bc2c146fb95763a415f7a
+DIST opera-10.51-6252.ppc.linux.tar.bz2 13348226 RMD160 5bf63f798df5d9fa0018cad993ef9592af7c0488 SHA1 bfc48c9f58ef83d9d65a8fe0a84913cbc6db69a3 SHA256 89ec203599278caf37dff82927a42f96be22c17a14512ef5c41196593cbe6f75
+DIST opera-10.51-6252.x86_64.linux.tar.bz2 13995857 RMD160 4890d7a234d2f78bf1ec715697561c7bb8b69d3c SHA1 2b56e645aee9b4d7477b8614063a851bb2eb86ef SHA256 944cf4a37fca1513a724adf6e9e95edfb9175e3f62b636ec81d22fd6d0be1cfc
 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.20_pre4744.ebuild 5082 RMD160 3345df94e66946bde58d0f52aaae9c22346b87bf SHA1 d7a61c4f9c74fa64a2d0ea4e80307f62daf706a6 SHA256 86a87fd4fe4a30a1abd2a60031ef8632fe1e7d6afebeb0c27d4d3b5d244a89de
-EBUILD opera-10.50_pre6240.ebuild 4014 RMD160 40610cdd3a454eaedf735d8ae548c83fe2ef77b8 SHA1 1190209995334f73fceb860bea8c481974b74927 SHA256 54e8199b05388c8281eb5e2314c660b165103170be4d6b1d6c413988a044c4ac
-EBUILD opera-10.50_pre6242.ebuild 4060 RMD160 b27fbcf0037eec33d487cd9a49d335685ee42041 SHA1 7b6b0712787ed102b507ba34b8b2cba9e1df4d39 SHA256 f2989f24334512a5b8ea00f95cdecc11396ec087210e8a22672977d84f79631e
 EBUILD opera-10.51_pre6248.ebuild 4060 RMD160 51b48bc629ad05080251210178adc26e5426d0b7 SHA1 10fa7c017b9cfe001b6faae394bef8276b8b11a7 SHA256 2e15b81c4b5a5885f0a5cec0e84c8bbb1f228728a52230504c3a49b6e6bd3536
-MISC ChangeLog 87376 RMD160 56bd4096d0cc2d17c08cfdfdcc0c9c72db655583 SHA1 c35013fc11c4aa34a23518413a605f15534cf8ae SHA256 c803e3036ac3b1323df25560fc6bd7031c5ed80eea7d85b3c8aa68f4c73f63cb
+EBUILD opera-10.51_pre6252.ebuild 3902 RMD160 b6df044ac3e384b94b86cf29c1d7d1f8ca894e1a SHA1 466c0a020d825411247e06977a3e26a5204ed402 SHA256 da9a2b3e8ed9380e89ec9455913f72b9c576eefa9c2962bee1e845a7c52b4716
+MISC ChangeLog 87677 RMD160 247b7a91c7047d8c279e38cce2ceaa068547442d SHA1 3e1063738d57cfa4c5dcb8dbcbbc6f7228d97e77 SHA256 2d2d8f9b4161804c600bd660964e92d1ece8fe122f9fa52aefeccbffa0af38eb
 MISC metadata.xml 547 RMD160 dabb86bc4db85881b0ce910ac05e63d16342e787 SHA1 9acc7ec7a62017ed7c9acfca301a3ea75e4e88d9 SHA256 9f70a9db124893d6a56a40615dbe8cccd015b836067d570a9638a9bd9ec6217a
diff --git a/www-client/opera/files/opera b/www-client/opera/files/opera
new file mode 100644
index 000000000000..902f28635df2
--- /dev/null
+++ b/www-client/opera/files/opera
@@ -0,0 +1,4 @@
+#!/bin/bash
+export OPERA_DIR=/usr/share/opera
+export OPERA_PERSONALDIR="${HOME}/.opera"
+exec /usr/lib/opera/opera "$@"
diff --git a/www-client/opera/opera-10.50_pre6240.ebuild b/www-client/opera/opera-10.50_pre6240.ebuild
deleted file mode 100644
index f75e94d8b726..000000000000
--- a/www-client/opera/opera-10.50_pre6240.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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.50_pre6240.ebuild,v 1.1 2010/03/02 15:11:25 jer Exp $
-
-EAPI="2"
-
-OPREFIX="/usr/lib"
-
-inherit eutils
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-10.10 LGPL-2"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-
-RESTRICT="mirror test"
-
-QA_DT_HASH="${OPREFIX}/${PN}/.*"
-QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
-
-IUSE="elibc_FreeBSD"
-
-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? ( ${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="
-	=x11-libs/gtk+-2*
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/glitz
-	media-plugins/gst-plugins-meta
-	media-libs/libpng
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/cairo
-	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/pango
-	x11-libs/pixman
-	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_prepare() {
-	sed -i opera \
-		-e 's|=usr/lib/opera|=/usr/lib/opera|g' \
-		-e '6a\OPERA_DIR=/usr/share/opera' \
-		|| die "sed opera script failed"
-	epatch "${FILESDIR}"/${PN}-10.50-paths.patch
-}
-
-src_install() {
-	# This alpha build hardcodes /usr as prefix
-	mv etc/ usr/ "${D}"/ || die "mv etc/ usr/ failed"
-
-	make_desktop_entry ${PN} Opera ${PN} # TODO
-
-	# Install startup script
-	dobin ${PN} || 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 ${OPREFIX}/opera/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
-}
diff --git a/www-client/opera/opera-10.50_pre6242.ebuild b/www-client/opera/opera-10.51_pre6252.ebuild
index 1ff979c591e5..6c1177351c45 100644
--- a/www-client/opera/opera-10.50_pre6242.ebuild
+++ b/www-client/opera/opera-10.51_pre6252.ebuild
@@ -1,6 +1,6 @@
 # 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.50_pre6242.ebuild,v 1.1 2010/03/06 15:34:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.51_pre6252.ebuild,v 1.1 2010/03/21 23:22:37 jer Exp $
 
 EAPI="2"
 
@@ -110,22 +110,15 @@ src_unpack() {
 	fi
 }
 
-src_prepare() {
-	sed -i opera \
-		-e 's|=usr/lib/opera|=/usr/lib/opera|g' \
-		-e '6a\OPERA_DIR=/usr/share/opera' \
-		|| die "sed opera script failed"
-	epatch "${FILESDIR}"/${PN}-10.50-paths.patch
-}
-
 src_install() {
 	# This alpha build hardcodes /usr as prefix
-	mv etc/ usr/ "${D}"/ || die "mv etc/ usr/ failed"
+	dodir /usr
+	mv lib/ share/ "${D}"/usr/ || die "mv etc/ usr/ failed"
 
 	make_desktop_entry ${PN} Opera ${PN} # TODO
 
 	# Install startup script
-	dobin ${PN} || die "dobin failed"
+	dobin ${PN}-widget-manager "${FILESDIR}"/opera || die "dobin failed"
 
 	# Stop revdep-rebuild from checking opera binaries
 	dodir /etc/revdep-rebuild
@@ -151,7 +144,7 @@ src_install() {
 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 ${OPREFIX}/opera/share/opera/locale/, then enter 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