gentoo resync : 28.04.2021

4 files changed, 33 insertions, 18 deletions

diff --git a/games-misc/lucidlife/Manifest b/games-misc/lucidlife/Manifest
index 7d5fdc35866c..815c50a97079 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
+AUX lucidlife-0.9.2-gnome-vfs.patch 1465 BLAKE2B 0621dcf90a3bcce6606c4da8fbd0ac934abc02008e5446d19f83474f91e03313ec1897c2116107fe4687d61a38f59ee57bb8550842467d7a8f8353582bc1433b SHA512 3c46f18981b51f7fd47f75ef473e2f7f15be0b506b6244844338cedb8205d1caa8712f3dcc78a2871dc2627868cfc3d129517f13eed7fd92ab76f3de0f5e05ba
+AUX lucidlife-0.9.2-underlink.patch 245 BLAKE2B c22bd2859339c588e6913a9df991a6f8cf0a6b15a17b5ce719816aac060a842aa5b3e225641bb1b3b9fa692452c54e72716b5499c586bf3b4d02d027bf92bf26 SHA512 69472de3b26048a81a99f04859f63bdbbcf74b5bb77860426a8e9730d9f584a7804a7aee4b8e496252e6b6dc0ac2e68ebfe594bc6f20fd459e53ecc19b18f1dc
 DIST lucidlife-0.9.2.tar.gz 1506448 BLAKE2B 8e391a60d9cade2c57dece9397f55b945a9b5e182d81f2cceec2e93deea11f50ee250e1b19ecc1a6e88ed437bba98beef4cc098505406d2dce6164de5d07404a SHA512 5184d6a5a2d48b38b2a72edbab6ca4f251547e5c54234792d3821482d39e5fbb2b96ab171544dc3e6843f9976c1dc40935eb3537dcf06c1cb0c717260bd04b01
-EBUILD lucidlife-0.9.2-r1.ebuild 806 BLAKE2B 8d4ee523ad9216b11a4818b810f0dfafab6c8fa9dfa49eba5cfb08dbb078911fd0d4298923d0fdd979189382d0ae8089982da66a623a318d5aab2eb4f4525e0d SHA512 499281f1a4818583abfd81f745c36d5bda85919c9464361d7bf4234817fa4eeb2d2ec97ee19db9d3cc265820f621876b9d1a464e97454c0c40a01d7a157cbe86
+EBUILD lucidlife-0.9.2-r1.ebuild 1066 BLAKE2B 15d8c5d2aad579fc9dc02ede4cd907444211e9181ac07210bc407c6ea69fb18d89544af7220ff1fbeb041176dc9f0035cab94c1537a5a16e514bda54d15f2b02 SHA512 dececcad3e87ec8eb13eed15a374d8fb9dd861ad662a79280e5f16f1276dc0d65fb35e2982f2a8841f6daa08a79cc1b16aeadca58da9f2b2ad795586fefb1cb1
 MISC metadata.xml 247 BLAKE2B 6e885a4bc233754242982df43837c623e79b6e0f9149c9bf81b7ab904ae7f25ef2c1e2657c695f37cd57c2883359a78a09d8c3d1467a90634a857021984bc58d SHA512 fd894fe434a856714537ba8d3dcc8b0ae16889f6b44634e8844143ae15450013d9c4558b2df6215edad3762ebc727d166371b35bcccaa7353426388a04d71216
diff --git a/games-misc/lucidlife/files/lucidlife-0.9.2-gnome-vfs.patch b/games-misc/lucidlife/files/lucidlife-0.9.2-gnome-vfs.patch
index 49918b62146a..68fe0a3b3bc6 100644
--- a/games-misc/lucidlife/files/lucidlife-0.9.2-gnome-vfs.patch
+++ b/games-misc/lucidlife/files/lucidlife-0.9.2-gnome-vfs.patch
@@ -1,5 +1,5 @@
---- lucidlife-0.9.2/configure.ac
-+++ lucidlife-0.9.2/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -23,7 +23,7 @@
  AC_SUBST(CFLAGS)
  AC_SUBST(LDFLAGS)
@@ -9,8 +9,8 @@
  PKG_CHECK_MODULES(GNOME, $GNOME_MODULES)
  AC_SUBST(GNOME_CFLAGS)
  AC_SUBST(GNOME_LIBS)
---- lucidlife-0.9.2/src/lucidlife.c
-+++ lucidlife-0.9.2/src/lucidlife.c
+--- a/src/lucidlife.c
++++ b/src/lucidlife.c
 @@ -35,8 +35,6 @@
  
  #include <gtk/gtk.h>
@@ -55,8 +55,8 @@
  	free(url);
  }
  
---- lucidlife-0.9.2/lucidlife.desktop.in
-+++ lucidlife-0.9.2/lucidlife.desktop.in
+--- a/lucidlife.desktop.in
++++ b/lucidlife.desktop.in
 @@ -2,8 +2,7 @@
  Name=LucidLife
  Comment=A user-friendly version of Conway's game of life
diff --git a/games-misc/lucidlife/files/lucidlife-0.9.2-underlink.patch b/games-misc/lucidlife/files/lucidlife-0.9.2-underlink.patch
index 77bd7092b812..f83c8214b60c 100644
--- a/games-misc/lucidlife/files/lucidlife-0.9.2-underlink.patch
+++ b/games-misc/lucidlife/files/lucidlife-0.9.2-underlink.patch
@@ -1,5 +1,5 @@
---- a/src/Makefile.am	2011-06-17 17:31:54.078600741 +0200
-+++ b/src/Makefile.am	2011-06-17 17:32:05.491299944 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -2,7 +2,7 @@
             -DDATADIR=\""$(datadir)/lucidlife"\" \
             -DDOCDIR=\""$(datadir)/doc/lucidlife"\"
diff --git a/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild b/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild
index d899eb14600c..05012e421cc6 100644
--- a/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild
+++ b/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A Conway's Life simulator written in GTK+2 - fork from Gtklife"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -11,13 +12,24 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${DEPEND}
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib
+	dev-libs/gobject-introspection
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gnome-vfs.patch
@@ -37,5 +49,8 @@ src_install() {
 		pixmapdir=/usr/share/pixmaps \
 		DESTDIR="${D}"
 
+	# Let's just shift the docdir
+	mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
+
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }