Really remove the _p* versions.

Package-Manager: portage-2.1.5_rc3

4 files changed, 6 insertions, 369 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 405e3be822e7..e37249d23991 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.220 2008/04/24 18:11:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.221 2008/04/24 18:28:20 jer Exp $
+
+  24 Apr 2008; Jeroen Roovers <jer@gentoo.org>
+  -opera-9.50_beta2_p1904.ebuild, -opera-9.50_beta2_p1929.ebuild:
+  Really remove the _p* versions.
 
 *opera-9.50_beta2_pre1929 (24 Apr 2008)
 *opera-9.50_beta2_pre1904 (24 Apr 2008)
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index d0e1cc3abff2..2541dcef4585 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -37,9 +37,7 @@ DIST opera-9.50b2-20080422.9-static-qt.i386-en.tar.gz 8612688 RMD160 456eb116213
 EBUILD opera-9.27.ebuild 5935 RMD160 03a15aa0e98ec83b1f4561f94079d5b22a8575eb SHA1 9c707ae173eb1d4273102c028418222c1d097ec5 SHA256 b5d4c356cf5dd046b6250eca0289527348a30fc275c1ab9a928a2c801f4a6d4f
 EBUILD opera-9.50_beta1.ebuild 5895 RMD160 c901f78917d4159de6eada313f67c707e604eff1 SHA1 b6623366cb2f89abe90bf2a799fd8d1e06140723 SHA256 7918ae8eab27002f51a91ea4f9240edaf48619bf5610709a4aa1c6749bf055fc
 EBUILD opera-9.50_beta2.ebuild 5490 RMD160 4e15164256893bac4346d8424e00eee53833dc9c SHA1 b04bd2e7c2df281cc4cb5aa5410c104ddc82451f SHA256 3c321ef0b60eb3bf763fe20dbb2b30c9ddcf08c984b7a65514c1aa50a217cbe0
-EBUILD opera-9.50_beta2_p1904.ebuild 5515 RMD160 d2041099fb34dff82f1db395bf15e9d1ab591e0f SHA1 8a5c276e3c15f0813bd4908805bbc04505b075df SHA256 b6cdf3f8c61f4b76d95a36a8a9e6abca1ad8d10e6080405b03634eedad9c101c
-EBUILD opera-9.50_beta2_p1929.ebuild 5365 RMD160 f848fb233e598724c551fddb2d287d2492fb83fb SHA1 f0a08ba5fde44abb275e86a5d7cf90e89cb05323 SHA256 016d42d77fafdb78859ecd0dc41e8142992d20adbb4cfded08879a4fdf040366
 EBUILD opera-9.50_beta2_pre1904.ebuild 5517 RMD160 f31656a7bfac0c7fe1f3f189afff0d0f30db01c5 SHA1 5b78a27ba06ea5a77e5bdf6ffc5ce4e5032c4da2 SHA256 fad7457a9d2e3f1cf4cb0a6b53f067b1cb77ed8058f2d91632e3d1fad7f8859c
 EBUILD opera-9.50_beta2_pre1929.ebuild 5367 RMD160 3490f6a2f9227d9f22fffe04fee6dfb8e709df58 SHA1 f5289550b82c41b850186dd9505278ad67112db8 SHA256 a4a1b517748c09a534f8128dd4326a4df6724e0d1ab81ee0eae3d3d705259ec1
-MISC ChangeLog 46761 RMD160 d10aa557459d02cb7a34a3925ca2629aac4696ce SHA1 1206b5502b04b09d61e833b386ba2e4bbeec938c SHA256 28aa65c8d2de07a1f81a38e32d1b0e37916532443992a0eff7af534b9494bd7c
+MISC ChangeLog 46909 RMD160 f2d8469f9653ede788c248faecb0f53a1ec6301b SHA1 dfe118295e3ae2dbbd267d99a7c04cea365fc01a SHA256 7bf1b6c7c69aec52dc35f4e43e574c8cf61f49b074a503913b7ba46a19498046
 MISC metadata.xml 371 RMD160 9ce4bac73fb1a6fb95290774b2a6a09e23be1998 SHA1 dde7f60d2a566274f7997a7d691922a1278a3558 SHA256 192dad9e5e302573e365663703055daac67ab3d40cb1e081cab9927bbc1ddbaa
diff --git a/www-client/opera/opera-9.50_beta2_p1904.ebuild b/www-client/opera/opera-9.50_beta2_p1904.ebuild
deleted file mode 100644
index 77409ea72740..000000000000
--- a/www-client/opera/opera-9.50_beta2_p1904.ebuild
+++ /dev/null
@@ -1,183 +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.50_beta2_p1904.ebuild,v 1.1 2008/04/09 16:53: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 ~x86 ~x86-fbsd"
-
-IUSE="qt-static spell gnome elibc_FreeBSD"
-RESTRICT="mirror strip test"
-
-O_LNG=""
-O_SUFF="1904"
-O_VER="9.50-20080408"
-
-O_URI="http://snapshot.opera.com/unix/snapshot-${O_SUFF}/"
-
-SRC_URI="
-	amd64? ( ${O_URI}x86_64-linux/${PN}-${O_VER}.2-shared-qt.x86_64${O_LNG}-${O_SUFF}.tar.bz2 )
-	qt-static? (
-		ppc? ( ${O_URI}ppc-linux/${PN}-${O_VER}.1-static-qt.ppc${O_LNG}-${O_SUFF}.tar.bz2 )
-		x86? ( ${O_URI}intel-linux/${PN}-${O_VER}.9-static-qt.i386${O_LNG}-${O_SUFF}.tar.bz2 )
-		x86-fbsd? ( ${O_URI}intel-freebsd/${PN}-${O_VER}.5-static-qt.i386.freebsd${O_LNG}-${O_SUFF}.tar.bz2 )
-		)
-	!qt-static? (
-		ppc? ( ${O_URI}ppc-linux/${PN}-${O_VER}.6-shared-qt.ppc${O_LNG}-${O_SUFF}.tar.bz2 )
-		x86? ( ${O_URI}intel-linux/${PN}-${O_VER}.6-shared-qt.i386${O_LNG}-${O_SUFF}.tar.bz2 )
-		x86-fbsd? ( ${O_URI}intel-freebsd/${PN}-${O_VER}.3-shared-qt.i386.freebsd${O_LNG}-${O_SUFF}.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
-	!qt-static? ( =x11-libs/qt-3* )
-	amd64? ( =x11-libs/qt-3* )
-	spell? ( app-text/aspell )
-	x86-fbsd? ( =virtual/libstdc++-3* )"
-
-S="${WORKDIR}/${A/.tar.bz2/}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-9.00-install.patch"
-
-	# bug #181300:
-	use elibc_FreeBSD || epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch"
-	use elibc_FreeBSD && epatch "${FILESDIR}/${PN}-9.50-pluginpath-fbsd.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.
-	./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=$O_VER.1
-		else
-			use sparc && DIR=$O_VER.2 || DIR=$O_VER.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
-}
-
-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 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
-}
diff --git a/www-client/opera/opera-9.50_beta2_p1929.ebuild b/www-client/opera/opera-9.50_beta2_p1929.ebuild
deleted file mode 100644
index e375ad922891..000000000000
--- a/www-client/opera/opera-9.50_beta2_p1929.ebuild
+++ /dev/null
@@ -1,182 +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.50_beta2_p1929.ebuild,v 1.1 2008/04/17 18:03:11 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 ~x86 ~x86-fbsd"
-
-IUSE="qt-static spell gnome elibc_FreeBSD"
-RESTRICT="mirror strip test"
-
-O_LNG=""
-O_SUFF="1929"
-O_VER="9.50-20080417"
-
-O_URI="http://snapshot.opera.com/unix/snapshot-${O_SUFF}/"
-
-SRC_URI="
-	amd64? ( ${O_URI}x86_64-linux/${PN}-${O_VER}.2-shared-qt.x86_64${O_LNG}-${O_SUFF}.tar.bz2 )
-	ppc? ( ${O_URI}ppc-linux/${PN}-${O_VER}.6-shared-qt.ppc${O_LNG}-${O_SUFF}.tar.bz2 )
-	x86-fbsd? ( ${O_URI}intel-freebsd/${PN}-${O_VER}.4-shared-qt.i386.freebsd${O_LNG}-${O_SUFF}.tar.bz2 )
-	qt-static? (
-		x86? ( ${O_URI}intel-linux/${PN}-${O_VER}.9-static-qt.i386${O_LNG}-${O_SUFF}.tar.bz2 )
-		)
-	!qt-static? (
-		x86? ( ${O_URI}intel-linux/${PN}-${O_VER}.6-shared-qt.i386${O_LNG}-${O_SUFF}.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
-	!qt-static? ( =x11-libs/qt-3* )
-	amd64? ( =x11-libs/qt-3* )
-	ppc? ( =x11-libs/qt-3* )
-	spell? ( app-text/aspell )
-	x86-fbsd? ( =x11-libs/qt-3* =virtual/libstdc++-3* )"
-
-S="${WORKDIR}/${A/.tar.bz2/}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-9.00-install.patch"
-
-	# bug #181300:
-	use elibc_FreeBSD || epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch"
-	use elibc_FreeBSD && epatch "${FILESDIR}/${PN}-9.50-pluginpath-fbsd.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.
-	./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=$O_VER.1
-		else
-			use sparc && DIR=$O_VER.2 || DIR=$O_VER.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
-}
-
-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 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
-}