games-fps/gzdoom: Migrate to EAPI 5. Remove unfetchable version.

5 files changed, 15 insertions, 224 deletions

diff --git a/games-fps/gzdoom/ChangeLog b/games-fps/gzdoom/ChangeLog
index 15e180efc..3ed05ecfa 100644
--- a/games-fps/gzdoom/ChangeLog
+++ b/games-fps/gzdoom/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for games-fps/gzdoom
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Jun 2013; Michael Palimaka <kensington@gentoo.org> -gzdoom-1.5.5.ebuild,
+  gzdoom-9999.ebuild, -files/gzdoom-1.5.5-fix-new-fmod.patch:
+  Migrate to EAPI 5. Remove unfetchable version.
+
   21 Feb 2012; Mike MacDonald (crazymykl) <crazymykl@gmail.com>
   gzdoom-9999.ebuild, +files/gzdoom-respect-fluidsynth-useflag.patch.old,
   files/gzdoom-respect-fluidsynth-useflag.patch:
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 27ff8b23b..df85b2253 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,8 +1,5 @@
-AUX gzdoom-1.5.5-fix-new-fmod.patch 4755 RMD160 1c134cc67a76b4429de9fd4af5787fb4680ffb37 SHA1 b681ccab370c3e60f3e8ac31629bfd87c85b6c1f SHA256 3f5934cc3841fd21a00a27d3c4ff5dfd8edf5b44aa981c00c6969138d47aa0b7
-AUX gzdoom-9999-fix-new-fmod.patch 4019 RMD160 3f3e43edff91dbb506ae10ac06d203dfd1ea8b93 SHA1 3091ac26e43d07827d8dc1e86e2ca6bfac151bb2 SHA256 b50b933ff655f2fdbb23ee8c905307c0783eddbd499d0963d204c97143603a4b
-AUX gzdoom-respect-fluidsynth-useflag.patch 582 RMD160 27d0aea80743f2d3927feece4e548ef2ca45f643 SHA1 e54d25efcbb92729e7464d931f27aaefeca99e53 SHA256 67d1638278fd83c7a5a6b679c5c57342440c1f053825ede3c71b796c6259de4b
-DIST gzdoom-1.5.5.tar.bz2 3679401 RMD160 ed361d9e49ad96e621b7aac8d6cf286d19f70ef4 SHA1 177ba109850f076ef49d792ae02480aea2b50b12 SHA256 a28afe74fa0a99714159884d3ec88db3b752cb6ba34db2e41f8a40ed64cdac4f
-EBUILD gzdoom-1.5.5.ebuild 1853 RMD160 d4da9a14bab843571fe518311e7698fff5421d16 SHA1 58189f5faaa7a3b74698c5ca92fae0c4ac2834e3 SHA256 e8c7ec0cd7b3e79c9aacae90cb67606d302039e914b3e513ec87830b04fd4b6c
-EBUILD gzdoom-9999.ebuild 1955 RMD160 51e50283927a6d580fa259e45931ab61c70252fe SHA1 bc8ac1ab0896de1778c02b610f17cd48422f52c3 SHA256 c0709ef60b54ddee1b65cd18b761d67c09261099751b51298478367ed4445b31
-MISC ChangeLog 2863 RMD160 ab166e59f563dacb7ac0d08eac706d631728646a SHA1 18eedbc7fa3bb37821d5bfaa3e9b0d70905e2b17 SHA256 1ce08b31f7a239ea25fabb3484a2be1146e1e4a8be19af3ee51145614816620b
-MISC metadata.xml 293 RMD160 93f2f41306368e2ecaf009304527702be3e8dfa7 SHA1 2acf22407b99accddad16d864fa8660334dbc302 SHA256 2fe2749f64960afa7a1e8473fe7c10661c49ba7b047bb931e528bb94ddf757e0
+AUX gzdoom-9999-fix-new-fmod.patch 4019 SHA256 b50b933ff655f2fdbb23ee8c905307c0783eddbd499d0963d204c97143603a4b SHA512 73594dcd0dccfc18b90c7ab1380344bde04e068b1f68053842458e6520621826219bb3747a6e823800e664d705dd6916766ce3b469b2fc98c6a1ec563470477b WHIRLPOOL 51bf4a0e5ebee8f75d0ce5f58d5cd2bee1aa4a7997862a86518d146b133ae2eb580167e7f4ee3f1476f3d869678129919528ee308e26bc3ddf61b16ec909673a
+AUX gzdoom-respect-fluidsynth-useflag.patch 582 SHA256 67d1638278fd83c7a5a6b679c5c57342440c1f053825ede3c71b796c6259de4b SHA512 12af4f6e9f19e898d07ac45adc6c640d6084182ac19537a96d8e3007be559b874e22ed581c0ae656d138a7b0ca183205cb65aa30d4e5ce1fccc1f9825bbb471e WHIRLPOOL 5450d428199ab08ea18430e358ad556ebf04b29dce90c407426347db760b1000f6f885612b6cbb8f88ca337c46c55b8379001d1c239c313417c66c7385100775
+EBUILD gzdoom-9999.ebuild 1934 SHA256 742790cb9dd137318a1411c029eb2bab7354dd52d053a766fb7f1fa65e748849 SHA512 00bd8fd472485c2f10a921b3c0cfb32595438ea147a86101a44bdbd23185ee608e4779a34b4cb86b37bdc9418f4d8c2378cf0914f0c976bdf36f60fc29e299f9 WHIRLPOOL d58de39137346d50e8d3fb62eb5bd3ed203f9314c25b942bfcd27f06f4ba6d15d82b548017a1fb19744497046309424ada05b48eb0ee3c78c4405d664c4f4254
+MISC ChangeLog 3053 SHA256 f2e11d0eee30bd6576917162a23ab038e4c9ac317dc2e81e6dbb12c0d94278e5 SHA512 ddefb015fc29c9cf92fb72200e88e8c58d0472a0b30083fac040d10de1c2b31fb13383a6e48fb388a7c108e9e7fe03fe80f290f8e7963ab52c6bd958063f8801 WHIRLPOOL b7b6884c6841ad45a1efe6358d51dff86d151a00570eb21813c5300e3a782907f0d46be062b74f768c0c1b2e6ac877f6f219074f61e0dbed11cf12d5b17987bd
+MISC metadata.xml 293 SHA256 2fe2749f64960afa7a1e8473fe7c10661c49ba7b047bb931e528bb94ddf757e0 SHA512 e9ebc16e50391daba006676c14dd085c822f5618843c623d64fae16f008804d1c4903104812c082a94a62963e0222cc70288fcb03c4fc92b484c50a1776e904a WHIRLPOOL a23d04070810cd9a47744325cdb86c2a864963ed8a00912194fb4cc8c4d17e4ee86b53ed07b5debf254892a83bbdca2240129e9d20a841891fc678a8da7181a1
diff --git a/games-fps/gzdoom/files/gzdoom-1.5.5-fix-new-fmod.patch b/games-fps/gzdoom/files/gzdoom-1.5.5-fix-new-fmod.patch
deleted file mode 100644
index 8d8305f6c..000000000
--- a/games-fps/gzdoom/files/gzdoom-1.5.5-fix-new-fmod.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- src/sound/fmodsound.cpp	2010-11-17 10:13:29.000000000 -0500
-+++ fmodsound.cpp.new	2011-12-16 01:48:55.361040907 -0500
-@@ -75,6 +75,14 @@
- 

