Update ebuild to EAPI5 and a few other improvements based on suggestions by

Julian Ospald (hasufell).

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x0720FC74

4 files changed, 28 insertions, 14 deletions

diff --git a/games-simulation/corsix-th/ChangeLog b/games-simulation/corsix-th/ChangeLog
index 611361d101b3..5a3acc89c4ae 100644
--- a/games-simulation/corsix-th/ChangeLog
+++ b/games-simulation/corsix-th/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-simulation/corsix-th
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/corsix-th/ChangeLog,v 1.1 2013/07/27 11:41:13 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/corsix-th/ChangeLog,v 1.2 2013/07/28 21:02:57 miknix Exp $
+
+  28 Jul 2013; Angelo Arrifano <miknix@gentoo.org> corsix-th-0.21-r1.ebuild,
+  metadata.xml:
+  Update ebuild to EAPI5 and a few other improvements based on suggestions by
+  Julian Ospald (hasufell).
 
 *corsix-th-0.21-r1 (27 Jul 2013)
 
diff --git a/games-simulation/corsix-th/Manifest b/games-simulation/corsix-th/Manifest
index e4d7c462ad83..e07e00b597a3 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 AUX corsix-th-0.21-naming.patch 796 SHA256 abb543ab7dd58b212198227c95855d29e10d179434d6043fca856c3576ffe39a SHA512 20fd934258fc13bed37b9b4816fb2bbcaf54e610bdb2e4ac759a8bca7f87e628b82e86933644081aaad65b7a7e767adcbea06c8563a0f3c96b189afb49ce4aa7 WHIRLPOOL 78638e2254b79856cfab5b56a47f0496d4bfd5f2f57dba3c30ad18c8dd9632806897bc21681611c239d3ade6e3ec9e59d48ca4843b920e3694d6ad8aec206a8a
 AUX corsix-th-nodoc.patch 478 SHA256 361f21bc204ccb157199eff6b4c88ea64b243fe5940b9272903561803058c7b1 SHA512 708813e00a0f09ccd8c6546b3cad91f8008ee1facf7b5f68a50ab99c5c8b76b7063958b85737c7ee9008aaab9f2d5a8544b793571e07be970549be0025b22211 WHIRLPOOL a3a289486833a9b8fd890b01bd226249ca4cee76c8741478e29decf7e0167b81b5a297b19a2d65ad83012ee195fffeeb1ea582f02bb9c399e198f7387a2aaa4e
 DIST CorsixTH-0.21-Source.tar.gz 3908197 SHA256 9a8b54644e614dc13d4b5d97bf023b8e023e0186f931695b8f4ec7e4577a4ead SHA512 6f75772a7af0a09d216f042eda437e4159061637b404c0282472dab4751b7d515e25c6a922bb51051cfe7c351396491ac68d7969e3f37dafb1862fb6c85b6b52 WHIRLPOOL 69e3a57581e0a7446fda839284d2200ed8be559403504a42cfa187c8180689b175a96fb7b15b2b124ac3605dd936190f8ee882f4ea464acdc81157f598b0b20a
