gentoo resync : 16.09.2021

6 files changed, 2 insertions, 129 deletions

diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index 8dd6cd89963b..f041012ef187 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -1,12 +1,5 @@
-AUX pysolfc-2.6.4-python38.patch 343 BLAKE2B f0530a19cc53baa0f2f5a0a32f4c095c073bec967ffca6aff3185fe147ac8d1b80d5039664eeb111b9a138e144bef7cd8135377fbfb76a8f78bd00ea773244e0 SHA512 1a1362bfc3faa9a4b51ade80004a2931975def8aa6ea63db3a33116c9e3965a2bed110428d29175f1d9245a5438746ce33d04c8d8b13fa0d376a7c204fe12df5
-AUX pysolfc-gentoo.patch 322 BLAKE2B c2fccd5b11942d4cdce148199c6e8b8544502ba7bd95c2bdf230ebf96abc0b9d4e6225e7b1dde92f5eea8820149c10eb4c53e8f95fe82fcec15a480c0efa061a SHA512 963daef445d492a693380466fcfdc7f464947269d8a2b687039f31179c1f4fe5119efd71f83708073373c3ac5174a754075367937f99253d6b443e74e60e93d3
-AUX pysolfc-locales.patch 655 BLAKE2B ce8068858b91eead34f3ff374959d362aef3c1b2e6448016f54a4f69a04ff3c629660460a04af51d09e7451870db0727aa46bb190cd4671f0b81cb57c783c689 SHA512 53f95675c032f6d47957e883c9c5da4807b185fe4daaab663f36fb7044f12eb191cd934b6375534f5fcbc3f45dcd1b003639cf1d5f9d65b90fa5cc0afaae718e
 DIST PySolFC-2.12.0.tar.xz 3816376 BLAKE2B c37388873fcfc665f237ce7cae21d7d263b95f96efea118c6660f2d2fd18b4b5b2e935519b1318ec3f444085ec12dcfb65dc70a43937a9ec3dd7199f59c8edac SHA512 893012e93ca1cba72fac5f9f428c548af3aa59fa094aa9d027ed6740c91b34c5be62972e6522fb89264d1eb0f887234ddb07fa67a765573e105dbc25d885d1c5
-DIST PySolFC-Cardsets--Minimal-2.0.1.tar.xz 1450064 BLAKE2B 629318963ee9bf82f6ab0de03f1b59047b896f7528d0f9f5be973fb550b496b523238b9ef8fcdc034f53b5a7adc4c3b56326e912bb83fcfa7e7ad2f9dec8be6b SHA512 56c9ad3c1f9231c6f3866366d694eb6be6036b1b46c8a1ffbd6f7a243a19ab377d30ee4ccaae34f13e35727357d4168db7d9bc044562ec2d86445fb8aec84e4a
 DIST PySolFC-Cardsets--Minimal-2.0.2.tar.xz 6969096 BLAKE2B 50e87073cf4ab69031e1e4116115ddb1771197da176ac609c09e2f5fab1cc48ccb6f3ba40d7b581f67013835893106f7ab579a2cbc744aad98095944fbd2d5d9 SHA512 5317866d6259b154219ec6efea349af3f9cb0fe9309a895ee55f7be87ebc8c34df12b81a08e1dee907a3f475f4e623c3609fdbd7e357890c2ade418ec5d68cb2
-DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8
 DIST PySolFC-Cardsets-2.1PRE.tar.bz2 34399177 BLAKE2B 12f577e67e858b96e9d76bb3aceafaaf1cb267b1805c91f36a51ae0b92652cc265d675543bc16923b216b125142b36aee858b54c2dc8f2eeccdd0d6c3e435fe7 SHA512 7fb83450fb3579d9a4e3e0ec1404d5da779c3e99d0ceaaad9d35adf599e2d9ef173f9d2bbf272ff08dc3c3e043a5dda78ae054c95c6fad828e80dff4c9011314
-DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127 SHA512 da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906
 EBUILD pysolfc-2.12.0-r1.ebuild 1551 BLAKE2B dfecab426817a0ec941c512131d07de884c2b7cf7970fe1df385238d777d58a2afb2cf26f30d4af1d25b62b6f8e282be3144bc6ce7d5918d4123752df29701f6 SHA512 aa556e0505336b4fda24ae09accc55b31bb04796f08469680c33e8ff9e21ef8f902ab7589c6618d56abdaa894118fa0d52ed8d410ed6ec17c878ee83b55b05ef
