gentoo resync : 20.06.2021

2 files changed, 28 insertions, 24 deletions

diff --git a/games-action/heroes/Manifest b/games-action/heroes/Manifest
index 241b69557ecc..c085bc5e5042 100644
--- a/games-action/heroes/Manifest
+++ b/games-action/heroes/Manifest
@@ -7,5 +7,5 @@ DIST heroes-0.21.tar.bz2 709079 BLAKE2B 356c7c97504c5abe6c9e94a9ba190613d199000c
 DIST heroes-data-1.5.tar.bz2 391970 BLAKE2B b4325e978955ad6cfe522055755ebcc0ff487a9fdc136dbeaea30073f450d50946859d61cf44f75ab89be556e0886f8cb6ff3623c84c3275194ac81e60b1d0f9 SHA512 a4cb1508c2010b2157dc0e1d0a7973131fa167cb1f3c93649c3bc9b2c37419e4429e33cde14f3b67c7a4670f751ff4c28d88604102780bdb1fe5c77a93e1a213
 DIST heroes-sound-effects-1.0.tar.bz2 389883 BLAKE2B cd4e889bf7e0b33eda33806040d3141576d60b93332d6c4bf7d41fd587bb9d661ded4f619e313e17d8508500e138f7f3ce08b9336818f85d9e240d2fdebaf4e2 SHA512 51da63373f1bdb2314a8c3164028ee9cbb95958bfe8f13b1119236f035282a711efcc6ef5a84fd647c1e8451b4da788a74e4b8506e1476a437299dfc7b2046d1
 DIST heroes-sound-tracks-1.0.tar.bz2 1245613 BLAKE2B b390a96065c6b127addc0bc25326c8d0055b13f896d33e765ab9a5b3c45d831c0f91e1cff361f43a2b4956e87a6a980ce2cd07d6e6588357038f92805c64dbd1 SHA512 3e7ee2890c47366a39cfc7d7b9a1e5fdf3c3379013ca96072586ba909e2a602b114c728ffbe9dfe8eb6b62232cb6c25b13475f2a33da0243ea1ffb3f040842f0
-EBUILD heroes-0.21-r2.ebuild 1542 BLAKE2B d3e59ea72325b58f00aef689c05c4c57ecf767f28908b650494a72bdd26b0f44ee2de912bbf59e825acc18121d3ce6bcdae09bd0ae68a5c53c7388d5c17e13b4 SHA512 7e7c01995b2325f4c05b45c12060aaa9806e1046921462badb01afff8dddb2de34d5e85e8d750417ec00fd0de842c8bc3fbcdf84571b6827ce734f515a1fa182
+EBUILD heroes-0.21-r3.ebuild 1584 BLAKE2B cfdee2930a0856bb3460971d3b8d267c089641fa0c5912268ff4f2e883eb7590cf56c450acee0735ab6c17a14fb467a76026ab840060d21653a83279559bc498 SHA512 b996f5228d8385725b1e24fe510fde56c9eb2dd54cf62d5ff262e13d8ee3faaff6550a18150b46fc5dd704717a1bbce87d78c875d51356f4fa791a23934abfea
 MISC metadata.xml 329 BLAKE2B 3d95771553c911350c23023422240c0a791ede2044a55bf40a25ac4c5ac84114ddb2942b370b9605a966d4dac960b1498f278394925d065bee642164f4893187 SHA512 f33d2b7d06f5e772abf4acb8b3dc8ba78b52ab8220a350ddc64d8bde67e850062830b4251f13021b8472b110602c937cfdc3fd34c97c37ba455542b771ecb872
diff --git a/games-action/heroes/heroes-0.21-r2.ebuild b/games-action/heroes/heroes-0.21-r3.ebuild
index a576ebf8f758..502043e2eb33 100644
--- a/games-action/heroes/heroes-0.21-r2.ebuild
+++ b/games-action/heroes/heroes-0.21-r3.ebuild
@@ -1,25 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
-
-data_ver=1.5
-snd_trk_ver=1.0
-snd_eff_ver=1.0
+inherit autotools desktop
 
 DESCRIPTION="Heroes Enjoy Riding Over Empty Slabs: similar to Tron and Nibbles"
 HOMEPAGE="http://heroes.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://sourceforge/${PN}/${PN}-data-${data_ver}.tar.bz2
-	mirror://sourceforge/${PN}/${PN}-sound-tracks-${snd_trk_ver}.tar.bz2
-	mirror://sourceforge/${PN}/${PN}-sound-effects-${snd_eff_ver}.tar.bz2"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://sourceforge/${PN}/${PN}-data-1.5.tar.bz2
+	mirror://sourceforge/${PN}/${PN}-sound-tracks-1.0.tar.bz2
+	mirror://sourceforge/${PN}/${PN}-sound-effects-1.0.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ggi nls sdl"
+IUSE="ggi nls +sdl"
 REQUIRED_USE="^^ ( ggi sdl )"
 RESTRICT="test"
 
@@ -31,8 +28,8 @@ RDEPEND="
 	)
 	nls? ( virtual/libintl )
 	sdl? (
-		media-libs/libsdl
-		media-libs/sdl-mixer
+		media-libs/libsdl[joystick,sound,video]
+		media-libs/sdl-mixer[mod]
 	)"
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
@@ -47,28 +44,35 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
 src_configure() {
+	local econfargs=(
+		$(use_enable nls)
+		$(use_with ggi mikmod)
+		$(use_with ggi)
+		$(use_with sdl sdl-mixer)
+		$(use_with sdl)
+		--disable-heroes-debug
+		--disable-optimizations
+	)
+
 	local pkg
 	for pkg in ${A//.tar.bz2}; do
 		cd "${WORKDIR}"/${pkg} || die
-		econf \
-			--disable-heroes-debug \
-			--disable-optimizations \
-			$(use_with sdl) \
-			$(use_with sdl sdl-mixer) \
-			$(use_with ggi) \
-			$(use_with ggi mikmod) \
-			$(use_enable nls)
+		econf "${econfargs[@]}"
 	done
 }
 
 src_install() {
 	local pkg
 	for pkg in ${A//.tar.bz2} ; do
-		cd "${WORKDIR}"/${pkg} || die
-		emake DESTDIR="${D}" install
+		emake -C "${WORKDIR}"/${pkg} DESTDIR="${D}" install
 	done
+
+	einstalldocs
+
+	make_desktop_entry ${PN} Heroes applications-games
 }