1 |
commit: 3f663baaec4dcf0eaee3fcfc5dec7f2a31a37670 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 28 06:46:06 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 28 16:42:38 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f663baa |
7 |
|
8 |
games-arcade/pengupop: EAPI 6->8, simplify ebuild |
9 |
|
10 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
11 |
|
12 |
.../pengupop/files/pengupop-2.2.5-underlink.patch | 20 -------- |
13 |
games-arcade/pengupop/pengupop-2.2.5-r1.ebuild | 53 ++++++---------------- |
14 |
2 files changed, 14 insertions(+), 59 deletions(-) |
15 |
|
16 |
diff --git a/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch b/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch |
17 |
deleted file mode 100644 |
18 |
index fbbb704a6a3..00000000000 |
19 |
--- a/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch |
20 |
+++ /dev/null |
21 |
@@ -1,20 +0,0 @@ |
22 |
---- a/Makefile.am.old 2011-06-14 21:44:40.242317771 +0200 |
23 |
-+++ b/Makefile.am 2011-06-14 21:44:49.216882568 +0200 |
24 |
-@@ -17,7 +17,7 @@ |
25 |
- nodist_pengupop_SOURCES = images.h |
26 |
- |
27 |
- if LINUX |
28 |
--pengupop_LDADD = -lSDL -lz |
29 |
-+pengupop_LDADD = -lSDL -lz -lm |
30 |
- |
31 |
- endif |
32 |
- if WIN32 |
33 |
-@@ -25,7 +25,7 @@ |
34 |
- endif |
35 |
- if DARWIN |
36 |
- pengupop_LDFLAGS = -framework Carbon -framework CoreServices -framework AudioUnit -framework QuickTime -framework Cocoa -framework IOKit -framework OpenGL -framework SDL SDLMain.m |
37 |
--pengupop_LDADD = -lz -lstdc++ |
38 |
-+pengupop_LDADD = -lz -lstdc++ -lm |
39 |
- |
40 |
- all-local: Pengupop.dmg |
41 |
- |
42 |
|
43 |
diff --git a/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild b/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild |
44 |
index 6938c534c5c..c10d3f82d4a 100644 |
45 |
--- a/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild |
46 |
+++ b/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild |
47 |
@@ -1,55 +1,30 @@ |
48 |
-# Copyright 1999-2018 Gentoo Foundation |
49 |
+# Copyright 1999-2021 Gentoo Authors |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
|
52 |
-EAPI=6 |
53 |
-inherit autotools desktop gnome2-utils |
54 |
+EAPI=8 |
55 |
|
56 |
-DESCRIPTION="Networked multiplayer-only Puzzle Bubble clone" |
57 |
+inherit desktop |
58 |
+ |
59 |
+DESCRIPTION="Networked Puzzle Bubble clone" |
60 |
HOMEPAGE="http://freshmeat.net/projects/pengupop" |
61 |
SRC_URI="mirror://gentoo/${P}.tar.gz" |
62 |
|
63 |
-LICENSE="GPL-2" |
64 |
+LICENSE="GPL-3+" |
65 |
SLOT="0" |
66 |
KEYWORDS="~amd64 ~x86" |
67 |
-IUSE="" |
68 |
- |
69 |
-DEPEND="media-libs/libsdl[sound,video] |
70 |
- sys-libs/zlib" |
71 |
-RDEPEND="${DEPEND}" |
72 |
- |
73 |
-src_prepare() { |
74 |
- default |
75 |
- |
76 |
- eapply "${FILESDIR}"/${P}-underlink.patch |
77 |
- |
78 |
- sed -i \ |
79 |
- -e '/Icon/s/\.png//' \ |
80 |
- -e '/^Encoding/d' \ |
81 |
- -e '/Categories/s/Application;//' \ |
82 |
- pengupop.desktop || die |
83 |
|
84 |
- sed -i \ |
85 |
- -e 's/-g -Wall -O2/-Wall/' \ |
86 |
- Makefile.am || die |
87 |
+RDEPEND=" |
88 |
+ media-libs/libsdl[sound,video] |
89 |
+ sys-libs/zlib:=" |
90 |
+DEPEND="${RDEPEND}" |
91 |
|
92 |
- mv configure.in configure.ac || die |
93 |
- eautoreconf |
94 |
+src_compile() { |
95 |
+ emake LIBS=-lm #497196 |
96 |
} |
97 |
|
98 |
src_install() { |
99 |
default |
100 |
- domenu pengupop.desktop |
101 |
- doicon -s 48 pengupop.png |
102 |
-} |
103 |
- |
104 |
-pkg_preinst() { |
105 |
- gnome2_icon_savelist |
106 |
-} |
107 |
- |
108 |
-pkg_postinst() { |
109 |
- gnome2_icon_cache_update |
110 |
-} |
111 |
|
112 |
-pkg_postrm() { |
113 |
- gnome2_icon_cache_update |
114 |
+ doicon pengupop.png |
115 |
+ make_desktop_entry ${PN} Pengupop |
116 |
} |