gentoo resync : 17.07.2021

3 files changed, 14 insertions, 14 deletions

diff --git a/games-puzzle/xye/Manifest b/games-puzzle/xye/Manifest
index 4177bee11980..9ed783866c6a 100644
--- a/games-puzzle/xye/Manifest
+++ b/games-puzzle/xye/Manifest
@@ -1,6 +1,6 @@
 AUX xye-0.12.2-fix-buildsystem.patch 1020 BLAKE2B 6408b6df99db5ca103183a7cee8905f7cc1c851d7e2f00e60334b806517841eab0896028e0a178fcfdf42e0bd672a8594c47caae2ac629d915ceff9af883dab6 SHA512 d4b08db4eb5ee4b3e1e98e9faeda87aafe17ae444cb0a8400c9206c2871b56801040bddeffb13dfed0170094d48ffac593209b2ad69896f8993521d0b0929cf1
 AUX xye-0.12.2-fix-c++14.patch 502 BLAKE2B e3116515757af9e84d5bac340947df1e88e768058a3dfb65e0894388ad8e0fa98f63e6c16314e35b288fff8639d8f46972999c031e077d3417218c09bc9c00a7 SHA512 c9dcc309b5e451f1608174de4f6016d006879d2267627eebe8ff524af293137af90f4761c8eacbc5ebd9ee633cc7d087e23eb3e7c4970f5484e065dfa8dff3af
-AUX xye-0.12.2-fix-desktop-file.patch 414 BLAKE2B 3d4f87e6db2144407eaf5161d73184d23eabd4742dbc1f68e59d8932257491eb429d68d12d910ee311fdbafecd4c118a6ad9f9b3b225157384035868ced3ee48 SHA512 c798ed5da4e45b0a8d5aaa4dd77fe09d9cb08837a33b44a5c69f89e4d2456fb5964c4fc5646a83fd6166d315200924944ab6dd7eea3f983e4be403a8f14f8c9e
+AUX xye-0.12.2-fix-desktop-file.patch 424 BLAKE2B 9ab00bc1e2bc706556cb070e63e0c43090521ac8146bd5377834491c0b3c18374a21013a020a8664c46cd25fa48247e5d501a532ebb91d812a707c7fd9b1b0b1 SHA512 e94792912c0997226f2099057e5ad08fd0fbbd3bcb6a164ed0cab05c8d86337b381aac614dbfff6c36c0ca82af75011d8325ef63d343e6bb03fd7dfa8ee0f1fd
 DIST xye-0.12.2.tar.gz 2860290 BLAKE2B 426cd4afb84c0de8bdbafe9b63d0da2f686593449b4577ae0eb77e38364bcac166cb9bf4a3a41f7d15a0a1745bc9574f959e0429998c00ad78a6fe40c49093f1 SHA512 a31d922e0a0660d269d30430fbaf1d00924b0271db697f3cbc89b78815e597e11743bd9018fbf3f2f9e7561ad3469e9cca28687efaae7fc6dcba40ada2b5effa
-EBUILD xye-0.12.2.ebuild 933 BLAKE2B b1057bf7efbf494560e061c1ff8c6340b6911405eedeee52cc6c238b06c59430bf1656c6f1ae022a60aa580af00a52e1061e732c3591c799ac22c922b0edce41 SHA512 c22d78ace9f2da94a7ca966b7b3b9579860b2e48f46d5c85ff787d10d1a7e773c9388453cbb56739692e824284e50ce5d77bae680ad6bb545ab06b5f2751af77
+EBUILD xye-0.12.2.ebuild 869 BLAKE2B d9411d4198db6f80168bbe7486e0586bb91f26d3c6d089e68e70f0dadce67348d9f059d56354ce551cf709e3e605c456ef13a16e192617fa365c1e40376d7479 SHA512 9bfa0eb75547299c53665ae0f29e33bde636f053e58a029427ba1defec2e557dc5012fca66e557bb76766d5651a09c5d09c2fa278e5b9c3067b7bd1145828fe1
 MISC metadata.xml 326 BLAKE2B 8f368cb2e89ca46600917931c95285943f8ededa8a3c1c6fe1602a11c68a00f53429be467d28a49cf9a0989cb6b6f0cfa70ded461f2b6f9adeb86e8c05a49e52 SHA512 05084d9dcce50a1d4302a83cb89abd67519143384ff6c1ca3f84e10db468483cf90e4d10c240dc58f47b10df747725c86514db303efaeca048d44a3085bb7fe6
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 99558ef28732..1f51bfb41336 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 dd5d31b2b2a0..1dec87af8d3b 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
 }