games-fps/zdoom: bump to 2.8.1

Added unpacker DEPEND for 7zip (bug #598160).
FMOD support had broken by upstream, temporary disabled.
There few QA notices, I'm planning to fix them in upstream.

Package-Manager: portage-2.3.0
Manifest-Sign-Key: A018DE8C

5 files changed, 86 insertions, 156 deletions

diff --git a/games-fps/zdoom/Manifest b/games-fps/zdoom/Manifest
index f8ba8ce..d6cd151 100644
--- a/games-fps/zdoom/Manifest
+++ b/games-fps/zdoom/Manifest
@@ -1,11 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST zdoom-2.7.1-src.7z 2891257 SHA256 7419c95cdb598882c42f8afb0f5911241b31f21f4028da19185278c984b4cf19 SHA512 eb90f1c9da87f485bcea1e912ce5f591f56023284c2a9d0900bb2101a6c238d70c04a2cede6351bd6d0af448ea979ebaa02528a5c8e2a68ec266f61892288f3b WHIRLPOOL 38a5f47c6771f2d0d6d22b3bae7542bd3ca6a912edc17c177b39728e5ba949f64eaee1a3e65fac43d29c0bf60c8d2431e7a1fe8148fa5a80466b76781dd91781
+DIST zdoom-2.8.1-src.7z 3165904 SHA256 782179d4667d2e56e26e21d7a0872523f8e4262ed176072fef00d0043376a310 SHA512 f8894368fe252de2e403fca8a1cfe5fdb975f9ab5d70398d537459d164a9237032aba5364115df6c02bf6d26bc00eab6014c4a5324462b20d2d7679bb101cdae WHIRLPOOL ef12a43412c55741ddd4d4a418885a309efda63f59b6950c74dd1aa7e4406d38b0480276df10949318b34dd181a96cc8b5e199450bcdf324e248491fa151bfd5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHcKh8ACgkQz+A7F6AY3oyiTQEAuFx4Scq/ctCiY/akSpcB+izr
-avvGQmVDBXr+9PPxSlIBAJ/a5Gbu47hE8V2RsVHdAZaRaFVAMXdTk/XZkePiksf3
-=hlTP
+iF4EAREIAAYFAlgSP6IACgkQz+A7F6AY3oyJiwEAh/l/Mth/QEBxtHknFeb/zRsZ
+Oo2Lcw4mciUtznewadkA/2MOLCzrCWIgLGbuhNiIg7yPP2TlV0eiJfNxn5GU/jhM
+=/uNG
 -----END PGP SIGNATURE-----
diff --git a/games-fps/zdoom/metadata.xml b/games-fps/zdoom/metadata.xml
index 202e559..36b28ff 100644
--- a/games-fps/zdoom/metadata.xml
+++ b/games-fps/zdoom/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 <email>azamat.hackimov@gmail.com</email>
 <name>Azamat H. Hackimov</name>
 </maintainer>
@@ -11,5 +11,9 @@ ZDoom is an enhanced port of the official DOOM source code
 <longdescription lang="ru">
 ZDoom - улучшенный порт движка DOOM
 </longdescription>
+<use>
+<flag name="asm">Enable assembly implementations</flag>
+<!-- <flag name="fmod">Enable the fmod music and sound effects</flag> -->
+</use>
 </pkgmetadata>
 
diff --git a/games-fps/zdoom/zdoom-2.7.1.ebuild b/games-fps/zdoom/zdoom-2.7.1.ebuild
deleted file mode 100644
index bfdb12e..0000000
--- a/games-fps/zdoom/zdoom-2.7.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils eutils games versionator unpacker
-
-DESCRIPTION="ZDoom is an enhanced port of the official DOOM source code"
-HOMEPAGE="http://www.zdoom.org"
-SRC_URI="http://www.zdoom.org/files/${PN}/$(get_version_component_range 1-2)/${P}-src.7z"
-
-LICENSE="BSD BUILD DOOM"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_mmx gtk"
-
-RDEPEND="app-arch/bzip2
-	media-libs/fmod:1
-	media-libs/libsdl:0
-	media-sound/fluidsynth
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libXcursor
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	cpu_flags_x86_mmx? ( || ( dev-lang/nasm dev-lang/yasm ) )"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	# Add new versions of FMOD
-	sed -i \
-		-e "s:\(set( MAJOR_VERSIONS\):\1 \"40\" \"38\":" \
-		src/CMakeLists.txt || die
-	# Use default game data path
-	sed -i \
-		-e "s:/usr/local/share/:${GAMES_DATADIR}/doom-data/:" \
-		src/sdl/i_system.h || die "sed i_system.h failed"
-}
-
-src_configure() {
-	mycmakeargs=(
-		"-DFMOD_LOCAL_LIB_DIRS=/opt/fmodex/api/lib"
-		"-DFMOD_INCLUDE_DIR=/opt/fmodex/api/inc"
-#		"-DSHARE_DIR=\"${GAMES_DATADIR}/doom-data\""
-		$(cmake-utils_use_no gtk GTK)
-		$(cmake-utils_use_no cpu_flags_x86_mmx ASM)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	dogamesbin "${CMAKE_BUILD_DIR}/${PN}" || die "dogamesbin failed"
-	insinto "${GAMES_DATADIR}/doom-data"
-	doins "${CMAKE_BUILD_DIR}/${PN}.pk3" || die "doins failed"
-	dodoc docs/commands.txt
-	dohtml docs/console.{css,html}
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "Copy or link wad files into ${GAMES_DATADIR}/doom-data/"
-	elog "(the files must be readable by the 'games' group)."
-	elog
-	elog "To play, simply run:"
-	elog
-	elog "   zdoom"
-	echo
-}
diff --git a/games-fps/zdoom/zdoom-2.8.1.ebuild b/games-fps/zdoom/zdoom-2.8.1.ebuild
new file mode 100644
index 0000000..66e4ffe
--- /dev/null
+++ b/games-fps/zdoom/zdoom-2.8.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils eutils versionator unpacker
+
+DESCRIPTION="ZDoom is an enhanced port of the official DOOM source code"
+HOMEPAGE="http://www.zdoom.org"
+SRC_URI="http://www.zdoom.org/files/${PN}/$(get_version_component_range 1-2)/${P}-src.7z"
+
+LICENSE="BSD BUILD DOOM"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# FIXME fmod does not work
+IUSE="asm gtk openal"
+
+# fmod? ( media-libs/fmod:1 )
+RDEPEND="app-arch/bzip2
+	media-libs/game-music-emu
+	media-libs/libsdl2
+	openal? ( media-libs/openal )
+	media-sound/fluidsynth
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libXcursor
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	asm? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	$(unpacker_src_uri_depends)"
+
+S="${WORKDIR}"
+
+DOCS=( "docs/commands.txt" )
+HTML_DOCS=( "docs/console.{css,html}" )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/share/:/usr/share/doom-data/:" \
+	src/posix/i_system.h || die "sed i_system.h failed"
+
+	sed -i \
+		-e "s:/usr/local/share/doom:/usr/share/doom-data/:" \
+	src/gameconfigfile.cpp || die "sed gameconfigfile.cpp failed"
+}
+
+src_configure() {
+	mycmakeargs=(
+#		"-DFMOD_LOCAL_LIB_DIRS=/opt/fmodex/api/lib"
+#		"-DFMOD_INCLUDE_DIR=/opt/fmodex/api/inc"
+		"-DGME_INCLUDE_DIR=/usr/include"
+		"-DFORCE_INTERNAL_GME=no"
+		-DNO_ASM=$(usex !asm)
+#		-DNO_FMOD=$(usex !fmod)
+		-DNO_GTK=$(usex !gtk)
+		-DNO_OPENAL=$(usex !openal)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dobin "${CMAKE_BUILD_DIR}/${PN}"
+	insinto "/usr/share/doom-data"
+	doins "${CMAKE_BUILD_DIR}/${PN}.pk3"
+}
+
+pkg_postinst() {
+	echo
+	elog "Copy or link wad files into /usr/share/doom-data/"
+	elog
+	elog "To play, simply run:"
+	elog
+	elog "   zdoom"
+	echo
+}
diff --git a/games-fps/zdoom/zdoom-9999.ebuild b/games-fps/zdoom/zdoom-9999.ebuild
deleted file mode 100644
index ec827c8..0000000
--- a/games-fps/zdoom/zdoom-9999.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils eutils games git-2
-
-DESCRIPTION="ZDoom is an enhanced port of the official DOOM source code"
-HOMEPAGE="http://www.zdoom.org"
-EGIT_REPO_URI="https://github.com/rheit/zdoom"
-#SRC_URI="http://www.zdoom.org/files/${PN}/2.5/${P}-src.7z"
-
-LICENSE="BSD BUILD DOOM"
-SLOT="0"
-KEYWORDS=""
-IUSE="cpu_flags_x86_mmx gtk"
-
-RDEPEND="app-arch/bzip2
-	media-libs/fmod:1
-	media-sound/fluidsynth
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libXcursor
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	cpu_flags_x86_mmx? ( || ( dev-lang/nasm dev-lang/yasm ) )"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	# Add new versions of FMOD
-	sed -i \
-		-e "s:\(set( MAJOR_VERSIONS\):\1 \"40\" \"38\":" \
-		src/CMakeLists.txt || die
-	# Use default game data path
-#	sed -i \
-#		-e "s:/usr/local/share/:${GAMES_DATADIR}/doom-data/:" \
-#		src/sdl/i_system.h || die "sed i_system.h failed"
-}
-
-src_configure() {
-	mycmakeargs=(
-		"-DFMOD_LOCAL_LIB_DIRS=/opt/fmodex/api/lib"
-		"-DFMOD_INCLUDE_DIR=/opt/fmodex/api/inc"
-#		"-DSHARE_DIR=\"${GAMES_DATADIR}/doom-data\""
-		$(cmake-utils_use_no gtk GTK)
-		$(cmake-utils_use_no cpu_flags_x86_mmx ASM)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	dogamesbin "${CMAKE_BUILD_DIR}/${PN}" || die "dogamesbin failed"
-	insinto "${GAMES_DATADIR}/doom-data"
-	doins "${CMAKE_BUILD_DIR}/${PN}.pk3" || die "doins failed"
-	dodoc docs/commands.txt
-	dohtml docs/console.{css,html}
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "Copy or link wad files into ${GAMES_DATADIR}/doom-data/"
-	elog "(the files must be readable by the 'games' group)."
-	elog
-	elog "To play, simply run:"
-	elog
-	elog "   zdoom"
-	echo
-}