-EBUILD pysolfc-2.6.4-r1.ebuild 2169 BLAKE2B 581be072c6f3d141478a972dd15d4a81321abad8eb7d817dfbc8975f8e57c6570efcddeff45e56f4bbf13076be7ad360a92f0c567a905fbc39441af9d275c01d SHA512 afcbaa4a60df2d7b3cbb3bb32564383d05d1bd8a4064ca1ed3151cd5db822c3eedc42aad37dec8aaab825ccd94c1342033b5454830412f918f4863e8eebd5992
-MISC metadata.xml 562 BLAKE2B 1c818819cff77a23b88ca9ba0e67dab5a1ec9e388f68bd125acc0514306df05d76f2e9137aad414aebe2ed91b2632d04ca9f71435545846099c90a5c42e14ad5 SHA512 e3c7ecd4c54a21b46ee4ce4abc994fd5b8b486e4d5924755c0817fb0a29784a2fb36a10ed7aa36d4d5fa2c6518187702d879efc305a17c7699e8fe99bb09d107
+MISC metadata.xml 563 BLAKE2B 3b59b69697c8e2e34a4dad3f042639eeaf78e93167299d68ee17e7a0efb9417d78efb4d85be54b2dfa9710767abd4f1de5d9579e9f2ece656e39c286149eb5cc SHA512 6f27d71460517af500de23bc137225272c9ea45bf727725f2964a104ba48ac2a5464a930071d85e67ebf4f83b29a3359041ff8b4966b19459ed8e6cd7a24cb3f
diff --git a/games-board/pysolfc/files/pysolfc-2.6.4-python38.patch b/games-board/pysolfc/files/pysolfc-2.6.4-python38.patch
deleted file mode 100644
index 9a857f3b266b..000000000000
--- a/games-board/pysolfc/files/pysolfc-2.6.4-python38.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py
-index f461ed1..c71a61f 100644
---- a/pysollib/mfxutil.py
-+++ b/pysollib/mfxutil.py
-@@ -143,7 +143,7 @@ def getprefdir(package):
- 
- 
- # high resolution clock() and sleep()
--uclock = time.clock
-+uclock = time.process_time
- usleep = time.sleep
- if os.name == "posix":
-     uclock = time.time
diff --git a/games-board/pysolfc/files/pysolfc-gentoo.patch b/games-board/pysolfc/files/pysolfc-gentoo.patch
deleted file mode 100644
index 07a7b662f320..000000000000
--- a/games-board/pysolfc/files/pysolfc-gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/pysollib/settings.py	2014-04-07 20:05:02.335276008 +0200
-+++ b/pysollib/settings.py	2014-04-07 20:05:33.099062670 +0200
-@@ -63,6 +63,7 @@
-         '/usr/local/share/PySolFC',
-         '/usr/games/PySolFC',
-         '/usr/local/games/PySolFC',
-+        '/usr/share/pysolfc',
-         ]
- if os.name == 'nt':
-     pass
diff --git a/games-board/pysolfc/files/pysolfc-locales.patch b/games-board/pysolfc/files/pysolfc-locales.patch
deleted file mode 100644
index defac9bfba87..000000000000
--- a/games-board/pysolfc/files/pysolfc-locales.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r -U2 PySolFC-pysolfc-2.2.0.orig/setup.py PySolFC-pysolfc-2.2.0/setup.py
---- PySolFC-pysolfc-2.2.0.orig/setup.py	2018-04-16 15:05:24.000000000 +0200
-+++ PySolFC-pysolfc-2.2.0/setup.py	2018-05-19 17:52:08.434768430 +0200
-@@ -45,7 +45,4 @@
-                        ['data/images/misc/pysol01.png',
-                         'data/images/misc/pysol02.png', ]))
--    for l in ('ru', 'ru_RU'):
--        data_files.append(('share/locale/%s/LC_MESSAGES' % l,
--                           ['locale/%s/LC_MESSAGES/pysol.mo' % l]))
-     data_files.append((data_dir, ['data/pysolfc.glade']))
-     data_files.append(('share/applications', ['data/pysol.desktop']))
diff --git a/games-board/pysolfc/metadata.xml b/games-board/pysolfc/metadata.xml
index 40a685cd1155..9b6db17c8fa5 100644
--- a/games-board/pysolfc/metadata.xml
+++ b/games-board/pysolfc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>games@gentoo.org</email>
diff --git a/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild b/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild
deleted file mode 100644
index 442a95d8a337..000000000000
--- a/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_REQ_USE="tk"
-
-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="https://pysolfc.sourceforge.net/"
-SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
-	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}"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		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}/${P}-python38.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}"/"${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 ../doc/${PF}/html /usr/share/${PN}/html
-
-	doman docs/*.6
-	DOCS=( README.md AUTHORS.md docs/README docs/README.SOURCE )
-	HTML_DOCS=( html-src/html/. )
-	distutils-r1_python_install_all
-}