version bump wrt #167341

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 147 insertions, 12 deletions

diff --git a/games-action/d2x-rebirth/ChangeLog b/games-action/d2x-rebirth/ChangeLog
index 3912fc958d80..f0eb340d48a9 100644
--- a/games-action/d2x-rebirth/ChangeLog
+++ b/games-action/d2x-rebirth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-action/d2x-rebirth
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/d2x-rebirth/ChangeLog,v 1.4 2012/04/25 16:25:14 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/d2x-rebirth/ChangeLog,v 1.5 2013/02/06 21:11:58 hasufell Exp $
+
+*d2x-rebirth-0.57.3 (06 Feb 2013)
+
+  06 Feb 2013; Julian Ospald <hasufell@gentoo.org> +d2x-rebirth-0.57.3.ebuild,
+  +files/d2x-rebirth-0.57.3-flags.patch:
+  version bump wrt #167341
 
   25 Apr 2012; Justin Lecher <jlec@gentoo.org> d2x-rebirth-0.50.ebuild:
   Drop unnessecary die
diff --git a/games-action/d2x-rebirth/Manifest b/games-action/d2x-rebirth/Manifest
index 4783d45d5be5..31b43696724f 100644
--- a/games-action/d2x-rebirth/Manifest
+++ b/games-action/d2x-rebirth/Manifest
@@ -1,15 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST d2x-rebirth_v0.50-src-20061025.tar.gz 2331334 RMD160 4b3338dd4a9c3531e2c804c540ae07c01e684eff SHA1 6ceeff5090ee9be0a04e03e10673b1b0e44d16be SHA256 988987b0793978c5a37acd0ebcc3e9b54614f1ef377daa92de416c1d1dffb9a7
-DIST dxx-rebirth_icons.zip 137392 RMD160 2e82d09ecd6e249aa7964221be3dc2647e31d505 SHA1 7228b659259aed6960760ee163dfa41ff2cf2740 SHA256 d38ba8730335b13d63ddf9119ad180e3f6c29e3f238baad87080cf60c4730efc
-EBUILD d2x-rebirth-0.50.ebuild 2877 RMD160 52dd1e8cf8b0fb1b9d2a41d071b012764fa009f6 SHA1 a08e3a99894f3304b908ffabee43b8a3a0c64afb SHA256 94b1ecaa557e4446fb32a5a866f3898ea2bfb936e27351c74f0fcb016688028a
-MISC ChangeLog 790 RMD160 40a7a0ed25111383b380131be0096ed9d0743d12 SHA1 ea6d700900879bb9497fe60486a0172ded1daaf0 SHA256 e86d8c8d05da1a98699f99aeecb39297fc9ddf6cab7f7c2273f2b9ec7bc66a9f
-MISC metadata.xml 287 RMD160 500644b3bd3b934a1145693d975877252ccc5e99 SHA1 6d5104b5f3d687c69e70b794eb82dad0a54901c4 SHA256 83154faa07286150291b035f2258aec5eb6e54417e256d5dd8370a2acdf6e906
+AUX d2x-rebirth-0.57.3-flags.patch 700 SHA256 af935f39b755b4473e5c3c341b7cb1bf667ecd22e3d7d938cb124a3dfe7d13da SHA512 0e80c5bd6ff6b89596c477e1dd3bd622499227fc048074abd1a4b35fbf9cafd7a907e68be581949bfa09a259f43e93e3db1a6c2e2260c73ef2ab2d20a6b57596 WHIRLPOOL cde2387d85791315a8d53d86634a52fd9b29b30a28d98d8351127569cf0be35151ddb927e8bb6c53d00249fbe738ff2b18a93c2f39306ffab798d7a6ab510ff8
+DIST d2x-rebirth_v0.50-src-20061025.tar.gz 2331334 SHA256 988987b0793978c5a37acd0ebcc3e9b54614f1ef377daa92de416c1d1dffb9a7
+DIST d2x-rebirth_v0.57.3-src.tar.gz 1353869 SHA256 ec9c1fdfe043c71ea13600544e7d3bb1404c656bd690d3ec5d4b84df6bb3ca7b SHA512 6c8b165222c49d966a9dddc6d8aed6511b858a346899c5b7708fc30fb518103514ae03707857854d732a0af8ea81ee0a4df3797b61515f8d091622457dfbece5 WHIRLPOOL c82db780efcf46969390266578f5d423e73fb63c812e75adda728e40298ab86d49305c24a6d24b5ccc923385a2bfa1c4727eaa07b6261b074eccb001936033c8
+DIST d2xr-briefings-ger.zip 11717 SHA256 e190321e657c1ad55998b91d610534fd0275f29ab12fe56018e47d3e603704f9 SHA512 479aa577dc65271c705e80404ec46e6c59ee3a5122d6e9705dbdd16b71b16c0d3447426e3e74937aa20eb7026f67a3896c5e814fbfcede9164bd557b6eb8423c WHIRLPOOL 65093403524bd82fb4396a5cabf9317effdaf447f18e421b6a59642103bc690ddaa240e0d2db3fbfe1a4bbd83d9f62bfe5b70fdfe8dc76f0cfe00433d25a9e1f
+DIST d2xr-opl3-music.zip 22710919 SHA256 6890c6cf8a40c30a2b88339fe1affd25d210e45b504b0f0f76dba7ba97f813d7 SHA512 876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86 WHIRLPOOL 86cccdbe071654b7f3ba2f774c762b3ab81797916e8a2053466320a54693a1913de9a6759eb29a4acde5a5611c58d1371338bed140a4084f7d005d48151a639b
+DIST d2xr-sc55-music.zip 19579531 SHA256 ace152182c70b9a7ae6f911bddbc239566220a287ab5419cab260d5af739bf16 SHA512 290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6 WHIRLPOOL 1cc02d95dfffc36676a8cd3129580ba11c4a5cb13ee54bcdbe9e30e9fd9d8365bf0a8fc0d3e4b962607887b41bd056678d578cf9a5896ba1c9f4d1bef13c3edd
+DIST dxx-rebirth_icons.zip 137392 SHA256 d38ba8730335b13d63ddf9119ad180e3f6c29e3f238baad87080cf60c4730efc
+EBUILD d2x-rebirth-0.50.ebuild 2877 SHA256 94b1ecaa557e4446fb32a5a866f3898ea2bfb936e27351c74f0fcb016688028a SHA512 eaa862f1df5bf7afea460778c4c4a4238bed88ded49601fd15ffce32d640fb5983cac027c9574677ef6970870adc405026c4e73d8ccd05775b632adc79c42db4 WHIRLPOOL 12c09de4b45324fa918556016aa9069d021463c8e63924e794c4cf5d74c3916dc8ac9d2ef0f4c119233ec8d448ed2001692bddc7e76d7ac299ea9ec6a5e0ccce
+EBUILD d2x-rebirth-0.57.3.ebuild 2414 SHA256 c7144516673cc37524457ca89b8157d1ca753671de9b879a7348d51f3d57cced SHA512 9d0ffdeeb6f8cab16aebf2bebc3ca7f01678290246bd2945df62657e7386cc0ce116c93571fa3c334b445d7afd0edfc768b0bdef6493207cf440fa1d023bc8a1 WHIRLPOOL e09aeb940ceda9cffc68577db5fb6181515b45eace722c10db765f577d47a18b4e7cd6be320688e1ff574bc779b46de8de2e632a544d92b9feead2171405ca67
+MISC ChangeLog 977 SHA256 b61e0584366e53063281c01746658337d1c617a5275f6e35fc57891586ea50e1 SHA512 4bfcbbb19e9d3efd89140970e765306fc0265db86913eb40fd5b4db692c59c1efa367907e39a05773e6fe7f8958c3e2e03484ad2c651755c01e8c7deafc3322e WHIRLPOOL 6439d9e04c57c1c56070cc15cf498517ae1d4eddd935dc9387d72a054700afb525c673bcae646815119136e5c967cd1fb96c62486213c41ba2195dec10b17eac
+MISC metadata.xml 858 SHA256 1b93642d6915ecdbd9342f3341b8732cb8ad062771e547a904fe140a02200302 SHA512 3394f5107870a92ab61dc27555ac3d5c80c4e0abf778cd686216ba79b947ff01138cf9e2a568140b15eeb588a604d0e74a528528e0dedd1a7d8a9b18df684ecf WHIRLPOOL 2f4d81288d3d283548d02dab4519e273cd676b8b98876817052aa0272e3923cbaac16efe4d8198475e254c5522532578b481e24c3b189162400230666916bc44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk+YJW8ACgkQgAnW8HDreRZk3QCgtkIhgSxtB6XbNb9S2sjbzkwL
-ODQAmwbYgiWw5y4MW+vwAB6mX0bDm0qJ
-=uZY/
+iQEcBAEBCAAGBQJREschAAoJEFpvPKfnPDWzScUH+wayTgZJMkKvboF8OFB5WDDB
+cWqB7ifYug/GOcLs86e83e1p/PHRs8lRq235+qyJ8XKiitB/wCSG/0RvdPEBaU+C
+3zD4vep2b9jj0YF7BPBY5dZ+wSl9LcXRbwGymOxOuSuJd2B2tRA7UA8kF6m5kGxn
+a06bo/a/xP25Y98x1K0iwcSNvY6giHmN6zqWJ8p0GIdFkHiqSr8jlLiPbyDgXP/A
+1OG84c6cx0Fb5uhmN2klPh0H/+nVIWavFZ8ZXg1HvsJMrzOM9snIto4zkVtw5LXN
+sghmZpSDzKom3y0Q2nVNSF+Haf3043Yf3YM/Gj1wzUIbvSiI+UDn/pPbqzstsvc=
+=p64Y
 -----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
