gentoo resync : 22.10.2018

3 files changed, 26 insertions, 33 deletions

diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 1df4b384f4d7..b47961450631 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -4,7 +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
+AUX odamex-0.7.0-miniupnpc20.patch 850 BLAKE2B 5b3d1efca9a76b64b0783d66f47a3d1f6385963f257cc16c8205d1d5061dc9b7eb0c1b4f3396e6c8e05ed9effdd27e135822dbe7659da9b7ec2584c6d75bdffc SHA512 070a1e93e79485c7e30db95312f5d6cb089fba26acd34f3a1415c311f5753123e967dfe3fc1e4fb8cc3591ed5342387ca7e96daaef2440b759b9b3b4f29e035b
 DIST odamex-src-0.7.0.tar.bz2 8435860 BLAKE2B 9720efdf262047074fed593360b0c38864d5d0f9c076a45d6df9aaf362cba35f41eeafab968338be0911681726872c33e3625934176f75068ca4933655876f7b SHA512 410f3c2588e4d57006e5bb50eaa0f6c1a83cf197ce40daabb958667483eb6c85138206ac74b8aee64c4208c4360415ad16d1698534be5c7abec1493a0f91aa8b
-EBUILD odamex-0.7.0-r1.ebuild 2680 BLAKE2B 7dab16f3b940503a9710ae254921a28b47c9f4afc27c3ce68080fa266ca2e349a8ee5f66d54e99728b0e69469454a17cc771cb9dd07570e40320d34642cd026c SHA512 45a4c37fe091c908e9aada85da92c508f8eacdc6bddca74e5c3ee4044417fb516e2d4b7ad8e2b7b0e687ebf4918592562c0a09a0e71a5b1fd0a630f9109e9c3d
+EBUILD odamex-0.7.0-r1.ebuild 2441 BLAKE2B 57337f452bef08fd79aa5f1d1ce6a2dfd34fac6456fb9e5069827f9f8a2faafec7b884a4e69e14d209424f4c7eaecf25c15fea85134548ca025a86245f1b7cf8 SHA512 09784c80f0741d80c49659578d1e400298888c76c75e3f33b7b3a1c1e37c9b157fb8c41a652af4d72e92c1459c5908ec274caf2ee92c9aff7ea5678858f94065
 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
index 716a07fe628a..377286220b11 100644
--- a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
+++ b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
@@ -1,7 +1,7 @@
 Index: common/i_net.cpp
 ===================================================================
---- common/i_net.cpp	(revision 5459)
-+++ common/i_net.cpp	(working copy)
+--- a/common/i_net.cpp	(revision 5459)
++++ b/common/i_net.cpp	(working copy)
 @@ -151,7 +151,11 @@
  
  	Printf(PRINT_HIGH, "UPnP: Discovering router (max 1 unit supported)\n");
diff --git a/games-engines/odamex/odamex-0.7.0-r1.ebuild b/games-engines/odamex/odamex-0.7.0-r1.ebuild
index 0d2e515d29dc..78af4a724d7e 100644
--- a/games-engines/odamex/odamex-0.7.0-r1.ebuild
+++ b/games-engines/odamex/odamex-0.7.0-r1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 WX_GTK_VER="3.0"
-inherit cmake-utils eutils gnome2-utils readme.gentoo-r1 wxwidgets
+inherit cmake-utils desktop gnome2-utils readme.gentoo-r1 wxwidgets
 
 MY_P=${PN}-src-${PV}
-DESCRIPTION="An online multiplayer, free software engine for Doom and Doom II"
-HOMEPAGE="http://odamex.net/"
+DESCRIPTION="Online multiplayer, free software engine for Doom and Doom II"
+HOMEPAGE="https://odamex.net/"
 SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="dedicated +odalaunch master portmidi server"
+IUSE="dedicated master +odalaunch portmidi server"
 
 RDEPEND="
 	dedicated? ( >=net-libs/miniupnpc-1.8:0= )
@@ -35,23 +36,19 @@ DOC_CONTENTS="
 
 S="${WORKDIR}/src-${PV:2:3}"
 
-pkg_pretend() {
-	if ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.0 for C++11-specific compiler flags"
-	fi
-}
+PATCHES=(
+	"${FILESDIR}"/1-${P}-install-rules.patch
+	"${FILESDIR}"/2-${P}-cmake-options.patch
+	"${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
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/1-${P}-install-rules.patch \
-		"${FILESDIR}"/2-${P}-cmake-options.patch \
-		"${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
 	cmake-utils_src_prepare
+	rm -r libraries/libminiupnpc || die
 }
 
 src_configure() {
@@ -59,22 +56,22 @@ src_configure() {
 		-DUSE_INTREE_PORTMIDI=OFF
 		-DCMAKE_INSTALL_BINDIR="/usr/bin"
 		-DCMAKE_INSTALL_DATADIR="/usr/share"
-		$(cmake-utils_use_build master MASTER)
+		-DBUILD_MASTER=$(usex master)
 	)
 
 	if use dedicated ; then
 		mycmakeargs+=(
 			-DBUILD_CLIENT=OFF
 			-DBUILD_ODALAUNCH=OFF
-			-DBUILD_SERVER=ON
 			-DENABLE_PORTMIDI=OFF
+			-DBUILD_SERVER=ON
 		)
 	else
 		mycmakeargs+=(
 			-DBUILD_CLIENT=ON
-			$(cmake-utils_use_build odalaunch ODALAUNCH)
-			$(cmake-utils_use_build server SERVER)
-			$(cmake-utils_use_enable portmidi PORTMIDI)
+			-DBUILD_ODALAUNCH=$(usex odalaunch)
+			-DENABLE_PORTMIDI=$(usex portmidi)
+			-DBUILD_SERVER=$(usex server)
 		)
 	fi
 
@@ -102,10 +99,6 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	readme.gentoo_print_elog