Remove old. Add beta2.

(Portage version: 2.2_rc33/cvs/Linux i686)

4 files changed, 67 insertions, 524 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 9477fdd200fd..559dd63d7c17 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.367 2009/07/16 13:49:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.368 2009/07/17 15:29:23 jer Exp $
+
+*opera-10.00_pre4492 (17 Jul 2009)
+
+  17 Jul 2009; Jeroen Roovers <jer@gentoo.org> -opera-10.00_pre4340.ebuild,
+  -opera-10.00_pre4345.ebuild, -opera-10.00_pre4394.ebuild,
+  +opera-10.00_pre4492.ebuild:
+  Remove old. Add beta2.
 
 *opera-10.00_pre4493 (16 Jul 2009)
 
diff --git a/www-client/opera/opera-10.00_pre4345.ebuild b/www-client/opera/opera-10.00_pre4345.ebuild
deleted file mode 100644
index d5a5867f6ded..000000000000
--- a/www-client/opera/opera-10.00_pre4345.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4345.ebuild,v 1.3 2009/07/09 18:57:05 jer Exp $
-
-EAPI="2"
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-10.00"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RESTRICT="mirror strip test"
-
-IUSE="elibc_FreeBSD gnome ia32 qt-static qt3"
-MY_LINGUAS="be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka ko lt mk nb nl nn pl pt pt-BR ru sv ta te tr uk zh-CN zh-TW"
-
-for MY_LINGUA in ${MY_LINGUAS}; do
-	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
-done
-
-O_U="http://snapshot.opera.com/unix/snapshot-${P##*_pre}/"
-O_P="${P/_pre/-}"
-
-SRC_URI="
-	qt-static? (
-		ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-		x86? (
-			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-			)
-		amd64? (
-			ia32? (
-				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-			)
-			!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-		)
-	)
-	!qt-static? (
-		ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-		x86? (
-			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-		)
-		amd64? (
-			ia32? (
-				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-			)
-			!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-		)
-	)
-	"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="
-	media-libs/jpeg
-	media-libs/libexif
-	>=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
-	x86? (
-		qt-static? (
-			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
-		)
-		!qt-static? (
-			qt3? ( =x11-libs/qt-3*[-immqt] )
-			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
-		)
-	)
-	ppc? ( =x11-libs/qt-3*[-immqt] )
-	amd64? (
-		ia32? (
-			qt-static? (
-				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
-			)
-			!qt-static? ( =x11-libs/qt-3*[-immqt] )
-		)
-		!ia32? ( =x11-libs/qt-3*[-immqt] )
-	)
-	"
-
-opera_linguas() {
-	# Remove unwanted LINGUAS:
-	local LINGUA
-	local LNGDIR="${D}/opt/opera/share/opera/locale"
-	einfo "Keeping these locales: ${LINGUAS}."
-	for LINGUA in ${MY_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}"
-		fi
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-	if [[ ! -d ${S} ]]; then
-		cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
-		S="$(pwd)"
-		einfo "Setting WORKDIR to ${S}"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-simplify-desktop.patch"
-	epatch "${FILESDIR}/${PN}-freedesktop.patch"
-
-	# bug #181300:
-	if use elibc_FreeBSD; then
-		epatch "${FILESDIR}/${PN}-10.00-pluginpath-fbsd.patch"
-	else
-		epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
-	fi
-
-	sed -i 	-e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
-		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
-		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-		install.sh || die "sed failed"
-}
-
-src_configure() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a configure script exists.
-	true
-}
-
-src_compile() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a Makefile exists.
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-
-	# Opera's native installer.
-	./install.sh --prefix="${D}"/opt/opera || die "install.sh failed"
-
-	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
-
-	# Adapt desktop file to Gnome when needed
-	use gnome && sed -i -e s:"GenericName\[":"Comment\[": "${D}"/usr/share/applications/opera.desktop
-
-	# Install a symlink /usr/bin/opera
-	dodir /usr/bin
-	dosym /opt/opera/bin/opera /usr/bin/opera
-
-	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
-
-	# Add the Opera man dir to MANPATH:
-	insinto /etc/env.d
-	echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera
-
-	[[ -z MY_LINGUAS ]] || opera_linguas
-}
-
-pkg_postinst() {
-	use gnome && gnome2_pkg_postinst
-
-	elog "To change the UI language, choose [Tools] -> [Preferences], open the"
-	elog "[General] tab, click on [Details...] then [Choose...] and point the"
-	elog "file chooser at /opt/opera/share/opera/locale/, then enter the"
-	elog "directory for the language you want and [Open] the .lng file."
-
-	elog
-	elog "To use the spellchecker (USE=spell) for languages other than English, do:"
-	elog " emerge app-dicts/myspell-[your language]"
-	elog " mkdir \${HOME}/.opera/dictionaries"
-	elog " cd \${HOME}/.opera/dictionaries"
-	elog " ln -s /usr/share/myspell/*.{aff,dic} ."
-	elog "A future release of Opera 10 should remedy this inconvenience."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	elog
-	elog "The current Opera builds may still have issues with plugins, notably"
-	elog "www-plugins/adobe-flash. See also https://bugs.gentoo.org/198162"
-}
-
-pkg_postrm() {
-	use gnome && gnome2_pkg_postrm
-}
diff --git a/www-client/opera/opera-10.00_pre4394.ebuild b/www-client/opera/opera-10.00_pre4394.ebuild
deleted file mode 100644
index 0e2654cde0a3..000000000000
--- a/www-client/opera/opera-10.00_pre4394.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4394.ebuild,v 1.3 2009/07/09 18:57:05 jer Exp $
-
-EAPI="2"
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-10.00"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RESTRICT="mirror strip test"
-
-IUSE="elibc_FreeBSD gnome ia32 qt-static qt3"
-MY_LINGUAS="be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka ko lt mk nb nl nn pl pt pt-BR ru sv ta te tr uk zh-CN zh-TW"
-
-for MY_LINGUA in ${MY_LINGUAS}; do
-	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
-done
-
-O_U="http://snapshot.opera.com/unix/snapshot-${P##*_pre}/"
-O_P="${P/_pre/-}"
-
-SRC_URI="
-	qt-static? (
-		ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-		x86? (
-			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-			)
-		amd64? (
-			ia32? (
-				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-			)
-			!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-		)
-	)
-	!qt-static? (
-		ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-		x86? (
-			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-		)
-		amd64? (
-			ia32? (
-				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-			)
-			!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-		)
-	)
-	x86-fbsd? ( ${O_U}intel-freebsd/${O_P}.freebsd6-shared-qt3.i386.tar.bz2 )
-	"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="
-	media-libs/jpeg
-	media-libs/libexif
-	>=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
-	x86? (
-		qt-static? (
-			!qt3? (
-				x11-libs/libXinerama
-				x11-libs/qt-core
-				x11-libs/qt-gui
-			)
-		)
-		!qt-static? (
-			qt3? ( =x11-libs/qt-3*[-immqt] )
-			!qt3? (
-				x11-libs/libXinerama
-				x11-libs/qt-core
-				x11-libs/qt-gui
-			)
-		)
-	)
-	ppc? ( =x11-libs/qt-3*[-immqt] )
-	amd64? (
-		ia32? (
-			qt-static? (
-				!qt3? (
-					x11-libs/libXinerama
-					x11-libs/qt-core
-					x11-libs/qt-gui
-				)
-			)
-			!qt-static? ( =x11-libs/qt-3*[-immqt] )
-		)
-		!ia32? ( =x11-libs/qt-3*[-immqt] )
-	)
-	x86-fbsd? ( =x11-libs/qt-3*[-immqt] )
-	"
-
-opera_linguas() {
-	# Remove unwanted LINGUAS:
-	local LINGUA
-	local LNGDIR="${D}/opt/opera/share/opera/locale"
-	einfo "Keeping these locales: ${LINGUAS}."
-	for LINGUA in ${MY_LINGUAS}; do
-		if ! use linguas_${LINGUA/-/_}; then
-			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
-			rm -r "${LINGUA}"
-		fi
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-	if [[ ! -d ${S} ]]; then
-		cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
-		S="$(pwd)"
-		einfo "Setting WORKDIR to ${S}"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-simplify-desktop.patch"
-	epatch "${FILESDIR}/${PN}-freedesktop.patch"
-
-	# bug #181300:
-	if use elibc_FreeBSD; then
-		epatch "${FILESDIR}/${PN}-10.00-pluginpath-fbsd.patch"
-	else
-		epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
-	fi
-
-	sed -i 	-e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
-		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
-		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-		install.sh || die "sed failed"
-}
-
-src_configure() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a configure script exists.
-	true
-}
-
-src_compile() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a Makefile exists.
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-
-	# Opera's native installer.
-	./install.sh --prefix="${D}"/opt/opera || die "install.sh failed"
-
-	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
-
-	# Adapt desktop file to Gnome when needed
-	use gnome && sed -i -e s:"GenericName\[":"Comment\[": "${D}"/usr/share/applications/opera.desktop
-
-	# Install a symlink /usr/bin/opera
-	dodir /usr/bin
-	dosym /opt/opera/bin/opera /usr/bin/opera
-
-	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
-
-	# Add the Opera man dir to MANPATH:
-	insinto /etc/env.d
-	echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera
-
-	[[ -z MY_LINGUAS ]] || opera_linguas
-}
-
-pkg_postinst() {
-	use gnome && gnome2_pkg_postinst
-
-	elog "To change the UI language, choose [Tools] -> [Preferences], open the"
-	elog "[General] tab, click on [Details...] then [Choose...] and point the"
-	elog "file chooser at /opt/opera/share/opera/locale/, then enter the"
-	elog "directory for the language you want and [Open] the .lng file."
-
-	elog
-	elog "To use the spellchecker (USE=spell) for languages other than English, do:"
-	elog " emerge app-dicts/myspell-[your language]"
-	elog " mkdir \${HOME}/.opera/dictionaries"
-	elog " cd \${HOME}/.opera/dictionaries"
-	elog " ln -s /usr/share/myspell/*.{aff,dic} ."
-	elog "A future release of Opera 10 should remedy this inconvenience."
-
-	if use elibc_FreeBSD; then
-		elog
-		elog "To improve shared memory usage please set:"
-		elog "$ sysctl kern.ipc.shm_allow_removed=1"
-	fi
-
-	elog
-	elog "The current Opera builds may still have issues with plugins, notably"
-	elog "www-plugins/adobe-flash. See also https://bugs.gentoo.org/198162"
-}
-
-pkg_postrm() {
-	use gnome && gnome2_pkg_postrm
-}
diff --git a/www-client/opera/opera-10.00_pre4340.ebuild b/www-client/opera/opera-10.00_pre4492.ebuild
index 5bcea5bfc9e3..27069c07ff4d 100644
--- a/www-client/opera/opera-10.00_pre4340.ebuild
+++ b/www-client/opera/opera-10.00_pre4492.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4340.ebuild,v 1.4 2009/07/09 18:57:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4492.ebuild,v 1.1 2009/07/17 15:29:23 jer Exp $
 
 EAPI="2"
 
