Fix parallel install wrt bug #255777. Fix automagic dependency on media-libs/svgalib. Migrate to EAPI 4.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

5 files changed, 138 insertions, 3 deletions

diff --git a/app-emulation/spectemu/ChangeLog b/app-emulation/spectemu/ChangeLog
index 2a0ea97df199..a78709846de1 100644
--- a/app-emulation/spectemu/ChangeLog
+++ b/app-emulation/spectemu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/spectemu
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spectemu/ChangeLog,v 1.26 2009/03/03 20:37:38 flameeyes Exp $
+# Copyright 2002-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spectemu/ChangeLog,v 1.27 2012/11/06 15:07:48 kensington Exp $
+
+*spectemu-0.99.3-r1 (06 Nov 2012)
+
+  06 Nov 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/spectemu-0.99.3-automagic.patch, +files/spectemu-0.99.3-build.patch,
+  +spectemu-0.99.3-r1.ebuild:
+  Fix parallel install wrt bug #255777. Fix automagic dependency on media-
+  libs/svgalib. Migrate to EAPI 4.
 
   03 Mar 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   spectemu-0.99.3.ebuild:
diff --git a/app-emulation/spectemu/Manifest b/app-emulation/spectemu/Manifest
index 5c27d8958514..685a09acc446 100644
--- a/app-emulation/spectemu/Manifest
+++ b/app-emulation/spectemu/Manifest
@@ -1,5 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX spectemu-0.99.3-automagic.patch 904 SHA256 9d7a0dacf0b05d8d1cd1988e35ee0f67a9f0cd669a66d5d4e17d2fca04f8d9d6 SHA512 c5a99c037ff014c402efb93b420a6e7c04939a88f3e0cd87ba558d2fe952d548c4ff2d80e35741f60a8139d2e78c2ff821b3aafb7363d0081b34af879f7eb2af WHIRLPOOL 210ce9c40b44b0260f57b12a18b40f9ebcc1dde1112db163883122fe1988becf81c28559b351b070b21cb098c2dcbe19fc7aab93cfd14a3dc14f3a402d6b867c
+AUX spectemu-0.99.3-build.patch 1077 SHA256 b0aced26e99f801704b7a1079eda05e72169530f240901772fc98bb99051639b SHA512 9a650e52eb07e2bbd1109b5fe27417b3891aff79a9a7783c59fd683b4309eb9447672b4a20c0f7746fab60250d865e1d5cdbc8957e5813cec4bfebed996af493 WHIRLPOOL 32a0857b8124b8aef989c3e31196ae6113260e73c11e10811ba509bad9448802dc4cac47229b93eaa8f82996c5916639aba41862f05247e95da818e8d927236b
 AUX spectemu-0.99.3-qa.patch 687 SHA256 b0d7353486dac5b58770ca8e51d068d7c622c4886ebd1291425448f10301ff01 SHA512 854db7e4ab1abae52b225adb6a82b71a52a217087187970589eb694dcfdc54d8a36c7456470e8871e9af5736bc59e8f727ea5390ac5f6303e42a1d0c5efa7791 WHIRLPOOL c0592fef246315f8542ef33c9bd50979baa502ad7862ce0a23c9cd70a42414a77923362f16abfe7f764953ab7f0d7baae03bb687bd2a92f895a600503646793d
 DIST spectemu-0.99.3.tar.gz 269524 SHA256 a3f51176fdbcdbd1cdf8e0bab6b668a548c79b8fc699d5a7199ecfde79c79bc1 SHA512 a2efcf46a2481a213825b452987626ade3fa95a525d26bd11a315ef885eb4f536343a7a58389733f459d05486b3da73e81503a0988ebe768ad93b089351f3e25 WHIRLPOOL 3cd4cb7faf5dc585ec8fa0e8985d8a55906486926fc82fff545287bd802d91923711a7796ba4145353569fefa6dd78330dfcc33303cbcfa7d85c1ee55a6ea2d0
+EBUILD spectemu-0.99.3-r1.ebuild 1087 SHA256 e8ab5eddfd8d3a01c5c408c8b5472a7249953f56bcff48cfbaab6e4ad34ae777 SHA512 7fa74942484adf5e97bbc58ed02e8eb3df3cf6264bdec0a5adb65ec39b113a10bda5079e465c9d7f2f74bb05b084675aa0977c8b44e34b97d9326d193d2d819a WHIRLPOOL 2336c94f9cc7bc1458858ea714dd031790a52ef811cb5ce213191eafaf0208891f962c81fb0fa008832d53a5cb78653f6995e9665aca0c5c8a308f72b250b7c4
 EBUILD spectemu-0.99.3.ebuild 1383 SHA256 166e5e92fd6f5342fb83a4f704c898243960d342efdfb505fe28c7c46eb4a937 SHA512 8a727523d6441dfe132b51bb8734e30e47a32b421165fbe07641496a082e6277d9e9a59e1e8596eea3ba457c5a3039398d3e9c55e8e30d4fd2804bac464604a1 WHIRLPOOL 3ec3a294c8a921729d108d995bbe64223968c6be281b6a4e16e13e22dd435290b6692366ab5f6e67e96b39cdea3f3db88f31d4fe2202923f3c43bd4eb0126ace
