[games-action/d2x-rebirth] audio -> sound (bug #357661), cleanup.

Package-Manager: portage-2.2.8-r1
Manifest-Sign-Key: A018DE8C

5 files changed, 14 insertions, 117 deletions

diff --git a/games-action/d2x-rebirth/Manifest b/games-action/d2x-rebirth/Manifest
index 6355ad3..85cd5e0 100644
--- a/games-action/d2x-rebirth/Manifest
+++ b/games-action/d2x-rebirth/Manifest
@@ -1,5 +1,14 @@
-DIST d2x-rebirth_v0.57.3-src.tar.gz 1353869 SHA256 ec9c1fdfe043c71ea13600544e7d3bb1404c656bd690d3ec5d4b84df6bb3ca7b SHA512 6c8b165222c49d966a9dddc6d8aed6511b858a346899c5b7708fc30fb518103514ae03707857854d732a0af8ea81ee0a4df3797b61515f8d091622457dfbece5 WHIRLPOOL c82db780efcf46969390266578f5d423e73fb63c812e75adda728e40298ab86d49305c24a6d24b5ccc923385a2bfa1c4727eaa07b6261b074eccb001936033c8
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST d2x-rebirth_v0.58.1-src.tar.gz 1375376 SHA256 a8ebb1a17302380e933e9a4a9208290acd5e21054737c090013b30a7c240af22 SHA512 19281c8dc554d595f6c40cbef2f4921c6325cd736ec648cb1abf60ad6a339e59b882b8a1426987f7bcfb8413c78bbda9b6f7fa86a6ff8927550a37d0290873fd WHIRLPOOL 6a1d830cca9a3a3a68e401e2804f4e1c64220cb68737c8a8610efa897c1a79b83f4290f3a193de67f1d5c7b2f9482043975bc0e16fbeb0a21cc26c990c7ab460
 DIST d2xr-briefings-ger.dxa 11717 SHA256 e190321e657c1ad55998b91d610534fd0275f29ab12fe56018e47d3e603704f9 SHA512 479aa577dc65271c705e80404ec46e6c59ee3a5122d6e9705dbdd16b71b16c0d3447426e3e74937aa20eb7026f67a3896c5e814fbfcede9164bd557b6eb8423c WHIRLPOOL 65093403524bd82fb4396a5cabf9317effdaf447f18e421b6a59642103bc690ddaa240e0d2db3fbfe1a4bbd83d9f62bfe5b70fdfe8dc76f0cfe00433d25a9e1f
 DIST d2xr-opl3-music.dxa 22710919 SHA256 6890c6cf8a40c30a2b88339fe1affd25d210e45b504b0f0f76dba7ba97f813d7 SHA512 876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86 WHIRLPOOL 86cccdbe071654b7f3ba2f774c762b3ab81797916e8a2053466320a54693a1913de9a6759eb29a4acde5a5611c58d1371338bed140a4084f7d005d48151a639b
 DIST d2xr-sc55-music.dxa 19579531 SHA256 ace152182c70b9a7ae6f911bddbc239566220a287ab5419cab260d5af739bf16 SHA512 290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6 WHIRLPOOL 1cc02d95dfffc36676a8cd3129580ba11c4a5cb13ee54bcdbe9e30e9fd9d8365bf0a8fc0d3e4b962607887b41bd056678d578cf9a5896ba1c9f4d1bef13c3edd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlN2I/gACgkQz+A7F6AY3owaowD+Ig9zHfXP+uAJYtsPte5yxtao
+IHkv2FodSfY+EK0VKFcA/0nBMeW1uP7nxAzH64IgQyzxWHa9NuhAjTcfIAR+T/Hb
+=BRJa
+-----END PGP SIGNATURE-----
diff --git a/games-action/d2x-rebirth/d2x-rebirth-0.57.3.ebuild b/games-action/d2x-rebirth/d2x-rebirth-0.57.3.ebuild
deleted file mode 100644
index 7cf84e5..0000000
--- a/games-action/d2x-rebirth/d2x-rebirth-0.57.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils games scons-utils
-
-DV=2
-MY_P=${PN}_v${PV}-src
-DESCRIPTION="Descent Rebirth - enhanced Descent ${DV} engine"
-HOMEPAGE="http://www.dxx-rebirth.com/"
-SRC_URI="mirror://sourceforge/dxx-rebirth/${MY_P}.tar.gz
-	opl3-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-opl3-music.dxa )
-	sc55-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.dxa )
-	linguas_de? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.dxa )"
-
-LICENSE="D1X GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+data debug ipv6 linguas_de +music +opengl opl3-musicpack sc55-musicpack"
-
-REQUIRED_USE="?? ( opl3-musicpack sc55-musicpack )
-	opl3-musicpack? ( music )
-	sc55-musicpack? ( music )"
-
-RDEPEND="dev-games/physfs[hog,mvl,zip]
-	media-libs/libsdl:0[X,audio,joystick,opengl?,video]
-	music? (
-		media-libs/sdl-mixer:0[timidity,vorbis]
-	)
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)"
-DEPEND="${RDEPEND}"
-PDEPEND="data? ( || (
-	games-action/descent2-data
-	games-action/descent2-demodata
-) )"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT=mirror
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	DOCS=({CHANGELOG,COPYING,INSTALL,README,RELEASE-NOTES}.txt)
-	edos2unix ${DOCS[@]}
-	epatch "${FILESDIR}"/${P}-flags.patch
-}
-
-src_compile() {
-	escons \
-		verbosebuild=1 \
-		sharepath="${GAMES_DATADIR}/d${DV}x" \
-		$(use_scons debug) \
-		$(use_scons ipv6) \
-		$(use_scons music sdlmixer) \
-		$(use_scons opengl) \
-		|| die
-}
-
-src_install() {
-	dodoc ${DOCS[@]}
-
-	insinto "${GAMES_DATADIR}/d${DV}x"
-
-	use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.dxa
-	use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.dxa
-	use linguas_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.dxa
-
-	doicon "${S}/${PN}.xpm"
-
-	dogamesbin d${DV}x-rebirth
-	make_desktop_entry d${DV}x-rebirth "Descent ${DV} Rebirth"
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if ! use data ; then
-		echo
-		elog "To play the game enable USE=\"data\" or manually "
-		elog "copy the files to ${GAMES_DATADIR}/d${DV}x."
-		elog "See /usr/share/doc/${PF}/INSTALL.txt.bz2 for details."
-		echo
-	fi
-}
diff --git a/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild b/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild
index a60ea61..b0413ac 100644
--- a/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild
+++ b/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -25,7 +25,7 @@ REQUIRED_USE="?? ( opl3-musicpack sc55-musicpack )
 	sc55-musicpack? ( music )"
 
 RDEPEND="dev-games/physfs[hog,mvl,zip]
