gentoo resync : 02.08.2019

13 files changed, 40 insertions, 304 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 299152a4b690..3de3a4247b64 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/gnuchess/Manifest b/games-board/gnuchess/Manifest
index b391d78c861d..f75da41b8ffb 100644
--- a/games-board/gnuchess/Manifest
+++ b/games-board/gnuchess/Manifest
@@ -1,5 +1,5 @@
 DIST gnuchess-6.2.4.tar.gz 757985 BLAKE2B bbb83a9fe7a7ace155b869deebdb67474d6c23538e7852167e846d5570bcd878634b0b2576f3ee33407913976103c637d3b024a8b81f290325c88c84d573d85c SHA512 53546d3319cd6a7bc70be5cc11c29cf33c71b747de2244a7d8d4aff6b00318ad35ee0e27058b40a265c62ef02c188d2e34cba9bbf439306220796e7332904d42
 DIST gnuchess-6.2.5.tar.gz 782359 BLAKE2B d9ae979023ea6265e89a25223935df3847adfc52d46df2a9fe96700081f613f7817b4add22e3a63aa4e035adea9c1f4856cb1e9b80d751c3ee63818b5924c388 SHA512 f3f65a85eb4c93f6f10c7058bde7ee7f4a48c2f465b24a7cc0d5bcafe4df186b434ce23bf8c032d012efffba39c6c3c60ada484ff22d87114ce2be5dd0da6835
-EBUILD gnuchess-6.2.4.ebuild 440 BLAKE2B 7a2769716516ee2dea1b0a7d7cf76625e244e47e485ea5cceaa7fcf419f4baff99a80fdd8573fe2825990e7c58582acfee1aac6d36d7752e776a157f673d4ad2 SHA512 2de88c8d341b321ca37d0a2d369ce497762de4a79432bb0a53911eea7644ac29edfd0e8081b1c951c807dd3aedfcd03ce89d7e0584b4e0c6c52d7627a791e3f2
+EBUILD gnuchess-6.2.4.ebuild 436 BLAKE2B bd1be6c822b90e0af3b3a6751ef813e9548837da149589a9b30ef6525f60abf5aa7338e24a1abb5fb4f73ad49d03c271016383fd0d34381a39289ad437e818ed SHA512 545ca9057cc22f01ffca401e32db9a1bbe5bb0e89d1712e2a6743a5668a19d44a8bd7925853e5414a871333041dc3005a91d250b3e392ddcbd9039808af7e61c
 EBUILD gnuchess-6.2.5.ebuild 443 BLAKE2B 8cfd191557073ef39505219bde801f90d28f6ff785a44446d5aa68f0d6365ca35773d2194dfb0240f6b0c04725a1c39f23d3142f7219c7b9656b2feb1e6e808d SHA512 40bcb82fa16ed49715eb105e2351822bf69b18aaedc05ef3b1efed3cdca534788304373eb5f54349132eed2fa26c566e81592b1a974e8b5231de1c29e9d71bae
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnuchess/gnuchess-6.2.4.ebuild b/games-board/gnuchess/gnuchess-6.2.4.ebuild
index 739454eaf6e1..09272e6f0341 100644
--- a/games-board/gnuchess/gnuchess-6.2.4.ebuild
+++ b/games-board/gnuchess/gnuchess-6.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Console based chess interface"
 HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
 SRC_URI="mirror://gnu/chess/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
diff --git a/games-board/gnugo/Manifest b/games-board/gnugo/Manifest
index 0309209c9cc5..ee0822387eb5 100644
--- a/games-board/gnugo/Manifest
+++ b/games-board/gnugo/Manifest
@@ -2,5 +2,5 @@ AUX gnugo-3.9.1-format-security.patch 1943 BLAKE2B 2dd1c6f7b69da62baac53336e1b01
 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 632 BLAKE2B b66eddd2cd01c1c43eb4a3a357a39c5bc70636ed30fd8df32350ed7e341675519c819256844d328b84d06ed1db574e8f296f841cb8bbf17510d26eca302f81e0 SHA512 1aafe04206a41f12fea4ba3890a209948061fd48e79e45d5df504b7c7d34cdeeb1acd5279ec1ecf363f1da887c7183a0dba0461a11fc38d0b0e48f58e79249c1
+EBUILD gnugo-3.9.1-r2.ebuild 631 BLAKE2B c3d6006c4c0d1204237e44e81665b7cb9d8255f0e51a883ce78474eef683c4e4b208af7167c170164eebac16f15c7572b031681932cf1b5d2c0ac5dae362508c SHA512 2822f4e6e0c11a8bbd1d8b8c0c23bb500f874ba5d23671222deae93174e1b8b5e1e422beee4d18f164333193898a9ba35e7cb6973e4b6c4cadb10943ea1d9e51
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnugo/gnugo-3.9.1-r2.ebuild b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
index 6f8ab8e92916..cfcbcca0fbbb 100644
--- a/games-board/gnugo/gnugo-3.9.1-r2.ebuild
+++ b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="readline"
 
 RDEPEND="
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index 437be69959eb..21fdbf51915b 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -1,14 +1,7 @@
-AUX pysolfc-PIL-imports.patch 1581 BLAKE2B 82e608f9f84c0af4b695378af7f6ffe90602195f8bac980eb702cd4cc31be5051732e1abedd843970ec1ddf0a4b11bdb5e3455a0de1ff9d62f29dfb35a14987c SHA512 d00fb7b579e4010210131f9fe82ed90cb7ad5d39a391529d8d5c29c5f19b813afc429b1d5b8ae8af0eaf3a8082cf4a48723ce21b42522d9b9c8163a46a033aa9
 AUX pysolfc-gentoo.patch 322 BLAKE2B c2fccd5b11942d4cdce148199c6e8b8544502ba7bd95c2bdf230ebf96abc0b9d4e6225e7b1dde92f5eea8820149c10eb4c53e8f95fe82fcec15a480c0efa061a SHA512 963daef445d492a693380466fcfdc7f464947269d8a2b687039f31179c1f4fe5119efd71f83708073373c3ac5174a754075367937f99253d6b443e74e60e93d3
 AUX pysolfc-locales.patch 655 BLAKE2B ce8068858b91eead34f3ff374959d362aef3c1b2e6448016f54a4f69a04ff3c629660460a04af51d09e7451870db0727aa46bb190cd4671f0b81cb57c783c689 SHA512 53f95675c032f6d47957e883c9c5da4807b185fe4daaab663f36fb7044f12eb191cd934b6375534f5fcbc3f45dcd1b003639cf1d5f9d65b90fa5cc0afaae718e
-AUX pysolfc-pillow-6.patch 950 BLAKE2B da24c30a13a3acec5549e0fa5e527f68f4dc2a92994d4d25205dadde8b265706aeb5899b2f7c8c36ff46b77bfd656c9dc02f9dc8581ad32fb68afee66a79b6e5 SHA512 4ac1c1746392eefa03574c4e884445b992870fc153e57f4a32df7192ce89a661a74922ac3f0df7087f97a95242416cc2bef021ece24ac62ba20b3febf1aa1a30
-DIST PySolFC-2.0.tar.bz2 4208776 BLAKE2B 0675de0923c6ee381f58f8abbaef5e27bd6fc85bbee9dcd182026ba7259c25c38282623e0cd35b582e8999754d21b092d6a824499bc890a2c0c89c53679182fd SHA512 ec5a11565bd43e097cf1854fe246b8f92acd74077c0b3b158c999f9dc45966e8f805c60a2cfbd815137d970e0e6409d0ae437b9807bac9c39353657cf596b6fc
+DIST PySolFC-Cardsets--Minimal-2.0.1.tar.xz 1450064 BLAKE2B 629318963ee9bf82f6ab0de03f1b59047b896f7528d0f9f5be973fb550b496b523238b9ef8fcdc034f53b5a7adc4c3b56326e912bb83fcfa7e7ad2f9dec8be6b SHA512 56c9ad3c1f9231c6f3866366d694eb6be6036b1b46c8a1ffbd6f7a243a19ab377d30ee4ccaae34f13e35727357d4168db7d9bc044562ec2d86445fb8aec84e4a
 DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8
