Silly me (bug #127200 comment #23 :).

(Portage version: 2.1.2.9)

3 files changed, 4 insertions, 191 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 1debf7513b48..a92b30e14a88 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,9 @@
 # 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.114 2007/07/26 13:17:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.115 2007/07/26 15:49:11 jer Exp $
+
+  26 Jul 2007; Jeroen Roovers <jer@gentoo.org> -opera-9.22-r1.ebuild:
+  Silly me (bug #127200 comment #23 :).
 
 *opera-9.22-r1 (26 Jul 2007)
 
diff --git a/www-client/opera/files/digest-opera-9.22-r1 b/www-client/opera/files/digest-opera-9.22-r1
deleted file mode 100644
index 370f4dc0b8d9..000000000000
--- a/www-client/opera/files/digest-opera-9.22-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-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/opera-9.22-r1.ebuild b/www-client/opera/opera-9.22-r1.ebuild
deleted file mode 100644
index 022e0eb124cd..000000000000
--- a/www-client/opera/opera-9.22-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# 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-r1.ebuild,v 1.1 2007/07/26 13:17:03 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
-	>=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}/${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
-}
-
-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
-
-	# 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
-}