gentoo resync : 07.07.2018

8 files changed, 39 insertions, 42 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 5572aeed0a88..2c672c271129 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freesynd/Manifest b/games-strategy/freesynd/Manifest
index b339599b9781..389db704dbdd 100644
--- a/games-strategy/freesynd/Manifest
+++ b/games-strategy/freesynd/Manifest
@@ -1,4 +1,4 @@
 AUX freesynd-0.7.1-cmake.patch 931 BLAKE2B 0ad1994ad923355fdcae7c472a1440c88a848c409d5cc17b43d4d42e6307eb5c9f362efae5d81227d6ed6a7a4ecd5a7ec3492086e11f2208473190f2713fdd89 SHA512 994d12a2f079582bda03a600888c2d7ed2043468d69ce752e64deb45d156de5a7556edabd00d2635acc2c39882a8074193dc559e423e8e0181e9d4ea9d8b8b6f
 DIST freesynd-0.7.1.tar.gz 2576695 BLAKE2B 11b8f1d25768cdef6cf6894e8141cd13562a133a3253aa5b19034f0c54f114081dd97d41d230c74b5b1aaf66d84ad45d0c09ca5cdc72fb1de00a39ff23ad1272 SHA512 b87e6adaf71206532b4f90cd230ca6be00438fe26f000c5a0bfebf2839fea80d78d98ddc27331a2224874338c3e14ffbfa58b8c5bdbdc53c93bba8d6a9e6b7b4
-EBUILD freesynd-0.7.1-r1.ebuild 1640 BLAKE2B 2191d33a02ad08dc458bf5df63371f068014a63a3e6c6273296003d7ad7f53b7df7e37531176c20f2f97b733e18c0f3003849dbf2a2691c4bd8d7a7b34966c8a SHA512 8883509215a0c8bcf61d740f11b971bfff09cdffd0ef15fc3e7ccb526db7748cfde2d5c0b0e889874eaf8360df52f3f7e1a123a0709afacd923a10b04a455c0a
+EBUILD freesynd-0.7.1-r1.ebuild 1597 BLAKE2B 3d7fadee4f1f1c9c8574b7477972cd781afab7c1f321137bfef5ae84cbb80c6b595ac1b73b165e4878f7a03995899c9a79fd90faddd035c3d10f0fd477f6da03 SHA512 29892a155a86b4a3eda85c5d1e8f987a85f7b63a70ef2b9adc981b509e804bcf2ae4b4b5c28bc19f4fe9499504f8d4a7d6c1e204ce7e9d32cd778394a525c718
 MISC metadata.xml 401 BLAKE2B e83ee7425bd7de156c4ce45903a7fe00a12ad94f9e8bfe8ab0547458d2cf3f883fbbb319494a40bdabbadf2d85e74d0a929c43973d27550a7198bfd2c0e7add7 SHA512 5750ad5bed978d8a906a3cea47f3602257b5390bb87096c1e005d0c2bd1921b9033bdfb87f14506e88e8929268a9c9bb0003c9b343d0a0040b30df2058726152
diff --git a/games-strategy/freesynd/freesynd-0.7.1-r1.ebuild b/games-strategy/freesynd/freesynd-0.7.1-r1.ebuild
index c787783deb41..08cdeb54329a 100644
--- a/games-strategy/freesynd/freesynd-0.7.1-r1.ebuild
+++ b/games-strategy/freesynd/freesynd-0.7.1-r1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils cmake-utils gnome2-utils readme.gentoo-r1
+EAPI=6
 
-DESCRIPTION="A portable reimplementation of engine for the classic Bullfrog game, Syndicate"
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake-utils desktop gnome2-utils readme.gentoo-r1
+
+DESCRIPTION="Portable reimplementation of engine for the classic Bullfrog game, Syndicate"
 HOMEPAGE="http://freesynd.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
@@ -23,9 +25,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+DOCS=( NEWS README INSTALL AUTHORS )
 
-CMAKE_IN_SOURCE_BUILD=1
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
 
 DOC_CONTENTS="
 	You have to set \"data_dir = /my/path/to/synd-data\"
@@ -42,8 +44,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_with debug DEBUG)
-		$(cmake-utils_use_build devtools DEV_TOOLS)
+		-DWITH_DEBUG=$(usex debug)
+		-DBUILD_DEV_TOOLS=$(usex devtools)
 	)
 
 	cmake-utils_src_configure