-MISC ChangeLog 2887 SHA256 a40eb72e6df4c75258394660983e04543493e2363f4236103b8958a8e5135deb SHA512 aee51bf25c690aca9f9920d1cc841d10097f1c47de6f7418e899721fa7c64e22a34a7c2d55f5a353ee2b7cea7d09df39e17bea05cd8e0aa78e512dcc467e2cf9 WHIRLPOOL 97da66ba6949bb55035031f50c67030692458bc6f6ea33b2b8d45ec15f7ce3a299035a6f8c4894d98ff97bb04dbaec1e5d2ac0b57c3fd7ba6b28bf808d9edfbc
+MISC ChangeLog 3198 SHA256 81b2c0175ceaad28ec391c9840151c04866c3511d927b3f6220ed6505c0a0df8 SHA512 e8797379607e72355c75304caec4a5b30b097173e487396f786e6e5ec2a17348b83307a95c49eba56b26b62ac7675c67c98625c6c2f5b27e21b782954d56ab19 WHIRLPOOL ca5a971a75ac1344e302ddbcc919335a2d17b06192bd46043f9d42b8b4b1d223d2d012ab3c04c53c3fbe3d8ddf4c8a25c18a58c62a6b0de4830d06ee65d49709
 MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQmSdnAAoJEMbwO6tnXQ0shxcIAKdLODw3FvrKWBC2qwC8RnvX
+jL40eUu3OBcu6iVsZikKfUGNL38gsT7lyG6mHU01MQUQD5kLQcAf+g1eKn3SLsie
+VKGDj7dI4XC7tCls56am8nvFY+yl4VgUi0gX5KWcm8fgECcGmY4o9wF6fCEBvN1p
+8RO5SMijH2NfLQbqNFeb573Vlmr8VpKLAmJPsEOeo4argCUiycLEO/KaC6QHUHf8
+4HA/YaBEBE/Pz5rzn1DPeLfomaVph8HsgQWeQ2wyoxb6Pl7//T5GUEU+8egR+gEP
+CpUD8PR/FqSOvwAST+8kICHsVbNX5FQQpRmwRtwInnLFgufsU4/hjS9UfftaHfM=
+=t6v6
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/spectemu/files/spectemu-0.99.3-automagic.patch b/app-emulation/spectemu/files/spectemu-0.99.3-automagic.patch
new file mode 100644
index 000000000000..6e813d6373e5
--- /dev/null
+++ b/app-emulation/spectemu/files/spectemu-0.99.3-automagic.patch
@@ -0,0 +1,31 @@
+--- configure.in
++++ configure.in
+@@ -121,13 +121,22 @@
+ dnl -----------------------------------------------------------
+ dnl Check for SVGALIB
+ dnl -----------------------------------------------------------
+-AC_CHECK_LIB(vga, vga_setmode, no_vga="", no_vga=yes)
+-if test "$no_vga" != yes; then
+-   progs="$progs vgaspect"
+-   vgalib=-lvga
+ 
+-   LIBS="$vgalib $olibs"
+-   AC_CHECK_FUNC(vga_runinbackground_version, AC_DEFINE(RUN_IN_BACKGROUND))
++svgalibs=""
++withsvga=no
++AC_ARG_WITH(svga,
++[  --with-svga         Compile with svga library],
++[if test "$withval" = no; then withsvga=no; fi])
++
++if test "$withsvga" = yes; then
++  AC_CHECK_LIB(vga, vga_setmode, no_vga="", no_vga=yes)
++  if test "$no_vga" != yes; then
++     progs="$progs vgaspect"
++     vgalib=-lvga
++
++     LIBS="$vgalib $olibs"
++     AC_CHECK_FUNC(vga_runinbackground_version, AC_DEFINE(RUN_IN_BACKGROUND))
++  fi
+ fi
+ 
+ LIBS="$olibs"
diff --git a/app-emulation/spectemu/files/spectemu-0.99.3-build.patch b/app-emulation/spectemu/files/spectemu-0.99.3-build.patch
new file mode 100644
index 000000000000..1c354a5fa933
--- /dev/null
+++ b/app-emulation/spectemu/files/spectemu-0.99.3-build.patch
@@ -0,0 +1,34 @@
+--- Makefile.in
++++ Makefile.in
+@@ -44,17 +44,19 @@
+ 	./mkinstalldirs $(i_bindir) $(i_mandir)
+ 
+ install_prog: $(progs)
++	mkdir -p $(i_bindir)
+ 	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:
++	mkdir -p $(i_mandir)
+ 	$(INSTALL_DATA) ./xspect.1 $(i_mandir)
+ 	$(INSTALL_DATA) ./tapeout.1 $(i_mandir)
+ 	(cd $(i_mandir); rm -f vgaspect.1; ln -s xspect.1 vgaspect.1)
+ 
+-install: installdirs install_prog install_man
++install: install_prog install_man
+ 
+ z80_c_objs=z80.o z80optab.o z80_step.o spperif.o spect.o rom48.o \
+            z80_op1.o z80_op2.o z80_op3.o z80_op4.o z80_op5.o z80_op6.o
+@@ -88,7 +90,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-r1.ebuild b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
new file mode 100644
index 000000000000..aa8dde0766c0
--- /dev/null
+++ b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/11/06 15:07:48 kensington Exp $
+
+EAPI=4
+
+inherit autotools 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"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="readline svga +X"
+
+REQUIRED_USE="|| ( svga X )"
+
+DEPEND="X? ( >=x11-proto/xf86vidmodeproto-2.2.2
+		>=x11-proto/xextproto-7.0.2
+		>=x11-proto/xproto-7.0.4
+		>=x11-libs/libX11-1.0.0
+		>=x11-libs/libXext-1.0.0
+		>=x11-libs/libXxf86vm-1.0.0 )
+	readline? ( sys-libs/readline )"
+RDEPEND="${DEPEND}
+	svga? ( media-libs/svgalib )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-automagic.patch
+	epatch "${FILESDIR}"/${P}-build.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with readline) \
+		$(use_with svga) \
+		$(use_with X x)
+}
+
+src_install() {
+	emake install_root="${D}" install
+}