- #define SPECTRUM_SIZE				256

- 

-+#if FMOD_VERSION < 0x43400

-+#define FMOD_OPENSTATE_PLAYING FMOD_OPENSTATE_STREAMING

-+#endif

-+

-+#if FMOD_VERSION < 0x43702

-+#define FMOD_INIT_HRTF_LOWPASS FMOD_INIT_SOFTWARE_HRTF

-+#endif

-+

- // TYPES -------------------------------------------------------------------

- 

- struct FEnumList

-@@ -157,7 +165,7 @@
- 	{ "Windows Multimedia",		FMOD_OUTPUTTYPE_WINMM },

- 	{ "WinMM",					FMOD_OUTPUTTYPE_WINMM },

- 	{ "WaveOut",				FMOD_OUTPUTTYPE_WINMM },

--	{ "OpenAL",					FMOD_OUTPUTTYPE_OPENAL },

-+//	{ "OpenAL",					FMOD_OUTPUTTYPE_OPENAL },

- 	{ "WASAPI",					FMOD_OUTPUTTYPE_WASAPI },

- 	{ "ASIO",					FMOD_OUTPUTTYPE_ASIO },

- 

-@@ -387,13 +395,13 @@
- 	{

- 		bool is;

- 		FMOD_OPENSTATE openstate = FMOD_OPENSTATE_MAX;

--		bool starving;

-+		bool starving, diskbusy;

- 

- 		if (Stream == NULL)

- 		{

- 			return true;

- 		}

--		if (FMOD_OK != Stream->getOpenState(&openstate, NULL, &starving))

-+		if (FMOD_OK != Stream->getOpenState(&openstate, NULL, &starving, &diskbusy))

- 		{

- 			openstate = FMOD_OPENSTATE_ERROR;

- 		}

-@@ -436,7 +444,7 @@
- 			Owner->Sys->setStreamBufferSize(16*1024, FMOD_TIMEUNIT_RAWBYTES);

- 			return result != FMOD_OK;

- 		}