@@ -56,14 +58,10 @@ src_install() {
 	doins -r data
 	newicon -s 128 icon/sword.png ${PN}.png
 	make_desktop_entry ${PN}
-	dodoc NEWS README INSTALL AUTHORS
+	einstalldocs
 	readme.gentoo_create_doc
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	if use debug ; then
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index e100ce76f6f9..56eb1652559e 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,10 +1,10 @@
 AUX s25rttr-0.8.1-cmake-3.patch 851 BLAKE2B 212aacf9ab7d37f41b0f1ade26fac67f015c62c02058874910af7d8e0123bd39a1f1301e0296ec906ce55f38e006bbdba6f30d9b98f35439639ea778f8272c22 SHA512 46f012e386854fbb7f21bbee98855849303501bf946b74a93c87ec9745cf5ec50b903ea3d35ecf9e84c1e4161c1876d43507c97d6bd9af8b5af2f6c9f4cb2805
-AUX s25rttr-0.8.1-cmake.patch 5682 BLAKE2B baaefa108e4bb10f5bbbfea536a5ef11d488033a72836541ffbd420a9e94fab4febf2d1f037d23bd9ed724060cf93a17a2382ac3de212cba26c905b971905655 SHA512 3da2e2837681a191ce3e08cc3338844ff325870b0b364a94b9b870ec36bcf3e7210e0cce15823a6b5bc0a95696cc41e133811773e5317f7e429fa882d0f049da
-AUX s25rttr-0.8.1-format.patch 694 BLAKE2B 7e1a5b011f6c5e8777ebc8682f2903f4d2c0fae6aae5ad377c92286ed9c45a21dbfc33888cb4e40c5b38f4295d0b9e0458a9338d623581177b7a5d843a8e91ed SHA512 66e159481ad4e240f0d3be46acb953caa78e00b35b5eaec76db577de2ee1d6fc7faba7ffc6814298165ff4128252cd9fa1a34a7f8086286105a519ec6276dcd9
+AUX s25rttr-0.8.1-cmake.patch 5706 BLAKE2B 5b9d796e1e6815336eb9a9006e321a66e6c733ebd514b5ff92ae542e6078a9dc2366dc7e01cc310ea758c903dceebb545a860fa09fe462fd5fa00bf2202c3647 SHA512 0a53ea20225d616686aff2ef2d98ae5dc5394e28db9be554102332705de5418cd5dd895075923924c7ada0e8bbcc2b9825203e531b3fffa531dc4232d9463fa3
+AUX s25rttr-0.8.1-format.patch 698 BLAKE2B f4ad85af1c05e4a6ace8da4a62e75673a773698170a430a716aef0219d08badfef01fb3b9d71b225549e541a3f7dc9be754c18f349c522c046f4ec8b83125385 SHA512 f0ba023f3d6fff3970cfcfc132c44e4dcff41ed91faee74b5ad513bce3bd625d6528511114fad70f6d3f5cdfc6e471ecef07a607be6a082ca7f3a0b71477d8cc
 AUX s25rttr-0.8.1-fpic.patch 1508 BLAKE2B f53042695c3fa65fb2ced0afb8307fd9e56d12d2b6ad0bef2c309720177d3466eb61a7bd0ed89c9f4c6ff3ff45faf9fab5e7e4b7d26f4a6dbb957f030805df31 SHA512 23c2f54864205c55bb7f18cb9b6e949640451b4b4de86b2c30a8721fd724c8ba00fd667bc8c07ea31ba8edfb92630afec08e1f52ab861d08887cf639f8cde7a9
 AUX s25rttr-0.8.1-gcc6.patch 1504 BLAKE2B 6cbb0fcd59ebedbb0e9faf49bc192944b70ceee9a0abdc3b5256717672da190a6337ed2ad4d52d28aedc1b0e29704c9fe36b6a67aafe9aceb28bd350895efb12 SHA512 3a10ee4c6329c1dcc514e2b4d5edec41b56ac72c08955b24eeced94d1c9757703fe0732d833718dd99a4e5d70857a8e84347d8036c683b9b82d37916bd2cf951
 AUX s25rttr-0.8.1-miniupnpc-api-14.patch 1385 BLAKE2B a5fe9c6937dfe154685ac1e0debab0b5ef3e6c3e27a792f947e1c5a93f772f2d9829602c87db76d9a421d723e652c01f3e015643801d0c136002164f366a5fca SHA512 163a83ac734ff2accca133c20c0e15f7f21140e41661add4229f2a878baebebf09eb82420b2d0b0a7a77042be35608bd00c30006265395e842ae28d64b8986f6
-AUX s25rttr-0.8.1-soundconverter.patch 763 BLAKE2B 98b4d316ae398f2a51304f77ca81e493f18369268e6682da407ad6fb0075c20f6a0f2f56aeb25bdab3d28afa4e8bc8f2440d92478016b920e5e058546f97c65d SHA512 0f16e86057cb1574b8dd2303c49547ce855897683de3af52a437da9304c7bc821bcd3278dae6652fb8a0a358e64c1fa4c0eaec88323ab2dc5a0c56da3ce61afe
+AUX s25rttr-0.8.1-soundconverter.patch 767 BLAKE2B 7a3772caa5624ee18a73cff0fb41531798022ef845feb4e1bb7bae560207efe82fb084fec7c0d9dfdde02c293db6fe3c2ea9290a5a6fd59cc59fee37a32693b7 SHA512 e62de5e040e89d53b73a0b7202eab0b32382656978e6c4471b1f3b996c9c679c9de13a8db671d719a79b985b062be3e67e75dacd4d9b5efb58e63c30bde1c10c
 DIST s25rttr-0.8.1.tar.xz 39644940 BLAKE2B 80268ac6ee20da983b4c3a90d8a9ebd5903734547fb48036963f435498a3395964afba990498a306a89009da50d023982a1dbd502e1ed618734c6a8d44ba2368 SHA512 31a7d640e1ecd5488ef02d0ed3adcaeb9b5ae5f6af5e006deb4100fde3eb8ec567e34519e9c2b82f38c9972d62790a6f6978d5da6c6dfca7f1c153fa65f22df2
-EBUILD s25rttr-0.8.1-r3.ebuild 2583 BLAKE2B 65516faac7946febe0c1d7ba43fe3eebf69f24b7ffd4ece248230efc8252a511d41e8393811a795cd8d1a8176e0c607afc34f7b4227d5d6bc5a04136f7bdbfab SHA512 5d35823cd2913637699d52af716436eb0e3c7eebcd72b5e570a417f7c462251f9ff6d5506b860656020758a3c011d12615fac2083595c05310730d1034641b20
+EBUILD s25rttr-0.8.1-r3.ebuild 2561 BLAKE2B f13028cb9ecc8411759492da43b3203c22ef701d81c7f84641c79f1ea1a727ff68f66b4cf8fee5c5fba1b28439fcb14ee6588d7e973f030f7cddea78181080bb SHA512 d08a0c4eccab8a1cd85efca0f794ff36b340b8326e103df69fbed55a48a530a8315e73635d0b8bc3647df2c3b5c346a7371633e3073919992259f9c295d02f1f
 MISC metadata.xml 463 BLAKE2B 33a0cc242b253cb1a3446cc2705cfb32bf0cd125c990bf0b8d527c3c9de546c390dd8fbad984c2a2a6264a25e0f889b63e86287024aa666dfdac94a5aacc3664 SHA512 dd5ea72d1f7ceda9bb2f033c8482e2978924ebee1a61e00fb515b0b0e846553bb1a4024aa739ae1f51608dcb90d0138d6679df1133a8140bfa2bfdb48163c885
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
index d8cdfedbb9a0..14f2edb52df5 100644
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
@@ -4,8 +4,8 @@ Date: Fri Oct  5 13:33:05 UTC 2012
 make build system gentoo-compatible
 provide options for SDL and GLFW video drivers
 
---- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -19,12 +19,19 @@
  
  ################################################################################
@@ -83,8 +83,8 @@ provide options for SDL and GLFW video drivers
  INSTALL(CODE "INCLUDE(src/cmake_install.cmake)")
  
  # and then dont let him install anything
---- driver/video/CMakeLists.txt
-+++ driver/video/CMakeLists.txt
+--- a/driver/video/CMakeLists.txt
++++ b/driver/video/CMakeLists.txt
 @@ -3,7 +3,11 @@
  #################################################################################
  
@@ -99,8 +99,8 @@ provide options for SDL and GLFW video drivers
 +ENDIF(BUILD_SDL_DRIVER)
  
  #################################################################################
---- driver/video/SDL/src/CMakeLists.txt
-+++ driver/video/SDL/src/CMakeLists.txt
+--- a/driver/video/SDL/src/CMakeLists.txt
++++ b/driver/video/SDL/src/CMakeLists.txt
 @@ -30,9 +30,9 @@
  	ADD_CUSTOM_COMMAND(TARGET videoSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX})
  	
