gentoo resync : 21.06.2020

6 files changed, 17 insertions, 36 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 99f0196f2f0f..984fb578ed8b 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/gtklife/Manifest b/games-misc/gtklife/Manifest
index 2c76d527d6e8..30e3d8ecdbe7 100644
--- a/games-misc/gtklife/Manifest
+++ b/games-misc/gtklife/Manifest
@@ -1,4 +1,3 @@
-AUX gtklife-5.1-link.patch 578 BLAKE2B 27c3ca447d6c46551c1d3966921f88ca3f0b89a5371cfa07cf875805439de3fc0604de048c8c54a1020e80ff1e8949bcaa9bf45a550e5617c00f3840902c3f99 SHA512 2bcfff0164f13dd236edd3d2b88c37aebd79bf6344b7f0108a51b652cf291ea67d9ef4a4b0ccb11bd97a867617b4fb45b0b4668e8014e5c53ebcb345e1937a97
-DIST gtklife-5.1.tar.gz 809542 BLAKE2B 379f2f69c9fdc55dbc48d62b7659dacf9070c561a6765e9f3b6656e11542d94e2b4214708fd92aae4a560cd5a8d93d5c3cc4f119c7fb95dd561b487090897f19 SHA512 b80a2f0fc41583c2905e84e00baf689870c22262a55af25dfc2fe9e914d214f9c01b6800125e68516b63067005d25338ee7edf0c63ee37327479411693840025
-EBUILD gtklife-5.1-r1.ebuild 781 BLAKE2B 55a5f362fa7b2b6fc386018df9475f5cff04d311c9bfd182437bcc71fb168f48a32ee67c4b68bf17424c07dd72002cda38e0aa13d05b2dc603df78d25e60af99 SHA512 30087cc2ca2b2133a52bbfa0592df47a16ceebdeb6380720f6c50c33209648515c441dba70cc6c22f850affff4f3a06fb7857425c360c0e600d664e41a7862b4
+DIST gtklife-5.2.tar.gz 808937 BLAKE2B c6eb8e8fac94db2872a83060ed1b5fc96bb097dc2e43e90b0b82acdc65e36774e9e655a4cd523693cbe6f0d8bf8646b3fbd3fa7ea4fc01e9d60b5173d1199be9 SHA512 3c40368fbfbf3092c5f8976ed797858a50d67044c5ef029ff52aab911d04899e3f09f564c883905fa23ee5b3c313ef129094affe533e6fc795071f5a18bca3e5
+EBUILD gtklife-5.2.ebuild 755 BLAKE2B 11fb0ce3f358f9af1d6fc17e625ce59554d3529d88b6e6b7687a6a468ee842c41b373128ddb2f7e1fabb6b6ba8fd91ea6448388e1262687c54b074841b1c872a SHA512 70009177448fb9de9fb448bab2bd99a0d29348aa5bca42bc7d7d7f1a3b703abde7c681179ffcccc2a6d2c5abc53ba213983d4e7c6d3187a830ca5189d9ff5081
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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 0971a5d73cc8..000000000000
--- 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
index bca795466a9a..07b83da645e7 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/*
diff --git a/games-misc/lucidlife/Manifest b/games-misc/lucidlife/Manifest
index 982530365faf..7d5fdc35866c 100644
--- a/games-misc/lucidlife/Manifest
+++ b/games-misc/lucidlife/Manifest
@@ -1,5 +1,5 @@
 AUX lucidlife-0.9.2-gnome-vfs.patch 1549 BLAKE2B 5960dd039064aaa1d1878b596d847fa939316b6d1b75b68b6060c681a8af65d6a5e4b6cec02fe6e9d72c55b6de488785070ffdb65b15ee63f57dca544edfe5d8 SHA512 57048afec7111940aed0388f17bd4bac9a6e7046d09c07067f0414267a2877cda5d0d04d8ab2a46caea1e6680b7b26a407780c3e77b3d3dc6b2d939364585426
 AUX lucidlife-0.9.2-underlink.patch 317 BLAKE2B 407129ced5f5b9fbe22c6b450c6834fb0f2ce7e59f4d34970826cbbaee1e4b470088995943b8fbc2cf0bd0febcf7f9056e16b178fad4dcd0b7f4901158036134 SHA512 ee33861f9d3f79e1d662ce5ce5c1d1a47aba87b9a45dd04c93ede13ed6d85c0a7365b0f1cca2e7fcf65960985f295ccb12197fcd44679b6196ae1cba11643592
 DIST lucidlife-0.9.2.tar.gz 1506448 BLAKE2B 8e391a60d9cade2c57dece9397f55b945a9b5e182d81f2cceec2e93deea11f50ee250e1b19ecc1a6e88ed437bba98beef4cc098505406d2dce6164de5d07404a SHA512 5184d6a5a2d48b38b2a72edbab6ca4f251547e5c54234792d3821482d39e5fbb2b96ab171544dc3e6843f9976c1dc40935eb3537dcf06c1cb0c717260bd04b01
-EBUILD lucidlife-0.9.2-r1.ebuild 830 BLAKE2B 3642f5d965a9d9da1bb02409e81a3e4d233539e397d88a17316f12dedf2765f5614a662df69239b8a3520918c7806169a5562acc773c5f73ed4e69b2ea358b58 SHA512 692bfa894ff1348544e9204b24c1cfb5be246f76f602bef0b6c827508588d6d05321220b0283d2e9b38c3f71f43e0f3dcc2ddaa3666568cb554ae8456a1240c1
+EBUILD lucidlife-0.9.2-r1.ebuild 806 BLAKE2B 8d4ee523ad9216b11a4818b810f0dfafab6c8fa9dfa49eba5cfb08dbb078911fd0d4298923d0fdd979189382d0ae8089982da66a623a318d5aab2eb4f4525e0d SHA512 499281f1a4818583abfd81f745c36d5bda85919c9464361d7bf4234817fa4eeb2d2ec97ee19db9d3cc265820f621876b9d1a464e97454c0c40a01d7a157cbe86
 MISC metadata.xml 247 BLAKE2B 6e885a4bc233754242982df43837c623e79b6e0f9149c9bf81b7ab904ae7f25ef2c1e2657c695f37cd57c2883359a78a09d8c3d1467a90634a857021984bc58d SHA512 fd894fe434a856714537ba8d3dcc8b0ae16889f6b44634e8844143ae15450013d9c4558b2df6215edad3762ebc727d166371b35bcccaa7353426388a04d71216
diff --git a/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild b/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild
index 33faf6200942..d899eb14600c 100644
--- a/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild
+++ b/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools eutils
 
 DESCRIPTION="A Conway's Life simulator written in GTK+2 - fork from Gtklife"
-HOMEPAGE="http://gtk-apps.org/content/show.php/LucidLife?content=130867"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"