From e232c951cf4e2743c875750d9959ca406aa93fbe Mon Sep 17 00:00:00 2001 From: jensp Date: Sun, 31 Jan 2010 18:49:37 +0000 Subject: [PATCH] qa fixes for qemu-softmmu and qemu-launcher --- app-emulation/qemu-launcher/Manifest | 16 +-------- .../qemu-launcher/qemu-launcher-1.5.1.ebuild | 33 ------------------- .../qemu-launcher/qemu-launcher-1.7.1.ebuild | 4 +-- app-emulation/qemu-softmmu/Manifest | 2 +- .../qemu-softmmu-0.9.1_p20080205-r3.ebuild | 6 ++-- 5 files changed, 7 insertions(+), 54 deletions(-) delete mode 100644 app-emulation/qemu-launcher/qemu-launcher-1.5.1.ebuild diff --git a/app-emulation/qemu-launcher/Manifest b/app-emulation/qemu-launcher/Manifest index 1d9f54d20..bbf9cb678 100644 --- a/app-emulation/qemu-launcher/Manifest +++ b/app-emulation/qemu-launcher/Manifest @@ -1,16 +1,2 @@ -DIST qemu-launcher_1.5.1-1.tar.gz 33684 DIST qemu-launcher_1.7.1.tar.gz 61868 RMD160 98ccc7e6d28b202bf98bffd40f2d5db05a1d73dd SHA1 4369b70e3ecd2472b9bec2d1e0a2e082e5092d9f SHA256 bf4d8091e1a7114463ffdc86296f057a097356f01fd68826e18fc2b6a5117869 -EBUILD qemu-launcher-1.5.1.ebuild 870 RMD160 ad5e94f1e25562c822e24ecff48ddf39af4615a1 SHA1 e97c0889794279ece2dfa627cb9f7395f89eac76 SHA256 0ea1ddf3fbcf06cb1888e103facbe78f96c517470c14ded9dac10b2d335f0500 -MD5 5e7aba325b063611e7dc7df771cc36a0 qemu-launcher-1.5.1.ebuild 870 -RMD160 ad5e94f1e25562c822e24ecff48ddf39af4615a1 qemu-launcher-1.5.1.ebuild 870 -SHA256 0ea1ddf3fbcf06cb1888e103facbe78f96c517470c14ded9dac10b2d335f0500 qemu-launcher-1.5.1.ebuild 870 -EBUILD qemu-launcher-1.7.1.ebuild 667 RMD160 ade3beebb8f2a2ecb6fd48982a39f3667c2ff1bc SHA1 062747dbb86a92c97eb35375e0a9def4c7bff7a8 SHA256 7383248a3fc9cfbab42cbb9f60060277375dd54e9c1805ac9fbb9eea9a4e9803 -MD5 017f3b9a98065381409c102decc3c824 qemu-launcher-1.7.1.ebuild 667 -RMD160 ade3beebb8f2a2ecb6fd48982a39f3667c2ff1bc qemu-launcher-1.7.1.ebuild 667 -SHA256 7383248a3fc9cfbab42cbb9f60060277375dd54e9c1805ac9fbb9eea9a4e9803 qemu-launcher-1.7.1.ebuild 667 -MD5 fc80d30470f2e3c589d9edc5b4caab56 files/digest-qemu-launcher-1.5.1 72 -RMD160 1edcaa468e1ca80e934e8a4585427ba7a2df2e31 files/digest-qemu-launcher-1.5.1 72 -SHA256 e12de640fc0300889f3872f2a76a3b4e454040e4a9681da7d1e7d6587723654d files/digest-qemu-launcher-1.5.1 72 -MD5 25e87c43643ad26d57bb06b11c127a34 files/digest-qemu-launcher-1.7.1 256 -RMD160 73193462ea26db8ab0756ec47866b22b3cfb1aec files/digest-qemu-launcher-1.7.1 256 -SHA256 5a7b72e267a122f82dfd4897e89b69d3afef16f584d63efe8bbf3731c4620810 files/digest-qemu-launcher-1.7.1 256 +EBUILD qemu-launcher-1.7.1.ebuild 669 RMD160 6c7e48baefd41bcd45535c7ebd2f688c7e0692a5 SHA1 6558eb37763839b32cf3e5625e2f2ab77bfbae98 SHA256 c301318a7b058acec2ed92c72218822aba42219af5e9ef667b026e09698201bf diff --git a/app-emulation/qemu-launcher/qemu-launcher-1.5.1.ebuild b/app-emulation/qemu-launcher/qemu-launcher-1.5.1.ebuild deleted file mode 100644 index b71343d82..000000000 --- a/app-emulation/qemu-launcher/qemu-launcher-1.5.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /root/portage/app-emulation/qemu-launcher/qemu-launcher-1.5.1.ebuild,v 1.1.1.1 2006/03/06 22:19:49 grimmlin Exp $ - -MY_P="${PN}_${PV}-1.tar.gz" - -DESCRIPTION="GNOME/Gtk front-end for the Qemu x86 PC emulator" -HOMEPAGE="http://emeitner.f2o.org/qemu_launcher" -SRC_URI="http://emeitner.f2o.org/debian/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -RESTRICT="fetch" -IUSE="" - -DEPEND="dev-lang/perl - >=dev-perl/gtk2-perl-1.101 - >=dev-perl/gtk2-gladexml-1.005 - >=dev-perl/gnome2-perl-1.023 - >=dev-perl/Locale-gettext-1.05" - -pkg_nofetch() { - einfo "Due to restrictions on server please" - einfo "download ${SRC_URI}" - einfo "manually with a web browser" - einfo "and put it in ${DISTDIR}" -} - -src_install() { - cd "${WORKDIR}/trunk" - make DESTDIR=${D} install -} diff --git a/app-emulation/qemu-launcher/qemu-launcher-1.7.1.ebuild b/app-emulation/qemu-launcher/qemu-launcher-1.7.1.ebuild index 36544d4d9..a89258382 100644 --- a/app-emulation/qemu-launcher/qemu-launcher-1.7.1.ebuild +++ b/app-emulation/qemu-launcher/qemu-launcher-1.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -26,5 +26,5 @@ src_compile() { src_install() { cd "${WORKDIR}/trunk" - make DESTDIR=${D} install + make DESTDIR="${D}" install } diff --git a/app-emulation/qemu-softmmu/Manifest b/app-emulation/qemu-softmmu/Manifest index 03c4ccb58..26e1b383b 100644 --- a/app-emulation/qemu-softmmu/Manifest +++ b/app-emulation/qemu-softmmu/Manifest @@ -1,4 +1,4 @@ AUX qemu-cvs20080205-brb_02-olive.patch 86977 RMD160 5c3b9aaa654370ce3cf20aa6058a9af38b9fce20 SHA1 1a19841a7a951f4800335911fab34291154ae7df SHA256 a14e340757312542ab560bb52ff5f3bba6fe5345ea16ba58f7793af853e251ad AUX qemu-e1000.patch 5451 RMD160 6846da29edf912c3b000a24ddae9b8878e1da584 SHA1 5930f34b58603d61f06427caa11193339f60eb17 SHA256 36ac7ba42ebc59f34df0ce94262f4c1ca04aebe9dc2015b5d22692eec5cac7cf DIST qemu-20080205.tar.gz 2894660 RMD160 fca1cec324ea5eb4a76b5eb8880fec7aa3c3a492 SHA1 b6f2faded4cb784a1d4fa15c131b2c9b5bbb73b0 SHA256 60f5b4a36133904145d97f2ea0ab8153d09aac29705491f7d0cd25c16f6452cc -EBUILD qemu-softmmu-0.9.1_p20080205-r3.ebuild 3251 RMD160 356792ffa0fbe31fafa48da94d6a4508830cb3d1 SHA1 8d14e09b06d9bd0e51184d59e0d5bbde12fa4a1f SHA256 2ce2c71bd3a555dfe5cf8924389052c2824a6320544489e0552d9add80071996 +EBUILD qemu-softmmu-0.9.1_p20080205-r3.ebuild 3255 RMD160 c00c878b16624e9cf65091b0e59870819817e3af SHA1 05462ea93b0c53590055e762a73be7be759e9940 SHA256 31e632481351eaaccc9f61973eec8c1dcca8ceb2f5837bfd39858d1673b57efa diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1_p20080205-r3.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1_p20080205-r3.ebuild index be7ccd89e..9351fb9bb 100644 --- a/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1_p20080205-r3.ebuild +++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.9.1_p20080205-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 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.9.1-r3.ebuild,v 1.4 2008/05/14 20:25:37 maekke Exp $ @@ -33,8 +33,8 @@ S=${WORKDIR}/qemu-20080205 src_unpack() { unpack ${A} - epatch ${FILESDIR}/qemu-cvs20080205-brb_02-olive.patch - epatch ${FILESDIR}/qemu-e1000.patch + epatch "${FILESDIR}"/qemu-cvs20080205-brb_02-olive.patch + epatch "${FILESDIR}"/qemu-e1000.patch cd "${S}" # Alter target makefiles to accept CFLAGS set via flag-o. sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \