drop old version; fix DEPEND/RDEPEND split (bugs #221315, #221445, #221579)

Package-Manager: portage-2.1.4.4

4 files changed, 15 insertions, 131 deletions

diff --git a/app-emulation/pearpc/ChangeLog b/app-emulation/pearpc/ChangeLog
index 78b21202eb7f..2cbc176e5e19 100644
--- a/app-emulation/pearpc/ChangeLog
+++ b/app-emulation/pearpc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/pearpc
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/pearpc/ChangeLog,v 1.20 2008/07/28 18:57:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/pearpc/ChangeLog,v 1.21 2008/08/31 05:01:16 mr_bones_ Exp $
+
+  31 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org> -pearpc-0.3.1.ebuild,
+  pearpc-0.4.ebuild:
+  drop old version; fix DEPEND/RDEPEND split (bugs #221315, #221445, #221579)
 
   28 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-emulation/pearpc/Manifest b/app-emulation/pearpc/Manifest
index 887c8579cdcf..95d655fba29c 100644
--- a/app-emulation/pearpc/Manifest
+++ b/app-emulation/pearpc/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pearpc-0.4-configure.patch 1156 RMD160 cd24c87547ae8e1c5d607e1fd9519c521959ff55 SHA1 f1d1412dfbc169440ac1d7b20a272295eb910c5b SHA256 e1c70c701305ccbb556f63709e4a8b73e73717451560a40e31c5f9c4b8c07416
 DIST createdisk.py 383 RMD160 ea30bd2d2c68754173e59d5423a68cfc738faff5 SHA1 529a7da0d0601be62055a52cc86e9d0d54925ac0 SHA256 59c41b98916df1a6a69cbc1d7e835a5662b8c08551893b22846d4a29accc6f6a
-DIST pearpc-0.3.1.tar.bz2 641965 RMD160 2a901d3da7086598e86af2b4bf1b549de7b48a8b SHA1 dd72099397045dfb5b2b74bc8119ca54b7bcfeba SHA256 685c7ccf5f2a029e5e698c8cbb2fde65a60b0d9596e1f25158177e3b92184cec
 DIST pearpc-0.4.tar.bz2 687776 RMD160 84c831b3ede69721d0fa48d71a30ee0e7ec512fc SHA1 1cfa4f19f9a1de73c209a38d8fda174c0ebe6ad5 SHA256 30e6fdc1e9b01cdcc263c3082ebf50013d886ea6f31d37b00c1ba8bc0233b182
-EBUILD pearpc-0.3.1.ebuild 2655 RMD160 f1b71fd794fd692c43eb488924a9146d49e01993 SHA1 f536b6633cfd235a5b859e80383dca95ac6aca13 SHA256 937d2568b4c2f099866ff39500cd8592391c8a59fef907fd98c19e85ce630086
-EBUILD pearpc-0.4.ebuild 2240 RMD160 37381de6e0cb362f7c965ef227b4392757587aa2 SHA1 0755ed7027af4eccd68ad346605ee73bbac08b6f SHA256 fed844bee8f2cef463d415c5918c5808e9a419ed01b5c90105e739260316e286
-MISC ChangeLog 2660 RMD160 0d496354a845844e1143f75dbaf5ee9e61ceab9e SHA1 98b4f2d4a5f7f0ce4b487ada631ca5458352ae1d SHA256 2a14d4089868d9b2c3fb979bdf227655f8e034cfa1aa1247e117287411221fa3
+EBUILD pearpc-0.4.ebuild 2228 RMD160 b28c257ae4b2fe68e4c608519e8fb0afedb3cc0b SHA1 026a64878df39dc5ca9bc27f4c10bc9c5eba7cd8 SHA256 bb1add099da6ab24ac66fd885c9db63cd28204bc9c185927b213e7b2767e08fd
+MISC ChangeLog 2840 RMD160 47fb581b9b06a85bcde57c49de4525abc9598747 SHA1 218afb95610d21f4b59db4bce3fa93ef0d96aa5d SHA256 1d451dcef62a74f5e907cfc6bdebf61459eb518080b759fe047b6f332b1b41ad
 MISC metadata.xml 352 RMD160 cd9a31b489dfcbd3b0db3847b7be81d39c50a287 SHA1 4d691a0d133f034a1a8a06bdadf515e3d8328b95 SHA256 a9dbe0a943497418118a1e32867d935607bc66fcfec121c49317aba31776564a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiOFrgACgkQoeSe8B0zEfy+pQCfZqfZ1nTGlHy9A8SEB79oelim
-XzwAnRo/n3+Ce6iF1rZPTRgyzvzLW0z0
-=zBBh
------END PGP SIGNATURE-----
diff --git a/app-emulation/pearpc/pearpc-0.3.1.ebuild b/app-emulation/pearpc/pearpc-0.3.1.ebuild
deleted file mode 100644
index 9f0a9e196904..000000000000
--- a/app-emulation/pearpc/pearpc-0.3.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/pearpc/pearpc-0.3.1.ebuild,v 1.11 2008/06/12 23:16:56 darkside Exp $
-
-inherit flag-o-matic
-
-IUSE="debug jit sdl"
-#IUSE="debug qt gtk jit sdl"
-
-DESCRIPTION="PowerPC Architecture Emulator"
-HOMEPAGE="http://pearpc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pearpc/${P}.tar.bz2
-	http://pearpc.sf.net/createdisk.py"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-DEPEND="x86? ( dev-lang/nasm )
-	x11-libs/libXt"
-
-RDEPEND="media-libs/libmng
-	media-libs/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	media-libs/freetype
-	sdl? ( media-libs/libsdl )"
-#	gtk? ( >=x11-libs/gtk-2.0 )
-#	qt? ( >=x11-libs/qt-3.1.1 )"
-
-DEFAULT_TO_X11=0
-
-pkg_setup() {
-
-	append-ldflags -Wl,-z,now
-
-#	if (use qt && use sdl) || (use qt && use gtk) || (use gtk && sdl) || (use gtk && use qt && use sdl); then
-#		ewarn
-#		ewarn "More than one frontend USE flags enabled, defaulting to X11 support."
-#		ewarn
-#		DEFAULT_TO_X11=1
-#	fi
-}
-
-src_compile() {
-	local myconf
-	myconf="--enable-release"
-
-	use jit && myconf="${myconf} --enable-cpu=jitc_x86"
-
-	if use debug; then
-		myconf="${myconf} --enable-debug"
-	else
-		myconf="${myconf} --disable-debug"
-	fi
-
-	if [ $DEFAULT_TO_X11 = 1 ]; then
-		myconf="${myconf} --enable-ui=x11"
-	else
-		if use sdl; then
-			myconf="${myconf} --enable-ui=sdl"
-#		elif use qt; then
-#			myconf="${myconf} --enable-ui=qt"
-#		elif use gtk; then
-#			myconf="${myconf} --enable-ui=gtk"
-		else
-			myconf="${myconf} --enable-ui=x11"
-		fi
-	fi
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin src/ppc
-	dodoc ChangeLog AUTHORS README TODO
-
-	dodir /usr/share/${P}
-	insinto /usr/share/${P}
-	doins scripts/ifppc_down scripts/ifppc_up scripts/ifppc_up.setuid scripts/ifppc_down.setuid
-	doins video.x
-	fperms u+s /usr/share/${P}/ifppc_up.setuid /usr/share/${P}/ifppc_down.setuid
-
-	insinto /usr/share/doc/${P}
-	sed -i -e "s:video.x:/usr/share/${P}/video.x:g" ppccfg.example
-	doins ppccfg.example
-
-	dodir /usr/share/${P}/scripts
-	insinto /usr/share/${P}/scripts
-	doins "${DISTDIR}"/createdisk.py
-}
-
-pkg_postinst() {
-	echo
-	elog "You will need to update your configuration files to point"
-	elog "to the new location of video.x, which is now"
-	elog "/usr/share/${P}/video.x"
-	echo
-	elog "To create disk images for PearPC, you can use the Python"
-	elog "script located at: /usr/share/${P}/scripts/createdisk.py"
-	elog "Usage: createdisk.py <image name> <image size>"
-	echo
-	elog "Also, be sure to check /usr/share/doc/${P}/ppccfg.example"
-	elog "for new configuration options."
-	echo
-}
diff --git a/app-emulation/pearpc/pearpc-0.4.ebuild b/app-emulation/pearpc/pearpc-0.4.ebuild
index bff58cedb24f..7af6fdd49e34 100644
--- a/app-emulation/pearpc/pearpc-0.4.ebuild
+++ b/app-emulation/pearpc/pearpc-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/pearpc/pearpc-0.4.ebuild,v 1.8 2008/06/12 22:57:15 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/pearpc/pearpc-0.4.ebuild,v 1.9 2008/08/31 05:01:16 mr_bones_ Exp $
 
 inherit eutils flag-o-matic linux-info linux-mod
 
@@ -14,17 +14,16 @@ SLOT="0"
 KEYWORDS="-amd64 ~x86"
 IUSE="debug jit X sdl"
 
-DEPEND="virtual/libc
-	sys-devel/flex
-	sys-devel/bison
-	x86? ( dev-lang/nasm )
-	jit? ( dev-lang/nasm )
+RDEPEND="sys-apps/net-tools
+	sdl? ( >=media-libs/libsdl-1.2.0 )
 	X? ( x11-libs/libX11 )
-	sdl? ( >=media-libs/libsdl-1.2.0 )"
-RDEPEND="${DEPEND}
-	sys-apps/net-tools
 	net-firewall/iptables
 	net-misc/bridge-utils"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	x86? ( dev-lang/nasm )
+	jit? ( dev-lang/nasm )"
 
 src_unpack() {
 	unpack ${A}