gentoo resync : 30.04.2018

8 files changed, 58 insertions, 110 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index a36ee0a9625f..46eae48f54dc 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index f27594958328..1df4b384f4d7 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -4,6 +4,7 @@ AUX 3-odamex-0.7.0-wad-search-path.patch 1758 BLAKE2B a202ea34cf7c219b611d48601a
 AUX 4-odamex-0.7.0-odalauncher-bin-path.patch 1671 BLAKE2B 833c95320ce5567fea90b12eedd7e2703540bff8f1a38e99ec80563ac4556ffe748b946948bb46d12064a08ed46a8c42fac92fbc5d6d408478067650718d92b8 SHA512 4ab5c84d5e3e1465fb02c775fad0208bf177264137d82297515c8f2bf188e9f4ce79a5510e28dfc4811392ecef407b89267e2baf45d37c236fb86cfc066c1ed2
 AUX odamex-0.7.0-gcc6.patch 1149 BLAKE2B e97191c08be8f1987c3374c4920b9016beb1e824e5e7781c8d4ec9088d9eb977e2dbb155ab7930914e3bae295098156c05d0726da7ee2df82a80a90d1ee333a7 SHA512 e34fc554016d67e42d95b9f2e964b69282791a9c07c9976c49990778188bfc1dab5784b29a798e10d6fcd8cc36893bd3416b57c8e2c9f1bd67587a3524c0a422
 AUX odamex-0.7.0-miniupnpc.patch 1144 BLAKE2B feb91380a8f1677f6aae2d29a569f3e452e6464c48962fe7f718a83733ce160b6bf2d4d0c84be78fbdb3f9102862571c13c69a9163a822f003743167d52a564d SHA512 0a805aca36687f183aa168972ecc9bfcd04c117787e42967fbf62b08873943b9f6c5118f15089a70ede43335ce571216255f315e08ce08f89ff23f6859507951
+AUX odamex-0.7.0-miniupnpc20.patch 846 BLAKE2B 3c55c9a761e5abe0de591ce6a53efc915eb7c6a0bdbd308ebff7fc9aa19517d647b882eaeec163a673f071a2f7aab505864ef8e7e64ffb2961682fb024cee190 SHA512 a55e2fea8742bed18765824131d87321e72df293c8e10b6682ade542b7f8feda10f89acbea9dc98749b509c117ae94c070b065ec95434118c73845f74e187664
 DIST odamex-src-0.7.0.tar.bz2 8435860 BLAKE2B 9720efdf262047074fed593360b0c38864d5d0f9c076a45d6df9aaf362cba35f41eeafab968338be0911681726872c33e3625934176f75068ca4933655876f7b SHA512 410f3c2588e4d57006e5bb50eaa0f6c1a83cf197ce40daabb958667483eb6c85138206ac74b8aee64c4208c4360415ad16d1698534be5c7abec1493a0f91aa8b
-EBUILD odamex-0.7.0.ebuild 2633 BLAKE2B 9ed602563c7ed2c8eaf5d0ab138410a2b3a9f68367fbf28006e9ed39cc05da1de43e6b82b16d5629d3997fdf2045ec5dfdc183f44a6a4085fbd515e900cb762c SHA512 9c7af68d6e4629e2f0f8ac261e919b0d0ae797aef702f3c0fd4a2b7a1c88d46f24849822b55db7d759d8f11954202147a0d67bee23da76e33995bcab186fea87
+EBUILD odamex-0.7.0-r1.ebuild 2680 BLAKE2B 7dab16f3b940503a9710ae254921a28b47c9f4afc27c3ce68080fa266ca2e349a8ee5f66d54e99728b0e69469454a17cc771cb9dd07570e40320d34642cd026c SHA512 45a4c37fe091c908e9aada85da92c508f8eacdc6bddca74e5c3ee4044417fb516e2d4b7ad8e2b7b0e687ebf4918592562c0a09a0e71a5b1fd0a630f9109e9c3d
 MISC metadata.xml 1467 BLAKE2B 43e3e80b72476360be1f5a345946a96c4ba0b6068209afa8506325a9a8467d56c8f19b62e5713a8d41c6a84cdc24c8218b8dd73453feb7ac621e3338a9421e16 SHA512 386792eba91c781bdb52d0f3d262a516843b3ab17e9522e23506fb7327ca726178ac387d577464faa1608fd396e81b3be813ab2bdac6b92caf10a9133a28332b
