gentoo resync : 02.08.2019

3 files changed, 1 insertions, 83 deletions

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>