EAPI=5; punt svga support

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

3 files changed, 18 insertions, 37 deletions

diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog
index 149c00ccef40..652f8ef82146 100644
--- a/games-fps/quake2-icculus/ChangeLog
+++ b/games-fps/quake2-icculus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake2-icculus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.47 2014/05/15 16:44:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.48 2014/07/04 08:19:46 mr_bones_ Exp $
+
+  04 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  quake2-icculus-0.16.1-r1.ebuild:
+  EAPI=5; punt svga support
 
   15 May 2014; Ulrich Müller <ulm@gentoo.org> quake2-icculus-0.16.1-r1.ebuild:
   Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index 0d18815cfffe..70e98870a968 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 0.16-rogue-armor.patch 312 SHA256 8198edf3c33d04cfe1cbde0ac64174f85614b1952478c39ad5986736057145a2 SHA512 0c3a5add1eeeb038054377fc3efd73c58b21498006d8d4126f3b8810f76268652a376bbf0ea4f9771e31d68a1ced3691001d2fb770def68d78ec5b507aa3f217 WHIRLPOOL d2570d92c1b6cb4a93be332b25267e3e8db3cb58b2ed91e0e39800810b3c671e29669f913f14a153b94bf2396f5e407a61684f63f3442d7f4cb84a515e4f7a60
 AUX 0.16-rogue-nan.patch 242 SHA256 9de64221141c8e9e2c519504176029a57ad627ca9b68830e53d53db31f01a3c0 SHA512 3dbd39ccb0806231c3df1ae9559226f5fe1a0035172c7a900d1894299947d522bd6df6f873fa96c0b2bffccbb935e493d7c9a847d89d1c0c99666b9a70fae4ad WHIRLPOOL cf432ca19e253ceb002598e561b783e7353d36e3f21c329c0e5a2c09e902c8b4cde03309c13478528014651204f7bc0c6ac4c4a3728235fda37ce7e296e1f3c3
 AUX README-postinstall 3083 SHA256 90f8cce0737adf8a95afac11ca30911a59801659cb5ebf29943792586eed1a45 SHA512 cc7441ce14117ea765a7df98b3de0370b251f444289fd8aaa03c97ea5b383d626088977bc30dfc7a30124dedce4796b5d6392dad7e3d203ee2257d71a9b49bfe WHIRLPOOL 32b83ba760f6cb4929ccdda6b2e68e68ed9decf71fb96e562451d79ba6218fa3a48ecbbe1a648e773a17b923f9c3b14e74e2d75e17e89e0ac6a40b7788560835
@@ -18,20 +15,6 @@ DIST maxpak.pak 3282742 SHA256 653569fe880f1ed5f7529483ac961b22078482e6ff0e83f4d
 DIST quake2-r0.16.1.tar.gz 1525384 SHA256 49f4d3d53772b6ffd7733506f5d121c7893bfd8884133bfc36a28039c0744642 SHA512 63e8fa10446698b1f1cbd20b4bbfeec75d7620cb6454bb90b853cd2a3d6cd9040041a164666a5e015c3a8289423127f9164b500f57793505f6e4671dec932cf2 WHIRLPOOL 017d0c6add0302fa2f74bc4b2603fff36589417ac7fd150429f8e83be846bef53695ac4edaa22ec5a8b38cf2aaf73ea733e1e142d8e8a0cc778826753dc96b14
 DIST roguesrc320.shar.Z 626769 SHA256 ceefb2fd748961cb0bc3244220f3eb09d8f7b8ca2eb32cdf9b284727a2fdc919 SHA512 330db4966b758b8e363eb8d699b30ce5ec7d9fa581936288e7267000d0815996388adebc0206a8903734cdc1c5658616b15518a2bf888ad9e6059f8155960141 WHIRLPOOL 84430a1596179086cc440196974f83e13edff52378c8418d84e46bcd78f5e6856aa1a8b6a9e1a9e5496c1845ca19b3af6be346661580601e6581920529109dbd
 DIST xatrixsrc320.shar.Z 455917 SHA256 94bf596cd85d38ea294b99ccb0ebb5e4b9776cca335001b3803e2d8407395589 SHA512 6723440d3cfdaf7f9b260d5777d9823937a4c3ee800c8c204e8a5c3d29f2b37f6bdc7c0786025a19d040b5692aa54b99b9db2dc121bc0ca2b53c8763b4ab4dfa WHIRLPOOL d5254a11f49ecd0cc341d6b51cc31bd6d43597e0341df09662849e235a07452eef80fc881983ed34bcfd47fca575e8592aa306f53a3b82d1464167b16cee4fed
-EBUILD quake2-icculus-0.16.1-r1.ebuild 5646 SHA256 740e212eeb8a79d93bb0296467020217ccd182e1ff768ff641b9ab123c4378e4 SHA512 b9f304e147e54b0aee92547b05c3f7c33449d5fd6ff11bafa9afcdb6413bfc06e96c291e91a016ef7cf3c1c46670cba639bd4180b27eceb7022d08eef421c248 WHIRLPOOL e16f621b2c23abf3135c6d35dbfb7f6caf57b270ce97b9fa799e3a615ece44b79acdb98127022ce8dec9cb630dd01134b9d1277e75ac80da57df48c420382a48
-MISC ChangeLog 8489 SHA256 29cf94343f7c94920e914b343a58d64062bdc62cd004b8da954587ce511db243 SHA512 625d453715db92d89a6cd42bfc27ebbe8e9fa1f5d75afc0729f899ce2b3faf14cfdc98a06d768e9888dc9133ce3c591574b49eb1fe0585f7a0bff4814ea99c81 WHIRLPOOL 3acc2f1f35a2f5683ef7e54a138817c8a6ba58ed3a2354ba2717bfacddbb8d0d7bf92bc34d5517e5fd3426c6780e51020c42dcedae631fc143568007e2b81ad1
+EBUILD quake2-icculus-0.16.1-r1.ebuild 5480 SHA256 a1ac923898c3dcabab7ea6057175854deaecaa3d5fd1fb776d24bd4081618fb5 SHA512 30788e9015ed968816b88afd4831f3e214cc497ed8a7cdc5f9e57ab9dee4b4c2f2591f085c48ad1d74620ae7eb872d11ecd97577f41f72cebf8119f53bee4523 WHIRLPOOL cd239879acc4a1d67a9fbf7daa5428c653bb4cf51a20b1d7de58b33fac44ad60fcc776f520d50d9d41ebc994f38f7b968869d34db86bbd8dbc02e44990127cf5
+MISC ChangeLog 8614 SHA256 13070e7eb96ccfec13768d24fe9cd4308744dc6fc7ade23e2d9b56d5c7774c0d SHA512 3a4accd77dcac665f67b4932e9b20a277b955aab4919735636ddfafdf9cd623423794a24c08149c7832158e316039d3bae8c606518b0c80a507b4a998d309013 WHIRLPOOL 53ad10de7a15699e94c6d23e553689604213661db9a6d0098b4517165c163df448ec6fc245ef4678aecd6cdc2a8a63fd8d6cea827714d2a4f8ff07412dc0063f
 MISC metadata.xml 513 SHA256 0608a118c068c5cb15473fc3ee2c6338b6a6330ee2063d1d2b6864c57a761e2c SHA512 ea99d61d4c0b39f1e403edcfdd56dbaa117450748c9136885ec1828b760605e4c064e02c04e73d9a5339ffdb5cf8581794cc5a40dc5ab601b6e3edab06361cac WHIRLPOOL fd818babc2cad1f17a1423c6292b8c85ddf61bc0a10b00e52f83ec1c442953fd919eb7637b7afd1304a805d8371b32bdc232ae3601a926be82b49dfff2144e61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQGcBAEBCAAGBQJTdO8PAAoJEJQzkH1pP7W42SYL/jpizgEdPNKXqIbbDCfE+ySr
-s1u/7tnZOb8a95KDt+fXYIfThPEhJ+YnMcai4Qho7kVbhhZNw9/F/momvaA8GoeV
-U55b/yX4b9lGeT3O6K8575hyOHrsrqX3ZMnwTVjoXzSh4jYtvzib831z5Mhh0Gxv
-FNmXvo2Vwi9VkI4DC6l4PHR3g4wZfhL1xh4iwEjYG6WMwnxEuW16YAtYfzochUC3
-FqypXOsmCOmXM9Byr/NEFlUGtwR5I3UJEB6aXEeOJiBH9X7g5zr3CpHfarV91x1Z
-XSnXJR327tNmnZYpkSRmYq4yd7GRbw7LKug4ZsQLDVkYvHCuPYxLaDDapceIcXd0
-nSmInGW8e8OZmEq1Xp4nHZmTgBiG8U3yOBH5hcSC67TGlpPMSGddRDhJZRnrhwSq
-n7K/oFSeFAZI4HY2hCsBDi08+PahVnLoyJUKwBO+a2Jhytx2zvLLCPsw4J+pz0DM
-Y54CJlDEL29fsPlXhNevaVmOkVrHGDP7BhUD9YsIrg==
-=fY1p
------END PGP SIGNATURE-----
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
index 79f578d3a34e..2566266fac29 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.28 2014/05/15 16:44:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.29 2014/07/04 08:19:46 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils toolchain-funcs games
 
 MY_P="quake2-r${PV}"
