[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, games-puzzle/skladnik/, games-puzzle/ksokoban/

[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, games-puzzle/skladnik/, games-puzzle/ksokoban/

[Andreas Sturmlechner]

commit:     4ad70416aa0b0efe2d5bbe15e7bb258f7a532d90
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 16:12:25 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 17:03:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad70416

games-puzzle/skladnik: rename games-puzzle/ksokoban

Closes: https://bugs.gentoo.org/920695
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 games-puzzle/ksokoban/metadata.xml                        | 10 ----------
 games-puzzle/{ksokoban => skladnik}/Manifest              |  0
 games-puzzle/skladnik/metadata.xml                        | 15 +++++++++++++++
 .../skladnik-0.5.0_pre20210905.ebuild}                    | 11 +++++++----
 .../skladnik-9999.ebuild}                                 | 10 +++++-----
 profiles/updates/4Q-2023                                  |  1 +
 6 files changed, 28 insertions(+), 19 deletions(-)

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/ksokoban/Manifest b/games-puzzle/skladnik/Manifest
similarity index 100%
rename from games-puzzle/ksokoban/Manifest
rename to games-puzzle/skladnik/Manifest

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-0.5.0_pre20210905.ebuild b/games-puzzle/skladnik/skladnik-0.5.0_pre20210905.ebuild
similarity index 62%
rename from games-puzzle/ksokoban/ksokoban-0.5.0_pre20210905.ebuild
rename to 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/ksokoban/ksokoban-9999.ebuild b/games-puzzle/skladnik/skladnik-9999.ebuild
similarity index 73%
rename from games-puzzle/ksokoban/ksokoban-9999.ebuild
rename to games-puzzle/skladnik/skladnik-9999.ebuild
index 6659d8b4de5f..48dcf8c610f2 100644
--- a/games-puzzle/ksokoban/ksokoban-9999.ebuild
+++ b/games-puzzle/skladnik/skladnik-9999.ebuild
@@ -1,15 +1,15 @@
-# 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"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023
index 7c54eda77c51..78fe1d963e7a 100644
--- a/profiles/updates/4Q-2023
+++ b/profiles/updates/4Q-2023
@@ -39,3 +39,4 @@ move dev-python/blake3-py dev-python/blake3
 move games-action/minetest games-engines/minetest
 move app-laptop/tuxedo-keyboard app-laptop/tuxedo-drivers
 move dev-libs/clhpp dev-cpp/clhpp
+move games-puzzle/ksokoban games-puzzle/skladnik