Revision bump to add support for the ia32 USE flag to install a 32-bit Opera on AMD64 (bug #227339).

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

3 files changed, 229 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index ea23fb8fea56..cb89f1984597 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.247 2008/06/23 00:48:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.248 2008/06/23 01:15:46 jer Exp $
+
+*opera-9.50-r1 (23 Jun 2008)
+
+  23 Jun 2008; Jeroen Roovers <jer@gentoo.org> +opera-9.50-r1.ebuild:
+  Revision bump to add support for the ia32 USE flag to install a 32-bit Opera
+  on AMD64 (bug #227339).
 
 *opera-9.51_pre2050 (23 Jun 2008)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 3b4069124eb7..b0a41938b535 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -20,7 +20,8 @@ DIST opera-9.51-2050.gcc4-shared-qt3.i386.tar.bz2 7006043 RMD160 933044268e9125f
 DIST opera-9.51-2050.gcc4-shared-qt3.ppc.tar.bz2 7077917 RMD160 5233eaddb6b058f233e307af67b8264b0bc3aeef SHA1 e96df43e965f340a60a9fe63561d89eca470d898 SHA256 ec59faab2580785098a202227ad09fbf8b857a14270f87c92eefcff126c3dbc7
 DIST opera-9.51-2050.gcc4-static-qt3.i386.tar.bz2 8905836 RMD160 8c22185581fd8a30fd14c9ca83005fa2657b0201 SHA1 02828b7926b347eb6f68b02fa8e33985483f0eca SHA256 de6e07dbce8ca0a19db0f250be337402deebc4eaad610ebfbea03f9207bbd862
 EBUILD opera-9.27.ebuild 5937 RMD160 fe418d4b5a2f34664f46bb6bcee56b27f3d182e0 SHA1 bda2f3ec16759f92c4227203a3a22927cd3b811e SHA256 fff41046fb4e6c58fc1c4cb73df98857c1c2ea89a9c6131aa03f3ce6aee19e98
+EBUILD opera-9.50-r1.ebuild 6498 RMD160 981d663de8ce733e8a638b389a91804ddfb14c0f SHA1 272aafded68eba6d62ab432b684aca645a9c0983 SHA256 146e8a2cc9f6204d632815511342ae261a47f956362eab9280564e004084d6ec
 EBUILD opera-9.50.ebuild 6300 RMD160 b64e0c79fcd5a8846e994981d09e68d71e419982 SHA1 1eae4b0c3e6ef835e41c962083bb5353832fbc21 SHA256 b4685d6666690be9efd55897d00a7ed0189d3995fafeb5c5155c5d7254b6ba84
 EBUILD opera-9.51_pre2050.ebuild 6999 RMD160 22c5a7539b36a5fb1d356457308eae7106732da5 SHA1 924477ac2f302fc77dfb32610c0ba6c8628c2ba9 SHA256 b4b956beb470aac1148d73a41f58f201e2a7c9e8101720f9c627540903536d2e
-MISC ChangeLog 51452 RMD160 39e8f705ac821bfb177ee9c41d17336ca7546ed9 SHA1 b9fe7ee8b938e48285665ac32f8c66c443bafda9 SHA256 f8c935a40526b10706a9ed36684df7b14dcbe03bf4763411d974f123cfdf974c
+MISC ChangeLog 51658 RMD160 b0750044ee8b31605371b1e1e9b905a51a21d258 SHA1 083fb48982f9ae3e7d2bba160daf90f2c1aeeadc SHA256 d1eee1f5038d6b4ab06047052cde92ed09fa89a73b8f72653342bb3c8f6c7d14
 MISC metadata.xml 471 RMD160 5aafe92015ec3864f040f14dff25fc57add1f206 SHA1 796cd3e48c2f939465a60dde64e4123d9b7058a8 SHA256 74d7b68d270d4de61d0fcf48eedc937e46dbbb4e157e86e51790dd8ecd226134
diff --git a/www-client/opera/opera-9.50-r1.ebuild b/www-client/opera/opera-9.50-r1.ebuild
new file mode 100644
index 000000000000..1e19742dbffe
--- /dev/null
+++ b/www-client/opera/opera-9.50-r1.ebuild
@@ -0,0 +1,220 @@
+# 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.50-r1.ebuild,v 1.1 2008/06/23 01:15:46 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 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="/950/final/en/"
+O_SUFF="2042"
+
+SRC_URI="
+	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 )
+	)
+	ppc? ( ${O_URI}linux${O_FTP}ppc/shared/${P}.gcc4-shared-qt3.ppc.tar.bz2 )
+	x86-fbsd? ( ${O_URI}unix/freebsd${O_FTP}shared/${P}-freebsd5-shared-qt3.i386.tar.bz2 )
+	qt-static? (
+		x86? ( ${O_URI}linux${O_FTP}i386/${P}.gcc4-qt4.i386.tar.bz2 )
+	)
+	!qt-static? (
+		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
+	!qt-static? ( =x11-libs/qt-3* )
+	amd64? ( =x11-libs/qt-3* )
+	ppc? ( =x11-libs/qt-3* )
+	spell? ( app-text/aspell )
+	x86-fbsd? ( =x11-libs/qt-3* =virtual/libstdc++-3* )"
+
+pkg_setup() {
+	if use amd64; then
+		if use ia32; then
+			S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.x86_64"
+		else
+			S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.i386"
+		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
+			S="${WORKDIR}/${P}-${O_SUFF}.gcc4-qt4.i386"
+		else
+			S="${WORKDIR}/${P}-${O_SUFF}.gcc4-shared-qt3.i386"
+		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
+}