gentoo resync : 17.06.2021

4 files changed, 47 insertions, 150 deletions

diff --git a/games-board/freedoko/Manifest b/games-board/freedoko/Manifest
index bb1e39210658..c1f888b2c0ee 100644
--- a/games-board/freedoko/Manifest
+++ b/games-board/freedoko/Manifest
@@ -6,6 +6,5 @@ DIST kdecarddecks.zip 3370611 BLAKE2B d097bd95545e57250ea7dc034d40577253cf8e78e5
 DIST openclipart.zip 1251509 BLAKE2B 66ac2ada7d96726d4f4f9d016feb088814ff95def9950082c04b0a440d86e80701fcb06ee6e04afc431daf759198957281a971124f591346b66d70be916b50db SHA512 8c5e84d8f8f011cfc84f7d012c97e606f80c2254336518c9b9563315bd63971e7211b762effbb841e74603e0f02bb12ae9e91d1be6a4e23c243691b025874ec2
 DIST pysol.zip 26314316 BLAKE2B f8df3be0b4a2f9343af40dd3311f4d58ca33a1392474f837afc2a0e56bcf21e1bd39b3b2914e06f6e226e5e832b2c6cba9f090639e27f38d554da81dbc3e1d58 SHA512 951891631c6890144361d779bc52aed2b94a87e810de65f7ef240193c49a243e2f1a93f3e170eacb19080dd28beb99b279d7e0bc16d7cb54553e27d29e65b1f7
 DIST xskat.zip 666085 BLAKE2B 2141ffec9b76142ab96bc0bd66784578711a44163788b868b9b02cfa9514f123e02a75d6d3c979ba86283b5fdda1604167eff9181c9ce2ee8b324db0b02bb0e1 SHA512 725bb12e983e8c1494748faf78b2e1c76c424806eeb7a88aafecf580aa63703c166907aea2bbd7890d2f972ffacc5dde78d01a82b72ab87cccf1a8e50d1034f9
