[gentoo-commits] proj/gamerlay:master commit in: games-action/d1x-rebirth/

[gentoo-commits] proj/gamerlay:master commit in: games-action/d1x-rebirth/

[Azamat H. Hackimov]

commit:     436c05c62659b18af99634971414e7cf421270f8
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Fri May 16 14:34:41 2014 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Fri May 16 14:34:41 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=436c05c6

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

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

---
 games-action/d1x-rebirth/d1x-rebirth-0.57.3.ebuild | 95 ----------------------
 games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild |  4 +-
 games-action/d1x-rebirth/metadata.xml              |  2 +
 3 files changed, 4 insertions(+), 97 deletions(-)

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>