gentoo resync : 30.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-30 21:33:31 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-30 21:33:31 +0100
commit: 2f8db31405fac68eea6f7257d58529243815033b (patch)
tree: 54259cc8988a98a10586fc0496b1f3501cd1e2a1 /games-board
parent: a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (diff)
24 files changed, 185 insertions, 190 deletions
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index c693e1eded1e..18427d7c4a93 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/crafty/Manifest b/games-board/crafty/Manifest
index 3ff9c8a76a8d..2a0e0b66492d 100644
--- a/games-board/crafty/Manifest
+++ b/games-board/crafty/Manifest
@@ -1,5 +1,5 @@
 AUX crafty-24.1-numcpus.patch 1564 BLAKE2B 9796e2bb0363500deabd703a64243fe8a771e072dc7e95ddc3e2e50f0c8aec67995c768d69b802213d640cf63aa32a8bb764b15993af414a4770cf07119196ff SHA512 303942f906b0ddedd1f2d2ab2c6808877c793dbc58d5f866c1af9823509fe08085d81cb3ed44f9663fa56aadc6b96a0fa4fbfde0b5ff9f53f1a235185faa2cbf
 DIST crafty-24.1.zip 442680 BLAKE2B a6f2e00e4ce3882b7548ff401eab122a102c3504b640ff6adeba58727fcc06b029ac5e49cc120d5ce394e883cb0f6c12fcb59bb82efd0789c61777f7dc13569d SHA512 4d8088aeb683d69e3ea5e01194eb0dc9b957049823c7f8a1f28686e601f9f270b829319083a8b8170016bfda36a42c592a94b4429d7c4f35a6351fd469f16124
 DIST crafty.doc.ascii 79678 BLAKE2B 776f5b141fa7982af7d95d32da4f1b2acd39794f530616fbfce828e5b5acdd094b83573da0ac684b3fe95462a453d50853dd211c5fff66b4cf99626716547696 SHA512 562698c3954e53f05c009025291bdb748baaa08616437796a08b42198057cff9f9efa7a8caf41574e71dafe60f4c132dc9497ad5ed9a83b8f071d1c31c8583b8
-EBUILD crafty-24.1.ebuild 2479 BLAKE2B c4f576bb6217029c40c6f9dd265da066fa26516d8d4f7858e10e536f70e261dd48caec37965c2c8acc90900e605d786a284003b59484d124d4f2351d7f4adac4 SHA512 146659cae299cc46bd1aeb6967eca253133a6d0b14ce8ee47e40c265f2d1a6fd01967ea5c76921cbb9244d22302025561f751711a84a9f85647d37f3ee4cea46
+EBUILD crafty-24.1-r1.ebuild 2047 BLAKE2B 5d7a1a12f2bc7e3bdd48f749c8ec366b413a839e3f49c765682d84681c1839d8ea0ec5ab390e295a2610a626af3e4705117d3b38e36c6fd0a010c440382f3d36 SHA512 a924129a809aa4f6bf38298693a4f96419a3485a9916c776228883a2918f64a8c11cdc318aaf65075953ced7cee85b7b5790319c0148fcb00206956f620b9f9d
 MISC metadata.xml 348 BLAKE2B 0553d91a61ec7b5f0fe5a67b6934b340e88030210d9b105d7f74e9599412a2f855c8b3cfd145c0bf428a0d19463eaeb97cf10aea75b1570db5b788749a0a9d36 SHA512 dac102e7447ff6f41ab290b7e59dfc9a97b2614e8f977f97a54ef1d5d616e8f22cc83607d3f9803693b59b98ecb175dcd527dcc78519451770e80f0a9cf6ed27
diff --git a/games-board/crafty/crafty-24.1.ebuild b/games-board/crafty/crafty-24.1-r1.ebuild
index 60d9bbb5d605..906629747c2b 100644
--- a/games-board/crafty/crafty-24.1.ebuild
+++ b/games-board/crafty/crafty-24.1-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 flag-o-matic toolchain-funcs eutils games
+EAPI=6
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Bob Hyatt's strong chess engine"
 HOMEPAGE="http://www.craftychess.com/"
