[PR PATCH] pysolfc{,-cardsets}: clean up.

[PR PATCH] pysolfc{,-cardsets}: clean up.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]

There is a new pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages pysolfc-cleanup
https://github.com/void-linux/void-packages/pull/42664

pysolfc{,-cardsets}: clean up.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42664.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pysolfc-cleanup-42664.patch --]
[-- Type: text/x-diff, Size: 2512 bytes --]

From 6287c42ff60079d296c41542c3f66737cc6b481b Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 8 Mar 2023 20:46:00 +0000
Subject: [PATCH 1/2] pysolfc: clean up.

---
 srcpkgs/pysolfc/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pysolfc/template b/srcpkgs/pysolfc/template
index 4c673510bdcf..9e03af776794 100644
--- a/srcpkgs/pysolfc/template
+++ b/srcpkgs/pysolfc/template
@@ -3,14 +3,16 @@ pkgname=pysolfc
 version=2.20.0
 revision=1
 build_style=python3-module
-hostmakedepends="gettext python3-pygame python3-random2 python3-six
- python3-tkinter python3-Pillow python3-attrs python3-pysol_cards"
-depends="pysolfc-cardsets ${hostmakedepends} python3-configobj"
+hostmakedepends="gettext python3-setuptools"
+depends="pysolfc-cardsets python3-pygame python3-random2 python3-six
+ python3-tkinter python3-Pillow python3-attrs python3-pysol_cards
+ python3-configobj"
+checkdepends="${depends}"
 short_desc="Python solitaire game collection"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
-homepage="http://pysolfc.sourceforge.net/"
-distfiles="https://github.com/shlomif/PySolFC/archive/${pkgname}-${version}.tar.gz"
+homepage="https://pysolfc.sourceforge.io/"
+distfiles="https://github.com/shlomif/PySolFC/archive/pysolfc-${version}.tar.gz"
 checksum=530c7b4f6350293c7fa8efbadc80d4a8643a3d66fe513693396308640abbe14d
 
 post_build() {

From bf0edc068e8466efacec997720b81974fbd09766 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 8 Mar 2023 20:46:31 +0000
Subject: [PATCH 2/2] pysolfc-cardsets: clean up.

---
 srcpkgs/pysolfc-cardsets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pysolfc-cardsets/template b/srcpkgs/pysolfc-cardsets/template
index d038d7cb3c67..cb84224adcfd 100644
--- a/srcpkgs/pysolfc-cardsets/template
+++ b/srcpkgs/pysolfc-cardsets/template
@@ -6,8 +6,8 @@ short_desc="PySolFC Cardsets"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 # pysolfc's license
 license="GPL-3.0-or-later"
-homepage="http://pysolfc.sourceforge.net/"
-distfiles="$SOURCEFORGE_SITE/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-${version}/PySolFC-Cardsets-${version}.tar.bz2"
+homepage="https://pysolfc.sourceforge.io/"
+distfiles="${SOURCEFORGE_SITE}/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-${version}/PySolFC-Cardsets-${version}.tar.bz2"
 checksum=53be2038cf201403a65266bf4b9ad8e3b8192bb253aba6af36964a71ea6f7755
 
 do_install() {

Re: [PR PATCH] [Updated] pysolfc{,-cardsets}: clean up.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages pysolfc-cleanup
https://github.com/void-linux/void-packages/pull/42664

pysolfc{,-cardsets}: clean up.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/42664.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pysolfc-cleanup-42664.patch --]
[-- Type: text/x-diff, Size: 2459 bytes --]

From 9c002cd9e1b8085c3ad675b376a0777e5f01b7e8 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 8 Mar 2023 20:46:00 +0000
Subject: [PATCH 1/2] pysolfc: clean up.

---
 srcpkgs/pysolfc/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/pysolfc/template b/srcpkgs/pysolfc/template
index 4c673510bdcf..e356e023c254 100644
--- a/srcpkgs/pysolfc/template
+++ b/srcpkgs/pysolfc/template
@@ -6,21 +6,18 @@ build_style=python3-module
 hostmakedepends="gettext python3-pygame python3-random2 python3-six
  python3-tkinter python3-Pillow python3-attrs python3-pysol_cards"
 depends="pysolfc-cardsets ${hostmakedepends} python3-configobj"
+checkdepends="python3-pytest"
 short_desc="Python solitaire game collection"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
-homepage="http://pysolfc.sourceforge.net/"
-distfiles="https://github.com/shlomif/PySolFC/archive/${pkgname}-${version}.tar.gz"
+homepage="https://pysolfc.sourceforge.io/"
+distfiles="https://github.com/shlomif/PySolFC/archive/pysolfc-${version}.tar.gz"
 checksum=530c7b4f6350293c7fa8efbadc80d4a8643a3d66fe513693396308640abbe14d
 
 post_build() {
 	make mo rules
 }
 
-do_check() {
-	python -m unittest -v
-}
-
 post_install() {
 	mv ${DESTDIR}/usr/bin/pysol{.py,}
 	sed -i "s|pysol.py|pysol|g" ${DESTDIR}/usr/share/applications/pysol.desktop

From 45981477708534358fd704425ced6c600185dd0b Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Wed, 8 Mar 2023 20:46:31 +0000
Subject: [PATCH 2/2] pysolfc-cardsets: clean up.

---
 srcpkgs/pysolfc-cardsets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pysolfc-cardsets/template b/srcpkgs/pysolfc-cardsets/template
index d038d7cb3c67..cb84224adcfd 100644
--- a/srcpkgs/pysolfc-cardsets/template
+++ b/srcpkgs/pysolfc-cardsets/template
@@ -6,8 +6,8 @@ short_desc="PySolFC Cardsets"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 # pysolfc's license
 license="GPL-3.0-or-later"
-homepage="http://pysolfc.sourceforge.net/"
-distfiles="$SOURCEFORGE_SITE/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-${version}/PySolFC-Cardsets-${version}.tar.bz2"
+homepage="https://pysolfc.sourceforge.io/"
+distfiles="${SOURCEFORGE_SITE}/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-${version}/PySolFC-Cardsets-${version}.tar.bz2"
 checksum=53be2038cf201403a65266bf4b9ad8e3b8192bb253aba6af36964a71ea6f7755
 
 do_install() {

Re: [PR PATCH] [Merged]: pysolfc{,-cardsets}: clean up.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1073 bytes --]

There's a merged pull request on the void-packages repository

pysolfc{,-cardsets}: clean up.
https://github.com/void-linux/void-packages/pull/42664

Description:

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->