commit: 5c42e6afc98993e353aa4195851ea523a2be5e80 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Fri May 16 14:43:04 2014 +0000 Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru> CommitDate: Fri May 16 14:43:04 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=5c42e6af
[games-action/d2x-rebirth] audio -> sound (bug #357661), cleanup. Package-Manager: portage-2.2.8-r1 Manifest-Sign-Key: A018DE8C --- games-action/d2x-rebirth/d2x-rebirth-0.57.3.ebuild | 93 ---------------------- games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild | 4 +- .../files/d2x-rebirth-0.57.3-flags.patch | 21 ----- games-action/d2x-rebirth/metadata.xml | 2 + 4 files changed, 4 insertions(+), 116 deletions(-) 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>