Bump opera for bug 129800. Thanks to Aquila <bart.braem@gmail.com> for the ebuild.

Package-Manager: portage-2.1_rc2

4 files changed, 206 insertions, 13 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 4bd6b1d00ac7..a1ca258cdf7e 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.38 2006/04/11 14:28:31 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.39 2006/05/25 20:47:32 kloeri Exp $
+
+*opera-8.54 (25 May 2006)
+
+  25 May 2006; Bryan Østergaard <kloeri@gentoo.org> +opera-8.54.ebuild:
+  Bump opera for bug 129800. Thanks to Aquila <bart.braem@gmail.com> for the
+  ebuild.
 
   11 Apr 2006; Simon Stelling <blubb@gentoo.org> opera-8.51.ebuild,
   opera-8.52.ebuild:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 50b175abfdbe..d559bb5c8b05 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,24 +1,59 @@
-MD5 ca115c069436457534de7a201252b02d ChangeLog 19481
-RMD160 58473f7f4d4d11a9a0b46f32a176b28ff30b96ad ChangeLog 19481
-SHA256 c1e05327d500769f85075abcd751b8f804618b2bfdd90ebd85b9b1d77f5c81a4 ChangeLog 19481
-MD5 c800460b72166b0b4f1b9ceeae585ff7 files/digest-opera-8.51 372
-RMD160 8fa10f03df29dfeb5383c44601b8eaa3b77c7e45 files/digest-opera-8.51 372
-SHA256 bd26ddb435dbefe9a0e814afa2469d2e684a7668c7409f4846babb80ebf1e399 files/digest-opera-8.51 372
-MD5 8bd742e4d15267140dbadcee2ff07796 files/digest-opera-8.52 372
-RMD160 33735d9430a48ed835eff4430800e4f1424314ea files/digest-opera-8.52 372
-SHA256 d35db769eb98841839f4df1281270f1bbf86ec02bef0cf04e4e3785a9e0f4172 files/digest-opera-8.52 372
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX opera-qt.2.patch 416 RMD160 854a3785d852e5bc1f55b01d9c0e1a81d232d5f6 SHA1 342514ac5280a1f82c0fbf77189dd7c9ddecc900 SHA256 b5cd33f7c861c0c0a6ac44fddb25be282e43b1661f9f379e037ee5808608d1a0
 MD5 fa357d1def9207d9e5e81038265b52cb files/opera-qt.2.patch 416
 RMD160 854a3785d852e5bc1f55b01d9c0e1a81d232d5f6 files/opera-qt.2.patch 416
 SHA256 b5cd33f7c861c0c0a6ac44fddb25be282e43b1661f9f379e037ee5808608d1a0 files/opera-qt.2.patch 416
+AUX opera.desktop 147 RMD160 4413b32af8f46f0dc0fe7271e528f81dd295832f SHA1 cd11a19295ff389988da3b9d96b89329621e1169 SHA256 39bcc8d03bf27d048f98ebb92b5490a27538dcba22492907e45930573d4fa9b9
 MD5 bafbdb86632b055a10fe826d16ea5b7f files/opera.desktop 147
 RMD160 4413b32af8f46f0dc0fe7271e528f81dd295832f files/opera.desktop 147
 SHA256 39bcc8d03bf27d048f98ebb92b5490a27538dcba22492907e45930573d4fa9b9 files/opera.desktop 147
-MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 metadata.xml 253
-SHA256 8e0389110e0cd8cc331b484cde34c22dd93f9f49df16c2263eea4d8e84093976 metadata.xml 253
+DIST opera-8.51-20051114.1-static-qt.i386-en.tar.bz2 5810388
+DIST opera-8.51-20051114.1-static-qt.ppc-en.tar.bz2 5811132
+DIST opera-8.51-20051114.1-static-qt.sparc-en.tar.bz2 5702501
+DIST opera-8.51-20051114.5-shared-qt.i386-en.tar.bz2 3971187
+DIST opera-8.52-20060201.1-static-qt.i386-en.tar.bz2 5812593
+DIST opera-8.52-20060201.1-static-qt.ppc-en.tar.bz2 5811355
+DIST opera-8.52-20060201.1-static-qt.sparc-en.tar.bz2 5705143
+DIST opera-8.52-20060201.5-shared-qt.i386-en.tar.bz2 3977438
+DIST opera-8.54-20060330.1-static-qt.i386-en.tar.bz2 3288384 RMD160 774b312d3d6d2d9b63757d67b4774667633bc7bb SHA1 3210886df1632dfe8aae6fa0be91282d9762b165 SHA256 947a52f81451c3c3aec058393596090d5cb13ccb3f657844e366a070dd8d31f7
+DIST opera-8.54-20060330.1-static-qt.ppc-en.tar.bz2 5812618 RMD160 1beb66093c894501a0694267f7251c5db9df07a3 SHA1 70c773471a930fe9cdd1db8187ea49e8201fd1e6 SHA256 cefebea61175335818bfaf11ee0483da9c6e00b651f4058b2b48c1bd42c6bd22
+DIST opera-8.54-20060330.1-static-qt.sparc-en.tar.bz2 5706851 RMD160 8a87e4960c518a712e8a09cbeedb94b8699214ac SHA1 c81b8301be696c704d0ca84e959993673de1ab8a SHA256 1da7dc960698d686260a9b1b5c66f1724ce012aaf2a14e7cdc45fc42c83d1eed
+DIST opera-8.54-20060330.5-shared-qt.i386-en.tar.bz2 3977898 RMD160 440c7e44e5781750e0a9fca9075786ad5d3380c1 SHA1 0ce1ea9929c868613d40213ddbbf191135547280 SHA256 c2a73f252467fe786e27fb5c5e4f1d39e844543649d1456e4e92408dbc7c03fe
+EBUILD opera-8.51.ebuild 4243 RMD160 5db756d06d54b8c296d40796f55377430afe09ca SHA1 170313d549ccda04974863790375b7babd013156 SHA256 fa3971188657fde360e3d94cf8572ab64cc10905f188159a0fd454a462c4a123
 MD5 7f9eab381216d6f04c301ec7a34981ba opera-8.51.ebuild 4243
 RMD160 5db756d06d54b8c296d40796f55377430afe09ca opera-8.51.ebuild 4243
 SHA256 fa3971188657fde360e3d94cf8572ab64cc10905f188159a0fd454a462c4a123 opera-8.51.ebuild 4243
+EBUILD opera-8.52.ebuild 4525 RMD160 7b43ed136b8824d20a908ab981818f0e5ce2d74f SHA1 ce38c2c748cf03d8ac9b168380be2eb5f7d45742 SHA256 f9a17238709e5c0f2b2d9cf41187f5c6929c2ee04dd962384825088d4f380fa2
 MD5 47344b4f4787688b2af5c7ffa52709bc opera-8.52.ebuild 4525
 RMD160 7b43ed136b8824d20a908ab981818f0e5ce2d74f opera-8.52.ebuild 4525
 SHA256 f9a17238709e5c0f2b2d9cf41187f5c6929c2ee04dd962384825088d4f380fa2 opera-8.52.ebuild 4525
