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

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

4 files changed, 14 insertions, 98 deletions

diff --git a/games-action/d1x-rebirth/Manifest b/games-action/d1x-rebirth/Manifest
index 6e4324e..bc07d3b 100644
--- a/games-action/d1x-rebirth/Manifest
+++ b/games-action/d1x-rebirth/Manifest
@@ -1,6 +1,15 @@
-DIST d1x-rebirth_v0.57.3-src.tar.gz 1221678 SHA256 ea073e9307a24a882ef348f57829ac6f040b7b594d01ad74fb4c5357d497ab1d SHA512 778d97ffc52872de013b569ce3780d672a3e243ada8cbf3da2c912fa7da30ce9613b9ff2e5a1c3f470bc9936f6b9cfb6ee955bbd92b4ec3ae48fa5fad11955e1 WHIRLPOOL bbed5185f1bae891e1c1cff3320d85946844a6fa297d030950d55eefa4c13b938aff64567eee8dded54ec12c50933dd66086df4ac4a2ec2207c86c1b6b90693d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST d1x-rebirth_v0.58.1-src.tar.gz 1247599 SHA256 5befc8a2ab1159fdb4d4141ba9f0e229450592d5ada209e832101da5b0b3e38e SHA512 d1bdaeee07c5ac34b2e6839fea1449344d206f76f1eb2ba3fd4fa7cbe6acd82c2e8d7140b2d6297add3d5e8fb7fe4ca2b1c22c900def94603c218f6660644c80 WHIRLPOOL d379e3bf408fc51c9e2caea0d774272ce00a4dc52f460daa0b373ae6d08f305fe067e2e86a0164e7bb8c9f51f797cb29c8b38248555a5d3fd394ff88d6d170cd
 DIST d1xr-briefings-ger.dxa 16798 SHA256 38f8b9dd5fcab8b675a5112290e4dda771d4bc7a613292a589f6535a8c53861a SHA512 956a3ef1fe7379b71d5f651fdcb1f26b786883a35193a0a22009204e885a12fceb3a69c6accbeb2bd20be65afe087d23532d7ef3439edd97cc8904968bf519e3 WHIRLPOOL 0c4e7934eac399b6fed216648ba35ba100234f73a802112b900064584b4fb471bafc9e377af735a4d05fa65105a40ee4db781a1e07310a1e6b5feb4a9a10a29d
 DIST d1xr-hires.dxa 1426884 SHA256 b30a164fa9c6dff05eda6d50f777777df843968d32053f5cc9453fe89d5bed19 SHA512 3fc84d5610ba40ee383c1720f80513a21b4644ff8b6da4b84ebca13b11c1131deb4897ded6324b54845b6c847dfc0f16700535e16afdd7ebe83bfff042892302 WHIRLPOOL 372b5edffc2694429d5c87e343f70564b73178b3d3c61abab5c93a02235547beab3046d9773fc6bcec9eea1f530ddadbfb51205049ca61297d16e08d39366d04
 DIST d1xr-opl3-music.dxa 81503503 SHA256 8fe8fede12ca735cac28133e4a581c4026ed22845ab016814a745b2c10b81603 SHA512 4ac82c4bc2ddb02e2941746921443e38b698c6e54cfcab317fc9108f84ada7b868ec2ee3c70b28c1dfe9f41e2aadab4124c8daa65a409905cba5d674f0aab8a8 WHIRLPOOL a7fab740a6cf885984b93f1eb2512362d7c3b05eb65e5f1eecf4c374bf6ba9e04e6d91130d8ff14d113fa9639501cba768a9d7344af291975b095a6604066735
 DIST d1xr-sc55-music.dxa 72803408 SHA256 b27f7b9dc5f9c2744402c56c9499dfd9503c17e73a2a5223e745529d7867962f SHA512 3cdce5b6535e28397b3216cc9ca05cccf7194349c62d64c54300f02f39248b98598d170599e5c61b6900d780e4917f905c3c31eb814fbb8429221c804cbd8bf9 WHIRLPOOL d248894b95d5a1d2d8d375cf231fbfde114548e328addf3ae71c90eb436c628b6feb7d207877fd59f815d4b4f00ea76b6e2c23c4a12cd8e2e228967beb91b693
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlN2IgEACgkQz+A7F6AY3ox2IwEA3LHQFSA8aMiSxNT3WbvUDrpV
+8uzlTqCUqDWT9k5jp/wA/304Ot/oYq5/FefpAQk62H6n6vREnstNYy0Zq9/+ivg2
+=XXZE
+-----END PGP SIGNATURE-----
diff --git a/games-action/d1x-rebirth/d1x-rebirth-0.57.3.ebuild b/games-action/d1x-rebirth/d1x-rebirth-0.57.3.ebuild
deleted file mode 100644
index b618cc6..0000000
--- a/games-action/d1x-rebirth/d1x-rebirth-0.57.3.ebuild
+++ /dev/null
@@ -1,95 +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=1
-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 )
-	textures? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-hires.dxa )"
-
-LICENSE="D1X GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+data debug ipv6 linguas_de +music +opengl opl3-musicpack sc55-musicpack +textures"
-
-REQUIRED_USE="?? ( opl3-musicpack sc55-musicpack )
-	opl3-musicpack? ( music )
-	sc55-musicpack? ( music )"
-
-RDEPEND="dev-games/physfs[hog,zip]
-	media-libs/libsdl:0[X,audio,joystick,opengl?,video]
-	music? (
-		media-libs/sdl-mixer:0[timidity]
-	)
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)"
-DEPEND="${RDEPEND}"
-PDEPEND="data? ( || (
-	games-action/descent1-data
-	games-action/descent1-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
-	use textures && doins "${DISTDIR}"/d${DV}xr-hires.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/d1x-rebirth/d1x-rebirth-0.58.1.ebuild b/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild
index 475c3dc..4801e11 100644
--- a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild
+++ b/games-action/d1x-rebirth/d1x-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: $
 
@@ -26,7 +26,7 @@ REQUIRED_USE="?? ( opl3-musicpack sc55-musicpack )
 	sc55-musicpack? ( music )"
 
 RDEPEND="dev-games/physfs[hog,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]
 	)
diff --git a/games-action/d1x-rebirth/metadata.xml b/games-action/d1x-rebirth/metadata.xml
index 026edc8..f41ce91 100644
--- a/games-action/d1x-rebirth/metadata.xml
+++ b/games-action/d1x-rebirth/metadata.xml
@@ -17,5 +17,7 @@
       music, recorded with the Roland Sound Canvas SC-55 MIDI module</flag>
     <flag name="textures">Include high resolution (640x480) backgrounds,
       briefing images and fonts</flag>
+	<flag name="music">Adds music support</flag>
+	<flag name="data">Install data files</flag>
   </use>
 </pkgmetadata>