-DIST pysolfc-2.2.0.tar.gz 4504375 BLAKE2B ea48910d36b704667654292cd4fc2e62bcf259d9a3677369371ab7aadd387505d5ae658496ad8982e08ca0405b44971bc1e2375e91cd90f84c569f8f26249ff3 SHA512 c6d09803eab8fe7fc2c4203537d75b8db3216dfcbd5cc60be5b89f23544c871a37f7b16d20df7be4b70c6f014d47b8c361e1557ab04cb1008451f41b456d0ad2
-DIST pysolfc-2.4.0.tar.gz 6788273 BLAKE2B c852ec9912aabc37317f92941fea2c0fb7230467d188ac3a0a8a78b4a4e243bfac8b3d1ddbb03dde136d7518d03cf3fb02b48386e35218ce5891b54049e9c981 SHA512 177edf60797346b763c9da9daf73feae5fb3ef88529227a60e98b68eb6120289cd0cd76b8ca5925b0452cf43298b12acbb16a53872c892d56b71cbcf0fe93e03
-DIST pysolfc-2.6.2.tar.gz 6791741 BLAKE2B 473105f04bfb2fb174d3b50de5a7a55d586756a75e37eb36a9ff688a5a4b148ee940467b18fa4710f828d461d9156163c8fc9cd323b1562da18f0eb02e096916 SHA512 37b4f5f5f53c8041e7b908719456ad3c26401744389ffd44f445402d653b515c44e02ba55950e24d6a3aa2fc2bf914f8575f630335fe1b52c698154b47fb5717
-EBUILD pysolfc-2.0-r5.ebuild 1447 BLAKE2B 52dbd8f9be1d8946d5b8722ffef214a3f8ba6d15cb4f078be36164f120de1c47f883db8fc55c13526576e8aaafa22b1ab43b1aa1e0c2c1a3d53092be66bad6e4 SHA512 05f48c1db7ea2a2ab19bf30a9cac66289d95af96586d75d481e369391a83f809bd3d008aa9729c1800bbb51a829599b5d6de6d7be543b2c1ed1305a7d7cfd6b5
-EBUILD pysolfc-2.2.0.ebuild 1815 BLAKE2B 77f72a385ad1b7afed250236ede43d92c28af7556b9d7800c0de09accc3ee265df4557bf7202b01571e25dacd58a6be49a8afc0f8b9df7a88aaa41adb49fee8c SHA512 518766c0fcc0cccf849046c8d312cbfcf795d2ae2945838e23c00d553bf8d0c10c4d824c8d7354e35cb3b88859a6e0dc78af55514de92f60d43a617493db1479
-EBUILD pysolfc-2.4.0-r1.ebuild 1825 BLAKE2B a7488487632615898cda6ee8d460414d4e33d24e6e13562ae7054200a3e04e0b58fe49903364edd6002885bf0e9309ca50524b82226023a13f0fd942d0a1f672 SHA512 be5383e7444a0eb60fe3a07877ea171c4037a0173fcc9f0eddcbce9caa730089434d42673831154f1f732870abf48561b532a300237796dc71eea204dc25bd9f
-EBUILD pysolfc-2.6.2.ebuild 1861 BLAKE2B 102ac9c8eb851dbe5dbde6628c4e840106bc73b560e0ccad74a454cba6e76f2fafbcaa049e5e5cbd63784786b4ec63461f147b71226a93a1a1fee775699ffd8c SHA512 87c4a6f4d8408a0cfb5c479779d12938f5624d99c6e99fc3543ff44a6b3423dfc7f65b02e17d1fb0635a94caf49ff6441e6a411ac741e141e93fcc63fa964085
-MISC metadata.xml 505 BLAKE2B 2ece0bd1f9e531449fc33b4515e89959270d74d6bbf9354a9405ea08cc6c163080a4406c92dd7d158faff445e6d0efd08c48ac52959c3fcc68055560bcf62fc3 SHA512 e7bb917b63c06fd17dd5e863e354ae147bd5aa7ef3f360ec848b3ea20087a092d8b7450cfd7ce1a615a6414d6d618f32b60f299cb5a50f0e852205c3fcf4d136
+DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127 SHA512 da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906
+EBUILD pysolfc-2.6.4.ebuild 2098 BLAKE2B cf2e3741714b5fd91dba5908434e5a685147a92afaf1f33a056ef159d58ce1cdf7354789cd14d44982d46640aae97ab16ec8f603ffa1be363537d1d253b08dc1 SHA512 cd13fdd39f5b6fc23ff73d9e9f5494ad4927758ee96f803a79e7c226057de18a00c10d63f0c500ef2644b6e842fe8978316c706609b7eceac89eb14a717b9fe6
+MISC metadata.xml 562 BLAKE2B 1c818819cff77a23b88ca9ba0e67dab5a1ec9e388f68bd125acc0514306df05d76f2e9137aad414aebe2ed91b2632d04ca9f71435545846099c90a5c42e14ad5 SHA512 e3c7ecd4c54a21b46ee4ce4abc994fd5b8b486e4d5924755c0817fb0a29784a2fb36a10ed7aa36d4d5fa2c6518187702d879efc305a17c7699e8fe99bb09d107
diff --git a/games-board/pysolfc/files/pysolfc-PIL-imports.patch b/games-board/pysolfc/files/pysolfc-PIL-imports.patch
deleted file mode 100644
index 64d9980a881b..000000000000
--- a/games-board/pysolfc/files/pysolfc-PIL-imports.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://sourceforge.net/p/pysolfc/patches/10/
-https://bugs.gentoo.org/show_bug.cgi?id=471514
-
-Index: pysollib/mfxutil.py
-===================================================================
-diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py
---- a/pysollib/mfxutil.py	(revision 279)
-+++ b/pysollib/mfxutil.py	(working copy)
-@@ -41,18 +41,18 @@
- Image = ImageTk = ImageOps = None
- if TOOLKIT == 'tk':
-     try: # PIL
--        import Image
--        import ImageTk
--        import ImageOps
-+        from PIL import Image
-+        from PIL import ImageTk
-+        from PIL import ImageOps
-     except ImportError:
-         Image = None
-     else:
-         # for py2exe
--        import GifImagePlugin
--        import PngImagePlugin
--        import JpegImagePlugin
--        import BmpImagePlugin
--        import PpmImagePlugin
-+        from PIL import GifImagePlugin
-+        from PIL import PngImagePlugin
-+        from PIL import JpegImagePlugin
-+        from PIL import BmpImagePlugin
-+        from PIL import PpmImagePlugin
-         Image._initialized = 2
- USE_PIL = False
- if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7':
-Index: scripts/cardset_viewer.py
-===================================================================
-diff --git a/scripts/cardset_viewer.py b/scripts/cardset_viewer.py
---- a/scripts/cardset_viewer.py	(revision 279)
-+++ b/scripts/cardset_viewer.py	(working copy)
-@@ -7,7 +7,7 @@
- from math import sqrt, sin, cos, pi
- from Tkinter import *
- try:
--    import Image, ImageTk
-+    from PIL import Image, ImageTk
- except ImportError:
-     Image = None
- 
diff --git a/games-board/pysolfc/files/pysolfc-pillow-6.patch b/games-board/pysolfc/files/pysolfc-pillow-6.patch
deleted file mode 100644
index 4682ed34683a..000000000000
--- a/games-board/pysolfc/files/pysolfc-pillow-6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -U2 -r PySolFC-pysolfc-2.6.2.orig/pysollib/mfxutil.py PySolFC-pysolfc-2.6.2/pysollib/mfxutil.py
---- PySolFC-pysolfc-2.6.2.orig/pysollib/mfxutil.py	2019-02-27 21:52:26.000000000 +0100
-+++ PySolFC-pysolfc-2.6.2/pysollib/mfxutil.py	2019-04-03 14:09:51.059349643 +0200
-@@ -52,5 +52,5 @@
-         Image._initialized = 2
- USE_PIL = False
--if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7':
-+if TOOLKIT == 'tk' and Image:
-     USE_PIL = True
- 
-diff -U2 -r PySolFC-pysolfc-2.6.2.orig/pysollib/ui/tktile/tkutil.py PySolFC-pysolfc-2.6.2/pysollib/ui/tktile/tkutil.py
---- PySolFC-pysolfc-2.6.2.orig/pysollib/ui/tktile/tkutil.py	2019-02-27 21:52:26.000000000 +0100
-+++ PySolFC-pysolfc-2.6.2/pysollib/ui/tktile/tkutil.py	2019-04-03 14:19:22.450363811 +0200
-@@ -354,5 +354,5 @@
-         return None
-     im = image._pil_image
--    if Image.VERSION >= '1.1.7':
-+    if True:
-         # use an alpha image
-         sh = Image.new('RGBA', im.size, color)
diff --git a/games-board/pysolfc/metadata.xml b/games-board/pysolfc/metadata.xml
index 7cc738da552f..40a685cd1155 100644
--- a/games-board/pysolfc/metadata.xml
+++ b/games-board/pysolfc/metadata.xml
@@ -10,6 +10,7 @@
     <flag name="sound">Enable sound support using <pkg>dev-python/pygame</pkg></flag>
   </use>
   <upstream>
