Version bump (bug #210260).

Package-Manager: portage-2.1.4.4

3 files changed, 195 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index cb72430a191b..ea99b034dda9 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,11 @@
 # 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.195 2008/02/13 07:59:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.196 2008/02/20 13:51:53 jer Exp $
+
+*opera-9.26 (20 Feb 2008)
+
+  20 Feb 2008; Jeroen Roovers <jer@gentoo.org> +opera-9.26.ebuild:
+  Version bump (bug #210260).
 
 *opera-9.50_beta2_p1800 (13 Feb 2008)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index a89ba2f56684..5b8619759407 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -10,6 +10,13 @@ DIST opera-9.25-20071214.1-static-qt.sparc-en.tar.bz2 6744109 RMD160 54ba935cc62
 DIST opera-9.25-20071214.4-shared-qt.i386.freebsd-en.tar.bz2 5123603 RMD160 cc659ae0b871eb689ee9ba37239a157f22b79a8a SHA1 72c48c0af384dce16498a9a9cbf47bd70ea4a646 SHA256 c4fecd0b82459d647ed386d263b8cf8e62c71b3d2bd59400ce122c8827c23a35
 DIST opera-9.25-20071214.6-shared-qt.i386-en.tar.bz2 5231081 RMD160 12aae0aec3f85fa212f156171ec5e2a4d2d9c480 SHA1 4ed67a78794806dcabeb3cc2e59887d6bc004bf7 SHA256 fe43d0ac577255a23c1011fb41cbdaf8848e06956d3e2e7e883de317ee5668ec
 DIST opera-9.25-20071214.6-shared-qt.ppc-en.tar.bz2 5292768 RMD160 e0bb4aa28dee9d6e51b8a5895ba100f826b44213 SHA1 9b8802aa4278d226707a4cb6f79c39c87afcfb33 SHA256 bd83c3d71dfebf91e6c6d84d23877f7cfb138a011bc2eea2fd6226bed3bce60f
+DIST opera-9.26-20080215.1-static-qt.i386-en.tar.bz2 6813747 RMD160 878e0753e5d046bcc3a49a8fd04db89b6bddf324 SHA1 fbdb4e15ea8ad2eecf25b83e4a313968e8b0e10b SHA256 f4b5b7fec7478410f7b43c3c9982030748c47a66c73fa445aa14a9ff36fe0c64
+DIST opera-9.26-20080215.1-static-qt.i386.freebsd-en.tar.bz2 6561777 RMD160 88ca25c99bcd51202c8be7a8a437c451f2fd4251 SHA1 7697729e2efc81e0774beca36c128cd4f611bc98 SHA256 a3b121a2a5d57d32f572f05099364c7cead103d3caf81379d8c15af8183f37b0
+DIST opera-9.26-20080215.1-static-qt.ppc-en.tar.bz2 6859568 RMD160 6fcbafebda3804fcf35c95a54d7b769683463807 SHA1 771ef6776e72d3e691a1c38bfcd77b707f0846f0 SHA256 32a8897beaccfd22caf81775fc846ec12ba1074cc7874555bdee7030b6a7a693
+DIST opera-9.26-20080215.1-static-qt.sparc-en.tar.bz2 6757856 RMD160 31ba17bac4fc3ca2f2c397c5669757bfd6977211 SHA1 ae1328b7990de4f615d7b2e8467b7236acd2e5f1 SHA256 c71bf0096fb83c1b1b9518bf608d5f33cd3ebd3548abdd7564789e6be257c8d9
+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-20071102.1-static-qt.i386.freebsd-1652.tar.bz2 7527789 RMD160 4ea088caa5cc7a1f45eff7fb6cd1a28fe4b260e5 SHA1 11595e1105b228b71fb9032c76133ad9ddb62d1d SHA256 b3759f94c5511e3cc6603694a4852138e63528c8d07dd8cf98edee5da6545878
 DIST opera-9.50-20071102.10-static-qt.i386-1652.tar.bz2 7474431 RMD160 f04a9f612bdee690b17b893776542bc0f7bff2b0 SHA1 4fe9cb98e0544a1a0598d76480975a8a45b0d6be SHA256 0d1a913e1f2741b0b1159792a06417c5ce3b6db14c56385ca85ae2136443a5a5
@@ -95,6 +102,7 @@ DIST opera-9.50b-20071024.4-shared-qt.i386.freebsd-en.tar.bz2 5589042 RMD160 1a0
 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.25.ebuild 5827 RMD160 eeb652724ce20a69fbd5eb4d3cafaf0a0c3a1332 SHA1 63fe2ef37c482f98aa14d1cfa903e3d400011b62 SHA256 55221bb0d9634c5d239ca61ea12298991d7827e6ecc96a6320c6418bbe787ec0
+EBUILD opera-9.26.ebuild 5841 RMD160 6cfddfb23d7ef922c5a978e1dfb4c6132a46e259 SHA1 8c4dca8419b22d809146ec3bbbb5a95d3c7f1b11 SHA256 64edaf3b75445ae078e057b59dd63f9351fbc3b9753858a258efc1f9784fe4c1
 EBUILD opera-9.50_beta1.ebuild 5895 RMD160 cc69dcfef96019e54e5e7e7b5da63a1b10f541bc SHA1 9c4ba3f28f34aefb8d6941f59b79b315d0406430 SHA256 d70614ed8807bbbcd154e922e254a0d5305b09dffc56e5819e62a838435c171e
 EBUILD opera-9.50_beta2_p1652.ebuild 5458 RMD160 d726a8a829e1c13ec8df8707ba48ce17fbbc333f SHA1 4a5cdd5bb7cdf0ac8f9ce04e06c683259dc6ed00 SHA256 16b166e731fb87b9228b8ac36bf2f77a1ff198161dd838a92ca76048aff17628
 EBUILD opera-9.50_beta2_p1662.ebuild 5586 RMD160 a09c517e94fa228d4551abaa732d6ab984e5af02 SHA1 74ebd02025ceed43d2ab8692066efe69c1dd7045 SHA256 3f95c0ef4f05063e8c35738dfb73125be02021cecdbab9b9a263bf5444704d0b
@@ -109,5 +117,5 @@ EBUILD opera-9.50_beta2_p1766.ebuild 5572 RMD160 9bf7db4ac524d41c6a37b3c7037843e
 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
-MISC ChangeLog 42569 RMD160 16b97dbf76513381aa02e85f6a5de4c5ce38e83e SHA1 89aa0a723887e9987fb28d0225f32603980b6886 SHA256 3fe71a1863d5629a3658f337f8dab9c41cf6e8a5430c8951027795dc9f0f9e2c
+MISC ChangeLog 42694 RMD160 d94e9bb05ee6adf984cc4d1aaa522944862f4cd9 SHA1 78b9375eeefb25fc2d5d6f23ac49c85aea57161c SHA256 3fdc733ec7fde3ac1308bffbcacc7af1d581c075164131076073fed8cf53c01a
 MISC metadata.xml 371 RMD160 9ce4bac73fb1a6fb95290774b2a6a09e23be1998 SHA1 dde7f60d2a566274f7997a7d691922a1278a3558 SHA256 192dad9e5e302573e365663703055daac67ab3d40cb1e081cab9927bbc1ddbaa
diff --git a/www-client/opera/opera-9.26.ebuild b/www-client/opera/opera-9.26.ebuild
new file mode 100644
index 000000000000..5ed44904f0b4
--- /dev/null
+++ b/www-client/opera/opera-9.26.ebuild
@@ -0,0 +1,180 @@
+# 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.26.ebuild,v 1.1 2008/02/20 13:51:53 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 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="qt-static spell gnome elibc_FreeBSD"
+RESTRICT="strip mirror"
+
+O_LNG="en"
+O_SUFF="698"
+O_VER="9.26-20080215"
+O_FTP="926/final/${O_LNG}"
+
+O_URI="mirror://opera/"
+SRC_URI="
+	x86? ( qt-static? ( ${O_URI}linux/${O_FTP}/i386/static/${PN}-${O_VER}.1-static-qt.i386-${O_LNG}.tar.bz2 ) )
+	x86? ( !qt-static? ( ${O_URI}linux/${O_FTP}/i386/shared/${PN}-9.26-20080218.6-shared-qt.i386-${O_LNG}.tar.bz2 ) )
+	amd64? ( qt-static? ( ${O_URI}linux/${O_FTP}/i386/static/${PN}-${O_VER}.1-static-qt.i386-${O_LNG}.tar.bz2 ) )
+	amd64? ( !qt-static? ( ${O_URI}linux/${O_FTP}/i386/shared/${PN}-9.26-20080218.6-shared-qt.i386-${O_LNG}.tar.bz2 ) )
+	sparc? ( ${O_URI}linux/${O_FTP}/sparc/static/${PN}-${O_VER}.1-static-qt.sparc-${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}.6-shared-qt.ppc-${O_LNG}.tar.bz2 ) )
+	x86-fbsd? ( !qt-static? ( ${O_URI}unix/freebsd/${O_FTP}/shared/${PN}-${O_VER}.4-shared-qt.i386.freebsd-${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 ) )"
+
+DEPEND=">=sys-apps/sed-4"
+
+RDEPEND="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
+	>=media-libs/fontconfig-2.1.94-r1
+	amd64? ( qt-static? ( app-emulation/emul-linux-x86-xlibs )
+			 !qt-static? ( app-emulation/emul-linux-x86-qtlibs ) )
+	!amd64? ( media-libs/libexif
+			  spell? ( app-text/aspell )
+			  x86? ( !qt-static? ( =x11-libs/qt-3* ) )
+			  media-libs/jpeg )
+	x86-fbsd? ( =virtual/libstdc++-3*
+	            !qt-static? ( =x11-libs/qt-3* ) )"
+
+S=${WORKDIR}/${A/.tar.bz2/}-${O_SUFF}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-9.00-install.patch"
+
+	# bug #181300:
+	use elibc_FreeBSD || epatch "${FILESDIR}/${PN}-9.21-pluginpath.patch"
+	use elibc_FreeBSD && epatch "${FILESDIR}/${PN}-9.23-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
+
+	# 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 images/opera.xpm
+	for res in 16x16 22x22 32x32 48x48 ; do
+		insinto /usr/share/icons/hicolor/${res}/apps/
+		newins images/opera_${res}.png 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
+}
+
+pkg_postrm() {
+	use gnome && gnome2_pkg_postrm
+}