cleanup

Package-Manager: portage-2.1_pre3-r1

7 files changed, 7 insertions, 226 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index cf60e7db2e4b..c640698d9dc0 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.40 2005/12/23 15:57:31 lu_zero Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.41 2006/01/28 10:56:17 lu_zero Exp $
+
+  28 Jan 2006; Luca Barbato <lu_zero@gentoo.org> -files/qemu_gcc34.patch.gz,
+  -qemu-0.6.0.ebuild:
+  cleanup
 
 *qemu-0.8.0 (23 Dec 2005)
 
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 74074149f7aa..54e46bcd02c1 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,8 +1,6 @@
-MD5 212581f1b478fd37245e2977c4788f4a ChangeLog 5173
-MD5 9052eb692ddc0cbb296d7712b0cc6f44 files/digest-qemu-0.6.0 62
+MD5 131b62a13dba5eccc51fab31d4419a91 ChangeLog 5283
 MD5 1f8638d68cffbd8b96df97dcb0868b88 files/digest-qemu-0.6.1 63
 MD5 1f8638d68cffbd8b96df97dcb0868b88 files/digest-qemu-0.6.1-r1 63
-MD5 f2e48bae97dad4e6e6bccdb212124ae0 files/digest-qemu-0.7.0 127
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-qemu-0.7.0-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-qemu-0.7.1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-qemu-0.7.2 0
@@ -13,13 +11,10 @@ MD5 0b85ac42eaa41830ac9b4eccf4a118bd files/qemu-0.6.0-sigaction.patch 677
 MD5 f6094ee9cd2ee3a38404680796df2b75 files/qemu-0.6.0-typo.patch 528
 MD5 8490b50dc53ceca8208becb949c02ebb files/qemu-0.6.1-20041126.patch 27697
 MD5 3202f7445799cce82ccaac9749e1443d files/qemu-0.7.0-errno.patch 487
-MD5 ede1278e0122a8439c156bd1380a37d5 files/qemu_gcc34.patch.gz 406
 MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
-MD5 518988ab13f6b610696b8706d31d2fb9 qemu-0.6.0.ebuild 1895
 MD5 b035e8de3718e77cc27918198bf49fb6 qemu-0.6.1-r1.ebuild 2143
 MD5 e65dab4abb0028ab15d60ecd60ca4ba9 qemu-0.6.1.ebuild 2071
 MD5 a5f64bfa0ee03fa38a4b40c6faddd0ca qemu-0.7.0-r1.ebuild 493
-MD5 a69f6c23e1e4815aeae158b73abbe952 qemu-0.7.0.ebuild 4195
 MD5 0acd15b543d8330d56ef04e77b5ee1a1 qemu-0.7.1.ebuild 490
 MD5 3d713fa1f670e463c3204f254ed6e4e8 qemu-0.7.2.ebuild 505
 MD5 1f24e04cbc815e54292d3ecd78c15fc1 qemu-0.8.0.ebuild 505
