gentoo resync : 02.08.2019

6 files changed, 4 insertions, 86 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index a4941086d9fd..81883734596a 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index ebaa28f8e7c0..eb679519ccd0 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,5 +1,3 @@
-DIST doomsday-2.0.3.tar.gz 18060670 BLAKE2B e01545f5d719310a78f01de77249a72f9c3c61a1d295ee0827475439b63653f613660bdc033c1651180cc390469c89120d262c15c6e22cece52600e2889e1437 SHA512 4f8e737df9e004cf3ac3cf16b84ffce0c85e2180af552bac41a224595c7f6932397c39f7d3e9fa522e1ae62828cb87f564a5fa411e742eb07bbee96f14c3ee7c
 DIST doomsday-2.1.1.tar.gz 47526008 BLAKE2B bf941048d160058273df09d67b09e140c10d141cd73ff56d0f3162045696d81533aba9a8c9ff39fc29530248ee8b2f6dd2b3da76a929fb6263c311e65bcbdd82 SHA512 9df0afa0465ef3c3bb30cccf8ca51596e8e6e5584775a695c9c3278f15bcf7e9f7aaeaa0917f0a1de9fbb1174f2ae83a1ee85fba63bef6e49be957836f1107a3
-EBUILD doomsday-2.0.3.ebuild 1752 BLAKE2B b65b8da028703868366192847f12b26e22a3f5b4a4a88a7d17f2b0d9378ecbdb21a3e5f1561c90e8465b4ce7403190d89afdc1da3a5e500b2f681be8dbf9a3b1 SHA512 d954a9b61ee050ec9f30e376aee0e79be62ab6ff254db77dbd1f855c6d79e5ca104e1d47aef3418911f2ba963296d8da5f6ee486e43df1bc50dbbbaf48753b58
 EBUILD doomsday-2.1.1.ebuild 2046 BLAKE2B d0db0f2a7f0b46210c5a47ece5278ae86833ee511be00a81cf4370d5128177e4f548bf981a8fb6dc1ec75a8c1e7af82f9071458309fb3368c79cd8b92a97d03e SHA512 3917095b7299c62c0aae1bba1561076f12cf02d7f31dbeee03f38e1acb34117f62dcb1d57aae89925b8b10c0e1f464387388d8a9b353a191aa0fcd2e79cd43b1
