Cleanup

Package-Manager: portage-2.1.1_pre5-r1

6 files changed, 27 insertions, 44 deletions

diff --git a/app-emulation/qemu-softmmu/ChangeLog b/app-emulation/qemu-softmmu/ChangeLog
index b199edb04e42..128b754c76c7 100644
--- a/app-emulation/qemu-softmmu/ChangeLog
+++ b/app-emulation/qemu-softmmu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu-softmmu
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.24 2006/08/17 07:37:25 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.25 2006/08/17 08:09:42 lu_zero Exp $
+
+  17 Aug 2006; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.8.2.ebuild,
+  qemu-softmmu-0.8.2-r1.ebuild:
+  Remove stray bits from the older ebuild
 
 *qemu-softmmu-0.8.2-r1 (17 Aug 2006)
 
diff --git a/app-emulation/qemu-softmmu/Manifest b/app-emulation/qemu-softmmu/Manifest
index d6e4faffbded..3246287b8b8d 100644
--- a/app-emulation/qemu-softmmu/Manifest
+++ b/app-emulation/qemu-softmmu/Manifest
@@ -11,7 +11,6 @@ MD5 b3e7fd1797acd3ca68ffa4a31750d518 files/qemu-0.8.2-sparc-fp.patch 591
 RMD160 bbce6e754d32e8e5cb4c28e534b7a8ae27bee4b7 files/qemu-0.8.2-sparc-fp.patch 591
 SHA256 839166847b3b39fa481b49e27110aaf207067cc5acecaf55131d2ec31d92ad59 files/qemu-0.8.2-sparc-fp.patch 591
 DIST kqemu-0.7.2.tar.gz 79314 RMD160 cdb154d51eb616d6ad9924da0175276a655edba7 SHA1 39dda2566a9c47bfc5e76c76cf9aa41500d708f3 SHA256 4158b2c67603f5256a78d0065d715bde068a457aa58bbfef12dda20fe7f7ad8b
-DIST kqemu-1.3.0pre7.tar.gz 189920 RMD160 9f8e5dd7e1a901d939fc5e8b3be1a10e396f9ab3 SHA1 8d853bac016a1c78d7da22dea4b9a1619a1dadf3 SHA256 cf29505b3d07d5e31080aa677a4254f5770f273e9bd05ef2df956b87d248cead
 DIST qemu-0.8.0.20060329.tar.bz2 1325034 RMD160 a6ec15e1b08dd6e2dd88d953bfa31e3db1dc212e SHA256 4ccb27692ffaee119728442298da84198d6319de79a18d497d14604e140c3eb0
 DIST qemu-0.8.0.tar.gz 1497965 RMD160 3fc6da938f75364d0805ca0ecf8cb84a4b546dc7 SHA256 de388539ce86971a2cbe8474fca8b6160898c95772e3e6e08a7794d48db32a61
 DIST qemu-0.8.1.tar.gz 1623264 RMD160 04d163d4792bbea39fc0b1e52af124cdb7e907dc SHA1 72c943c24bed6aa066dcc3012b198c20f04aef30 SHA256 a1f83666f5c05eaee9bfc608a3a5034ad95d0fd3c99937bb399bf9235a6aa0c9
@@ -32,18 +31,18 @@ EBUILD qemu-softmmu-0.8.1.ebuild 2657 RMD160 8cc0ecdd505369b7e83fd258d3ff7b0ec6a
 MD5 2121a62301cd1069aed299801a6cd0e4 qemu-softmmu-0.8.1.ebuild 2657
 RMD160 8cc0ecdd505369b7e83fd258d3ff7b0ec6a5ee10 qemu-softmmu-0.8.1.ebuild 2657
 SHA256 ea3f39de2f13c8dc376299513b0231414fd3da6bd4cd01d4792329efb63420ad qemu-softmmu-0.8.1.ebuild 2657
-EBUILD qemu-softmmu-0.8.2-r1.ebuild 2898 RMD160 88c67878d2f41ab7267b1189e4a5e3ce4541fed1 SHA1 7480ff8886810c5d241baf969ecbdf90b05b6701 SHA256 df54cebb6867988db832bf0699caa1e8721b92ba4ba7fe4255cb9425d9dd88ef
-MD5 c64dc9dc52195cebaedd43df410b9652 qemu-softmmu-0.8.2-r1.ebuild 2898
-RMD160 88c67878d2f41ab7267b1189e4a5e3ce4541fed1 qemu-softmmu-0.8.2-r1.ebuild 2898
-SHA256 df54cebb6867988db832bf0699caa1e8721b92ba4ba7fe4255cb9425d9dd88ef qemu-softmmu-0.8.2-r1.ebuild 2898
-EBUILD qemu-softmmu-0.8.2.ebuild 2840 RMD160 2e9eb1568f09b7ade9bdcd88f2720f4e6ec4136c SHA1 aadb6b0d96680a9f1ac7f8f059ae65e122342cea SHA256 5b967476c478a4059c9ca220038e431af06f55f911f4bb253589a22fb0ee5af9
-MD5 cd22ceec657ab57f2230c565c4e5a904 qemu-softmmu-0.8.2.ebuild 2840
-RMD160 2e9eb1568f09b7ade9bdcd88f2720f4e6ec4136c qemu-softmmu-0.8.2.ebuild 2840
-SHA256 5b967476c478a4059c9ca220038e431af06f55f911f4bb253589a22fb0ee5af9 qemu-softmmu-0.8.2.ebuild 2840
-MISC ChangeLog 4742 RMD160 f34ff4c62f699b12bcd664a8fa011549240c2263 SHA1 7c89f044f349ee2ade8f0197f9a034f3baa83871 SHA256 b4826b0927da0a5347289252ef39eefd6ef7261ca70781bcbe7a3e93b82e6539
-MD5 556b1a89a9f0913cc93af4fb0d5caf82 ChangeLog 4742
-RMD160 f34ff4c62f699b12bcd664a8fa011549240c2263 ChangeLog 4742
-SHA256 b4826b0927da0a5347289252ef39eefd6ef7261ca70781bcbe7a3e93b82e6539 ChangeLog 4742
+EBUILD qemu-softmmu-0.8.2-r1.ebuild 2686 RMD160 072267b7990c05ebd3a1b41713b90525a53ac83c SHA1 81d22e76c2f74d0f144ed5adfd73d40d671774f3 SHA256 8d58ac4def3a2c743867bbe4558ddbc697503ebe51ee42eb579742e208ff8f29
+MD5 faa0f5c310ce4f1142ccbc28a4d367e3 qemu-softmmu-0.8.2-r1.ebuild 2686
+RMD160 072267b7990c05ebd3a1b41713b90525a53ac83c qemu-softmmu-0.8.2-r1.ebuild 2686
+SHA256 8d58ac4def3a2c743867bbe4558ddbc697503ebe51ee42eb579742e208ff8f29 qemu-softmmu-0.8.2-r1.ebuild 2686
+EBUILD qemu-softmmu-0.8.2.ebuild 2628 RMD160 0018a3b76a37a1f5180f7007a302bce079c4da2a SHA1 71b9e08dc65449ed0df0e3aac07fba2b656daec5 SHA256 a9d5cd6239e39a29143ce32e2b90172fc4deda84b550d3b1231ed19c886e5bc7
+MD5 004e5a98d8aeaf916af62f80980d1745 qemu-softmmu-0.8.2.ebuild 2628
+RMD160 0018a3b76a37a1f5180f7007a302bce079c4da2a qemu-softmmu-0.8.2.ebuild 2628
+SHA256 a9d5cd6239e39a29143ce32e2b90172fc4deda84b550d3b1231ed19c886e5bc7 qemu-softmmu-0.8.2.ebuild 2628
+MISC ChangeLog 4893 RMD160 ee66434f6c9a35562444a56b268aeefaecf300e5 SHA1 ba5313c71b71b73a40532db41ed68b0363c39216 SHA256 10be64d3ed45969b64588154c1958594a97e9c7696169f7d2c9a8653724df8ca
+MD5 5c02a08820ad702520802588bb8dcf0a ChangeLog 4893
+RMD160 ee66434f6c9a35562444a56b268aeefaecf300e5 ChangeLog 4893
+SHA256 10be64d3ed45969b64588154c1958594a97e9c7696169f7d2c9a8653724df8ca ChangeLog 4893
 MISC metadata.xml 223 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 SHA1 fcf66d2b271369d296150dde06603d850623ed27 SHA256 64a96c3c9929aec46b50a63ae1fd8c46cef4a8423f448d6f6fff09e20510c98b
 MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 metadata.xml 223
@@ -60,9 +59,9 @@ SHA256 481e1b6318003b8c8ba25549d433906ba919f8fafb261ac46442a4cc60f6ae84 files/di
 MD5 ceaf884835c3e3e52be03e21a6c5d135 files/digest-qemu-softmmu-0.8.1-r1 467
 RMD160 d3095e4fe78dd0357858259ccf9d4868f8acd61b files/digest-qemu-softmmu-0.8.1-r1 467
 SHA256 481e1b6318003b8c8ba25549d433906ba919f8fafb261ac46442a4cc60f6ae84 files/digest-qemu-softmmu-0.8.1-r1 467
-MD5 c353639d1739a23ad62723df63775a62 files/digest-qemu-softmmu-0.8.2 482
-RMD160 c3792751dd488d6e4ec5ef39a0a458bde1b7ea78 files/digest-qemu-softmmu-0.8.2 482
-SHA256 e1efc0b6697ed63d0bbbfa2ba277bd98b88d03cc885f6609f01175b39b02a04e files/digest-qemu-softmmu-0.8.2 482
-MD5 c353639d1739a23ad62723df63775a62 files/digest-qemu-softmmu-0.8.2-r1 482
-RMD160 c3792751dd488d6e4ec5ef39a0a458bde1b7ea78 files/digest-qemu-softmmu-0.8.2-r1 482
-SHA256 e1efc0b6697ed63d0bbbfa2ba277bd98b88d03cc885f6609f01175b39b02a04e files/digest-qemu-softmmu-0.8.2-r1 482
+MD5 e9b66fd821b0760086e3574d3a90398c files/digest-qemu-softmmu-0.8.2 235
+RMD160 1690afc2131b50cf62fe141bf5b621687fb107e3 files/digest-qemu-softmmu-0.8.2 235
+SHA256 f29c0addbe47b46f7c4ab7d2cb4965bac24abdaa456bc0815d5d07a407f7450b files/digest-qemu-softmmu-0.8.2 235
+MD5 e9b66fd821b0760086e3574d3a90398c files/digest-qemu-softmmu-0.8.2-r1 235
+RMD160 1690afc2131b50cf62fe141bf5b621687fb107e3 files/digest-qemu-softmmu-0.8.2-r1 235
+SHA256 f29c0addbe47b46f7c4ab7d2cb4965bac24abdaa456bc0815d5d07a407f7450b files/digest-qemu-softmmu-0.8.2-r1 235
diff --git a/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2 b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2
index f4e0a49eb203..767c6c8715e5 100644
--- a/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2
+++ b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2
@@ -1,6 +1,3 @@
-MD5 3b77edbada790f924456aa4675edd0be kqemu-1.3.0pre7.tar.gz 189920
-RMD160 9f8e5dd7e1a901d939fc5e8b3be1a10e396f9ab3 kqemu-1.3.0pre7.tar.gz 189920
-SHA256 cf29505b3d07d5e31080aa677a4254f5770f273e9bd05ef2df956b87d248cead kqemu-1.3.0pre7.tar.gz 189920
 MD5 5b3a89eb2f256a8a6f3bb07f7b3f1b07 qemu-0.8.2.tar.gz 1810909
 RMD160 715c24997330352aa675cd7279731cec251f833a qemu-0.8.2.tar.gz 1810909
 SHA256 2a20d811296c859d678bdd002222aa7ca7951a641327234f3af144e822d078f3 qemu-0.8.2.tar.gz 1810909
diff --git a/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2-r1 b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2-r1
index f4e0a49eb203..767c6c8715e5 100644
--- a/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2-r1
+++ b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2-r1
@@ -1,6 +1,3 @@
-MD5 3b77edbada790f924456aa4675edd0be kqemu-1.3.0pre7.tar.gz 189920
-RMD160 9f8e5dd7e1a901d939fc5e8b3be1a10e396f9ab3 kqemu-1.3.0pre7.tar.gz 189920
-SHA256 cf29505b3d07d5e31080aa677a4254f5770f273e9bd05ef2df956b87d248cead kqemu-1.3.0pre7.tar.gz 189920
 MD5 5b3a89eb2f256a8a6f3bb07f7b3f1b07 qemu-0.8.2.tar.gz 1810909
 RMD160 715c24997330352aa675cd7279731cec251f833a qemu-0.8.2.tar.gz 1810909
 SHA256 2a20d811296c859d678bdd002222aa7ca7951a641327234f3af144e822d078f3 qemu-0.8.2.tar.gz 1810909
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild
index b22542d17505..9c73c4bab7d5 100644
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild
+++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild,v 1.1 2006/08/17 07:37:25 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild,v 1.2 2006/08/17 08:09:42 lu_zero Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
 HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI="${HOMEPAGE}${P/-softmmu/}.tar.gz
-	kqemu? ( ${HOMEPAGE}kqemu-1.3.0pre7.tar.gz )"
+SRC_URI="${HOMEPAGE}${P/-softmmu/}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 KQEMU"
 SLOT="0"
@@ -41,12 +40,6 @@ pkg_setup() {
 #RUNTIME_PATH="/emul/gnemul/"
 src_unpack() {
 	unpack ${A}
-	if use kqemu; then
-		mv ${WORKDIR}/kqemu ${S}
-		cd ${S}/kqemu
-		#Let the configure find kqemu but NOT build it
-		sed -i -e 's:$(MAKE) -C kqemu*::' ${S}/Makefile
-	fi
 
 	cd ${S}
 	epatch "${FILESDIR}/qemu-${PV}-sparc-fp.patch"
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild
index 9a27a9d7f70b..0c1532628aca 100644
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild
+++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild,v 1.3 2006/08/17 07:37:25 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild,v 1.4 2006/08/17 08:09:42 lu_zero Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
 HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI="${HOMEPAGE}${P/-softmmu/}.tar.gz
-	kqemu? ( ${HOMEPAGE}kqemu-1.3.0pre7.tar.gz )"
+SRC_URI="${HOMEPAGE}${P/-softmmu/}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 KQEMU"
 SLOT="0"
@@ -41,12 +40,6 @@ pkg_setup() {
 #RUNTIME_PATH="/emul/gnemul/"
 src_unpack() {
 	unpack ${A}
-	if use kqemu; then
-		mv ${WORKDIR}/kqemu ${S}
-		cd ${S}/kqemu
-		#Let the configure find kqemu but NOT build it
-		sed -i -e 's:$(MAKE) -C kqemu*::' ${S}/Makefile
-	fi
 
 	cd ${S}
 	epatch "${FILESDIR}/qemu-${PV}-sparc-fp.patch"