[gentoo-commits] repo/proj/guru:dev commit in: games-fps/crispy-doom/

[William Breathitt Gray]

commit:     d15be3e5318904110322c031dd2325b004db82e4
Author:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Wed Aug 19 12:34:56 2020 +0000
Commit:     William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
CommitDate: Wed Aug 19 12:34:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d15be3e5

games-fps/cripsy-doom: Version bump to 5.9.0

Bug: https://bugs.gentoo.org/729216
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>

 games-fps/crispy-doom/Manifest                     |  3 +-
 games-fps/crispy-doom/crispy-doom-5.7.2.ebuild     | 42 ----------------------
 ...-doom-5.8.0.ebuild => crispy-doom-5.9.0.ebuild} | 33 ++++++++++++++---
 games-fps/crispy-doom/metadata.xml                 |  1 +
 4 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/games-fps/crispy-doom/Manifest b/games-fps/crispy-doom/Manifest
index 1e60c1e..1798910 100644
--- a/games-fps/crispy-doom/Manifest
+++ b/games-fps/crispy-doom/Manifest
@@ -1,2 +1 @@
-DIST crispy-doom-5.7.2.tar.gz 2624917 BLAKE2B 2c381d234168c53fda79c17d5b3544dbb72131d591bc6161524cc16b2ef47fa1e93c80656c3c9629dd3193a78dedad8fd4bffa66a1816ad5eb63c9c06a928e39 SHA512 236826c98e2cd66edcc11336b9ab1e6942ec9db09b53cb9f23e472046222431c94dc597fa0768e006b0b1b32ab6a6073c715e0bd95effebde17ea70b8e5f11ad
-DIST crispy-doom-5.8.0.tar.gz 2627570 BLAKE2B f4495363216fe251566ffda6ff4dff0952661050ebb1221e536ab5a13f792b69ae4eb159f2a89b32843cc796cead43455216ddec8cc2047d44e565f0aaab302b SHA512 c6a4833c27b81e9808565b352214001a0d621f8bf6dbb7f4235d2bedaa35db68a1cf2567f77e7139da29df1d56a1097419e16791d1b49e5882674e33ce8c4649
+DIST crispy-doom-5.9.0.tar.gz 2641211 BLAKE2B a97bb7d9bda0c4e984054a0051cadfcaba7c758829bec9e615801bbf91dc1c8063decfedf5b76056cd2fb05e8fcf4113f19c10d72604399b715011d994af3e8b SHA512 9970291f374003ac2a1d9e4c44db18b97a41ae3348a5e100ec369affc162d681d15ce61846480667c8a7418700b78a4380bedab1e3acae77976eb4271a22b644

diff --git a/games-fps/crispy-doom/crispy-doom-5.7.2.ebuild b/games-fps/crispy-doom/crispy-doom-5.7.2.ebuild
deleted file mode 100644
index d8a3500..0000000
--- a/games-fps/crispy-doom/crispy-doom-5.7.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools python-any-r1 xdg
-
-DESCRIPTION="A limit-removing enhanced-resolution Doom source port based on Chocolate Doom"
-HOMEPAGE="https://github.com/fabiangreffrath/crispy-doom"
-SRC_URI="https://github.com/fabiangreffrath/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libsamplerate png python timidity +vorbis zlib"
-
-DEPEND="
-	media-libs/libsdl2
-	media-libs/sdl2-mixer[timidity?,vorbis?]
-	media-libs/sdl2-net
-	libsamplerate? ( media-libs/libsamplerate )
-	png? ( media-libs/libpng:= )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-BDEPEND="python? ( ${PYTHON_DEPS} )"
-
-S="${WORKDIR}"/${PN}-${P}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${P}/docs" \
-		$(use_with libsamplerate) \
-		$(use_with png libpng) \
-		$(use_with zlib)
-}

diff --git a/games-fps/crispy-doom/crispy-doom-5.8.0.ebuild b/games-fps/crispy-doom/crispy-doom-5.9.0.ebuild
similarity index 60%
rename from games-fps/crispy-doom/crispy-doom-5.8.0.ebuild
rename to games-fps/crispy-doom/crispy-doom-5.9.0.ebuild
index a2e79c4..a7d1e8f 100644
--- a/games-fps/crispy-doom/crispy-doom-5.8.0.ebuild
+++ b/games-fps/crispy-doom/crispy-doom-5.9.0.ebuild
@@ -14,20 +14,33 @@ SRC_URI="https://github.com/fabiangreffrath/${PN}/archive/${P}.tar.gz"
 LICENSE="BSD GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libsamplerate png python timidity truecolor +vorbis zlib"
+IUSE="bash-completion doc libsamplerate +midi png truecolor +vorbis zlib"
 
 DEPEND="
 	media-libs/libsdl2
-	media-libs/sdl2-mixer[timidity?,vorbis?]
+	media-libs/sdl2-mixer[midi?,vorbis?]
 	media-libs/sdl2-net
 	libsamplerate? ( media-libs/libsamplerate )
 	png? ( media-libs/libpng:= )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
-BDEPEND="python? ( ${PYTHON_DEPS} )"
+BDEPEND="
+	bash-completion? ( ${PYTHON_DEPS} )
+	doc? ( ${PYTHON_DEPS} )"
 
 S="${WORKDIR}"/${PN}-${P}
 
+DOCS=(
+	"AUTHORS"
+	"ChangeLog"
+	"NEWS.md"
+	"NOT-BUGS.md"
+	"PHILOSOPHY.md"
+	"README.md"
+	"README.Music.md"
+	"README.Strife.md"
+)
+
 src_prepare() {
 	default
 	eautoreconf
@@ -35,9 +48,21 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${P}/docs" \
+		$(use_enable bash-completion) \
+		$(use_enable doc) \
+		--disable-fonts \
+		--disable-icons \
 		$(use_with libsamplerate) \
 		$(use_with png libpng) \
 		$(use_enable truecolor) \
 		$(use_with zlib)
 }
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Remove redundant documentation files
+	rm -r "${ED}/usr/share/doc/"* || die
+
+	einstalldocs
+}

diff --git a/games-fps/crispy-doom/metadata.xml b/games-fps/crispy-doom/metadata.xml
index a8959f1..119c68e 100644
--- a/games-fps/crispy-doom/metadata.xml
+++ b/games-fps/crispy-doom/metadata.xml
@@ -9,6 +9,7 @@
 		<name>William Breathitt Gray</name>
 	</maintainer>
 	<use>
+		<flag name="midi">Basic support for MIDI files</flag>
 		<flag name="truecolor">Enable true-color rendering (experimental)</flag>
 	</use>
 	<upstream>