[gentoo-commits] repo/gentoo:master commit in: games-board/pysolfc/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     b8adc4e883b4d8e0bd5d53235f4369b9430161cd
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 30 08:58:55 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Aug 30 09:03:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8adc4e8

games-board/pysolfc: remove optional music pack

Included it for completeness but was a bit torn on how to handle it
given essentially an optfeature, and believe most users don't want
this (nor want to enable mod on sdl2-mixer). It probably makes more
sense to let users put music in their $HOME dir if they want it.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-board/pysolfc/Manifest                                |  1 -
 .../{pysolfc-2.12.0.ebuild => pysolfc-2.12.0-r1.ebuild}     | 13 ++-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index 9e23433799f..110a3b08ce5 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -3,5 +3,4 @@ DIST PySolFC-Cardsets--Minimal-2.0.1.tar.xz 1450064 BLAKE2B 629318963ee9bf82f6ab
 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 pysol-music-4.50.tar.xz 2144764 BLAKE2B ce6203441efa4525633b22b289be1d20aaa3107baf2127f96a46df19ba43d4ddbe62ccb6e68488d9845de91678aed0b87d93524b97615def63940b738a32d005 SHA512 ef281db180d28ccdeada3124d8a2451011fceedacd7cde8bb29305953438081839cb9ec48f51cb44f2bebf7828e940d79993fd026844983cf270ba1d7c839a85
 DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127 SHA512 da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906

diff --git a/games-board/pysolfc/pysolfc-2.12.0.ebuild b/games-board/pysolfc/pysolfc-2.12.0-r1.ebuild
similarity index 84%
rename from games-board/pysolfc/pysolfc-2.12.0.ebuild
rename to games-board/pysolfc/pysolfc-2.12.0-r1.ebuild
index c234eda859a..62b6a5112a1 100644
--- a/games-board/pysolfc/pysolfc-2.12.0.ebuild
+++ b/games-board/pysolfc/pysolfc-2.12.0-r1.ebuild
@@ -19,8 +19,7 @@ DESCRIPTION="Exciting collection of more than 1000 solitaire card games"
 HOMEPAGE="https://pysolfc.sourceforge.io/"
 SRC_URI="mirror://sourceforge/pysolfc/${MY_P}.tar.xz
 	extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_P}.tar.bz2 )
-	!extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_MIN_P}.tar.xz )
-	sound? ( mirror://sourceforge/pysolfc/${PS_MUSIC_P}.tar.xz )"
+	!extra-cardsets? ( mirror://sourceforge/pysolfc/${PS_CARD_MIN_P}.tar.xz )"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+ GPL-2+"
@@ -39,10 +38,7 @@ RDEPEND="
 			dev-python/pillow[jpeg,tk,${PYTHON_USEDEP}]
 			dev-tcltk/tktable
 		)
-		sound? (
-			dev-python/pygame[${PYTHON_USEDEP}]
-			media-libs/sdl2-mixer[mod]
-		)
+		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
 	')"
 
 distutils_enable_tests unittest
@@ -56,11 +52,6 @@ python_install_all() {
 	insinto /usr/share/${MY_PN}
 	doins -r ../$(usex extra-cardsets ${PS_CARD_P} ${PS_CARD_MIN_P})/.
 
-	if use sound; then
-		insinto /usr/share/${MY_PN}/music
-		doins ../${PS_MUSIC_P}/data/music/*.{it,mod,s3m}
-	fi
-
 	# html files are used at runtime, keep at default location
 	dosym -r /usr/share/{${MY_PN},doc/${PF}}/html
 }