gentoo auto-resync : 25:12:2023 - 19:30:41

8 files changed, 76 insertions, 24 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index c3bbb934fd1d..b55db99813b6 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/ksokoban/Manifest b/games-puzzle/ksokoban/Manifest
deleted file mode 100644
index 3bf3ecf81285..000000000000
--- a/games-puzzle/ksokoban/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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 297 BLAKE2B 9949c433ed13953afb3bf626b0dcda1cf495fa7017839964edd5c60aafeadc82dac1569ada9eede6707e8977be18bf4fee0808e2a0af4d9245c073e73b16b693 SHA512 f820764a6a860c939f5fa1f2087a1582f3821dda2e8a6231fae2989085356146ffc13e8f8013535f8459a6734d45f519833a0ee61f7e83e18c27b64d8996d3f1
diff --git a/games-puzzle/ksokoban/metadata.xml b/games-puzzle/ksokoban/metadata.xml
deleted file mode 100644
index 1243142d00a9..000000000000
--- a/games-puzzle/ksokoban/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ksokoban</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/skladnik/Manifest b/games-puzzle/skladnik/Manifest
new file mode 100644
index 000000000000..f4a5e063aba5
--- /dev/null
+++ b/games-puzzle/skladnik/Manifest
@@ -0,0 +1,6 @@
+DIST ksokoban-0.5.0_pre20210905-39b9d1c1.tar.gz 444752 BLAKE2B f68376081a1ac038b64438439b17028e573b70454d820fd08c265b4a70467a51d34ca0cdd2b490b04a98c5445bf3d18dd9f7ff319258eb2e13eaf94d9b8be09e SHA512 e8cb0096c826c82c2098832885e6fc1ef7e9eb7dfc518be7c7bc68ea4f0ad68b6f72db89822f47b6aad91cd8ab395340a42426bb4c6723ee51914cf13ce9a4d8
+DIST skladnik-0.5.0.tar.xz 397672 BLAKE2B f498d5d2e9dca2d9a4c79f97500698b362e273979474f9acb2b050ffe4feee59cc77f2068e9f23d75b0e70ed45fbf4d19a7addbf431c63506d08650402ce9f97 SHA512 43cbd3545ca2b83b7c91a47c9ad8d2534fc285345859a1af315cc15fa19239e879831174edfb975f4b1424d61399e097b7578987e75aa462704d7d6bed7fd817
+EBUILD skladnik-0.5.0.ebuild 868 BLAKE2B 337c443271cd2b91ffd45c67ec9125e644aff15e2df5294ee383018a4ad58ec2f987db885be33a9660090096bed8dd9c5492218e305b390469a7d54c9c13815d SHA512 4484d62f940b7c337818d27e70aa52c9efff7c12ce7d2bb9d15c6d64a5878c8cc0897c671940d67e2e717c7a7fa8e71bebc8eb4f252760073e53512269bcd3a6
+EBUILD skladnik-0.5.0_pre20210905.ebuild 828 BLAKE2B 29ec424680550bd3c88e9d7d22c4bc4267fe0cddf2fe6c0a80e5c6196160017815792cda34c4031ace5dc7c686d4cb828beb1ed5c340845b608762e081228b45 SHA512 7d182d4e0062b14e496969ab0e369240637c47bd11f2353678a791cd9b634c624ccb8551460a1b9b987f05e169a55d7dce7dd9dc4849f09515614eab700b84ed
+EBUILD skladnik-9999.ebuild 868 BLAKE2B 337c443271cd2b91ffd45c67ec9125e644aff15e2df5294ee383018a4ad58ec2f987db885be33a9660090096bed8dd9c5492218e305b390469a7d54c9c13815d SHA512 4484d62f940b7c337818d27e70aa52c9efff7c12ce7d2bb9d15c6d64a5878c8cc0897c671940d67e2e717c7a7fa8e71bebc8eb4f252760073e53512269bcd3a6
+MISC metadata.xml 503 BLAKE2B 8be9718e48d319f1b5aa697e2019d617615a3248e94db8695811bea3f56aafef4b3f29b98b4ff93bdba4685adc3cece5e6742185eb8fe566bfcfe5059a6b3277 SHA512 579efdc76b044693cd1a8dd91a169587d542bcf8a78d5cfd0e948ee9c9c38472261700cff6d8ee30dc26287d0e7d026d9045fbb1af4ff3da526bbe72455cae4d
diff --git a/games-puzzle/skladnik/metadata.xml b/games-puzzle/skladnik/metadata.xml
new file mode 100644
index 000000000000..eb4e7a6e4b40
--- /dev/null
+++ b/games-puzzle/skladnik/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>bircoph@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=skladnik</bugs-to>
+		<remote-id type="kde-invent">games/skladnik</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/ksokoban/ksokoban-9999.ebuild b/games-puzzle/skladnik/skladnik-0.5.0.ebuild
index 6659d8b4de5f..da92df44477c 100644
--- a/games-puzzle/ksokoban/ksokoban-9999.ebuild
+++ b/games-puzzle/skladnik/skladnik-0.5.0.ebuild
@@ -1,24 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 ECM_HANDBOOK="optional"
-KFMIN=5.82.0
-QTMIN=5.15.2
+KFMIN=5.106.0
+QTMIN=5.15.9
 inherit ecm kde.org
 
-DESCRIPTION="The Japanese warehouse keeper game"
-HOMEPAGE="https://invent.kde.org/games/ksokoban"
+DESCRIPTION="The Japanese warehouse keeper sokoban game"
+HOMEPAGE="https://invent.kde.org/games/skladnik"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/libkdegames-22.12.0:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
@@ -26,3 +32,4 @@ RDEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 DEPEND="${RDEPEND}"
+BDEPEND="media-gfx/povray"
diff --git a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20210905.ebuild b/games-puzzle/skladnik/skladnik-0.5.0_pre20210905.ebuild
index 1035f3d3a619..d120f2c326c1 100644
--- a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20210905.ebuild
+++ b/games-puzzle/skladnik/skladnik-0.5.0_pre20210905.ebuild
@@ -1,16 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KDE_ORG_COMMIT=39b9d1c1702a21a6e0fae82876c29c1f6bb77fae
+KDE_ORG_COMMIT="39b9d1c1702a21a6e0fae82876c29c1f6bb77fae"
+MY_P="ksokoban-${PV}-${KDE_ORG_COMMIT:0:8}"
 KFMIN=5.82.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
-DESCRIPTION="The Japanese warehouse keeper game"
-HOMEPAGE="https://invent.kde.org/games/ksokoban"
+DESCRIPTION="The Japanese warehouse keeper sokoban game"
+HOMEPAGE="https://invent.kde.org/games/skladnik"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/games-puzzle/skladnik/skladnik-9999.ebuild b/games-puzzle/skladnik/skladnik-9999.ebuild
new file mode 100644
index 000000000000..da92df44477c
--- /dev/null
+++ b/games-puzzle/skladnik/skladnik-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org
+
+DESCRIPTION="The Japanese warehouse keeper sokoban game"
+HOMEPAGE="https://invent.kde.org/games/skladnik"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/libkdegames-22.12.0:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${RDEPEND}"
+BDEPEND="media-gfx/povray"