gentoo resync : 04.05.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-05-04 11:22:40 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-05-04 11:22:40 +0100
commit: fe1c8b732bd548b699d4c2ef725f67f8b8c8911c (patch)
tree: 84c0b6ca01b7cb63c7d6e685a63823200ce1007f /games-strategy
parent: 7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b (diff)
41 files changed, 327 insertions, 325 deletions
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index ca451748df7e..1e962142a02f 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freesynd/Manifest b/games-strategy/freesynd/Manifest
index bc9803b9dec0..b339599b9781 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.ebuild 1691 BLAKE2B 9ce42c87966e3108b7782a6d72320f13e9af343449e6412637bf46b042741f6a5d8e98cc2b9a7bde5b9cc305a37c303b270e0063dc5c9627c96655eda5d4eadf SHA512 bbc20b033504b95f9d45759c83ac02294a87fdcc58c5f7ac74df00e762d5f8610c663f56258b3398ff2c68abc39bb30d0ccfc3fb54f010ea94ae6d5bd1438060
+EBUILD freesynd-0.7.1-r1.ebuild 1640 BLAKE2B 2191d33a02ad08dc458bf5df63371f068014a63a3e6c6273296003d7ad7f53b7df7e37531176c20f2f97b733e18c0f3003849dbf2a2691c4bd8d7a7b34966c8a SHA512 8883509215a0c8bcf61d740f11b971bfff09cdffd0ef15fc3e7ccb526db7748cfde2d5c0b0e889874eaf8360df52f3f7e1a123a0709afacd923a10b04a455c0a
 MISC metadata.xml 401 BLAKE2B e83ee7425bd7de156c4ce45903a7fe00a12ad94f9e8bfe8ab0547458d2cf3f883fbbb319494a40bdabbadf2d85e74d0a929c43973d27550a7198bfd2c0e7add7 SHA512 5750ad5bed978d8a906a3cea47f3602257b5390bb87096c1e005d0c2bd1921b9033bdfb87f14506e88e8929268a9c9bb0003c9b343d0a0040b30df2058726152
diff --git a/games-strategy/freesynd/freesynd-0.7.1.ebuild b/games-strategy/freesynd/freesynd-0.7.1-r1.ebuild
index 6f9ce26e3669..c787783deb41 100644
--- a/games-strategy/freesynd/freesynd-0.7.1.ebuild
+++ b/games-strategy/freesynd/freesynd-0.7.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils cmake-utils gnome2-utils games
+inherit eutils cmake-utils gnome2-utils readme.gentoo-r1
 
 DESCRIPTION="A portable reimplementation of engine for the classic Bullfrog game, Syndicate"
 HOMEPAGE="http://freesynd.sourceforge.net/"
@@ -13,23 +13,30 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug devtools"
 
-RDEPEND="media-libs/libogg
-	media-libs/libpng:0
+RDEPEND="
+	media-libs/libogg
+	media-libs/libpng:0=
 	media-libs/libsdl[X,sound,video]
 	media-libs/libvorbis
 	media-libs/sdl-mixer[mp3,vorbis]
-	media-libs/sdl-image[png]"
-DEPEND=${RDEPEND}
+	media-libs/sdl-image[png]
+"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
 
 CMAKE_IN_SOURCE_BUILD=1
 
+DOC_CONTENTS="
+	You have to set \"data_dir = /my/path/to/synd-data\"
+	in \"~/.${PN}/${PN}.ini\".
+"
+
 src_prepare() {
 	cmake-utils_src_prepare
 
 	sed \
-		-e "s:#freesynd_data_dir = /usr/share/freesynd/data:freesynd_data_dir = ${GAMES_DATADIR}/${PN}/data:" \
+		-e "s:#freesynd_data_dir = /usr/share/freesynd/data:freesynd_data_dir = /usr/share/${PN}/data:" \
 		-i ${PN}.ini || die
 }
 
@@ -42,37 +49,28 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
-	dogamesbin src/${PN}
-	use devtools && newgamesbin src/dump ${PN}-dump
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin src/${PN}
+	use devtools && newbin src/dump ${PN}-dump
+	insinto /usr/share/${PN}
 	doins -r data
 	newicon -s 128 icon/sword.png ${PN}.png
 	make_desktop_entry ${PN}
 	dodoc NEWS README INSTALL AUTHORS
-	prepgamesdirs
+	readme.gentoo_create_doc
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	elog "You have to set \"data_dir = /my/path/to/synd-data\""
-	elog "in \"~/.${PN}/${PN}.ini\"."
-
+	gnome2_icon_cache_update
 	if use debug ; then
 		ewarn "Debug build is not meant for regular playing,"
 		ewarn "game speed is higher."
 	fi
-
-	games_pkg_postinst
-	gnome2_icon_cache_update
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
diff --git a/games-strategy/galaxyhack/Manifest b/games-strategy/galaxyhack/Manifest
index 170690bfa8f5..c3dd85d53b68 100644
--- a/games-strategy/galaxyhack/Manifest
+++ b/games-strategy/galaxyhack/Manifest
@@ -1,10 +1,10 @@
-AUX galaxyhack-1.74-boost-1.50.patch 3190 BLAKE2B 019a0f3a22376c5f78ac899a1819e73e402200b30aed49b4e523e00998b38cc35dba25be3212c614efc534ed481ce962f921391c11975d76868beda9cb5c6456 SHA512 72a715cbfcfd8faa7cbe3aa6def2f66f80194cacb50411c3b1a1995f04cdcb5d4d42d3dc8295a50d7969c20ae6e1ca31ad44ff0447f0b2782df27726e8a77de8
+AUX galaxyhack-1.74-boost-1.50.patch 3206 BLAKE2B c97b67ac602a440eb90ae481e0ef5837e64cf9ad3c07e722899b7e1c6701536df1af3dca5e7e645dc13bd3622b8bf7e1a274c0c0de24cb9f39287f1af2e5e14f SHA512 ce441bd44c44000b28520bba3c76b4e3d37fef5b424ddae1be4ee2e0675859ce22090c9e79a7fca37f46b16312b581201eb413d89cdddab3d6169c97ec0d6304
 AUX galaxyhack-1.74-boost.patch 245 BLAKE2B afb356c6fb7d2f5243466f84d5605e1cc13da00b842c2bc554d791f20de6c37ab6b563e3320b3f0f6ca242987c75ffe6fbaba5ba236bd833a3bc86361be689b9 SHA512 19a6ef4ee430edab619d60d4410d318e07ba3dd75b48036331029ff0de11ad5ccc73970825708764a7da9870d9ae8a7708a22176aa6698fdd4c2837bf3a91885
-AUX galaxyhack-1.74-destdirs.patch 386 BLAKE2B 8a9c60a773fd3bded4fb228d3aed5e144d6f4a71be57b375a9ce76c0442ec8607855e84334d33aa691e1d1507007d60dbddddf549dc1fdc015a5c4995ecf67a1 SHA512 d48bbc0b55baccbf290e81fce500436e9b13958d8028171608c220da05ecc676c4e3d3e78141d097569715fa7c4e8d4ea7a380fbd485bee1ea85178a6b3235b7
-AUX galaxyhack-1.74-format.patch 1764 BLAKE2B de91a08e31c75a0b3912bf5678577f56c823b6bf20350e6a650e583cdfec6ca282268036cfb3fe22637a11a8e4d78ccf01f35e90f4fb1dcf86dd080f3aaf43c0 SHA512 2a2eadc378761c2827e7519f41805d202867c6df60d66bc3ff6dc2ae26ea7a4acc5b804c04d4c5d91bc9f3d6d8ee4b785f715e60c26197f649c78dad63c8bd4c
+AUX galaxyhack-1.74-destdirs.patch 390 BLAKE2B 5c807a22493528f472e3d5e9366ab4b8bacfb7d3a7c31291a3a1e8cf872fcd2cf9c3e373e53bffa9d92af68bf9549c6ebf44a6aaa8d6cd10f6afcfd6e6906690 SHA512 d154eb0b0116fa1e067bae12db82cef5eb3bf882683f624becb54244ffa744a3bdc7ebe77fe6e87c634f42f649cc8dd0fb7067aa5d2cb5b8a72cf50cdbfe7702
+AUX galaxyhack-1.74-format.patch 1768 BLAKE2B 5a0ee8e935c557ac25b470e1914f242da093352321ba34c067ca3997e3892aff3f6330b827bc7d08c7541cc1e9e0cb2e0b4e0d938ddd1f9cfd21916b11f978e3 SHA512 e38280f9a06426a77abea3a10de6ce23868dd2d4df0c398832856bfa5e39c329cf39b39bd4ff766c54fd72813933c502ca9a63750b7a4160e536a40a08bc0ba3
 AUX galaxyhack-1.74-gcc43.patch 309 BLAKE2B f8af1b8b2d4d50bb37eb13237915638d746a79daa621d81958bf99d7071178d3402989fa0fbeb9d67abffea4a15a97d1da263855b5ac17b1caf96213ebddcb31 SHA512 21169edbaf8f4c0d8f4fcd44a494e0121fb332b42cf14ba09818cf871cfdb792e4bbe00c7ae1b9ddc9094c96edda785f2763c76a70dcf92ec7ea163e3248aaa0
-AUX galaxyhack-1.74-gentoo.patch 988 BLAKE2B 41e809c49632ba24c51485b0176e98cbfeefc623ab56e1c705a4fbc1524947591ffff77a89e91019d4e9abc54a50257e30b8f0f40ec661c9f98268b1ea8e2874 SHA512 5cff46c4443d402e835eb6bebb6f037bd9c443b6522c6d05cc1abc101d0ad52d625fe2039bf2bc508b08bff9403dbfd6afa8e3dcefc0201d07596b5ac431a70e
+AUX galaxyhack-1.74-gentoo.patch 992 BLAKE2B 63ca6fee15f9f088e2c8a73566d5a7579ed4636d8048771ee01aa40a6f8edd1013e1d6a710d45caa951311709c19ed3d670014bfd1513982c317d6ea5d1b4d34 SHA512 e268019e57c95caf6f24331e0c1f6bb0f47507940e8621cf5307f5cdd24cdd9ab49307208f6914558df35bedd725db38374c04b4f887c89814896ce9902f7b0a
 DIST galaxyhack-1.74.tar.bz2 9948336 BLAKE2B 2029e4a27e2995ebd8bb4f7e9192fc353b22a0246e5bca5294a9a09ee936c0050682dcff52a233b87d659a6a4e98f56fcd4b563fb1159b52f6f596a5413a687b SHA512 d708494b1ad572c0243da9e7168b4707112ec3c99a09498b87f8e0cb2e4e5bc9df8dc4631e3fb4d3cd7517ec4b17e937798dec3fcf770de9d0fc1b5e29a0bd58
 DIST galaxyhack.png 819 BLAKE2B c19a6c05313eedfd118de0b02b688e98dc011a760da10c5edc6ee15eea3668e7dbf19fcbc7546807221b3b727056c5d5075c91cae699300c6d7b19c939b0f2b6 SHA512 b8ab4dd1c18c079ec3f60b3d04843fbb7a892feb8f872d498c20eb3142e7de26bff90c93b308656e1afe5ee77074fcb3f78542dfd175c27a9b865a512e0b0200
