[gentoo-commits] repo/gentoo:master commit in: games-arcade/pengupop/, games-arcade/pengupop/files/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/pengupop/, games-arcade/pengupop/files/

[Ionen Wolkens]

commit:     3f663baaec4dcf0eaee3fcfc5dec7f2a31a37670
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 28 06:46:06 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jun 28 16:42:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f663baa

games-arcade/pengupop: EAPI 6->8, simplify ebuild

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

 .../pengupop/files/pengupop-2.2.5-underlink.patch  | 20 --------
 games-arcade/pengupop/pengupop-2.2.5-r1.ebuild     | 53 ++++++----------------
 2 files changed, 14 insertions(+), 59 deletions(-)

diff --git a/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch b/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch
deleted file mode 100644
index fbbb704a6a3..00000000000
--- a/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.am.old	2011-06-14 21:44:40.242317771 +0200
-+++ b/Makefile.am	2011-06-14 21:44:49.216882568 +0200
-@@ -17,7 +17,7 @@
- nodist_pengupop_SOURCES = images.h
- 
- if LINUX
--pengupop_LDADD = -lSDL -lz
-+pengupop_LDADD = -lSDL -lz -lm
- 
- endif
- if WIN32
-@@ -25,7 +25,7 @@
- endif
- if DARWIN
- pengupop_LDFLAGS = -framework Carbon -framework CoreServices -framework AudioUnit -framework QuickTime -framework Cocoa -framework IOKit -framework OpenGL -framework SDL SDLMain.m
--pengupop_LDADD = -lz -lstdc++
-+pengupop_LDADD = -lz -lstdc++ -lm
- 
- all-local: Pengupop.dmg
- 

diff --git a/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild b/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild
index 6938c534c5c..c10d3f82d4a 100644
--- a/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild
+++ b/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild
@@ -1,55 +1,30 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools desktop gnome2-utils
+EAPI=8
 
-DESCRIPTION="Networked multiplayer-only Puzzle Bubble clone"
+inherit desktop
+
+DESCRIPTION="Networked Puzzle Bubble clone"
 HOMEPAGE="http://freshmeat.net/projects/pengupop"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-underlink.patch
-
-	sed -i \
-		-e '/Icon/s/\.png//' \
-		-e '/^Encoding/d' \
-		-e '/Categories/s/Application;//' \
-		pengupop.desktop || die
 
-	sed -i \
-		-e 's/-g -Wall -O2/-Wall/' \
-		Makefile.am || die
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
 
-	mv configure.in configure.ac || die
-	eautoreconf
+src_compile() {
+	emake LIBS=-lm #497196
 }
 
 src_install() {
 	default
-	domenu pengupop.desktop
-	doicon -s 48 pengupop.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
 
-pkg_postrm() {
-	gnome2_icon_cache_update
+	doicon pengupop.png
+	make_desktop_entry ${PN} Pengupop
 }