[gentoo-commits] repo/gentoo:master commit in: games-action/heroes/

[gentoo-commits] repo/gentoo:master commit in: games-action/heroes/

[Ionen Wolkens]

commit:     b251d6cac56f1d2a38189c4e8347dfe419388daf
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 20 02:28:20 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 12:40:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b251d6ca

games-action/heroes: fix RequiredUseDefaults, tighten sdl deps

Cleaned up variables given unlikely changing those will
ever be needed with last release being in 2002.

Also add a generic .desktop file, and einstalldocs.

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

 ...heroes-0.21-r2.ebuild => heroes-0.21-r3.ebuild} | 50 ++++++++++++----------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/games-action/heroes/heroes-0.21-r2.ebuild b/games-action/heroes/heroes-0.21-r3.ebuild
similarity index 55%
rename from games-action/heroes/heroes-0.21-r2.ebuild
rename to games-action/heroes/heroes-0.21-r3.ebuild
index a576ebf8f75..502043e2eb3 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
 }

[gentoo-commits] repo/gentoo:master commit in: games-action/heroes/

[Ionen Wolkens]

commit:     81185571707c23be1ef52e2f2db7bb7caef2b49a
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 29 19:56:02 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 29 20:53:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81185571

games-action/heroes: add .desktop icon

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

 games-action/heroes/Manifest              |  1 +
 games-action/heroes/heroes-0.21-r3.ebuild | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/games-action/heroes/Manifest b/games-action/heroes/Manifest
index 66c583c8f98..97135866add 100644
--- a/games-action/heroes/Manifest
+++ b/games-action/heroes/Manifest
@@ -2,3 +2,4 @@ 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
+DIST heroes.png 5131 BLAKE2B f87ae50b7b6bfc3747a14fa3ca27c8e7530a369b7db989684fa8a412ef4183ffcf5f3604ecd29d9f8beefb3f3869a68e19e39d220bfa4fdf11fa434997055526 SHA512 bbc6c9673b8ef4f6e4e4930099552f3f0ee99f1ab0dde4e4afb525b9cb1260378df9562afbe714f1ea95dc48143841b53c82bec6889e9ad2694f4293b59b8f81

diff --git a/games-action/heroes/heroes-0.21-r3.ebuild b/games-action/heroes/heroes-0.21-r3.ebuild
index 502043e2eb3..7920a08313c 100644
--- a/games-action/heroes/heroes-0.21-r3.ebuild
+++ b/games-action/heroes/heroes-0.21-r3.ebuild
@@ -11,7 +11,8 @@ 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"
+	mirror://sourceforge/${PN}/${PN}-sound-effects-1.0.tar.bz2
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -60,19 +61,20 @@ src_configure() {
 	)
 
 	local pkg
-	for pkg in ${A//.tar.bz2}; do
-		cd "${WORKDIR}"/${pkg} || die
+	for pkg in ${A% *}; do
+		cd "${WORKDIR}"/${pkg%.tar.bz2} || die
 		econf "${econfargs[@]}"
 	done
 }
 
 src_install() {
 	local pkg
-	for pkg in ${A//.tar.bz2} ; do
-		emake -C "${WORKDIR}"/${pkg} DESTDIR="${D}" install
+	for pkg in ${A% *}; do
+		emake -C "${WORKDIR}"/${pkg%.tar.bz2} DESTDIR="${D}" install
 	done
 
 	einstalldocs
 
-	make_desktop_entry ${PN} Heroes applications-games
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} Heroes
 }