-MISC metadata.xml 956 BLAKE2B 762c3c0aa85b8d59cdc333f381e4028c7708d113017c84d7dad4ae2659f7c9c875ec410c04b29baccfb9df267f6a081a2cd5321068a328cfe95d2861d0108c7d SHA512 2efbdb770fec0865b8f6a2b6a1ceab526842f2ff70eb9317048d3595b19ed43ba7a67857d7e698081e28463c9a925630030674992d267e6ec5a37efe67c39cfa
+MISC metadata.xml 771 BLAKE2B 8a5effc2f449a9b4448dead1a37e9df047ae2e1608c26522d99b02e2d9561e8c129dbdb93f5a713dce72cee09edd8eaed61f38a278d995b3a7fc7e1a5c468bed SHA512 8bc89aa4bab55338472489ec1e92b47cb676b3110a1d3609d8e5a0d51965955770f045405665bff2e401f34697ef4d4b52341a668d08909a92db8eb660c18e00
diff --git a/games-fps/doomsday/doomsday-2.0.3.ebuild b/games-fps/doomsday/doomsday-2.0.3.ebuild
deleted file mode 100644
index c50b22ad60ee..000000000000
--- a/games-fps/doomsday/doomsday-2.0.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 readme.gentoo-r1 cmake-utils
-
-DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
-HOMEPAGE="http://www.dengine.net"
-SRC_URI="https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="fluidsynth openal +doom demo freedoom heretic hexen tools fmod"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	demo? ( doom ) freedoom? ( doom )
-"
-
-RDEPEND="
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtgui:5[-gles2]
-	dev-qt/qtcore:5
-	net-misc/curl
-	sys-libs/zlib
-	media-libs/assimp
-	fmod? ( media-libs/fmod )
-	fluidsynth? ( media-sound/fluidsynth )
-	openal? ( media-libs/openal )
-	tools? ( sys-libs/ncurses:0 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-PDEPEND="
-	demo? ( games-fps/doom-data )
-	freedoom? ( games-fps/freedoom )
-"
-
-S="${WORKDIR}/${P}/${PN}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-You need to copy Doom, Doom 2, Chex Quest, Heretic, Hexen, HexenDD,
-and Doom64 wads to a folder of your choice. Then configure in game
-engine where that folder is. This is different than old versions,
-which had centralized launchers for each game, and required the
-files to be in a specific place
-"
-
-internal_src_configure() {
-	export QT_SELECT=qt5
-	local mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DDENG_ASSIMP_EMBEDDED=off
-	)
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	python_foreach_impl internal_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml
index 851017e48a82..0efa03a4eb6a 100644
--- a/games-fps/doomsday/metadata.xml
+++ b/games-fps/doomsday/metadata.xml
@@ -7,12 +7,9 @@
 	</maintainer>
 	<use>
 		<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="fmod">Enable support for fmod music and sound effects lib</flag>
 		<flag name="freedoom">Install launcher for doom1.wad from <pkg>games-fps/freedoom</pkg></flag>
-		<flag name="heretic">Install launcher for jheretic game</flag>
-		<flag name="hexen">Install launcher for jhexen game</flag>
 		<flag name="tools">Build additional tools such as doomsday-shell, md2tool and texc</flag>
 	</use>
 	<upstream>
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 8fdec2507e98..91b1dc86a7aa 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -9,6 +9,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20190419-7615.tar.xz 14740500 BLAKE2B 462a93789c0c096f85f889769ca3bf642c33cd997e1b2cfb821060aa2dbd0040b0dbd910d33da09e2be8b6610d62fbb06fed2dd62aeaa619fa23c17b6a538feb SHA512 ca496c0f6478cb246e0746de1ecf171e46762d65fdb6906c8174f610b8f52362d84c48e0f4095fe00a41e4c73cbb7298ec3446d4bc0be68ed0f9a52a768183fe
-EBUILD eduke32-20190419.7615.ebuild 5957 BLAKE2B 49af6fbf6756aec89f74bf6f9440ffaf1a8971e3fcaee05c3bcf6491401fd2a1f7000ac286d3bab3ccf13015b28d158bc6802ce3b2aeb0d3d33e3f4e8d843c32 SHA512 175743bbd23da4afb7558ded6d8c3db78a3867cd34484c5db45396b8669af3ffb934f3770a63d3a27971954094c5b435436cc1bd00df4a0141a3202beea96ac8
+DIST eduke32_src_20190719-7814.tar.xz 14751836 BLAKE2B 95017d0fbb4a3d4db3bb64657671bad58f368af5f4c1d52cfc805d99bbfc77019dfc372d3aa82e9c216a783a41993d6c8e539b2861b72604c0397cfc52f046c4 SHA512 cf8783e36b73ee76ba7c824d9322a64b87ae48ddb7002e3e4b61120c03c03a03bb0205f790483421c5992e536adee0be1c497cd7aa8357fa0aa518f50a4ba861
+EBUILD eduke32-20190719.7814.ebuild 5972 BLAKE2B a212513a58223dfc35ef3cdb50937a3d6294ed5fafe6fd6ed5804d5c27b479c34b9e4b2a39431b1272848cf547b1275cb5b295b8efe6a2b1c5009d0906573391 SHA512 df0fbf71fe5ee81e75f476f5baa42e6fffccb314928b1ba563683ba431bc040a20866ccafb8edde4ccf1bc7f177b48cfcdf3f235a80687b143836e22b90a629d
 MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
diff --git a/games-fps/eduke32/eduke32-20190419.7615.ebuild b/games-fps/eduke32/eduke32-20190719.7814.ebuild
index d70f5ef8c30e..196f0653f812 100644
--- a/games-fps/eduke32/eduke32-20190419.7615.ebuild
+++ b/games-fps/eduke32/eduke32-20190719.7814.ebuild
@@ -78,7 +78,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${P}-wad2map-buildfix.patch"
+	"${FILESDIR}/${PN}-20190419.7615-wad2map-buildfix.patch"
 	"${FILESDIR}/log-to-tmpdir.patch"
 	"${FILESDIR}/search-duke3d-path.patch"
 )