+    <remote-id type="github">shlomif/PySolFC</remote-id>
     <remote-id type="sourceforge">pysolfc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/games-board/pysolfc/pysolfc-2.0-r5.ebuild b/games-board/pysolfc/pysolfc-2.0-r5.ebuild
deleted file mode 100644
index b98ccfee931b..000000000000
--- a/games-board/pysolfc/pysolfc-2.0-r5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-DISTUTILS_SINGLE_IMPL="1"
-
-inherit eutils distutils-r1
-
-MY_PN=PySolFC
-SOL_URI="mirror://sourceforge/${PN}"
-
-DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
-HOMEPAGE="http://pysolfc.sourceforge.net/"
-SRC_URI="${SOL_URI}/${MY_PN}-${PV}.tar.bz2
-	extra-cardsets? ( ${SOL_URI}/${MY_PN}-Cardsets-${PV}.tar.bz2 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="extra-cardsets minimal +sound"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DEPEND=""
-RDEPEND="${RDEPEND}
-	!minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
-		dev-tcltk/tktable )
-	sound? ( dev-python/pygame[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-PIL-imports.patch" #471514
-	"${FILESDIR}/${PN}-gentoo.patch" #591904
-)
-
-python_prepare_all() {
-	sed -i \
-		-e "/pysol.desktop/d" \
-		-e "s:share/icons:share/pixmaps:" \
-		-e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \
-		setup.py || die
-
-	mv docs/README{,.txt} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
-
-	if use extra-cardsets; then
-		insinto /usr/share/${PN}
-		doins -r "${WORKDIR}"/${MY_PN}-Cardsets-${PV}/*
-	fi
-
-	doman docs/*.6
-
-	DOCS=( README AUTHORS docs/README.txt docs/README.SOURCE )
-	HTML_DOCS=( docs/*html )
-
-	distutils-r1_python_install_all
-}
diff --git a/games-board/pysolfc/pysolfc-2.2.0.ebuild b/games-board/pysolfc/pysolfc-2.2.0.ebuild
deleted file mode 100644
index 874ce3fcf38b..000000000000
--- a/games-board/pysolfc/pysolfc-2.2.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="tk"
-
-inherit eutils distutils-r1
-
-MY_PN=PySolFC
-
-DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
-HOMEPAGE="http://pysolfc.sourceforge.net/"
-SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
-	extra-cardsets? ( mirror://sourceforge/${PN}/archive/${P}/${MY_PN}-Cardsets-2.0.tar.bz2 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="extra-cardsets minimal +sound"
-
-S=${WORKDIR}/${MY_PN}-${P}
-
-DEPEND=""
-RDEPEND="${RDEPEND}
-	python_targets_python3_5? ( dev-python/random2[python_targets_python3_5] )
-	python_targets_python3_6? ( dev-python/random2[python_targets_python3_6] )
-	!minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
-		dev-tcltk/tktable )
-	sound? ( dev-python/pygame[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-gentoo.patch" #591904
-	"${FILESDIR}/${PN}-locales.patch"
-)
-
-python_prepare_all() {
-	sed -i \
-		-e "/pysol.desktop/d" \
-		-e "s:share/icons:share/pixmaps:" \
-		-e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \
-		setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	pushd html-src > /dev/null || die "html-src not found"
-	PYTHONPATH=.. "${EPYTHON}" gen-html.py || die "gen-html failed"
-	mv images html/ || die "mv images failed"
-	popd > /dev/null
-}
-
-python_install_all() {
-	make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
-
-	if use extra-cardsets; then
-		insinto /usr/share/${PN}
-		doins -r "${WORKDIR}"/${MY_PN}-Cardsets-2.0/*
-	fi
-
-	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/html
-
-	doman docs/*.6
-	DOCS=( README.md AUTHORS docs/README docs/README.SOURCE )
-	HTML_DOCS=( html-src/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/games-board/pysolfc/pysolfc-2.4.0-r1.ebuild b/games-board/pysolfc/pysolfc-2.4.0-r1.ebuild
deleted file mode 100644
index af1ee2777085..000000000000
--- a/games-board/pysolfc/pysolfc-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="tk"
-
-inherit eutils distutils-r1
-
-MY_PN=PySolFC
-
-DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
-HOMEPAGE="http://pysolfc.sourceforge.net/"
-SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
-	extra-cardsets? ( mirror://sourceforge/${PN}/archive/${P}/${MY_PN}-Cardsets-2.0.tar.bz2 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="extra-cardsets minimal +sound"
-
-S=${WORKDIR}/${MY_PN}-${P}
-
-DEPEND="dev-python/six"
-RDEPEND="${DEPEND}
-	python_targets_python3_5? ( dev-python/random2[python_targets_python3_5] )
-	python_targets_python3_6? ( dev-python/random2[python_targets_python3_6] )
-	!minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
-		dev-tcltk/tktable )
-	sound? ( dev-python/pygame[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-gentoo.patch" #591904
-	"${FILESDIR}/${PN}-locales.patch"
-)
-
-python_prepare_all() {
-	sed -i \
-		-e "/pysol.desktop/d" \
-		-e "s:share/icons:share/pixmaps:" \
-		-e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \
-		setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	pushd html-src > /dev/null || die "html-src not found"
-	PYTHONPATH=.. "${EPYTHON}" gen-html.py || die "gen-html failed"
-	mv images html/ || die "mv images failed"
-	popd > /dev/null
-}
-
-python_install_all() {
-	make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
-
-	if use extra-cardsets; then
-		insinto /usr/share/${PN}
-		doins -r "${WORKDIR}"/${MY_PN}-Cardsets-2.0/*
-	fi
-
-	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/html
-
-	doman docs/*.6
-	DOCS=( README.md AUTHORS docs/README docs/README.SOURCE )
-	HTML_DOCS=( html-src/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/games-board/pysolfc/pysolfc-2.6.2.ebuild b/games-board/pysolfc/pysolfc-2.6.4.ebuild
index 04193353ffbf..bc63361710f4 100644
--- a/games-board/pysolfc/pysolfc-2.6.2.ebuild
+++ b/games-board/pysolfc/pysolfc-2.6.4.ebuild
@@ -1,39 +1,47 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_REQ_USE="tk"
 
-inherit eutils distutils-r1
+inherit distutils-r1 desktop
 
 MY_PN=PySolFC
+CARD_BASE="${MY_PN}-Cardsets"
+CARD_BASEV="${CARD_BASE}-2.0"
+CARD_BASE_MINV="${CARD_BASE}--Minimal-2.0.1"
+SF_CARD_BASE="mirror://sourceforge/${PN}/${CARD_BASE}"
 
 DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
-HOMEPAGE="http://pysolfc.sourceforge.net/"
+HOMEPAGE="https://pysolfc.sourceforge.net/"
 SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
-	extra-cardsets? ( mirror://sourceforge/${PN}/archive/${P}/${MY_PN}-Cardsets-2.0.tar.bz2 )"
+	extra-cardsets? ( ${SF_CARD_BASE}/${CARD_BASEV}/${CARD_BASEV}.tar.bz2 )
+	!extra-cardsets? ( ${SF_CARD_BASE}/minimal/${CARD_BASE_MINV}.tar.xz )"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="extra-cardsets minimal +sound"
 
-S=${WORKDIR}/${MY_PN}-${P}
+S="${WORKDIR}/${MY_PN}-${P}"
 
-DEPEND="dev-python/six"
-RDEPEND="${DEPEND}
-	python_targets_python3_5? ( dev-python/random2[python_targets_python3_5] )
-	python_targets_python3_6? ( dev-python/random2[python_targets_python3_6] )
-	!minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
-		dev-tcltk/tktable )
-	sound? ( dev-python/pygame[${PYTHON_USEDEP}] )"
+RDEPEND="
+	dev-python/random2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!minimal? (
+		dev-python/pillow[tk,${PYTHON_USEDEP}]
+		dev-tcltk/tktable
+	)
+	sound? (
+		dev-python/pygame[${PYTHON_USEDEP}]
+	)"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-gentoo.patch" #591904
 	"${FILESDIR}/${PN}-locales.patch"
-	"${FILESDIR}/${PN}-pillow-6.patch"
 )
 
 python_prepare_all() {
@@ -58,13 +66,18 @@ python_install_all() {
 
 	if use extra-cardsets; then
 		insinto /usr/share/${PN}
-		doins -r "${WORKDIR}"/${MY_PN}-Cardsets-2.0/*
+		doins -r "${WORKDIR}"/"${CARD_BASEV}"/*
+	else
+		# upstream bug #89
+		# repo does not contain minimal cardsets in archive
+		insinto /usr/share/${PN}
+		doins -r "${WORKDIR}"/"${CARD_BASE_MINV}"/*
 	fi
 
-	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/html
+	dosym ../doc/${PF}/html /usr/share/${PN}/html
 
 	doman docs/*.6
-	DOCS=( README.md AUTHORS docs/README docs/README.SOURCE )
+	DOCS=( README.md AUTHORS.md docs/README docs/README.SOURCE )
 	HTML_DOCS=( html-src/html/. )
 	distutils-r1_python_install_all
 }