new file mode 100644
index 000000000000..dd3277b8cd98
--- /dev/null
+++ b/games-action/d2x-rebirth/d2x-rebirth-0.57.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/d2x-rebirth/d2x-rebirth-0.57.3.ebuild,v 1.1 2013/02/06 21:11:58 hasufell Exp $
+
+EAPI=5
+
+inherit eutils scons-utils games
+
+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.zip )
+	sc55-musicpack? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.zip )
+	linguas_de? ( http://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.zip )"
+
+LICENSE="D1X GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdinstall debug demo 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[X,audio,joystick,opengl?,video]
+	music? (
+		media-libs/sdl-mixer[timidity,vorbis]
+	)
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+PDEPEND="cdinstall? ( games-action/descent2-data )
+	demo? ( games-action/descent2-demodata )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch
+
+	DOCS=( {CHANGELOG,COPYING,INSTALL,README,RELEASE-NOTES}.txt )
+	edos2unix ${DOCS[@]}
+}
+
+src_compile() {
+	escons \
+		verbosebuild=1 \
+		sharepath="${GAMES_DATADIR}/d${DV}x" \
+		$(use_scons ipv6) \
+		$(use_scons music sdlmixer) \
+		$(use_scons debug) \
+		$(use_scons opengl) \
+		|| die
+}
+
+src_install() {
+	dodoc ${DOCS[@]}
+
+	insinto "${GAMES_DATADIR}/d${DV}x"
+
+	# None of the following zip files need to be extracted.
+	use linguas_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.zip
+	use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.zip
+	use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.zip
+
+	doicon ${PN}.xpm
+
+	dogamesbin ${PN}
+	make_desktop_entry ${PN} "Descent ${DV} Rebirth"
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	if ! use cdinstall ; then
+		echo
+		elog "To play the full game enable USE=\"cdinstall\" or manually "
+		elog "copy the files to ${GAMES_DATADIR}/d${DV}x."
+		elog "See /usr/share/doc/${PF}/INSTALL.txt for details."
+		echo
+	fi
+}
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
new file mode 100644
index 000000000000..48533768cf91
--- /dev/null
+++ b/games-action/d2x-rebirth/files/d2x-rebirth-0.57.3-flags.patch
@@ -0,0 +1,21 @@
+--- 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 bdc2e243eebd..b85dfd63b081 100644
--- a/games-action/d2x-rebirth/metadata.xml
+++ b/games-action/d2x-rebirth/metadata.xml
@@ -4,6 +4,14 @@
   <herd>games</herd>
   <use>
     <flag name="awe32">Enable AWE32 support</flag>
-    <flag name="mpu401">Enable MPU401 music support</flag>
+	<flag name="mpu401">Enable MPU401 music support</flag>
+	<flag name="demo">Install <pkg>games-action/descent2-demodata</pkg> as well</flag>
+	<flag name="music">Support for ingame music</flag>
+    <flag name="linguas_de">Provides German translations for the game's
+      briefings, robot descriptions, and outro of the original campaign</flag>
+    <flag name="opl3-musicpack">Include alternate version of the game's 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>
   </use>
 </pkgmetadata>