Version bump. Move weekly ebuilds to _rc version format.

(Portage version: 2.1.2.9)

7 files changed, 590 insertions, 1 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index bd7b28d604e3..abae63cf96f6 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,14 @@
 # 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.106 2007/07/10 18:39:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.107 2007/07/19 11:10:50 jer Exp $
+
+*opera-9.22 (19 Jul 2007)
+*opera-9.22_rc652 (19 Jul 2007)
+*opera-9.22_rc651 (19 Jul 2007)
+
+  19 Jul 2007; Jeroen Roovers <jer@gentoo.org> +opera-9.22_rc651.ebuild,
+  +opera-9.22_rc652.ebuild, +opera-9.22.ebuild:
+  Version bump. Move weekly ebuilds to _rc version format.
 
 *opera-9.22.652 (10 Jul 2007)
 
diff --git a/www-client/opera/files/digest-opera-9.22 b/www-client/opera/files/digest-opera-9.22
new file mode 100644
index 000000000000..370f4dc0b8d9
--- /dev/null
+++ b/www-client/opera/files/digest-opera-9.22
@@ -0,0 +1,18 @@
+MD5 601c923cfdc99ec57925e7cdc669ce48 opera-9.22-20070716.1-static-qt.i386-en.tar.bz2 6800643
+RMD160 b00159a4e9a22253eadc44bca99e321687d1c75c opera-9.22-20070716.1-static-qt.i386-en.tar.bz2 6800643
+SHA256 fed87ac83c2d0dd123856435319615b535142d28f227244a430661f5faac7964 opera-9.22-20070716.1-static-qt.i386-en.tar.bz2 6800643
+MD5 147f8043df26d8ac997edbe7ced0f3ac opera-9.22-20070716.1-static-qt.i386.freebsd-en.tar.bz2 6546833
+RMD160 925a9d010b1630426a2e4de429ec1583ea3cb099 opera-9.22-20070716.1-static-qt.i386.freebsd-en.tar.bz2 6546833
+SHA256 5c9573de5217e8d8107922341d8b4367d158c45edf1d522768860faf8b43f58c opera-9.22-20070716.1-static-qt.i386.freebsd-en.tar.bz2 6546833
+MD5 1ca7710dbbadf234981742b9a48ee72d opera-9.22-20070716.1-static-qt.ppc-en.tar.bz2 6839351
+RMD160 3fb83e1e944d9ac9d0c2d745813f216a3bd48fcb opera-9.22-20070716.1-static-qt.ppc-en.tar.bz2 6839351
+SHA256 d9d1134742f9a553e9bb68885a1d32eb3bac90af8adf1feea6efa9ec5742d8d0 opera-9.22-20070716.1-static-qt.ppc-en.tar.bz2 6839351
+MD5 4eccc2443ef63a4354512ea3a2dd6776 opera-9.22-20070716.1-static-qt.sparc-en.tar.bz2 6739692
+RMD160 709d3f17aa3868cebd70b211ffde811988964d13 opera-9.22-20070716.1-static-qt.sparc-en.tar.bz2 6739692
+SHA256 0d4bbf619354de14226ee5cdea0524a86eff4725531d1e0a5fa41a6ab94b2a0d opera-9.22-20070716.1-static-qt.sparc-en.tar.bz2 6739692
+MD5 88611ff69658ed6fe70790393f3ea14b opera-9.22-20070716.4-shared-qt.i386.freebsd-en.tar.bz2 5122833
+RMD160 c8b34d4f9f25a6b67d68e05a16d4d08a7e9a7724 opera-9.22-20070716.4-shared-qt.i386.freebsd-en.tar.bz2 5122833
+SHA256 5b30e178e17f7e609a4eeb64be0d90d221f3858922989f515582719ab4213c24 opera-9.22-20070716.4-shared-qt.i386.freebsd-en.tar.bz2 5122833
+MD5 e125cf9ce197a63f9587279feede27b5 opera-9.22-20070716.6-shared-qt.i386-en.tar.bz2 5229135
+RMD160 a2ac8c984dd34eb803eca30882fc4e580f723748 opera-9.22-20070716.6-shared-qt.i386-en.tar.bz2 5229135
+SHA256 7a6ee406d9385319bc0a4f387d81ecf1b9e80d9cedebd9a2c511c7459500c7e7 opera-9.22-20070716.6-shared-qt.i386-en.tar.bz2 5229135
diff --git a/www-client/opera/files/digest-opera-9.22_rc651 b/www-client/opera/files/digest-opera-9.22_rc651
new file mode 100644
index 000000000000..86bb2489f833
--- /dev/null
+++ b/www-client/opera/files/digest-opera-9.22_rc651
@@ -0,0 +1,18 @@
+MD5 afd7f4c677cd2e7a66f47a95d53d11b7 opera-9.22-20070705.1-static-qt.i386-en-651.tar.bz2 6801503
+RMD160 7148bef66aef0cd01cce8b61a2aa7cc2d928fd07 opera-9.22-20070705.1-static-qt.i386-en-651.tar.bz2 6801503
+SHA256 2c49a9d28efcafc8cea0b56c8f66205baa6081a8a8e322a52fa4b3af1748f8e5 opera-9.22-20070705.1-static-qt.i386-en-651.tar.bz2 6801503
+MD5 ce6c600ba209bc64adb3bac6be6f754a opera-9.22-20070705.1-static-qt.i386.freebsd-en-651.tar.bz2 6547824
+RMD160 e080ce07514e239f8e9e4b2b51469dd39983388e opera-9.22-20070705.1-static-qt.i386.freebsd-en-651.tar.bz2 6547824
+SHA256 111062821a654f457f78345b5ab33c17bde62913a19ccae07557bb14b0957b27 opera-9.22-20070705.1-static-qt.i386.freebsd-en-651.tar.bz2 6547824
+MD5 39aa040218f6d880b0f62cc235d2083a opera-9.22-20070705.1-static-qt.ppc-en-651.tar.bz2 6841598
+RMD160 dc3e3ab60ad3603c5f364c13cbc6441e525b7d44 opera-9.22-20070705.1-static-qt.ppc-en-651.tar.bz2 6841598
+SHA256 7238505d00c1abfad846afce96575bd06071b351eb28c86dfa99d8ddfa86e21a opera-9.22-20070705.1-static-qt.ppc-en-651.tar.bz2 6841598
+MD5 ff81bb2adf4bc375a145098b920c0dd3 opera-9.22-20070705.1-static-qt.sparc-en-651.tar.bz2 6739065
+RMD160 9dc38ee0fb54dd2277db4ee3ed855fd21b421348 opera-9.22-20070705.1-static-qt.sparc-en-651.tar.bz2 6739065
+SHA256 251a40f1dbd8276a47df89038cee93f53e219bd593a9737bf80cff3254e36ca7 opera-9.22-20070705.1-static-qt.sparc-en-651.tar.bz2 6739065
+MD5 1e09d24b7ce5583a05f8059385cdb085 opera-9.22-20070705.4-shared-qt.i386.freebsd-en-651.tar.bz2 5121933
+RMD160 ef3b65b08d17702d862c0bfe08ceb9f9f149f410 opera-9.22-20070705.4-shared-qt.i386.freebsd-en-651.tar.bz2 5121933
+SHA256 f62f22e1a98e596195a67e80f6a1275d478ca83fb53da8e9d7f68ca22174b10a opera-9.22-20070705.4-shared-qt.i386.freebsd-en-651.tar.bz2 5121933
+MD5 14e1ac147907eeb1c57bc82240c766ff opera-9.22-20070705.6-shared-qt.i386-en-651.tar.bz2 5226942
+RMD160 077018469d781a264d36726f8c2386145e253852 opera-9.22-20070705.6-shared-qt.i386-en-651.tar.bz2 5226942
+SHA256 c93d7d4263b860ed444305104f55aa3520c34709a039f4b3a7c264cd361570ef opera-9.22-20070705.6-shared-qt.i386-en-651.tar.bz2 5226942
diff --git a/www-client/opera/files/digest-opera-9.22_rc652 b/www-client/opera/files/digest-opera-9.22_rc652
new file mode 100644
index 000000000000..7d22e9eef485
--- /dev/null
+++ b/www-client/opera/files/digest-opera-9.22_rc652
@@ -0,0 +1,12 @@
+MD5 030a1c9c15ab13914cfa6b5a537e0a1b opera-9.22-20070710.1-static-qt.i386-en-652.tar.bz2 6801898
+RMD160 97e343ebf7803b069d0bda631d2f5a057595028f opera-9.22-20070710.1-static-qt.i386-en-652.tar.bz2 6801898
+SHA256 d8abbbe6714a6d7bd79e9f1cd021e98b188815cc8560b0d8c2ed93f33ec3be7b opera-9.22-20070710.1-static-qt.i386-en-652.tar.bz2 6801898
+MD5 fd47d4f63ff8c1745374839cb9cd22be opera-9.22-20070710.1-static-qt.i386.freebsd-en-652.tar.bz2 6546627
+RMD160 aee1a220214ec9d5884228dd455afa9b0bac0cfc opera-9.22-20070710.1-static-qt.i386.freebsd-en-652.tar.bz2 6546627
+SHA256 33bf6abeca86cc38ebe7325c8b8256e49f45df6555b622a30d3627fcb8301054 opera-9.22-20070710.1-static-qt.i386.freebsd-en-652.tar.bz2 6546627
+MD5 2645e62ab683b50eabceb364e712179d opera-9.22-20070710.4-shared-qt.i386.freebsd-en-652.tar.bz2 5121645
+RMD160 dd617766513810197dee20ff282630e71cc55822 opera-9.22-20070710.4-shared-qt.i386.freebsd-en-652.tar.bz2 5121645
+SHA256 8786367cb91b87b8ef0c8c00014d1ebb26b5be3f5886098e2c90ee6e04e0879a opera-9.22-20070710.4-shared-qt.i386.freebsd-en-652.tar.bz2 5121645
+MD5 9992369554f6190aa26e01a308d8d525 opera-9.22-20070710.6-shared-qt.i386-en-652.tar.bz2 5227343
+RMD160 9326f3fa8fa5bd07d0b2800903bec3e5325db8f9 opera-9.22-20070710.6-shared-qt.i386-en-652.tar.bz2 5227343
+SHA256 23fc8eda56e8fb857e29693067ad95bd01f48fe3f0152af15e589d947582c325 opera-9.22-20070710.6-shared-qt.i386-en-652.tar.bz2 5227343
diff --git a/www-client/opera/opera-9.22.ebuild b/www-client/opera/opera-9.22.ebuild
new file mode 100644
index 000000000000..dd0b3df0d961
--- /dev/null
+++ b/www-client/opera/opera-9.22.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.22.ebuild,v 1.1 2007/07/19 11:10:50 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"
+RESTRICT="strip mirror"
+
+OPERALNG="en"
+OPERASUFF="655"
+OPERAVER="9.22-20070716"
+OPERAFTP="922/final/${OPERALNG}"
+
+OPERA_URI="mirror://opera/"
+SRC_URI="
+	x86? ( qt-static? ( ${OPERA_URI}linux/${OPERAFTP}/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}.tar.bz2 ) )
+	x86? ( !qt-static? ( ${OPERA_URI}linux/${OPERAFTP}/i386/shared/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}.tar.bz2 ) )
+	amd64? ( qt-static? ( ${OPERA_URI}linux/${OPERAFTP}/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}.tar.bz2 ) )
+	amd64? ( !qt-static? ( ${OPERA_URI}linux/${OPERAFTP}/i386/shared/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}.tar.bz2 ) )
+	sparc? ( ${OPERA_URI}linux/${OPERAFTP}/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-${OPERALNG}.tar.bz2 )
+	ppc? ( ${OPERA_URI}linux/${OPERAFTP}/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-${OPERALNG}.tar.bz2 )
+	x86-fbsd? ( !qt-static? ( ${OPERA_URI}unix/freebsd/${OPERAFTP}/shared/${PN}-${OPERAVER}.4-shared-qt.i386.freebsd-${OPERALNG}.tar.bz2 ) )
+	x86-fbsd? ( qt-static? ( ${OPERA_URI}unix/freebsd/${OPERAFTP}/static/${PN}-${OPERAVER}.1-static-qt.i386.freebsd-${OPERALNG}.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
+			  )
+			  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? ( 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/}-${OPERASUFF}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${PN}-9.00-install.patch"
+	epatch "${FILESDIR}/${P}-pluginpath.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
+}
+
+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
+	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
+
+	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 x86-fbsd; 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 x86-fbsd; 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
+}
diff --git a/www-client/opera/opera-9.22_rc651.ebuild b/www-client/opera/opera-9.22_rc651.ebuild
new file mode 100644
index 000000000000..24de3aaa6b2e
--- /dev/null
+++ b/www-client/opera/opera-9.22_rc651.ebuild
@@ -0,0 +1,178 @@
+# 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.22_rc651.ebuild,v 1.1 2007/07/19 11:10:50 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"
+RESTRICT="strip mirror"
+
+OPERALNG="en"
+OPERASUFF="651"
+OPERAVER="9.22-20070705"
+
+OPERA_URI="http://snapshot.opera.com/unix/Weekly-${OPERASUFF}/"
+SRC_URI="
+	x86? ( qt-static? (
+	${OPERA_URI}intel-linux/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
+	x86? ( !qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
+	amd64? ( qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
+	amd64? ( !qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
+	sparc? ( ${OPERA_URI}sparc-linux/${PN}-${OPERAVER}.1-static-qt.sparc-${OPERALNG}-${OPERASUFF}.tar.bz2 )
+	ppc? ( ${OPERA_URI}ppc-linux/${PN}-${OPERAVER}.1-static-qt.ppc-${OPERALNG}-${OPERASUFF}.tar.bz2 )
+	x86-fbsd? ( !qt-static? ( ${OPERA_URI}intel-freebsd/${PN}-${OPERAVER}.4-shared-qt.i386.freebsd-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
+	x86-fbsd? ( qt-static? ( ${OPERA_URI}/intel-freebsd/${PN}-${OPERAVER}.1-static-qt.i386.freebsd-${OPERALNG}-${OPERASUFF}.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
+			  )
+			  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? ( media-libs/libexif
+			  spell? ( app-text/aspell )
+			  x86? ( !qt-static? ( =x11-libs/qt-3* ) )
+			  media-libs/jpeg )"
+
+S=${WORKDIR}/${A/.tar.bz2/}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${PN}-9.00-install.patch"
+	epatch "${FILESDIR}/${PN}-9.21-pluginpath.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 [ ${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
+	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
+	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
+
+	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 [ ${ARCH} = "x86-fbsd" ]; 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 x86-fbsd; 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
+}
diff --git a/www-client/opera/opera-9.22_rc652.ebuild b/www-client/opera/opera-9.22_rc652.ebuild
new file mode 100644
index 000000000000..0fac34c7eab3
--- /dev/null
+++ b/www-client/opera/opera-9.22_rc652.ebuild
@@ -0,0 +1,176 @@
+# 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.22_rc652.ebuild,v 1.1 2007/07/19 11:10:50 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 ~x86 ~x86-fbsd"
+
+IUSE="qt-static spell gnome"
+RESTRICT="strip mirror"
+
+OPERALNG="en"
+OPERASUFF="652"
+OPERAVER="9.22-20070710"
+
+OPERA_URI="http://snapshot.opera.com/unix/Weekly-${OPERASUFF}/"
+SRC_URI="
+	x86? ( qt-static? (
+	${OPERA_URI}intel-linux/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
+	x86? ( !qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
+	amd64? ( qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
+	amd64? ( !qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
+	x86-fbsd? ( !qt-static? ( ${OPERA_URI}intel-freebsd/${PN}-${OPERAVER}.4-shared-qt.i386.freebsd-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
+	x86-fbsd? ( qt-static? ( ${OPERA_URI}/intel-freebsd/${PN}-${OPERAVER}.1-static-qt.i386.freebsd-${OPERALNG}-${OPERASUFF}.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
+			  )
+			  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? ( media-libs/libexif
+			  spell? ( app-text/aspell )
+			  x86? ( !qt-static? ( =x11-libs/qt-3* ) )
+			  media-libs/jpeg )"
+
+S=${WORKDIR}/${A/.tar.bz2/}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${PN}-9.00-install.patch"
+	epatch "${FILESDIR}/${PN}-9.21-pluginpath.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 [ ${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
+	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
+	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
+
+	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 [ ${ARCH} = "x86-fbsd" ]; 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 x86-fbsd; 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
+}