Version bump (bug #202770).

Package-Manager: portage-2.1.4_rc10

4 files changed, 220 insertions, 5 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 8fa69712d0cd..b6e1d831a64e 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.178 2007/12/14 17:16:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.179 2007/12/19 14:49:59 jer Exp $
+
+*opera-9.25 (19 Dec 2007)
+
+  19 Dec 2007; Jeroen Roovers <jer@gentoo.org> +opera-9.25.ebuild:
+  Version bump (bug #202770).
 
 *opera-9.50_beta2_p1719 (14 Dec 2007)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 8084134a09b3..6ed0ac73ae33 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -24,6 +24,12 @@ DIST opera-9.24-20071015.1-static-qt.ppc-en.tar.bz2 6840376 RMD160 60326b19358b7
 DIST opera-9.24-20071015.1-static-qt.sparc-en.tar.bz2 6743394 RMD160 9ff411d0b1cfdda79143028ee10907b3b87da676 SHA1 7541fdc2e29de63cbbe89d085d7c5fa28b3d12e1 SHA256 f56bfd4264839c6d13a19721e3d6d76ad87ea534f4b5d8e03ad59bc10fd18d9c
 DIST opera-9.24-20071015.4-shared-qt.i386.freebsd-en.tar.bz2 5123101 RMD160 f3c72fe4f21d22f87c71e07799ac986f0a3bc5a8 SHA1 05789beb4ea27f01d4e52c81ac0ae541098b965e SHA256 c0bc7497a8114f13bda60fe14c9dd6ad732c1311cdc8d55597d67b09fe389593
 DIST opera-9.24-20071015.6-shared-qt.i386-en.tar.bz2 5229490 RMD160 b2fdc5adb3577e3ca7213178c7e0b787e1cf9e43 SHA1 997e7171d13856c3d2562258117171cb307431ae SHA256 eff1982b755cf09f94bb444688e9fec5995e38de15ef300bbaea147c96453b2c
+DIST opera-9.25-20071214.1-static-qt.i386-en.tar.bz2 6805990 RMD160 476aecf5ed7636d2867800fc6635af1377de500c SHA1 2783ba59e98bf0d61491264fd43b11b89f0bfec2 SHA256 058e69ac5f246377ff3843619090c885ba31801d2e0f47c6f6b8cbd675d8d913
+DIST opera-9.25-20071214.1-static-qt.i386.freebsd-en.tar.bz2 6548352 RMD160 4dafda310ef785d91cdb245a8d18a9bf5f384b2c SHA1 fb8f614ad3a3a62d71b7e7e0943d87257934009e SHA256 6c5893592af82f10da6722741d0c04b7b09f9a808c5e16d5044cc96e1f8f86c7
+DIST opera-9.25-20071214.1-static-qt.ppc-en.tar.bz2 6841505 RMD160 98c6ae57dc0bf89ed13718300c992028559ade82 SHA1 42b042c261a42d9b7d043187bc6d3acc2b89ffb4 SHA256 16738f7e9f17cfc272f340ad718406167c755585095f8e04f4043139c12fb85e
+DIST opera-9.25-20071214.1-static-qt.sparc-en.tar.bz2 6744109 RMD160 54ba935cc622aff7dfc286aa72924e5a7c77f043 SHA1 761b3481804fe5331f669a715d16b34a73edfeea SHA256 080ef3a1a580ba9aed8bfd112bf0d188d78288564fa32986d9a32077f97110e8
+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.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
@@ -68,6 +74,10 @@ EBUILD opera-9.24.ebuild 5700 RMD160 91a4db38310e806d8bd9ba39cb2f2728051feb53 SH
 MD5 a77c83c599a4d21e3577d4a0082a00d6 opera-9.24.ebuild 5700
 RMD160 91a4db38310e806d8bd9ba39cb2f2728051feb53 opera-9.24.ebuild 5700
 SHA256 ea86e4db351a56ed93ce53ebcc37335f1248d1fe1b7cf038115c8af56378b218 opera-9.24.ebuild 5700
+EBUILD opera-9.25.ebuild 5704 RMD160 58a51cfde302cc5b9d6735fffb57670f11c2537d SHA1 ef47b6d6f9af5ab1eaae9c9458086bfb18023a93 SHA256 1e730a0ef868f0d5adce34cf0b91d6310d777079f8dd68c421e5bc00b47ea1e5
+MD5 2f56ed0b920012a84a753c8bd921bc86 opera-9.25.ebuild 5704
+RMD160 58a51cfde302cc5b9d6735fffb57670f11c2537d opera-9.25.ebuild 5704
+SHA256 1e730a0ef868f0d5adce34cf0b91d6310d777079f8dd68c421e5bc00b47ea1e5 opera-9.25.ebuild 5704
 EBUILD opera-9.50_beta1.ebuild 5895 RMD160 cc69dcfef96019e54e5e7e7b5da63a1b10f541bc SHA1 9c4ba3f28f34aefb8d6941f59b79b315d0406430 SHA256 d70614ed8807bbbcd154e922e254a0d5305b09dffc56e5819e62a838435c171e
 MD5 b33fb60f89425d26522b4cd67d732d59 opera-9.50_beta1.ebuild 5895
 RMD160 cc69dcfef96019e54e5e7e7b5da63a1b10f541bc opera-9.50_beta1.ebuild 5895
@@ -96,10 +106,10 @@ EBUILD opera-9.50_beta2_p1719.ebuild 5516 RMD160 c900a620c1b10d5ac422139d901ed5f
 MD5 4927ba4e07cad86042028126f615f6ba opera-9.50_beta2_p1719.ebuild 5516
 RMD160 c900a620c1b10d5ac422139d901ed5f9a08481ed opera-9.50_beta2_p1719.ebuild 5516
 SHA256 ef6fb459edb4b42addf036f8e1f4916dcbf88462e898f3a79a772cf8b1223b18 opera-9.50_beta2_p1719.ebuild 5516
-MISC ChangeLog 40001 RMD160 1bd9090889e4bc32912f91fa910f5bcdf5c4463e SHA1 a686e9cc979ab3a46d9ce30a7974ea33351c2d9c SHA256 c4deffd2f946620343a0a7216542e1a6e5e7ed6bf42e8062c98c1123f5fadbc7
-MD5 c2fa1cd28e7620e4ec838b5a643d916b ChangeLog 40001
-RMD160 1bd9090889e4bc32912f91fa910f5bcdf5c4463e ChangeLog 40001
-SHA256 c4deffd2f946620343a0a7216542e1a6e5e7ed6bf42e8062c98c1123f5fadbc7 ChangeLog 40001
+MISC ChangeLog 40126 RMD160 8bd6585ced2d437ebe79f264b21aa62a16083c39 SHA1 0cad6679426e6811e891102f47bb75dd2aec72a9 SHA256 afe39bd42825fb84fa3c9b5d5054ae0710f84bf976fc79e5df1699563a7f327d
+MD5 2123b031e7130a71739f94e80f679341 ChangeLog 40126
+RMD160 8bd6585ced2d437ebe79f264b21aa62a16083c39 ChangeLog 40126
+SHA256 afe39bd42825fb84fa3c9b5d5054ae0710f84bf976fc79e5df1699563a7f327d ChangeLog 40126
 MISC metadata.xml 371 RMD160 9ce4bac73fb1a6fb95290774b2a6a09e23be1998 SHA1 dde7f60d2a566274f7997a7d691922a1278a3558 SHA256 192dad9e5e302573e365663703055daac67ab3d40cb1e081cab9927bbc1ddbaa
 MD5 6c43eb4a469936dfc17d56ab9e7c3f12 metadata.xml 371
 RMD160 9ce4bac73fb1a6fb95290774b2a6a09e23be1998 metadata.xml 371
@@ -107,6 +117,9 @@ SHA256 192dad9e5e302573e365663703055daac67ab3d40cb1e081cab9927bbc1ddbaa metadata
 MD5 2f85304163dc11d039f841310979bedc files/digest-opera-9.24 1998
 RMD160 8f473004525e070b99b135187850bda75cd50a28 files/digest-opera-9.24 1998
 SHA256 2b4fef3014fd08bcf40ca5ad3cbaa06ff598d2222bc97278c60dd72b1615d489 files/digest-opera-9.24 1998
+MD5 280a6c7679c1f2a7275d1f668c0ed0ff files/digest-opera-9.25 1998
+RMD160 cf7668e27f45ac11a7885f1d033d927c2b3a1d51 files/digest-opera-9.25 1998
+SHA256 22a1d34f692866466ddbac925e34041809496a1ba7db3faca84e342c23a42450 files/digest-opera-9.25 1998
 MD5 38d2506d8ae2aa3e854544de2cbc9909 files/digest-opera-9.50_beta1 2347
 RMD160 e4e602be4da9a58b24af60c85be064caa4b76456 files/digest-opera-9.50_beta1 2347
 SHA256 01af39173d8d6e94ca0910525977d9e8f16feaf2b8fbe3ca6662f66435106796 files/digest-opera-9.50_beta1 2347
diff --git a/www-client/opera/files/digest-opera-9.25 b/www-client/opera/files/digest-opera-9.25
new file mode 100644
index 000000000000..c9db46e652b4
--- /dev/null
+++ b/www-client/opera/files/digest-opera-9.25
@@ -0,0 +1,18 @@
+MD5 49e3f2120ce804252280f09ee62332d1 opera-9.25-20071214.1-static-qt.i386-en.tar.bz2 6805990
+RMD160 476aecf5ed7636d2867800fc6635af1377de500c opera-9.25-20071214.1-static-qt.i386-en.tar.bz2 6805990
+SHA256 058e69ac5f246377ff3843619090c885ba31801d2e0f47c6f6b8cbd675d8d913 opera-9.25-20071214.1-static-qt.i386-en.tar.bz2 6805990
+MD5 de5f21e7389130a518d672d3abf4b945 opera-9.25-20071214.1-static-qt.i386.freebsd-en.tar.bz2 6548352
+RMD160 4dafda310ef785d91cdb245a8d18a9bf5f384b2c opera-9.25-20071214.1-static-qt.i386.freebsd-en.tar.bz2 6548352
+SHA256 6c5893592af82f10da6722741d0c04b7b09f9a808c5e16d5044cc96e1f8f86c7 opera-9.25-20071214.1-static-qt.i386.freebsd-en.tar.bz2 6548352
+MD5 2ec6f397598d317deb0a0c5002994977 opera-9.25-20071214.1-static-qt.ppc-en.tar.bz2 6841505
+RMD160 98c6ae57dc0bf89ed13718300c992028559ade82 opera-9.25-20071214.1-static-qt.ppc-en.tar.bz2 6841505
+SHA256 16738f7e9f17cfc272f340ad718406167c755585095f8e04f4043139c12fb85e opera-9.25-20071214.1-static-qt.ppc-en.tar.bz2 6841505
+MD5 540ced39b5ba48aed4ac0716eb13f473 opera-9.25-20071214.1-static-qt.sparc-en.tar.bz2 6744109
+RMD160 54ba935cc622aff7dfc286aa72924e5a7c77f043 opera-9.25-20071214.1-static-qt.sparc-en.tar.bz2 6744109
+SHA256 080ef3a1a580ba9aed8bfd112bf0d188d78288564fa32986d9a32077f97110e8 opera-9.25-20071214.1-static-qt.sparc-en.tar.bz2 6744109
+MD5 b931c51c9d77328d81356ff3c73b18f0 opera-9.25-20071214.4-shared-qt.i386.freebsd-en.tar.bz2 5123603
+RMD160 cc659ae0b871eb689ee9ba37239a157f22b79a8a opera-9.25-20071214.4-shared-qt.i386.freebsd-en.tar.bz2 5123603
+SHA256 c4fecd0b82459d647ed386d263b8cf8e62c71b3d2bd59400ce122c8827c23a35 opera-9.25-20071214.4-shared-qt.i386.freebsd-en.tar.bz2 5123603
+MD5 496adcd61d1f510b64009e49702ec21f opera-9.25-20071214.6-shared-qt.i386-en.tar.bz2 5231081
+RMD160 12aae0aec3f85fa212f156171ec5e2a4d2d9c480 opera-9.25-20071214.6-shared-qt.i386-en.tar.bz2 5231081
+SHA256 fe43d0ac577255a23c1011fb41cbdaf8848e06956d3e2e7e883de317ee5668ec opera-9.25-20071214.6-shared-qt.i386-en.tar.bz2 5231081
diff --git a/www-client/opera/opera-9.25.ebuild b/www-client/opera/opera-9.25.ebuild
new file mode 100644
index 000000000000..3ab1c0502e7c
--- /dev/null
+++ b/www-client/opera/opera-9.25.ebuild
@@ -0,0 +1,179 @@
+# 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.25.ebuild,v 1.1 2007/12/19 14:49:59 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="687"
+O_VER="9.25-20071214"
+O_FTP="925/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}-${O_VER}.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}-${O_VER}.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? ( ${O_URI}linux/${O_FTP}/ppc/static/${PN}-${O_VER}.1-static-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
+}