Version bump <http://my.opera.com/desktopteam/blog/2010/04/21/new-rc-for-windows-and-mac>.

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

4 files changed, 19 insertions, 181 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 3971881d3ee7..5a865c1de0b2 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.465 2010/04/20 15:38:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.466 2010/04/21 12:51:05 jer Exp $
+
+*opera-10.52_pre6321 (21 Apr 2010)
+
+  21 Apr 2010; Jeroen Roovers <jer@gentoo.org> -opera-10.52_pre6312.ebuild,
+  -opera-10.52_pre6317.ebuild, +opera-10.52_pre6321.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2010/04/21/new-rc-for-windows-and-ma
+  c>.
 
 *opera-10.52_pre6320 (20 Apr 2010)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index ee74b53cecf3..69f93dea98c1 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -9,22 +9,17 @@ DIST opera-10.10.gcc4-bundled-qt4.i386.tar.bz2 16529068 RMD160 b10ddc7f727352e7c
 DIST opera-10.10.gcc4-bundled-qt4.x86_64.tar.bz2 17297117 RMD160 2a3be809b1463858e444e19c32b596081dec0dd9 SHA1 9f744474dac1da9fc08ce16857f1b867620daf6e SHA256 25b9b119da04068d0b99a93446cdb5496ece81a4e2d387f9bc9ca274178713da
 DIST opera-10.10.gcc4-qt4.i386.tar.bz2 11691076 RMD160 c567e56211e096bfed792e52f016a9e12ea94115 SHA1 f6d2938acdc8bbe2d762521313892989fd62a8be SHA256 c35992860387a88303bfdc4b7fe354914a720e7fdebfd37025dbebe721e6467a
 DIST opera-10.10.gcc4-qt4.x86_64.tar.bz2 12537317 RMD160 db34e4a2b92965472ecc47cab7be9209c97c488b SHA1 6098ac4e4b2fd0519bdbfdb32dc97e50d17fd004 SHA256 63d7678414f3ac40917fda71d745d81d048dadd723da56300fd424542a012df8
-DIST opera-10.52-6312.i386.freebsd.tar.bz2 13217324 RMD160 f4b4eb70c73f277fe5ef9872bb2ca359925fb1e9 SHA1 7da570fe53c2411c14512bf4e934f500c288bdfe SHA256 6e160784e98f0765cdbf9c0fe983b82447eb9c51ace7c022d3c28c01a8c76052
-DIST opera-10.52-6312.i386.linux.tar.bz2 13137379 RMD160 544fdb0ef8faf70999d3bece5b745dd54f0eb0db SHA1 359d4e5d14f8b01dded64f6c3c9a03aec341516d SHA256 0ecadb83f975518ff6fe116567835d9454f1c9dd9a7f7434164db2722ca5c147
-DIST opera-10.52-6312.ppc.linux.tar.bz2 13438602 RMD160 5b93e05cc6b368443c3a0e28970c34ec1c20d9b6 SHA1 3344e9400c34917ee00654ec2cabe055bb82f2ac SHA256 7b440c2e13117361169fe2f55794ac2062362263b092cf645f1f3e979b89326f
-DIST opera-10.52-6312.x86_64.linux.tar.bz2 14163507 RMD160 3713ef1780fe14ffce19288899a9a0f33f2170e2 SHA1 5799472279a356468e258fdec8fa420d223b8346 SHA256 2537f5a4a631f33bd536bd6855696bb3268b0e8a128e54d958dcc9ad6572712c
-DIST opera-10.52-6317.i386.freebsd.tar.bz2 13218979 RMD160 fe36ad60153714a2a1ab6cc1c1a329314742278f SHA1 0dbcdb212e4918e09ef8145b423a4d70be2cbe78 SHA256 e2bcc5f5ce130fc8c5d0449d7a7ab31e4b168cd29a24b7838d8498bc175a87fc
-DIST opera-10.52-6317.i386.linux.tar.bz2 13137545 RMD160 f59acf6f343bed29888997accd6760b3cadd7a11 SHA1 28a026a8bafba6844c2dd53e5eee426a63a2312c SHA256 66ce340207614c1cba2ca9c65f50edf1bdf187313abed4c317ddb245d355db43
-DIST opera-10.52-6317.ppc.linux.tar.bz2 13443038 RMD160 5f50c8be57650996173dd5d4da194083cbbe987c SHA1 2a3420e70e802fffc62d92b8c9356952df9b6e10 SHA256 7a80d06a9576e4f6466ba04f3d64a46746d3448329dec4e1ff88c0bb96d17db4
-DIST opera-10.52-6317.x86_64.linux.tar.bz2 14163760 RMD160 c94addca318784d01cd6955dbf82c8117168e310 SHA1 5e51299e3acc22a942d5c765b06e098b6483b2b1 SHA256 5728c7695b8789288af8324cc6163c59a85bc435c9f30f814c318a6924453b6a
 DIST opera-10.52-6320.i386.freebsd.tar.bz2 13216538 RMD160 76dbb94f3ec9a714513e6874c1364c8398d7034a SHA1 2a0922f2ead9002bb1351c743b6603a6298af896 SHA256 d759655e26b28161840fc8bc1c7929b84d41e3cd19bdcbe00d28ba0c829c82b9
 DIST opera-10.52-6320.i386.linux.tar.bz2 13136417 RMD160 c42b1bfd1e893c6d2b96095023f4000a89698738 SHA1 251aa3297f147e421a0d6f03cdeedeca3bb70db1 SHA256 6c9379707bb755fe6d0b11dec54300378a9c6665592aa8876a1a0e658d569d65
 DIST opera-10.52-6320.ppc.linux.tar.bz2 13436162 RMD160 7015252bbe5c403acbf4d29a712db7d1fea8e032 SHA1 02c7d9766011caae03f4c24bcf821349adcc16a3 SHA256 3150102cb8676a994ddd4c85f4de80ace7c72a537f0f6b4d0aaa510e3b4f7275
 DIST opera-10.52-6320.x86_64.linux.tar.bz2 14163998 RMD160 9e4092e3c1c2500c50547b774a40bdcb46ba60bd SHA1 134835095526c56d2c16236dd79947f34149d989 SHA256 5658145804f4e011ea3d805368723231812b73f406a35f9c20cd8090dba6fe31
