gentoo resync : 22.06.2019

10 files changed, 65 insertions, 105 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index a560acd3a619..99c567622c97 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/doom-data/Manifest b/games-fps/doom-data/Manifest
index c4056bcb87f6..198e92911673 100644
--- a/games-fps/doom-data/Manifest
+++ b/games-fps/doom-data/Manifest
@@ -1,3 +1,3 @@
-DIST doom1.wad.bz2 1689021 BLAKE2B 45ab359525cec44ac6f58110be80e76a75e0d5e186c1fc6bb67e055e7a7e03d2596c2e99cb3636484245d1af85d6b93830f07d8548df99f5f40e55d249bcef16 SHA512 f3aa78fd1e36d2dbd176c8c5284f8cee4f39d8e34df5386fd668565e752410e2b776413c78c1e7a3571695a1668f1e4820338ebc9a2b1a0ed1a81896260534fe
-EBUILD doom-data-1-r2.ebuild 900 BLAKE2B 9a8e2c28cbc9dbc48fb6e986f557fe7629752358822af27a833f7172ef52bde43da146cb855ffc8ebfea4bc920dd4b58ad3088dbaaffa3eabb3ad14910e7639b SHA512 c0b0d7b36df52b3165a07d63297fa14513d6fc1ee01cb0174c8333def136b1ab197dc9ea1c338a58098c003b2c980c6d52397cd316a823a6a89dca2414aafdc4
-MISC metadata.xml 347 BLAKE2B 4655211a8c43a4659d40a685721f45ba4abce6277eba9ec94b19755dff4824feef2bb704d7f5746cb43d91eef2ab9f72a47fe4a116f994cddb8bcc0cf7371180 SHA512 2cf8dbebdc411b37294374d196748fa23a741e5ae37946d87b74fabba84dc67811db3f5e215b82be1ec0e8543ea4e0b5e3a5e46412dffb576b3492ebb79edd3a
+DIST doom1.wad 4196020 BLAKE2B d242892e97f4684d1483192a5fc5b5fe3c662f2b9d61078e869758f400ca9e6d4e81fe51a6ffe562bbbd9d66f3db33f9a780780095aeeba691df1fe9407b1430 SHA512 6c2798417f0a0feaa1ab8777edb54e821eb336acfe953d62214dac46dd62429f58da97f9d13beac5fdaf944e70a07c60c96af9a885a0daf38eff1619cde71c2a
+EBUILD doom-data-1.9.ebuild 629 BLAKE2B e535353ef20978041083d7b7a21a7885ea7a1c4f9b53011a3bb297f349df10f27f029c13a43d39c04ab81db0dcf10bd491ff92bf6072172a32de4e6bfc0cc6ac SHA512 760afd75e7c3281508757d21bf65aa6535890b56da2ecbe0802f88e29c53f3f3d25b58e19c35a8009bbb76797da59828d8333128ae0199b16653f9ba82ba4846
+MISC metadata.xml 517 BLAKE2B 0b803fd2121dbd4b3b7824be9ebcba1343bb0717f8471f240323da744871789df3d3e0a1bdca972d7158fb75edf6f8623b6cc340c1ae4cf321ff3bc2df1a6185 SHA512 6999df06785c7e56e9cedd200f095b4840a959416210888305d722afb3bbb94b6f8f8de10901dc0c0c44cac198622fe2bcbddbdf54acd80618963f2a890740ae
diff --git a/games-fps/doom-data/doom-data-1-r2.ebuild b/games-fps/doom-data/doom-data-1-r2.ebuild
deleted file mode 100644
index dcbff4655ed9..000000000000
--- a/games-fps/doom-data/doom-data-1-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Collection of doom wad files from id"
-HOMEPAGE="http://www.idsoftware.com/"
-SRC_URI="mirror://gentoo/doom1.wad.bz2"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doomsday"
-
-RDEPEND="doomsday? ( games-fps/doomsday )"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/doom-data
-	doins *.wad
-	if use doomsday; then
-		# Make wrapper for doomsday
-		make_wrapper doomsday-demo "jdoom -file \
-			/usr/share/doom-data/doom1.wad"
-		make_desktop_entry doomsday-demo "Doomsday - Demo"
-	fi
-}
-
-pkg_postinst() {
-	if use doomsday; then
-		elog "To use the doomsday engine, run doomsday-demo"
-	else
-		elog "A Doom engine is required to play the wad"
-		elog "Enable the doomsday use flag if you want to use"
-		elog "	the doomsday engine"
-	fi
-}
diff --git a/games-fps/doom-data/metadata.xml b/games-fps/doom-data/metadata.xml
index 343e8213e1cf..4ec24fa26e96 100644
--- a/games-fps/doom-data/metadata.xml
+++ b/games-fps/doom-data/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="doomsday">Add wrapper to run it within doomsday</flag>
-  </use>
+	<longdescription lang="en">
+		DOOM1.WAD is the IWAD used by the shareware version of Doom. It is a cut-down version of DOOM.WAD which contains only the first episode. Later on, "Doom 1" became a retronym for Doom after the release of Doom II.
+	</longdescription>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-fps/freedoom/Manifest b/games-fps/freedoom/Manifest
index c929cd393b3b..1e5f0ad3225d 100644
--- a/games-fps/freedoom/Manifest
+++ b/games-fps/freedoom/Manifest
@@ -1,4 +1,2 @@
-DIST freedm-0.11.3.zip 7853186 BLAKE2B 5f399233e0d1f1c61d8170dc8e13ca0c6efe79255a87511027ad69e9ab7cf21045e9bc7f40fec6fa3604b3c77590cde8e85b2e9a53e1d89c5aeaf67bffa7023e SHA512 263f126e519a883b828b4f321363fe0f8c557ae58b76c6b3e28aa60e86c15fcc78c866bf003fc523276cefbb431023de64f09b026e85b0a0c7c85a88d1f47cd0
-DIST freedoom-0.11.3.zip 18889307 BLAKE2B 052d7f58d1beb7947f4fff3021ec0229c9746bfb7970a52d23fa44fc881d8cf3c314b8ecf0dc400c2da4e28c623695874ae75dcd1e45933fdb1826ea04f0e24b SHA512 c67fc69bca87cba2ba40b91f578724feaabbd6cd64c6845fa567d6901b7a9e3145185011731c677a71f7b5a6f8707855fb573c0c09b6d47fef83b1577b211816
-EBUILD freedoom-0.11.3.ebuild 707 BLAKE2B c37d9c313b4b0abf1b559909b730aabb091dc48bdba8754adec2f427b01952f03810d67052f541d9b1aa5ff51035cc7b8598cd578e6cf512990c477c3c07ea58 SHA512 da624039370da6fbd92cb5a1f21e1a4d38f8f7abdbec98eac6d888f383c24954dbbd2f3388c87911fef68bbefb8f94be6c05bd96f41ba2ad72cb2c68b6cdee4c
-MISC metadata.xml 345 BLAKE2B 856529c69e0cede9d5ddfc4476945783de0ba760f0c1719d1f58a012da24a6739757af14561a04e9393c49cdd7e2cf69fb3a2a690140adbe3e0635953175c46b SHA512 d830ba46200839ec37d298883c566cc63eafbc45ad6683ef028d4168e0bd4aa245fb13d4c5e84eb5113ee37db85d018f8ef7222da00682524157ff5d29a6da6b
+EBUILD freedoom-0.11.3-r1.ebuild 528 BLAKE2B 0a72d04671bf677fda1c63348cff4eefa9f6d53972e58284912be3ff50a3189fe2dc589b643bc7b58559dd5d47b67550d9bd3351bf7e0b2ee77434b927bdcdf0 SHA512 2a4eff48c27f68cee0f3391ac926fac08151f7bd45505dfd4ef7e3790d72d0c91ec9a835d696c0bb1a9f41e97f0c1afe1a77fca742cd86e561250ff93b6cea60
+MISC metadata.xml 1809 BLAKE2B 84960851e0fcb2354c71c796ebd28f3c1bea2762e1810d851c04d375cbc90bf6a6cddd9629f802829bb495cea44260b352291e2d3adbb17516c8cb97697da450 SHA512 a1e68567ab9be93d88e5debbba73e2704e5ef9f063bc98f30bc480064e9037b3841fdd3cec24a8f61ba0c76a68d20b63a329dd880d8c99a8c11a3ba39c3de89d
diff --git a/games-fps/freedoom/freedoom-0.11.3.ebuild b/games-fps/freedoom/freedoom-0.11.3.ebuild
deleted file mode 100644
index d4377003850c..000000000000
--- a/games-fps/freedoom/freedoom-0.11.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Free game content for the Doom engine"
-HOMEPAGE="https://freedoom.github.io"
-SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedoom-${PV}.zip
-	https://github.com/freedoom/freedoom/releases/download/v${PV}/freedm-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/doom-data/${PN}
-	doins */*.wad
-	dodoc "${P}"/CREDITS.txt "${P}"/README.html
-}
-
-pkg_postinst() {
-	einfo "Please note that WAD files location is /usr/share/doom-data/${PN}"
-}
diff --git a/games-fps/freedoom/metadata.xml b/games-fps/freedoom/metadata.xml
index 700dad658c01..08a722785b1d 100644
--- a/games-fps/freedoom/metadata.xml
+++ b/games-fps/freedoom/metadata.xml
@@ -1,11 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">freedoom/freedoom</remote-id>
-  </upstream>
+	<longdescription lang="en">
+		The Freedoom project aims to create a complete free content first person
+		shooter game. But Freedoom by itself is just the raw material for a
+		game: it must be paired with a compatible game engine to be played.
+
+		id Software released the source code to their classic game, Doom, under
+		the GNU General Public License. This means that the program code that
+		powers Doom is free; Freedoom complements this with free levels,
+		artwork, sound effects and music to make a completely free game.
+
+		Phase 1 is the first part of the single-player game, containing four
+		chapters which are nine levels each, smoothly paced for beginner
+		players. It is compatible with mods for the original Doom and The
+		Ultimate Doom.
+
+		Phase 2 is the second major part of the single-player game, a massive
+		32-level chapter expanding upon the same concepts present in Phase 1, as
+		well as containing additional monsters and the double-barreled shotgun!
+		The levels in this game tend to demand more skillful play than the
+		previous chapters. It is compatible with mods for Doom II.
+	</longdescription>
+	<maintainer type="person">
+		<email>vilhelm.gray@gmail.com</email>
+		<name>William Breathitt Gray</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/freedoom/freedoom/issues</bugs-to>
+		<doc lang="en">https://freedoom.github.io</doc>
+		<remote-id type="github">freedoom/freedoom</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 05b65d34ce7c..e2476e917539 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,4 +1,5 @@
 AUX gzdoom-4.1.3-fluidsynth2.patch 1047 BLAKE2B c56fbc64aa85fef15415415b87ad2246b831b6c412ddf3a1e5f841530a0dc42a8feb1f16bca4a6c888d97590d7659cd5694029e893cfb4e72b3fc833554028f5 SHA512 6ef599283753d744345ce91c5556edcc6ee369c6cc2dd478b3e8ec95926b06f0875ce009d78afb9c45ba9da3b22755460f5d0c5d7fbf56322b361390c59fcda1
+AUX gzdoom-4.1.3-install_soundfonts.patch 1379 BLAKE2B 5ce4ee6fe06d5185a1b2fae5b70ed195e61d405d5c5b5973a1409244e657a4899017e16c28574add1d9ff37d4ee02444ff3e162197ad222d5c0990e7c40a9f91 SHA512 2ce0032b5246337c8e1ae80b254ec676460a54d19366902ad30042bfd9c2ae2c92354ab13631affa514bb7c47100c38bdec7b9d76695f2fd0281486a7d7d85dd
 DIST gzdoom-4.1.3.tar.gz 13084313 BLAKE2B d082efacc99264eff92f51dac1a4ff742ee00c65fec769cd143e1ffa7a1527060735efc7325a5fd5d0950bdce52cf28941837c1a32e3e88483ece574de1fba64 SHA512 16d3db1320eaaf39477971e3724228850abe216fa792d79e288f3551ab635344c22699c10ccf9e7da4dc49543e1b5ff8be7f0053b79dc53e274e33cc17a667ac
-EBUILD gzdoom-4.1.3.ebuild 1379 BLAKE2B 34f6cdbe54a9d31eb7d47654f65abfce87b11ee505e28b3b986c4b0367d0be02ba25b5dc20df7b995d8c77c35d636429244713aee13c962d0272827d5135b755 SHA512 d4c325772bba09afd1674a7222a1a0dd9f768e2a1c501f4bf07ee4d62726fa1bc36abbfb70dd4fbe63df67d5fcfe914d7dafe8001aa286f53bdb99118f4a0da2
-MISC metadata.xml 971 BLAKE2B c8b8d21ceb52ed04b079e9fb5de2b30351e5bc613a20d73f8cd26be75615959ace1ac8bf4b61b6009455e5db68377fa093040e7dbd9c2591455a1813c7d2c7b6 SHA512 f8c7cb9aec78c3a6ac5a861a5a7bd9d96dfc18883aa1c9265608edb955f962a81e078b2bcd23524a649643165150fba2e3b04df92d56bba17ec9d5b10156b119
+EBUILD gzdoom-4.1.3.ebuild 1416 BLAKE2B d60d589c185e3b675a92329231eabe06139b0acc236df0f31a87ef5b49e547e5e7654ffca00ca1e4b7413cdf5bb6ab7cc600fed0f0cc2216e5b99c8b1d8c2505 SHA512 4be692cbc8c360b7c897723f2b7e61fdd14190424bdee602cf195fdf2f8c018159a004a6fb7fdfc8094d0f96752f7e6522559ef99c8c9d1d343b59ee53d7a80c
+MISC metadata.xml 883 BLAKE2B 3d019a0bf36020e6588fea81419fdf87d1e6e9571dcaac4a38fde6a4a0e2dc9b0fe9784fb2539e20c22a93bd689e997f8e195ba8ed1bf42a897397f8fe9b36ca SHA512 61d4477fa1c674118bf347b237cdb31ef00b2410cda123fc1fa5178c47528d14fb22d65f99ec1a2b41c021b676628fe70d74640074f91d4c5d76beee01415ca2
diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
index d3d5f880537b..242bd4e92879 100644
--- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.1.3.ebuild
@@ -12,27 +12,27 @@ SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="fluidsynth gtk gtk2 +openal openmp"
+IUSE="gtk gtk2 openmp"
 
 DEPEND="
 	media-libs/libsdl2[opengl]
+	media-libs/libsndfile
+	media-libs/openal
+	media-sound/fluidsynth:=
+	media-sound/mpg123
 	sys-libs/zlib
 	virtual/jpeg:0
 	gtk? (
 		gtk2? ( x11-libs/gtk+:2 )
 		!gtk2? ( x11-libs/gtk+:3 )
 	)"
-RDEPEND="
-	${DEPEND}
-	fluidsynth? ( media-sound/fluidsynth:= )
-	openal? (
-		media-libs/libsndfile
-		media-libs/openal
-		media-sound/mpg123
-	)"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-g${PV}"
-PATCHES="${FILESDIR}/${P}-fluidsynth2.patch"
+PATCHES=(
+	"${FILESDIR}/${P}-fluidsynth2.patch"
+	"${FILESDIR}/${P}-install_soundfonts.patch"
+)
 
 src_prepare() {
 	rm -rf docs/licenses || die
@@ -43,12 +43,13 @@ src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_DOCS_PATH="${EPREFIX}/usr/share/doc/${PF}"
 		-DINSTALL_PK3_PATH="${EPREFIX}/usr/share/doom"
+		-DINSTALL_SOUNDFONT_PATH="${EPREFIX}/usr/share/doom"
 		-DDYN_FLUIDSYNTH=OFF
 		-DDYN_OPENAL=OFF
 		-DDYN_SNDFILE=OFF
 		-DDYN_MPG123=OFF
 		-DNO_GTK="$(usex !gtk)"
-		-DNO_OPENAL="$(usex !openal)"
+		-DNO_OPENAL=OFF
 		-DNO_OPENMP="$(usex !openmp)"
 	)
 	cmake-utils_src_configure
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 95f6ed619edf..cfd1b5ffe560 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -17,7 +17,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
 		<flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag>
 	</use>
 	<upstream>