gentoo resync : 10.09.2021

7 files changed, 63 insertions, 70 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 9cfd6fdc233a..bbf2721ce746 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/arrows/Manifest b/games-puzzle/arrows/Manifest
index 14cbc0307882..b99a81b8b612 100644
--- a/games-puzzle/arrows/Manifest
+++ b/games-puzzle/arrows/Manifest
@@ -1,3 +1,3 @@
 DIST arrows-0.6.tar.gz 53374 BLAKE2B ba31d4ef1bc6e48ada197a13a359004a661a6dcf8875933da2a74f57ad90c3b0d422fd4c2427c4eb340fb26870952ebaa679ff8b0f88d7470f012bc3b8c0f868 SHA512 f6c55d616283ad25d9d830440deaa11de81bccfc2d8eabe627104626ea111d986e522f73d61e5aed58476cc34a3e2b3fe2a20ab1538b7ecef04ecb941f34d83e
-EBUILD arrows-0.6-r1.ebuild 895 BLAKE2B 2aab21a3b6e89451fe1972cd0eace456542641a47bde688958ee0602c75bce6b1fde432603c17c41e97ece3535a71eea7ad4da586dfce99928c4dac224e6e15e SHA512 bf8e71f225251531348c42b99cbd2718a9c68975e26f66f5b8ca16418f0efe4c0664bf00c7d86986d1e3bbc5fef344d413ba824ea03ea2b7131a29278c00d9cc
+EBUILD arrows-0.6-r2.ebuild 922 BLAKE2B 73033fe5fc38936cc78380efed8b33290a683124b893153607d58f52971569f57194b5054fb850dde76ec5f461b8b7032c414aa1a17cc378ce051f24667de38e SHA512 e658b22710d5a8198e279958a6a644f682b326f8909b21f9df06df8a428bb542dc38d73e9dafa6c81fd029e7b5037ee1908c00c3e87bd7acb9d87a644e8e1bab
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/arrows/arrows-0.6-r1.ebuild b/games-puzzle/arrows/arrows-0.6-r1.ebuild
deleted file mode 100644
index 5e3b5c6834b5..000000000000
--- a/games-puzzle/arrows/arrows-0.6-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Simple maze-like game where you navigate around and destroy arrows"
-HOMEPAGE="http://noreason.ca/?file=software"
-SRC_URI="http://noreason.ca/data/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.4:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	# Modify path to data
-	sed -i \
-		-e "s:arrfl:/usr/share/${PN}/arrfl:" \
-		-e 's:nm\[9:nm[35:' \
-		-e 's:nm\[6:nm[30:' \
-		-e 's:nm\[7:nm[31:' \
-		game.c \
-		|| die 'sed failed'
-	sed -i \
-		-e '/^CC /d' \
-		-e '/CCLIBS/s:$: $(LDFLAGS):' \
-		Makefile \
-		|| die 'sed failed'
-}
-
-src_compile() {
-	make clean || die "make clean failed"
-	emake CCOPTS="${CFLAGS}"
-}
-
-src_install() {
-	dobin arrows
-	insinto "/usr/share/${PN}"
-	doins arrfl*
-	einstalldocs
-}
diff --git a/games-puzzle/arrows/arrows-0.6-r2.ebuild b/games-puzzle/arrows/arrows-0.6-r2.ebuild
new file mode 100644
index 000000000000..020deb8745c5
--- /dev/null
+++ b/games-puzzle/arrows/arrows-0.6-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Simple maze-like game where you navigate around and destroy arrows"
+HOMEPAGE="http://noreason.ca/?file=software"
+SRC_URI="http://noreason.ca/data/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Modify path to data
+	sed -i \
+		-e "s|arrfl|${EPREFIX}/usr/share/${PN}/arrfl|" \
+		-e 's|nm\[9|nm[35|' \
+		-e 's|nm\[6|nm[30|' \
+		-e 's|nm\[7|nm[31|' \
+		game.c || die
+}
+
+src_compile() {
+	emake clean
+	emake CC="$(tc-getCC)" CCOPTS="${CFLAGS}" LINKOPTS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin arrows
+
+	insinto /usr/share/${PN}
+	doins arrfl.[1-5]
+	einstalldocs
+
+	make_desktop_entry ${PN} ${PN^} applications-games
+}
diff --git a/games-puzzle/ksokoban/Manifest b/games-puzzle/ksokoban/Manifest
index 87fadde8e2ee..60b1151cbd2d 100644
--- a/games-puzzle/ksokoban/Manifest
+++ b/games-puzzle/ksokoban/Manifest
@@ -1,4 +1,4 @@
-DIST ksokoban-0.5.0_pre20190225.tar.gz 433196 BLAKE2B 5c5c132b09165798042d1f41ffc282dc41e70bc1f0573bd55373c237dc7d8424119b2c78ae6bfb741193e3699d7120c952da66f579993189332da4104c8711d9 SHA512 3377a07f646501d37f30da66e70954894e39c8b5b948cd230263bfeeec4483b4fb2fec7d00aa020fff4459df5d376a1861dea63fc1b0a2a90757066a210a5be8
-EBUILD ksokoban-0.5.0_pre20190225.ebuild 857 BLAKE2B e13e3ff703bd861e7aad92cf8edd2ba8a10355ef62a75f05bd65789c9b3f306ee9ff090a9eb575d3524821c0904c5da47182ebdd9035d8d738de4f2b68752cc6 SHA512 4617d0b1a651f8c8952df16ac783008aa392dda7ddc040a152087693f181991d76708a9d33a90e51b72b973e9df3cbea078906feaa1fcf09d969907f8e84b96e
-EBUILD ksokoban-9999.ebuild 680 BLAKE2B d924aec88ced6787b7650047a0addbf19d1f5bcf26502dbaf9ffc2c344f8ad3a1d4c2d29b87274042e1c3cf01c3c4fac3f70f91338bae7dafe91c06eced08b4f SHA512 c55be8831b2a1180bc573241bb82d103b0a1c8ea66f5519dc64c4a5db65b8cf6ee99563fcfce18b4734dd965ff5a8356907ebd38df50777f887c15f662085dff
+DIST ksokoban-0.5.0_pre20210905-39b9d1c1.tar.gz 444752 BLAKE2B f68376081a1ac038b64438439b17028e573b70454d820fd08c265b4a70467a51d34ca0cdd2b490b04a98c5445bf3d18dd9f7ff319258eb2e13eaf94d9b8be09e SHA512 e8cb0096c826c82c2098832885e6fc1ef7e9eb7dfc518be7c7bc68ea4f0ad68b6f72db89822f47b6aad91cd8ab395340a42426bb4c6723ee51914cf13ce9a4d8
+EBUILD ksokoban-0.5.0_pre20210905.ebuild 710 BLAKE2B 8ef557767952df2de10cbb3de44b2d3ef68101fbd0612938e2595409166cd73f0e6f98efa1df8f54256e7aea4160cd468c1960e166a561652fe4955f5fd9b7d0 SHA512 aba419abb7dd9afae4ecd8ada3ef3b49ccdda5491f850c1885682a73bb71fbb626a74d320bc370a9b038cb62280221e260ee9173004b7d204833f6848aebbb5d
+EBUILD ksokoban-9999.ebuild 638 BLAKE2B 23ed65385e68efc2523148fb891774f1a6ce5977c61ea4ef2589173ca4f1f38970631e0e39858bc9c60e32595307c9951c007f10fb6e0b49ee1b7a25250b36bc SHA512 19418fc239aa8ef85f8bf59ed8cb20d21f268f80ece939b23ff2e3cfd62af302c58273de8750e7bd79f8f86ec5f166583e9664fe45198a3879803e23e519d885
 MISC metadata.xml 296 BLAKE2B 8abfdabec906c0024c978d0df7911b26d1df5c21269f78f6b327da8ae9a3955e0a091540741553cd9b805cdae52c09c713d868df83fa92c59e43b203d5db3219 SHA512 50facad52c9acec67642e499d377ccd05b7a18f578f0d71b6b8b222e6ac6a310b24913d9374bb9ba995fbc3cd55612f79ae562c8fe9ecd1e451d472505bd8e14
diff --git a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20210905.ebuild
index 08ededa85199..1035f3d3a619 100644
--- a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild
+++ b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20210905.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-COMMIT="317b1e70a87224c94cac85955a3d666a43527812"
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KDE_ORG_COMMIT=39b9d1c1702a21a6e0fae82876c29c1f6bb77fae
+KFMIN=5.82.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
-DESCRIPTION="The japanese warehouse keeper game"
+DESCRIPTION="The Japanese warehouse keeper game"
 HOMEPAGE="https://invent.kde.org/games/ksokoban"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,8 +26,4 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
+DEPEND="${RDEPEND}"
diff --git a/games-puzzle/ksokoban/ksokoban-9999.ebuild b/games-puzzle/ksokoban/ksokoban-9999.ebuild
index c1fce45cc775..6659d8b4de5f 100644
--- a/games-puzzle/ksokoban/ksokoban-9999.ebuild
+++ b/games-puzzle/ksokoban/ksokoban-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="optional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.82.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="The Japanese warehouse keeper game"
@@ -25,6 +25,4 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-"
+DEPEND="${RDEPEND}"