@@ -114,8 +114,8 @@ provide options for SDL and GLFW video drivers
  	)
  ELSE (SDL_FOUND)
  	MESSAGE(WARNING ": SDL library not found: Not building SDL videodriver")
---- driver/video/GLFW/src/CMakeLists.txt
-+++ driver/video/GLFW/src/CMakeLists.txt
+--- a/driver/video/GLFW/src/CMakeLists.txt
++++ b/driver/video/GLFW/src/CMakeLists.txt
 @@ -2,7 +2,7 @@
  ### $Id$
  #################################################################################
@@ -133,8 +133,8 @@ provide options for SDL and GLFW video drivers
 +ENDIF ("${COMPILEFOR}" STREQUAL "linux" )
  
  #################################################################################
---- driver/audio/SDL/src/CMakeLists.txt
-+++ driver/audio/SDL/src/CMakeLists.txt
+--- a/driver/audio/SDL/src/CMakeLists.txt
++++ b/driver/audio/SDL/src/CMakeLists.txt
 @@ -34,9 +34,9 @@
          ADD_CUSTOM_COMMAND(TARGET audioSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX})
  
@@ -148,8 +148,8 @@ provide options for SDL and GLFW video drivers
          )
      ELSE (SDLMIXER_FOUND)
          MESSAGE(WARNING ": SDL_mixer library not found: Not building SDL audiodriver")
