gentoo resync : 08.07.2021

2 files changed, 29 insertions, 56 deletions

diff --git a/games-rpg/draci-historie/Manifest b/games-rpg/draci-historie/Manifest
index 09c53099bf86..47fcdd60cdda 100644
--- a/games-rpg/draci-historie/Manifest
+++ b/games-rpg/draci-historie/Manifest
@@ -2,5 +2,6 @@ DIST dh-cz-2012.zip 29293879 BLAKE2B 5f8d4199de6f418d041c409bbc25b383021721b062b
 DIST dh-de-2012.zip 3316443 BLAKE2B 99a495be5d2add5e6f375904d249bda06f556e5e8ede4b33348d6ee46778de15b704016f9b498ca5b68ad678b3f2bd572034c37bc7dde2dfcd9d46ef2f4b242a SHA512 088f372e8de59cb52555a70cb7918ec14bb4abbb712a3867b40ce9eef80dc3f03b6c28402b9e0c9ee7e02f1938ee5f140abc02aef801716e38af84d66dafd5aa
 DIST dh-en-2012.zip 3310860 BLAKE2B 22c8dc8102f5f1d984a760d51fd8f7f028cca6a28b1a4e0f459c44eec68255e3ecd526ef80426b57f2137c33f6a5ba0d16b2c760b42a67413c2ffa3cec9ec648 SHA512 a9b5ff15305c961f288fdf915f56ca204a2ebe5370dcf56c20a0057cf721c45445a20479a39fe1f5443e79e7c95bd5771abef2115396c418442d2e5e400ce10a
 DIST dh-pl-2012.zip 36041498 BLAKE2B 29f6daeac610aa83f4df4a7698d19540f7c97d3a019a66078e784492010891860fa6af9b3151457c0aefeeb5eb3f90b8336693a1367b64e97592e017a7e9f247 SHA512 627f85a14362e032e00ed36275df696b6a468965734db7c8bb459d689b548c05033fe387ffee9855a83fe634f14b98a5c5ea51aefdf169c7243e9282fa1c19a5
-EBUILD draci-historie-2012-r1.ebuild 2365 BLAKE2B c908bcbfc5b1cb9aefc3eb73d55ff3b50045af923d57ef45857e173ca64ff4a7142897e4e645342aee5b163b8ff5dc6cec759d55dfdb1591cd3a755a9d9359b9 SHA512 a54f1a29806cd8a2f270a0dc232a6ac1b34fad9f76d0843919a0aac2e40fc043dfe0def47887be40d97c68224bb8bbf789a3bb2f74f0bb2d62cd7b2684d533db
+DIST draci-historie.png 5121 BLAKE2B f4f5ec74e00385e1cd13ba4002305960513d5be829a89f116e0ce7829347b934ab2317a5064c6bfeb89e70a6d0f3f6106eb497bf3558e6549f838b2548693512 SHA512 a0c204dcc94c0fe872dd46da7553aa148e08ac5a04941a24eee05823ae1e14ea6576b22e2bae87371d8af3c1559edf14abbd5998784a49338ccba1e217400f30
+EBUILD draci-historie-2012-r1.ebuild 1380 BLAKE2B a6237015ff6f65a18184e1b853878ece1ea756fc7eebd0becb8e2edad0960021ffd8e739395030c26c0ac92be0a985977a5259fd0dda8569552f8cd078bf96aa SHA512 0e98b80e58519cdc04b0084ba9a9d21b6735512c089d764841d55bfbd179631980dfb2aa2ab7d7185ae1c01a59fc01c0a73e9655956a616316a884d26d2ab171
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/draci-historie/draci-historie-2012-r1.ebuild b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
index 3982a8538d15..262964dad79f 100644
--- a/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
+++ b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
@@ -1,79 +1,51 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=8
+
+inherit desktop wrapper
 
 DESCRIPTION="Bert the little dragon searches for his father"
