gentoo resync : 01.08.2021

11 files changed, 19 insertions, 16 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 4a73d2ef4082..cf70b5725187 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/chocolate-doom/Manifest b/games-fps/chocolate-doom/Manifest
index 2f31d10e0c14..acab6bf54a81 100644
--- a/games-fps/chocolate-doom/Manifest
+++ b/games-fps/chocolate-doom/Manifest
@@ -14,5 +14,5 @@ AUX chocolate-doom-3.0.1-install-AppStream-metadata-into-the-proper-location.pat
 AUX chocolate-doom-3.0.1-use-reverse-DNS-naming-for-installing-.desktop-files.patch 5485 BLAKE2B d89e14a071349cd772e5f91962429d0cdf152e2acd92be842068ee39569f79f451513a5bbd5a35f6abcd15d3eb73235e429025db1fb320c58f28feb3ca5c1d98 SHA512 e12d7e64baaaab44d8f6372cd057b4622e3758de6fb39365bcb047980eeccb6ec0b571185d084a56ac4c28a1d2916d3a8beef29466bb5d406eced60a3b2ddc6d
 DIST chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch 26736 BLAKE2B 3b75eaf6ea38280eb649eb0a35cf72376fc8daafda51a79bb321e1ac9311bd7d7edc6b7740b235288c32142c01fcf346045091783912739317556a78eb07751a SHA512 64512c47d404de1a85f84948bcf780257070f5b22dce6fa7dba66ba65027a15e93e39145424be327de4abd1f1f3b994fcd936e3dcdc564f1f96238b133a3a554
 DIST chocolate-doom-3.0.1.tar.gz 2245563 BLAKE2B 0c9babfbc9e52ea7822ca00c0dbf84e471bfe6d6ec94f729d3d0f72243205b060e5a3b5f1f99728da7764e81af735b45d001bb368dd2b5796666554e3c911090 SHA512 2a81905cf619ea2def7e2f9ebe65b38543d01bd83a95e535e88d04a79f2676f8ba0da64031a650bd905e1345cda1b9d28a398ad87c10c92f2d3d50f3253ec214
-EBUILD chocolate-doom-3.0.1.ebuild 2544 BLAKE2B 9640e7b406854a3e6e476dfc11d41c684162658d52a4f37f0db316be76dd4c50cf955a36e93c1ce58e396df0c12b7225b095805e29aed30cc262416d06b78bfb SHA512 81e05cf2d3660bfbf8897b5f82efd3ca02c70dddd84cacd4014bc5c785004018c0a5eebec1333ec48912eae8eb6e7eb9c918f59bc51a33511ddcfcaf9748ca5b
+EBUILD chocolate-doom-3.0.1-r1.ebuild 2537 BLAKE2B 6efeec6f543e52502a19d204c618e6e27175e7f7463f9a368c1f308b469a349c89ccdf6fa2bcbf84b9298e7c2cd3425f0015ef45c6d89c36eb9a048add001253 SHA512 4a0e5e028bf60ad4e71e1725fe89617ff8f3cef04c271c4d03030dacbcd2ed69fae6053fe5c91ee591b6a25db03de47b24246c38a963a4e80478db78e8b23b51
 MISC metadata.xml 1033 BLAKE2B 29efd90d416ae1858245ae325e5451acc332cf61a5f9eefe2a5da8028a3514f75f6ad8c87a5e5124c35912f7ea4b8a388d8b0fe9c5e733f05644a082bc5958f3 SHA512 e6357dd32a02f56989d0f9315fd8a77f20fcb9ae5950d35cb19eaf3d7a9f34837be51ec1c833054bfcdc742819c32db68e45d0545ea91966758f4fabcddf7eaa
diff --git a/games-fps/chocolate-doom/chocolate-doom-3.0.1.ebuild b/games-fps/chocolate-doom/chocolate-doom-3.0.1-r1.ebuild
index 13647f2153ff..02a5356a9c32 100644
--- a/games-fps/chocolate-doom/chocolate-doom-3.0.1.ebuild
+++ b/games-fps/chocolate-doom/chocolate-doom-3.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools prefix python-any-r1 xdg
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz
 LICENSE="BSD GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion doc libsamplerate +midi png vorbis"
+IUSE="doc libsamplerate +midi png vorbis"
 
 DEPEND="
 	media-libs/libsdl2[video]
@@ -24,8 +24,9 @@ DEPEND="
 	libsamplerate? ( media-libs/libsamplerate )
 	png? ( media-libs/libpng:= )"
 RDEPEND="${DEPEND}"
+# ${PYTHON_DEPS} for bash-completion
 BDEPEND="
-	bash-completion? ( ${PYTHON_DEPS} )
+	${PYTHON_DEPS}
 	doc? ( ${PYTHON_DEPS} )"
 
 S="${WORKDIR}/${PN}-${P}"
