gentoo resync : 29.06.2021

4 files changed, 50 insertions, 69 deletions

diff --git a/games-arcade/missile/Manifest b/games-arcade/missile/Manifest
index 9cf5ad13b9ce..9bd6aa841e9c 100644
--- a/games-arcade/missile/Manifest
+++ b/games-arcade/missile/Manifest
@@ -1,4 +1,3 @@
-AUX missile-1.0.1-ldflags.patch 441 BLAKE2B 165f02176acb378833043931c696459c449b4c77389a84cefb62a11cb77c7c743157e29d7c2de927f57babcb6790c307676bae6d022a181963cf29b9da923992 SHA512 f29ce3eacbde93ec61a327462ab8096a1530752bec6391f98b5999af9b3fec5cd0ffc6a02e592a74ea5d7f535b3e6224bf9bb10537a55ab0c9bdbdd85e50d0f2
 DIST missile-1.0.1.tar.gz 214933 BLAKE2B a1131971051008b9be4d79b3b92d630653cc045988c62ba1090f482bccd62ba4f63320882e75c889c64c9b54bad0c5270400c0b9f54dfc6be4cb1e3ac2f42a36 SHA512 32d30213d433fd3d02d74c4614747bdc2e3012c77793dfb7b869d774b7f43f4d0eb6b1a0e5db805d976e7919404c57cbbaa20f21954dfd4475ddaa6c2f6c0cc2
-EBUILD missile-1.0.1-r1.ebuild 1040 BLAKE2B 79710c97bb71b8ec2b23bbd43d5f015457e4b2880254ad983ba3936a6cdd4df8a556f7aafe0fe914a1d6fac73cbd8d7014976f1c0107ec5b98b724a36ecbe182 SHA512 58f6dcc1aac56aec4500e3ba83a38563de5485aedae66322bbf3d7c4a6faee98ca8d1b36157f9c4624da7292508b6863cf1f289d87e93c7e2d0862f5fbf16e36
+EBUILD missile-1.0.1-r2.ebuild 1119 BLAKE2B e4f7f5ace081ed0bea536fd610c5dee42f2efb084bf8bfc293ccd221e2fc3dfa05d6a38081ab34689f298fa142cb0087e839f9ad399db92bfbf61a29310d456a SHA512 57dbd4b256bb8a4c50045c3096557da7afb638a9912fa7008106c6ef2f13b81375a187d9aef391dc1eab6694c081d6376f6d50a391fa1d2abe33c1f4e130094f
 MISC metadata.xml 330 BLAKE2B 9b2dd9925eec0680e98ae011358f7530aa05d1155883f3d97f2814bbbb30726c27a0f37a731f4ad379a8f2f34428f659373f93adf070ccc4dae6c168c6f0dba0 SHA512 ab5f1e51dec4ccf1f6d4d78282b5fe1ed115cabc124ca34ec0ab11246a76017ec60c1df83fedf4e88a6b35ab48a6d1f5e0b5dc8785c4031aba868c37d280b3a4
diff --git a/games-arcade/missile/files/missile-1.0.1-ldflags.patch b/games-arcade/missile/files/missile-1.0.1-ldflags.patch
deleted file mode 100644
index 744b8192c5b9..000000000000
--- a/games-arcade/missile/files/missile-1.0.1-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.old	2010-09-22 09:11:48.000000000 +0200
-+++ b/Makefile	2010-09-22 09:13:08.000000000 +0200
-@@ -125,10 +125,10 @@
- 	fi
- 
- $(PROGRAM):	$(OBJECTS)
--	$(CC) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(LIBS)
- 
- static : $(OBJECTS)
--	$(CC) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(STATIC_LIBS)
-+	$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(STATIC_LIBS)
- 
- 
- %.o : %.c %.h
diff --git a/games-arcade/missile/missile-1.0.1-r1.ebuild b/games-arcade/missile/missile-1.0.1-r1.ebuild
deleted file mode 100644
index 2e9d9e9874db..000000000000
--- a/games-arcade/missile/missile-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-DESCRIPTION="The game Missile Command for Linux"
-HOMEPAGE="http://missile.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e '/^CC/d' \
-		-e "s:\$(game_prefix)/\$(game_data):/usr/share/${PN}:" \
-		-e "s/-O2/${CFLAGS}/" \
-		-e 's/-lSDL_image $(SND_LIBS)/-lSDL_image -lm $(SND_LIBS)/g' \
-		Makefile || die
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r data/*
-	newicon -s 48 icons/${PN}_icon_black.png ${PN}.png
-	make_desktop_entry ${PN} "Missile Command"
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-arcade/missile/missile-1.0.1-r2.ebuild b/games-arcade/missile/missile-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..1c473e3b58ee
--- /dev/null
+++ b/games-arcade/missile/missile-1.0.1-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Port of the Atari Missile Command game for Linux"
+HOMEPAGE="http://missile.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE="+sound"
+
+RDEPEND="
+	media-libs/libsdl[sound?,video]
+	media-libs/sdl-image[png]
+	sound? ( media-libs/sdl-mixer )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	tc-export CC
+
+	local cppargs=(
+		-DDATA="'\"${EPREFIX}/usr/share/${PN}\"'"
+		-DVERSION=\\\"${PV}\\\"
+		$(usev sound -DUSE_SOUND)
+		$($(tc-getPKG_CONFIG) --cflags sdl SDL_image $(usev sound SDL_mixer))
+	)
+	append-cppflags "${cppargs[@]}"
+
+	LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl SDL_image $(usev sound SDL_mixer)) -lm" \
+		emake -f /dev/null ${PN}
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r data/{graphics,missile_icon.png,sound}
+
+	einstalldocs
+
+	newicon icons/${PN}_icon_red.png ${PN}.png
+	make_desktop_entry ${PN} "Missile Command"
+}