Version bump thanks to georgia_tech_swagger (bug #230633). Allow amd64 users to choose any x86 version (bug #227339).

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r2-JeR i686

3 files changed, 286 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 8e56ff4b8436..56c115d19c73 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.254 2008/07/01 16:23:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.255 2008/07/03 22:52:38 jer Exp $
+
+*opera-9.51 (03 Jul 2008)
+
+  03 Jul 2008; Jeroen Roovers <jer@gentoo.org> +opera-9.51.ebuild:
+  Version bump thanks to georgia_tech_swagger (bug #230633). Allow amd64 users
+  to choose any x86 version (bug #227339).
 
 *opera-9.51_pre2061 (01 Jul 2008)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 41d937f94de6..7cbe40630b3c 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -37,12 +37,20 @@ DIST opera-9.51-2061.gcc4-shared-qt3.i386.tar.bz2 7010967 RMD160 460b6c3c232f521
 DIST opera-9.51-2061.gcc4-shared-qt3.ppc.tar.bz2 7084039 RMD160 dced16253e1e2503f7f6abf0a84fb35f135d10d7 SHA1 44bb9cc7bc596f398aab4d00833ea35dab823168 SHA256 7b1986c82b6a68902d154fcdb9ad0d2bded37cacd7ae20856b9d098e31f642ac
 DIST opera-9.51-2061.gcc4-shared-qt3.x86_64.tar.bz2 7612984 RMD160 922686f8afefc829aae435be7f31a3e3a613cfc9 SHA1 08793ed1cb310bf937622a0980667302cecfb8ac SHA256 14a194213ea1d02eb9a22e9b064d0bb3ff413022596a4298659c9332bce514c5
 DIST opera-9.51-2061.gcc4-static-qt3.i386.tar.bz2 8912022 RMD160 ade74eac08e5fcf88c9ce88f2cd32d4d9f5e0932 SHA1 6ce291e803c9e3d90040a29db32f9711a1b1554c SHA256 70b745bc55ca7e542868b62325765786f86c55e59c703ec0948e702b49d2981c
+DIST opera-9.51-freebsd5-shared-qt3.i386.tar.bz2 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+DIST opera-9.51-freebsd5-static-qt3.i386.tar.bz2 9062393 RMD160 8816c32acca8c76578cf240e8ddd799d5550ea34 SHA1 d01c8a8dc188671b8f938043895936c26616a9be SHA256 b03f5d7df610a5b0c4d8f63bc7301bb5e81a4aed3ddc1d58ab80ab1641ff2658
+DIST opera-9.51.gcc4-qt4.i386.tar.bz2 9244734 RMD160 57eb4d35fc6531b7225f9f1c2e24358924992706 SHA1 54bb1320e8cf0d2dc09ff4bae9609afa1a46b313 SHA256 d4dd46525a94b971de90782baebedc3edeef74fa1ab080e21df8e06a3eea2463
+DIST opera-9.51.gcc4-shared-qt3.i386.tar.bz2 7010967 RMD160 460b6c3c232f52188f9c7285f99953c17a229706 SHA1 7b8f7dd531f19fd74e7d4c162ec3958fc11be432 SHA256 74fdb072282cb6da93c74d3dcde7b2f4d719c067794cac2b4cc476fecaf69ab4
+DIST opera-9.51.gcc4-shared-qt3.ppc.tar.bz2 7084039 RMD160 dced16253e1e2503f7f6abf0a84fb35f135d10d7 SHA1 44bb9cc7bc596f398aab4d00833ea35dab823168 SHA256 7b1986c82b6a68902d154fcdb9ad0d2bded37cacd7ae20856b9d098e31f642ac
+DIST opera-9.51.gcc4-shared-qt3.x86_64.tar.bz2 7612984 RMD160 922686f8afefc829aae435be7f31a3e3a613cfc9 SHA1 08793ed1cb310bf937622a0980667302cecfb8ac SHA256 14a194213ea1d02eb9a22e9b064d0bb3ff413022596a4298659c9332bce514c5
+DIST opera-9.51.gcc4-static-qt3.i386.tar.bz2 8912022 RMD160 ade74eac08e5fcf88c9ce88f2cd32d4d9f5e0932 SHA1 6ce291e803c9e3d90040a29db32f9711a1b1554c SHA256 70b745bc55ca7e542868b62325765786f86c55e59c703ec0948e702b49d2981c
 EBUILD opera-9.27.ebuild 5937 RMD160 fe418d4b5a2f34664f46bb6bcee56b27f3d182e0 SHA1 bda2f3ec16759f92c4227203a3a22927cd3b811e SHA256 fff41046fb4e6c58fc1c4cb73df98857c1c2ea89a9c6131aa03f3ce6aee19e98
 EBUILD opera-9.50-r1.ebuild 6549 RMD160 bdf30bebff93085e79989c27861b564594b93093 SHA1 21a6978d6fd59e88bf4ef92d6994443e38cb48f8 SHA256 bfb31ebaf8f76f48bf5bcfb5d43c616947ba08ebbe6554a7339be2391eafcaa5
 EBUILD opera-9.50.ebuild 6300 RMD160 b64e0c79fcd5a8846e994981d09e68d71e419982 SHA1 1eae4b0c3e6ef835e41c962083bb5353832fbc21 SHA256 b4685d6666690be9efd55897d00a7ed0189d3995fafeb5c5155c5d7254b6ba84
+EBUILD opera-9.51.ebuild 7988 RMD160 a3d1a74cb0771211fd444bbd4328396f1d77b2a7 SHA1 a8aaa1770e9d6df8eefe54695fd18ddd8f926e71 SHA256 5ab118ea51c8e892a0ac419fe47083cc6567f69718a67071473e949e7460c208
 EBUILD opera-9.51_pre2050.ebuild 6999 RMD160 22c5a7539b36a5fb1d356457308eae7106732da5 SHA1 924477ac2f302fc77dfb32610c0ba6c8628c2ba9 SHA256 b4b956beb470aac1148d73a41f58f201e2a7c9e8101720f9c627540903536d2e
 EBUILD opera-9.51_pre2052.ebuild 7457 RMD160 349a94b6e42a89c9165d428e50aa4b813d8db6bd SHA1 c68ba959a381528009c60a3e1fc88029d5035be6 SHA256 7efcba4565825d69e93976e7fe41582c24d4cf830b7e261175c9510a5668e5c6
 EBUILD opera-9.51_pre2059.ebuild 7457 RMD160 d0f2ae0d9ae91b5712696d16ffd59445e46ab9a4 SHA1 2a988f3dc2a8ae83fecffcbbf4d20c75841bc1b8 SHA256 b494d135230cc72c813a87325ae0db3bc93ef52c1a2bd2808fa5d329d2b51b5a
 EBUILD opera-9.51_pre2061.ebuild 7457 RMD160 bfc0754222fb061ea5a5f91b2512ac38deb4a422 SHA1 85d69d2efa067eccb3bc238c74302373c52239ef SHA256 b62cad3759d69990c3d1c2ca751ab5b4229271f31393505f5617acd7dc1460d4
-MISC ChangeLog 52698 RMD160 f73081b03e8fe4511a34c7923b403c5d9e12c489 SHA1 0a16958cb521eb24657ded782a89580b991a77fd SHA256 580df6370844b5567b24e4deb6a7c88b8b115f68fed960438d6e709f8ecef6bb
+MISC ChangeLog 52915 RMD160 a65ec9060355bbbe36f0c49b9c3303f3d07903ac SHA1 c00fd0a6e75c9a147cc458695cce223bb2600250 SHA256 9a8166790e27bad865e1f70fff1c6d53bacc46fa10c45a8ce40e7a249fb496fc
 MISC metadata.xml 471 RMD160 5aafe92015ec3864f040f14dff25fc57add1f206 SHA1 796cd3e48c2f939465a60dde64e4123d9b7058a8 SHA256 74d7b68d270d4de61d0fcf48eedc937e46dbbb4e157e86e51790dd8ecd226134
diff --git a/www-client/opera/opera-9.51.ebuild b/www-client/opera/opera-9.51.ebuild
new file mode 100644
index 000000000000..ee995c097b75
--- /dev/null
+++ b/www-client/opera/opera-9.51.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.51.ebuild,v 1.1 2008/07/03 22:52:38 jer Exp $
+
+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 ~x86-fbsd"
+
+RESTRICT="strip test"
+
+IUSE="elibc_FreeBSD gnome ia32 qt-static qt3-static spell"
+MY_LINGUAS="be bg cs da de el en en-GB es-ES es-LA fi fr fr-CA fy hi
+hr hu it ja ka ko lt mk nb nl nn pl pt pt-BR ru sv tr zh-CN zh-TW"
+
+for MY_LINGUA in ${MY_LINGUAS}; do
+	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
+done
+
+O_URI="mirror://opera/"
+O_FTP="/951/final/en/"
+O_SUFF="2061"
+
+SRC_URI="
+	ppc? ( ${O_URI}linux${O_FTP}ppc/shared/${P}.gcc4-shared-qt3.ppc.tar.bz2 )
+	qt-static? (
+		x86-fbsd? ( ${O_URI}unix/freebsd${O_FTP}intel/static/${P}-freebsd5-static-qt3.i386.tar.bz2 )
+		qt3-static? (
+			amd64? (
+				ia32? ( ${O_URI}linux${O_FTP}i386/static/${P}.gcc4-static-qt3.i386.tar.bz2 )
+				!ia32? ( ${O_URI}linux${O_FTP}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${O_URI}linux${O_FTP}i386/static/${P}.gcc4-static-qt3.i386.tar.bz2 )
+		)
+		!qt3-static? (
+			amd64? (
+				ia32? ( ${O_URI}linux${O_FTP}i386/${P}.gcc4-qt4.i386.tar.bz2 )
+				!ia32? ( ${O_URI}linux${O_FTP}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${O_URI}linux${O_FTP}i386/${P}.gcc4-qt4.i386.tar.bz2 )
+		)
+	)
+	!qt-static? (
+		x86-fbsd? ( ${O_URI}unix/freebsd${O_FTP}intel/shared/${P}-freebsd5-shared-qt3.i386.tar.bz2 )
+		qt3-static? (
+			amd64? (
+				ia32? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
+				!ia32? ( ${O_URI}linux${O_FTP}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
+		)
+		!qt3-static? (
+			amd64? (
+				ia32? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
+				!ia32? ( ${O_URI}linux${O_FTP}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
+		)
+	)
+	"
+
+DEPEND=">=sys-apps/sed-4"
+
+RDEPEND="media-libs/libexif
+	media-libs/jpeg
+	>=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
+	x86? ( !qt-static? ( !qt3-static? ( =x11-libs/qt-3* ) ) )
+	amd64? (
+		ia32? ( app-emulation/emul-linux-x86-qtlibs )
+		!ia32? ( =x11-libs/qt-3* )
+	)
+	ppc? ( =x11-libs/qt-3* )
+	spell? ( app-text/aspell )
+	x86-fbsd? (
+		=virtual/libstdc++-3*
+		!qt-static? ( !qt3-static? ( =x11-libs/qt-3* ) )
+	)
+	"
+
+pkg_setup() {
+	if use amd64; then
+		if use ia32; then
+			if use qt-static; then
+				if use qt3-static; then
+					S="${WORKDIR}/${P}-${O_SUFF}.gcc4-static-qt3.i386"
+				else
+					S="${WORKDIR}/${P}-${O_SUFF}.gcc4-qt4.i386"
+				fi
+			else
+				if use qt3-static; then
+					S="${WORKDIR}/${P}-${O_SUFF}.gcc4-static-qt3.i386"
+				else
+					S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.i386"
+				fi
+			fi
+		else
+			S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.x86_64"
+		fi
+	fi
+	use ppc && S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.ppc"
+	use x86-fbsd && S="${WORKDIR}/${P}-${O_SUFF}-freebsd5-shared-qt3.i386"
+	if use x86; then
+		if use qt-static; then
+			if use qt3-static; then
+				S="${WORKDIR}/${P}-${O_SUFF}.gcc4-static-qt3.i386"
+			else
+				S="${WORKDIR}/${P}-${O_SUFF}.gcc4-qt4.i386"
+			fi
+		else
+			if use qt3-static; then
+				S="${WORKDIR}/${P}-${O_SUFF}.gcc4-static-qt3.i386"
+			else
+				S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.i386"
+			fi
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-9.00-install.patch"
+
+	# bug #181300:
+	use elibc_FreeBSD || epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch"
+	use elibc_FreeBSD && epatch "${FILESDIR}/${PN}-9.50-pluginpath-fbsd.patch"
+
+	sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
+		-e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \
+		-e "s:/usr/share/pixmaps:${D}/usr/share/pixmaps:g" \
+		-e "s:/usr/share/icons:${D}/usr/share/icons:g" \
+		-e "s:/etc/X11:${D}/etc/X11:g" \
+		-e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
+		-e "s:/opt/gnome/share:${D}/opt/gnome/share:g" \
+		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
+		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
+		-e 's:read str_answer:return 0:' \
+		-e "s:/opt/kde:${D}/usr/kde:" \
+		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
+		install.sh || die "sed failed"
+
+}
+
+src_compile() {
+	# This workaround is sadly needed because gnome2.eclass doesn't check
+	# whether a configure script or 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
+
+	# Install the icons
+	insinto /usr/share/pixmaps
+	doins usr/share/pixmaps/opera.xpm
+
+	local res
+	for res in 16x16 22x22 32x32 48x48 ; do
+		insinto /usr/share/icons/hicolor/${res}/apps
+		doins usr/share/icons/hicolor/${res}/apps/opera.png
+	done
+
+	# Install the menu entry
+	make_desktop_entry opera Opera /usr/share/pixmaps/opera.xpm 'Network;WebBrowser;Email;FileTransfer;IRCClient'
+
+	# Install a symlink /usr/bin/opera
+	dodir /usr/bin
+	dosym /opt/opera/bin/opera /usr/bin/opera
+
+	# fix plugin path
+	echo "Plugin Path=/opt/opera/lib/opera/plugins" >> "${D}"/etc/opera6rc
+
+	# enable spellcheck
+	if use spell; then
+		if use qt-static; then
+			DIR=${P}.1
+		else
+			use sparc && DIR=${P}.2 || DIR=${P}.5
+		fi
+		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> "${D}"/opt/opera/share/opera/ini/spellcheck.ini
+	fi
+
+	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
+
+	# 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
+}
+
+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 non-English simply do"
+	elog "$ emerge app-dicts/aspell-[your language]."
+
+	if use elibc_FreeBSD; then
+		elog
+		elog "To improve shared memory usage please set:"
+		elog "$ sysctl kern.ipc.shm_allow_removed=1"
+	fi
+
+	elog "The Opera betas may still have issues with plugins, notably"
+	elog "net-www/netscape-flash. See also https://bugs.gentoo.org/198162"
+}
+
+pkg_postrm() {
+	use gnome && gnome2_pkg_postrm
+}