-HOMEPAGE="http://www.ucw.cz/draci-historie/index-en.html"
-BASE_URL="http://www.ucw.cz/draci-historie/binary/dh"
+HOMEPAGE="https://www.ucw.cz/draci-historie/index-en.html"
+BASE_URL="https://www.ucw.cz/draci-historie/binary/dh"
 SRC_URI="
 	l10n_cs? ( ${BASE_URL}-cz-${PV}.zip )
 	l10n_de? ( ${BASE_URL}-de-${PV}.zip )
 	l10n_en? ( ${BASE_URL}-en-${PV}.zip )
 	l10n_pl? ( ${BASE_URL}-pl-${PV}.zip )
 	!l10n_cs? ( !l10n_de? ( !l10n_en? ( !l10n_pl? ( ${BASE_URL}-en-${PV}.zip ) ) ) )
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png
 "
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="l10n_cs l10n_de l10n_en l10n_pl"
+IUSE="l10n_cs l10n_de +l10n_en l10n_pl"
 
-RDEPEND=">=games-engines/scummvm-1.1"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
+RDEPEND="games-engines/scummvm"
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
-	if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then
-		mkdir en || die
-		unpack dh-en-${PV}.zip
-		mv *.{dfw,fon,mid,sam} en/ || die
-	fi
-	if use l10n_cs ; then
-		mkdir cs || die
-		unpack dh-cz-${PV}.zip
-		mv *.{dfw,fon,mid,sam,zzz} cs/ || die
-	fi
-	if use l10n_de ; then
-		mkdir de || die
-		unpack dh-de-${PV}.zip
-		mv *.{dfw,fon,mid,sam} de/ || die
-	fi
-	if use l10n_pl ; then
-		mkdir pl || die
-		unpack dh-pl-${PV}.zip
-		mv *.{dfw,fon,mid,sam,zzz} pl/ || die
-	fi
-}
-
-src_prepare() {
-	default
-	rm -f *.{bat,exe,ins} readme.* || die
+	MY_L10N=( $(usev l10n_{cs,cz}) $(usev l10n_de) $(usev l10n_en) $(usev l10n_pl) )
+	[[ ${MY_L10N} ]] || MY_L10N=( l10n_en )
+
+	local lang
+	for lang in "${MY_L10N[@]//l10n_/}"; do
+		mkdir ${lang} || die
+		unpack dh-${lang}-${PV}.zip
+		mv *.{dfw,fon,mid,sam} ${lang}/ || die
+	done
 }
 
 src_install() {
-	newicon bert.ico draci-historie.ico
 	insinto /usr/share/${PN}
-	for lingua in $(find * -type d); do
-		doins -r ${lingua}
+	local lang
+	for lang in "${MY_L10N[@]//l10n_/}"; do
+		doins -r ${lang}
+		make_wrapper ${PN}-${lang} "scummvm -f -p \"${EPREFIX}/usr/share/${PN}/${lang}\" draci"
+		make_desktop_entry ${PN}-${lang} "Dračí Historie (${lang})"
 	done
-	if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then
-		make_wrapper draci-historie-en "scummvm -f -p \"/usr/share/${PN}/en\" draci" .
-		make_desktop_entry ${PN}-en "Dračí Historie (English)" /usr/share/pixmaps/draci-historie.ico
-	fi
-	if use l10n_cs ; then
-		make_wrapper draci-historie-cs "scummvm -f -p \"/usr/share/${PN}/cs\" draci" .
-		make_desktop_entry ${PN}-cs "Dračí Historie (Čeština)" /usr/share/pixmaps/draci-historie.ico
-	fi
-	if use l10n_de ; then
-		make_wrapper draci-historie-de "scummvm -f -p \"/usr/share/${PN}/de\" draci" .
-		make_desktop_entry ${PN}-de "Dračí Historie (Deutsch)"  /usr/share/pixmaps/draci-historie.ico
-	fi
-	if use l10n_pl ; then
-		make_wrapper draci-historie-pl "scummvm -f -p \"/usr/share/${PN}/pl\" draci" .
-		make_desktop_entry ${PN}-pl "Dračí Historie (Polski)"  /usr/share/pixmaps/draci-historie.ico
-	fi
-	einstalldocs
+
+	doicon "${DISTDIR}"/${PN}.png
 }