gentoo resync : 16.11.2017

3 files changed, 33 insertions, 41 deletions

diff --git a/games-puzzle/ksokoban/Manifest b/games-puzzle/ksokoban/Manifest
index dfc0087a43ab..05dac8325c66 100644
--- a/games-puzzle/ksokoban/Manifest
+++ b/games-puzzle/ksokoban/Manifest
@@ -1,5 +1,5 @@
-DIST ksokoban-0.5.0_pre20120725.tar.xz 345344 SHA256 fb1c47e37b7d6297960f67377f9bac0deb9c4b132c251c02cdd75d1935bc2b5c SHA512 b7a962a5915bb6f10ecb85dfaae20b009a6c40ba0312e02d12b654e196bdef82159e7f0d6fca17b1befaa1cb17db1a9268822904cdf9bdc8bd1bacf2202b460c WHIRLPOOL 3026b04a4a50da8097a926949ab80e736d0f77f814f437aa87a39c6b5805ab0636cb6dde5a1ab74a76b56ce17b44176bf393c5ffe66e86314b30b77ae9921b4c
-EBUILD ksokoban-0.5.0_pre20120725.ebuild 871 SHA256 aed18b33d8070ac67fb6401a226ad55d7c1da915d225f2b9d12d57f72ff874f1 SHA512 c54531d805db6bd72e323db769601df13340cd01fc1d6b2789175ee1922a84304b94ef3f4c95b0636ba2f74a3a7eae6f38ff4b6b7650aaadc976f6b4269fa769 WHIRLPOOL 336fb8bae8a0560fcf60a5c1885cc74e1a8e9486a32ae1baacecd02dcd934aa93f0e79c51e6f5872c97ffc966404dc695a54ab015b98a32f1c86c7acfc63f1ee
+DIST ksokoban-0.5.0_pre20170827.tar.gz 433276 SHA256 05b513bfa18c303366cff7b245d8369974c56e64225b1a0634560b66fa2f8cae SHA512 50b650733c021fe95ea087fdfc6e354071b587156ddc38dc1ae571d893c555bf7405f7d089403d3af3b907a956a3d5dc7beecc9279c8c687b867ac813c796d31 WHIRLPOOL 08e7d43a77d8567e8d83a6a3d7b9879e2703db7df59bf4340b0344055738e26c5bef8ba2858446d62bf669b7d136dbcc0011afe2d69f6a0c1b63d92e17cd17e3
+EBUILD ksokoban-0.5.0_pre20170827.ebuild 802 SHA256 f6c63dbd42819af89c8d464ec2c00aaa610eee315b46e02882abccd7fdcb86b2 SHA512 a5406f5e8ed282f0b3f388b662ff8888f6b6075617980046b123c1a44ae15ca00ca04e652d6653d3e0b7b4cf570c9969b6880b2416084b64f94477258b0f7d9a WHIRLPOOL 7fec279c4302dacccf868e9ea4ae7ef1f5de29a2b713774941276b514dd9403740b67ea10ae72fffa35c297aea2229eb27e941fca993c0db3618fdffaae37a2b
 EBUILD ksokoban-9999.ebuild 651 SHA256 342f5644536a7194e454be89b70f99ee88df64c1eccc03c455b789a56f716ad9 SHA512 3fc37f0460f2fe7539b343e2ece45d16d91847bfa086dbfcaae6409ed1438e1891d749d9d393adaf4e87492052e11890818c314989fdd736508e1b04b48d0133 WHIRLPOOL f48c013bce08f15ec2d40cfb456a59ceb1d3e9f5b157ee782916b262e4c914954dbd5640798b9094f9c453b7665acc680ac05955879228b7f62d1602d0ab1522
 MISC ChangeLog 2864 SHA256 347b87283b401cab2f4a68aa64f2c60ba47cd58e1474d8a107a76e2e1e8841e3 SHA512 cd164eeb7ae765117147e56c560912713315b1b14b6d1ec3d51987c6fd75ebe57ea0201fca72aced23f3eaec730fddd0adf0ec947e0daa4251aa9b41cc0d8fb4 WHIRLPOOL b29a3da1abb706a72d019a1dbb6214b757265b5ac67c122b3fd2139b2063c0d755e7fff3ee872e3075143e1bf57383fe4c566d5553c1a04c23a353f36a194ffb
 MISC ChangeLog-2015 628 SHA256 474274472c03cf73145b02b18be18aeef1c2e60f788cb96936b1b93feddf367f SHA512 c8afbe11383731e7f6e2bbe85ef34d98eb935d4fbbec01d5c7d2fd6d82125ba9ba2cbd47068dc4973cb523c39964162e28370e3c97cc777a416f87ccf6786465 WHIRLPOOL 05219be318311dc18ffd27294bad81be8d6be3201007767a6c5fc8066575194b396e08310714d84fc772bc4745ca45be4bfa5e183488540a279dd36fd1245f19
diff --git a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild
deleted file mode 100644
index 248af7967e33..000000000000
--- a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]]; then
-	inherit mercurial
-	EHG_REPO_URI="http://hg.code.sf.net/p/ksokoban/code"
-else
-	SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit cmake-utils
-DESCRIPTION="The japanese warehouse keeper game"
-HOMEPAGE="https://sourceforge.net/projects/ksokoban/"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="kde-frameworks/kdelibs:4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-CMAKE_IN_SOURCE_BUILD="yes"
-
-src_prepare() {
-	sed -i 's/%m//' "data/${PN}.desktop" || die "sed for desktop file failed"
-}
-
-# source lacks install target
-src_install() {
-	dobin ksokoban
-	dodoc AUTHORS NEWS TODO
-	domenu "data/${PN}.desktop"
-	for i in 16 22 32 48 64 128; do
-		doicon -s "${i}" "data/hi${i}-app-${PN}.png"
-	done
-}
diff --git a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20170827.ebuild b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20170827.ebuild
new file mode 100644
index 000000000000..109daa9faf8b
--- /dev/null
+++ b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20170827.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=048b42324ef6dac807af4351174065cda2f32f44
+EGIT_BRANCH="port-to-kf5"
+KDE_HANDBOOK="optional"
+inherit kde5 vcs-snapshot
+
+DESCRIPTION="The japanese warehouse keeper game"
+HOMEPAGE="https://cgit.kde.org/ksokoban.git"
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"