-	media-libs/libsdl:0[X,audio,joystick,opengl?,video]
+	media-libs/libsdl:0[X,sound,joystick,opengl?,video]
 	music? (
 		media-libs/sdl-mixer:0[timidity,vorbis]
 	)
diff --git a/games-action/d2x-rebirth/files/d2x-rebirth-0.57.3-flags.patch b/games-action/d2x-rebirth/files/d2x-rebirth-0.57.3-flags.patch
deleted file mode 100644
index 4853376..0000000
--- a/games-action/d2x-rebirth/files/d2x-rebirth-0.57.3-flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- d2x-rebirth_v0.57.3-src/SConstruct
-+++ d2x-rebirth_v0.57.3-src/SConstruct
-@@ -399,7 +399,6 @@
- 	env.Append(CPPFLAGS = ['-g'])
- else:
- 	env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
--	env.Append(CPPFLAGS = ['-O2'])
- 
- # profiler?
- if (profiler == 1):
-@@ -428,8 +427,9 @@
- print '\n'
- 
- env.Append(CPPDEFINES = [('SHAREPATH', '\\"' + str(sharepath) + '\\"')])
-+env.Append(LINKFLAGS = [str(lflags)])
- # finally building program...
--env.Program(target=str(target), source = common_sources, LIBS = libs, LINKFLAGS = str(lflags))
-+env.Program(target=str(target), source = common_sources, LIBS = libs)
- if (sys.platform != 'darwin'):
- 	env.Install(BIN_DIR, str(target))
- 	env.Alias('install', BIN_DIR)
diff --git a/games-action/d2x-rebirth/metadata.xml b/games-action/d2x-rebirth/metadata.xml
index 2fd949c..0078f1c 100644
--- a/games-action/d2x-rebirth/metadata.xml
+++ b/games-action/d2x-rebirth/metadata.xml
@@ -19,5 +19,7 @@
       music, recorded with the Yamaha YMF262 OPL3 soundchip</flag>
     <flag name="sc55-musicpack">Include alternate version of the game's
       music, recorded with the Roland Sound Canvas SC-55 MIDI module</flag>
+	<flag name="music">Adds music support</flag>
+	<flag name="data">Install data files</flag>
   </use>
 </pkgmetadata>