[gentoo-commits] repo/gentoo:master commit in: games-misc/gtklife/, games-misc/gtklife/files/

[gentoo-commits] repo/gentoo:master commit in: games-misc/gtklife/, games-misc/gtklife/files/

[James Le Cuirot]

commit:     21f9048458b4255d16bc45aca1b88ed47d6a9ad7
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 13:59:35 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 13:59:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21f90484

games-misc/gtklife: Bump to 5.2, drop old 5.1, EAPI 7

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-misc/gtklife/Manifest                        |  2 +-
 games-misc/gtklife/files/gtklife-5.1-link.patch    | 20 --------------------
 .../{gtklife-5.1-r1.ebuild => gtklife-5.2.ebuild}  | 22 ++++++++++++----------
 3 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/games-misc/gtklife/Manifest b/games-misc/gtklife/Manifest
index 1154cf84483..d6db74553db 100644
--- a/games-misc/gtklife/Manifest
+++ b/games-misc/gtklife/Manifest
@@ -1 +1 @@
-DIST gtklife-5.1.tar.gz 809542 BLAKE2B 379f2f69c9fdc55dbc48d62b7659dacf9070c561a6765e9f3b6656e11542d94e2b4214708fd92aae4a560cd5a8d93d5c3cc4f119c7fb95dd561b487090897f19 SHA512 b80a2f0fc41583c2905e84e00baf689870c22262a55af25dfc2fe9e914d214f9c01b6800125e68516b63067005d25338ee7edf0c63ee37327479411693840025
+DIST gtklife-5.2.tar.gz 808937 BLAKE2B c6eb8e8fac94db2872a83060ed1b5fc96bb097dc2e43e90b0b82acdc65e36774e9e655a4cd523693cbe6f0d8bf8646b3fbd3fa7ea4fc01e9d60b5173d1199be9 SHA512 3c40368fbfbf3092c5f8976ed797858a50d67044c5ef029ff52aab911d04899e3f09f564c883905fa23ee5b3c313ef129094affe533e6fc795071f5a18bca3e5

diff --git a/games-misc/gtklife/files/gtklife-5.1-link.patch b/games-misc/gtklife/files/gtklife-5.1-link.patch
deleted file mode 100644
index 0971a5d73cc..00000000000
--- a/games-misc/gtklife/files/gtklife-5.1-link.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.in	2014-07-24 21:25:09.072431615 +0200
-+++ b/Makefile.in	2014-07-24 21:26:34.898037740 +0200
-@@ -22,7 +22,7 @@
- # Preprocessor and linking flags
- 
- CPPFLAGS:=$(CPPFLAGS) $(GTK_CFLAGS) -DVERSION=\"$(VERSION)\" -DDATADIR=\"$(pkgdatadir)\" -DDOCDIR=\"$(docdir)\"
--LDFLAGS:=$(LDFLAGS) $(GTK_LIBS)
-+LDLIBS:=$(GTK_LIBS) -lX11
- 
- # Object files
- 
-@@ -51,7 +51,7 @@
- 	$(INSTALL_DATA) doc/* $(docdir)
- 
- gtklife: $(OBJS)
--	$(CC) -o gtklife $(OBJS) $(LDFLAGS)
-+	$(CC) -o gtklife $(OBJS) $(LDFLAGS) $(LDLIBS)
- 
- create_lookup: $(CL_OBJS)
- 	$(CC) -o create_lookup $(CL_OBJS)

diff --git a/games-misc/gtklife/gtklife-5.1-r1.ebuild b/games-misc/gtklife/gtklife-5.2.ebuild
similarity index 76%
rename from games-misc/gtklife/gtklife-5.1-r1.ebuild
rename to games-misc/gtklife/gtklife-5.2.ebuild
index bca795466a9..07b83da645e 100644
--- a/games-misc/gtklife/gtklife-5.1-r1.ebuild
+++ b/games-misc/gtklife/gtklife-5.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit desktop xdg
 
 DESCRIPTION="A Conway's Life simulator for Unix"
 HOMEPAGE="http://ironphoenix.org/tril/gtklife/"
@@ -11,18 +12,19 @@ SRC_URI="http://ironphoenix.org/tril/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
 
 RDEPEND="
 	dev-libs/glib:2
 	x11-libs/gtk+:2
 	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-link.patch
-)
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
 
 src_configure() {
 	econf \
@@ -36,7 +38,7 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins -r graphics patterns
 
-	newicon icon_48x48.png ${PN}.png
+	newicon -s 48 icon_48x48.png ${PN}.png
 	make_desktop_entry ${PN} GtkLife
 
 	dodoc -r doc/*