+DIST opera-10.52-6321.i386.freebsd.tar.bz2 13222954 RMD160 5b0060e7f69a87e6fdc1917f50931306baf3c834 SHA1 5b712d5dd47295a5b7721b2adf1573d3493a14fc SHA256 eec1274dc5fac74529d1c0f309246407f3c9c373a04a2cafb28be4cbdcd97e50
+DIST opera-10.52-6321.i386.linux.tar.bz2 13141100 RMD160 780112f5f5310ea1cea01d414d0b4831329a10c8 SHA1 0ef90ebb194fbd794a5a58d759cf59db43b2f101 SHA256 fef7bbfcb361c80fe7ae1a227ed68323657002884fa2c6d2a91125fd8b243876
+DIST opera-10.52-6321.ppc.linux.tar.bz2 13440312 RMD160 b8672c02a52e2d505c9429073c1a588c59e451d4 SHA1 2f6de4f3df8ec06632f17c0d5d845fa47aa7b210 SHA256 8d7befcad01bf02ea0a2b4adf3895cd3400685ab42788b84ff8da917779691f3
+DIST opera-10.52-6321.x86_64.linux.tar.bz2 14167179 RMD160 4e3239e9bfafc390aa21fa423489b75a0e0e0269 SHA1 bf91b62d8375c99b075d76917049e14794228c18 SHA256 f6aeb48572bf00d1af89c4850ec3af097e2214eb885b861574b3477af0eb745a
 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.52_pre6312.ebuild 4381 RMD160 7633f5c09fe8a4fe89156233692fc8ae52dfdad8 SHA1 c56ae14ce170aaf902f8fd25362ec58c96608d08 SHA256 f70b4b68f69b72f2eb1df835db24c08ce3eefc4ce4aaaeb7fd5e673e1468b460
-EBUILD opera-10.52_pre6317.ebuild 4381 RMD160 b932f801147fb6d2b210cb1859b0f6fee3d36209 SHA1 62868123e805854535fef4972f0a4d9b358408b6 SHA256 e3017c5f940016740ae56490691c4827587fda09e4c16a588216d21a6e3cc2f8
 EBUILD opera-10.52_pre6320.ebuild 4452 RMD160 e4c2f863318b3671340d20bc7d8b06c17fa41f9e SHA1 8e59b41c1c24e3033d67bf131bf7d6ddd97959b4 SHA256 41c0dcbf4473adac79258b17e3a181fb73f12c2ba0ae8cb862488cdf46a7902d
-MISC ChangeLog 89717 RMD160 8d93a007caafbe1f8a3c306c3d320e905df3902e SHA1 c2ed075a41506450d751b1609f07a94028bf7811 SHA256 f303d883a54c6ebc5ac5a227dce71597a57a7c2a5534357fe1e6de53926d4a13
+EBUILD opera-10.52_pre6321.ebuild 4452 RMD160 1466731b0124540801ed3b203af105a520570731 SHA1 878525a88e32368c4bfb1a1e71bf44804235089a SHA256 04767e16ef4ac7d3b26598ae50b9d106effb3b484af065bc8a5ab8b7c0273aaa
+MISC ChangeLog 89988 RMD160 58c964fecb3cc2a7be7f370cb079d0bdb7141d2c SHA1 057e67acf74aab72f5c177c59a47e9fe20d76423 SHA256 5fc7b6bd23e5f7c3f44a62fe5ab0550d052e1bab26670d3591c885bd64b1e282
 MISC metadata.xml 547 RMD160 dabb86bc4db85881b0ce910ac05e63d16342e787 SHA1 9acc7ec7a62017ed7c9acfca301a3ea75e4e88d9 SHA256 9f70a9db124893d6a56a40615dbe8cccd015b836067d570a9638a9bd9ec6217a
diff --git a/www-client/opera/opera-10.52_pre6317.ebuild b/www-client/opera/opera-10.52_pre6317.ebuild
deleted file mode 100644
index 857fe92c4e9d..000000000000
--- a/www-client/opera/opera-10.52_pre6317.ebuild
+++ /dev/null
@@ -1,168 +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.52_pre6317.ebuild,v 1.1 2010/04/16 13:38:09 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.50 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~ppc ~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 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/snapshot-${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="
-	=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_install() {
-	# We install into usr instead of opt as Opera does not support the latter
-	dodir /usr
-	mv lib/ share/ "${D}"/usr/ || die "mv lib/ 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"
-
-	# Install startup script
-	dobin ${PN}-widget-manager "${FILESDIR}"/opera || 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
-}
diff --git a/www-client/opera/opera-10.52_pre6312.ebuild b/www-client/opera/opera-10.52_pre6321.ebuild
index c9ba7a31d456..17c69a691af2 100644
--- a/www-client/opera/opera-10.52_pre6312.ebuild
+++ b/www-client/opera/opera-10.52_pre6321.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.52_pre6312.ebuild,v 1.1 2010/04/14 20:20:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.52_pre6321.ebuild,v 1.1 2010/04/21 12:51:05 jer Exp $
 
 EAPI="2"
 
@@ -112,6 +112,9 @@ src_unpack() {
 }
 
 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/ share/ "${D}"/usr/ || die "mv lib/ share/ failed"