-EBUILD freedoko-0.7.16-r1.ebuild 2618 BLAKE2B 10013cc1d84d7a99d97168ba757acbba960ebefc40d6d6d3a4a1ff7caeaef6f7ea20b8f3b9941ef6011a6620ba166157a06f93578d63cff221ef7f0fc4f70566 SHA512 310c381b1e145ef43e55fb343c134319848f199258b7912f7d344726e528638f69e0fcd5e2842ca6b306c4d433ba9d6ce9bb7fb0360e768f9b4f194d8b2fbb15
-EBUILD freedoko-0.7.16.ebuild 2697 BLAKE2B 19cdf1d26ced16f9f79c7b537868e07b859ae1d146a6eef90ded70ee6f2033cff98ecb0674773737c761d4ed89113abb51396959eb6cf7284238300d625a9baa SHA512 5eacdc90fa6fa0473e5fdb808ff3fdc1cf9f82439f8429469aaa79d5d58558805928a6957e12596f499c285b02fef1cee66b95a0d8e9797879f61d8c3ffacd05
-MISC metadata.xml 817 BLAKE2B 0b98264bb5e7f8db35d1db092a0b31779747c47c50463c489f2aa05abf8d465ec1ee9c8380d728ad9dc36b26c305d4c41921391ba4acdb5fa9b26613a32597e7 SHA512 36779c23b160e2fedaedc705cf19a4f70170d735cbda5d72e577f0e3c7f9937e30552804389023ced71f4428a6b6e90c640dc39bfce764eb93fb7b0744196d33
+EBUILD freedoko-0.7.16-r1.ebuild 2537 BLAKE2B 35541f76a4dd3fcd43c184b870eefa47cf1740be9f7cdfe876bcd5a17998d8327e973324f472a81c320222d1eb6104c4ef9c0fa97973c3cf34a25292f58574f2 SHA512 27f88a8ffd2f750af7e78143ae919bbbd256325f0f714f430fa7a7f5c47ead057f269b955b3405c29e5ded2f221fcc6b39a60aebb96014a94b5cc4e650c2eab4
+MISC metadata.xml 761 BLAKE2B d7ed9777e441df02f9d84948a5dda5aaf678482d84a0789999d2595e266e78d43bcdff72a336b19850318d157d63eb198dd15155dd08f1d689a2e754fdde0638 SHA512 e249da1eb0b49d59217376092672f3a8cde45e592d984569bfeb622abbde2242d37293e456a8ca73125040fdba1803062e459732a62af76b7283826ddb26223b
diff --git a/games-board/freedoko/freedoko-0.7.16-r1.ebuild b/games-board/freedoko/freedoko-0.7.16-r1.ebuild
index 2776366c552c..0a9f423066ad 100644
--- a/games-board/freedoko/freedoko-0.7.16-r1.ebuild
+++ b/games-board/freedoko/freedoko-0.7.16-r1.ebuild
@@ -1,54 +1,64 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils
+EAPI=7
+
+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-2.4:2.4"
-DEPEND="${RDEPEND}
+RDEPEND="
+	dev-cpp/gtkmm:3.0
+	media-libs/openal"
+DEPEND="${RDEPEND}"
+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
@@ -56,44 +66,33 @@ src_unpack() {
 	fi
 }
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.16-gentoo.patch
-)
-
-src_prepare() {
-	default
-	export VARTEXFONTS="${T}/fonts" #652028
+src_compile() {
+	tc-export CXX
 	append-cxxflags -std=c++14
-}
+	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
 
-src_compile() {
-	export CPPFLAGS="-DPUBLIC_DATA_DIRECTORY_VALUE='\"/usr/share/${PN}\"'"
-	export CPPFLAGS+=" -DMANUAL_DIRECTORY_VALUE='\"/usr/share/doc/${PF}/html\"'"
 	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
+	emake -C src FreeDoko LIBS="${LDFLAGS}"
 }
 
 src_install() {
 	newbin src/FreeDoko freedoko
-	insinto /usr/share/${PN}/
-	doins -r data/{backgrounds,cardsets,iconsets,rules,sounds,translations,*png}
-	find "${D}/usr/share/${PN}" -name Makefile -delete
-	dodoc AUTHORS README ChangeLog
-	newicon -s 32 src/FreeDoko.png ${PN}.png
-	make_desktop_entry ${PN} FreeDoko
-}
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
+	insinto /usr/share/${PN}
+	doins -r data/{backgrounds,cardsets,iconsets,rules,sounds,translations,*.png}
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
+	newicon src/icon.png ${PN}.png
+	make_desktop_entry ${PN} FreeDoko
+
+	einstalldocs
 
-pkg_postrm() {
-	gnome2_icon_cache_update
+	find "${ED}"/usr/share/${PN} -name Makefile -delete || die
 }
diff --git a/games-board/freedoko/freedoko-0.7.16.ebuild b/games-board/freedoko/freedoko-0.7.16.ebuild
deleted file mode 100644
index 279bdf73da22..000000000000
--- a/games-board/freedoko/freedoko-0.7.16.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="FreeDoko is a Doppelkopf-game"
-HOMEPAGE="http://free-doko.sourceforge.net"
-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 )
-	openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip )
-	!xskatcards? (
-		!kdecards? (
-			!gnomecards? (
-				!openclipartcards? (
-					!pysolcards? (
-						mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net"
-
-RDEPEND="net? ( net-libs/gnet dev-libs/glib:2 )
-	>=dev-cpp/gtkmm-2.4:2.4"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}/FreeDoko_${PV}
-
-src_unpack() {
-	local cards=0
-
-	unpack_cards() {
-		use $1 && { unpack $2 ; cards=$(( $cards + 1 )); };
-	}
-	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 openclipartcards openclipart.zip
-	[ $cards ] || unpack xskat.zip # fall back to xskat
-
-	if use backgrounds ; then
-		cd "${S}"/data/backgrounds || die
-		unpack ${PN}-backgrounds.zip
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.16-gentoo.patch
-)
-
-src_prepare() {
-	default
-	export VARTEXFONTS="${T}/fonts" #652028
-	append-cxxflags -std=c++14
-}
-
-src_compile() {
-	export CPPFLAGS="-DPUBLIC_DATA_DIRECTORY_VALUE='\"/usr/share/${PN}\"'"
-	export CPPFLAGS+=" -DMANUAL_DIRECTORY_VALUE='\"/usr/share/doc/${PF}/html\"'"
-	export OSTYPE=Linux
-	export USE_NETWORK=$(use net && echo true || echo false)
-	export USE_SOUND_ALUT=false # still marked experimental
-	emake Version
-	emake -C src FreeDoko
-}
-
-src_install() {
-	newbin src/FreeDoko freedoko
-	insinto /usr/share/${PN}/
-	doins -r data/{backgrounds,cardsets,iconsets,rules,sounds,translations,*png}
-	find "${D}/usr/share/${PN}" -name Makefile -delete
-	dodoc AUTHORS README ChangeLog
-	newicon -s 32 src/FreeDoko.png ${PN}.png
-	make_desktop_entry ${PN} FreeDoko
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/freedoko/metadata.xml b/games-board/freedoko/metadata.xml
index a5dbad4c24dd..2e46e5ae6b65 100644
--- a/games-board/freedoko/metadata.xml
+++ b/games-board/freedoko/metadata.xml
@@ -7,7 +7,6 @@
   </maintainer>
   <use>
     <flag name="kdecards">Install the KDE card set</flag>
-    <flag name="net">Enable network game support</flag>
     <flag name="pysolcards">Install the PySol card set</flag>
     <flag name="xskatcards">Install the XSkat card set</flag>
     <flag name="gnomecards">Install the gnome-games card set</flag>