-EBUILD galaxyhack-1.74.ebuild 1578 BLAKE2B 8a35bc46379c642eca5ff1b24c113078a965322511a3eea13d833a10ef8b43c8e5282e3902ce4004d794d25b24e5c8c1aa33159b7264aef2e4f85aa95ea6ce8e SHA512 f22e19012eacbf09429983540abbfa5c8433ae98604c7badd3eebbf365d28aad172dbf7a4859daeb9f470c42089b8d6afd7e86632ca08f3ae76f927b3e57bc7e
+EBUILD galaxyhack-1.74-r1.ebuild 1592 BLAKE2B afde825de3df81f6b18cce5376f30059763dfeab87c154a8b3f7fa9c4a7d011a66cd53b2a3df165bd3c05eb858317c1f9ee20545b10295fb76eca3691a5c265d SHA512 abd828bf419949722c7261439c6bb386b9f6813da6bd6c68c91d8084ae4a0d04f2b6f6660116a8cc969a742ed62ce05bec3306fa58bca93d79186af3d00c4072
 MISC metadata.xml 1383 BLAKE2B b358635bd0e1f15560dc84368bc32eb1de4a487ca377924d82f3d2b28912ec702a07fa34565fea4fdf77280599403187b670a103d3d158e0c5ccfa3265257725 SHA512 1857f21b7f01d16e5eaa7fd6f3b653c820837d5b47022bf47c02af44c5bb00f0010c36c722aa1225d0cf0cdec8d85c4f6f14e5c7c0785da8706ea9886a72b285
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch
index 1b630c66fb20..ed8ff748aa98 100644
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch
@@ -1,5 +1,5 @@
---- ForceSelectWin.cpp.orig	2012-08-20 17:35:01.000000000 +0200
-+++ ForceSelectWin.cpp	2012-08-20 17:47:19.000000000 +0200
+--- a/ForceSelectWin.cpp.orig	2012-08-20 17:35:01.000000000 +0200
++++ b/ForceSelectWin.cpp	2012-08-20 17:47:19.000000000 +0200
 @@ -1596,15 +1596,15 @@
  	fs::directory_iterator directoryEnd; // default construction yields past-the-end
  	for (fs::directory_iterator iter(sourcePath); iter != directoryEnd; ++iter) {
@@ -20,8 +20,8 @@
  		
  		fs::copy_file(*iter, destPath.string() + "/" + destFile);
  	}