@@ -16,12 +16,11 @@ SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc sparc x86 ~x86-fbsd"
-IUSE="aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl svga X xatrix"
+IUSE="aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl X xatrix"
 
 UIDEPEND="aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	opengl? ( virtual/opengl )
-	svga? ( media-libs/svgalib )
 	sdl? ( media-libs/libsdl[sound,joystick?,video] )
 	X? (
 		x11-libs/libXxf86dga
@@ -62,16 +61,12 @@ src_prepare() {
 		mkdir -p src/${g}
 		pushd src/${g}
 		local shar=../../../${g}src320.shar
-		sed -i \
-			-e 's:^read ans:ans=yes :' ${shar} \
-			|| die "sed ${shar} failed"
+		sed -i -e 's:^read ans:ans=yes :' ${shar} || die
 		echo ">>> Unpacking ${shar} to ${PWD}"
-		env PATH="${T}:${PATH}" unshar ${shar} || die "unpacking ${shar} failed"
+		env PATH="${T}:${PATH}" unshar ${shar} || die
 		popd
 	done
-	sed -i \
-		-e 's:jpeg_mem_src:_&:' \
-		src/ref_candygl/gl_image.c || die
+	sed -i -e 's:jpeg_mem_src:_&:' src/ref_candygl/gl_image.c || die
 
 	sed -i -e 's:BUILD_SOFTX:BUILD_X11:' Makefile || die
 	# -amd64.patch # make sure this is still needed in future versions
@@ -116,10 +111,10 @@ src_compile() {
 		[[ ${BUILD_QMAX} == "YES" ]] \
 			&& libsuffix=-qmax \
 			|| libsuffix=
-		make clean || die "cleaning failed"
+		emake -j1 clean
 		emake -j1 build_release \
 			BUILD_SDLQUAKE2=$(yesno sdl) \
-			BUILD_SVGA=$(yesno svga) \
+			BUILD_SVGA=NO \
 			BUILD_X11=$(yesno X) \
 			BUILD_GLX=$(yesno opengl) \
 			BUILD_SDL=$(yesno sdl) \
@@ -138,8 +133,7 @@ src_compile() {
 			DEFAULT_BASEDIR="${GAMES_DATADIR}/quake2" \
 			DEFAULT_LIBDIR="$(games_get_libdir)/${PN}${libsuffix}" \
 			OPT_CFLAGS="${CFLAGS}" \
-			CC="$(tc-getCC)" \
-			|| die "make failed"
+			CC="$(tc-getCC)"
 		# now we save the build dir ... except for the object files ...
 		rm release*/*/*.o
 		mv release* my-rel-${BUILD_QMAX}
@@ -176,7 +170,7 @@ src_install() {
 	if use qmax ; then
 		dodir "${q2maxdir}"
 		cp -rf my-rel-YES/* "${D}/${q2maxdir}"/ || die
-		newgamesbin "${D}/${q2maxdir}"/quake2 quake2-qmax || die
+		newgamesbin "${D}/${q2maxdir}"/quake2 quake2-qmax
 		rm "${D}/${q2maxdir}"/quake2
 		use dedicated \
 			&& newgamesbin "${D}/${q2maxdir}"/q2ded q2ded-qmax \
@@ -186,7 +180,7 @@ src_install() {
 			&& rm "${D}/${q2maxdir}"/sdlquake2
 
 		insinto "${q2maxdir}"/baseq2
-		doins "${DISTDIR}"/maxpak.pak || die
+		doins "${DISTDIR}"/maxpak.pak
 
 		make_desktop_entry quake2-qmax Quake2-qmax quake2
 	fi