gentoo resync : 28.04.2021

3 files changed, 14 insertions, 12 deletions

diff --git a/games-puzzle/glightoff/Manifest b/games-puzzle/glightoff/Manifest
index bb5b21bcc743..c62639e98e99 100644
--- a/games-puzzle/glightoff/Manifest
+++ b/games-puzzle/glightoff/Manifest
@@ -1,4 +1,4 @@
-AUX glightoff-1.0.0-desktop.patch 402 BLAKE2B 7963509566d34f84f6850385093774cd1829b6791e63494eaf774a2ec634288c68f57746046e47d76a8978dbf7dc9d6d4c6199a9c9358418a93d509892ac1c83 SHA512 4571865a471d210b5218775a09076bdc4003880e6683a245efeeba47a7e128822c11c6b1198fdfae21460900dce5fd747166c30f75c75d0322b1e8a68f7daa27
+AUX glightoff-1.0.0-desktop.patch 330 BLAKE2B 5bdeac9f9d8fe9aed9d80b3483775afee35b57f174f67c9b6cf1a368a309a1f01640982147f1b347abd7dbbccc46d901a230a6c7dbd2a7af20be2c8f517b8288 SHA512 53f637623de641a9948a45998edeb513a448dd12ce9bc264318dccdc7505fdb450ca1ca7926319bc505dfb1ab399b5ab9f087673e9137642765d4c38ac964e3c
 DIST glightoff-1.0.0.tar.gz 349274 BLAKE2B 1c8198215ad1b5229f7ca9ef55df2858cf61474d18343ab0d506ace2104807573b29a3e570c5b88149fa788601c4f2fda872f2f36948cbd8f0de3dc2c5193293 SHA512 b3be7f65bfbb6b3affbddd20a12321ee401defb2bc0b64e58b5aed05d319e6ac51100cfa8dfb4beddb3c919deb9ee6931235dbc4183c12d3e501da5eb748ae94
-EBUILD glightoff-1.0.0-r1.ebuild 703 BLAKE2B 03d9201fa1b7dcc37f33affeb79add8924fe982e218f6ee652d5ec352eec2e9ba0b4cb42ddfe87abab8c1d3cee95488710dc9cd3080b4cc8d3a940e99ea0ef25 SHA512 2ea4bc1971fe1352c5c3e94a8150e20000ac5a8ffec0e295f3f39a645416c340d6470c2ebfc4499f218e47a0661d66d5092a51e223d4b61015416aa7084b3433
+EBUILD glightoff-1.0.0-r1.ebuild 702 BLAKE2B 5c580c494e6bdf708150a1e14eb4549dd09847563dab61aaa1c450722a97817a0c54e80c99ab6e845b7a1d8a7391c89cd563b637f89b9b6151a0354d8f10c3cf SHA512 7aa53a6ce6c8fe24a116be2d197d8ce77d3e37d595fe24ca9ede571cc27dafb399430eb5a6928566216852ae6a2b78d73cb67adfd704a0c666e8c8aab7e83b26
 MISC metadata.xml 332 BLAKE2B 31bf81162a12c4192ab3fcf74e2e72c1f0f188c163e74b6db1de3986de1c335d641250c125732172fd7a2412edad4a97f01e53dd0f7e9470163fae5e3947210a SHA512 83debe37911969e2b45ad0ca5ff90684a7d7e3dc3fd4bb504aa537c3c7823b68131f8e919075c9e5806d6b29a8874086f3c69fbfbb1335898d241d8b46f70e70
diff --git a/games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch b/games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch
index 0d087d78df9f..503735eb168f 100644
--- a/games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch
+++ b/games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch
@@ -1,5 +1,5 @@
---- glightoff.desktop.in.old	2014-11-22 17:57:47.019838007 +0100
-+++ glightoff.desktop.in	2014-11-22 17:58:15.484321664 +0100
+--- a/glightoff.desktop.in
++++ b/glightoff.desktop.in
 @@ -1,10 +1,9 @@
  [Desktop Entry]
 -Encoding=UTF-8
diff --git a/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild b/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
index 5a209fa62cf1..5ef63e773900 100644
--- a/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
+++ b/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG="yes"
+EAPI=7
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="A simple (but not so easy to solve!) puzzle game"
 HOMEPAGE="http://glightoff.sourceforge.net/"
@@ -13,24 +12,27 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	gnome-base/librsvg
 	media-libs/libpng:0=
 	>=x11-libs/gtk+-2.6:2
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-util/intltool-0.29
+	media-libs/libpng
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-desktop.patch
+)
+
 src_prepare() {
 	# Fix broken png files
 	pngfix -q --out=out.png glightoff.png
 	mv -f out.png glightoff.png || die
 
-	epatch "${FILESDIR}/${PN}-1.0.0-desktop.patch"
-
 	gnome2_src_prepare
 }