Correct spellcheck.so location in spellcheck.ini thanks to MageSlayer (bug #258198). Die when spellcheck.so is not found. Refer to LINGUAS for >app-text/aspell-0.60.5.

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

3 files changed, 254 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index c29615c247c9..523d4900d5ec 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.317 2009/02/04 16:45:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.318 2009/02/11 18:24:26 jer Exp $
+
+*opera-10.00_pre4126-r1 (11 Feb 2009)
+
+  11 Feb 2009; Jeroen Roovers <jer@gentoo.org>
+  +opera-10.00_pre4126-r1.ebuild:
+  Correct spellcheck.so location in spellcheck.ini thanks to MageSlayer (bug
+  #258198). Die when spellcheck.so is not found. Refer to LINGUAS for
+  >app-text/aspell-0.60.5.
 
   04 Feb 2009; Jeroen Roovers <jer@gentoo.org> opera-10.00_pre4126.ebuild:
   Depend on media-libs/libpng thanks to Constantine D. Kardaris (bug
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 6cfe87cfcc37..678a60be32e9 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -39,8 +39,9 @@ DIST opera-9.63.gcc4-shared-qt3.x86_64.tar.bz2 7972223 RMD160 43c826276d535a74eb
 DIST opera-9.63.gcc4-static-qt3.i386.tar.bz2 9266959 RMD160 f982a5da638ef3b609c1775904929240f4d2542e SHA1 b946933a8d145c61c94181ad4e7a6297cdb4b74e SHA256 0e33b1c2f8154147ce29c4f4ba02c20a76170363cf8f8269b4c047f49378b7d0
 EBUILD opera-10.00_pre4102.ebuild 7667 RMD160 3e0c3a3192f7359463644b4843a1badd8f8e27bc SHA1 705ee849b1fd02cdf0e4104909b8ffb023c87849 SHA256 f34356901eabc74280c3c7f5efc8f21c7b763f3d8066d13834d4a2224a093c84
 EBUILD opera-10.00_pre4116.ebuild 6579 RMD160 fc2520a49abb1433bce37f1da9e754a571b5cdc9 SHA1 7d2d85c9f9f2c786aad14bc9d88c542f632f072a SHA256 e7fa52dc876e24dce0e94e2b48a27371a6ef6a9629b3655bfa984734f7797802
+EBUILD opera-10.00_pre4126-r1.ebuild 6939 RMD160 bc99123832197e670a38fe55dcc6710a8e1d88d0 SHA1 0b5a2591582b46e7ad72520389a2126cd4f1b57d SHA256 c3afa25dfc5fbccc597a8c525c74d3353678e5ffd07349cdf377b5a45af65108
 EBUILD opera-10.00_pre4126.ebuild 6610 RMD160 05c2d71748d52f635b22773c75fb8df693312bf5 SHA1 3f62cf36a909b32be36aadf0dbff59c63746b048 SHA256 86cdc3eddbd1eab134c394f4bf551670ff0c9f8ed37a25cfddd88b227fe3cdd1
 EBUILD opera-9.27.ebuild 5937 RMD160 fe418d4b5a2f34664f46bb6bcee56b27f3d182e0 SHA1 bda2f3ec16759f92c4227203a3a22927cd3b811e SHA256 fff41046fb4e6c58fc1c4cb73df98857c1c2ea89a9c6131aa03f3ce6aee19e98
 EBUILD opera-9.63.ebuild 7761 RMD160 d84113a28ad13ec79153c2b968faeb1b0be4914b SHA1 7deb049dbd34255f36bc4f51a1813b1c61bab223 SHA256 e06f34767567a1683c674cb428ce94d614ded19625b3d04a17bffcb27a7f25b3
-MISC ChangeLog 62195 RMD160 9dcf9564525539e0e93de8c6cb81fdc33d39bf50 SHA1 7b26f3686a9c42bf17ba802970017a67ac8d76a1 SHA256 5ea2ad68f5c51db3ce1403ca21c198709d70230fefcbed880a44bd56546af787
+MISC ChangeLog 62490 RMD160 6be81461051498a98c75859c8e02a76c5416f071 SHA1 a74f2666652e4f67bf163be2140c1dfe966c1d2d SHA256 bd1d1a177fdbbf085ed849bdbbc9b16432d0c1b7cf4da6980b65eef6381e9f0b
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-10.00_pre4126-r1.ebuild b/www-client/opera/opera-10.00_pre4126-r1.ebuild
new file mode 100644
index 000000000000..8b9874e8223b
--- /dev/null
+++ b/www-client/opera/opera-10.00_pre4126-r1.ebuild
@@ -0,0 +1,243 @@
+# 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_pre4126-r1.ebuild,v 1.1 2009/02/11 18:24:26 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="mirror strip test"
+
+IUSE="elibc_FreeBSD gnome ia32 qt-static qt3 spell"
+MY_LINGUAS="be bg cs da de el en 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 ru sv ta te tr uk zh-CN zh-TW"
+
+for MY_LINGUA in ${MY_LINGUAS}; do
+	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
+done
+
+O_U="http://snapshot.opera.com/unix/snapshot-4126/"
+O_P="${P/_pre/-}"
+
+SRC_URI="
+	x86-fbsd? ( ${O_U}intel-freebsd/${O_P}.freebsd6-shared-qt3.i386.tar.bz2 )
+	ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
+	qt-static? (
+		qt3? (
+			amd64? (
+				ia32? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+				!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+		)
+		!qt3? (
+			amd64? (
+				ia32? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+				!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+		)
+	)
+	!qt-static? (
+		qt3? (
+			amd64? (
+				ia32? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+				!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+		)
+		!qt3? (
+			amd64? (
+				ia32? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
+				!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${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
+	!qt-static? ( media-libs/libpng )
+	qt-static? ( !qt3? ( x11-libs/libXinerama media-libs/nas ) )
+	x86? ( !qt-static? (
+			qt3? ( =x11-libs/qt-3* )
+			!qt3? ( =x11-libs/qt-core-4* =x11-libs/qt-gui-4* )
+		   )
+		 )
+	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? ( =x11-libs/qt-3* ) )
+	)
+	"
+
+opera_cd() {
+	cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
+	S="$(pwd)"
+	einfo "Working in ${S}"
+}
+
+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}
+	opera_cd
+
+	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}-9.50-pluginpath-fbsd.patch"
+	else
+		epatch "${FILESDIR}/${PN}-9.50-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_compile() {
+	# This workaround is sadly needed because gnome2.eclass doesn't check
+	# whether a configure script or Makefile exists.
+	true
+}
+
+src_install() {
+	opera_cd
+	# 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
+
+	# fix plugin path
+	echo "Plugin Path=/opt/opera/lib/opera/plugins" >> "${D}"/etc/opera6rc
+
+	# enable spellcheck
+	if use spell; then
+		local spellchecklib="/opt/opera/lib/opera/${PV/_*/}/spellcheck.so"
+		if [[ -f "${D}/${spellchecklib}" ]]; then
+			echo "Spell Check Engine=${spellchecklib}" \
+				>> "${D}"/opt/opera/share/opera/ini/spellcheck.ini
+		else
+			die "Could not set ${spellchecklib}."
+		fi
+	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
+
+	[[ -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."
+
+	if has_version "<app-text/aspell-0.60.6"; then
+		elog
+		elog "To use the spellchecker (USE=spell) for non-English simply do"
+		elog "$ emerge app-dicts/aspell-[your language]."
+	else
+		elog
+		elog "To use the spellchecker (USE=spell) for languages other that English,"
+		elog "set the LINGUAS variable in your package manager configuration, and"
+		elog "then update the world target."
+	fi
+
+	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 "net-www/netscape-flash. See also https://bugs.gentoo.org/198162"
+}
+
+pkg_postrm() {
+	use gnome && gnome2_pkg_postrm
+}