--		if (JustStarted && openstate == FMOD_OPENSTATE_STREAMING)

-+		if (JustStarted && openstate == FMOD_OPENSTATE_PLAYING)

- 		{

- 			JustStarted = false;

- 		}

-@@ -479,15 +487,15 @@
- 		FMOD_OPENSTATE openstate;

- 		unsigned int percentbuffered;

- 		unsigned int position;

--		bool starving;

-+		bool starving, diskbusy;

- 		float volume;

- 		float frequency;

- 		bool paused;

- 		bool isplaying;

- 

--		if (FMOD_OK == Stream->getOpenState(&openstate, &percentbuffered, &starving))

-+		if (FMOD_OK == Stream->getOpenState(&openstate, &percentbuffered, &starving, &diskbusy))

- 		{

--			stats = (openstate <= FMOD_OPENSTATE_STREAMING ? OpenStateNames[openstate] : "Unknown state");

-+			stats = (openstate <= FMOD_OPENSTATE_PLAYING ? OpenStateNames[openstate] : "Unknown state");

- 			stats.AppendFormat(",%3d%% buffered, %s", percentbuffered, starving ? "Starving" : "Well-fed");

- 		}

- 		if (Channel == NULL)

-@@ -819,7 +827,7 @@
- 		result = Sys->setDriver(driver);

- 	}

- 	result = Sys->getDriver(&driver);

--	result = Sys->getDriverCaps(driver, &Driver_Caps, &Driver_MinFrequency, &Driver_MaxFrequency, &speakermode);

-+	result = Sys->getDriverCaps(driver, &Driver_Caps, &Driver_MaxFrequency, &speakermode);

- 	if (result != FMOD_OK)

