Fix timidity for recent gzdoom

5 files changed, 89 insertions, 87 deletions

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 7c998ec..f15f03d 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,6 +1,6 @@
 DIST gzdoom-g3.2.3.zip 10636714 BLAKE2B d3d6c53575f335f843e7e0104950a9a314298d2a3a45301f5e267548198b3540f42eff532e2abd333918203b7981890570bfccb09c55d00b86d5a915d4071fdc SHA512 1b6bdd542c7fe090bf89d81451d877d9b42f111f8b8a406b0040cafdfeb959fa007e343893debd27de447f5c950de67dba240c9d432e697ec577e8602d87ff11
 DIST gzdoom-g3.4.1.zip 11499076 BLAKE2B f7e9b1f303752ea2442b67347c106bec054e7cda318b52085c061617b00021d1e550b06001f6f74f6c8b91d15972829e2aafa5033b11b03353aa55e5d73ce522 SHA512 512b2e51b01b6b74cd7373e31643f196f962b71bdae19621fd4fa7f7bf54f863088e26818354b840947b48abe9f6644e05eb80601ded13fb6d18af93d43dc728
-EBUILD gzdoom-3.2.3.ebuild 1660 BLAKE2B 69bb87543d72c1ed2dff06251f061f5cdee40a4ee90f6ec5dcd1ca6afde284d9fc09118b203fde8fb91fdcd455905a4e73c26a07ba160230af84402fddaf67e8 SHA512 379d6a613ecebe55be6a2772ec3af11c315bdc3d71245387f86d9ac5b8aab6638ebf779a48b22b5127cf5128b69b745dec001128b03159110863d878e3f83e94
-EBUILD gzdoom-3.4.1.ebuild 1660 BLAKE2B 69bb87543d72c1ed2dff06251f061f5cdee40a4ee90f6ec5dcd1ca6afde284d9fc09118b203fde8fb91fdcd455905a4e73c26a07ba160230af84402fddaf67e8 SHA512 379d6a613ecebe55be6a2772ec3af11c315bdc3d71245387f86d9ac5b8aab6638ebf779a48b22b5127cf5128b69b745dec001128b03159110863d878e3f83e94
-EBUILD gzdoom-9999-r1.ebuild 1660 BLAKE2B 69bb87543d72c1ed2dff06251f061f5cdee40a4ee90f6ec5dcd1ca6afde284d9fc09118b203fde8fb91fdcd455905a4e73c26a07ba160230af84402fddaf67e8 SHA512 379d6a613ecebe55be6a2772ec3af11c315bdc3d71245387f86d9ac5b8aab6638ebf779a48b22b5127cf5128b69b745dec001128b03159110863d878e3f83e94
+EBUILD gzdoom-3.2.3.ebuild 1534 BLAKE2B 3ac64e6f8de37bf85a1cf2b4a1dc4c1cb3712c33273477c28a3eaf81fe8134dbf533995f64b4450157fb3bfac20c854182f9231c0ea15739d9e1dd8c584b9d57 SHA512 725c7d9407d3c372b50540fec7e56782927ebecd8b7167e023869f9b7d9d8376a1ed15ee32acb83c36a3b547b975fa62b806799b38f049921fdb5d04e3c89af9
+EBUILD gzdoom-3.4.1-r1.ebuild 2176 BLAKE2B 362d17af5b90e377b039c2059f027c83f8881f7497123055a0db55f8d1a1ca059ced6b1b6151d0ed691262d053633a61d0d45906ea965e4cd3743bd5a560baf7 SHA512 ea30db5cce6fd5cacf85a3b29ff394ffca6e49a8a3a0369accf928cecd23cf95470539477623cead994510f9e2db54d349ba1a0bb514bebaa9e425884b73a56e
+EBUILD gzdoom-9999-r1.ebuild 2176 BLAKE2B 362d17af5b90e377b039c2059f027c83f8881f7497123055a0db55f8d1a1ca059ced6b1b6151d0ed691262d053633a61d0d45906ea965e4cd3743bd5a560baf7 SHA512 ea30db5cce6fd5cacf85a3b29ff394ffca6e49a8a3a0369accf928cecd23cf95470539477623cead994510f9e2db54d349ba1a0bb514bebaa9e425884b73a56e
 MISC metadata.xml 209 BLAKE2B 33379e9e99cbdf92e08d56493ff29921c92fa82e54df125720deac16f4e1baa34008718c880034426c16f756bb7d0be0eb6a41632712e724efadbf05200a104b SHA512 ea91ad4eadb2073643e37878109c4849a1cc73692e6e88552fbc3f5f0ef16367ae186951ef8ccc59173b023d5f344d22c758e6adabed2d215563c4304262295b
