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

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

commit:     880ebfb838e80e30ed6e6fcb9b38746ad027bd74
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 18:46:59 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 20:00:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=880ebfb8

games-board/freedoko: tidy ebuild

Just a bit of extra sorting out for now, this package
needs more attention and a version bump.

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

 games-board/freedoko/freedoko-0.7.16-r1.ebuild | 60 ++++++++++++++------------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/games-board/freedoko/freedoko-0.7.16-r1.ebuild b/games-board/freedoko/freedoko-0.7.16-r1.ebuild
index 3b960d8b53e..0a9f423066a 100644
--- a/games-board/freedoko/freedoko-0.7.16-r1.ebuild
+++ b/games-board/freedoko/freedoko-0.7.16-r1.ebuild
@@ -3,54 +3,62 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic toolchain-funcs xdg
+inherit desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="FreeDoko is a Doppelkopf-game"
 HOMEPAGE="http://free-doko.sourceforge.net"
-SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
+SRC_URI="
+	mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
 	backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> ${PN}-backgrounds.zip )
-	kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip )
-	xskatcards? ( mirror://sourceforge/free-doko/xskat.zip )
-	pysolcards? ( mirror://sourceforge/free-doko/pysol.zip )
 	gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip )
+	kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip )
 	openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip )
+	pysolcards? ( mirror://sourceforge/free-doko/pysol.zip )
+	xskatcards? ( mirror://sourceforge/free-doko/xskat.zip )
 	!xskatcards? (
 		!kdecards? (
 			!gnomecards? (
 				!openclipartcards? (
 					!pysolcards? (
 						mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )"
+S="${WORKDIR}/FreeDoko_${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds"
+IUSE="+backgrounds +gnomecards +kdecards +openclipartcards +pysolcards +xskatcards"
 
-RDEPEND="dev-cpp/gtkmm:3.0
+RDEPEND="
+	dev-cpp/gtkmm:3.0
 	media-libs/openal"
 DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
+BDEPEND="
+	app-arch/unzip
 	virtual/pkgconfig"
 
-S="${WORKDIR}/FreeDoko_${PV}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.16-gentoo.patch
+)
 
 src_unpack() {
-	local cards=0
+	unpack FreeDoko_${PV}.src.zip
 
+	local cards=
 	unpack_cards() {
-		use $1 && { unpack $2 ; cards=$(( $cards + 1 )); };
+		if use $1; then
+			cards=y
+			unpack $2
+		fi
 	}
-	unpack FreeDoko_${PV}.src.zip
-	cp /dev/null "${S}"/src/Makefile.local || die
 
 	cd "${S}"/data/cardsets || die
 
-	unpack_cards xskatcards       xskat.zip
-	unpack_cards kdecards         kdecarddecks.zip
-	unpack_cards pysolcards       pysol.zip
 	unpack_cards gnomecards       gnome-games.zip
+	unpack_cards kdecards         kdecarddecks.zip
 	unpack_cards openclipartcards openclipart.zip
-	[ $cards ] || unpack xskat.zip # fall back to xskat
+	unpack_cards pysolcards       pysol.zip
+	unpack_cards xskatcards       xskat.zip
+	[[ $cards ]] || unpack xskat.zip # fall back to xskat
 
 	if use backgrounds ; then
 		cd "${S}"/data/backgrounds || die
@@ -58,20 +66,18 @@ src_unpack() {
 	fi
 }
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.16-gentoo.patch
-)
-
 src_compile() {
 	tc-export CXX
 	append-cxxflags -std=c++14
-	append-cppflags -DPUBLIC_DATA_DIRECTORY_VALUE="'\"${EPREFIX}/usr/share/${PN}\"'" \
+	append-cppflags \
+		-DPUBLIC_DATA_DIRECTORY_VALUE="'\"${EPREFIX}/usr/share/${PN}\"'" \
 		-DMANUAL_DIRECTORY_VALUE="'\"${EPREFIX}/usr/share/doc/${PF}/html\"'"
+	touch src/Makefile.local || die # needed for above paths to be used
 
-	export VARTEXFONTS="${T}/fonts" #652028
 	export OSTYPE=Linux
 	export USE_NETWORK=false
 	export USE_SOUND_ALUT=false # still marked experimental
+	export VARTEXFONTS="${T}/fonts" #652028
 
 	emake Version
 	emake -C src FreeDoko LIBS="${LDFLAGS}"
@@ -80,13 +86,13 @@ src_compile() {
 src_install() {
 	newbin src/FreeDoko freedoko
 
-	insinto /usr/share/${PN}/
-	doins -r data/{backgrounds,cardsets,iconsets,rules,sounds,translations,*png}
+	insinto /usr/share/${PN}
+	doins -r data/{backgrounds,cardsets,iconsets,rules,sounds,translations,*.png}
 
-	newicon -s 32 src/FreeDoko.png ${PN}.png
+	newicon src/icon.png ${PN}.png
 	make_desktop_entry ${PN} FreeDoko
 
 	einstalldocs
 
-	find "${ED}/usr/share/${PN}" -name Makefile -delete || die
+	find "${ED}"/usr/share/${PN} -name Makefile -delete || die
 }