- 	{

- 		Printf(TEXTCOLOR_BLUE"Could not ascertain driver capabilities. Some things may be weird. (Error %d)\n", result);

-@@ -899,7 +907,7 @@
- 	initflags = FMOD_INIT_NORMAL;

- 	if (snd_hrtf)

- 	{

--		initflags |= FMOD_INIT_SOFTWARE_HRTF;

-+		initflags |= FMOD_INIT_HRTF_LOWPASS;

- 	}

- 	if (snd_profile)

- 	{

-@@ -991,7 +999,7 @@
- 	}

- 	else

- 	{

--		result = Sys->createDSPByType(FMOD_DSP_TYPE_REVERB, &WaterReverb);

-+		result = Sys->createDSPByType(FMOD_DSP_TYPE_SFXREVERB, &WaterReverb);

- 		if (result != FMOD_OK)

- 		{

- 			Printf(TEXTCOLOR_BLUE"  Could not create underwater reverb unit. (Error %d)\n", result);

-@@ -1058,8 +1066,8 @@
- 								result = sfx_head->addInput(WaterReverb, NULL);

- 								if (result == FMOD_OK)

- 								{

--									WaterReverb->setParameter(FMOD_DSP_REVERB_ROOMSIZE, 0.001f);

--									WaterReverb->setParameter(FMOD_DSP_REVERB_DAMP, 0.2f);

-+									//WaterReverb->setParameter(FMOD_DSP_REVERB_ROOMSIZE, 0.001f);

-+									//WaterReverb->setParameter(FMOD_DSP_REVERB_DAMP, 0.2f);

- 									WaterReverb->setActive(false);

- 								}

- 							}

-@@ -1210,7 +1218,7 @@
- 		Printf ("Driver: "TEXTCOLOR_GREEN"%d"TEXTCOLOR_NORMAL" ("TEXTCOLOR_ORANGE"%s"TEXTCOLOR_NORMAL")\n", driver, name);

- 		DumpDriverCaps(Driver_Caps, Driver_MinFrequency, Driver_MaxFrequency);

- 	}

--	if (FMOD_OK == Sys->getHardwareChannels(&num2d, &num3d, &total))

-+	if (FMOD_OK == Sys->getHardwareChannels(&total))

- 	{

- 		Printf (TEXTCOLOR_YELLOW "Hardware 2D channels: "TEXTCOLOR_GREEN"%d\n", num2d);

- 		Printf (TEXTCOLOR_YELLOW "Hardware 3D channels: "TEXTCOLOR_GREEN"%d\n", num3d);

-@@ -1253,6 +1261,7 @@
- 	{

- 		Printf("\n");

- 	}

-+	/*

- 	if (caps & FMOD_CAPS_REVERB_EAX2)				Printf(TEXTCOLOR_OLIVE "   EAX2");

- 	if (caps & FMOD_CAPS_REVERB_EAX3)				Printf(TEXTCOLOR_OLIVE "   EAX3");

- 	if (caps & FMOD_CAPS_REVERB_EAX4)				Printf(TEXTCOLOR_OLIVE "   EAX4");

-@@ -1261,7 +1270,7 @@
- 	if (caps & (FMOD_CAPS_REVERB_EAX2 | FMOD_CAPS_REVERB_EAX3 | FMOD_CAPS_REVERB_EAX4 | FMOD_CAPS_REVERB_EAX5 | FMOD_CAPS_REVERB_I3DL2))

- 	{

- 		Printf("\n");

--	}

-+	}*/

- 	if (caps & FMOD_CAPS_REVERB_LIMITED)			Printf("TEXTCOLOR_OLIVE    Limited reverb\n");

- }

- 

diff --git a/games-fps/gzdoom/gzdoom-1.5.5.ebuild b/games-fps/gzdoom/gzdoom-1.5.5.ebuild
deleted file mode 100644
index c8f654e84..000000000
--- a/games-fps/gzdoom/gzdoom-1.5.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit games cmake-utils eutils
-
-DESCRIPTION="Enhanced OpenGL port of the official DOOM source code that also supports Heretic, Hexen, and Strife"
-HOMEPAGE="http://grafzahl.drdteam.org/"
-SRC_URI="http://omploader.org/vNjdnZw/${P}.tar.bz2"
-
-LICENSE="DOOMLIC BUILDLIC BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mmx gtk fluidsynth"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	fluidsynth? ( media-sound/fluidsynth )
-	media-libs/flac
-	media-libs/fmod:1
-	virtual/glu
-	virtual/jpeg
-	virtual/opengl
-	media-libs/libsdl"
-
-DEPEND="${REPEND}
-	mmx? ( || ( dev-lang/nasm dev-lang/yasm ) )"
-
-src_prepare() {
-	# Use default game data path"
-	sed -i \
-		-e "s:/usr/local/share/:${GAMES_DATADIR}/doom-data/:" \
-		src/sdl/i_system.h || die
-	epatch "${FILESDIR}/${PN}-respect-fluidsynth-useflag.patch"
-	epatch "${FILESDIR}/${P}-fix-new-fmod.patch"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_no mmx ASM)
-		$(cmake-utils_use_no gtk GTK)
-		$(cmake-utils_use_use fluidsynth FLUIDSYNTH)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	dodoc docs/*.{txt,TXT} || die
-	dohtml docs/console*.{css,html} || die
-
-	cd "${CMAKE_BUILD_DIR}" || die
-	dogamesbin ${PN} || die
-
-	insinto "${GAMES_DATADIR}/doom-data"
-	doins ${PN}.pk3 || die
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "Copy or link wad files into ${GAMES_DATADIR}/doom-data/"
-	elog "(the files must be readable by the 'games' group)."
-	elog
-	elog "To play, simply run:"
-	elog "   gzdoom"
-	elog
-	if use fluidsynth && ! has_version media-sound/fluid-soundfont; then
-		ewarn "You may need to install media-sound/fluid-soundfont"
-		ewarn "for fluidsynth to play music, depending on your sound card."
-	fi
-	elog "See /usr/share/doc/${P}/zdoom.txt.bz2 for more info"
-}
diff --git a/games-fps/gzdoom/gzdoom-9999.ebuild b/games-fps/gzdoom/gzdoom-9999.ebuild
index 7fb18c27b..151a18f18 100644
--- a/games-fps/gzdoom/gzdoom-9999.ebuild
+++ b/games-fps/gzdoom/gzdoom-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="5"
 
 inherit games cmake-utils subversion eutils
 
@@ -50,14 +50,14 @@ src_configure() {
 }
 
 src_install() {
-	dodoc docs/*.{txt,TXT} || die
-	dohtml docs/console*.{css,html} || die
+	dodoc docs/*.{txt,TXT}
+	dohtml docs/console*.{css,html}
 
 	cd "${CMAKE_BUILD_DIR}" || die
 	dogamesbin ${PN} || die
 
 	insinto "${GAMES_DATADIR}/doom-data"
-	doins ${PN}.pk3 || die
+	doins ${PN}.pk3
 
 	prepgamesdirs
 }