Remove old (bug #235298). Squash metadata.xml tabbing.

(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7-JeR i686)

3 files changed, 14 insertions, 253 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 7d6f4172a58a..12917560865e 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.277 2008/08/25 18:28:44 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.278 2008/08/25 19:16:59 jer Exp $
+
+  25 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml,
+  -opera-9.51.ebuild:
+  Remove old (bug #235298). Squash metadata.xml tabbing.
 
   25 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org> opera-9.52.ebuild:
   ppc stable, bug #235298
diff --git a/www-client/opera/metadata.xml b/www-client/opera/metadata.xml
index 401aaa187e03..af9fb40cd035 100644
--- a/www-client/opera/metadata.xml
+++ b/www-client/opera/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
-	<longdescription>
+<herd>no-herd</herd>
+<maintainer>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+<longdescription>
 Opera is a graphical Web browser available on several platforms. The desktop
 version runs on GNU/Linux, FreeBSD, and Solaris. Versions for Macintosh and
 Windows are also available.
 </longdescription>
 <use>
-	<flag name='ia32'>Install 32-bit binaries instead of 64-bit binaries</flag>
-	<flag name='qt-static'>Install binaries statically linked to Qt</flag>
-	<flag name='qt3-static'>Install binaries statically linked to Qt 3</flag>
+<flag name='ia32'>Install 32-bit binaries instead of 64-bit binaries</flag>
+<flag name='qt-static'>Install binaries statically linked to Qt</flag>
+<flag name='qt3-static'>Install binaries statically linked to Qt 3</flag>
 </use>
 </pkgmetadata>
diff --git a/www-client/opera/opera-9.51.ebuild b/www-client/opera/opera-9.51.ebuild
deleted file mode 100644
index 0216fab37d7e..000000000000
--- a/www-client/opera/opera-9.51.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.51.ebuild,v 1.8 2008/07/09 13:38:15 jer Exp $
-
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="A standards-compliant graphical Web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-9.0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-
-RESTRICT="strip test"
-
-IUSE="elibc_FreeBSD gnome ia32 qt-static qt3-static spell"
-MY_LINGUAS="be bg cs da de el en en-GB es-ES es-LA fi fr fr-CA fy hi
-hr hu it ja ka ko lt mk nb nl nn pl pt pt-BR ru sv tr zh-CN zh-TW"
-
-for MY_LINGUA in ${MY_LINGUAS}; do
-	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
-done
-
-O_URI="mirror://opera/"
-O_FTP="/951/final/en/"
-O_SUFF="2061"
-
-SRC_URI="
-	ppc? ( ${O_URI}linux${O_FTP}ppc/shared/${P}.gcc4-shared-qt3.ppc.tar.bz2 )
-	x86-fbsd? (
-		qt-static? ( ${O_URI}unix/freebsd${O_FTP}intel/static/${P}-freebsd5-static-qt3.i386.tar.bz2 )
-		!qt-static? ( ${O_URI}unix/freebsd${O_FTP}intel/shared/${P}-freebsd5-shared-qt3.i386.tar.bz2 )
-	)
-	qt-static? (
-		qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}linux${O_FTP}i386/static/${P}.gcc4-static-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}linux${O_FTP}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}linux${O_FTP}i386/static/${P}.gcc4-static-qt3.i386.tar.bz2 )
-		)
-		!qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}linux${O_FTP}i386/${P}.gcc4-qt4.i386.tar.bz2 )
-				!ia32? ( ${O_URI}linux${O_FTP}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}linux${O_FTP}i386/${P}.gcc4-qt4.i386.tar.bz2 )
-		)
-	)
-	!qt-static? (
-		qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}linux${O_FTP}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
-		)
-		!qt3-static? (
-			amd64? (
-				ia32? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}linux${O_FTP}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
-			)
-			x86? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
-		)
-	)
-	"
-
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="media-libs/libexif
-	media-libs/jpeg
-	>=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-static? ( =x11-libs/qt-3* ) ) )
-	amd64? (
-		ia32? ( app-emulation/emul-linux-x86-qtlibs )
-		!ia32? ( =x11-libs/qt-3* )
-	)
-	ppc? ( =x11-libs/qt-3* )
-	spell? ( app-text/aspell )
-	x86-fbsd? (
-		=virtual/libstdc++-3*
-		!qt-static? ( !qt3-static? ( =x11-libs/qt-3* ) )
-	)
-	"
-
-opera_cd() {
-	cd "${WORKDIR}"/${P}-${O_SUFF}* || die "failed to enter work directory"
-	S="$(pwd)"
-	einfo "Working in ${S}"
-}
-
-src_unpack() {
-	unpack ${A}
-	opera_cd
-
-	epatch "${FILESDIR}/${PN}-9.00-install.patch"
-
-	# bug #181300:
-	if use elibc_FreeBSD; then
-		epatch "${FILESDIR}/${PN}-9.50-pluginpath-fbsd.patch"
-	else
-		epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch"
-	fi
-
-	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() {
-	opera_cd
-	# 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
-
-	# Install the icons
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/opera.xpm
-
-	local res
-	for res in 16x16 22x22 32x32 48x48 ; do
-		insinto /usr/share/icons/hicolor/${res}/apps
-		doins usr/share/icons/hicolor/${res}/apps/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=${P}.1
-		else
-			use sparc && DIR=${P}.2 || DIR=${P}.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
-
-	# Add the Opera man dir to MANPATH:
-	insinto /etc/env.d
-	echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera
-
-	# 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
-}
-
-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 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
-
-	elog "The Opera betas may still have issues with plugins, notably"
-	elog "net-www/netscape-flash. See also https://bugs.gentoo.org/198162"
-}
-
-pkg_postrm() {
-	use gnome && gnome2_pkg_postrm
-}