Readd because of the p.mask on beta2 (thanks to Cyker for notifying).

Package-Manager: portage-2.1.4.4

3 files changed, 205 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 5e4f57c22fe7..0d180ee47acf 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,9 @@
 # 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.203 2008/02/27 04:12:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.204 2008/02/28 01:58:49 jer Exp $
+
+  28 Feb 2008; Jeroen Roovers <jer@gentoo.org> +opera-9.50_beta1.ebuild:
+  Readd because of the p.mask on beta2 (thanks to Cyker for notifying).
 
   27 Feb 2008; Jeroen Roovers <jer@gentoo.org> -opera-9.50_beta1.ebuild,
   -opera-9.50_beta2_p1652.ebuild, -opera-9.50_beta2_p1662.ebuild,
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index c9bc9054c524..54914fa985bc 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -10,6 +10,7 @@ DIST opera-9.26-20080215.1-static-qt.sparc-en.tar.bz2 6757856 RMD160 31ba17bac4f
 DIST opera-9.26-20080215.4-shared-qt.i386.freebsd-en.tar.bz2 5135201 RMD160 f763aa7255fdc95f83ef87aa3b1b8475062f9c52 SHA1 ea4f809223313dd6fffd9527488e8f87ab196233 SHA256 d0cdbe623b592092f86edc5f25e331c45931c454d744bf3dfc18d524e3bedd1f
 DIST opera-9.26-20080215.6-shared-qt.ppc-en.tar.bz2 5306251 RMD160 82fabd2d7c3b5b1fa8793cb96271f61c266f9a6c SHA1 b3bd842c7e950f575cee606cd5d3419d78cc641e SHA256 4e15386b9c776b2666c762dc3cf24badf2e5066763ae383a53a1c5bb63265356
 DIST opera-9.26-20080218.6-shared-qt.i386-en.tar.bz2 5246181 RMD160 35c2e4a4d9f18c1c9954727e20d4a55291b4d773 SHA1 036cdd7202d4a946767d0d6309f00d2ec1765a3d SHA256 efe90b1d0f016a6a3bed07e527b187f7829cf32b6d048b07c83c4afed6efcb54
+DIST opera-9.50-20071024.2-shared-qt.x86_64-1643.tar.bz2 6036762 RMD160 6c50a708f410709198c08b29145aeee7654b973f SHA1 de1b0044a2ea9fd665599383336eb4ca44dd64f0 SHA256 c662fbe906be9118885fe3ed3e5a593ea845658f18394b040d7f8fac50c861bf
 DIST opera-9.50-20080118.1-static-qt.sparc-1766.tar.bz2 7251035 RMD160 9294ad4c1869c3cc3628c9ed8d926b91b526417f SHA1 8057f4e93cec2682e0baaa2a3cf8955657b1c134 SHA256 526e2c6d632525ccc2d384e0ca582eeab8ce63778526ad8674407bef56315fdf
 DIST opera-9.50-20080118.2-shared-qt.sparc-1766.tar.bz2 5378332 RMD160 6e2e4ed876ddbaf1c1b2350ef1eaa4c904252cd6 SHA1 3041bc54de95876d2004227ee2cf44c00baa106f SHA256 f711cc13d3de5b06d401a76e759533c6e6239ded53ec98f204727c8797534139
 DIST opera-9.50-20080118.2-shared-qt.x86_64-1766.tar.bz2 6204823 RMD160 4ce38735d51ae234e81c35fe1dd9b6835d5076c4 SHA1 fbb22b59e8fb5d158d182f5f249573ef67ae8b4a SHA256 54d531022bc3645172023af134d9631e339c32599df152df158975aa524e4467
@@ -42,11 +43,18 @@ DIST opera-9.50-20080221.5-static-qt.i386.freebsd-1823.tar.bz2 7627509 RMD160 72
 DIST opera-9.50-20080221.6-shared-qt.i386-1823.tar.bz2 5616481 RMD160 2dd2f19a8c3adc87ffe3bfc5273fd23008d3c792 SHA1 610c6000be46f575597deab0602efb252d0b4c4a SHA256 1329c870bc43b288a7f6dffd96fbdaa4aa724d4161878316e64c5738c8ac01f5
 DIST opera-9.50-20080221.6-shared-qt.ppc-1823.tar.bz2 5677423 RMD160 998d2b7da8218067a1759dde3d8461143003c415 SHA1 27edb636beea581f7441a0a9ca32895babbeedf4 SHA256 53f440943df8e5d2e5de8c6b5541fd25f1ddaafccee52f7bd22a775d6f6c7c80
 DIST opera-9.50-20080221.9-static-qt.i386-1823.tar.bz2 7855294 RMD160 e9d4cabb4d0d7f6ebed85e24629e9186f2ac2be4 SHA1 4651c02890a815728965b779e9f579005cc92afb SHA256 897cfb3bb6508dad552e49b26fdf4a50c852f2755884d74b995e7ff3e5e0ec32