+EBUILD opera-8.54.ebuild 4530 RMD160 02925ecd8edbb775514562f090a481763bf8a52f SHA1 3440bcf3213185402f9c7ff1db92ed5e5dade813 SHA256 df26570f1e976fe42c49b55e9a7a27520664ab7e1fd9dbaee5254a89eb07bb48
+MD5 c4da55152b7fc53be0f080330c4fae32 opera-8.54.ebuild 4530
+RMD160 02925ecd8edbb775514562f090a481763bf8a52f opera-8.54.ebuild 4530
+SHA256 df26570f1e976fe42c49b55e9a7a27520664ab7e1fd9dbaee5254a89eb07bb48 opera-8.54.ebuild 4530
+MISC ChangeLog 19670 RMD160 bc04b516beb3e19136899f4b47212758c7236123 SHA1 0e529e97dfee296bcf3e6b7cf87cf1d774409daa SHA256 1d41e831fce3cfd7bbb2f64e16a1a0bb9adb5074be4700544f2c59841309f03a
+MD5 267b558cb65a3bee5264a28a6a1c5ac6 ChangeLog 19670
+RMD160 bc04b516beb3e19136899f4b47212758c7236123 ChangeLog 19670
+SHA256 1d41e831fce3cfd7bbb2f64e16a1a0bb9adb5074be4700544f2c59841309f03a ChangeLog 19670
+MISC metadata.xml 253 RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 SHA1 3a8933b91cfe570a857153b2774464411b845b7d SHA256 8e0389110e0cd8cc331b484cde34c22dd93f9f49df16c2263eea4d8e84093976
+MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 metadata.xml 253
+SHA256 8e0389110e0cd8cc331b484cde34c22dd93f9f49df16c2263eea4d8e84093976 metadata.xml 253
+MD5 c800460b72166b0b4f1b9ceeae585ff7 files/digest-opera-8.51 372
+RMD160 8fa10f03df29dfeb5383c44601b8eaa3b77c7e45 files/digest-opera-8.51 372
+SHA256 bd26ddb435dbefe9a0e814afa2469d2e684a7668c7409f4846babb80ebf1e399 files/digest-opera-8.51 372
+MD5 8bd742e4d15267140dbadcee2ff07796 files/digest-opera-8.52 372
+RMD160 33735d9430a48ed835eff4430800e4f1424314ea files/digest-opera-8.52 372
+SHA256 d35db769eb98841839f4df1281270f1bbf86ec02bef0cf04e4e3785a9e0f4172 files/digest-opera-8.52 372
+MD5 ae83e36f4709074d0f74413482850d41 files/digest-opera-8.54 1300
+RMD160 5b53adb757dbe32b197b84a5151ea6467b4e8a2d files/digest-opera-8.54 1300
+SHA256 7b957a6eab54a2b3d4ae6646e5bc82ca140411d7414ffad6e3fdee8b44aef4f5 files/digest-opera-8.54 1300
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD4DBQFEdjQ6ugEuf3OQ0akRAoyeAJjOlCQdFbX1a90a24i+vc+QpsfpAJ9tRbKn
++sK+FUR+YUJga2TwcJwvlA==
+=99T/
+-----END PGP SIGNATURE-----
diff --git a/www-client/opera/files/digest-opera-8.54 b/www-client/opera/files/digest-opera-8.54
new file mode 100644
index 000000000000..90605f28b82e
--- /dev/null
+++ b/www-client/opera/files/digest-opera-8.54
@@ -0,0 +1,12 @@
+MD5 16969fd3b4c5c4ccdfffddf34f95f71d opera-8.54-20060330.1-static-qt.i386-en.tar.bz2 3288384
+RMD160 774b312d3d6d2d9b63757d67b4774667633bc7bb opera-8.54-20060330.1-static-qt.i386-en.tar.bz2 3288384
+SHA256 947a52f81451c3c3aec058393596090d5cb13ccb3f657844e366a070dd8d31f7 opera-8.54-20060330.1-static-qt.i386-en.tar.bz2 3288384
+MD5 022ab96cbf6c48239e45a63cf057f1bd opera-8.54-20060330.1-static-qt.ppc-en.tar.bz2 5812618
+RMD160 1beb66093c894501a0694267f7251c5db9df07a3 opera-8.54-20060330.1-static-qt.ppc-en.tar.bz2 5812618
+SHA256 cefebea61175335818bfaf11ee0483da9c6e00b651f4058b2b48c1bd42c6bd22 opera-8.54-20060330.1-static-qt.ppc-en.tar.bz2 5812618
+MD5 1225c949dca9782a82a4f275e4271a87 opera-8.54-20060330.1-static-qt.sparc-en.tar.bz2 5706851
+RMD160 8a87e4960c518a712e8a09cbeedb94b8699214ac opera-8.54-20060330.1-static-qt.sparc-en.tar.bz2 5706851
+SHA256 1da7dc960698d686260a9b1b5c66f1724ce012aaf2a14e7cdc45fc42c83d1eed opera-8.54-20060330.1-static-qt.sparc-en.tar.bz2 5706851
+MD5 4887d49469a374b993010807dba79d32 opera-8.54-20060330.5-shared-qt.i386-en.tar.bz2 3977898
+RMD160 440c7e44e5781750e0a9fca9075786ad5d3380c1 opera-8.54-20060330.5-shared-qt.i386-en.tar.bz2 3977898
+SHA256 c2a73f252467fe786e27fb5c5e4f1d39e844543649d1456e4e92408dbc7c03fe opera-8.54-20060330.5-shared-qt.i386-en.tar.bz2 3977898
diff --git a/www-client/opera/opera-8.54.ebuild b/www-client/opera/opera-8.54.ebuild
new file mode 100644
index 000000000000..60e21985a374
--- /dev/null
+++ b/www-client/opera/opera-8.54.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-8.54.ebuild,v 1.1 2006/05/25 20:47:32 kloeri Exp $
+
+inherit eutils
+
+IUSE="qt-static spell qt kde"
+
+OPERAVER="8.54-20060330"
+OPERAFTPDIR="854/final/en"
+
+S=${WORKDIR}/${A/.tar.bz2/}
+
+DESCRIPTION="Opera web browser."
+HOMEPAGE="http://www.opera.com/linux/"
+
+# that's an ugly workaround for the broken src_uri syntax
+OPERA_URI="mirror://opera/linux/${OPERAFTPDIR}/"
+SRC_URI="
+	x86? ( qt-static? ( ${OPERA_URI}i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+	x86? ( !qt-static? ( ${OPERA_URI}i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+	amd64? ( qt-static? ( ${OPERA_URI}i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+	amd64? ( !qt-static? ( ${OPERA_URI}i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+	sparc? ( ${OPERA_URI}sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )
+	ppc? ( ${OPERA_URI}ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )"
+
+#	sparc? ( !qt-static? ( ${OPERA_URI}/sparc/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )
+#	ppc? ( !qt-static? ( ${OPERA_URI}/ppc-linux/en/${PN}-${OPERAVER}.3-shared-qt.ppc-en.tar.bz2 ) )
+
+# Dependencies may be augmented later (see below).
+DEPEND=">=sys-apps/sed-4
+	amd64? ( sys-apps/setarch )"
+
+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
+			  )
+			  virtual/x11
+			)
+	>=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? ( virtual/motif
+	          spell? ( app-text/aspell )
+	          x86? ( !qt-static? ( =x11-libs/qt-3* ) )
+	          media-libs/jpeg )"
+
+SLOT="0"
+LICENSE="OPERA-8.50"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	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:/usr/share/applications:${D}/usr/share/applications:g" \
+		   -e "s:/usr/local/share/applications:${D}/usr/share/applications: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
+}
+
+src_compile() {
+	true
+}
+
+src_install() {
+	# Prepare installation directories for Opera's installer script.
+	dodir /etc
+
+	# Opera's native installer.
+	if [ ${ARCH} = "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
+
+	# Install the menu entry
+	insinto /usr/share/applications
+	doins ${FILESDIR}/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
+		if use qt-static; then
+			DIR=$OPERAVER.1
+		else
+			use sparc && DIR=$OPERAVER.2 || DIR=$OPERAVER.5
+		fi
+		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> ${D}/opt/opera/share/opera/ini/spellcheck.ini
+	fi
+
+	#if use qt || use kde; then
+	#	cd ${D}/opt/opera/bin
+	#	epatch ${FILESDIR}/opera-qt.2.patch
+	#fi
+
+	dodir /etc/env.d
+	echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > ${D}/etc/env.d/90opera
+}
+
+pkg_postinst() {
+	einfo "For localized language files take a look at:"
+	einfo "http://www.opera.com/download/languagefiles/index.dml?platform=linux"
+	einfo
+	einfo "To change the spellcheck language edit /opt/opera/share/opera/ini/spellcheck.ini"
+	einfo "and emerge app-text/aspell-language."
+}