QA fixes (#140680)

Package-Manager: portage-2.1.1_pre2-r8

5 files changed, 78 insertions, 17 deletions

diff --git a/app-emulation/spectemu/ChangeLog b/app-emulation/spectemu/ChangeLog
index 5c757602355b..7161f793d94c 100644
--- a/app-emulation/spectemu/ChangeLog
+++ b/app-emulation/spectemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/spectemu
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spectemu/ChangeLog,v 1.15 2006/01/24 23:55:49 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spectemu/ChangeLog,v 1.16 2006/07/17 05:58:39 truedfx Exp $
+
+  17 Jul 2006; Harald van Dijk <truedfx@gentoo.org>
+  +files/spectemu-0.99.3-qa.patch, spectemu-0.99.3.ebuild:
+  QA fixes (#140680)
 
   24 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> spectemu-0.99.3.ebuild:
   Make modular X friendly.
diff --git a/app-emulation/spectemu/Manifest b/app-emulation/spectemu/Manifest
index 212d187f01dd..d3b006b5fc6c 100644
--- a/app-emulation/spectemu/Manifest
+++ b/app-emulation/spectemu/Manifest
@@ -1,5 +1,34 @@
-MD5 a3825daf576e0c0f7355cb7a5c852bad ChangeLog 1658
-MD5 3eff986352c598213569695176c1dadb files/digest-spectemu-0.9.4 65
-MD5 2fa8d7d58dd97f11057af7dc17b910a1 files/digest-spectemu-0.99.3 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX spectemu-0.99.3-qa.patch 687 RMD160 0c58cf8e8d3b679ef19388b28f92a39347983cdd SHA1 751a7f3d98341763ac26651388336477a828325a SHA256 b0d7353486dac5b58770ca8e51d068d7c622c4886ebd1291425448f10301ff01
+MD5 74fa014d1dca94966a033462ad36a378 files/spectemu-0.99.3-qa.patch 687
+RMD160 0c58cf8e8d3b679ef19388b28f92a39347983cdd files/spectemu-0.99.3-qa.patch 687
+SHA256 b0d7353486dac5b58770ca8e51d068d7c622c4886ebd1291425448f10301ff01 files/spectemu-0.99.3-qa.patch 687
+DIST spectemu-0.94.tar.gz 224088
+DIST spectemu-0.99.3.tar.gz 269524 RMD160 000c87e3a126d32ba9bd0829ba2f5184b360af1c SHA1 f0652018bdf712e50b9901b1f4e8f08af30cada8 SHA256 a3f51176fdbcdbd1cdf8e0bab6b668a548c79b8fc699d5a7199ecfde79c79bc1
+EBUILD spectemu-0.9.4.ebuild 1762 RMD160 925e14bafa45d0e5f7007b36b0b2f3ed80be0c68 SHA1 5851443a5f3f313a2c9f5cd6bc748ec1a9f24a76 SHA256 d811d90c5a12e45b8c05556368bd653ea7b6230fb6409f877c31ce411b64be54
 MD5 1b45a582ff3b5518e2fef1b2ecd823ec spectemu-0.9.4.ebuild 1762
-MD5 712f89fb6a595a5884533f153cd1c26a spectemu-0.99.3.ebuild 1400
+RMD160 925e14bafa45d0e5f7007b36b0b2f3ed80be0c68 spectemu-0.9.4.ebuild 1762
+SHA256 d811d90c5a12e45b8c05556368bd653ea7b6230fb6409f877c31ce411b64be54 spectemu-0.9.4.ebuild 1762
+EBUILD spectemu-0.99.3.ebuild 1350 RMD160 d43e5311ce429b00d7bf5f6bef63080c3e0cf64f SHA1 7d5ebd05a585bac391728b68d98b0e74f13dd866 SHA256 190271572e58f4600d7f15669ad9b3632a64ac73ec8863ee6c766e19f67931a1
+MD5 ab7e04311e3f3f10fe6fdeebfb0fa419 spectemu-0.99.3.ebuild 1350
+RMD160 d43e5311ce429b00d7bf5f6bef63080c3e0cf64f spectemu-0.99.3.ebuild 1350
+SHA256 190271572e58f4600d7f15669ad9b3632a64ac73ec8863ee6c766e19f67931a1 spectemu-0.99.3.ebuild 1350
+MISC ChangeLog 1788 RMD160 149fcd8b162e324772d9a99914ed7dcd750acd5f SHA1 5e05aa56ff809a9e1149e1399195d445848e9012 SHA256 9d700cc3561a159189941ed6a9839d3ca47581a1659563955656a04ce802b077
+MD5 0cf41c85c62742e0339e4b08f1b764bb ChangeLog 1788
+RMD160 149fcd8b162e324772d9a99914ed7dcd750acd5f ChangeLog 1788
+SHA256 9d700cc3561a159189941ed6a9839d3ca47581a1659563955656a04ce802b077 ChangeLog 1788
+MD5 3eff986352c598213569695176c1dadb files/digest-spectemu-0.9.4 65
+RMD160 b22b8d25ce69bdc13631452502c2266544140965 files/digest-spectemu-0.9.4 65
+SHA256 ebe9b78f2ddb2411261c65b779df79de36a33c32f652dc7d16ef2bea06cfe826 files/digest-spectemu-0.9.4 65
+MD5 77209dff2bb702959664ae6e09144b30 files/digest-spectemu-0.99.3 247
+RMD160 08b8c94d159fb6ad2ffbe05d7f969940ea2b0034 files/digest-spectemu-0.99.3 247
+SHA256 dc0a69433c3c39c61f975f22f2f6c258362d9c154009688ee3ec96b0cc3ccf62 files/digest-spectemu-0.99.3 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEuye5wnQyISwouHwRAiOlAKCCb4RTxAnP+ICZ/RZfP867tcnj7QCgvsT/
+Oco6PmGB9ZHihVp1lq0RaSQ=
+=C/RP
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/spectemu/files/digest-spectemu-0.99.3 b/app-emulation/spectemu/files/digest-spectemu-0.99.3
index f236e6c2e193..15c728ffe3fd 100644
--- a/app-emulation/spectemu/files/digest-spectemu-0.99.3
+++ b/app-emulation/spectemu/files/digest-spectemu-0.99.3
@@ -1 +1,3 @@
 MD5 67330d27e3f5c9127413bd6f35aa664b spectemu-0.99.3.tar.gz 269524
+RMD160 000c87e3a126d32ba9bd0829ba2f5184b360af1c spectemu-0.99.3.tar.gz 269524
+SHA256 a3f51176fdbcdbd1cdf8e0bab6b668a548c79b8fc699d5a7199ecfde79c79bc1 spectemu-0.99.3.tar.gz 269524
diff --git a/app-emulation/spectemu/files/spectemu-0.99.3-qa.patch b/app-emulation/spectemu/files/spectemu-0.99.3-qa.patch
new file mode 100644
index 000000000000..00d136305819
--- /dev/null
+++ b/app-emulation/spectemu/files/spectemu-0.99.3-qa.patch
@@ -0,0 +1,23 @@
+--- spectemu-0.99.3/Makefile.in
++++ spectemu-0.99.3/Makefile.in
+@@ -45,9 +45,9 @@
+ 
+ install_prog: $(progs)
+ 	if test -f xspect; then \
+-	   $(INSTALL_PROGRAM) -s -m 755 xspect $(i_bindir); fi
++	   $(INSTALL_PROGRAM) -m 755 xspect $(i_bindir); fi
+ 	if test -f vgaspect; then \
+-	   $(INSTALL_PROGRAM) -s -m 4755 vgaspect $(i_bindir); fi
++	   $(INSTALL_PROGRAM) -m 4755 vgaspect $(i_bindir); fi
+ 
+ install_man:
+ 	$(INSTALL_DATA) ./xspect.1 $(i_mandir)
+@@ -88,7 +88,7 @@
+ 	./sp_to_s < i386emul.sp > i386emul.s
+ 
+ i386emul.o: i386emul.s
+-	$(CC) -c $(CFLAGS) i386emul.s
++	$(CC) -c $(ASFLAGS) -Xassembler --noexecstack i386emul.s
+ 
+ sp_to_s: sp_to_s.o
+ 	$(CC) -o sp_to_s $(LDFLAGS) sp_to_s.o
diff --git a/app-emulation/spectemu/spectemu-0.99.3.ebuild b/app-emulation/spectemu/spectemu-0.99.3.ebuild
index 99158a8940ac..3dc7fd46b3ff 100644
--- a/app-emulation/spectemu/spectemu-0.99.3.ebuild
+++ b/app-emulation/spectemu/spectemu-0.99.3.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spectemu/spectemu-0.99.3.ebuild,v 1.5 2006/01/24 23:55:49 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spectemu/spectemu-0.99.3.ebuild,v 1.6 2006/07/17 05:58:39 truedfx Exp $
 
 ### Several versions of specemu exist,  xspect & vgaspect, utilising X11
 ### and/or svgalib. libreadline provides optional runtime features.
 ### The ./configure script automagically figures out which binaries to build
 ### so the run/compiletime dependancies here are use dependant
 
+inherit eutils
+
 DESCRIPTION="48k ZX Spectrum Emulator"
 HOMEPAGE="http://kempelen.iit.bme.hu/~mszeredi/spectemu/spectemu.html"
 SRC_URI="http://www.inf.bme.hu/~mszeredi/spectemu/${P}.tar.gz"
 
-LICENSE="|| ( GPL-2 LGPL-2 )"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="X readline svga"
 
-#X? ( virtual/x11 )
-
 DEPEND="X? ( || (
 	( >=x11-proto/xf86vidmodeproto-2.2.2
 	>=x11-proto/xextproto-7.0.2
@@ -30,18 +30,21 @@ DEPEND="X? ( || (
 	readline? ( sys-libs/readline )"
 RDEPEND="svga? ( media-libs/svgalib )"
 
-src_compile() {
-	local myflags
-	use X || myflags="${myflags} --with-x=no"
-	use readline || myflags="${myflags} --without-readline"
-
-	myflags="${myflags} --mandir=${D}/usr/share/man/"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-qa.patch
+}
 
-	econf ${myflags} || die "Spectemu ./configure failed"
+src_compile() {
+	econf \
+		$(use_with readline) \
+		$(use_with X x) \
+		|| die "Spectemu ./configure failed"
 	emake || die "Spectemu make failed"
 }
 
 src_install() {
-	einstall || die
+	make install_root="${D}" install || die
 }