diff --git a/app-emulation/qemu/files/digest-qemu-0.6.0 b/app-emulation/qemu/files/digest-qemu-0.6.0
deleted file mode 100644
index dc459bc45072..000000000000
--- a/app-emulation/qemu/files/digest-qemu-0.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cdbc7258f122f381cba7ac1ca6ce0722 qemu-0.6.0.tar.gz 874397
diff --git a/app-emulation/qemu/files/digest-qemu-0.7.0 b/app-emulation/qemu/files/digest-qemu-0.7.0
deleted file mode 100644
index 279f446285f5..000000000000
--- a/app-emulation/qemu/files/digest-qemu-0.7.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 234e9ace03b00259bb57dc5a9c633056 qemu-0.7.0.tar.gz 1211802
-MD5 c6bb3b40fb3d526d731eb0f1f9dee7ee kqemu-0.6.2-1.tar.gz 21002
diff --git a/app-emulation/qemu/files/qemu_gcc34.patch.gz b/app-emulation/qemu/files/qemu_gcc34.patch.gz
deleted file mode 100644
index 1e2e7b37dd5b..000000000000
--- a/app-emulation/qemu/files/qemu_gcc34.patch.gz
+++ /dev/null
diff --git a/app-emulation/qemu/qemu-0.6.0.ebuild b/app-emulation/qemu/qemu-0.6.0.ebuild
deleted file mode 100644
index c532f9ca27c6..000000000000
--- a/app-emulation/qemu/qemu-0.6.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.6.0.ebuild,v 1.8 2005/01/01 14:16:15 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
-HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI="http://fabrice.bellard.free.fr/qemu/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ppc -alpha -sparc"
-IUSE="softmmu qemu-fast sdl"
-RESTRICT="nostrip"
-
-DEPEND="virtual/libc
-	sdl? ( media-libs/libsdl )"
-RDEPEND=""
-
-set_target_list() {
-	TARGET_LIST="arm-user i386-user ppc-user sparc-user" #i386-softmmu ppc-softmmu
-	use softmmu && TARGET_LIST="${TARGET_LIST} i386-softmmu ppc-softmmu"
-	use qemu-fast && TARGET_LIST="${TARGET_LIST} i386"
-	export TARGET_LIST
-}
-
-#RUNTIME_PATH="/emul/gnemul/"
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-typo.patch
-	epatch ${FILESDIR}/${P}-sigaction.patch
-	epatch ${FILESDIR}/qemu_gcc34.patch.gz
-	epatch ${FILESDIR}/${P}-configure.patch
-}
-
-src_compile() {
-	set_target_list
-#		--interp-prefix=${RUNTIME_PATH}/qemu-%M
-	./configure \
-		--prefix=/usr \
-		--target-list="${TARGET_LIST}" \
-		--enable-slirp \
-		`use_enable sdl`\
-		|| die "could not configure"
-	make || die "make failed"
-}
-
-src_install() {
-	make install \
-		prefix=${D}/usr \
-		bindir=${D}/usr/bin \
-		datadir=${D}/usr/share/qemu \
-		docdir=${D}/usr/share/doc/${P}-${PR} \
-		mandir=${D}/usr/share/man || die
-	chmod -x ${D}/usr/share/man/*/*
-}
-
-pkg_postinst() {
-	einfo "You will need the Universal TUN/TAP driver compiled into"
-	einfo "kernel or as a module to use the virtual network device."
-	use softmmu || \
-	(
-	ewarn "You have the softmmu useflag disabled."
-	ewarn "In order to have the full system emulator (qemu) you have"
-	ewarn "to emerge qemu again with the softmmu useflag enabled"
-	)
-}
diff --git a/app-emulation/qemu/qemu-0.7.0.ebuild b/app-emulation/qemu/qemu-0.7.0.ebuild
deleted file mode 100644
index 1cf9db31fbce..000000000000
--- a/app-emulation/qemu/qemu-0.7.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.7.0.ebuild,v 1.9 2005/12/05 20:01:28 dang Exp $
-
-inherit eutils flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
-HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
-SRC_URI="http://fabrice.bellard.free.fr/qemu/${P}.tar.gz
-	kqemu? ( http://fabrice.bellard.free.fr/qemu/kqemu-0.6.2-1.tar.gz )"
-#qvm86? ( http://dev.gentoo.org/~lu_zero/distfiles/qvm86-20050409.tar.bz2 )"
-#kqemu? ( http://fabrice.bellard.free.fr/qemu/kqemu-${PV%.*}-1.tar.gz )
-
-LICENSE="GPL-2 LGPL-2.1 KQEMU"
-SLOT="0"
-KEYWORDS="~x86 ~ppc -alpha -sparc"
-IUSE="softmmu sdl kqemu"  #qvm86 debug nptl qemu-fast nptlonly"
-RESTRICT="nostrip"
-
-DEPEND="virtual/libc
-	sdl? ( media-libs/libsdl )
-	app-text/texi2html"
-RDEPEND="sdl? ( media-libs/libsdl )"
-
-MODULE_NAMES=""
-use kqemu && MODULE_NAMES=$MODULE_NAMES" kqemu(misc:${S}/kqemu)"
-#use qvm86 && MODULE_NAMES=$MODULE_NAMES" qvm86(misc:${S}/qvm86)"
-
-set_target_list() {
-	TARGET_LIST="arm-user armeb-user i386-user ppc-user sparc-user"
-	use softmmu &&
-		TARGET_LIST="${TARGET_LIST} i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu"
-	export TARGET_LIST
-}
-
-pkg_setup() {
-	if [ "$(gcc-major-version)" == "4" ]; then
-		ewarn "Qemu could not build with GCC 4"
-	fi
-#	( use kqemu || use qvm86 ) && linux-mod_pkg_setup
-	use kqemu && linux-mod_pkg_setup
-}
-
-#RUNTIME_PATH="/emul/gnemul/"
-src_unpack() {
-	unpack ${A}
-
-	if use kqemu ; then
-	einfo "QEMU Accelerator enabled"
-	einfo "kqemu actually is a closed source software"
-	einfo "Please read carefully the KQEMU license"
-	einfo "and http://fabrice.bellard.free.fr/qemu/qemu-accel.html"
-	einfo "if you want it released under GPL"
-	mv ${S}/../kqemu ${S}
-	cd ${S}/kqemu
-	epatch ${FILESDIR}/kqemu-sysfs.patch
-	fi
-	#	if use qvm86; then
-#		mv ${WORKDIR}/qvm86 ${S}
-#		cd ${S}
-#		epatch qvm86/patch.qvm86
-#	fi
-	cd ${S}
-	#Fix errno mismatch on glibc-2.3.5
-	epatch ${FILESDIR}/${P}-errno.patch
-
-	# Alter target makefiles to accept CFLAGS set via flag-o.
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target tests/Makefile
-	# Ensure mprotect restrictions are relaxed for emulator binaries
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			Makefile.target
-	# Prevent install of kernel module by qemu's makefile
-	sed -i 's/\(.\/install.sh\)/#\1/' Makefile
-}
-
-src_compile() {
-	#Let the application set its cflags
-	unset CFLAGS
-
-	# Switch off hardened tech
-	filter-flags -fpie -fstack-protector
-
-	myconf=""
-	set_target_list
-#		--interp-prefix=${RUNTIME_PATH}/qemu-%M
-	./configure \
-		--prefix=/usr \
-		--target-list="${TARGET_LIST}" \
-		--enable-slirp \
-		--kernel-path=${KV_DIR} \
-		$(use_enable kqemu) \
-		${myconf} \
-		$(use_enable sdl)\
-		|| die "could not configure"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make install \
-		prefix=${D}/usr \
-		bindir=${D}/usr/bin \
-		datadir=${D}/usr/share/qemu \
-		docdir=${D}/usr/share/doc/${P} \
-		mandir=${D}/usr/share/man || die
-
-	chmod -x ${D}/usr/share/man/*/*
-
-	if use kqemu ; then
-
-		linux-mod_src_install
-
-		# udev rule
-		dodir /etc/udev/rules.d/
-		echo 'KERNEL="kqemu*",           NAME="%k", GROUP="qemu", MODE="0660"' \
-			> ${D}/etc/udev/rules.d/48-qemu.rules
-		enewgroup qemu
-
-		# Module doc
-		dodoc ${S}/kqemu/README
-
-	fi
-}
-
-pkg_postinst() {
-	einfo "You will need the Universal TUN/TAP driver compiled into"
-	einfo "kernel or as a module to use the virtual network device."
-	if ! use softmmu ; then
-		ewarn ""
-		ewarn "You have the softmmu useflag disabled."
-		ewarn "In order to have the full system emulator (qemu) you have"
-		ewarn "to emerge qemu again with the softmmu useflag enabled."
-		ewarn ""
-	fi
-	if use kqemu ; then
-		einfo "kqemu actually is a closed source software"
-		einfo "Please read carefully the KQEMU license"
-		einfo "and http://fabrice.bellard.free.fr/qemu/qemu-accel.html"
-		einfo "if you want it released under GPL"
-		linux-mod_pkg_postinst
-		einfo "make sure you have the kernel module loaded before running qemu"
-		einfo "and your user is in the qemu group"
-	fi
-}