version bump wrt #465432

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

5 files changed, 353 insertions, 21 deletions

diff --git a/games-fps/doomsday/ChangeLog b/games-fps/doomsday/ChangeLog
index 82b487543060..89d54d6b5126 100644
--- a/games-fps/doomsday/ChangeLog
+++ b/games-fps/doomsday/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/doomsday
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.51 2013/03/02 21:15:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.52 2013/07/17 15:08:40 hasufell Exp $
+
+*doomsday-1.10.2 (17 Jul 2013)
+
+  17 Jul 2013; Julian Ospald <hasufell@gentoo.org> +doomsday-1.10.2.ebuild,
+  +files/doomsday-1.10.2-openal-link.patch:
+  version bump wrt #465432
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> doomsday-1.9.8-r1.ebuild,
   doomsday-1.9.8.ebuild:
diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index cf99082c2a27..6bf2ada224ee 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX doomsday-1.10.2-openal-link.patch 4100 SHA256 61b75a8c3bc299dcbf23c887ea3f5799c12f80e94bdb0924d58e02e222563d5a SHA512 cf9f027bd28ce5870a0bf460730a11bec1a68962efc9158261649bbd486358d7057495b59920fe57b1590c40598ccd0937e5be57744ba694a95de136085cc7d2 WHIRLPOOL 80d0517349108e98452e5da1fd1dfe8e2b14f0ffb19aa21db8ef0806a7d5ea3941b02c8f97851092ff4f72a93785cc911f8f685c20265251325a50063675cfe7
 AUX doomsday-1.9.0_beta69-png15.patch 5042 SHA256 0a406daa9afafffca641be96a7f153635655b5611d7747daaf67ca2f2a943d07 SHA512 87bdcf3fbe0160b3866632b51f07475dcba719b1fdcb24523a65f73afa66d59e57b28e9b278ca7c90255d83db4b03fee8d394b95a2ec79b7d61a2a38e09c4970 WHIRLPOOL 9470584b53c18f98115e3176a09a89a9765dad933547f365c82bb7f419ac6bde5c539fca36a41dfd838cb41f2cdc1fc408113a883aca3a3e71ce139a7397d800
 AUX doomsday-1.9.0_beta69-underlink.patch 386 SHA256 b774ef4cdad497668728668ec49b46b17c90a399cce5949337e8c0756cdfe0b7 SHA512 78b24e69ace32a0c9575c7164333694585e88a39fae6b3e9e85900fa606d54b21e1c69a52c928426757acaf242dd401cc7ebf7fabf2048dd518f2bd2be1a66f7 WHIRLPOOL 83e7fcd55991f0bfe6f069afb1a9ae5f1d7e491c80efda45918edab100627362b6243767a13f09e7ccdce7f928833522425dd2ac7baf5da481b96b5cde1529a9
 AUX doomsday-1.9.8-2to3.patch 12480 SHA256 e9439d7d1c2482e73c623ac45271d627928a08419002c13e5e45d37de6008149 SHA512 76254c73caffac1a840f14f3572215af4ae86f03867e08761b8dc9d301562841f7cdee8aab54512c211dc41ce98b233d37c4ee641f71b87e231ccfdd5fd3354a WHIRLPOOL a17ad494f3ee56b2e6afa23f4cf173a27c57c076bb9acdf769c147ede29b6f7baa5ec11b1159965a677f83742d6e160a4e9005da4926b0c2e5337d76e44a89aa
@@ -8,28 +9,22 @@ AUX doomsday-1.9.8-openal-64bit-fix.patch 1189 SHA256 1ed4cf8085a8867cc3df1ca46c
 AUX doomsday-1.9.8-openal-link.patch 4100 SHA256 61b75a8c3bc299dcbf23c887ea3f5799c12f80e94bdb0924d58e02e222563d5a SHA512 cf9f027bd28ce5870a0bf460730a11bec1a68962efc9158261649bbd486358d7057495b59920fe57b1590c40598ccd0937e5be57744ba694a95de136085cc7d2 WHIRLPOOL 80d0517349108e98452e5da1fd1dfe8e2b14f0ffb19aa21db8ef0806a7d5ea3941b02c8f97851092ff4f72a93785cc911f8f685c20265251325a50063675cfe7
 AUX wrapper 136 SHA256 64b959cfeb77bd778f16768c0ee509cd128eb855fa4acd8e7c37046c5885dbc8 SHA512 ec3fe44a7c07a835167780924423256d202450666cfa82f97269561794f28194e9f331c4581dfe7f810581c4adcc31c5ee11fba83441f8771885e40420c53049 WHIRLPOOL b4a6fd7c4d531eef4defbdf215a9c4318d3eff7f5e85dd77c5a4aa83f6fe709bfc09e99cac7d8c2901e18475c090e96f56e9010e659214cb2ece70b743603cc0
 DIST deng-1.9.0-beta6.9.tar.gz 6085833 SHA256 3553f6a58660916fdedbe0594f5b22dac4738ee6e02b042992d3140d358954af
+DIST doomsday-1.10.2.tar.gz 8501449 SHA256 f4e27c70823464595b77b64e392f5405152ee83f6e71e3be56bbb8e3b83fb839 SHA512 f7fe378a5309faffca2aa5f83126626182c76a65993c2addb28cf5e78e0892e25bb5ecb4893aff3b4b6d0f420a558600082ae54a93e50a11306e23d9de8177f6 WHIRLPOOL d433b273a2c9a6c89a31532771149e2e4c5800cf55e8a05f1a38394a58c5c3e7fe1718e5813c2641bb247155e39c7b166aea63bd0f21fd136321038eb2f93117
 DIST doomsday-1.9.8.tar.gz 7048039 SHA256 5401e5d58d197c287f7bc1318ee8429f27a76792ae6f2471c12d10281a569474 SHA512 e264d75e939c501290ae33cd69f4c408c83f57b33bc3c17eba4f7b334b1846d830717395b140a986817ea61dbc2918992b66be9e564b2d04d5eb5046fc3f5a65 WHIRLPOOL 66150a95d1e242b6612f39501d0a699eb194d519223b176fd647a250edf6d28478e0d3d52929f659a6e60a8928b227e38339e12323f48e791001be4e6754f638
+EBUILD doomsday-1.10.2.ebuild 4846 SHA256 987765314e0ce96b492c2f652c5aa16751f6e5c3d50dc42e2f26cdf8a309e00f SHA512 2592ba1aa1220b5b9778d9f1b8188755410f64524706af0e2f4f76b0473ecc1308563a44c00d11d7ae6637ea0cb2567b7362c087615a2133b40cf89ef9bb3108 WHIRLPOOL 3398ca3a662cfde38a8d11a82a356a64d7e1fd9c67d2747f99887f8ad8eab0166621390c6e93a7e53aa181c32d3ef66691ba06a01465cd4bc1e5e126917c47e1
 EBUILD doomsday-1.9.0_beta69.ebuild 2264 SHA256 5ba265d19c0868cebf7a53b32585babbc0fa99bbe29b3686da5c7fda5f227469 SHA512 7cb47d13d70cbfdda7e784f5d1bb3c8fd62b8e32d9298985eee744855356193a76034f7d83e72400ef0d362a4b3851dc7b35bf1c49bb60a19d27cbbcfd0d0e41 WHIRLPOOL 2f7eaa8a2794c45a0279c8c43ffc11e68bb79aaec709d1c675299252d5c0f48e746a51efb12c84b538332da0e43b1168fa7868c444edb961c06d9985469a5152
 EBUILD doomsday-1.9.8-r1.ebuild 4209 SHA256 4b11c007067b9c20357c875d62912d49927ac27dea1f6b3d2d2f79a1938c1426 SHA512 77cdf004a29efdbe8af17c8d393576a92fc083f63d50d210f7201183e483df9139cf09d70ca0924d0127b7b464b87a54e7c81510ca66b445b1ef84a953745865 WHIRLPOOL ebf2e446ae839f3034ff68c15ebd08e326be44878b4ef36dcaa96b7f3e72c6d3882d8a9e38481f0a7402e0360ccafa85fd4682c07718348741b3f18b40602b80
 EBUILD doomsday-1.9.8.ebuild 3698 SHA256 d018fcfd9a84f932772b3b42cfd85be8a207ff27a149bca1766f4b05215fccc3 SHA512 bed384fbe7aabe6f390c9017d558cdb2b534e44280fc4116d81e43f14de455181509ad56ed4b0e62ca062b73ef072f3c0df1bd6e3a4755c17d2ceac3ac006ef1 WHIRLPOOL cc5d9e6ef48e370992c9456076e54eacbef165cd7dfb923a70335273972ddb7f28aaba3946ca0683956bff9e76f227191e16b44ebae910c6b78b73f46856997e
-MISC ChangeLog 7971 SHA256 7b1d571f37257505970fbd2185f735b9d0b663fd7db699a5f69c16cae113b60e SHA512 c9fbe8c85f92624da5eb32e25c345691860315881fbd0690aa7c987cb67a4d993f4cb0f4f955dcee918662be90c55bee84c9fb4408110b57dea78d9aee9b69b4 WHIRLPOOL 29e2e298e7dac346fd262349a83b61491a30676c7257c25d2aba2b0712baf544ca1bee01c531596dc56ca126202876f9e01a7c0aca63f3c6738bb427d8a56876
-MISC metadata.xml 718 SHA256 0d8702a3ad1afd41e3315663411c97c3cf7a4faf2892f69785c2c497e7a694cd SHA512 a45c03f6e4fb3c9f25a704e65c6d72db0b899139123db68c29746d336d82ccacf0c5e7d71dea2390beb7d05ee12abcff9483e886ea34d6694dac53243bef96b6 WHIRLPOOL 60578d1e1475d3d920e0c09fa2d00bec5430c70a136dec04f2d8832d7b7402fea6cd9cf0d29c54d0f70596328f25c19f1d36d26321524abb2d275278aae43f26
+MISC ChangeLog 8151 SHA256 dd6d509d2babfe6df48a5078f61cacd9b5c28cb7f261200682a9f49074459f0c SHA512 eeb917339af5c1f9f84211d42394e57a04c0cf10943d2f03ef6e91ef46d685bb04c02952e2ba552ee7f8d7be44a8eaa707be1f5e2758b0a862771b309022999e WHIRLPOOL 9024d3a8ff7a6083799fd91f81af1c7ece6a99d1fde16aa6888bfba1f87e12143ca4de3ea8951ecc085c533f5b9ce89dd7a38ed441a0f47668d2d2b6af9beb35
+MISC metadata.xml 875 SHA256 cdf77347f052fb941dd7a789cd191c401d8ae0add020bed309baf4876e8c22b6 SHA512 039aa83733658ed1036f2c28798cbf28432e9b69dfd669ab3fe87ab2dafbffc33bb6455d82fdaf9a895379f8ab66cf03483fe089a96f2cf33ad7ba89ee8ed43c WHIRLPOOL 5b91d3f1d971b6ec695b3a089bb7285a4b331d79b6f3dd3713aeb99e7a0bd73ca4c3b0ca4bbb6fa335da82f4038ad1941884ed9d62cedb4475b1eee843ab9620
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMmwMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88dbYQALJCxZx6NCiBxG6F1a6L/seK
-P9gvzYwMU+RjrInr4xurOKyy+yUlGxOMYjxM0BR3ZEa2gtUGam/B5GfPJp1rlb4C
-OcQ4xb9i/29nYfCqLvRRcrMtk/Dslb27Jahx2vEeJjuYO0nKvj5+EAU6NLXqtgK9
-0zJraJloM/f5G+O9lR3v4m4q41J9X7a5zXGELwVU4WK/k2q02BM+fG1wJPeV9JOX
-FmXlqcJLsMwrfUOPUhdLZVL29DOPTw2F2IhNNGMF6miRZgEfpPDoyBBbgylG6OhC
-WdpKq1c1UDJ+0BMXbODLDrP0NeD2kUzFb395Mk1wa5JPAWVDqzLdpMw3Kz2G9nXA
-U1LQDZ0W2RRTeM8VeyI252lNctMXTgkCZXpEVWcmpsjznXxyAATSljhFycWTnaLA
-eVufM+nDiGLSfYA77Nb3eyMz227MePwQg3YSIpP5iWHRtFuR6wEPc00PTXqk1plN
-LknL5wzh9GOvOlouJAd/m4jfHfkzsrkaMTTApyqn5RDQrb8fOrA13DsKcPgXS2gn
-dzQly/R4w/aJ3FV/mmfJ/Yb4aYhKwK3n7lONU+FesjV8IFRbiSdB5eAaG++EQFsP
-VEG3PWRgPJmqkMbhqk8L5X0ZSpRNW6N9qNNjJzt+DvGymYEpwm58AHxQcXYcQCGX
-h8ZRcmdcbp9gBWYIS3Fh
-=f7fo
+iQEcBAEBCAAGBQJR5rN/AAoJEFpvPKfnPDWzoUUH/3PZ/rgWakbB1pN4tRuQSO2w
+swbczzosc1QwfkUqyi5vrf3v6cxUpMmSamDjzDHUl56vBtw1/PHWUSEx8t+7MYq6
+oEvt8+EFYpqW9x2pAl+C9xG2IiTMFcWT1sdpScicRZjhvRADeUJSX7a27iogdKPW
+Hzwu97fnuJGakCWLcSdaRwIUPHjONS3it0ZkHircsgnWDnoVd0XmtIxRkiWBrnS4
+qXC90Qz2sqyyl+OG4+CYp4ucDXMI2VBUowmKT40tD0/O8YUx9pVG+miLK6V7lfrC
+3MxCRSBJU8KI8dFHGZjlBDiMavgCRqFXb4o5nM0S9tFaU7T7vf2WlEen1t7PiLw=
+=6KxI
 -----END PGP SIGNATURE-----
diff --git a/games-fps/doomsday/doomsday-1.10.2.ebuild b/games-fps/doomsday/doomsday-1.10.2.ebuild
new file mode 100644
index 000000000000..704593984cdb
--- /dev/null
+++ b/games-fps/doomsday/doomsday-1.10.2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.10.2.ebuild,v 1.1 2013/07/17 15:08:40 hasufell Exp $
+
+# TODO: fmod support broken (deng_fmod)
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+inherit python-r1 confutils eutils qt4-r2 games
+
+DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
+HOMEPAGE="http://www.dengine.net/"
+SRC_URI="mirror://sourceforge/deng/Doomsday%20Engine/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools"
+REQUIRED_USE="snowberry? ( ${PYTHON_REQUIRED_USE} !dedicated )
+	demo? ( doom ) freedoom? ( doom ) resources? ( doom )
+	doom? ( !dedicated )"
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtopengl:4
+	dev-qt/qtgui:4
+	net-misc/curl
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl[joystick,audio]
+		media-libs/sdl-mixer
+		media-libs/libpng:0
+		virtual/opengl
+		virtual/glu
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXxf86vm
+	)
+	fluidsynth? ( media-sound/fluidsynth )
+	openal? ( media-libs/openal )
+	snowberry? ( ${PYTHON_DEPS} )
+	tools? ( sys-libs/ncurses )"
+RDEPEND="${DEPEND}
+	snowberry? ( dev-python/wxpython )"
+PDEPEND="
+	demo? ( games-fps/doom-data )
+	freedoom? ( games-fps/freedoom )
+	resources? ( games-fps/doomsday-resources )"
+
+S=${S}/${PN}
+
+pkg_setup() {
+	games_pkg_setup
+	python_export_best
+}
+
+src_prepare() {
+	sed -i \
+		-e '/readme.path/s#$$PREFIX#/usr#' \
+		client/client.pro || die "fixing docdir failed!"
+
+	sed -i \
+		-e "/^DENG_BASE_DIR =/s:\$\$PREFIX/share:${GAMES_DATADIR}:" \
+		config_unix.pri || die
+	echo "CONFIG += nostrip" > config_user.pri
+	echo "PREFIX=/usr/games" >> config_user.pri
+	use snowberry &&
+		echo "CONFIG += deng_snowberry" >> config_user.pri || \
+		echo "CONFIG += deng_nosnowberry" >> config_user.pri
+
+	use fluidsynth &&
+		echo "CONFIG += deng_fluidsynth" >> config_user.pri
+
+	use tools ||
+		echo "CONFIG += deng_notools" >> config_user.pri
+
+	use dedicated &&
+		echo "CONFIG += deng_noclient" >> config_user.pri
+
+	if use openal; then
+		echo "CONFIG += deng_openal" >> config_user.pri
+		sed -i \
+			-e 's:\# Generic Unix.:LIBS += -lopenal:' \
+			dep_openal.pri || die
+		epatch "${FILESDIR}"/${P}-openal-link.patch
+	fi
+
+	qt4-r2_src_prepare
+}
+
+#Usage: doom_make_wrapper <name> <game> <icon> <desktop entry title> [args]
+doom_make_wrapper() {
+	local name=$1 game=$2 icon=$3 de_title=$4
+	shift 4
+	games_make_wrapper $name \
+		"doomsday -game ${game} $@"
+	make_desktop_entry $name "${de_title}" ${icon}
+}
+
+src_configure() {
+	qt4-r2_src_configure
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	dodoc "${WORKDIR}"/${P}/README.md
+
+	mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die
+	dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom
+
+	if use snowberry; then
+		python_replicate_script "${D}"/"${GAMES_BINDIR}"/launch-doomsday
+
+		installmodules() {
+			# relocate snowberry module directory recursively into site-packages
+			python_domodule "${D}/${GAMES_DATADIR}"/${PN}/snowberry
+			# hack around improper path handling
+			sed -i \
+				-e "s:os.chdir.*$:os.chdir('$(python_get_sitedir)/snowberry'):" \
+				"${D}"/"${GAMES_BINDIR}"/launch-doomsday-${EPYTHON} || die
+		}
+		python_foreach_impl installmodules
+		# remove old module dir
+		rm -r "${D}/${GAMES_DATADIR}"/${PN}/snowberry || die
+
+		make_desktop_entry launch-doomsday "Snowberry DoomsDay" snowberry
+		doicon ../snowberry/graphics/snowberry.png
+	fi
+
+	if use doom; then
+		local res_arg
+		if use resources; then
+			res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded"
+		fi
+
+		doicon ../snowberry/graphics/orb-doom.png
+		doom_make_wrapper jdoom doom1 orb-doom "DoomsDay Engine: Doom 1" "${res_arg}"
+		elog "Created jdoom launcher. To play Doom place your doom.wad to"
+		elog "\"${GAMES_DATADIR}\"/doom-data"
+		elog
+
+		if use demo; then
+			doom_make_wrapper jdoom-demo doom1-share orb-doom "DoomsDay Engine: Doom 1 Demo" \
+				"-iwad \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}"
+		fi
+		if use freedoom; then
+			doom_make_wrapper jdoom-freedoom doom1-share orb-doom "DoomsDay Engine: FreeDoom" \
+				"-iwad \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad"
+		fi
+	fi
+	if use hexen; then
+		doicon ../snowberry/graphics/orb-hexen.png
+		doom_make_wrapper jhexen hexen orb-hexen "DoomsDay Engine: Hexen"
+
+		elog "Created jhexen launcher. To play Hexen place your hexen.wad to"
+		elog "\"${GAMES_DATADIR}\"/${PN}/data/jhexen"
+		elog
+	fi
+	if use heretic; then
+		doicon ../snowberry/graphics/orb-heretic.png
+		doom_make_wrapper jheretic heretic orb-heretic "DoomsDay Engine: Heretic"
+
+		elog "Created jheretic launcher. To play Heretic place your heretic.wad to"
+		elog "\"${GAMES_DATADIR}\"/${PN}/data/jheretic"
+		elog
+	fi
+
+	prepgamesdirs
+}
diff --git a/games-fps/doomsday/files/doomsday-1.10.2-openal-link.patch b/games-fps/doomsday/files/doomsday-1.10.2-openal-link.patch
new file mode 100644
index 000000000000..c59c48ac7aef
--- /dev/null
+++ b/games-fps/doomsday/files/doomsday-1.10.2-openal-link.patch
@@ -0,0 +1,158 @@
+--- doomsday/plugins/openal/src/driver_openal.cpp	2012-05-15 06:01:38.000000000 +0200
++++ doomsday/plugins/openal/src/driver_openal.cpp	2012-05-29 07:37:21.170639342 +0200
+@@ -66,6 +66,7 @@ ALenum(*EAXGet) (const struct _GUID* pro
+ ALenum(*EAXSet) (const struct _GUID* propertySetID, ALuint prop, ALuint source, ALvoid* value, ALuint size);
+ #endif
+ 
++extern "C" {
+ int DS_Init(void);
+ void DS_Shutdown(void);
+ void DS_Event(int type);
+@@ -83,6 +84,7 @@ void DS_SFX_Setv(sfxbuffer_t* buf, int p
+ void DS_SFX_Listener(int prop, float value);
+ void DS_SFX_Listenerv(int prop, float* values);
+ int DS_SFX_Getv(int prop, void* values);
++}
+ 
+ #ifdef WIN32
+ // EAX 2.0 GUIDs
+@@ -134,14 +136,14 @@ static void loadExtensions(void)
+ #endif
+ }
+ 
+-int DS_Init(void)
++extern "C" int DS_Init(void)
+ {
+     // Already initialized?
+     if(initOk) return true;
+ 
+     // Open a playback device.
+     /// @todo Shouldn't we use the system default device?
+-    device = alcOpenDevice((ALCchar*) "DirectSound3D");
++    device = alcOpenDevice((ALCchar*) NULL);
+     if(!device)
+     {
+         Con_Message("OpenAL init failed (device: DirectSound3D).\n");
+@@ -167,7 +169,7 @@ int DS_Init(void)
+     return true;
+ }
+ 
+-void DS_Shutdown(void)
++extern "C" void DS_Shutdown(void)
+ {
+     if(!initOk) return;
+ 
+@@ -185,12 +187,12 @@ void DS_Event(int /*type*/)
+     // Not supported.
+ }
+ 
+-int DS_SFX_Init(void)
++extern "C" int DS_SFX_Init(void)
+ {
+     return true;
+ }
+ 
+-sfxbuffer_t* DS_SFX_CreateBuffer(int flags, int bits, int rate)
++extern "C" sfxbuffer_t* DS_SFX_CreateBuffer(int flags, int bits, int rate)
+ {
+     sfxbuffer_t* buf;
+     ALuint bufName, srcName;
+@@ -236,7 +238,7 @@ sfxbuffer_t* DS_SFX_CreateBuffer(int fla
+     return buf;
+ }
+ 
+-void DS_SFX_DestroyBuffer(sfxbuffer_t* buf)
++extern "C" void DS_SFX_DestroyBuffer(sfxbuffer_t* buf)
+ {
+     ALuint srcName, bufName;
+ 
+@@ -251,7 +253,7 @@ void DS_SFX_DestroyBuffer(sfxbuffer_t* b
+     Z_Free(buf);
+ }
+ 
+-void DS_SFX_Load(sfxbuffer_t* buf, struct sfxsample_s* sample)
++extern "C" void DS_SFX_Load(sfxbuffer_t* buf, struct sfxsample_s* sample)
+ {
+     if(!buf || !sample) return;
+ 
+@@ -277,7 +279,7 @@ void DS_SFX_Load(sfxbuffer_t* buf, struc
+ /**
+  * Stops the buffer and makes it forget about its sample.
+  */
+-void DS_SFX_Reset(sfxbuffer_t* buf)
++extern "C" void DS_SFX_Reset(sfxbuffer_t* buf)
+ {
+     if(!buf) return;
+ 
+@@ -285,7 +287,7 @@ void DS_SFX_Reset(sfxbuffer_t* buf)
+     buf->sample = NULL;
+ }
+ 
+-void DS_SFX_Play(sfxbuffer_t* buf)
++extern "C" void DS_SFX_Play(sfxbuffer_t* buf)
+ {
+     ALuint source;
+ 
+@@ -310,7 +312,7 @@ void DS_SFX_Play(sfxbuffer_t* buf)
+     buf->flags |= SFXBF_PLAYING;
+ }
+ 
+-void DS_SFX_Stop(sfxbuffer_t* buf)
++extern "C" void DS_SFX_Stop(sfxbuffer_t* buf)
+ {
+     if(!buf || !buf->sample) return;
+ 
+@@ -318,7 +320,7 @@ void DS_SFX_Stop(sfxbuffer_t* buf)
+     buf->flags &= ~SFXBF_PLAYING;
+ }
+ 
+-void DS_SFX_Refresh(sfxbuffer_t* buf)
++extern "C" void DS_SFX_Refresh(sfxbuffer_t* buf)
+ {
+     ALint state;
+ 
+@@ -368,7 +370,7 @@ static void setPan(ALuint source, float
+     alSourcefv(source, AL_POSITION, pos);
+ }
+ 
+-void DS_SFX_Set(sfxbuffer_t* buf, int prop, float value)
++extern "C" void DS_SFX_Set(sfxbuffer_t* buf, int prop, float value)
+ {
+     ALuint source;
+ 
+@@ -411,7 +413,7 @@ void DS_SFX_Set(sfxbuffer_t* buf, int pr
+     }
+ }
+ 
+-void DS_SFX_Setv(sfxbuffer_t* buf, int prop, float* values)
++extern "C" void DS_SFX_Setv(sfxbuffer_t* buf, int prop, float* values)
+ {
+     ALuint source;
+ 
+@@ -435,7 +437,7 @@ void DS_SFX_Setv(sfxbuffer_t* buf, int p
+     }
+ }
+ 
+-void DS_SFX_Listener(int prop, float value)
++extern "C" void DS_SFX_Listener(int prop, float value)
+ {
+     switch(prop)
+     {
+@@ -451,7 +453,7 @@ void DS_SFX_Listener(int prop, float val
+     }
+ }
+ 
+-void DS_SFX_Listenerv(int prop, float* values)
++extern "C" void DS_SFX_Listenerv(int prop, float* values)
+ {
+     float ori[6];
+ 
+@@ -489,7 +491,7 @@ void DS_SFX_Listenerv(int prop, float* v
+     }
+ }
+ 
+-int DS_SFX_Getv(int /*prop*/, void* /*values*/)
++extern "C" int DS_SFX_Getv(int /*prop*/, void* /*values*/)
+ {
+     // Stub.
+     return 0;
diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml
index 1bb8e628bcb1..1a220b18ce09 100644
--- a/games-fps/doomsday/metadata.xml
+++ b/games-fps/doomsday/metadata.xml
@@ -3,12 +3,14 @@
 <pkgmetadata>
 <herd>games</herd>
 <use>
-	<flag name="snowberry">Install Snowberry doomsday front-end</flag>
-	<flag name="doom">Install launcher for jdoom game</flag>
 	<flag name="demo">Install launcher dor doom1.wad from <pkg>games-fps/doom-data</pkg></flag>
+	<flag name="doom">Install launcher for jdoom game</flag>
+	<flag name="fluidsynth">Build the FluidSynth sound driver</flag>
 	<flag name="freedoom">Install launcher for doom1.wad from <pkg>games-fps/freefoom</pkg></flag>
 	<flag name="heretic">Install launcher for jheretic game</flag>
 	<flag name="hexen">Install launcher for jhexen game</flag>
 	<flag name="resources">Enable support for <pkg>games-fps/doomsday-resources</pkg> in jdoom launcher</flag>
+	<flag name="snowberry">Install Snowberry doomsday front-end</flag>
+	<flag name="tools">Build additional tools such as doomsday-shell, md2tool and texc</flag>
 </use>
 </pkgmetadata>