diff --git a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
new file mode 100644
index 000000000000..716a07fe628a
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
@@ -0,0 +1,28 @@
+Index: common/i_net.cpp
+===================================================================
+--- common/i_net.cpp	(revision 5459)
++++ common/i_net.cpp	(working copy)
+@@ -151,7 +151,11 @@
+ 
+ 	Printf(PRINT_HIGH, "UPnP: Discovering router (max 1 unit supported)\n");
+ 
++#if MINIUPNPC_API_VERSION < 14
+ 	devlist = upnpDiscover(sv_upnp_discovertimeout.asInt(), NULL, NULL, 0, 0, &res);
++#else
++	devlist = upnpDiscover(sv_upnp_discovertimeout.asInt(), NULL, NULL, 0, 0, 2, &res);
++#endif
+ 
+ 	if (!devlist || res != UPNPDISCOVER_SUCCESS)
+     {
+@@ -179,7 +183,11 @@
+       //      " desc: %s\n st: %s\n",
+         //    dev->descURL, dev->st);
+ 
++#if MINIUPNPC_API_VERSION < 16
+     descXML = (char *)miniwget(dev->descURL, &descXMLsize, 0);
++#else
++    descXML = (char *)miniwget(dev->descURL, &descXMLsize, 0, &res);
++#endif
+ 
+     if (descXML)
+     {
diff --git a/games-engines/odamex/odamex-0.7.0.ebuild b/games-engines/odamex/odamex-0.7.0-r1.ebuild
index 9dbda85d5fc4..0d2e515d29dc 100644
--- a/games-engines/odamex/odamex-0.7.0.ebuild
+++ b/games-engines/odamex/odamex-0.7.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 WX_GTK_VER="3.0"
-inherit cmake-utils eutils gnome2-utils wxwidgets games
+inherit cmake-utils eutils gnome2-utils readme.gentoo-r1 wxwidgets
 
 MY_P=${PN}-src-${PV}
 DESCRIPTION="An online multiplayer, free software engine for Doom and Doom II"
@@ -16,18 +16,24 @@ KEYWORDS="~amd64 ~x86"
 IUSE="dedicated +odalaunch master portmidi server"
 
 RDEPEND="
-	dedicated? ( >=net-libs/miniupnpc-1.8 )
+	dedicated? ( >=net-libs/miniupnpc-1.8:0= )
 	!dedicated? (
-		media-libs/libpng:0
+		media-libs/libpng:0=
 		>=media-libs/libsdl-1.2.9[X,sound,joystick,video]
 		>=media-libs/sdl-mixer-1.2.6
 		odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
 		portmidi? ( media-libs/portmidi )
-		server? ( >=net-libs/miniupnpc-1.8 )
-	)"
+		server? ( >=net-libs/miniupnpc-1.8:0= )
+	)
+"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/src-${PV:2:3}
+DOC_CONTENTS="
+	This is just the engine, you will need doom resource files in order to play.
+	Check: http://odamex.net/wiki/FAQ#What_data_files_are_required.3F
+"
+
+S="${WORKDIR}/src-${PV:2:3}"
 
 pkg_pretend() {
 	if ! test-flag-CXX -std=c++11; then
@@ -41,18 +47,18 @@ src_prepare() {
 		"${FILESDIR}"/3-${P}-wad-search-path.patch \
 		"${FILESDIR}"/4-${P}-odalauncher-bin-path.patch \
 		"${FILESDIR}"/${P}-miniupnpc.patch \
+		"${FILESDIR}"/${P}-miniupnpc20.patch \
 		"${FILESDIR}"/${P}-gcc6.patch
 
 	rm -r libraries/libminiupnpc || die
-
-	epatch_user
+	cmake-utils_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_INTREE_PORTMIDI=OFF
-		-DCMAKE_INSTALL_BINDIR="${GAMES_BINDIR}"
-		-DCMAKE_INSTALL_DATADIR="${GAMES_DATADIR}"
+		-DCMAKE_INSTALL_BINDIR="/usr/bin"
+		-DCMAKE_INSTALL_DATADIR="/usr/share"
 		$(cmake-utils_use_build master MASTER)
 	)
 
@@ -83,6 +89,7 @@ src_compile() {
 
 src_install() {
 	cmake-utils_src_install
+	readme.gentoo_create_doc
 
 	if ! use dedicated ; then
 		newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
@@ -93,22 +100,15 @@ src_install() {
 			make_desktop_entry odalaunch "Odamex Launcher" odalaunch
 		fi
 	fi
-
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-	einfo
-	elog "This is just the engine, you will need doom resource files in order to play."
-	elog "Check: http://odamex.net/wiki/FAQ#What_data_files_are_required.3F"
-	einfo
 	gnome2_icon_cache_update
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
diff --git a/games-engines/qtads/Manifest b/games-engines/qtads/Manifest
index 1975096578a4..42fcf27c5f7a 100644
--- a/games-engines/qtads/Manifest
+++ b/games-engines/qtads/Manifest
@@ -1,3 +1,3 @@
 DIST qtads-2.1.7.tar.bz2 2562026 BLAKE2B daa66022db1b187c2d74fc762fdb60beefb0988401464382d14c6f9bc1455a8046e212cdba9d834decb0efe053b3bb430392696b12bd4f94aaa006744c53a65e SHA512 ab88aa20991642df6048af49d2cd7b804dbb98b3f5c6ab38ad974e8b39531d880eac0eae0ba773f332e9568578b76b677bc35753f7d1e6d9a99d919b15f4c6ee
-EBUILD qtads-2.1.7.ebuild 1018 BLAKE2B 260a88df30f5f0ba6be00b6e239086112f51a9ca5833628e29bb36542489839dce0af680d585432c93587b25c39889a590762ddf23c787884747f2a6bc46b858 SHA512 4460cc98c9c87ed3dfdfcb5d2fb25973a6d52b94795bd9362b1092160c79ab7c9365b4bbc569c2e0144b07eb1b583b398cf06b99a19e266c83d3168529f852ca
+EBUILD qtads-2.1.7-r1.ebuild 864 BLAKE2B fc886e561e0ab14ca670f73433e57c9091e9338ebd885e9ab09ea797b9c8cf7730709a2f2aa82895f366786fe8cf91ecc056e1174f7565c9d52dc184d47d3df7 SHA512 f7c3a4ee2580553e14977bcb2d17fcd2c8ed42d4b4636fbf88b5318a86b233bfe3a74609a8ae76d6c861f2be9fb6ff52cb142a16a59154884697a5815d61f392
 MISC metadata.xml 338 BLAKE2B e923224db53da22487dff5dc33486c7a9b7391d7dbf26a5c11392e0b0808b177488b8b442b888077039d66679cdbd9e87a8389ae347cbc17443eda7e86078015 SHA512 18a82c16eb83363eb440ad9ca6ce1c612a17011194b3e1f50ac2563c0ef72c96c8618643f25ed8df81c852045a281498fabf18468c2181051f28e584738b8472
diff --git a/games-engines/qtads/qtads-2.1.7.ebuild b/games-engines/qtads/qtads-2.1.7-r1.ebuild
index b256007bc652..521b932662cb 100644
--- a/games-engines/qtads/qtads-2.1.7.ebuild
+++ b/games-engines/qtads/qtads-2.1.7-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gnome2-utils fdo-mime qmake-utils games
+EAPI=6
+inherit gnome2-utils qmake-utils xdg
 
 DESCRIPTION="Multimedia interpreter for TADS text adventures"
 HOMEPAGE="http://qtads.sourceforge.net"
@@ -18,34 +18,30 @@ DEPEND="media-libs/libsdl[sound]
 	media-libs/sdl-sound[mp3]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	eqmake5 qtads.pro -after CONFIG-=silent
 }
 
 src_install() {
-	dogamesbin qtads
+	dobin qtads
 	dodoc AUTHORS HTML_TADS_LICENSE NEWS README
 	insinto /usr
 	doins -r share
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
+	xdg_pkg_preinst
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
 	gnome2_icon_cache_update
+	xdg_pkg_postrm
 }
diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
index 1a79d35d623b..cd253adbded4 100644
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -1,7 +1,5 @@
 AUX stratagus-2.3.0-debug.patch 667 BLAKE2B 6f81f640dc5773a29f5c97732c1ace1de8969a27029637551cf0aee2edadd3afeaeedf7ced5e03cf344af4f726a045a9fbeecc71074603d023837da7ca7a2218 SHA512 751efd651b7beeeca702ad0fd6743c47041607ab0a127f4da1c219c10a55c44abf611aa7215c08f75a899d61cc8e499801d6d003f79520bff022df46ef98949f
 AUX stratagus-2.3.0-doc.patch 378 BLAKE2B 673afcbcf6131a49d03b683db2b430795b30226a97d4355ba88780bc4543f08c51b49c3726a79bc93620cd23595e2dcef62452d6afc989aa2ea06f616ce86fa6 SHA512 185b4a82d4960369bdff7c5522418553838d0d2c0947d8f75a55bf7a22741b9be20a20b60ae086ee04bd31ecf963c5c58167ef6b57b777659832a82d79726483
 DIST stratagus-2.4.1.tar.gz 1087678 BLAKE2B be7fc8322aee2a28c80833d44c3180e26b961ce9dfd1bc5e0a8e3fa0caac74bf713224de4c38b2ebf6d5aeabbe778a5664346c6a444b066f07f719bba5317bac SHA512 1f0420677df72e3e2d2f31e60030fa2eba4c3d1ab80cfc79c045724fe39ac237846bc38e8762ee9aa51768a443cdbbaa1fe91bf80fb2164261288a1bb17e27cd
-DIST stratagus_2.3.0.orig.tar.gz 1000990 BLAKE2B 8d815a23a2efa6c55e1050e1762f9190656f25e355fafcb434238a3c024d313e8cbd6b5a5873430ea37aa7b7ba30d4128beec7c080c733415888ae2ddff412e6 SHA512 ad38568029aa777fcc2d2e6d4a862b4192bc87354b23712270b9f0a62e269548a08097305e97adcea7bc9d9d506a6d092c578656a1957db808a48f44712a76bf
-EBUILD stratagus-2.3.0.ebuild 1681 BLAKE2B 79598669b2d7d1b5f756e8249d9107201c201c2f3a213c5cd0e03773936efbd81a18a1d3ee184b30e7562c5b1c7e831e22cfca08fbbd163e471d155b74cb5d02 SHA512 5d53ac76db8a013573a41ac96cba406286f4b0d9bfbdcd8020e7fb20741ef64f2986d957a5bcad8ae21314fec88ed0b0449793c638501177131575b578b4adf3
 EBUILD stratagus-2.4.1.ebuild 1523 BLAKE2B 3b165318ba374101a436297ef4e8bdfefe977fa60ef850001f1de415135babc0d6692a4321c3a56a7249ccbc5cf903b1322e4c51e202c590636125ab43d41251 SHA512 0751342ca95b1384e116732401481c341c0c79555eecda4ab6dda0318d0823c6130ea4a4e988ec97c77a315bc5f70db8be4b36c6cd9e705a7fe0885d86bab269
 MISC metadata.xml 468 BLAKE2B 8c8195ecd200944aa9923b2556768b47b66689424d9e0039970f60a9faf94477830490aec5c886c5e2425fa36dd9d4e18a2c9042657187e78ce022afdf5e928e SHA512 80c9342fa0155fd762f9585fcd3aaf2f472e4d6d75439926ed6fd9711c25821fee9193c011bbc6efdca644d0a41ad57966ff19effa5b36b277295b15b25cd642
diff --git a/games-engines/stratagus/stratagus-2.3.0.ebuild b/games-engines/stratagus/stratagus-2.3.0.ebuild
deleted file mode 100644
index cea036b23b00..000000000000
--- a/games-engines/stratagus/stratagus-2.3.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils games
-
-DESCRIPTION="A realtime strategy game engine"
-HOMEPAGE="https://launchpad.net/stratagus/"
-SRC_URI="https://launchpad.net/stratagus/trunk/2.3/+download/stratagus_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 debug doc fluidsynth mikmod mng theora vorbis"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-lang/lua-5:0
-	dev-lua/toluapp
-	media-libs/libpng:0
-	virtual/opengl
-	x11-libs/libX11
-	media-libs/libsdl[sound,opengl,video]
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	fluidsynth? ( media-sound/fluidsynth )
-	mikmod? ( media-libs/libmikmod )
-	mng? ( media-libs/libmng )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-		theora? ( media-libs/libtheora )
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-REQUIRED_USE="theora? ( vorbis )"
-PATCHES=( "${FILESDIR}"/${P}-{debug,doc}.patch )
-
-S=${WORKDIR}/${PN}_${PV}.orig
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# there are in-source switches
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	local mycmakeargs=(
-		-DGAMEDIR="${GAMES_BINDIR}"
-		-DBINDIR="${GAMES_BINDIR}"
-		-DSBINDIR="${GAMES_BINDIR}"
-		-DDOCDIR="/usr/share/doc/${PF}"
-		$(cmake-utils_use_with bzip2)
-		$(cmake-utils_use_enable doc)
-		$(cmake-utils_use_with fluidsynth)
-		$(cmake-utils_use_with mikmod)
-		$(cmake-utils_use_with mng)
-		$(cmake-utils_use_with vorbis OGGVORBIS)
-		$(cmake-utils_use_with theora)
-		-DENABLE_DEV=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	prepgamesdirs
-}