@@ -16,47 +16,48 @@ LICENSE="OPERA-10.00"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 RESTRICT="mirror strip test"
+QA_DT_HASH="opt/${PN}/.*"
 
-IUSE="elibc_FreeBSD gnome ia32 qt-static qt3"
-MY_LINGUAS="be bg cs da de el en en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka ko lt mk nb nl nn pl pt pt-BR ru sv ta te tr uk zh-CN zh-TW"
+IUSE="elibc_FreeBSD gnome ia32 qt3 qt-static"
+MY_LINGUAS="zh-CN zh-HK zh-TW"
 
 for MY_LINGUA in ${MY_LINGUAS}; do
 	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
 done
 
-O_U="http://snapshot.opera.com/unix/snapshot-${P##*_pre}/"
-O_P="${P/_pre/-}"
+O_U="mirror://opera/"
+
+# 1) Please check for missing (qt3/qt-static) builds
+# 2) and only then update the build number manually
+OPERABUILD="b2"
+O_P="${P/_pre*/}-${OPERABUILD}"
 
 SRC_URI="
-	qt-static? (
-		ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-		x86? (
-			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
+	amd64? (
+		!ia32? (
+			qt-static? ( ${O_U}linux/1000b2/beta2/en/x86_64/${O_P}.gcc4-bundled-qt4.x86_64.tar.bz2 )
+			!qt-static? (
+				qt3? ( ${O_U}linux/1000b2/beta2/en/x86_64/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+				!qt3? ( ${O_U}linux/1000b2/beta2/en/x86_64/${O_P}.gcc4-qt4.x86_64.tar.bz2 )
 			)
-		amd64? (
-			ia32? (
-				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
-				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
+		)
+		ia32? (
+			qt-static? ( ${O_U}linux/1000b2/beta2/en/i386/${O_P}.gcc4-bundled-qt4.i386.tar.bz2 )
+			!qt-static? (
+				qt3? ( ${O_U}linux/1000b2/beta2/en/i386/shared/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+				!qt3? ( ${O_U}linux/1000b2/beta2/en/i386/${O_P}.gcc4-qt4.i386.tar.bz2 )
 			)
-			!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
 		)
 	)
-	!qt-static? (
-		ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
-		x86? (
-			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-		)
-		amd64? (
-			ia32? (
-				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
-			)
-			!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+	ppc? ( ${O_U}linux/1000b2/beta2/en/ppc/shared/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
+	x86? (
+		qt-static? ( ${O_U}linux/1000b2/beta2/en/i386/${O_P}.gcc4-bundled-qt4.i386.tar.bz2 )
+		!qt-static? (
+			qt3? ( ${O_U}linux/1000b2/beta2/en/i386/shared/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+			!qt3? ( ${O_U}linux/1000b2/beta2/en/i386/${O_P}.gcc4-qt4.i386.tar.bz2 )
 		)
 	)
-	x86-fbsd? ( ${O_U}intel-freebsd/${O_P}.freebsd5-static-qt3.i386.tar.bz2 )
+	x86-fbsd? ( ${O_U}unix/freebsd/1000b2/en/intel/shared/${O_P}-freebsd7-shared-qt3.i386.tar.bz2 )
 	"
 
 DEPEND=">=sys-apps/sed-4"
@@ -75,25 +76,31 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libSM
 	x11-libs/libICE
-	x86? (
-		qt-static? (
-			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
-		)
-		!qt-static? (
-			qt3? ( =x11-libs/qt-3*[-immqt] )
-			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
-		)
-	)
-	ppc? ( =x11-libs/qt-3*[-immqt] )
 	amd64? (
 		ia32? (
-			qt-static? (
+			qt-static? ( media-libs/nas )
+			!qt-static? (
+				qt3? ( =x11-libs/qt-3*[-immqt] )
+				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+			)
+		)
+		!ia32? (
+			qt-static? ( media-libs/nas )
+			!qt-static? (
+				qt3? ( =x11-libs/qt-3*[-immqt] )
 				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
 			)
-			!qt-static? ( =x11-libs/qt-3*[-immqt] )
 		)
-		!ia32? ( =x11-libs/qt-3*[-immqt] )
 	)
+	ppc? ( =x11-libs/qt-3*[-immqt] )
+	x86? (
+		qt-static? ( media-libs/nas )
+		!qt-static? (
+			qt3? ( =x11-libs/qt-3*[-immqt] )
+			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+		)
+	)
+	x86-fbsd? ( =x11-libs/qt-3*[-immqt] )
 	"
 
 opera_linguas() {
@@ -109,6 +116,12 @@ opera_linguas() {
 	done
 }
 
+pkg_setup() {
+	elog "${WARN}If you seek support, please file a bug report at${NORMAL}"
+	elog "${WARN}https://bugs.gentoo.org and post the output of${NORMAL}"
+	elog "${WARN} \`emerge --info =${CATEGORY}/${P}'${NORMAL}"
+}
+
 src_unpack() {
 	unpack ${A}
 	if [[ ! -d ${S} ]]; then
@@ -130,24 +143,17 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
 	fi
 
-	sed -i 	-e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
+	sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
 		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
 		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
 		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
 		install.sh || die "sed failed"
 }
 
-src_configure() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a configure script exists.
-	true
-}
-
-src_compile() {
-	# This workaround is sadly needed because gnome2.eclass doesn't check
-	# whether a Makefile exists.
-	true
-}
+# These workarounds are sadly needed because gnome2.eclass doesn't check
+# whether a configure/Makefile script exists.
+src_configure() { :; }
+src_compile() { :; }
 
 src_install() {
 	# Prepare installation directories for Opera's installer script.