diff --git a/games-fps/gzdoom/gzdoom-3.2.3.ebuild b/games-fps/gzdoom/gzdoom-3.2.3.ebuild
index 2bd01b4..a19a190 100644
--- a/games-fps/gzdoom/gzdoom-3.2.3.ebuild
+++ b/games-fps/gzdoom/gzdoom-3.2.3.ebuild
@@ -8,15 +8,9 @@ inherit eutils cmake-utils
 DESCRIPTION="A 3D-accelerated Doom source port based on ZDoom code"
 HOMEPAGE="https://zdoom.org"
 
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/coelckers/gzdoom.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://zdoom.org/files/gzdoom/src/${PN}-g${PV}.zip"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-g${PV}"
-fi
+SRC_URI="https://zdoom.org/files/gzdoom/src/${PN}-g${PV}.zip"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/${PN}-g${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/games-fps/gzdoom/gzdoom-3.4.1-r1.ebuild b/games-fps/gzdoom/gzdoom-3.4.1-r1.ebuild
new file mode 120000
index 0000000..3f3fad3
--- /dev/null
+++ b/games-fps/gzdoom/gzdoom-3.4.1-r1.ebuild
@@ -0,0 +1 @@
+gzdoom-9999-r1.ebuild
\ No newline at end of file
diff --git a/games-fps/gzdoom/gzdoom-3.4.1.ebuild b/games-fps/gzdoom/gzdoom-3.4.1.ebuild
deleted file mode 100644
index 2bd01b4..0000000
--- a/games-fps/gzdoom/gzdoom-3.4.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="A 3D-accelerated Doom source port based on ZDoom code"
-HOMEPAGE="https://zdoom.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/coelckers/gzdoom.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://zdoom.org/files/gzdoom/src/${PN}-g${PV}.zip"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-g${PV}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="fluidsynth +gtk3 timidity"
-
-RDEPEND="fluidsynth? ( media-sound/fluidsynth )
-	gtk3? ( x11-libs/gtk+:3 )
-	timidity? ( media-sound/timidity++ )
-	media-libs/libsdl2
-	virtual/glu
-	virtual/jpeg:62
-	virtual/opengl"
-
-DEPEND="${RDEPEND}
-	|| ( dev-lang/nasm dev-lang/yasm )"
-
-src_prepare() {
-	# Use default data path
-	sed -i -e "s:/usr/local/share/:/usr/share/doom-data/:" src/posix/i_system.h
-	sed -i -e '/SetValueForKey ("Path", "\/usr\/share\/games\/doom", true);/ a \\t\tSetValueForKey ("Path", "/usr/share/doom-data", true);' \
-		src/gameconfigfile.cpp
-	eapply_user
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DNO_GTK="$(usex gtk3 no yes)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	dodoc docs/*.txt
-	dohtml docs/console*.{css,html}
-
-	newicon "src/win32/icon1.ico" "${PN}.ico"
-	make_desktop_entry "${PN}" "GZDoom" "${PN}.ico" "Game;ActionGame;"
-
-	cd "${BUILD_DIR}"
-
-	insinto "/usr/share/doom-data"
-	doins *.pk3
-
-	dobin "${PN}"
-}
-
-pkg_postinst() {
-	elog "Copy or link wad files into /usr/share/doom-data/"
-	elog "ATTENTION: The path has changed! It used to be /usr/share/games/doom-data/"
-	elog
-	elog "To play, simply run:"
-	elog "   gzdoom"
-	elog
-}
diff --git a/games-fps/gzdoom/gzdoom-9999-r1.ebuild b/games-fps/gzdoom/gzdoom-9999-r1.ebuild
index 4196abc..5a88948 120000..100644
--- a/games-fps/gzdoom/gzdoom-9999-r1.ebuild
+++ b/games-fps/gzdoom/gzdoom-9999-r1.ebuild
@@ -1 +1,82 @@
-gzdoom-3.2.3.ebuild
\ No newline at end of file
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils cmake-utils
+
+DESCRIPTION="A 3D-accelerated Doom source port based on ZDoom code"
+HOMEPAGE="https://zdoom.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/coelckers/gzdoom.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://zdoom.org/files/gzdoom/src/${PN}-g${PV}.zip"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-g${PV}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+gtk3 system-timidity"
+
+RDEPEND="gtk3? ( x11-libs/gtk+:3 )
+	media-libs/libsdl2
+	virtual/glu
+	virtual/jpeg:62
+	virtual/opengl"
+
+DEPEND="${RDEPEND}
+	|| ( dev-lang/nasm dev-lang/yasm )"
+
+src_prepare() {
+	# Use default data path
+	sed -i -e "s:/usr/local/share/:/usr/share/doom-data/:" src/posix/i_system.h
+	sed -i -e '/SetValueForKey ("Path", "\/usr\/share\/games\/doom", true);/ a \\t\tSetValueForKey ("Path", "/usr/share/doom-data", true);' \
+		src/gameconfigfile.cpp
+	sed -i -e '/SetValueForKey("Path", "\/usr\/share\/games\/doom\/soundfonts", true);/ a \\t\tSetValueForKey ("Path", "/usr/share/doom-data/soundfonts", true);' \
+		src/gameconfigfile.cpp
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DNO_GTK="$(usex gtk3 no yes)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dodoc docs/*.txt
+	dohtml docs/console*.{css,html}
+
+	newicon "src/win32/icon1.ico" "${PN}.ico"
+	make_desktop_entry "${PN}" "GZDoom" "${PN}.ico" "Game;ActionGame;"
+
+	cd "${BUILD_DIR}"
+
+	insinto "/usr/share/doom-data"
+	doins *.pk3
+	insinto "/usr/share/doom-data/soundfonts"
+	doins soundfonts/*.sf2
+
+	dobin "${PN}"
+}
+
+pkg_postinst() {
+	elog "Copy or link wad files into /usr/share/doom-data/"
+	elog "ATTENTION: The path has changed! It used to be /usr/share/games/doom-data/"
+	elog
+	elog "Starting from GZDoom 3.3.0, TiMidity++ is now an internal MIDI player."
+	elog "Unfortunately, it does not support system soundfonts directly."
+	elog "To make them selectable, turn '/usr/share/timidity/foo' into a zip archive and put it"
+	elog 'into /usr/share/doom-data/soundfonts/ or $HOME/.config/gzdoom/soundfonts/'
+	elog
+	elog "To play, simply run:"
+	elog "   gzdoom"
+	elog
+}