From 2a0eaa29b442c711d3a666375188713f8ac2c969 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 29 Jul 2019 23:23:18 +0100 Subject: games-board/pysolfc: Drop all old versions Closes: https://bugs.gentoo.org/585124 Closes: https://bugs.gentoo.org/656194 Closes: https://bugs.gentoo.org/666670 Closes: https://bugs.gentoo.org/670046 Closes: https://bugs.gentoo.org/671836 Package-Manager: Portage-2.3.69, Repoman-2.3.13 Signed-off-by: James Le Cuirot --- games-board/pysolfc/Manifest | 4 -- .../pysolfc/files/pysolfc-PIL-imports.patch | 49 --------------- games-board/pysolfc/files/pysolfc-pillow-6.patch | 20 ------- games-board/pysolfc/pysolfc-2.0-r5.ebuild | 64 -------------------- games-board/pysolfc/pysolfc-2.2.0.ebuild | 69 --------------------- games-board/pysolfc/pysolfc-2.4.0-r1.ebuild | 69 --------------------- games-board/pysolfc/pysolfc-2.6.2.ebuild | 70 ---------------------- 7 files changed, 345 deletions(-) delete mode 100644 games-board/pysolfc/files/pysolfc-PIL-imports.patch delete mode 100644 games-board/pysolfc/files/pysolfc-pillow-6.patch delete mode 100644 games-board/pysolfc/pysolfc-2.0-r5.ebuild delete mode 100644 games-board/pysolfc/pysolfc-2.2.0.ebuild delete mode 100644 games-board/pysolfc/pysolfc-2.4.0-r1.ebuild delete mode 100644 games-board/pysolfc/pysolfc-2.6.2.ebuild (limited to 'games-board/pysolfc') diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest index fddaf75fe519..f3084ac40b3d 100644 --- a/games-board/pysolfc/Manifest +++ b/games-board/pysolfc/Manifest @@ -1,7 +1,3 @@ -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 DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127 SHA512 da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906 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/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.2.ebuild deleted file mode 100644 index 04193353ffbf..000000000000 --- a/games-board/pysolfc/pysolfc-2.6.2.ebuild +++ /dev/null @@ -1,70 +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" - "${FILESDIR}/${PN}-pillow-6.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 -} -- cgit v1.2.3-65-gdbad