[gentoo-commits] repo/gentoo:master commit in: games-puzzle/xye/, games-puzzle/xye/files/

[Ionen Wolkens]

commit:     87b96fc04aaa92689ae86d94b5db350ebae17376
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 07:36:17 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 07:58:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87b96fc0

games-puzzle/xye: EAPI 6->7, fix AbsoluteSymlink

Also restore .desktop sub-category using the correct entry.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../xye/files/xye-0.12.2-fix-desktop-file.patch    |  2 +-
 games-puzzle/xye/xye-0.12.2.ebuild                 | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch b/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
index 99558ef2873..1f51bfb4133 100644
--- a/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
@@ -7,7 +7,7 @@ Fix .desktop file to comply with FDO specifications.
  Exec=xye
  Type=Application
 -Categories=Application;Game;PuzzleGame
-+Categories=Game
++Categories=Game;LogicGame
  Name=Xye
  GenericName=Xye
  Comment=Solve puzzles and action challenges in order to get all the gems in the room.

diff --git a/games-puzzle/xye/xye-0.12.2.ebuild b/games-puzzle/xye/xye-0.12.2.ebuild
index dd5d31b2b2a..1dec87af8d3 100644
--- a/games-puzzle/xye/xye-0.12.2.ebuild
+++ b/games-puzzle/xye/xye-0.12.2.ebuild
@@ -1,9 +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
+EAPI=7
 
-inherit autotools xdg
+inherit autotools eapi8-dosym xdg
 
 DESCRIPTION="Free version of the classic game Kye"
 HOMEPAGE="http://xye.sourceforge.net/"
@@ -12,23 +12,23 @@ SRC_URI="mirror://sourceforge/xye/${P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	media-fonts/dejavu
 	media-libs/libsdl[video]
-	media-libs/sdl-ttf
-	media-libs/sdl-image[png]"
+	media-libs/sdl-image[png]
+	media-libs/sdl-ttf"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.2-fix-buildsystem.patch
-	"${FILESDIR}"/${PN}-0.12.2-fix-c++14.patch
-	"${FILESDIR}"/${PN}-0.12.2-fix-desktop-file.patch
+	"${FILESDIR}"/${P}-fix-buildsystem.patch
+	"${FILESDIR}"/${P}-fix-c++14.patch
+	"${FILESDIR}"/${P}-fix-desktop-file.patch
 )
 
 src_prepare() {
 	default
+
 	mv configure.{in,ac} || die
 	eautoreconf
 }
@@ -37,6 +37,6 @@ src_install() {
 	default
 
 	# create symlinks for previously bundled fonts
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/res/DejaVuSans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf /usr/share/${PN}/res/DejaVuSans-Bold.ttf
+	dosym8 -r /usr/share/{fonts/dejavu,${PN}/res}/DejaVuSans.ttf
+	dosym8 -r /usr/share/{fonts/dejavu,${PN}/res}/DejaVuSans-Bold.ttf
 }