@@ -69,7 +70,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_enable bash-completion) \
+		--enable-bash-completion \
 		$(use_enable doc) \
 		--disable-fonts \
 		--disable-icons \
diff --git a/games-fps/freedm-data/Manifest b/games-fps/freedm-data/Manifest
index 84cde8c5e7ee..6cec1a6b5cb4 100644
--- a/games-fps/freedm-data/Manifest
+++ b/games-fps/freedm-data/Manifest
@@ -1,3 +1,3 @@
 DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d SHA512 7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2
-EBUILD freedm-data-0.12.1.ebuild 1086 BLAKE2B b59e7abc6ecb488b05e8dbaff5bbe901a389be303e129411023d9f65c6b4b4c3c9e3866b3d378673e52bcd4d2d89a1cb700aeb86bcad5961d3b4440f1fc8c15b SHA512 b75845ee30061170b93beb293ba5a473e00d528cddd3edda092b8de467737920e159a8a62d4f7d55df456d7d7b1dea0f47582cc3aadbba773c5b282414a0bc31
+EBUILD freedm-data-0.12.1-r1.ebuild 1092 BLAKE2B bc39a90703139ee3f23bc45cce55b0d6e0a3e52d41cd4caf6fc0ff34ab585d8d0efc86c96c53df96cbedf5fcdc6ac48da4e21b0e60cd1fa15126beb54e49c4e0 SHA512 efcb5b570a98d35bc0adc4139d82f0813f6ae5ef48ad9840a6a2df1e14b587d8b69d220764e3e8a60629257e8fa496a8ca2a0ed5427a34b65e2d5db10b457231
 MISC metadata.xml 1510 BLAKE2B 228d6788aedc580020163b04ffafb826c8e68aff148cf9d72743d64f8ee953e20fc67e246963ded56481b5aeee539d45b84af395bd604dc5bb07bfb9b8d763db SHA512 06e30065de755cc85aaee05597722a7d2679870a602214f82e49008c4dda0635f14f5724d1e07a20276abcb6ec9c1d14a5058451ed0a2f4edf63ff1f82920690
diff --git a/games-fps/freedm-data/freedm-data-0.12.1.ebuild b/games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild
index fa8948dc07d3..f9c14047d7b6 100644
--- a/games-fps/freedm-data/freedm-data-0.12.1.ebuild
+++ b/games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 BDEPEND="
 	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]')
 	app-text/asciidoc
-	games-util/deutex"
+	games-util/deutex[png]"
 
 S="${WORKDIR}/freedoom-${PV}"
 
@@ -44,7 +44,7 @@ src_install() {
 	emake install-freedm \
 		prefix="${ED}/usr/" \
 		bindir="bin/" \
-		docdir="share/doc/${P}" \
+		docdir="share/doc/${PF}" \
 		mandir="share/man/" \
 		waddir="${DOOMWADPATH}/"
 }
diff --git a/games-fps/freedm/Manifest b/games-fps/freedm/Manifest
index d02f29b773df..ec591ca0e5d2 100644
--- a/games-fps/freedm/Manifest
+++ b/games-fps/freedm/Manifest
@@ -1,2 +1,2 @@
-EBUILD freedm-0.12.1.ebuild 544 BLAKE2B 541a16219ff289e542e87c561484db201d4b83c8f3345e814777e1da614c843cb0da23e6329693d852fb7764c85ece0b6ff57e749f977081602559af3bbafad1 SHA512 7a5e483634a5f5bdfa3657b6bd00b8824e69117b1fc58c4aab1b5dc33e27ad232a2716b8b6cd0ad1d00e47d5f329dbeaf524a3f81cdbce34da03efcb6e2c7537
+EBUILD freedm-0.12.1.ebuild 571 BLAKE2B bb5695646003a6ae5dde9b03c81da6943104d8b11a0cb640a17f7b6b49e1c8342db58a02194741daf647ca9c38745c045a5fba06bf41e2e587531c3abdd997f3 SHA512 b5a8cac80d7da2b7534e231931df60ba9919d320a611b4e33113251588a0540e6c472aedf060d96b02c3517db6e8f28d59b89033c4d63639bd99391727ef8b42
 MISC metadata.xml 1510 BLAKE2B 228d6788aedc580020163b04ffafb826c8e68aff148cf9d72743d64f8ee953e20fc67e246963ded56481b5aeee539d45b84af395bd604dc5bb07bfb9b8d763db SHA512 06e30065de755cc85aaee05597722a7d2679870a602214f82e49008c4dda0635f14f5724d1e07a20276abcb6ec9c1d14a5058451ed0a2f4edf63ff1f82920690
diff --git a/games-fps/freedm/freedm-0.12.1.ebuild b/games-fps/freedm/freedm-0.12.1.ebuild
index 9b59beb2648f..1c2eae7cc6d6 100644
--- a/games-fps/freedm/freedm-0.12.1.ebuild
+++ b/games-fps/freedm/freedm-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,7 @@ RDEPEND="
 	|| (
 		games-fps/gzdoom[nonfree(+)]
 		games-engines/odamex
+		games-fps/chocolate-doom
 		games-fps/doomsday
 		games-fps/prboom-plus
 	)
diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index da1ec0666cf8..89edaa90859f 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1,3 +1,3 @@
 DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d SHA512 7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2
-EBUILD freedoom-data-0.12.1.ebuild 1118 BLAKE2B 24613fab215ab2e977bb4cfb16bf5deea7a6f4fb534c1bac7d566b540ca83630d05393c96257a3847d72a375bd1c5e1990a159cda422f702a47a35010584a85c SHA512 11e54ee30ca0fbd77238087af3336a0f0325663f8a3b5412d63412ad71e11e128a68289ff126187e4b4f1b2593b826e2402b5c9715317b88d39aadfc9cd970df
+EBUILD freedoom-data-0.12.1-r1.ebuild 1124 BLAKE2B 3fd2445ffb923a812dff19c1054a9e9c91a071edf0c82209a9a7637996a984d55a450bcc3f2f7b17ec808e0a0b7d05fe95fc86497537118d04dbc030f58ced6e SHA512 fb28628fc94b597b4a73f5b4da34c1e58754e5872fddcab7941798ae5cf723af4881e04de63cf8e898f94393d9d1514aa5889ff2e9cb5bbf2c5e5b945afadaf9
 MISC metadata.xml 1839 BLAKE2B e512baac046ee7dea937cbae541d36bc541305b0325879d6676d0c00750a3e104b6b9102d95ef016659467ab574ef746e5c6cb3e6cd1e9e5891dfb174430f7c7 SHA512 7713a4ecd003d543b8919c26400b1ba6f388767d6b43f4ba8a606277d1c39b6be696d1de83767f5eaf71057a0feffb66aa514bed7758d15f951c72e4ff65616b
diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
index d0402108c77b..87611ba48ea7 100644
--- a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 BDEPEND="
 	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]')
 	app-text/asciidoc
-	games-util/deutex"
+	games-util/deutex[png]"
 
 S="${WORKDIR}/freedoom-${PV}"
 
@@ -44,7 +44,7 @@ src_install() {
 	emake install-freedoom \
 		prefix="${ED}/usr/" \
 		bindir="bin/" \
-		docdir="share/doc/${P}" \
+		docdir="share/doc/${PF}" \
 		mandir="share/man/" \
 		waddir="${DOOMWADPATH}/"
 }
diff --git a/games-fps/freedoom/Manifest b/games-fps/freedoom/Manifest
index 5527172e31d6..ce3df8acb443 100644
--- a/games-fps/freedoom/Manifest
+++ b/games-fps/freedoom/Manifest
@@ -1,2 +1,2 @@
-EBUILD freedoom-0.12.1.ebuild 571 BLAKE2B 815e7a39e6b85d54e9bb68382ceb2b71577c0b1e903a8bd5eba258adfaf711c5e23c188dbe43722f80547917570affc4b780eee62869094abc7c10184b72938a SHA512 afafa4a4624910fb1d1d543eedb7c15373ff7d4d2ef50773da75e225d610263a52b6bb7e8232f9234204ba5e53795898de03e4254e399c9eba9e432d445c2d4d
+EBUILD freedoom-0.12.1.ebuild 598 BLAKE2B bd17ff88287838826efca4a5aff51b0c604d50b5d8c6264355157efffbb6a3d6663f0f6f44a1e36a01128278d1ccc14e9ffe98554cc93b63f277e7513ee6b99a SHA512 ae3e50f500d5e38c21d02af92e4aca3be928ad3fb12eb4ad0122c5d36cebc1225c611fd63f88b7ed08070466696848265426a03a671e0297a798e1d00a07bda3
 MISC metadata.xml 1839 BLAKE2B e512baac046ee7dea937cbae541d36bc541305b0325879d6676d0c00750a3e104b6b9102d95ef016659467ab574ef746e5c6cb3e6cd1e9e5891dfb174430f7c7 SHA512 7713a4ecd003d543b8919c26400b1ba6f388767d6b43f4ba8a606277d1c39b6be696d1de83767f5eaf71057a0feffb66aa514bed7758d15f951c72e4ff65616b
diff --git a/games-fps/freedoom/freedoom-0.12.1.ebuild b/games-fps/freedoom/freedoom-0.12.1.ebuild
index c0232065f78c..a122aa325f51 100644
--- a/games-fps/freedoom/freedoom-0.12.1.ebuild
+++ b/games-fps/freedoom/freedoom-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,7 @@ RDEPEND="
 	|| (
 		games-fps/gzdoom[nonfree(+)]
 		games-engines/odamex
+		games-fps/chocolate-doom
 		games-fps/doomsday
 		games-fps/prboom-plus
 	)