+DIST opera-9.50b-20071024.1-static-qt.i386.freebsd-en.tar.bz2 7517641 RMD160 311a905c23b4f670d3617e2f22050aa86c0c369d SHA1 a75f01fb6904280b87e847741d532d05def0fa5d SHA256 9632efd8f839c4cca16a929c63ab0d03b15c21a22b23be0c75e5c8440764a940
+DIST opera-9.50b-20071024.1-static-qt.ppc-en.tar.bz2 7236901 RMD160 6df43be8cd93ee45d60113894e4daf3ae41ee6b6 SHA1 83d2b0f00784ebffb3ac03e5883884908c10023a SHA256 2f29336bd986e0ee4e25df0815b95cdae13661aad05af542aeb65ac7dc89531d
+DIST opera-9.50b-20071024.3-shared-qt.ppc-en.tar.bz2 5752913 RMD160 7114895d497478d403a6c874ce99a2c4caa0ba0d SHA1 de0a5f42c33aba74797079d529b908d16efdf057 SHA256 a0e57f4d719d74e805b184cec9bdc35ef2eb054bf143b85d91ecf03d3d8b44af
+DIST opera-9.50b-20071024.4-shared-qt.i386.freebsd-en.tar.bz2 5589042 RMD160 1a07ba2e71f87c25fb51265558b0c48d85ddea86 SHA1 7ebbba1bb1b45b5c5a6e6e15e454b129a01409ea SHA256 0cb1c72e1ce46f7202901db9bc2f4b2318f2294d8876897ac9905cd8fe833865
+DIST opera-9.50b-20071024.6-shared-qt.i386-en.tar.bz2 5533621 RMD160 485999e2068ddafa623686013a862fd5000efd1b SHA1 1df8e3481c2b6ca449ab11291b1545a45bb84ac9 SHA256 4428d4413329e0858b686e6db2810e0beab0bb153d246887385c44271e274ed9
+DIST opera-9.50b-20071024.9-static-qt.i386-en.tar.bz2 7762453 RMD160 10d877c4e7d98175e2a84881a4a5ff0bcde2d8dd SHA1 be62bedca170355dbd300ce94700369dda6507a6 SHA256 25e3366d63a2494706ca8d9238896da53709125974a0ef14d7985c4c4f203ec3
 EBUILD opera-9.26.ebuild 5841 RMD160 d9553a54beef298cd9ca6dca36818ccb997d909d SHA1 c8472d619b677d6f92431ac0b1b1a36d517b8320 SHA256 1ff26ac7fad7ad2df51bb0f662aba5f857a42fc6e55ef1e95252633f44ce786f
+EBUILD opera-9.50_beta1.ebuild 5895 RMD160 c901f78917d4159de6eada313f67c707e604eff1 SHA1 b6623366cb2f89abe90bf2a799fd8d1e06140723 SHA256 7918ae8eab27002f51a91ea4f9240edaf48619bf5610709a4aa1c6749bf055fc
 EBUILD opera-9.50_beta2_p1766.ebuild 5572 RMD160 9bf7db4ac524d41c6a37b3c7037843e45841e719 SHA1 211e23d9ee280df4dce539d558604a5c67aeb9d9 SHA256 e6c65523a3a4670ca680bacd8f4a5b0771f9d82a0fa3514f0f244019e3566e19
 EBUILD opera-9.50_beta2_p1772.ebuild 5515 RMD160 82c16d057c76d0d65c8fdf0327b0344eeeb4eaa6 SHA1 63254df67b4c10e8adefb94bc898d3c08b3e7359 SHA256 1e6746ecec43182090b55051dc37c95ff3502c68b94bb95bdd4905386d6282ce
 EBUILD opera-9.50_beta2_p1786.ebuild 5515 RMD160 e754c13de44035f9b50fc43c97787558c68bbac1 SHA1 1c8c79d6c6edb19e4ce8178dcc74b571e0a81373 SHA256 f93a784e727b94dd6abe179355ef1112769908aa3fa67d7e8bd9c03ce8fc7af8
 EBUILD opera-9.50_beta2_p1800.ebuild 5365 RMD160 6602d77f6f607709cc60d5a8c4cb7e8b3b21cd20 SHA1 ffdafe09767ae37ca6f77dff3f50cad29939f513 SHA256 f3f0c6f97361a858da8b83420adcdf6fd7a625a411c3c3bf7c463a85159a2c35
 EBUILD opera-9.50_beta2_p1823.ebuild 5470 RMD160 ea902595a806e851ffec55abdce7a8911dc3d2a7 SHA1 11be6637f473180abdafbf65fdbcff1ac233208b SHA256 172eb2e2adb5b7955c7d096deb5c422c583652b597afc13e4c5882e9ac511fee
-MISC ChangeLog 43815 RMD160 219df72bec6ef451a7ddaf3ba772893aafdf6ae7 SHA1 d88d34fd564383891b16c5935c912465481e0f8a SHA256 4bf9a835bc88d809f2cee94cb1d097acd85d938f31f57695acdde13521cac5d8
+MISC ChangeLog 43961 RMD160 ebfe2bb3426ac1cc3c7dad556205300a84dc936b SHA1 3879f008b232a0cad1b36c18875fb2495174d391 SHA256 95f813163e57d70143a8a40d392ceb27238467253648e68ca0cdc0a14b961bad
 MISC metadata.xml 371 RMD160 9ce4bac73fb1a6fb95290774b2a6a09e23be1998 SHA1 dde7f60d2a566274f7997a7d691922a1278a3558 SHA256 192dad9e5e302573e365663703055daac67ab3d40cb1e081cab9927bbc1ddbaa
diff --git a/www-client/opera/opera-9.50_beta1.ebuild b/www-client/opera/opera-9.50_beta1.ebuild
new file mode 100644
index 000000000000..744cea1bd803
--- /dev/null
+++ b/www-client/opera/opera-9.50_beta1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.50_beta1.ebuild,v 1.14 2008/02/28 01:58:49 jer Exp $
+
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Opera web browser"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-9.0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+IUSE="qt-static spell gnome elibc_FreeBSD"
+RESTRICT="strip mirror"
+
+O_LNG="en"
+O_SUFF="1643"
+O_VER="9.50b-20071024"
+O_FTP="/950b/final/${O_LNG}/"
+
+O_URI="mirror://opera/"
+
+SRC_URI="amd64? ( ${O_URI}linux${O_FTP}x86_64/${PN}-${O_VER/b/}.2-shared-qt.x86_64-${O_SUFF}.tar.bz2 )
+	x86? ( qt-static? ( ${O_URI}linux${O_FTP}i386/static/${PN}-${O_VER}.9-static-qt.i386-${O_LNG}.tar.bz2 )
+		   !qt-static? ( ${O_URI}linux${O_FTP}i386/shared/${PN}-${O_VER}.6-shared-qt.i386-${O_LNG}.tar.bz2 ) )
+	ppc? ( qt-static? ( ${O_URI}linux${O_FTP}ppc/static/${PN}-${O_VER}.1-static-qt.ppc-${O_LNG}.tar.bz2 )
+		   !qt-static? ( ${O_URI}linux${O_FTP}ppc/shared/gcc-2.95/${PN}-${O_VER}.3-shared-qt.ppc-${O_LNG}.tar.bz2 ) )
+	x86-fbsd? (	qt-static? ( ${O_URI}unix/freebsd${O_FTP}static/${PN}-${O_VER}.1-static-qt.i386.freebsd-${O_LNG}.tar.bz2 )
+				!qt-static? ( ${O_URI}unix/freebsd${O_FTP}shared/${PN}-${O_VER}.4-shared-qt.i386.freebsd-${O_LNG}.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* )
+	spell? ( app-text/aspell )
+	x86-fbsd? ( =virtual/libstdc++-3* )"
+
+O_S="${A/opera-9.50b/opera-9.50}"
+O_S="${O_S/-${O_LNG}/}"
+
+if use amd64; then
+	S="${WORKDIR}/${O_S/.tar.bz2/}"
+else
+	S="${WORKDIR}/${O_S/.tar.bz2/}-${O_SUFF}"
+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.
+	if use amd64; then
+		linux32 ./install.sh --prefix="${D}"/opt/opera || die
+	else
+		./install.sh --prefix="${D}"/opt/opera || die
+	fi
+
+	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=$O_VER.1
+		else
+			use sparc && DIR=$O_VER.2 || DIR=$O_VER.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
+
+	# symlink to libflash-player.so:
+	dosym /opt/netscape/plugins/libflashplayer.so \
+		/opt/opera/lib/opera/plugins/libflashplayer.so
+
+	# Add the Opera man dir to MANPATH:
+	insinto /etc/env.d
+	echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera
+}
+
+pkg_postinst() {
+	use gnome && gnome2_pkg_postinst
+
+	elog "For localized language files take a look at:"
+	elog " http://www.opera.com/download/languagefiles/index.dml"
+	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 have several issues with plugins, notably"
+	elog "net-www/netscape-flash. See also https://bugs.gentoo.org/198162"
+}
+
+pkg_postrm() {
+	use gnome && gnome2_pkg_postrm
+}