---- build_paths.h.cmake
-+++ build_paths.h.cmake
+--- a/build_paths.h.cmake
++++ b/build_paths.h.cmake
 @@ -41,6 +41,7 @@
  
  //	set game directory (normal $(datadir)/s25rttr/S2)
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
index 588a755e829c..3d50543b9c0e 100644
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
@@ -1,5 +1,5 @@
---- src/dskGameInterface.cpp.old	2016-02-15 21:11:58.308899794 +0100
-+++ src/dskGameInterface.cpp	2016-02-15 21:12:24.564433584 +0100
+--- a/src/dskGameInterface.cpp.old	2016-02-15 21:11:58.308899794 +0100
++++ b/src/dskGameInterface.cpp	2016-02-15 21:12:24.564433584 +0100
 @@ -1349,7 +1349,7 @@
  			snprintf(text, sizeof(text), _("Team victory! '%s' and '%s' and '%s' and '%s' are the winners!"), GameClient::inst().GetPlayer(winners[0])->name.c_str(),GameClient::inst().GetPlayer(winners[1])->name.c_str(),GameClient::inst().GetPlayer(winners[2])->name.c_str(),GameClient::inst().GetPlayer(winners[3])->name.c_str());
  			break;
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
index 493d7cb404be..1cc7686b850d 100644
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
@@ -4,8 +4,8 @@ Date: Mon Apr 30 20:42:28 UTC 2012
 relocate executables sound-convert and s-c_resample which get installed
 into datadir by default
 
---- libutil/src/files.h
-+++ libutil/src/files.h
+--- a/libutil/src/files.h
++++ b/libutil/src/files.h
 @@ -140,7 +140,7 @@
  	/* 54 */RTTRDIR "",                               // unbenutzt
  	/* 55 */SETTINGSDIR "/LSTS/SOUND.LST",            // Die konvertierte sound.lst
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
index 00187684759d..47531d7e1d95 100644
--- a/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils cmake-utils gnome2-utils readme.gentoo-r1
+EAPI=6
+
+inherit cmake-utils desktop gnome2-utils readme.gentoo-r1
 
 DESCRIPTION="Open Source remake of The Settlers II game (needs original game files)"
 HOMEPAGE="https://www.siedler25.org/"
@@ -29,6 +30,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
 
+DOCS=( RTTR/texte/{keyboardlayout.txt,readme.txt} )
+
+DOC_CONTENTS="Copy your Settlers2 game files into ~/.${PN}/S2"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-cmake.patch
 	"${FILESDIR}"/${P}-soundconverter.patch
@@ -39,8 +44,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
 )
 
-DOC_CONTENTS="Copy your Settlers2 game files into ~/.${PN}/S2"
-
 src_configure() {
 	local arch
 	case ${ARCH} in
@@ -94,14 +97,10 @@ src_install() {
 	dobin src/s25client
 	make_desktop_entry "s25client" "Settlers RTTR" "${PN}"
 
-	dodoc RTTR/texte/{keyboardlayout.txt,readme.txt}
+	einstalldocs
 	readme.gentoo_create_doc
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	readme.gentoo_print_elog