@@ -21,14 +21,15 @@ DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 src_prepare() {
+	default
 	sed -i \
 		-e '/-o crafty/s/CC/CXX/' \
 		-e 's:CXFLAGS:CXXFLAGS:g' \
 		-e 's:-j ::g' \
 		Makefile || die
 	sed -i \
-		-e "s:\"crafty.hlp\":\"${GAMES_DATADIR}/${PN}/crafty.hlp\":" option.c || die
-	epatch "${FILESDIR}"/${P}-numcpus.patch
+		-e "s:\"crafty.hlp\":\"/usr/share/${PN}/crafty.hlp\":" option.c || die
+	eapply "${FILESDIR}"/${P}-numcpus.patch
 }
 
 src_compile() {
@@ -37,7 +38,7 @@ src_compile() {
 	if ! use no-opts ; then
 		if [[ $(tc-getCC) = icc ]] ; then
 			makeopts="${makeopts} asm=X86.o"
-			append-flags -D_REENTRANT -tpp6 \
+			append-cppflags -D_REENTRANT -tpp6 \
 				-DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
 				-DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B -DFAST \
 				-DSMP -DCPUS=4 -DCLONE -DDGT
@@ -46,13 +47,13 @@ src_compile() {
 		else
 			if [[ "${CHOST}" == "i686-pc-linux-gnu" ]] \
 			|| [[ "${CHOST}" == "i586-pc-linux-gnu" ]] ; then
-				append-flags -DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
+				append-cppflags -DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
 					-DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B \
 					-DFAST -DSMP -DCPUS=4 -DCLONE -DDGT
 				append-flags -fno-gcse \
 					-fomit-frame-pointer -mpreferred-stack-boundary=2
 			elif [[ "${CHOST}" == "x86_64-pc-linux-gnu" ]] ; then
-				append-flags -DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
+				append-cppflags -DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
 					-DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B \
 					-DFAST -DSMP -DCPUS=4 -DCLONE -DDGT
 				append-flags -fomit-frame-pointer
@@ -61,25 +62,13 @@ src_compile() {
 			fi
 		fi
 	fi
-	append-flags -DPOSIX -DSKILL
+	append-cppflags -DPOSIX -DSKILL
 	emake ${makeopts} crafty-make LDFLAGS="${LDFLAGS} -pthread"
 }
 
 src_install() {
-	dogamesbin crafty
-	insinto "${GAMES_DATADIR}/${PN}"
+	dobin crafty
+	insinto "/usr/share/${PN}"
 	doins crafty.hlp
 	dodoc "${DISTDIR}"/crafty.doc.ascii
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog
-	elog "Note: No books or tablebases have been installed. If you want them, just"
-	elog "      download them from ${HOMEPAGE}."
-	elog "      You will find documentation there too. In most cases you take now "
-	elog "      your xboard compatible application, (xboard, eboard, knights) and "
-	elog "      just play chess against computer opponent. Have fun."
-	elog
 }
diff --git a/games-board/freedoko/Manifest b/games-board/freedoko/Manifest
index 13848c4838e6..8fe216a56b4b 100644
--- a/games-board/freedoko/Manifest
+++ b/games-board/freedoko/Manifest
@@ -1,10 +1,10 @@
-AUX freedoko-0.7.14-gentoo.patch 1405 BLAKE2B 0c5bdc24b44d28b71ecd2a6d6ba0f2c795fcef18849e297be76a8179f8395c177081b1dd765759d24c5f7763e91c6bea232c02d48f215e0bc88db418f57d342c SHA512 71d8d7af7c45fe7ec184b7b575e85a23120c1ced09a9d04961282358ef0006b2dbd995c8aa1072b4a30ae5c2f7833334bd11471e35499a5561c9b38832525435
-DIST FreeDoko_0.7.14.src.zip 21959828 BLAKE2B fb19946876978119e36d6f8bb7bd0049523f2145dbaf198fe00e776256a1d66efb3067324bb6ffb0f7db90b3b5acd937c848cf7ec7958419e6897ae918955fce SHA512 d9135ad846c48c05b3d61c07b146429ef8c54d301469a304912176164f05ee98682d05a5b2ec8feb1a568acae2d81b2bf62fa625a1fde09a5c1c03a1c782ff17
+AUX freedoko-0.7.16-gentoo.patch 1233 BLAKE2B aed41cd99a5031a81c8566e4ce0055015e11bd68b7e5c195577deb6cfe228077ab3be0060a2d9881829319b3bd83b3618f0a50a2f1e9abb3c64bd8ffdc743683 SHA512 2ee93baa654050af04cea885a5d170933b94f777da669a72b66bfcff7d0a82e7347b58ffcb4966b52b40117f6cc8fc5dc9e0391638184f49f76b954e08a4796d
+DIST FreeDoko_0.7.16.src.zip 21763114 BLAKE2B a02e562badef67d596a5652a384022c0d7e86af766bdde35ce6fa18b212142a6f9008e3f702bdb571efc20cbbbaf1ebf61633a0e09fa97ed7bb5798268daaf34 SHA512 5a656539a6d8b06873532a32869a54a3cab68532b7ee8eb526e92c378ded957478e71ff5c2b1b5674f9433bb62adf2e94bdcf2d3ce13ffc7d846f268adbce314
 DIST freedoko-backgrounds.zip 1067740 BLAKE2B 1f4485007bc78c3d7d497ba556a9f7bf0ff121a228e9d938ee000a12bd3921eef14c40cfbc6806b95c5905bff3f8e823b56c5fc110b290719a0771351f985d5c SHA512 66f118a5440b854c7ad4b1bdfd63e7f3bc16e66c921a6f632637269ca8855a6a45eb05a71bfb9105abda20285e35994ff3c9c50649f70ab6de4a082e092c3a14
 DIST gnome-games.zip 3338038 BLAKE2B cc2ddb0abfcc1557addf896d15daf00150ec08d7bd75ae9c4fdf1e4cd6e5d126e9dcd5e50a7c62f1d74cb881259da8ba96f2f5623ff84041d04c6b5a38b9662e SHA512 42dd63c4eb696d7964b0ad30ff0032c80c93e8bd0a2517b0938005eaf8b12a584d7ce7901c6b3bb0bb55372e484162240c7719d2bf102035870b9c57f1930ec1
 DIST kdecarddecks.zip 3370611 BLAKE2B d097bd95545e57250ea7dc034d40577253cf8e78e539e7b81217a548903817ee792a5ee1115eef7d8238b3e90a70601e272df84fc304b43be4a28697220d545c SHA512 4f3fdac3c672fd1de3db2f6603919a242db73e2445a8dac07d45dcf284cfbb56948925d6e512f15a0b4c762b71758c0755312624a0030a4d8f11dbfe65666c44
 DIST openclipart.zip 1251509 BLAKE2B 66ac2ada7d96726d4f4f9d016feb088814ff95def9950082c04b0a440d86e80701fcb06ee6e04afc431daf759198957281a971124f591346b66d70be916b50db SHA512 8c5e84d8f8f011cfc84f7d012c97e606f80c2254336518c9b9563315bd63971e7211b762effbb841e74603e0f02bb12ae9e91d1be6a4e23c243691b025874ec2
 DIST pysol.zip 26314316 BLAKE2B f8df3be0b4a2f9343af40dd3311f4d58ca33a1392474f837afc2a0e56bcf21e1bd39b3b2914e06f6e226e5e832b2c6cba9f090639e27f38d554da81dbc3e1d58 SHA512 951891631c6890144361d779bc52aed2b94a87e810de65f7ef240193c49a243e2f1a93f3e170eacb19080dd28beb99b279d7e0bc16d7cb54553e27d29e65b1f7
 DIST xskat.zip 666085 BLAKE2B 2141ffec9b76142ab96bc0bd66784578711a44163788b868b9b02cfa9514f123e02a75d6d3c979ba86283b5fdda1604167eff9181c9ce2ee8b324db0b02bb0e1 SHA512 725bb12e983e8c1494748faf78b2e1c76c424806eeb7a88aafecf580aa63703c166907aea2bbd7890d2f972ffacc5dde78d01a82b72ab87cccf1a8e50d1034f9
-EBUILD freedoko-0.7.14-r1.ebuild 2649 BLAKE2B c1319c15e55d2ca3d829d6676ab4c1cc72cdadeaab3d5604172b1e1adf571865178bd3692f8da02ba259e9614a316c8807d17847bf0e92343274b4ab290ee712 SHA512 6e13623a8774963af128058b6e63739348e4638e8100262ac28e06b074ceef538eabc1aecb000b33fb2d469fcbb9286fd96c4f833430790514895538b3cb2f5a
+EBUILD freedoko-0.7.16.ebuild 2697 BLAKE2B 19cdf1d26ced16f9f79c7b537868e07b859ae1d146a6eef90ded70ee6f2033cff98ecb0674773737c761d4ed89113abb51396959eb6cf7284238300d625a9baa SHA512 5eacdc90fa6fa0473e5fdb808ff3fdc1cf9f82439f8429469aaa79d5d58558805928a6957e12596f499c285b02fef1cee66b95a0d8e9797879f61d8c3ffacd05
 MISC metadata.xml 928 BLAKE2B edb0c7696eaba28ed8ad3bc625d5a8f71525037dd09d5f75cda28b3fc586e1d59edfa5bf230e9f4d30c949fead44cdae048624cfe4eec92aaa3c9f46ace43e11 SHA512 df7bc6dfe2691b80cda7d4f17738e6d939a137658f8ba8453adf3d0003371c07d9c48fc4dce945fbc73978dcc0d7ee0eb0e4a5f46f1d0245ae0d4c8aa5b40847
diff --git a/games-board/freedoko/files/freedoko-0.7.14-gentoo.patch b/games-board/freedoko/files/freedoko-0.7.16-gentoo.patch
index d1d18fb485ea..68160dcba926 100644
--- a/games-board/freedoko/files/freedoko-0.7.14-gentoo.patch
+++ b/games-board/freedoko/files/freedoko-0.7.16-gentoo.patch
@@ -1,42 +1,33 @@
---- FreeDoko_0.7.14.orig/src/Makefile
-+++ FreeDoko_0.7.14/src/Makefile
-@@ -241,15 +241,7 @@
+--- a/src/Makefile.old	2017-06-06 13:30:39.005626983 +0200
++++ b/src/Makefile	2017-06-06 13:31:09.180881871 +0200
+@@ -239,15 +239,7 @@
  # compile FreeDoko
  $(PROGRAM) : show_settings objects $(DIRECTORIES)
  	@echo 'compiling $(PROGRAM)...'
 -# Gentoo users do want to see the real compile line.
 -# So remove the next five lines (the echo lines)
 -# and remove the '@' in the line after.
--	@echo '$(CXX) $(CXXFLAGS)'
--	@echo '        $$(OBJECTS)'
+-	@echo '$(CXX) $$(OBJECTS)'
 -	@echo '        $(INCLUDE_ALL)'
 -	@echo '        $(LIBS_ALL)'
+-	@echo '       $(CXXFLAGS)'
 -	@echo '        -o $@'
--	@$(CXX) $(CXXFLAGS) \
-+	$(CXX) $(CXXFLAGS) \
+-	@$(CXX) \
++	$(CXX) \
  	  $(OBJECTS_ALL:%.o=$(FREEDOKO_WORKING_DIRECTORY)/%.o) \
  	  $(INCLUDE_ALL) \
  	  $(LIBS_ALL) \
---- FreeDoko_0.7.14.orig/src/Makefile.os
-+++ FreeDoko_0.7.14/src/Makefile.os
-@@ -1,6 +1,5 @@
- include $(DEPTH)/../Makefile.os
- 
--include $(DEPTH)/Makefile.local
- include $(DEPTH)/Makefile.modules
- 
- ifeq ($(OPERATING_SYSTEM), Linux)
---- FreeDoko_0.7.14.orig/src/Makefile.rules
-+++ FreeDoko_0.7.14/src/Makefile.rules
-@@ -80,10 +80,8 @@
+--- a/src/Makefile.rules.old	2017-06-06 13:30:27.071526137 +0200
++++ b/src/Makefile.rules	2017-06-06 13:31:17.829954904 +0200
+@@ -80,10 +80,7 @@
  		  $(DEPTH)/Makefile.modules \
  		  $(DEPTH)/Makefile.local \
  		  $(DEPTH)/Makefile.os
 -# Gentoo users do want to see the real compile line.
 -# So remove the next line and remove the '@' in the line after.
- 	@echo $(CXX) -c $(SUBDIR)/$<
--	@$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(DEPGEN_FLAGS) -o $@ -c $<
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(DEPGEN_FLAGS) -o $@ -c $<
+-	@echo $(CXX) -c $(SUBDIR)/$<
+-	@$(CXX) $(INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(DEPGEN_FLAGS) -o $@ -c $<
++	$(CXX) $(INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(DEPGEN_FLAGS) -o $@ -c $<
  
  
  -include $(OBJECTS:%.o=$(TARGET_DIR_LOCAL)%.d)
diff --git a/games-board/freedoko/freedoko-0.7.14-r1.ebuild b/games-board/freedoko/freedoko-0.7.16.ebuild
index 1c2f599e4438..279bdf73da22 100644
--- a/games-board/freedoko/freedoko-0.7.14-r1.ebuild
+++ b/games-board/freedoko/freedoko-0.7.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -58,13 +58,13 @@ src_unpack() {
 }
 
 PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${PN}-0.7.16-gentoo.patch
 )
 
 src_prepare() {
 	default
-
-	append-cxxflags -std=c++11
+	export VARTEXFONTS="${T}/fonts" #652028
+	append-cxxflags -std=c++14
 }
 
 src_compile() {
diff --git a/games-board/fruit/Manifest b/games-board/fruit/Manifest
index 859d12cb5285..1d07168b0415 100644
--- a/games-board/fruit/Manifest
+++ b/games-board/fruit/Manifest
@@ -1,4 +1,4 @@
-AUX fruit-2.1-gentoo.patch 586 BLAKE2B 78e545371a02836235edcec0acf1c5706a0e62b9dfb825a6007cecd1886ceae09f8b456448deb78ccc0084f32498dd57071beea867082bad5df7cb07bfdb62e9 SHA512 4c226d37f7cf9c2c6abf0b262b9ebe6338ac30ce18333f1a7eece4935fb13ded57e541f9aa15be9dbbe2b67a66287e3b7565c226245fcb57dd62953bf09f8b75
+AUX fruit-2.1-gentoo.patch 590 BLAKE2B 0ff77b71537b8b2062413e1fe888014d69371c8cb29260e02cae8e3789b572c9175750be31abd5dfaebbdf517bc2c8f98b3132c8526beaa1cf1ebcbd35c77f79 SHA512 db32e30dcd60df1c0dabcab4589cdfb779ef619d2bdfdb35b77b5b6b224adb0b9826c310b2f3fd97c0591e4c63931dfec733578429c749b691a5dafbc8a954b4
 DIST fruit_21_linux.zip 716762 BLAKE2B ffdc38ca4a3021b69e95c876c419bc85102412ef6632cfc5d8d1370b59fdc6e1bb5e10e5066fd39197d16042286e0cac07ae76a39eb1ed3d96bfe804225a9948 SHA512 80d80141ca3c2a4521b241a750bd237e0971b531bc4e8e89ae3bdcdbb1436b99b35e64f505b9a61413726744646b6b4ce126bcdb53b90adc727f88a50adee889
-EBUILD fruit-2.1.ebuild 960 BLAKE2B 36dd56ac6329d826ee38db5028cbf3fd734e2c37ea21475120e7e10b414bd3574094820a6c58915bf7c97a62391cc5add845fa0f71a9fcf9726ea7c10089b220 SHA512 8583c3f6607ec7e356881bb78ab0be0697d84f84ecc69235ad867659c7a47038f2c75512ca84806b0d3fb417884368ee0e72ada43d3202e667d63e9153264cf6
+EBUILD fruit-2.1-r1.ebuild 795 BLAKE2B 669fa5a30b6173ad0dc3c92e78b8e87ef4b87b037caf4248b6928cb670e9b05e50410495b730b2f67290a683c593922748f06d43df02c9f06109d33a085d1af4 SHA512 655f8e1b74330fb41d4609a72bda62383fc492b7ef04c94edfca6310e95b50bb3f6980cba50452ce3669b824bd4342ba7379f3cd6baff005e543d8b2be48e9fc
 MISC metadata.xml 330 BLAKE2B e38a1b870857c880700f94c087932aee6c4236bdd38e87c61b93837c72235dc5f8e37c322fec5f8b87403a498e459035f13037a1b0711a9902405ea15d8e03e4 SHA512 f568c54581b78f36c6aaaba340be04f0396dbb62f133426b0dddf4a1ed39b0675fd64b6b2d14f9c41bf49851dc25156bf71566ef9b207570cc7e57a92380c4ef
diff --git a/games-board/fruit/files/fruit-2.1-gentoo.patch b/games-board/fruit/files/fruit-2.1-gentoo.patch
index bae207f89627..815b184d9dc2 100644
--- a/games-board/fruit/files/fruit-2.1-gentoo.patch
+++ b/games-board/fruit/files/fruit-2.1-gentoo.patch
@@ -1,5 +1,5 @@
---- option.cpp.old	2007-02-07 23:32:25.000000000 +0100
-+++ option.cpp	2007-02-07 23:32:51.000000000 +0100
+--- a/option.cpp.old	2007-02-07 23:32:25.000000000 +0100
++++ b/option.cpp	2007-02-07 23:32:51.000000000 +0100
 @@ -29,7 +29,7 @@
     { "Ponder", true, "false", "check", "", NULL },
  
diff --git a/games-board/fruit/fruit-2.1.ebuild b/games-board/fruit/fruit-2.1-r1.ebuild
index 89ebd40ca879..bb8f7635cf15 100644
--- a/games-board/fruit/fruit-2.1.ebuild
+++ b/games-board/fruit/fruit-2.1-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils versionator games
+EAPI=6
+inherit versionator
+
+MY_PV="$(replace_all_version_separators '')"
+MY_P="${PN}_${MY_PV}_linux"
 
-MY_PV=$(replace_all_version_separators '')
-MY_P=${PN}_${MY_PV}_linux
 DESCRIPTION="UCI-only chess engine"
 HOMEPAGE="http://arctrix.com/nas/fruit/"
 SRC_URI="http://arctrix.com/nas/${PN}/${MY_P}.zip"
@@ -18,12 +19,13 @@ IUSE=""
 RDEPEND=""
 DEPEND="app-arch/unzip"
 
-S=${WORKDIR}/${MY_P}/src
+S="${WORKDIR}/${MY_P}/src"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}"-gentoo.patch
+	default
+	eapply "${FILESDIR}/${P}"-gentoo.patch
 	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
 		option.cpp || die
 	sed -i \
 		-e '/^CXX/d' \
@@ -32,15 +34,8 @@ src_prepare() {
 }
 
 src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}/${PN}"
+	dobin ${PN}
+	insinto "/usr/share/${PN}"
 	doins ../book_small.bin
 	dodoc ../readme.txt ../technical_10.txt
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "To use this engine you need to install a UCI chess GUI"
-	elog "e.g. games-board/glchess"
 }
diff --git a/games-board/gnome-mastermind/Manifest b/games-board/gnome-mastermind/Manifest
deleted file mode 100644
index bec240e1991f..000000000000
--- a/games-board/gnome-mastermind/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gnome-mastermind-0.3.1-gentoo.patch 220 BLAKE2B 9a82af73d518105611b71ceae8ba2cd1b210cbce97f02c93bb137db2d6f6f847ae66a7e2eb78c2540cf7e6f1e09ef35b95fc65e4841c4950be719d0d54ce351d SHA512 2982778f12b0ab7b112635a34caf34c277f58d7291ce9d0c9dc526a492ca13a0e2f3dfa4c905ca9155f9bee13a58ec66ec94d4bca66ce0a416c46b748f6e079e
-DIST gnome-mastermind-0.3.1.tar.bz2 717787 BLAKE2B 5b57e9c5692a44276a6c8f97389bc294528c7e6fefa3f7f60ffb7eefe8f632838e4657214b5eac00fde0a3958f80d73f934536f42ece9fd5089d942bb8d69f7c SHA512 f8ec4caeb6e518e6d27136ca9dd9ff6c01ac8c0feceb29df0a4ac7158b99f8a917768bc6e3f2bd1aff32d46ef3131185f55664343de687d874881c196e8a8a17
-EBUILD gnome-mastermind-0.3.1-r1.ebuild 885 BLAKE2B 4ba3e96e97bb23d50b86d80adc0e084f0eca677fbb13c3a655c67dd1ae8eef476cdda8ce4da4ca0c616aa73d2a166e699cad622127bfeb7587a38a899bc223bc SHA512 69232c2e69f2603973b504ffc5866839894944af5e0b780bf2667ca3b6136be4fdde9ec1517ae3455063982d126453cf37772648a25f439626514d240655dae2
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnome-mastermind/files/gnome-mastermind-0.3.1-gentoo.patch b/games-board/gnome-mastermind/files/gnome-mastermind-0.3.1-gentoo.patch
deleted file mode 100644
index ba14e592ae16..000000000000
--- a/games-board/gnome-mastermind/files/gnome-mastermind-0.3.1-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.old	2007-08-25 01:12:01.000000000 +0200
-+++ Makefile.in	2007-08-25 01:14:29.000000000 +0200
-@@ -685,7 +685,7 @@
- 
- info-am:
- 
--install-data-am: install-pkgdataDATA
-+install-data-am:
- 
- install-exec-am:
- 
diff --git a/games-board/gnome-mastermind/gnome-mastermind-0.3.1-r1.ebuild b/games-board/gnome-mastermind/gnome-mastermind-0.3.1-r1.ebuild
deleted file mode 100644
index 039169b2f57b..000000000000
--- a/games-board/gnome-mastermind/gnome-mastermind-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A little Mastermind game for GNOME"
-HOMEPAGE="http://www.autistici.org/gnome-mastermind/"
-SRC_URI="http://download.gna.org/gnome-mastermind/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	gnome-base/gconf:2
-	gnome-base/orbit
-	app-text/gnome-doc-utils
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/pango
-	x11-libs/cairo
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext
-	app-text/rarian
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	# Fix .desktop file
-	sed -i -e 's/True/true/' desktop/gnome-mastermind.desktop.in || die
-
-	# Regenarate all intltool files to respect LINGUAS
-	eautoreconf
-
-	gnome2_src_prepare
-}
diff --git a/games-board/gnome-mastermind/metadata.xml b/games-board/gnome-mastermind/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/gnome-mastermind/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/gnugo/Manifest b/games-board/gnugo/Manifest
index 3ccf99585467..2459e5edbf4e 100644
--- a/games-board/gnugo/Manifest
+++ b/games-board/gnugo/Manifest
@@ -1,4 +1,6 @@
+AUX gnugo-3.9.1-format-security.patch 1943 BLAKE2B 2dd1c6f7b69da62baac53336e1b017136b16392b85a343aeb41d47fd10f5464a98eee1c8383e31531b21f72456a037bf72fb206752818f2fb39939d46bccb35a SHA512 5d53c53173980c9e73ce1f19c5c5e9228308cb00a61a623e942a3cc8598b73cc188ef24fda0b44feddcf0f381dbebdccf85716a187de730a9bb6412d1f9d61a7
 AUX gnugo-3.9.1-invalid-move.patch 727 BLAKE2B 5c5a13e3b00175627a45a4ef1d32b4a3dc049114281219ec70a22985c2deb027938b2e4ee1c0a58c1da8759800fdd9f98d6bb4981405f51af6269e0a01dedb74 SHA512 a1f20761e714670e2173b36390492304252bf30e46f93e37dee3cc72de346a59a8daaaaa6f0cf2e20834637598831f0f55d4c6c0825021d6fd00055a57db2bdb
 DIST gnugo-3.9.1.tar.gz 3207748 BLAKE2B 4251e125eac20188926210db8640f1ae4ff2b79f6a59b429af9e10fcfd6b0d34f9bf180b32194c519a7b59905a4b5e8bc1a2e45a071a8b8696bf16dd04f6a342 SHA512 b2b215fb8c1ebb0b58e54d14dcc02af3b76bde3a1b84a842a11a0a6018c77a2464c44b26fe0e7ad73b2b2e7fa22005466821bf762108c2c2e04428d3d459af97
 EBUILD gnugo-3.9.1-r1.ebuild 662 BLAKE2B 48296b632f9c05b031b7550e76af9a25217e21c7503a17f65fd859b4170ef8436251fa8ec911278cf4c469c5544f41c79975a197612c0938169211a89554de73 SHA512 287f9f4e6b7a7daa14cbfa7efe45d8f784c08fd4805a1b6f249e269156d9320a9d490ae1204a7c7bf52881e4bfd3b9e4982b3428a73f1cbae2f4db45f452fc58
+EBUILD gnugo-3.9.1-r2.ebuild 631 BLAKE2B 9bb7b3a76f9626167dd3eeba0461b5708f09766fd5e8da3ed4a998df8b066c1556152b569f39e11753a501d75b017743d0b8970806673addeaa8de5f21f74e0b SHA512 14a7092ef29576c6a51198dcdb260b061c3f1cc538c400f18ba499ffa213bb7acfef7678bcc28fc027395f55e1d77f1804a8dd9e4649189d48ecc09bfe029c93
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnugo/files/gnugo-3.9.1-format-security.patch b/games-board/gnugo/files/gnugo-3.9.1-format-security.patch
new file mode 100644
index 000000000000..7828187c571d
--- /dev/null
+++ b/games-board/gnugo/files/gnugo-3.9.1-format-security.patch
@@ -0,0 +1,60 @@
+diff --git a/patterns/dfa.c b/patterns/dfa.c
+index 3689616..2d2f8c6 100644
+--- a/patterns/dfa.c
++++ b/patterns/dfa.c
+@@ -279,7 +279,7 @@ resize_dfa(dfa_t *pdfa, int max_states, int max_indexes)
+  * dump a dfa (debugging purpose).
+  */
+ 
+-static const char *line =
++static const char line[] =
+   "----------------------------------------------------\n";
+ 
+ void
+diff --git a/patterns/mkpat.c b/patterns/mkpat.c
+index 70a6964..5f1f1dd 100644
+--- a/patterns/mkpat.c
++++ b/patterns/mkpat.c
+@@ -1419,7 +1419,7 @@ generate_autohelper_code(int funcno, int number_of_params, int *labels)
+     /* A common case. Just use the labels as parameters. */
+     switch (number_of_params) {
+     case 0:
+-      code_pos += sprintf(code_pos, autohelper_functions[funcno].code);
++      code_pos += sprintf(code_pos, "%s", autohelper_functions[funcno].code);
+       break;
+     case 1:
+       code_pos += sprintf(code_pos, autohelper_functions[funcno].code,
+diff --git a/patterns/uncompress_fuseki.c b/patterns/uncompress_fuseki.c
+index 3290b05..c67a733 100644
+--- a/patterns/uncompress_fuseki.c
++++ b/patterns/uncompress_fuseki.c
+@@ -224,9 +224,9 @@ main(int argc, char *argv[])
+ 
+   assert(boardsize > 0);
+   if (boardsize > MAX_BOARD) {
+-    printf(output_strings[PREAMBLE]);
++    printf("%s", output_strings[PREAMBLE]);
+     printf(output_strings[HEADER], boardsize);
+-    printf(output_strings[FOOTER]);
++    printf("%s", output_strings[FOOTER]);
+     return EXIT_SUCCESS;
+   }
+   
+@@ -251,7 +251,7 @@ main(int argc, char *argv[])
+     board[k][boardsize + 1] = '|';
+   }
+ 
+-  printf(output_strings[PREAMBLE]);
++  printf("%s", output_strings[PREAMBLE]);
+   printf(output_strings[HEADER], boardsize);
+   
+ 
+@@ -308,7 +308,7 @@ main(int argc, char *argv[])
+   if (mode == C_OUTPUT)
+     write_pattern_c_code(NULL, board1d, NO_MOVE, 0, boardsize, -1);
+   
+-  printf(output_strings[FOOTER]);
++  printf("%s", output_strings[FOOTER]);
+ 
+   return EXIT_SUCCESS;
+ }
diff --git a/games-board/gnugo/gnugo-3.9.1-r2.ebuild b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
new file mode 100644
index 000000000000..b78c0ed865e0
--- /dev/null
+++ b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A Go-playing program"
+HOMEPAGE="https://www.gnu.org/software/gnugo/devel.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="readline"
+
+RDEPEND="
+	readline? ( sys-libs/readline:0= )
+	>=sys-libs/ncurses-5.2-r3:0=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-invalid-move.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
+
+src_configure() {
+	econf \
+		$(use_with readline) \
+		--enable-cache-size=32
+}
diff --git a/games-board/phalanx/Manifest b/games-board/phalanx/Manifest
index a7e4f6559fce..db404c0c6458 100644
--- a/games-board/phalanx/Manifest
+++ b/games-board/phalanx/Manifest
@@ -1,3 +1,3 @@
 DIST Phalanx-XXII.tar.gz 356831 BLAKE2B 11eacd51a77df0a0b25315145a3519e0ae34f97b1498b691167978700fe038770db24e0ce3dec4141a4f5f4c38ab38bf90b338a1320a09191f1757b895ce7307 SHA512 e959556bb29eb2178dbf77c656d6c6520a8568e93e03350c5141bee8808a04d0a0c1050a3db53b1fef4a7b6e6b724272700e52feb6c5d7f8308cebca91c51d67
-EBUILD phalanx-22.ebuild 974 BLAKE2B 55975bf62b2544e611b0eec2c61db413a271e50913267332516af3d033c5607e2ccabcc5933180463cfaede2fd26e8a78d05d757f4f4e77796aac2ac04d3443e SHA512 f49be130847d6886ba6ca4d83a792a7175caf05a515d0e2773534fed835be9bc838df7f91f071012776fca49ee586bb2132d7a8840cae38c5149700cab1a312a
+EBUILD phalanx-22-r1.ebuild 930 BLAKE2B edd80d4bcd0c850e67ed5c378d290c256c2acd320652a0becda1cc3cb188f3f0cd44f5a0cc68342e6e050144ac839d06f88a9f35b85891839fb63b78db39270b SHA512 e335f8cbf3d84867d7062d35ab2905d8da9df656fcffadb239abccb5e032c9a1b3d305d1be77f8ead81d584384c44a44cd30e5b751a2422b8121dd9cf3c1df5a
 MISC metadata.xml 590 BLAKE2B cc0d80f3eb03f6aab26996d3773c68b2f64328b1d9b8d4798fc4168d924c87d87f196d2dea76484cadcbd3d0d45ca4da9a34407cf57d59f9ce314203f2fcfee0 SHA512 48daed32c34b1183e44136d4da6572da67508c2782e6a28aebbf6d6d52b94eb2cf8c6dd079d8eab61a4180d82e1894271eb56e32d73f6bc302c2aa3050949fd6
diff --git a/games-board/phalanx/phalanx-22.ebuild b/games-board/phalanx/phalanx-22-r1.ebuild
index 8d2354125e88..cb72a63812f8 100644
--- a/games-board/phalanx/phalanx-22.ebuild
+++ b/games-board/phalanx/phalanx-22-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit toolchain-funcs games
+EAPI=6
+inherit toolchain-funcs
 
 MY_PN="Phalanx"
 MY_PV="XXII"
-MY_P=${MY_PN}-${MY_PV}
+MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="A chess engine suitable for beginner and intermediate players"
 HOMEPAGE="http://phalanx.sourceforge.net/"
@@ -17,14 +17,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_compile() {
 	# configure is not used in the project; confs are in Makefile,
 	# and here we override them:
 	local define="-DGNUFUN" myvar
 	for myvar in "PBOOK" "SBOOK" "LEARN" ; do
-		define="${define} -D${myvar}_DIR=\"\\\"${GAMES_DATADIR}/${PN}\\\"\""
+		define="${define} -D${myvar}_DIR=\"\\\"/usr/share/${PN}\\\"\""
 	done
 	emake \
 		DEFINES="${define}" \
@@ -34,9 +34,8 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin phalanx
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin phalanx
+	insinto /usr/share/${PN}
 	doins pbook.phalanx sbook.phalanx learn.phalanx
-	dodoc HISTORY README
-	prepgamesdirs
+	einstalldocs
 }
diff --git a/games-board/sjeng/Manifest b/games-board/sjeng/Manifest
index 01c8377133ce..ab5f678b75e2 100644
--- a/games-board/sjeng/Manifest
+++ b/games-board/sjeng/Manifest
@@ -1,3 +1,3 @@
 DIST Sjeng-Free-11.2.tar.gz 174019 BLAKE2B c50f312ce4f569b17cf7f240fe27e9d6d27e83e260c7549ba13ee612a357700b1642c2b274637af3e0e0f45c35e46f088cdcd5dce6bb62591ef600b97d8c6d6b SHA512 cda3409d732ac1b07e83ccc0d3063d24497651097c633500dfca66fbb3021532053082ac57a5e23909dd1016a2bae07f166e56b82c4ce834749a101c9ee444b8
-EBUILD sjeng-11.2-r1.ebuild 450 BLAKE2B 30121dab0101baeb1bde37b01d5a30e5c32e3b71541fa13e57952fa82a3298ea176c80478055a2f8ff903578524d100b8aeeed44eb7218beb8566232d82d41aa SHA512 18d1368682cf9e0e9ec19340bebd1997186028338d0b12dd43cfdbfa1efc447e4e9b84296cffec1a2b26b8be99426025fb6608041c921b176972fd4824588843
+EBUILD sjeng-11.2-r2.ebuild 398 BLAKE2B b829535981175878c2631fe03a542dbc8706530d4006550de55386a5440a186a5b7db47db0c99290d5d4b21cf16de68a5cf7a9c1271a9cf31b6926f3741d3ea5 SHA512 cff266a31310acb99335d459820715987bbf763a4941addeaa75c709c03ec872fe25a10d1321f4609cc5147407d89cd9106ad44237078e14aa2d96d86ffee45e
 MISC metadata.xml 328 BLAKE2B a01f3dc1b89d082ffb3e813bbadc30aec1d774322215d6aac79934e8e6e4b139beeeea052d46e075c7694a5fe2c3de80a418671fd339eb24afa51331051c41f3 SHA512 54f4f8c4089f82b019be4e1cc7f8ce10221142ff020c992f37cbcd3a9e87a43e4b61a1c5dca23edfcc1e5060fe0db19292d4f63319414d4994b91f517153c68d
diff --git a/games-board/sjeng/sjeng-11.2-r1.ebuild b/games-board/sjeng/sjeng-11.2-r2.ebuild
index 4a7cd0e31ace..9cf968e7d406 100644
--- a/games-board/sjeng/sjeng-11.2-r1.ebuild
+++ b/games-board/sjeng/sjeng-11.2-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games
+EAPI=6
 
 DESCRIPTION="Console based chess interface"
 HOMEPAGE="http://sjeng.sourceforge.net/"
@@ -13,12 +12,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE=""
 
-DEPEND="sys-libs/gdbm"
-RDEPEND=${DEPEND}
+RDEPEND="sys-libs/gdbm:0="
+DEPEND=${RDEPEND}
 
-S=${WORKDIR}/Sjeng-Free-${PV}
-
-src_install () {
-	default
-	prepgamesdirs
-}
+S="${WORKDIR}/Sjeng-Free-${PV}"
diff --git a/games-board/spider/Manifest b/games-board/spider/Manifest
index 715605250e6b..6b0650bc24aa 100644
--- a/games-board/spider/Manifest
+++ b/games-board/spider/Manifest
@@ -1,4 +1,4 @@
 DIST spider_1.2-4.diff.gz 2882 BLAKE2B 3016e4d6a7f4aa6e4f47e7abb78b12d70d5cee400a4e61b514e8fbbfdb7ad8484f84c1c1006447f3c6ab8a5897dfc4d4af5304eeaea716203c5c5440f9084b3b SHA512 e1e6eb4d5b14de7c32e1537877a3d26470c032bea567aa679c8a3744d62ab6b12d81bf05120679a273d98b6fd976c32d24ce9c54b720d006c51464f7ff6d5e75
 DIST spider_1.2.orig.tar.gz 168209 BLAKE2B 3a1163099ba9ce4faa9bc7c3424a2a2105c6fe001487822898dba7598dc5dc8d43cab2a3d7685fb71b1d19ff1b667397a41a3ba03fca4abf5d700308b19dc202 SHA512 a1d01f15ca37c8abdcc9f7c3dac925b1726f9b58ce51eb4096a9248abe0a55086ccdd5cc5ec358c2ee609ff089978676a3e3c669062a522ed7f1d4ea1ce33ab0
-EBUILD spider-1.2_p4-r1.ebuild 1655 BLAKE2B 3bb36ea32ba136d70e9badba43a46546ae9baeb45f626495036a6613b112dbd68e3abab558b282de91daa102df01a58aee7334b238d3a55c5b8100e5a6d968e4 SHA512 0f0025fc52bf5c1090351280b7d86aaa9761c18810a90943a37b08f2cd2a87f85ba79ae4f88379f1d4862d78fca22e6acf109fc54958e5cad1db3e6d44e76c9b
+EBUILD spider-1.2_p4-r2.ebuild 1601 BLAKE2B 4e15a8f2bac4f49184054e75dc23c9d85dca213f6421bcc92f3e304bafbc8ffff730b599a2d4351957270f1477ac68b2649c91404a334b7af836124d3f02c505 SHA512 48f0b26a8d42b1ed788350ce1e976e6431088c22318204ee72e199faad2be918fc6e3d5cbb4c615254b13bd132f8f27c3765feecb569546110a35c3d43c9fa13
 MISC metadata.xml 327 BLAKE2B 60eff6a4428512cda35daa5d6d02f55f946b5e7840a9ff866a1f76014a837c25fa5c4e142187270a5b25b1c38c96a61cf3e7a229f39caf70d830731565b9222e SHA512 e55a8b00c37c88331de81c2c28e9a187c1a28d4fd64c5fcafd9e01c8cdfbdbd455ded19f523d1806506a1652a5eecaf09b5f8097a42ac40bb36821b92bd3c4b9
diff --git a/games-board/spider/spider-1.2_p4-r1.ebuild b/games-board/spider/spider-1.2_p4-r2.ebuild
index 0d2b229121cc..a543715af982 100644
--- a/games-board/spider/spider-1.2_p4-r1.ebuild
+++ b/games-board/spider/spider-1.2_p4-r2.ebuild
@@ -1,15 +1,15 @@
-# 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 gnome2-utils games
+EAPI=6
+inherit desktop epatch gnome2-utils
 
 MY_P="${P%%_*}"
 MY_P="${MY_P/-/_}"
 DEB_V="${P##*_p}"
 
 DESCRIPTION="Spider Solitaire"
-HOMEPAGE="http://packages.debian.org/stable/games/spider"
+HOMEPAGE="https://packages.debian.org/stable/games/spider"
 SRC_URI="mirror://debian/pool/main/s/spider/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/s/spider/${MY_P}-${DEB_V}.diff.gz"
 
@@ -18,17 +18,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="athena"
 
-RDEPEND="x11-libs/libXext
+RDEPEND="
+	x11-libs/libXext
 	athena? ( x11-libs/libXaw )
 	x11-libs/libXmu
-	x11-libs/libXt"
+	x11-libs/libXt
+"
 DEPEND="${RDEPEND}
 	x11-misc/imake
-	x11-proto/xproto"
+	x11-proto/xproto
+"
 
-S=${WORKDIR}/${MY_P/_/-}.orig
+S="${WORKDIR}/${MY_P/_/-}.orig"
 
 src_prepare() {
+	default
 	epatch "${WORKDIR}"/${MY_P}-${DEB_V}.diff
 	sed -i \
 		-e '/MKDIRHIER/s:/X11::' \
@@ -54,26 +58,23 @@ src_configure() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		BINDIR="${GAMES_BINDIR}" \
+		BINDIR="/usr/bin" \
 		MANSUFFIX="6" \
 		MANDIR="/usr/share/man/man6" \
 		HELPDIR="/usr/share/doc/${PF}" \
 		install install.doc install.man
 
-	dodoc README* ChangeLog
+	einstalldocs
 	newicon icons/Spider.png ${PN}.png
 	newicon -s 32 icons/Spider32x32.png ${PN}.png
 	make_desktop_entry spider Spider
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }
 
diff --git a/games-board/xmille/Manifest b/games-board/xmille/Manifest
index fb23e694d5e1..54d6546e45d2 100644
--- a/games-board/xmille/Manifest
+++ b/games-board/xmille/Manifest
@@ -1,4 +1,4 @@
-DIST xmille_2.0-12.diff.gz 6041 BLAKE2B 3c901cccdacf7306420c5de98618ea0468a96ef42a61d5d9f0cbb4e655269c1eb38fab8acfc77830978ea90ed7c424c9236efa16b70f33ef53a36076a6dd6e9f SHA512 8f8a71ce6f4359b4d8fbecd0e6149783abc4ded07da485c91c67784fd6c4988d074ad9bda7a8a47689ffe379dd8d20f9968ef7e6998ed22b735c51a2fae5828d
+DIST xmille_2.0-13.diff.gz 6276 BLAKE2B bf136bc25d3aea56b671b6ff475717d162f0620a1c8c07d3b96b9d7a4b9b9f3ccae1039fc24827048686c631312c36e450a8bd989c32e9d26ab1c594ffc317d9 SHA512 d9e4448942738a105255d9aa77e2e66cb9edc8b35fd8278d1c810dbdca4a5b8a4916bf48c8d6a16e282db0c0fa058a0b281c168976529edeedb6caf53af7cd15
 DIST xmille_2.0.orig.tar.gz 68178 BLAKE2B bd6ab40a8868b90bfc1b045a2be797c8eab49e676b695f521ceaf8646de9c01a07806c0ce029e4959a339e2ab48668635abd5b842c90e33c2cb5fd359eb971b8 SHA512 028740785dfc13b4088810855358b9dab75fbb79221dd4218ef0c19550c2180fe92e553d0a474bf45091b4008988e1a093a6d5bac99fe1ccafcaec3429cd0e8b
-EBUILD xmille-2.0-r2.ebuild 938 BLAKE2B e64e701ffb28d67655ac41843e04b92e28c9d6ed2ebfe7acb5366a5bea518975f6bde90a1bb0a0ff59b559e62264306e8cadfcc65fc7b426ddf04feaad63f43a SHA512 ec4157d671725c45c8f9474c01222cbbea39d1d783466b187ced4787636e6040043a113de15d752d500643ae6fe784a83fca0486fb5c2ae12b4617bb910efc52
+EBUILD xmille-2.0-r3.ebuild 969 BLAKE2B 83b923821852b492b09a1cf30cb9a02b9ef733d0abb713feb7f41df8e9b500a114937dc3626c87805ff24b0c271ebcd9130498e9f576059a5e38f172e70bc77d SHA512 776ae5ac9669743a5efddf1badf2774514f1aa936d2bbc2fa9ed7d252a2cc426ab063517a10f13e5e0dc6169438aeda7ac6fe50d37eecea61c41ee97f0c7a4d5
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xmille/xmille-2.0-r2.ebuild b/games-board/xmille/xmille-2.0-r3.ebuild
index 7405836d743f..7821de3430bb 100644
--- a/games-board/xmille/xmille-2.0-r2.ebuild
+++ b/games-board/xmille/xmille-2.0-r3.ebuild
@@ -1,10 +1,10 @@
-# 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 toolchain-funcs games
+EAPI=6
+inherit desktop epatch toolchain-funcs
 
-DEB_PATCH_VER="12"
+DEB_PATCH_VER="13"
 DESCRIPTION="Mille Bournes card game"
 HOMEPAGE="http://www.milleborne.info/"
 SRC_URI="mirror://debian/pool/main/x/xmille/${PN}_${PV}.orig.tar.gz
@@ -18,11 +18,13 @@ IUSE=""
 RDEPEND="x11-libs/libXext"
 DEPEND="${RDEPEND}
 	app-text/rman
-	x11-misc/imake"
+	x11-misc/imake
+"
 
-S=${WORKDIR}/${P}.orig
+S="${WORKDIR}/${P}.orig"
 
 src_prepare() {
+	default
 	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_PATCH_VER}.diff
 
 }
@@ -41,8 +43,8 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin xmille
-	dodoc CHANGES README
+	dobin xmille
+	einstalldocs
+	make_desktop_entry "${PN}" "Milles Bournes"
 	newman xmille.man xmille.6
-	prepgamesdirs
 }
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-30 21:33:31 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-30 21:33:31 +0100
commit	2f8db31405fac68eea6f7257d58529243815033b (patch)
tree	54259cc8988a98a10586fc0496b1f3501cd1e2a1 /games-board
parent	a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (diff)