-EBUILD corsix-th-0.21-r1.ebuild 1509 SHA256 13988615373870d8a801ab4f73563f4a25d72ff04bb8d3ad748b8c6dd67d5959 SHA512 0d18260c59e606d2186f43dbcf1ba215bbb0bf5aae9c0e22e5c5fe5cd3d4561e79e4ba39baaf3e10beb1927504bd9bce75bd5e1d487aae74b72e5212e1f1ee72 WHIRLPOOL 7d4789ea69d86e9fa2d116f43b02dcd5d328436e5042da0cb9c0328cb320922b84bcf038c959fd3c3d61e302aa8fde7b680baf6ba13019e019feb25843fde83d
-MISC ChangeLog 443 SHA256 a2d6a148d5acafb4a9600898e7d9de52b212650ce1a8ba8096d27033ec9efeda SHA512 f543ea066a638da796d7f5ad3b06cd33c456a6d90e5a8508c2ce727daa59e7b5f0e8f37640f9fa04f704e32319261d9b502195d4b4b92d17a07f6a1808b59eb2 WHIRLPOOL d724b257af05ef9ff694ef616502f32dddb68d164f442a8f1c1b0dbb24061e8fcb1104409360bc2ef0637ec9593f110768326fdbd8126e24068c334ebf68d7a8
-MISC metadata.xml 848 SHA256 b22330ed1bd0457aa6c3860b76a10619a6fd5079681a55805d30ebba8bdef564 SHA512 c1bda026af3439bce60150e1019cd4604d78a4ea4b7201d9655f42578452ed58073844ed5baf5c02368495e07cb1e3034ea5f6446025141e886694a39fc6579a WHIRLPOOL 1e9af821c2f9d834b2c94be69a0d9cee3a88c46ee594ab9973cb7545bf116f9e0f2d528ede6ef68de840c2ead04a3e076ddb24e77c94994eaa8f85f471b767ee
+EBUILD corsix-th-0.21-r1.ebuild 1660 SHA256 527556a0511497449f9a3b181b56a8382b531733fa2dece6b5e15531170c65f8 SHA512 5475ac6cf3913d0628917f13efec6d7cfed16a675b366b5d02ae2db10ced610f74109c8dcf19523e10632aa64cc924ce0f71e300b196c61d5e44ff3faaf27191 WHIRLPOOL 0512fddf4f942272e1f1b054315458986438b2ea2521f64658738ecbafe427a89bb2c84112619566ed0e8e19a32681935c4635d25ef805bd76afb76060cd824b
+MISC ChangeLog 643 SHA256 f2635de4379a1abcafe2809642ddd5af6158db6b2ff52d8e40b19cf6ffc2b7b2 SHA512 fa294cab300653b308de5ca39b65930be5c4f69b90d559d4fa700a1f766d08b0f2f18fdfaddc914e3f86d7971ee08919648deb31d7ad195d5638cebcc23794a0 WHIRLPOOL 4102f481c11f4d53847f0056472406e955a25dfa21c0affcf011eb77120288361245d182128caecff0143a60970fe5f8720503325b9055f54bd05cccc40d8cd5
+MISC metadata.xml 924 SHA256 cc3e41ab202fb5ce7da399fc853dde78c88246aa139bc05c5b0ac4c11fe531a3 SHA512 2c2c1df47731364168abdf2048dd95a91d79bc62f2264edfa9bf5c4138c3d493650257f9c23caaa68213b8cc9bc8122b6ce089bbb482ef4ae383058ba59605c7 WHIRLPOOL 1dafb9c968572c6f9afeabd6c69353da5058f3c9184bb295c57265de0fad4d6fd2b0634d468fdf2d20154e73c2aba1a162b106a8291e46f2cec93b76ae848253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHzsd8ACgkQbkqODQcg/HTt+wCeNbbGTLmEEaGnfNj3nYG8S6J5
-asgAnjpYvWsxxTzDu0uk8p3268Mn+KbF
-=uSeg
+iEYEAREIAAYFAlH1ePcACgkQbkqODQcg/HTTTgCdEPBjSPUn4TZowZqZYIkiuCJx
+i7AAnAnIIUiTNh5xVHVgYmYAk3qPgK49
+=nyPh
 -----END PGP SIGNATURE-----
diff --git a/games-simulation/corsix-th/corsix-th-0.21-r1.ebuild b/games-simulation/corsix-th/corsix-th-0.21-r1.ebuild
index 7a744f39990f..710af26e8191 100644
--- a/games-simulation/corsix-th/corsix-th-0.21-r1.ebuild
+++ b/games-simulation/corsix-th/corsix-th-0.21-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/corsix-th/corsix-th-0.21-r1.ebuild,v 1.1 2013/07/27 11:41:13 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/corsix-th/corsix-th-0.21-r1.ebuild,v 1.2 2013/07/28 21:02:57 miknix Exp $
 
-EAPI=3
+EAPI=5
 
-inherit games cmake-utils
+inherit eutils cmake-utils games
 
 MY_P="CorsixTH-${PV}-Source"
 
@@ -15,14 +15,16 @@ SRC_URI="http://corsix-th.googlecode.com/files/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+ffmpeg truetype opengl +sdl +sound"
+IUSE="+ffmpeg truetype opengl +sdl +sound +midi"
+REQUIRED_USE="|| ( sdl opengl )"
 
 RDEPEND=">=dev-lang/lua-5.1
-	media-libs/libsdl
+	media-libs/libsdl[X]
 	ffmpeg? ( virtual/ffmpeg )
 	truetype? ( media-libs/freetype:2 )
 	opengl? ( virtual/opengl )
-	sound? ( media-libs/sdl-mixer[timidity] )"
+	sound? ( media-libs/sdl-mixer )
+	midi? ( media-libs/sdl-mixer[timidity] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -45,7 +47,13 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_compile() {
+	cmake-utils_src_compile
+}
+
 src_install() {
+	cmake-utils_src_install
+
 	DOCS="CorsixTH/README.txt CorsixTH/changelog.txt" cmake-utils_src_install
 	games_make_wrapper ${PN} "${GAMES_DATADIR}/${PN}/CorsixTH" || die
 	make_desktop_entry ${PN} ${PN} \
diff --git a/games-simulation/corsix-th/metadata.xml b/games-simulation/corsix-th/metadata.xml
index 30e9fc7dbb66..58226a80ca17 100644
--- a/games-simulation/corsix-th/metadata.xml
+++ b/games-simulation/corsix-th/metadata.xml
@@ -9,7 +9,8 @@
 		<flag name='ffmpeg'>Use ffmpeg for playing in-game cutscenes.</flag>
 		<flag name='opengl'>Use OpenGL for rendering.</flag>
 		<flag name='sdl'>Use SDL for rendering.</flag>
-		<flag name='sound'>Use SDL mixer for MIDI sound.</flag>
+		<flag name='sound'>Use SDL mixer for in-game sound.</flag>
+		<flag name='midi'>Use SDL mixer and timidity for in-game music.</flag>
 		<flag name='truetype'>Use high quality fonts.</flag>
 	</use>
 	<longdescription>