---- Main.cpp.orig	2012-08-20 17:48:13.000000000 +0200
-+++ Main.cpp	2012-08-20 17:50:51.000000000 +0200
+--- a/Main.cpp.orig	2012-08-20 17:48:13.000000000 +0200
++++ b/Main.cpp	2012-08-20 17:50:51.000000000 +0200
 @@ -339,12 +339,6 @@
  
  void GameInit(char* argv[]) {
@@ -35,8 +35,8 @@
  	
  	FindHomePath();
  	LoadSettings(argv);
---- Menu_Base.cpp.orig	2012-08-20 17:51:05.000000000 +0200
-+++ Menu_Base.cpp	2012-08-20 17:52:15.000000000 +0200
+--- a/Menu_Base.cpp.orig	2012-08-20 17:51:05.000000000 +0200
++++ b/Menu_Base.cpp	2012-08-20 17:52:15.000000000 +0200
 @@ -206,7 +206,7 @@
  
  	fs::directory_iterator directoryEnd; // default construction yields past-the-end
@@ -64,8 +64,8 @@
  
  		if (filename.find('.') == filename.npos)
  			continue;
---- Stuff.cpp.orig	2012-08-20 17:52:36.000000000 +0200
-+++ Stuff.cpp	2012-08-20 17:53:11.000000000 +0200
+--- a/Stuff.cpp.orig	2012-08-20 17:52:36.000000000 +0200
++++ b/Stuff.cpp	2012-08-20 17:53:11.000000000 +0200
 @@ -657,7 +657,7 @@
  	fs::directory_iterator directoryEnd; // default construction yields past-the-end
  	for (fs::directory_iterator iter(tempPath); iter != directoryEnd; ++iter) {
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
index 4b5beef56ac7..7c60c4efa624 100644
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
@@ -1,5 +1,5 @@
---- Main.cpp.old	2006-07-28 00:04:46.000000000 +0200
-+++ Main.cpp	2006-07-28 00:08:28.000000000 +0200
+--- a/Main.cpp.old	2006-07-28 00:04:46.000000000 +0200
++++ b/Main.cpp	2006-07-28 00:08:28.000000000 +0200
 @@ -184,7 +184,7 @@
  #ifndef WIN32
  	string settingsPath = userHomePath + "settings.dat";
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch
index 4bd9e8fc6f83..478e58001c73 100644
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch
@@ -1,5 +1,5 @@
---- JSDL.cpp.old	2016-01-04 10:42:56.404316856 +0100
-+++ JSDL.cpp	2016-01-04 10:51:16.744255312 +0100
+--- a/JSDL.cpp.old	2016-01-04 10:42:56.404316856 +0100
++++ b/JSDL.cpp	2016-01-04 10:51:16.744255312 +0100
 @@ -47,14 +47,14 @@
  	if (!globalSettings.batch) {
  		if (SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO) == -1) {
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch
index a609a473fe7f..9e55c941bfeb 100644
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch
+++ b/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2009-02-11 22:21:26.000000000 +0100
-+++ Makefile	2009-02-11 22:20:58.000000000 +0100
+--- a/Makefile.old	2009-02-11 22:21:26.000000000 +0100
++++ b/Makefile	2009-02-11 22:20:58.000000000 +0100
 @@ -6,12 +6,11 @@
  # James Gregory and Everton da Silva Marques <evertonsm@yahoo.com.br>
  #
diff --git a/games-strategy/galaxyhack/galaxyhack-1.74.ebuild b/games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild
index 68d0a57a06f8..aead3e7b9481 100644
--- a/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
+++ b/games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic games
+EAPI=6
+inherit eutils flag-o-matic readme.gentoo-r1
 
 DESCRIPTION="Multiplayer AI script based strategy game"
 HOMEPAGE="http://galaxyhack.sourceforge.net/"
@@ -14,47 +14,55 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="media-libs/libsdl[video]
+RDEPEND="
+	media-libs/libsdl[video]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[mod,vorbis]
-	>=dev-libs/boost-1.34"
-RDEPEND=${DEPEND}
+	>=dev-libs/boost-1.34
+"
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}/src
+S="${WORKDIR}/${PN}/src"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Settings will default to those found in
+/usr/share/galaxyhack/settings.dat
+Per user settings can be specified by creating
+~/.galaxyhack/settings.dat
+
+Additional user submitted fleets can be downloaded from
+http://galaxyhack.sourceforge.net/viewfleets.php
+"
 
 src_prepare() {
+	default
 	edos2unix Makefile
-	epatch \
+	eapply \
 		"${FILESDIR}"/${P}-destdirs.patch \
 		"${FILESDIR}"/${P}-boost.patch \
 		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-boost-1.50.patch \
 		"${FILESDIR}"/${P}-format.patch \
 		"${FILESDIR}"/${P}-gentoo.patch
-	sed -i "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
+	sed -i "s:@GAMES_DATADIR@:/usr/share:" \
 		Main.cpp || die
-	sed -i "/Base data path/s:pwd:${GAMES_DATADIR}/${PN}:" \
+	sed -i "/Base data path/s:pwd:/usr/share/${PN}:" \
 		../settings.dat || die
 }
 
 src_install() {
-	dogamesbin "${PN}"
+	dobin "${PN}"
 	cd ..
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	doins -r fleets gamedata graphics music standardpictures \
 		settings.dat
 	dodoc readme.txt
+	readme.gentoo_create_doc
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} GalaxyHack
-	prepgamesdirs
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-	elog "Settings will default to those found in"
-	elog "${GAMES_DATADIR}/galaxyhack/settings.dat"
-	elog "Per user settings can be specified by creating"
-	elog "~/.galaxyhack/settings.dat"
-	elog "Additional user submitted fleets can be downloaded from"
-	elog "http://galaxyhack.sourceforge.net/viewfleets.php"
+	readme.gentoo_print_elog
 }
diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest
index 90b485682ff6..8cfd63e1a78b 100644
--- a/games-strategy/glob2/Manifest
+++ b/games-strategy/glob2/Manifest
@@ -1,8 +1,8 @@
-AUX glob2-0.9.4.4-gcc44.patch 184 BLAKE2B 4db1a71f4458ff28f263855c61639d60fe0203b6d9bc3267556257d4e16c2cfa659e03e01fcc9082b33dac01dbce2807d5d7ec644d83be042e880e5e475dd51b SHA512 e3d5d84c4c9240806ec97eace315b92288da4cbb28da230f91e3dc9aa224d4b7e010d4e132b53a538ae7d477a72320b27b482e9423182d1496751dbec58f461f
+AUX glob2-0.9.4.4-gcc44.patch 188 BLAKE2B bd6fc1a3ad79eb29e070d53099079c403553add1e8fcf513d8c5cf58902120ff0735ad0cc78d396329ababf64d94355c21b9e2269046467b8a68069cee0afdc4 SHA512 c341e484311fa508f9a034d216729fa7a8251e6fb710fe6417bd0a000b89a870cf5a24850e6126a704f160fee064fa7211973da8f3720dbd9a96df86adcd67fd
 AUX glob2-0.9.4.4-gcc49.patch 907 BLAKE2B f7ad515c19660af0713ca8c79c40a4c225372da85d17dfa58bc4a31e65bdced9a24ae9ff3f8f57f623da0011b24d841618bfc8fe09000703db94bc9e89a66971 SHA512 7a1f19fe40effa577b2eb03ec4f2ddd7df78bff1c3df25c8b15df37d9feb03e4583e1776e4c2240130f318f9fa643d2d662492c9c5be46ed659bd587f88eafac
 AUX glob2-0.9.4.4-gcc6.patch 1767 BLAKE2B 41716842d1d0552e4ea05e4ae189b92ea600ca5e31604bf19e5659ca6690c7e394d25f11baf3fee07b9bdfcba6a748586b152a0141312daad89ab76946ea4d82 SHA512 d2eddfe657f81a1ec085298f09aafb904d22a80d601aca6405d92d6f17b28d0f3f3b5b445a9423988b7bc8869ca41698783e4139928f9f2ba33093ded6a3cb02
-AUX glob2-0.9.4.4-scons-blows.patch 904 BLAKE2B 45368edec58d1e5421b195eb29eb9a410d45b79a90516e8064f883759d80d34ff7d63e1d3acd73e196b0c37b2d9491ca6e9d83a4163604a1d6caa2b07a330b2c SHA512 1018f2481d82df9b5e8ddd497fc1878a58a13e54c369e3e3f3a9f541f5140a92fec54460da5ff76c6913ad202385c53534d4c88e0140b8d4f65b759e23393a7b
+AUX glob2-0.9.4.4-scons-blows.patch 908 BLAKE2B 6d677c0588dbad9f44307579549946c8979b956331be3ef667fb4bbcd6fdf3e9889b22cd4c9458a76f487b12bc73ae73dfba03e0c1f86fb228e1934b1d4e67cc SHA512 0d805014200c76ca571ecc97c284b9168f280df0e88060c880b284b8e3d5490c1512708857bb22a0b2a4e4b78716d98ae26ae552531f661bb38f6dd75af474d3
 AUX glob2-0.9.4.4-underlinking.patch 672 BLAKE2B 59fbd0afacd468cc6a2e6e18336c524653697f42404124d9b2347246130ba390a202cb2b88fa223bd80063e6555211a5065cbf08dd4d113b7dadd2e0ad9a3f41 SHA512 24551c73af34badaa4a464da30c771c95082f0bfe83f351b264abddc578d5486a71f1a79b02d13ff48753e67059f8350752e77eb89397029833647bb74d79d21
 DIST glob2-0.9.4.4.tar.gz 11338986 BLAKE2B 047f27385c9b819c6ca2614406d340ff2cb7dcc26c8a20a205b11dce234af4ea52cb4eb04b7ed5b695382b17b34b5dd50387d61cfecaced16ee61b3c69c2921f SHA512 c82ace807ad208bc386b730f1fe6d6162640a9468440482f3584f8ccab825967660d8bbf6b3bebf70c74d1ed95f153cd9b5a0bd72dc247a1f97176c6c737f6ca
-EBUILD glob2-0.9.4.4-r1.ebuild 1359 BLAKE2B 58ceb47c146236b1f413f7fa9ba467a33c099fb71cacdc59abd9f86bd9d4755147b9ba2f4d45252fe89867a405cbce651c9e62ddad9c4864fcb1144cb99c332d SHA512 ebdd3dcc79fb25babdfd3ff81323ef778a9da2b9c4980edc7e059eb19d8fc7037a1bec7b9b56ab05992accf0d50b552ec90896a7188c031f43b51995698d9457
+EBUILD glob2-0.9.4.4-r2.ebuild 1251 BLAKE2B 41c2a82cecb07b7e544d457519af07829702584b083990933ac2f2a64024cc10e3a5bd9546dcf9712fa762560efbae6bf3ffdd3d53d45ffc3259d3d145947f39 SHA512 aff57e535f19cae25e86dd0f85edbcccec499951d5e12c2c718bc83f70f061de9b6b5f705a4da86e0d2dee51f815383e73f6495e0644a9eb5fed9c4396876e36
 MISC metadata.xml 637 BLAKE2B 405198c067618ace05cf22e6b790a356eb643cddf921f07a37516cc661f37706adab72edde18639abaa5b23ebfe771877ced14f1eacb3d9da83ed5c9e32213f5 SHA512 af021418808275511478f34bcbd4a3fadd193a583c7e94c676e94d39d10fb23c8d2de7b3ef5c8da81f2f6291a3bf9d0cc09448aea1b16959e7c811ba38d64e66
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch
index 5ce62ea6e46c..8d2da78cee23 100644
--- a/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch
@@ -1,5 +1,5 @@
---- libgag/include/StreamBackend.h.old
-+++ libgag/include/StreamBackend.h
+--- a/libgag/include/StreamBackend.h.old
++++ b/libgag/include/StreamBackend.h
 @@ -28,6 +28,9 @@
  #ifdef putc
  #undef putc
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch
index b0fb92d47974..b3e6e86eb485 100644
--- a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch
@@ -1,5 +1,5 @@
---- SConstruct.orig
-+++ SConstruct
+--- a/SConstruct.orig
++++ b/SConstruct
 @@ -1,6 +1,7 @@
  EnsureSConsVersion(0, 96, 92)
  import sys
diff --git a/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild b/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild
index 2268ae605173..fe7cdc7b1729 100644
--- a/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
+++ b/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gnome2-utils scons-utils games
+EAPI=6
+inherit desktop gnome2-utils scons-utils
 
 DESCRIPTION="Real Time Strategy (RTS) game involving a brave army of globs"
 HOMEPAGE="http://globulation2.org/"
@@ -23,17 +23,16 @@ RDEPEND="
 	media-libs/sdl-ttf
 	media-libs/speex
 	virtual/glu
-	virtual/opengl"
+	virtual/opengl
+"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{gcc{44,49,6},scons-blows,underlinking}.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-{gcc{44,49,6},scons-blows,underlinking}.patch )
 
 src_configure() {
 	myesconsargs=(
-		INSTALLDIR="${GAMES_DATADIR}"/${PN}
-		DATADIR="${GAMES_DATADIR}"/${PN}
+		INSTALLDIR=/usr/share/${PN}
+		DATADIR=/usr/share/${PN}
 	)
 	escons data
 }
@@ -43,23 +42,20 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin src/${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin src/${PN}
+	insinto /usr/share/${PN}
 	doins -r campaigns data maps scripts
-	find "${D}/${GAMES_DATADIR}"/${PN} -name SConscript -exec rm -f '{}' +
+	find "${ED}"/usr/share/${PN} -name SConscript -exec rm -f '{}' +
 	newicon -s 48 data/icons/glob2-icon-48x48.png ${PN}.png
 	make_desktop_entry glob2 "Globulation 2"
-	dodoc README*
-	prepgamesdirs
+	einstalldocs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-strategy/knights-demo/Manifest b/games-strategy/knights-demo/Manifest
index b406053f62bd..152c63cfe4f3 100644
--- a/games-strategy/knights-demo/Manifest
+++ b/games-strategy/knights-demo/Manifest
@@ -1,3 +1,3 @@
 DIST knights-demo-1.32.run 31667235 BLAKE2B ee9c63a261aaea93122b790ef3d4df21b30b53d8f47e2f1549c3e6aaf7a09f04b5f7985e6d26e395266176fa9135cb7257bfc5c6f5eba7524da19758ab241715 SHA512 f53cf9524811b4a83ec2531f62ea251fc5a939cb09445ab850c7bbac85301e8b8275dda12a8dc991e4412eb4358d7597d0c007bd9263fd875289b039b941ed9c
-EBUILD knights-demo-1.32-r1.ebuild 1214 BLAKE2B 2922e3b244a176a7aa2e86f65c3121931c41b83a557765d6220cfc97608ba303234e03ff79eccf50460c31bb99a35b3861ee28ddc3c4b5f70f84fc0d0b7b849a SHA512 8f0d92229c3d11e1f62d23be5070d5a15a419ea61b89edf08e5d0708bf7fd609ad6011a318a68395f2475ea47a7e177eb1de3b71d5fd8f450d1be070da8b0e0d
+EBUILD knights-demo-1.32-r2.ebuild 1183 BLAKE2B 7474ab747a641cb6913a5aa26d4fcaf1e0fd319b5db9e50d133ba05af9828a6caf76318f66d627ce23b19880c92fc2e2ef27e12b3511e298d57995844a4005ce SHA512 213b7a7f8fe80e919077ad35fa68ed7d7c111ef408917e55ab307afade34ea4843bf6a0f2d6ac4a01f2d10768fd57d8bd670c04f3a20389e8d6a2485a8a8b231
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r1.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
index b9d0fc04f438..d314a019ee7c 100644
--- a/games-strategy/knights-demo/knights-demo-1.32-r1.ebuild
+++ b/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils unpacker games
+EAPI=6
+inherit eutils unpacker
 
 DESCRIPTION="Anglo-Saxon medieval army battles and resource management"
 HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=knights"
@@ -11,18 +11,19 @@ SRC_URI="mirror://gentoo/${P}.run"
 
 LICENSE="knights-demo"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
-RDEPEND="sys-libs/glibc
+RDEPEND="
+	sys-libs/glibc
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
 	>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
 	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
 	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]"
-
-S=${WORKDIR}
+	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+"
+S="${WORKDIR}"
 
 src_unpack() {
 	unpack_makeself ${P}.run
@@ -32,7 +33,7 @@ src_unpack() {
 }
 
 src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
+	local dir=/opt/${PN}
 
 	exeinto "${dir}"
 	doexe bin/Linux/x86/${PN}{,.dynamic}
@@ -42,8 +43,7 @@ src_install() {
 	doins EULA icon.xpm README{,.licenses}
 
 	# We don't support the dynamic version, even though we install it.
-	games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
+	make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
 	newicon icon.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Knights and Merchants (Demo)" ${PN}
-	prepgamesdirs
 }
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index 67440d8c5840..a4304e1f2633 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -1,4 +1,4 @@
 DIST lgeneral-1.3.1.tar.gz 1678892 BLAKE2B 701b22a8967c037e2385a1f1bbb2e91703cbffc7fff6383f3d593fab07dc01fa352f9ec3ee25dfbbdd5172c4e8cd804bd7f9fa2a84a3c6a22f581884c8d7d9d9 SHA512 4eb8fc6d1dc134792893f3f9b23833da75412fafefea66d699a27de1954d3c1338c7e5dedef842537303368387797ecea2158a477fe1d018e3af973dd5b755e5
 DIST pg-data.tar.gz 410454 BLAKE2B 70b325636c43b69b7cdc2f074a0ac49af46db5c60ebeea5ecefaae18169509b05b4c452c34e8b0cd483d3565c54191623ff3eb900f24683252fd8c775ecdf847 SHA512 b0df30dd9a9d0652acd8702d601c489e5d3a030854ceeb173d2daa656c00633a78a3f45814da9f4157b86544dec34eda02495742242653c7cdebba5ec9951516
-EBUILD lgeneral-1.3.1-r1.ebuild 2022 BLAKE2B f42273e255ff9045a550a039f4eaa2a99f74928c7f55c63658187301b712a458d1e4f9243756b0e7a292aff422b5c42bf10cd2ad9a0482317756774ece18102b SHA512 1cc1b63ea06323231b8d7e8e473e6c356e49f6f6bf51fab62dde095477eaf0c4700c9c591633057974647bf6152ea27aa1732e3d31dc3304b59c4259647e4fb8
+EBUILD lgeneral-1.3.1-r2.ebuild 1922 BLAKE2B 743229424c55bc5581c30bcccf727efe5720294f8449e58113acf4a3b83a4a5c101430aad7ac12c0a1fbea35a053e93b5f05138b3a5d36ab22d9a662d2a86ee2 SHA512 5edbe0077b8fcca017235986c57c481ac88798494830015feaf57efee555614562fab26f17a51b9cd65621846e906ccac8e8657956af76db3e48c0ddefd10585
 MISC metadata.xml 331 BLAKE2B ed6b281fa54a304ddd752e6bda476635922a0d9be37524a0e988666502279b85c793d455de63929c93e02f5b105367b78bea2eeb004e1a996d558159fe6443e2 SHA512 eef1e23a9d81b81e39f84ba41d70d39bf11f52acad42dc312548239919b7ce359a671f9b76dcdee92be92bc11c798d9031f3a641c13ab6febfe5bd978a4bbeeb
diff --git a/games-strategy/lgeneral/lgeneral-1.3.1-r1.ebuild b/games-strategy/lgeneral/lgeneral-1.3.1-r2.ebuild
index 2cbe4796f69b..bc431e1c2933 100644
--- a/games-strategy/lgeneral/lgeneral-1.3.1-r1.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.3.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools gnome2-utils games
+EAPI=6
+inherit autotools desktop gnome2-utils
 
 MY_P="${P/_/}"
 MY_P="${MY_P/beta/beta-}"
@@ -16,15 +16,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-RDEPEND="media-libs/libsdl[sound,video]
+RDEPEND="
+	media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+"
 DEPEND="${RDEPEND}
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
 	sed -i \
 		-e '/desktop_DATA/d' \
 		-e '/icon_DATA/d' \
@@ -38,26 +42,25 @@ src_prepare() {
 	# Build a temporary lgc-pg that knows about ${WORKDIR}:
 	cp -pPR "${S}" "${WORKDIR}"/tmp-build || die
 	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
+		-e "s:@GENTOO_DATADIR@:/usr/share:" \
 		-e "s:@D@::" \
 		{lgc-pg,src}/misc.c || die
 
 	cd "${WORKDIR}"/tmp-build || die
 	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
+		-e "s:@GENTOO_DATADIR@:/usr/share:" \
 		-e "s:@D@:${D}:" \
 		{lgc-pg,src}/misc.c || die
 }
 
 src_configure() {
-	egamesconf \
-		$(use_enable nls)
+	econf $(use_enable nls)
 
 	# Build the temporary lgc-pg:
 	cd "${WORKDIR}"/tmp-build || die
-	egamesconf \
+	econf \
 		--disable-nls \
-		--datadir="${D}/${GAMES_DATADIR}"
+		--datadir="${D}/usr/share"
 }
 
 src_compile() {
@@ -70,26 +73,23 @@ src_compile() {
 
 src_install() {
 	default
-	keepdir "${GAMES_DATADIR}"/${PN}/{ai_modules,music,terrain}
+	keepdir /usr/share/${PN}/{ai_modules,music,terrain}
 
 	# Generate scenario data:
-	dodir "${GAMES_DATADIR}"/${PN}/gfx/{flags,units,terrain} #413901
+	dodir /usr/share/${PN}/gfx/{flags,units,terrain} #413901
 	SDL_VIDEODRIVER=dummy "${WORKDIR}"/tmp-build/lgc-pg/lgc-pg --separate-bridges \
 		-s "${WORKDIR}"/pg-data \
-		-d "${D}/${GAMES_DATADIR}"/${PN} || die
+		-d "${D}"/usr/share/${PN} || die
 
 	doicon -s 48 lgeneral.png
 	make_desktop_entry ${PN} LGeneral
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-strategy/lightyears/Manifest b/games-strategy/lightyears/Manifest
index 7124d3c1ef1a..7cf7cebecb57 100644
--- a/games-strategy/lightyears/Manifest
+++ b/games-strategy/lightyears/Manifest
@@ -1,4 +1,4 @@
-AUX lightyears-1.4-gentoo.patch 1276 BLAKE2B afa822f2840070097644fdf6f6b6c25ba88dff59ef9a6fdc7b578aed266ea60f8dd797f7ae705e28d9bbfa65b9ca7fcf60af2b511b95890486779f8649df1866 SHA512 3388a5bbb384cbaaef29776f3f05c789df8955a86ead9ccb88dbcc48c623ae16a3cb2c498c48db49e87f57ae8a8bd174219ae14cb848903394331bb4635f0b61
+AUX lightyears-1.4-gentoo.patch 1280 BLAKE2B fd247d049fe7e32264a0d86ffa06f37ca8a8ffb4fd7b5651adce2008f089b1b83758286b46e33555c61b4a62fb79e6ed93475bf51aff599117fc5eedbfe70680 SHA512 4a8770b29c7aa8b489a8afaac7ba3ec9a2efc1466f6263f35ee531a8e4498a1490080bd390a87309983d62ac0d3a722421058d671c32c7cda91bcc6a94d81be3
 DIST lightyears-1.4.tar.bz2 693877 BLAKE2B 871b8f66088c3a947de50e7b47a8aeef4d06f9c7919f4f361a6719ff0dfa6b48acabb759dca6969d09255e2c89c158caa0cd560ef02567df6e46bbcda2eb9417 SHA512 68f576d820d54b353adbc504f8aa3341547e2e56474717cc59aecc2368fc0eb533458e09876b3cd2a9062914a8a58d39a35ce944256372bb9e15830210924597
-EBUILD lightyears-1.4-r1.ebuild 1110 BLAKE2B 0bbaa058ca140091bc57a0ccd15a26c08705dab81339eefa02a255195a3cb08a88c2ae062d30388ef968d9f0b36eb93bf0534e0e64bcd00387e164f8a213c3ae SHA512 29d991cfd0261ec7f7441e13afbd23e9e85861009ee5f74ea069a894c7a87971cf69328da8535a2989a6be71696953806d47266d106a150b81c8dcb708245824
+EBUILD lightyears-1.4-r2.ebuild 1020 BLAKE2B d692c8e1087689b67a62a8785869d5c66511bdfd8114e9b27378ab0c3b35418b733eb8c4d37bfcfa25a2943a035207648d0e39eb39b3ec3b318f4c3197491e9e SHA512 1721d4023d7a275d67f691e867d857200d7c9e71b871b4b7fec34302707324ebf8d88c47d03d0331e149ca9ace89daceece333415c45225f690220574cdae087
 MISC metadata.xml 457 BLAKE2B 7f250bdb961fe6d994ebc983f8dfaf3cbe7c4763b766fbcbc199b2db3f33ca273136e827adece324f4c00b611521882b932a1750a372258e0d52daf691a2c1bb SHA512 354fad5eed1305fc7e5ed69de92f7033b651371a1993ccd90d3d6fd9f49975e30e8b5b4c8cfcf8bb6f1284b5ef0df790adf863f76f580945ff3699ff275d5c13
diff --git a/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch b/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
index 063dbab3c1e8..325c4365ded4 100644
--- a/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
+++ b/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
@@ -1,5 +1,5 @@
---- lightyears
-+++ lightyears
+--- a/lightyears
++++ b/lightyears
 @@ -1,7 +1,6 @@
  #!/usr/bin/python
  
diff --git a/games-strategy/lightyears/lightyears-1.4-r1.ebuild b/games-strategy/lightyears/lightyears-1.4-r1.ebuild
deleted file mode 100644
index 2215ab7dc4a0..000000000000
--- a/games-strategy/lightyears/lightyears-1.4-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 games
-
-DESCRIPTION="a single-player game with a science-fiction theme"
-HOMEPAGE="http://www.jwhitham.org/20kly/"
-SRC_URI="http://www.jwhitham.org/20kly/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-RDEPEND=${DEPEND}
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}"-gentoo.patch
-	sed -i \
-		-e "s:@GENTOO_LIBDIR@:$(games_get_libdir)/${PN}:" \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		${PN} || die
-	python_fix_shebang .
-}
-
-src_install() {
-	dogamesbin ${PN}
-
-	insinto "$(games_get_libdir)/${PN}"
-	doins code/*.py
-
-	dodoc README.txt
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r audio data manual
-
-	python_optimize "${D}$(games_get_libdir)/${PN}"
-
-	newicon data/32.png ${PN}.png
-	make_desktop_entry ${PN} "Light Years Into Space"
-	prepgamesdirs
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	games_pkg_setup
-}
diff --git a/games-strategy/lightyears/lightyears-1.4-r2.ebuild b/games-strategy/lightyears/lightyears-1.4-r2.ebuild
new file mode 100644
index 000000000000..7e7344951fc2
--- /dev/null
+++ b/games-strategy/lightyears/lightyears-1.4-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop python-single-r1
+
+DESCRIPTION="A single-player game with a science-fiction theme"
+HOMEPAGE="http://www.jwhitham.org/20kly/"
+SRC_URI="http://www.jwhitham.org/20kly/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygame[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}/${P}"-gentoo.patch
+	sed -i \
+		-e "s:@GENTOO_LIBDIR@:/usr/$(get_libdir)/${PN}:" \
+		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
+		${PN} || die
+	python_fix_shebang .
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/"$(get_libdir)/${PN}"
+	doins code/*.py
+
+	einstalldocs
+
+	insinto "/usr/share/${PN}"
+	doins -r audio data manual
+
+	python_optimize "${ED}/usr/$(get_libdir)/${PN}"
+
+	newicon data/32.png ${PN}.png
+	make_desktop_entry ${PN} "Light Years Into Space"
+}
diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest
index 0bc4cd459ac0..9ac03e77fc48 100644
--- a/games-strategy/liquidwar/Manifest
+++ b/games-strategy/liquidwar/Manifest
@@ -1,6 +1,6 @@
-AUX liquidwar-5.6.4-exec-stack.patch 430 BLAKE2B 712aedee771cd1958ec252852d6f889f867c4264ec81b10e833257ee4c9d7f33977b1729b20c19940d9ae35d3a08df12e4302c6efa538c16934f5a9c1cd311fb SHA512 e5f068a73bc8a13f85350823fb12264adaaa2e4ad7b19dcba6d3bb81c8ff70818a274adb9827665208bc5d63cde59a7ec5c2bc83fd3449b4e8fbffd4d8ef5ce7
-AUX liquidwar-5.6.4-ovflfix.patch 696 BLAKE2B 5117cd7286b75cdba47a9849a6c1dd65339682b9a387a374bb25340c09daea66bcf983022c66ca2fb92ff81083ed10f11fce24346a949e6a7cf40c69de767cad SHA512 2d1b72ac481ef9c742e4b22e012805161e628fcdbebc8b55084c03fae63f0fd88da92ce1827ad08c27da2ca2c0ec3482726e4524887385cf4fc75f202c302102
-AUX liquidwar-5.6.4-underlink.patch 438 BLAKE2B c57af7199c560f3b82cc007c20a8d525aceb4d1f8867df207711a3ecd3c31013f88677734d9283b9ee0a67122b550efcd84cd9bde180c26ad1afe3c93ab89753 SHA512 c4795242e102566d208ca57d68fdb60d3c69d0aec5c8a2f196e4bcbfa91e64c07cb8b06d82e870c059405967f8563090a8910ace3bad17b9591047329ccbe3d5
+AUX liquidwar-5.6.4-exec-stack.patch 442 BLAKE2B 21e0cdd8bb36ff7ce4bacb9bf9c5bd046803c953818eb73e58f372eb431a368dfd97530b22d3352eceecbb503975ccf3fa041d2776a48f63c15dcb4ef809a6fd SHA512 9759a6ae5805871ccbe2161e295449efc268403094d96360596e6043c1583e9ee18d2fdefbbf6bc695dadfe5f57170a5badf930a0fe8aa637b10215014c9561a
+AUX liquidwar-5.6.4-ovflfix.patch 700 BLAKE2B d0a46b244008d78eaa67cba8f8a39a710c8b75d64876a9e7eae86b168c94f8111326739795b061a2209c70fbb05399291cfdfa6f580c3439e7a68768e9049def SHA512 0d242ff7ba17af4b5d61e040b37fbf363d5c4bec615af21e2b2ea77f7cef4633f66a870196e40b590c6609ed15c90208172154b4e613b6ea0d4fe0f2189bb294
+AUX liquidwar-5.6.4-underlink.patch 442 BLAKE2B bfd7beea85546fca013de4229bbd0b1a658f87a608d1340e2463304c72b1d6e82917a95052488f53be40e3bfcafcf23b13007d8f86d541c8236e6dbaeec1c948 SHA512 3835cad62e8141774c5675d1dbc22103cb41a6af0d4a0a70b23e96d88fe72f49b872823bfb9f35294b8d1bec5d6e89942b37928ee92bb53ecb177a560fe8559d
 DIST liquidwar-5.6.4.tar.gz 3268432 BLAKE2B 9b74b057ecb065e18c355c92e9b71bcd257997d9b9874c37a77352b1df83fe17d130c6ac1394368eeb40957ff81d26e973f0677035949d84c357829dc40875f6 SHA512 7145a8362c46a0f39662327edf81b341659a3ce8216f9fb3bb32e483de618c0f46169ed916fe2c4c651ebc5925ecdc534b372c381e16c3ddae9a50fb48f98ed7
-EBUILD liquidwar-5.6.4-r1.ebuild 1535 BLAKE2B dfec55beda94bfc7783644f15e53d98d926d4eb0c8f83a2846522312018770819fe32da0799deb816a30c43a728e8f5bda57fd81d8eaad71e6e4593eb6cb33f4 SHA512 4ceaf10463625f3d484e2e95d4097bd92133889216b9c1a3828ad99ce004a91e9b6cfe9459d29e8647acb9fa989570a8a3dea2df635f010d435a62722beb4248
+EBUILD liquidwar-5.6.4-r2.ebuild 1650 BLAKE2B 92597eae770aa2a1063101a383eb406922c969b9adf8187b812fa98ae04d6135b29dcb90440190c0a02d2637d3f06752894c7a122aac3c88a62a3a67fa08558f SHA512 4adc6c05c0f9c319ba75c3720679040bdf5e2b2e269ed1208cf155a44b26b14d015943b5520233adcb86156f007b16840f8696d1d150933b1e8cc1b89f5c86c9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch
index 83e733b28a05..a1e93c9b738c 100644
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch
@@ -1,5 +1,5 @@
---- src/glouglou.s
-+++ src/glouglou.s
+--- a/src/glouglou.s
++++ b/src/glouglou.s
 @@ -240,3 +240,6 @@
  
     ret
@@ -7,8 +7,8 @@
 +#ifdef __ELF__
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- src/monster.s
-+++ src/monster.s
+--- a/src/monster.s
++++ b/src/monster.s
 @@ -972,3 +972,6 @@
     ret                              # retour au c
  
@@ -16,8 +16,8 @@
 +#ifdef __ELF__
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- src/spread.s
-+++ src/spread.s
+--- a/src/spread.s
++++ b/src/spread.s
 @@ -957,3 +957,6 @@
  
  
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
index 446385624cfa..c092f02beabe 100644
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
@@ -1,5 +1,5 @@
---- src/wwwsrv.c.old	2010-10-26 14:16:31.000000000 +0200
-+++ src/wwwsrv.c	2010-10-26 14:17:35.000000000 +0200
+--- a/src/wwwsrv.c.old	2010-10-26 14:16:31.000000000 +0200
++++ b/src/wwwsrv.c	2010-10-26 14:17:35.000000000 +0200
 @@ -100,12 +100,12 @@
  
    data->privacy = privacy;
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch
index 2bc53e0caccb..d80e349bf1b1 100644
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch
+++ b/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch
@@ -1,5 +1,5 @@
---- src/Makefile.in.old	2011-06-22 07:45:05.756127862 +0200
-+++ src/Makefile.in	2011-06-22 07:46:00.681613957 +0200
+--- a/src/Makefile.in.old	2011-06-22 07:45:05.756127862 +0200
++++ b/src/Makefile.in	2011-06-22 07:46:00.681613957 +0200
 @@ -223,7 +223,7 @@
      EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
  else
diff --git a/games-strategy/liquidwar/liquidwar-5.6.4-r1.ebuild b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild
index bfbb51bdca17..8899b512aa19 100644
--- a/games-strategy/liquidwar/liquidwar-5.6.4-r1.ebuild
+++ b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
-DESCRIPTION="unique multiplayer wargame"
+DESCRIPTION="Unique multiplayer wargame"
 HOMEPAGE="http://www.ufoot.org/liquidwar/"
 SRC_URI="https://savannah.nongnu.org/download/liquidwar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="nls"
+IUSE=""
 RESTRICT="test"
 
 RDEPEND=">=media-libs/allegro-4.2:0[X]"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-exec-stack.patch \
+	default
+
+	eapply "${FILESDIR}"/${P}-exec-stack.patch \
 		"${FILESDIR}"/${P}-ovflfix.patch
 	sed -i \
 		-e 's:/games::' \
 		-e '/^MANDIR/ s:=.*:= $(mandir)/man6:' \
 		-e '/^PIXDIR/ s:=.*:= /usr/share/pixmaps:' \
-		-e '/^DESKTOPDIR/ s:=.*:= /usr/share/applnk/Games/:' \
+		-e '/^DESKTOPDIR/ s:=.*:= /usr/share/applications/:' \
 		-e '/^INFODIR/ s/=.*/= $(infodir)/' \
 		-e '/^GAMEDIR/ s/exec_prefix/bindir/' \
 		-e '/install/s:-s ::' \
@@ -36,11 +38,11 @@ src_prepare() {
 		-e '/^GAMEDIR/ s/$(exec_prefix)/@bindir@/' \
 		-e 's:/games::' src/Makefile.in \
 		|| die "sed src/Makefile.in failed"
-	epatch "${FILESDIR}"/${P}-underlink.patch
+	eapply "${FILESDIR}"/${P}-underlink.patch
 }
 
 src_configure() {
-	egamesconf \
+	econf \
 		--disable-doc-ps \
 		--disable-doc-pdf \
 		--disable-target-opt \
@@ -54,7 +56,9 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install_nolink
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING
-	use nls || rm -f "${D}"/usr/share/doc/${PF}/README.*
-	prepgamesdirs
+	einstalldocs
+	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
+	# Provided desktop file is completely obsolete
+	rm -f "${ED}"/usr/share/applications/liquidwar.desktop
+	make_desktop_entry ${PN} "Liquid War" /usr/share/pixmaps/${PN}.xpm
 }
diff --git a/games-strategy/majesty-demo/Manifest b/games-strategy/majesty-demo/Manifest
index 03b1160a7b8e..fb21a2c32ed9 100644
--- a/games-strategy/majesty-demo/Manifest
+++ b/games-strategy/majesty-demo/Manifest
@@ -1,3 +1,3 @@
 DIST majesty_demo.run 36582366 BLAKE2B f972f5d98eb0a907d7b34dd09c8a1eabb67ded08287e147f08125a6b6e833e4e7c18f8374873b532f765a6c121a6885a46f06645eddb4245db93e801f5a67328 SHA512 0573b29fa2635aeb0aa6ebaaa55c924322b3805e120f49fde51409cc6f101d7ae41d72ed0d086ffeac4d591ba75ee8bc190c46a3b71adb6b36d867df16be2c79
-EBUILD majesty-demo-1.0.0.ebuild 1089 BLAKE2B 2d3957f4ec11fb251798c205826415df45da5a03e51e2a047ad760584975ae6b2714bdb075c88a021cb35e21d724e78b5a534bbe70824316a99f35cfbb276bf4 SHA512 a1046e24279cbe5f48e1a0dd09fa96d3ca18935ec2e56ae712f68cc5d39c7d3b923d62866f11847d42072ee0ca4f025f9e8dca15d2416602943eadb2bd251cae
+EBUILD majesty-demo-1.0.0-r1.ebuild 1029 BLAKE2B 129421df38286b45c02fdafbbc4dac32b8f23ce76ee1c7c8a57fbe9383687f15341c2187ee9ec95259b4b550ac3f97ade3ea10a663af2509c89e65221d87b378 SHA512 e6c950304ea53be9627c53fbfbe37bfe57d4a3338375ee675cf5c4a5bc53cb9cd1c5f378f121ba102ba2d98d35370f0e50cf76c1ac9e7378ac880bb1be27d8c2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild b/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
index e39f1e1a7f97..7a9bb85b31a9 100644
--- a/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
+++ b/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils unpacker games
+EAPI=6
+inherit eutils unpacker
 
 DESCRIPTION="Control your own kingdom in this simulation"
 HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=8&"
@@ -14,30 +14,30 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="bindist strip"
 
-RDEPEND="sys-libs/glibc
+RDEPEND="
+	sys-libs/glibc
 	x11-libs/libX11[abi_x86_32(-)]
 	x11-libs/libXext[abi_x86_32(-)]
 	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]"
+	x11-libs/libXdmcp[abi_x86_32(-)]
+"
+DEPEND=""
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
+dir="/opt/${PN}"
+Ddir="${D}/${dir}"
 QA_PREBUILT="${dir:1}/maj_demo"
 
 src_install() {
-	dodoc README*
+	einstalldocs
 	insinto "${dir}"
 	exeinto "${dir}"
 	doins -r data quests
 	doins majesty.{bmp,xpm} majestysite.url
 	newicon majesty.xpm majesty-demo.xpm
 	# only installing the static version for now
-	if use x86 || use amd64; then
-		doexe bin/Linux/x86/maj_demo
-	fi
-	games_make_wrapper maj_demo ./maj_demo "${dir}" "${dir}"
-	prepgamesdirs
+	doexe bin/Linux/x86/maj_demo
+	make_wrapper maj_demo ./maj_demo "${dir}" "${dir}"
 	make_desktop_entry maj_demo "Majesty (Demo)"
 }
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
index 52d94c3bcf43..113e0384af04 100644
--- a/games-strategy/naev/Manifest
+++ b/games-strategy/naev/Manifest
@@ -1,4 +1,4 @@
 DIST naev-0.6.1.tar.bz2 1047908 BLAKE2B 3763440c64f89c5ceb5993a3e4ee356d0cc615df8b70dba14ce0fb35d12a0a136e82958349887d9c5a719e14d9ddfc47beb524b88650ea6f7a6859a6422d6898 SHA512 4766c80b49de5a7e748948f0404ac54edbc5afa80618150d1f993d66c7462ea73bfc5220d73073cb51cd76ff5dc6ecdf935d6f843051943136ceefaea9837203
 DIST ndata-0.6.1.zip 303984255 BLAKE2B 154d8b326e2596cfe16fc646e7d482c07d7015253b6933889d12b93a2ee7e28649b1f3ffcb0c0ed2bfe9d1e3654623cab00113486d05fe6fd1262ce989bf9c25 SHA512 71c3024e1713b094b63cb0de3c70239d61c54142b715e61d5206c5eb3cb8c7a851fc1b388ecf891110dd8bb5c2b3759af71d20f39cb6e629c71b27386a57d7fe
-EBUILD naev-0.6.1.ebuild 1613 BLAKE2B 57d2ba59bc2f19844237c470571514c568c74bf7ccee7096f6039ee8053050e5abe7018c11c10e822742c3a27d539be68d6a6136fa5b125ddf8032cf483768d8 SHA512 7ac47a9bdb8d43193b77e9c6164e186020267e27463e84bbb9bb46a98c57deb025e9ab982aaa09eb71ad18d183689fa2e06cdd65adee65c0baff505fb370a940
+EBUILD naev-0.6.1-r1.ebuild 1545 BLAKE2B 44c10dd5764f76cfb8c693d5b75072d0262f91ee88e1d0769cc931508b494f710536b6c4bf922b9a97de65f04752a8c4d416ec2323e26677900321725f6a2da9 SHA512 787650821eb5ca41c6c816961fee73b30ed915c2c2ad1fc95c1b389e32230ce809f41e92d601aa662af867db361b6404ebb66f85902b1de4b178cf52268272a0
 MISC metadata.xml 480 BLAKE2B 5769dca136bfc7d26f0b5acb60ee6598d75651b7a58d9899b6da0839180a95bee9d183c229026773ec5641e07637e3dbbfbe4fe6f77b0c466fdf62dfb01fc4cc SHA512 d42e9402581393d47976730560c1850d41e0bdd5d8bf842781222b4621db4c5c55ed5b3a886106d7bc43c3830e38bfef55182478fa7eae8bc6342cd1ec293f62
diff --git a/games-strategy/naev/naev-0.6.1.ebuild b/games-strategy/naev/naev-0.6.1-r1.ebuild
index 35e6898d296b..c7932c3eb325 100644
--- a/games-strategy/naev/naev-0.6.1.ebuild
+++ b/games-strategy/naev/naev-0.6.1-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 flag-o-matic gnome2-utils games
+EAPI=6
+inherit flag-o-matic gnome2-utils
 
 DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
 HOMEPAGE="http://blog.naev.org/"
@@ -14,26 +14,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug +mixer +openal"
 
-RDEPEND="media-libs/libsdl2[X,sound,video]
+RDEPEND="
+	media-libs/libsdl2[X,sound,video]
 	dev-libs/libzip
 	dev-libs/libxml2
-	>=media-libs/freetype-2
+	>=media-libs/freetype-2:2
 	>=media-libs/libvorbis-1.2.1
-	>=media-libs/libpng-1.2:0
+	>=media-libs/libpng-1.2:0=
 	virtual/glu
 	virtual/opengl
 	dev-lang/lua:0
 	mixer? ( media-libs/sdl2-mixer )
-	openal? ( media-libs/openal )"
+	openal? ( media-libs/openal )
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_unpack() {
 	unpack ${P}.tar.bz2
 }
 
 src_configure() {
-	egamesconf \
+	econf \
 		--docdir=/usr/share/doc/${PF} \
 		--enable-lua=shared \
 		$(use_enable debug) \
@@ -52,8 +55,7 @@ src_install() {
 		appdatadir=/usr/share/appdata \
 		Graphicsdir=/usr/share/applications \
 		install
-
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	newins "${DISTDIR}"/ndata-${PV}.zip ndata
 
 	local res
@@ -62,17 +64,13 @@ src_install() {
 	done
 
 	rm -f "${D}"/usr/share/doc/${PF}/LICENSE
-
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-strategy/netherearth/Manifest b/games-strategy/netherearth/Manifest
index 4af17dacd404..d7ea91b7f4a6 100644
--- a/games-strategy/netherearth/Manifest
+++ b/games-strategy/netherearth/Manifest
@@ -1,10 +1,10 @@
 AUX Makefile 1003 BLAKE2B 53264f4ebfcb11142d6c503263d47825cb9f3370a9e291551043aab616da09fb936e293a01eb5f4916ebd29690e315004b0dfa2303f2853963b3e80e0b260d59 SHA512 72cb6f6cb31beb79d91ac3b60eff1cb4046fcecd83621c42ff34a145eefbf484b8bc87ed3c2792bec7d1587d2578c95b4a4b925f9a032c8eefe9a9208a96fcdb
-AUX netherearth-0.52-freeglut.patch 367 BLAKE2B 688a05a5727592641025ef383bf5d2d369b2b2bdf786882151b1143292ab9f6a9965a6fc26136530c3972a1c47fbd58f0215c4c5a9d90ea701ed480ac44282a1 SHA512 c430a2e409c8b1be98a6d9147d429e98a8333541fdbf7e070c87230b85b43bdde9e6665338281d6a984f20a6af29127b9a165086d0c5a2a33ab392649f762c9d
+AUX netherearth-0.52-freeglut.patch 371 BLAKE2B 3b480c96a2ce423213e870a3310a2d0411717662b1f557268ceaf46a4ca7710044a82f7df0f9d2128006a0e7dcad6322be86b91260d4f4f2a6a2215ec66b4c02 SHA512 125c27de71d4c600f78ca3c6f86e6431a6ae20cfc2b12238f3fdfca99bc77bbe90ffb5f3b98ee58d987d8852b154d63342f1677eae99eeebff07b0b2d810edfa
 AUX netherearth-0.52-gentoo-paths.patch 4356 BLAKE2B 59b2320ab0e5dadd23a6d9559e45da2f9ede1daa78b97ba3ebde6a74db4d8fe3281ed7244f180e7d863022f0350c481d9e7c800d524fcc1d763d5aa33e16d77f SHA512 55fe5ddc2e4d783eb3b930600168c1c106562c84e4532f84dbfe44afb44e9134bb32f0c5cc8dea520cc86d661cf984122d4e82da8d624d03bd6fb42e67ba45ca
 AUX netherearth-0.52-glibc-212.patch 410 BLAKE2B 3aaf59a8ed6c02df5cf5e5037c92d3b51866be06bc28e79980cdddc983c6da5be8f298139a651f625e17011426fed85d86dbff075b1a8980134cf0a3e052ec1e SHA512 fe33f1b9220a8538490316880bfbb671ad65c0a55a896aaa624791a9c094cbded0e5ac182f87750bd58300550a9dbcb10da6453b531c2d58582780a10838ecef
-AUX netherearth-0.52-ldflags.patch 329 BLAKE2B f61fd8d747bb13cd432aa93deee3aa0583478491b3cd188138896e1c6e7623dff8a87959ea7a4bbbb1e67316d598ee21d4564bf7ca09f5e97609a1a539753b7b SHA512 fef30a64dc693973d4e037fc57a47d3a8fb7cfa0f31f98165b1486d48433b4f21361d077e15eda3df26ffceda536c679786103c047be604878ebc92bddfb9209
+AUX netherearth-0.52-ldflags.patch 333 BLAKE2B 557e8519d0dafe902a0713d91c539b4ddf7b11d8a05a3ce22a2c5d4c806f6c54e29a77c371991a8dbc5c2afa88f85cc4792e2e5966c606ad95217e997e80f8dc SHA512 39aab126a7110590d8fa77d7f1e1d695a16af43809ac128a01a06f6f583f7a80435d40e1f341c945b3279a17c51348a5c5744954588740106549e292721743a9
 AUX netherearth-0.52-linux.patch 1255 BLAKE2B 5389c41fa27426a89c904605ca058620636ebccbdf6a2c74988f7b777618e4892a9e352bf54d851da739dceba7721807b3113126da9825d3efe8257fabfe65cd SHA512 fd5e4385798a3027bb6fe89b92939e0e9d7f463420cb1d47d1606bd2fabc12d1f755892cb1523062a07eb5d2138156aabfcb801daaff7b5f1fdbba8d079ef56f
 DIST netherearth052.zip 872397 BLAKE2B 091a5f9e6773450e3796daebf0d40e1796ca97682aa8092dd669deb3dcf4161a9f6f408d5e43bcce847375ad61c7cb43a90acf382898a0ddd36b3da55917cbb1 SHA512 1f2cb3e896ac076c5ed3d346f19d8328b879546c4dc58609251bdbc8fd96b201cbc5dcb400df2a0dd4c717c7be002f83b92acf33f607890fa736b572c72a8cf5
 DIST sources.zip 75918 BLAKE2B 23142db81e0fca94948cfc6d6443daf1f7909c1dc2334b73897c1e07d1eb39c0c05cedb7cb0b1c8681990a0a0b6632e4666e67128379e14da23fbbe90b9ae641 SHA512 8daa9def65f4be8a541df15c69531da84344906e0f3eab2b7e84f8a94e2f3278d2033e37a9edd4b17fc19b1f7fbf3537286a2a2a9877950d19a51a1167487b75
-EBUILD netherearth-0.52.ebuild 1850 BLAKE2B 4e5d31a7aa1285ff8c3050dce511235b06255ae8b5011283e679e9196dcc1ff28ee93d5189cc1c766181119b330d713969ad64c56279e08bd81d0e73acb9210b SHA512 59135e42c52f2c79a74fa84a3d7905bf65054f0440f176a2c0191d6ed42a582d8e7a2ab8f705acb3e0ed01c32712ad7869449665e4638980818125688043e8c3
+EBUILD netherearth-0.52-r1.ebuild 1959 BLAKE2B 062404ba75e3c292cab09260d201244b6d1c8126f8446f0a5d1471a74308138e553455d765c3f8e26d794eb3e06e1ef3a4c8cf9b510218aba61ea31fbb6b5f59 SHA512 4f92ffd97841c6759002571031eb01b1f9c7732cd0888962faf28d0d470e97fd315eeaf07fedf80d81ce31816ae8dbba9d9cc6d6ac95937a6b258d8948f22b6a
 MISC metadata.xml 530 BLAKE2B a306a4d5741d0e7e1bfca697f04e8aed8337c7658cf910c213eee9541510484019ded391b4d884bda58cbd30a47a913a5eb1ac8b298cb4dfd4ba733fda64818a SHA512 4ec339e99b397a71a0f5b6ffccf7f9cefafdee1ce0627c9c5e5f8b00c0158fd7e73e7d0d9612c8f653ea30113905ad6b4efbec694fcd4c05b3ab59439d558868
diff --git a/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch b/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch
index 0fc147f0b7aa..b61e1f139b04 100644
--- a/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch
+++ b/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch
@@ -1,5 +1,5 @@
---- main.cpp
-+++ main.cpp
+--- a/main.cpp
++++ b/main.cpp
 @@ -8,6 +8,7 @@
  
  #include <stdio.h>
diff --git a/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch b/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch
index 6b7ed3a8989c..7d81f912764f 100644
--- a/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch
+++ b/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2010-10-12 09:30:19.000000000 +0200
-+++ Makefile	2010-10-12 09:30:38.000000000 +0200
+--- a/Makefile.old	2010-10-12 09:30:19.000000000 +0200
++++ b/Makefile	2010-10-12 09:30:38.000000000 +0200
 @@ -17,4 +17,4 @@
  all: $(TARGET)
  
diff --git a/games-strategy/netherearth/netherearth-0.52.ebuild b/games-strategy/netherearth/netherearth-0.52-r1.ebuild
index 5fc80fe0afb0..e1aa7cabaaac 100644
--- a/games-strategy/netherearth/netherearth-0.52.ebuild
+++ b/games-strategy/netherearth/netherearth-0.52-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
 MY_PV="${PV/./}"
 DESCRIPTION="A remake of the SPECTRUM game Nether Earth"
@@ -12,19 +12,22 @@ SRC_URI="http://www.braingames.getput.com/nether/sources.zip
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist"
 
-RDEPEND=">=media-libs/libsdl-1.2.6-r3
+RDEPEND="
+	>=media-libs/libsdl-1.2.6-r3
 	>=media-libs/sdl-mixer-1.2.5-r1
-	media-libs/freeglut"
+	media-libs/freeglut
+"
 DEPEND="${RDEPEND}
-	app-arch/unzip"
+	app-arch/unzip
+"
 
-S=${WORKDIR}/sources
+S="${WORKDIR}/sources"
 
-data=../nether\ earth\ v${PV}
+data="../nether earth v${PV}"
 
 src_unpack() {
 	unzip -LL "${DISTDIR}/${PN}${MY_PV}.zip" >/dev/null || die
@@ -32,19 +35,21 @@ src_unpack() {
 }
 
 src_prepare() {
-	DATA_DIR=${GAMES_DATADIR}/${PN}
+	default
+
+	DATA_DIR=/usr/share/${PN}
 
 	cp "${FILESDIR}/Makefile" . || die
 
 	# Fix compilation errors/warnings
-	epatch "${FILESDIR}"/${P}-linux.patch
+	eapply "${FILESDIR}"/${P}-linux.patch
 
-	epatch "${FILESDIR}"/${P}-freeglut.patch \
+	eapply "${FILESDIR}"/${P}-freeglut.patch \
 		"${FILESDIR}"/${P}-glibc-212.patch \
 		"${FILESDIR}"/${P}-ldflags.patch
 
 	# Modify dirs and some fopen() permissions
-	epatch "${FILESDIR}/${P}-gentoo-paths.patch"
+	eapply "${FILESDIR}/${P}-gentoo-paths.patch"
 	sed -i \
 		-e "s:models:${DATA_DIR}/models:" \
 		-e "s:textures:${DATA_DIR}/textures:" \
@@ -66,7 +71,7 @@ src_prepare() {
 }
 
 src_install() {
-	dogamesbin nether_earth
+	dobin nether_earth
 
 	cd "${data}"
 
@@ -76,5 +81,6 @@ src_install() {
 
 	dodoc readme.txt
 
-	prepgamesdirs
+	newicon textures/nuclear.bmp ${PN}.bmp
+	make_desktop_entry nether_earth "Nether Earth" /usr/share/pixmaps/${PN}.bmp
 }
diff --git a/games-strategy/outerspace/Manifest b/games-strategy/outerspace/Manifest
index 6f031eeaf188..389e740096bc 100644
--- a/games-strategy/outerspace/Manifest
+++ b/games-strategy/outerspace/Manifest
@@ -1,6 +1,6 @@
 AUX outerspace 169 BLAKE2B 432402aa2fa9b80c2a5d22f22e5858dd6d618145d37abe54736d7a23fbfcc20dbe6e8c8e2427a4e561960b338def2bd0c28f37f5fdcfcbfc1983b740f3f2a1f3 SHA512 fd20d9de084fef162eec391d68dc973df566b62fd2254fe8ad92c91b073341ca17f96844e0cae28592a7a4d05cc6e3744d66cd37dce9b70319678b91db8d8a1b
-AUX outerspace-0.5.68-setup.patch 1644 BLAKE2B 5b7d11b5ff9b12cbdb2564aed706ffece0c9065f8532caa3110a0f0ebba88ebc33db75564239e5c6cdd2f1c1da1594428e1e9ec7052d97b55d42de8fdb0e4d92 SHA512 3b583e3fbb0a2a26ee18edd6734d2adac07401376c5a96213f6fddaac18a0df6128007dc9947a77a0c9e12fafea368acff8cb5eef13d55206530bf55b28640c2
+AUX outerspace-0.5.68-setup.patch 1652 BLAKE2B 60d940c6c6c8c95452288abc13873aceff6d8cd6dd1216a61ca02de5bd1e834365fd2bbc0d6dd38500b1e2b764ccd1d629831871b40d2d45c708460939d23120 SHA512 b3d7f604724e6990436808dc62214a55325278cc04006fbe8438a213e772615a46b2969f88b03364332154af3cf996c7bdce05cc40dd5d24938bf6b537f9884b
 DIST outerspace-0.5.68.tar.gz 2249703 BLAKE2B 16b8c2d6c4e0516867d9a07a2762112da39f9a1074dffad9a9a3c343dd75662cba74d50f2a028b530013f320ffd7481317d061a3ebb449e9acf2f41bf56312a3 SHA512 dc2cbebf16fefabcc3356efb496766b90a5eabbf218f085fdc83cf956ca9503e99ef3154e0905c2432a3bf7caabd1f2af585a43397ba368581cd66546fcddc6b
 DIST outerspace_0.5.68-0ubuntu1_all.deb 2634188 BLAKE2B fd1667ae130e9a0ed603c369e9751d0b83414f20dd06c2f7e9941e2c465bdad0ff050ca41a928906bc5cc755eb05c0a5dfa18a8c35c868650c3fec6cf2e4f1f8 SHA512 9520cf1207a59497d6253b42bc34d580f9b805cf4ae55a5c921082e965892aa67921c4624ea94a5145c911dc2b24a1cca2806c06770ef8d1ded10855fb42666c
-EBUILD outerspace-0.5.68.ebuild 1718 BLAKE2B f0c9501b49495b8c7e73a9f53b04524c468d910211b2516234c004fdb39d53dbaa8c3161b3c567756c8ae64cfb34478568df08f7b8d731da50c9f16ef64dfd56 SHA512 25f544b374fe0e71c119d40e59cbad84f67f2b5de77ed4c50af63c7fac2f5996a608b7ae20a52ac6228a9309f44f4fba61fd0788c5c2bb91f62a719740bd82c8
+EBUILD outerspace-0.5.68-r1.ebuild 1565 BLAKE2B 54cfa44e8dbd0288c3d047f5ff5b13e5801f52c51f204c24e38141c29f15f3250de1e6702167e7410c2679a864e8dec892b4f7b459038659dcd221dc8df9946a SHA512 dbddbb02721b8bccc6486b178ede4c08e72d92bba22bb3606167b19d64f423f57f311f9c7af45a50509bbc2bd2bd6087e047197aa0c573b649614ee760d67143
 MISC metadata.xml 831 BLAKE2B 2eb39d75eca89288ab8dcb4ff274891d62e4c9a9540ceb2a2f887e2743c28c4d04b8692a093e24c0226b88d2dbe938b268ef17de4974e5c127422ed387bac6a7 SHA512 d607343f2cc56162b694e28523cf256339a306b03bcca9c0148c59700491249a9acc6cfc193467cbdd04d8ea9bb564816747276143b3e4e1bf3dc7deab480d1e
diff --git a/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch b/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
index 202c53bc7ee1..c95852dca3dc 100644
--- a/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
+++ b/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
@@ -1,5 +1,5 @@
---- setup.py
-+++ setup.py
+--- a/setup.py
++++ b/setup.py
 @@ -42,12 +42,7 @@
  
  # collect data files
@@ -42,8 +42,8 @@
 -        os.remove(path)
 -
 -shutil.rmtree("libsrvr", onerror = onerror)
---- osc.py
-+++ osc.py
+--- a/osc.py
++++ b/osc.py
 @@ -23,12 +23,36 @@
  # tweak PYTHONPATH
  import sys
diff --git a/games-strategy/outerspace/outerspace-0.5.68.ebuild b/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
index 1fcc38fc07a5..7ac6c532fd49 100644
--- a/games-strategy/outerspace/outerspace-0.5.68.ebuild
+++ b/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils gnome2-utils distutils-r1 games
+inherit desktop gnome2-utils distutils-r1
 
-MY_PN=${PN/outerspace/Outer Space}
-DESCRIPTION="on-line strategy game taking place in the dangerous universe"
+MY_PN="${PN/outerspace/Outer Space}"
+DESCRIPTION="On-line strategy game taking place in the dangerous universe"
 HOMEPAGE="http://www.ospace.net/"
 SRC_URI="mirror://sourceforge/ospace/Client/${PV}/Outer%20Space-${PV}.tar.gz -> ${P}.tar.gz
 	mirror://sourceforge/ospace/Client/${PV}/outerspace_${PV}-0ubuntu1_all.deb"
@@ -18,8 +18,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pygame-1.7"
+DEPEND=""
 
-S=${WORKDIR}/${MY_PN}-${PV}
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_unpack() {
 	default
@@ -28,8 +29,8 @@ src_unpack() {
 
 python_install() {
 	distutils-r1_python_install \
-		--install-scripts="${GAMES_BINDIR}" \
-		--install-data="${GAMES_DATADIR}/${PN}" \
+		--install-scripts="/usr/bin" \
+		--install-data="/usr/share/${PN}" \
 		--install-lib="$(python_get_sitedir)"
 
 	# source tarball is missing files
@@ -39,40 +40,31 @@ python_install() {
 }
 
 src_prepare() {
+	default
+
 	# fix setup script
 	# rework python start script to avoid shell-wrapper script
-	epatch "${FILESDIR}"/${P}-setup.patch
+	eapply "${FILESDIR}"/${P}-setup.patch
 
 	sed -i\
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
 		osc.py || die "sed failed"
 
 	distutils-r1_src_prepare
 }
 
-src_compile() {
-	distutils-r1_src_compile
-}
-
 src_install() {
 	distutils-r1_src_install
-	newicon -s 48 res/icon48.png ${PN}.png
+	newicon res/logo-login.png ${PN}.png
 	make_desktop_entry "osc.py" "${MY_PN}"
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
-
-	einfo
-	einfo "start the game via 'osc.py'"
-	einfo
 }
 
 pkg_postrm() {
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 2ef9955b96ce..cbdbafef0983 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -6,5 +6,5 @@ AUX s25rttr-0.8.1-gcc6.patch 1504 BLAKE2B 6cbb0fcd59ebedbb0e9faf49bc192944b70cee
 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
 DIST s25rttr-0.8.1.tar.xz 39644940 BLAKE2B 80268ac6ee20da983b4c3a90d8a9ebd5903734547fb48036963f435498a3395964afba990498a306a89009da50d023982a1dbd502e1ed618734c6a8d44ba2368 SHA512 31a7d640e1ecd5488ef02d0ed3adcaeb9b5ae5f6af5e006deb4100fde3eb8ec567e34519e9c2b82f38c9972d62790a6f6978d5da6c6dfca7f1c153fa65f22df2
-EBUILD s25rttr-0.8.1-r2.ebuild 2655 BLAKE2B b25d585fce1197cbb68525ddfa7d11628964472baaeee9bc029ec42b8f2f4243e48dff59767082ef193627438a68cf29e089a4beca967c2aaf21cb34ca88c629 SHA512 b9b426aa2019f8550d46d350bc20853a6c5ee54ee8f56d1c24c5b2fa1c3108ebe02d704b23260c2a17e0f7a2f0395b6087df87f53ac3a9387c0f658c1191b8b6
+EBUILD s25rttr-0.8.1-r3.ebuild 2582 BLAKE2B 73c58b320bdfdd511b149ff331b8adf454da2cfd8313b1c681873bda39745bcb03faedec1b08547e51b0f1643789111e2017564b4004bca856eb71039e57ba95 SHA512 140839837c4815bc7a984497824290367e7a6e87bff958eee1c496a11401874585917703e245b4ef36121132db65611cf75f728b6b48d44f46cf0f5e302b2975
 MISC metadata.xml 463 BLAKE2B 33a0cc242b253cb1a3446cc2705cfb32bf0cd125c990bf0b8d527c3c9de546c390dd8fbad984c2a2a6264a25e0f889b63e86287024aa666dfdac94a5aacc3664 SHA512 dd5ea72d1f7ceda9bb2f033c8482e2978924ebee1a61e00fb515b0b0e846553bb1a4024aa739ae1f51608dcb90d0138d6679df1133a8140bfa2bfdb48163c885
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
index 52de4ccf0b7c..ac9ed2e6c5f6 100644
--- a/games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils cmake-utils gnome2-utils games
+inherit eutils cmake-utils gnome2-utils readme.gentoo-r1
 
 DESCRIPTION="Open Source remake of The Settlers II game (needs original game files)"
 HOMEPAGE="http://www.siedler25.org/"
@@ -15,16 +15,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND="app-arch/bzip2
+RDEPEND="
+	app-arch/bzip2
 	media-libs/libsamplerate
 	media-libs/libsdl[X,sound,opengl,video]
 	media-libs/libsndfile
 	media-libs/sdl-mixer[vorbis]
 	net-libs/miniupnpc
 	virtual/libiconv
-	virtual/opengl"
+	virtual/opengl
+"
 DEPEND="${RDEPEND}
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cmake.patch
@@ -36,9 +39,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
 )
 
-src_prepare() {
-	cmake-utils_src_prepare
-}
+DOC_CONTENTS="Copy your Settlers2 game files into ~/.${PN}/S2"
 
 src_configure() {
 	local arch
@@ -54,11 +55,11 @@ src_configure() {
 		-DCOMPILEFOR="linux"
 		-DCOMPILEARCH="${arch}"
 		-DCMAKE_SKIP_RPATH=YES
-		-DPREFIX="${GAMES_PREFIX}"
-		-DBINDIR="${GAMES_BINDIR}"
-		-DDATADIR="${GAMES_DATADIR}"
-		-DLIBDIR="$(games_get_libdir)/${PN}"
-		-DDRIVERDIR="$(games_get_libdir)/${PN}"
+		-DPREFIX="/usr/"
+		-DBINDIR="/usr/bin"
+		-DDATADIR="/usr/share"
+		-DLIBDIR="/usr/$(get_libdir)/${PN}"
+		-DDRIVERDIR="/usr/$(get_libdir)/${PN}"
 		-DGAMEDIR="~/.${PN}/S2"
 		-DBUILD_GLFW_DRIVER=OFF
 	)
@@ -78,35 +79,32 @@ src_compile() {
 src_install() {
 	cd "${CMAKE_BUILD_DIR}" || die
 
-	exeinto "$(games_get_libdir)"/${PN}
+	exeinto /usr/"$(get_libdir)"/${PN}
 	doexe "${T}"/{sound-convert,s-c_resample}
-	exeinto "$(games_get_libdir)"/${PN}/video
+	exeinto /usr/"$(get_libdir)"/${PN}/video
 	doexe driver/video/SDL/src/libvideoSDL.so
-	exeinto "$(games_get_libdir)"/${PN}/audio
+	exeinto /usr/"$(get_libdir)"/${PN}/audio
 	doexe driver/audio/SDL/src/libaudioSDL.so
 
-	insinto "${GAMES_DATADIR}"
+	insinto /usr/share
 	doins -r "${CMAKE_USE_DIR}"/RTTR
-	dosym ./LSTS/splash.bmp "${GAMES_DATADIR}"/RTTR/splash.bmp
+	dosym ./LSTS/splash.bmp /usr/share/RTTR/splash.bmp
 
 	doicon -s 64 "${CMAKE_USE_DIR}"/debian/${PN}.png
-	dogamesbin src/s25client
+	dobin src/s25client
 	make_desktop_entry "s25client" "Settlers RTTR" "${PN}"
-	dodoc RTTR/texte/{keyboardlayout.txt,readme.txt}
 
-	prepgamesdirs
+	dodoc RTTR/texte/{keyboardlayout.txt,readme.txt}
+	readme.gentoo_create_doc
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-	elog "Copy your Settlers2 game files into ~/.${PN}/S2"
-
 	gnome2_icon_cache_update
+	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index 01ba594bcaf3..9617b8304bd2 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -8,5 +8,5 @@ DIST uqm-remix-disc1.uqm 50188876 BLAKE2B 02bf183aa9ef5460831d4bbcfa90ce4745814d
 DIST uqm-remix-disc2.uqm 60282662 BLAKE2B c556a99adfb11c8b90cf1de272ce5d42aaf7ec16d246572286646328ddd24b0928f013c8de7806e6545b436c2fa152e0cfd7f4851769992848d6aecb0379a433 SHA512 3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e
 DIST uqm-remix-disc3.uqm 39924875 BLAKE2B f5f495f2c3aca9d6a9a95df51379398a823cb795d85d0ccaa719676d54d7b1dbe9d1b41724eb13fabf62359d6aa72d90615de1f437e2ffde7066436fdebeb13b SHA512 2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951
 DIST uqm-remix-disc4.uqm 86545760 BLAKE2B d644e537ccf234ff846525d70ebe9bd910f68db78f9c7e8dc72b768f24acd98e8db587592352d575bb919561ef5c7dcf09a7e414d31d519475915c65cf65f9b7 SHA512 07f0fbe0b9889602eab43f376577c8e0a19c6db50bbb3f01f57836c7caab1eb18813e94d8d9f2d3098a6b6c9dc336290b7f5262c586f2fb41ffab0e2b0ba7f65
-EBUILD uqm-0.7.0-r3.ebuild 2948 BLAKE2B 0a1e059808315f5e838b3886c58fde77b26d89eba25b252661dbe057c249bd20d65ab82c6f3c43105cdbbc3ee2bc3584f1859231643cb2ac3c3d6cc18fcb6117 SHA512 e7344fcb4c306e69317e898ca86f5c43079a9378538a1216d2e2a694d7993a5a3ad1bf1d27d03daa3a23163085fb31fa1d3efe9bd96ad9852dd34226baed2285
+EBUILD uqm-0.7.0-r4.ebuild 2887 BLAKE2B b9bcdc61a47019fefe86f46453e7413efe252a7e7169d9fed3b4d93c00b045228bd0a3956b0d8013388128eb16b30ab2aab1010b8ebce093bd29f70dbd3a9b20 SHA512 2c551fcce44049917d348d04d011c095ed0e92ba2ba7ca38f0430c2ad83e5e13c1c96951b0be0e03a23a49cb044aee4a281815d5dd9c3de7e80b9febd176f58f
 MISC metadata.xml 572 BLAKE2B 154cfbc9c11b74fb658a2e8b494e394f1924291e2273e0fef3346471c9059adf42e819dbf795aad3fdf4296a272e149cf46a8502a195b6bb97287c7b0c548409 SHA512 cd21d5260e39857374bcd1795f2cb2c158104ce865cd9c091202bab404f8133b547d0ba8e7a2580a0177ee1b97de31bdf1b0658f0b20860d70585ecb85bd49b1
diff --git a/games-strategy/uqm/uqm-0.7.0-r3.ebuild b/games-strategy/uqm/uqm-0.7.0-r4.ebuild
index 0d0264e8f7a6..f04136716330 100644
--- a/games-strategy/uqm/uqm-0.7.0-r3.ebuild
+++ b/games-strategy/uqm/uqm-0.7.0-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib toolchain-funcs games
+EAPI=6
+inherit desktop toolchain-funcs
 
 DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
 HOMEPAGE="http://sc2.sourceforge.net/"
@@ -20,25 +20,30 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="music opengl remix voice"
 
-RDEPEND="media-libs/libmikmod
+RDEPEND="
+	media-libs/libmikmod
 	media-libs/libogg
-	>=media-libs/libpng-1.4:0
+	>=media-libs/libpng-1.4:0=
 	media-libs/libsdl[X,sound,joystick,video]
 	media-libs/libvorbis
 	media-libs/sdl-image[png]
 	sys-libs/zlib
-	opengl? ( virtual/opengl )"
+	opengl? ( virtual/opengl )
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
+	default
+
 	local myopengl
 
 	use opengl \
 		&& myopengl=opengl \
 		|| myopengl=pure
 
-	epatch \
+	eapply \
 		"${FILESDIR}"/${P}-tempdir.patch \
 		"${FILESDIR}"/${P}-warning.patch
 
@@ -47,10 +52,10 @@ src_prepare() {
 	CHOICE_graphics_VALUE='${myopengl}'
 	CHOICE_sound_VALUE='mixsdl'
 	CHOICE_accel_VALUE='plainc'
-	INPUT_install_prefix_VALUE='${GAMES_PREFIX}'
+	INPUT_install_prefix_VALUE='/usr/share'
 	INPUT_install_bindir_VALUE='\$prefix/bin'
 	INPUT_install_libdir_VALUE='\$prefix/lib'
-	INPUT_install_sharedir_VALUE='${GAMES_DATADIR}/'
+	INPUT_install_sharedir_VALUE='/usr/share/'
 	EOF
 
 	# Take out the read so we can be non-interactive.
@@ -62,7 +67,7 @@ src_prepare() {
 		-e "s/-O3//" build/unix/build.config || die
 
 	sed -i \
-		-e "s:@INSTALL_LIBDIR@:$(games_get_libdir)/:g" \
+		-e "s:@INSTALL_LIBDIR@:/usr/$(get_libdir)/:g" \
 		build/unix/uqm-wrapper.in || die
 
 	# respect CC
@@ -79,15 +84,15 @@ src_install() {
 	# Using the included install scripts seems quite painful.
 	# This manual install is totally fragile but maybe they'll
 	# use a sane build system for the next release.
-	newgamesbin uqm-wrapper uqm
-	exeinto "$(games_get_libdir)"/${PN}
+	newbin uqm-wrapper uqm
+	exeinto /usr/"$(get_libdir)"/${PN}
 	doexe uqm
 
-	insinto "${GAMES_DATADIR}"/${PN}/content/packages
+	insinto /usr/share/${PN}/content/packages
 	doins "${DISTDIR}"/${P}-content.uqm
-	echo ${P} > "${D}${GAMES_DATADIR}"/${PN}/content/version || die
+	echo ${P} > "${ED}"/usr/share/${PN}/content/version || die
 
-	insinto "${GAMES_DATADIR}"/${PN}/content/addons
+	insinto /usr/share/${PN}/content/addons
 	if use music; then
 		doins "${DISTDIR}"/${P}-3domusic.uqm
 	fi
@@ -97,7 +102,7 @@ src_install() {
 	fi
 
 	if use remix; then
-		insinto "${GAMES_DATADIR}"/${PN}/content/addons
+		insinto /usr/share/${PN}/content/addons
 		doins "${DISTDIR}"/${PN}-remix-disc{1,2,3,4}.uqm
 	fi
 
@@ -107,5 +112,4 @@ src_install() {
 	docinto devel/netplay
 	dodoc doc/devel/netplay/*
 	make_desktop_entry uqm "The Ur-Quan Masters"
-	prepgamesdirs
 }
author	V3n3RiX <venerix@redcorelinux.org>	2018-05-04 11:22:40 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-05-04 11:22:40 +0100
commit	fe1c8b732bd548b699d4c2ef725f67f8b8c8911c (patch)
tree	84c0b6ca01b7cb63c7d6e685a63823200ce1007f /games-strategy
parent	7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b (diff)