gentoo resync : 30.04.2018

3 files changed, 20 insertions, 29 deletions

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() {