kde-apps: Move kdeedu-meta 15.12.3 from kde overlay

Package-Manager: portage-2.2.27

65 files changed, 1535 insertions, 11 deletions

diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index 59c6706b6083..b2d721dd3bdf 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1 +1,2 @@
+DIST analitza-15.12.3.tar.xz 232928 SHA256 2b69d6692c91e3bf7c8abe053f2dd85f708ae8502a3a0559d67e12f8dd4ee543 SHA512 09b70419d4073027be426efcc9275ae4f7ffd6f431c1e7ae4b9a43bc301fe73dd4eb8d39e72f81e668af152895b282a480f17f2397bc73fdde66275fb097d548 WHIRLPOOL 5374303755461af18440331835bd4c48d544b6d81312a98c20840d5983b1d808cfa8c06fe13db1eb369781ffbfe071b1b957218ba8397bdacfae6599bf3af8c9
 DIST analitza-4.14.3.tar.xz 199964 SHA256 00227cf6006c2ee08d83ca3b502662bba331c3d007013e6bc981114cfccce422 SHA512 ac79692671bb82e5759ce7c030e21710e24e40be05a5c987f5e5b1107a8e24898937394fa8bac2825fbb77de8bef4e2d8b71d55db9b42e5746b60d144060efa0 WHIRLPOOL 2cf3c6944a03739f5cd4c2c8ab32789f15a060814238c557e3dec2ff4f51c26718dda2b8083d9a5c211c9804a3bc11d24464c8f70aac62e1ed3d97aa5bd1eca4
diff --git a/kde-apps/analitza/analitza-15.12.3.ebuild b/kde-apps/analitza/analitza-15.12.3.ebuild
new file mode 100644
index 000000000000..aaed74f3eee1
--- /dev/null
+++ b/kde-apps/analitza/analitza-15.12.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE library for mathematical features"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="eigen opengl"
+
+DEPEND="
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	eigen? ( dev-cpp/eigen:3 )
+	opengl? (
+		$(add_qt_dep qtopengl)
+		virtual/opengl
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Nothing is installed
+	sed -i \
+		-e "/add_subdirectory(examples)/ s/^/#DONT/" \
+		analitzaplot/CMakeLists.txt || die
+
+	if ! use test ; then
+		sed -i \
+			-e "/add_subdirectory(tests)/ s/^/#DONT/" \
+			analitza{,gui,plot}/CMakeLists.txt || die
+	fi
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package eigen Eigen3)
+		$(cmake-utils_use_find_package opengl OpenGL)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/analitza/metadata.xml b/kde-apps/analitza/metadata.xml
index 2fdbf33d963d..006469792bc7 100644
--- a/kde-apps/analitza/metadata.xml
+++ b/kde-apps/analitza/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index 0b299ac0a63e..af28e1e73301 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1 +1,2 @@
+DIST artikulate-15.12.3.tar.xz 3743640 SHA256 a12293fd319f51e37fdf716f88e1cf0f907b11454d5431cd531237f9e77db001 SHA512 5e5af44e18a6ad6270af8ed5236df0bd4df39017609c4a5ce9c5e091abe7cc6c11f45bf42e33b712f6665ea1ec264645e0522a89d2404c2f68e622786ead888d WHIRLPOOL 538482e8f4a49d7c2fec4fe7cb56f5e5f88ca1eab715669a2aaf41ab16d4932fae78052b20234cdcb6296a13a1cfcc373d812a0acbb90260ff1e8bc090b8dec4
 DIST artikulate-4.14.3.tar.xz 3850740 SHA256 d30197496b36358eeb43013d27e25950e91eea83274abbcd614f09e3381eebea SHA512 ef2421229fd88ecc85d0f4f98f847c9607459f3c58a1b3c3e9cb9204deb789504085819a757f80160179150cdbcdab3c7711ece3c6b85be2fb449229c2a1a572 WHIRLPOOL a62d1c7cd429c1cc0ad0a903206bf297d6b8759954569eb958318b50892e691c4216fc6c76ad761a7e240d0c98195740fcdbaa164dfa87e8b52d88380d54d814
diff --git a/kde-apps/artikulate/artikulate-15.12.3.ebuild b/kde-apps/artikulate/artikulate-15.12.3.ebuild
new file mode 100644
index 000000000000..07c5ea38f269
--- /dev/null
+++ b/kde-apps/artikulate/artikulate-15.12.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Language learning application that helps improving pronunciation skills"
+HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	>=media-libs/qt-gstreamer-1.2.0[qt5]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index f73642071bfe..f0926ef770e6 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1 +1,2 @@
+DIST blinken-15.12.3.tar.xz 567496 SHA256 a1cb720a21f2c870ad60b2afa1e4f5cdd02db6bfc33e588d83cf1c039f715312 SHA512 28b5d84e265c8ef10a390555f11a39222a73c1d8158ac95bba6411f0ed9d402d13bf93720389d8cef3723efc96a81825f74ac82e88bbb2f9e604f089138c31a2 WHIRLPOOL c3707b7c22e9e59689f0ccdb098de446af552d616cf65a39ab5f5aa1c0f356ee018a896066cf638709f4f562d7c840b5a3e5efca9d18fb30fe3f297cbafd7b38
 DIST blinken-4.14.3.tar.xz 565784 SHA256 7c14af0d6e9b3e8132ae0d15f24fc12f5b53edd44ca4de6a4df1fd4e8cdcae7e SHA512 7def87717f62645b029d916ab5f666fb15d93c1f2aeb7706eccd080959693face7b12a1b85c58a0ae1ba8644d94509490881cb984ce0570d69985ad0f0703fd9 WHIRLPOOL a20c563f6d60cbffcbbb1b623e88d89943ac88179ebeaa42b53b325973b2b9324e46ab74e7ca67dd98846decc004d051e3bdb739bb42f0c3359ae0d0ee584c86
diff --git a/kde-apps/blinken/blinken-15.12.3.ebuild b/kde-apps/blinken/blinken-15.12.3.ebuild
new file mode 100644
index 000000000000..c0bdefbea022
--- /dev/null
+++ b/kde-apps/blinken/blinken-15.12.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE version of the Simon Says game"
+HOMEPAGE="https://www.kde.org/applications/education/blinken
+https://edu.kde.org/blinken"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5]
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	kde5_src_install
+
+	rm "${D}"/usr/share/${PN}/README.packagers
+}
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 1580c8227f82..fc4bf40dc85f 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1 +1,2 @@
+DIST cantor-15.12.3.tar.xz 350924 SHA256 0c67d99038cc7b2f59de6f001337267131e3d420035dd10a05b860859afe423b SHA512 0544574803085fdad61eb2a6896fa7b5b7fc8bd96ebb251f3b3c5efafcb9dc0e30cf8a8719c3bd8e77bcbf140e7798b8cce498ccb92db415e4e816dd19ecd0d8 WHIRLPOOL 62e637230e997bd65c098f9f92245e50c0c67d790d4b6138133188ddbedbc102254701626b9e7828c7ad8dc25602e39c00fd3a42429c580dd5ba9eeffd01aa00
 DIST cantor-4.14.3.tar.xz 342140 SHA256 8fc81454666aa082ab392ae796f233acfb83a46fd9064952c643d89bed4565e1 SHA512 5da20030a74ef4f3b9d59f37d07b4a893b1f9cfea43728b4aa7c0aefe219d0de554201bbbf57ab9cd3e10a97ba381171cd2a907843246c42616da2a5d6b6afa9 WHIRLPOOL e5d46da3a7081d23fbb47e51c96ae58cac32a6d90354bc335bfb1926ec6586070da64ee7b973aeebbe75d81eea5858fdceadecc667f17c49bbb3fb48ea43db58
diff --git a/kde-apps/cantor/cantor-15.12.3-r1.ebuild b/kde-apps/cantor/cantor-15.12.3-r1.ebuild
new file mode 100644
index 000000000000..aac9cbea7562
--- /dev/null
+++ b/kde-apps/cantor/cantor-15.12.3-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+PYTHON_COMPAT=( python2_7 )
+# FIXME: PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Interface for doing mathematics and scientific computing"
+HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="analitza lua postscript python qalculate +R"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
+# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*')
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	analitza? ( $(add_kdeapps_dep analitza) )
+	lua? ( dev-lang/luajit:2 )
+	qalculate? (
+		sci-libs/cln
+		sci-libs/libqalculate
+	)
+	postscript? ( app-text/libspectre )
+	python? ( ${PYTHON_DEPS} )
+	R? ( dev-lang/R )
+"
+DEPEND="${RDEPEND}
+	>=dev-cpp/eigen-2.0.3:2
+"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+
+pkg_setup() {
+	use python && python_setup
+	kde5_pkg_setup
+}
+
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
+	sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
+		-i src/backends/CMakeLists.txt || die
+
+	if ! use test ; then
+		sed -e "/add_subdirectory(test)/ s/^/#DONT/" \
+			-i src/lib/CMakeLists.txt || die
+		sed -e "/add_subdirectory(tests)/ s/^/#DONT/" \
+			-i src/backends/python3/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package analitza Analitza5)
+		$(cmake-utils_use_find_package lua LuaJIT)
+		$(cmake-utils_use_find_package postscript LibSpectre)
+		$(cmake-utils_use_find_package python PythonLibs)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake-utils_use_find_package R R)
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! use analitza && ! use lua && ! use python && ! use qalculate && ! use R; then
+		echo
+		ewarn "You have decided to build ${PN} with no backend."
+		ewarn "To have this application functional, please do one of below:"
+		ewarn "    # emerge -va1 '='${CATEGORY}/${P} with 'analitza', 'lua', 'python', 'qalculate' or 'R' USE flag enabled"
+		ewarn "    # emerge -vaDu sci-mathematics/maxima"
+		echo
+	fi
+}
diff --git a/kde-apps/cantor/files/cantor-15.12.3-tests.patch b/kde-apps/cantor/files/cantor-15.12.3-tests.patch
new file mode 100644
index 000000000000..5cea78d6c3a6
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-15.12.3-tests.patch
@@ -0,0 +1,49 @@
+--- a/src/backends/maxima/CMakeLists.txt	2016-03-21 02:16:05.549024821 +0100
++++ b/src/backends/maxima/CMakeLists.txt	2016-03-21 02:22:07.951014021 +0100
+@@ -21,12 +21,14 @@
+   target_link_libraries(cantor_maximabackend KF5::Pty)
+ endif(NOT WIN32)
+ 
++if (BUILD_TESTING)
+ add_executable( testmaxima testmaxima.cpp)
+ target_link_libraries( testmaxima
+   cantorlibs
+   cantortest
+   ${QTTEST_LIBRARY}
+ )
++endif()
+ 
+ install( FILES cantor_maxima.knsrc  DESTINATION  ${KDE_INSTALL_CONFDIR} )
+ install( FILES keywords.xml cantor-initmaxima.lisp DESTINATION ${KDE_INSTALL_DATADIR}/cantor/maximabackend)
+--- a/src/backends/sage/CMakeLists.txt	2016-03-21 01:23:19.251791138 +0100
++++ b/src/backends/sage/CMakeLists.txt	2016-03-21 01:27:16.300827617 +0100
+@@ -17,12 +17,14 @@
+ 
+ target_link_libraries( cantor_sagebackend KF5::Pty)
+ 
++if (BUILD_TESTING)
+ add_executable( testsage testsage.cpp)
+ target_link_libraries( testsage
+   ${QT_QTTEST_LIBRARY}
+   cantorlibs
+   cantortest
+ )
++endif()
+ 
+ install( FILES cantor_sage.knsrc  DESTINATION  ${KDE_INSTALL_CONFDIR} )
+ install( FILES keywords.xml DESTINATION ${KDE_INSTALL_DATADIR}/cantor/sagebackend)
+--- a/src/backends/python2/CMakeLists.txt	2016-03-21 01:28:39.055793038 +0100
++++ b/src/backends/python2/CMakeLists.txt	2016-03-21 01:35:01.451012440 +0100
+@@ -20,10 +20,12 @@
+     cantor_pythonbackend
+     )
+ 
++if (BUILD_TESTING)
+ add_executable(testpython2 testpython2.cpp)
+ target_link_libraries(testpython2 ${QT_QTTEST_LIBRARY} cantorlibs cantortest)
+ 
+ add_test(NAME testpython2 COMMAND testpython2)
++endif()
+ 
+ install(FILES cantor_python2.knsrc  DESTINATION  ${KDE_INSTALL_CONFDIR})
+ install(FILES python2backend.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 64fb83b1a9a7..55984abfe60a 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1 +1,2 @@
+DIST kalgebra-15.12.3.tar.xz 256164 SHA256 0a6e8b1e776487aed34807ae6f0048eb2f927e68557baa042c0e440fc6424835 SHA512 6b3bf7040763856b449b6e3a91d2c819bd2886725719d0235777b2a1e0b47f92eaf3c13d2b82be52d824db69286c74831b2ae08fe633055604947feceb1af720 WHIRLPOOL 8490d2bf07202e27cd2aeda9f77675941521bab6a96690425ca5b7408c8f856e3bf3c3bb927343faaa82f09c27c183e899c5e676ddb94e87896152d31329d2ff
 DIST kalgebra-4.14.3.tar.xz 274600 SHA256 3a9b9fe63c8d1b6d9326d098254e5e4a32bb48f3b4514fb055e0896aebbdf67d SHA512 23f49a1389117dab08212de4130c49c7ed269d2d4adbb80b2f4c24d3e25b882495d79702db1d459b7cc83135914d17b48a1ef9333371a7eb4bc0d79858ebf65a WHIRLPOOL 429f6fe06ff00a2968e5a62b5553bef57f8654794c31e393140b959928690afa7ecbabe5f907618df7067906481f3489f75e04fdc5dc2f8989a081beb309fb28
diff --git a/kde-apps/kalgebra/kalgebra-15.12.3.ebuild b/kde-apps/kalgebra/kalgebra-15.12.3.ebuild
new file mode 100644
index 000000000000..f5f685b41e08
--- /dev/null
+++ b/kde-apps/kalgebra/kalgebra-15.12.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="MathML-based graph calculator for KDE"
+HOMEPAGE="https://www.kde.org/applications/education/kalgebra
+https://edu.kde.org/kalgebra"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="opengl readline"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep analitza 'opengl?')
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	opengl? (
+		$(add_qt_dep qtopengl)
+		$(add_qt_dep qtprintsupport)
+		virtual/glu
+	)
+	readline? ( sys-libs/readline:0= )
+"
+RDEPEND="${DEPEND}
+	!kde-apps/analitza:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package opengl OpenGL)
+		$(cmake-utils_use_find_package readline Readline)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index ca92e9d8a15a..8f78dd6cf5bc 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1 +1,2 @@
+DIST kalzium-15.12.3.tar.xz 3944560 SHA256 a1c2a052997db83ccf3ad827330d7227cb6b34d56225762cb45e7e3641512c53 SHA512 70808cd3df8b15941146444410f75c955dc925417a89e4b77612680d2a0bda53124e3c44e2b632c095408287db5481c32535a608b48e938d22a43b624073a271 WHIRLPOOL 03d538cebab06c24725a06ebee29fb79fc46ac25a261594a6e2d2eb69664ea5e88067831dd5c21f938ab40483806132c2c0106beef783d6e9766f99017e6c27c
 DIST kalzium-4.14.3.tar.xz 3944960 SHA256 4b8d086c942874c56b4835079991f2d86289d163d2dbb3e86390270c758317e5 SHA512 11f6f06379571cb92a7cb0c13d068596b2cbe014a5974dce628ac138c20f50ca5c207c4b6328c0c4d83dadf75d43455ce6794564933f2520dc1589570ddada94 WHIRLPOOL 50d392d8aac63dcc7143db1b2dd3e7e7c411f6457d4005b5313a0043bf68178f12c20b60e278697687aca28720b2759522c2f135dd1143873149bb4c3a754234
diff --git a/kde-apps/kalzium/kalzium-15.12.3-r1.ebuild b/kde-apps/kalzium/kalzium-15.12.3-r1.ebuild
new file mode 100644
index 000000000000..33f5630df872
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-15.12.3-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+OPENGL_REQUIRED="always"
+inherit kde4-base flag-o-matic
+
+DESCRIPTION="KDE: periodic table of the elements"
+HOMEPAGE="https://www.kde.org/applications/education/kalzium
+https://edu.kde.org/kalzium"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="editor debug solver"
+
+DEPEND="
+	editor? (
+		>=dev-cpp/eigen-2.0.3:2
+		sci-chemistry/avogadro
+		>=sci-chemistry/openbabel-2.2
+	)
+	solver? ( dev-ml/facile[ocamlopt] )
+"
+RDEPEND=${DEPEND}
+
+KMEXTRACTONLY="
+	libkdeedu/kdeeduui/
+	libkdeedu/libscience/
+"
+
+src_configure(){
+	# Fix missing finite()
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
+
+	local mycmakeargs=(
+		$(cmake-utils_use_with editor Eigen2)
+		$(cmake-utils_use_with editor Avogadro)
+		$(cmake-utils_use_with editor OpenBabel2)
+		$(cmake-utils_use_with editor OpenGL)
+		$(cmake-utils_use_with solver OCaml)
+		$(cmake-utils_use_with solver Libfacile)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 7e191f19e4a8..2c9e68589812 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1 +1,2 @@
+DIST kanagram-15.12.3.tar.xz 4789992 SHA256 f2ffeeee716d94d42e7ffbf70079f3ab8575256cca870dd0612f37485c60b0a9 SHA512 9b03cd394928203177450168a1e8387358b8f6b53535c981e5d6977f18e9bc3c3e654b022ce243666ec24ed0e5dea1a49b66bce0176c5ac07bc50d6eb5f97e4c WHIRLPOOL b473c06f63d28acb51baea14e1ee1766de503af3273aa91590f3243c68f617dd5abb772767cb528a1b3559a28c08ceb5335fd16712739251cab832aff6bfb7e4
 DIST kanagram-4.14.3.tar.xz 4612252 SHA256 95e551f5c1d923d0c3dbca4a024b0381fab7c35f56e7a9ce26fdb75ccc28495b SHA512 b8150717ffa61012bfcceec1defe739573f9b91fbe0089d340aa924624806a9629a183740980e6dbd6e206e1b33e0b18600c6900ff43f754e1373f7e3ba27427 WHIRLPOOL e016993986001abedefbb4d373756a4fcc5ade99c6d8ab24d385c9ef1a0133ea7a862563c2e8d76f04b52cf208add1fb653024d3b1465662d27a691760ca52fe
diff --git a/kde-apps/kanagram/kanagram-15.12.3.ebuild b/kde-apps/kanagram/kanagram-15.12.3.ebuild
new file mode 100644
index 000000000000..ba2cf887c345
--- /dev/null
+++ b/kde-apps/kanagram/kanagram-15.12.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Game based on anagrams of words"
+HOMEPAGE="https://www.kde.org/applications/education/kanagram
+https://edu.kde.org/kanagram"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5]
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdeedu-data)
+	$(add_qt_dep qtmultimedia 'qml')
+	$(add_qt_dep qtquickcontrols)
+"
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index 0e3928c1c4f3..1e0b5a93c5bf 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1 +1,2 @@
+DIST kbruch-15.12.3.tar.xz 905476 SHA256 e1d7abe0f7cba3d5b9a147901e7904e8e90a0812051d683c3abf0de9e28d8df8 SHA512 0d5df6f4e14ae0a0e0318c5c3017f43b5ac97a4d573950f99760b05c7bb5cab2f029300ebfe0b373295627236a4e5b7b5e47621d742f49339ea81fe7dc3dde20 WHIRLPOOL 03b70bc17a3ca8764eb26886c4e94a366281fc5ded4fdd397645e79af40e2b65729dcc44d4e5a188091ead28547bc021e0b1def9310b2efe38dac497c2e9cbf2
 DIST kbruch-4.14.3.tar.xz 902924 SHA256 9fa0084eb4a06ce16353a37f16c43d2e683c3590c6f01c24f4f0a98831042d4b SHA512 fbba4966e41928c712dfb7edb809a410a8824d8eb70206dab058c2353c4eca3761d531d0a8ecd978805ff9504364bc255d0a504c9a57f2fe4c66a84ab6897afd WHIRLPOOL a23188ba51801cd17c52d8f2d755d5a621c17b10d2f476261777ce5539ee4cc76471dd4d5bf81bec48b777a9d22296ecaee61c178f3873149bf30a60ccebedd5
diff --git a/kde-apps/kbruch/kbruch-15.12.3-r1.ebuild b/kde-apps/kbruch/kbruch-15.12.3-r1.ebuild
new file mode 100644
index 000000000000..fdb008c1bdc8
--- /dev/null
+++ b/kde-apps/kbruch/kbruch-15.12.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Educational application to learn calculating with fractions"
+HOMEPAGE="https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
new file mode 100644
index 000000000000..bef61d386f40
--- /dev/null
+++ b/kde-apps/kdeedu-data/Manifest
@@ -0,0 +1 @@
+DIST kdeedu-data-15.12.3.tar.xz 96580 SHA256 1ed8f9ea64538c8b2928610ab131306bfdd023d88fb45f334abf77392dd65aa2 SHA512 b9017d889eb5e56e69b22b125949d0d3cba9cf6d252f5acde6cdc8e2dcb92338d81a6bf9f39e645f243763bb092657bce7e219bd776bb01bb686fa68dd97d157 WHIRLPOOL 6c88b6f346795d24f696f03aefe8392ae5226580a63edc5f9f077f97a9b9b1252614eb97856185bfa2a2cd59bd79b4ddb968e81ad793c55f74a96e1e3c742ca4
diff --git a/kde-apps/kdeedu-data/kdeedu-data-15.12.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-15.12.3.ebuild
new file mode 100644
index 000000000000..c58281912d06
--- /dev/null
+++ b/kde-apps/kdeedu-data/kdeedu-data-15.12.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="Shared icons, artwork and data files for educational applications"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="$(add_frameworks_dep extra-cmake-modules)"
+RDEPEND=""
diff --git a/kde-apps/kdeedu-data/metadata.xml b/kde-apps/kdeedu-data/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-apps/kdeedu-data/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-15.12.3-r1.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-15.12.3-r1.ebuild
new file mode 100644
index 000000000000..3bd6d9ca8592
--- /dev/null
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-15.12.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
+HOMEPAGE="https://edu.kde.org"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_kdeapps_dep analitza)
+	$(add_kdeapps_dep artikulate)
+	$(add_kdeapps_dep blinken)
+	$(add_kdeapps_dep cantor)
+	$(add_kdeapps_dep kalgebra)
+	$(add_kdeapps_dep kalzium)
+	$(add_kdeapps_dep kanagram)
+	$(add_kdeapps_dep kbruch)
+	$(add_kdeapps_dep kdeedu-data)
+	$(add_kdeapps_dep kgeography)
+	$(add_kdeapps_dep khangman)
+	$(add_kdeapps_dep kig)
+	$(add_kdeapps_dep kiten)
+	$(add_kdeapps_dep klettres)
+	$(add_kdeapps_dep kmplot)
+	$(add_kdeapps_dep kqtquickcharts)
+	$(add_kdeapps_dep kstars)
+	$(add_kdeapps_dep ktouch)
+	$(add_kdeapps_dep kturtle)
+	$(add_kdeapps_dep kwordquiz)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_kdeapps_dep marble)
+	$(add_kdeapps_dep parley)
+	$(add_kdeapps_dep rocs)
+	$(add_kdeapps_dep step)
+"
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index c98842b461b4..3a9cad4a56da 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1 +1,2 @@
+DIST kgeography-15.12.3.tar.xz 6714820 SHA256 a628d7e8e4dd504fa7edcf3ba59287dd5ec8cbbf2a50a2fe208e4604e4cb58a7 SHA512 25ab1d6fcd58ccba9a8ff723aff8801f9a9d18e6040e0b0f9c53a7a93ec95cf50ae90f996ecb212e96589ee995566662dc908d1a7fa4858b03216873b9128d76 WHIRLPOOL e6bc867080f0297221720a1ff4518b380caa69f6a78369dd9462d80a822e15566172e2783112e90635567800491f1d67be537b380bb6fe8b2fa06fcec4a5cf22
 DIST kgeography-4.14.3.tar.xz 6707392 SHA256 44b26e6f08a53b946d3884dbd08486eaed33051f202959bd1901ae19ba38a788 SHA512 a468a05240d3163e6d177fbbcfb506d26083d5571e157b071cd1f05829485ce1251037a7a38be1e05bed037fbf66af8d10f34140c25490dcb76e568403fa9974 WHIRLPOOL f4a68eae9bc96647517da8f64251397cbf9388590f052eb727129665070fd30761e8c7a20811790d36150f047bc8a53679edc5b680034c69c8f8ee4659e0ab86
diff --git a/kde-apps/kgeography/files/kgeography-15.12.0-kcrash.patch b/kde-apps/kgeography/files/kgeography-15.12.0-kcrash.patch
new file mode 100644
index 000000000000..94ee6ec262ee
--- /dev/null
+++ b/kde-apps/kgeography/files/kgeography-15.12.0-kcrash.patch
@@ -0,0 +1,54 @@
+From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
+Date: Thu, 31 Dec 2015 13:02:56 +0000
+Subject: Enable KCrash.
+X-Git-Url: http://quickgit.kde.org/?p=kgeography.git&a=commitdiff&h=099cc1be8431e5e3b7109287cc0168aa35815df9
+---
+Enable KCrash.
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,8 +14,8 @@
+ 
+ find_package (Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets)
+ 
+-find_package (KF5 REQUIRED COMPONENTS
+-    XmlGui WidgetsAddons CoreAddons ConfigWidgets I18n ItemViews IconThemes Service DocTools
++find_package (KF5 5.15 REQUIRED COMPONENTS
++    XmlGui WidgetsAddons CoreAddons ConfigWidgets I18n ItemViews IconThemes Service Crash DocTools
+ )
+ 
+ include(KDEInstallDirs)
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -38,6 +38,7 @@
+                                  KF5::WidgetsAddons
+                                  KF5::CoreAddons
+                                  KF5::ConfigWidgets
++                                 KF5::Crash
+                                  KF5::I18n
+                                  KF5::ItemViews
+                                  KF5::IconThemes
+
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -13,6 +13,7 @@
+ #include <qapplication.h>
+ #include <qcommandlineparser.h>
+ #include <Kdelibs4ConfigMigrator>
++#include <KCrash>
+ #include "kgeography.h"
+ 
+ int main(int argc, char *argv[])
+@@ -33,6 +34,8 @@
+ 
+         app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kgeography")));
+ 
++	KCrash::initialize();
++
+ 	QCommandLineParser parser;
+ 	about.setupCommandLine(&parser);
+ 	parser.process(app);
+
diff --git a/kde-apps/kgeography/files/kgeography-15.12.0-kservice.patch b/kde-apps/kgeography/files/kgeography-15.12.0-kservice.patch
new file mode 100644
index 000000000000..3eacfb95c2e1
--- /dev/null
+++ b/kde-apps/kgeography/files/kgeography-15.12.0-kservice.patch
@@ -0,0 +1,33 @@
+commit 509c48f9040172e555e2243234bc2f8a853d80c7
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Thu Dec 31 20:39:40 2015 +0100
+
+    Remove unused dependency
+    
+    REVIEW: 126586
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f7f7b76..9c1f6c1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,7 +15,7 @@ set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+ find_package (Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets)
+ 
+ find_package (KF5 5.15 REQUIRED COMPONENTS
+-    XmlGui WidgetsAddons CoreAddons ConfigWidgets I18n ItemViews IconThemes Service Crash DocTools
++    XmlGui WidgetsAddons CoreAddons ConfigWidgets I18n ItemViews IconThemes Crash DocTools
+ )
+ 
+ include(KDEInstallDirs)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 8307954..a07ba4e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -42,7 +42,6 @@ target_link_libraries(kgeography KF5::XmlGui
+                                  KF5::I18n
+                                  KF5::ItemViews
+                                  KF5::IconThemes
+-                                 KF5::Service
+ )
+ install(TARGETS kgeography EXPORT KGeography ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+ 
diff --git a/kde-apps/kgeography/kgeography-15.12.3.ebuild b/kde-apps/kgeography/kgeography-15.12.3.ebuild
new file mode 100644
index 000000000000..d022a8e0d7ad
--- /dev/null
+++ b/kde-apps/kgeography/kgeography-15.12.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Geography learning tool"
+HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
+https://edu.kde.org/applications/all/kgeography"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-15.12.0-kcrash.patch"
+	"${FILESDIR}/${PN}-15.12.0-kservice.patch"
+)
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index 90ca184fddcc..f4d440d1f6a4 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1 +1,2 @@
+DIST khangman-15.12.3.tar.xz 3930624 SHA256 945c45ccc122b2ea8c107c64228d6b5ca15a5b60a819927c88525ad7c15b12a8 SHA512 79c826f83f56fc16d5a78caf91e33e6711128b52bb5e6080cbc447f4ee74f969a240359790963819c49c58c802be91d3cdf3028b82976e40c66dc91b5fa120b6 WHIRLPOOL f2bc1486545d89e65515b76b0d0e5f178620cbea70d81095ff74a2e0aa57a6bdc6623812e0c84c0faca7ade26f13e010db5b51d68f253c85a71275f290a97de3
 DIST khangman-4.14.3.tar.xz 3945696 SHA256 3d7e721a72d1477f630af985c88658a677c1ec8d380d3a6f838b6aa71f75ad71 SHA512 46d99a3f26e559ebe272e1f342e964a64f007e1d0e4383b74f561f29409b55b554d4804e6bca150995ac0bf2c24c9c915caa7c27582ef680729975683a3fc0a8 WHIRLPOOL 64180f0f018c513363094cb79af9bed854607fde9a8d9c05230cd58de792ffcf9ac3dbbbef8af52e225b2fccd673b5762964e8b9006aa4f47921a1c85ce486f3
diff --git a/kde-apps/khangman/khangman-15.12.3.ebuild b/kde-apps/khangman/khangman-15.12.3.ebuild
new file mode 100644
index 000000000000..dfbca4ed2617
--- /dev/null
+++ b/kde-apps/khangman/khangman-15.12.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Classical hangman game for KDE"
+HOMEPAGE="https://www.kde.org/applications/education/khangman
+https://edu.kde.org/khangman"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5]
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdeedu-data)
+"
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index c750e014ee35..fe726faf0619 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1 +1,2 @@
+DIST kig-15.12.3.tar.xz 1516568 SHA256 eb42d5244b40eded199b2332717dac19ce6e99da8a40969f87329d921a088e8b SHA512 8219286b1a45cd401a91b5eb9a5a4275998e685c59f0dce7b9ead695541b39ec31eb69beda1d55793c6b7b48e48529628f9c582dcf78c33dac1f6003663293a9 WHIRLPOOL 4988299a5ccdc86bfcfd46ac7392fa6db797bb2396a81ccf161f30b0d7ca1b2f644738d093582642201dceee0e7bcbd98d7857ec233944bba1657b6a905f11ef
 DIST kig-4.14.3.tar.xz 1506492 SHA256 2e71d86b14b4d09722b54e7b239c238558d35227465c0e5c62e9e6eb34cce3ce SHA512 218fce708a3fa5478bb50bd5a239479655a8168f8df069b819578701165f9ad9202015600eb2c44ff9580355459ce423ef83814d771079adebb940fa137a5813 WHIRLPOOL 6992a150ab19a373dd4fe791babd10a1cc65b61d5c01827c12b6b51183d43a0ba8f46105a6f2c710217dea8f3e3d3e9351ea3bdef0ca3a9fe6bad171c00fb479
diff --git a/kde-apps/kig/kig-15.12.3.ebuild b/kde-apps/kig/kig-15.12.3.ebuild
new file mode 100644
index 000000000000..46972f49fc20
--- /dev/null
+++ b/kde-apps/kig/kig-15.12.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 kde5
+
+DESCRIPTION="KDE Interactive Geometry tool"
+HOMEPAGE="https://www.kde.org/applications/education/kig https://edu.kde.org/kig"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="geogebra scripting"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	geogebra? ( $(add_qt_dep qtxmlpatterns) )
+	scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_prepare() {
+	kde5_src_prepare
+
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package geogebra Qt5XmlPatterns)
+		$(cmake-utils_use_find_package scripting BoostPython)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kig/metadata.xml b/kde-apps/kig/metadata.xml
index a1907072504d..dced816a5d5e 100644
--- a/kde-apps/kig/metadata.xml
+++ b/kde-apps/kig/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<use>
-		<flag name="scripting">Support Python scripting</flag>
-	</use>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="geogebra">Support files created by <pkg>sci-mathematics/geogebra</pkg></flag>
+		<flag name="scripting">Support Python scripting</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index e62d16355d1b..ae3efbffbcff 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1 +1,2 @@
+DIST kiten-15.12.3.tar.xz 11682252 SHA256 459f5ca7fd1cbedb88573f6fee50d5fcb50b6ace4891ff05cd84cd71df65f418 SHA512 29f26dd962533775d68d7a793195c3b013fe32dd2c8f1206e40304a1375afabef03c9f31c734916a7ed369aecc8de86881a1c65480492c613517517f2c6e053f WHIRLPOOL 3c49b2260a2ef387c8e5c304fa41da60d8ba2b3047f0bbffed16131b0b3b8f847d1ddbed2927ee17da9be41201abda0038371ef789d76861695d3984684e437e
 DIST kiten-4.14.3.tar.xz 11680148 SHA256 f9746426d1a157ae9bd51b210803f7693c49ecb7e34c6821eeb421ab66c0c69e SHA512 d0aca2a0dc13a92df6396953c09149cca925ffb85fcac744d7ebf090e76ffbf5922683c55ad03e49727d6ae68e82baa7232992005e0c33455afd0142985b63fa WHIRLPOOL 46e2a8057ea779c69c341a3e3293c6fd4c5e0eadfeb20e44f6854f831f16b66358f60581630b96d3afee3ae71b20b47125e0e23f4ebbd01f64eeb6777799817f
diff --git a/kde-apps/kiten/kiten-15.12.3.ebuild b/kde-apps/kiten/kiten-15.12.3.ebuild
new file mode 100644
index 000000000000..d45681a7579f
--- /dev/null
+++ b/kde-apps/kiten/kiten-15.12.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Japanese dictionary and reference"
+HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index 34c91c75b259..32fc487bd62f 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1 +1,2 @@
+DIST klettres-15.12.3.tar.xz 2786464 SHA256 2c34e7b3e5ca4e4094f6cdb3e5c87d2c17260606e4491c409806d91872e109a9 SHA512 685647190ccbd033635ae5aa15774772daecebeb173f283fa833442ab5453ed89140ab89d441856772c04a95379bd4274edb4a5fd9c497320216332e958e78ec WHIRLPOOL 74c48760d4df8c62def9380c028ee0ae82b50c27a282d07aa4ead482a5d75024671b5d0de0e2c30ddd3e1d49dd899ad653799618cc82ad89e5bedbc18acc3142
 DIST klettres-4.14.3.tar.xz 2814412 SHA256 145c93848095ee02784639dc1cec9772f6af08d9e5b2322cd8cc3a151b336e07 SHA512 7769f0e6efb842ab038066970188a46bb3d43c02af8d8f540c52bfba0f01a4f0e3bc65b7743d6bef9c92b6564f5656264aec352ba52937c7effabbc0d11a0a25 WHIRLPOOL 33c4e5b67f010dd0f55b279b023f1377cef23330de81f79753f9b80143e107ec3208a6eef0a4caee832e7a1d24f8e131ab1199a35bba05e35fedd51fc81a65a8
diff --git a/kde-apps/klettres/klettres-15.12.3.ebuild b/kde-apps/klettres/klettres-15.12.3.ebuild
new file mode 100644
index 000000000000..d15052c0d697
--- /dev/null
+++ b/kde-apps/klettres/klettres-15.12.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Alphabet learning application"
+HOMEPAGE="https://www.kde.org/applications/education/klettres
+https://edu.kde.org/klettres"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 1422724cdfd0..7687ba951a25 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1 +1,2 @@
+DIST kmplot-15.12.3.tar.xz 662868 SHA256 211f7be7e4537d162b2f36b67a26ea339813f2c5c208d314702ba20f5931bcf3 SHA512 837927cc0d8f35315ae1f9bb92d34e326197719941f0f602290a5f5439639ed9b64c18742c8a1869f1d4e31c2a860423cfa96748721aac29c48b1f429c41f597 WHIRLPOOL 396b793d2a845986fc30e70d27bb8e05b00c6a16b52bb0bab5490c77ec58e1d7a91df695ea33e2fbdd188fae3b1bfeab781952337457275648ecbd684ace04e4
 DIST kmplot-4.14.3.tar.xz 659892 SHA256 06ad930e91e8458d62817ee8295d1deb81a8096452e6826e8bce35abe08b52f5 SHA512 eb23f4c1766602582680ba3f7dce57af7a00975db92961b2f0e7a07dc07c5b8d7e2a61825d951d50c5f6aaa21e1d0c1d7e3175263737b9f247191b05e4e301a9 WHIRLPOOL b9f6097f15a8210b0a6a579f6c565e21b3d2f8c02d134d8e4a655cf56afd0b425de73966617bd5dfc771727381002bb5b89004a87a5d054ca3233abefefc04c4
diff --git a/kde-apps/kmplot/kmplot-15.12.3.ebuild b/kde-apps/kmplot/kmplot-15.12.3.ebuild
new file mode 100644
index 000000000000..b0566b044e66
--- /dev/null
+++ b/kde-apps/kmplot/kmplot-15.12.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Mathematical function plotter"
+HOMEPAGE="https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index 97ab96bfa00e..ccfd4e9f47cd 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1 +1,2 @@
+DIST kqtquickcharts-15.12.3.tar.xz 20500 SHA256 a49e2bab0ae17423290f19a68ccbbb7a61dfb80895d35b0c454ce22e4045ddd3 SHA512 cf7075f9d1a0df612325253adbd457863b17b42ba79b6dece98a83f7f47c26283bad20f6b13821a0c6964c7b28b2efe210d78072caaddbe01df1f9a47f46b4d5 WHIRLPOOL 7f93b69e67f846d29b672147e6fd20b634ab8972f80d1278db82112646c5a88ebaab3c0d8a785acabc215f82d9826c57d5f5ae156d9ff35057e2144a73aec318
 DIST kqtquickcharts-4.14.3.tar.xz 20472 SHA256 a595833029017c58b08b8c33be3d1d1d3ea51ea27d66b316ca2fa9dd994eb4ee SHA512 5d0d66b1e69ece2ef9edf74d3db369c3cc01a221419d0f4a475550a4224cb481580dd185609b72b6b37b003292718922e40965edb7d67d2cc6f297e859424289 WHIRLPOOL 9f00a9c354f6918d03b005e476f024ac4613c87c65bcce2bf0499d3c7acec638a28dda41392f1ae83533a98a4f8b345254d51ec201065a4381a4487ba89805b5
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-15.12.3.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-15.12.3.ebuild
new file mode 100644
index 000000000000..356bd2473c19
--- /dev/null
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-15.12.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DECLARATIVE_REQUIRED="always"
+inherit kde4-base
+
+DESCRIPTION="Qt Quick 1 plugin for beautiful and interactive charts"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="$(add_kdeapps_dep plasma-runtime)"
diff --git a/kde-apps/kstars/Manifest b/kde-apps/kstars/Manifest
index e26ec233ba61..b4906450566d 100644
--- a/kde-apps/kstars/Manifest
+++ b/kde-apps/kstars/Manifest
@@ -1 +1,2 @@
+DIST kstars-15.12.3.tar.xz 17064136 SHA256 b944eb9799250596990e5a0e3fcefe4c466f987980404bae09bb37fed70e43cd SHA512 a10326777fb4dc8565b4f1ae68cfe6c8f20b74e392eaabb72c67cc8afa8318e96de8a6685f04727e5d9db6d2dee9e35024a7d09e9ec7190192b035a1e0c406d6 WHIRLPOOL 71782f04b53dd0590b141f620b9c84d611fcf921ad9a37168c129722d8bc707ebe280d64b7184123a4e169eff2bbdb0c9f2195f9588ad12d119a1313fa1c8012
 DIST kstars-4.14.3.tar.xz 12374500 SHA256 771c46e8985724d7f5be74f4813bfba0a62cbb48e1c8d0cd27394a6f0ef15bde SHA512 c843506ae0d85e03b9ac3b11be73f35b66f9fc64adddf7a4643cb397fc59628920254aa056d7bf968b54893ce035d40d0c17a7d0fc576d3dae5799fd0f16ec3e WHIRLPOOL 752f69a01d8344aed4c276bb4920c6791bf223aac8c8adfb0ab9833425b625793978316033a1cfba5ae43d221896a9c93a4e5b43f19a42730cbe7fc282318a0a
diff --git a/kde-apps/kstars/files/kstars-15.12.0-unused-kf5-deps.patch b/kde-apps/kstars/files/kstars-15.12.0-unused-kf5-deps.patch
new file mode 100644
index 000000000000..0623845a20f1
--- /dev/null
+++ b/kde-apps/kstars/files/kstars-15.12.0-unused-kf5-deps.patch
@@ -0,0 +1,79 @@
+From: Akarsh Simha <akarsh@kde.org>
+Date: Thu, 31 Dec 2015 10:40:37 +0000
+Subject: [NEEDS TESTING] Remove "fake" KF5 dependencies from CMakeLists.txt
+X-Git-Url: http://quickgit.kde.org/?p=kstars.git&a=commitdiff&h=14ca537e2676267bed73a40f0b8efd94d7cbc761
+---
+[NEEDS TESTING] Remove "fake" KF5 dependencies from CMakeLists.txt
+
+Removed the following KF5 frameworks: JobWidgets, DBusAddons, TextEditor
+
+Moved the Notifications KF5 framework as required only if INDI is
+present.
+
+Builds both with and without INDI (but not in a completely thorough
+test) on my setup (ArchLinux)
+
+Jasem: please double check that it builds correctly for you too
+with/without INDI.
+
+CCMAIL: mutlaqja@ikarustech.com
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,16 +32,13 @@
+   GuiAddons
+   WidgetsAddons
+   NewStuff
+-  DBusAddons
++#  DBusAddons
+   I18n
+   Init
+-  JobWidgets
+   KIO
+   XmlGui
+   Plotting
+-  TextEditor
+   IconThemes
+-  Notifications
+ )
+ 
+ find_package(Eigen3 REQUIRED)
+@@ -61,6 +58,8 @@
+ find_package(INDI 1.2.0)
+ #FIXME is there a better way to do this?
+ if (INDI_FOUND)
++#FIXME is the following the right way of doing this?
++find_package(KF5 REQUIRED COMPONENTS Notifications)
+ SET(HAVE_INDI 1)
+ else(INDI_FOUND)
+ SET(HAVE_INDI 0)
+
+--- a/kstars/CMakeLists.txt
++++ b/kstars/CMakeLists.txt
+@@ -541,10 +541,9 @@
+         KF5::KIOFileWidgets
+         KF5::WidgetsAddons
+         KF5::Plotting
+-        KF5::TextEditor
+-        KF5::DBusAddons
++#        KF5::TextEditor
++#        KF5::DBusAddons
+         KF5::IconThemes
+-        KF5::Notifications
+         Qt5::Gui
+         Qt5::PrintSupport
+         Qt5::Sql
+@@ -561,7 +560,9 @@
+   target_link_libraries(KStarsLib ${CFITSIO_LIBRARIES})
+ endif (CFITSIO_FOUND)
+ if (INDI_FOUND)
+-  target_link_libraries(KStarsLib ${CMAKE_THREAD_LIBS_INIT} ${INDI_LIBRARIES} ${INDI_CLIENT_LIBRARIES} z)
++  target_link_libraries(KStarsLib ${CMAKE_THREAD_LIBS_INIT}
++  ${INDI_LIBRARIES} ${INDI_CLIENT_LIBRARIES}
++  KF5::Notifications z)
+ endif (INDI_FOUND)
+ if (WCSLIB_FOUND)
+     target_link_libraries(KStarsLib ${WCSLIB_LIBRARIES})
+
diff --git a/kde-apps/kstars/files/kstars-15.12.0-unused-qt-deps.patch b/kde-apps/kstars/files/kstars-15.12.0-unused-qt-deps.patch
new file mode 100644
index 000000000000..f819ec40decc
--- /dev/null
+++ b/kde-apps/kstars/files/kstars-15.12.0-unused-qt-deps.patch
@@ -0,0 +1,60 @@
+From: Jasem Mutlaq <mutlaqja@ikarustech.com>
+Date: Wed, 30 Dec 2015 17:02:20 +0000
+Subject: Removing unncessary dependencies on Qt modules for Test OpenGL QML QtQuick QtMultimedia. We should re-enable QML/QtQuick if someone manager to migrate what is interesting tonight tool
+X-Git-Url: http://quickgit.kde.org/?p=kstars.git&a=commitdiff&h=2f09f40aca053048ffb65621e3c18780cdc5cbe3
+---
+Removing unncessary dependencies on Qt modules for Test OpenGL QML QtQuick QtMultimedia. We should re-enable QML/QtQuick if someone manager to migrate what is interesting tonight tool
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,8 @@
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
+ 
+-find_package(Qt5 5.2 REQUIRED COMPONENTS Gui Qml Quick Xml Sql Svg OpenGL PrintSupport Multimedia Test)
++#find_package(Qt5 5.2 REQUIRED COMPONENTS Gui Qml Quick Xml Sql Svg PrintSupport)
++find_package(Qt5 5.2 REQUIRED COMPONENTS Gui Xml Sql Svg PrintSupport)
+ include(KDEInstallDirs)
+ include(KDECompilerSettings)
+ include(KDECMakeSettings)
+--- a/kstars/CMakeLists.txt
++++ b/kstars/CMakeLists.txt
+@@ -549,9 +549,8 @@
+         Qt5::PrintSupport
+         Qt5::Sql
+         Qt5::Svg
+-        Qt5::Multimedia
+-        Qt5::Qml
+-        Qt5::Quick
++        #Qt5::Qml
++        #Qt5::Quick
+ 	${ZLIB_LIBRARIES}
+         )
+ 
+--- a/kstars/kstars.cpp
++++ b/kstars/kstars.cpp
+@@ -39,7 +39,7 @@
+ #include "dialogs/finddialog.h"
+ #include "dialogs/exportimagedialog.h"
+ #include "observinglist.h"
+-#include "whatsinteresting/wiview.h"
++//#include "whatsinteresting/wiview.h"
+ 
+ #include "kstarsadaptor.h"
+ 
+--- a/kstars/kstarsactions.cpp
++++ b/kstars/kstarsactions.cpp
+@@ -30,8 +30,8 @@
+ #include <QDockWidget>
+ #include <QPointer>
+ #include <QInputDialog>
+-#include <QQuickWindow>
+-#include <QQuickView>
++//#include <QQuickWindow>
++//#include <QQuickView>
+ #include <QDebug>
+ #include <QAction>
+ #include <QFileDialog>
+
diff --git a/kde-apps/kstars/kstars-15.12.3.ebuild b/kde-apps/kstars/kstars-15.12.3.ebuild
new file mode 100644
index 000000000000..7e30f61935c9
--- /dev/null
+++ b/kde-apps/kstars/kstars-15.12.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_PUNT_BOGUS_DEPS="true"
+PYTHON_COMPAT=( python2_7 )
+inherit kde5 python-single-r1
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="indi wcs xplanet"
+
+# TODO: AstrometryNet requires new package
+# FIXME: doesn't build without sci-libs/cfitsio as of 15.04.0
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=sci-libs/cfitsio-0.390
+	sys-libs/zlib
+	indi? (
+		$(add_frameworks_dep knotifications)
+		>=sci-libs/indilib-1.0.0
+	)
+	wcs? ( sci-astronomy/wcslib )
+	xplanet? ( x11-misc/xplanet )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+"
+RDEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-15.12.0-unused-qt-deps.patch"
+	"${FILESDIR}/${PN}-15.12.0-unused-kf5-deps.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package indi INDI)
+		$(cmake-utils_use_find_package wcs WCSLIB)
+		$(cmake-utils_use_find_package xplanet Xplanet)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kstars/metadata.xml b/kde-apps/kstars/metadata.xml
index a724068e692a..90df4e902dac 100644
--- a/kde-apps/kstars/metadata.xml
+++ b/kde-apps/kstars/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<use>
-		<flag name="fits">Enable support for the FITS image format through cfitsio</flag>
-		<flag name="indi">Enable support for Astronomical control library using libindi</flag>
-	</use>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="fits">Enable support for the FITS image format through cfitsio</flag>
+		<flag name="indi">Enable support for Astronomical control library using libindi</flag>
+		<flag name="wcs">Enable support for World Coordinate System library using wcslib</flag>
+		<flag name="xplanet">Enable support for Xplanet</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index a78882686306..f0b12fdf0d77 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1 +1,2 @@
+DIST ktouch-15.12.3.tar.xz 2420924 SHA256 577f0e477494e4d12bcd4d687d950af874e470ad4e6311f2d170c47e45a9bffe SHA512 0d5270bc7c05ee3e41ec888041adff67612161046bc7c03da82b4a27b01f36be0182a3fd619032b521621429faff585c1f11a64e6ec32eb87b9cebd7a1617816 WHIRLPOOL 2ed53f661d331ceeffa9cf037119c1fe620b7b37a65beb5824799dcc53c1ab1af4a92c57dac4938af9c6cbe7a3829774c71494c9ec9e620d81c740e1a7cfe394
 DIST ktouch-4.14.3.tar.xz 2420844 SHA256 a38dfc12c89f5df014b9c710d8977f5e1e8ed7ac1ea2a52b3cb8473433561084 SHA512 3dc2fa11d45284224ea1deb03691c45abf10ab7e8659169143aa0cd2567b94fb8bfa979b16f44977e0a14de4b435b025cf8e97df0b57f3b23164465ef4e30970 WHIRLPOOL 7bfdab55a76d6e137badc0af4c9cb83d712d1670b7e1b0aa44c24a577b3124d1e81d7ecac359f4306aac5e4706a07d08a3eda00d1fc588dd33c392cd0f92f8aa
diff --git a/kde-apps/ktouch/ktouch-15.12.3.ebuild b/kde-apps/ktouch/ktouch-15.12.3.ebuild
new file mode 100644
index 000000000000..119f995a3398
--- /dev/null
+++ b/kde-apps/ktouch/ktouch-15.12.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
+HOMEPAGE="https://edu.kde.org/applications/miscellaneous/ktouch"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdeapps_dep knotify)
+	$(add_kdeapps_dep kqtquickcharts)
+	$(add_kdeapps_dep plasma-runtime)
+"
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index 810008b91302..8c04c0708053 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1 +1,2 @@
+DIST kturtle-15.12.3.tar.xz 194392 SHA256 16a3268dc26b0370bc2fb6bbad5cf64334378a858c77157af1eb3454cc36a88b SHA512 1fbd162c9c9fc60bb4aefeef65bb57c8f8d74808568b6ea5767b1ea2c0db08aa246716c380046ad437f81f3d37570e784a941f79b9d4c2d6d850cd741b3761f6 WHIRLPOOL a40c373185252e4718f9812a855de723b39782a0164fbe0ec9971bf027a511d8cff8b129634a665bb34ee9c5d9122eff0830573d2315ae1bb875a688f8d53bc5
 DIST kturtle-4.14.3.tar.xz 192100 SHA256 2e43a2a89698320cd417b1f5278522f92a6c704aaeb8efe32ab0faa269e8d5fc SHA512 397ce8bae115b4945ccb0e0a9574016ccca6e35dd2f5ab7820cc4c902e06f6032ae1b59e9f904157887ca1f29fb0f5b85eca73cde554a6f820cc79b3c477e038 WHIRLPOOL 109b167ba8493d347bd2d99cf2ba383215041c3cef0b96bedcce8b75ea00e0658819cd523f39cd5174d6a41ae5b018b175e20aa996be5dd4db53f3cbc03fb9e3
diff --git a/kde-apps/kturtle/kturtle-15.12.3.ebuild b/kde-apps/kturtle/kturtle-15.12.3.ebuild
new file mode 100644
index 000000000000..52ff52a7faf4
--- /dev/null
+++ b/kde-apps/kturtle/kturtle-15.12.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Educational programming environment using the Logo programming language"
+HOMEPAGE="https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index c65381c669cd..2eec44ac5bbf 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1 +1,2 @@
+DIST kwordquiz-15.12.3.tar.xz 1203820 SHA256 26a722c967e09701300cce64287d4f73f16158d34e26594fe91fa6589e6d1dee SHA512 4cba19c9da2642ce3557361be40bc331a4a3dae72ff6d09eb7af3ed23c389774b26b91172b7987bce1c7446b7e4f10b8135a79c4501fc7afb471cec085118247 WHIRLPOOL 69753615be0d3c7a0f8abb9635930fa2e9ebb0eb746c6d721bd849b8c13392ba5bfc31a89195b5de536bcf1e4720feba42975f9d660dcae44f8fe3a5a9722b0a
 DIST kwordquiz-4.14.3.tar.xz 1198472 SHA256 388083782b21ddb53ca194a65e51f4602f0e13fc05844d8c8d78b362d4fe7d7f SHA512 fff828e50ad888524fd1258f498be760732fb8bb3f09ea42a925d313cdbf6c83d8bfa1e31d84d54f9f7141f6014a13f8d58d3c1999421f31c29b5d1f2966f8df WHIRLPOOL c27515d96f514fddb1e58f78e8942e8109a7b391ad688d53f93756c5548666e622c65ff5d0e1139ac9fb34cefcbf4de13733bc0832b076f6911b6ba44e93a483
diff --git a/kde-apps/kwordquiz/files/kwordquiz-15.12.3-deps.patch b/kde-apps/kwordquiz/files/kwordquiz-15.12.3-deps.patch
new file mode 100644
index 000000000000..9221631df25d
--- /dev/null
+++ b/kde-apps/kwordquiz/files/kwordquiz-15.12.3-deps.patch
@@ -0,0 +1,46 @@
+commit 6e90d606424c3f97e21828cc9942bcf7950611e4
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sun Mar 20 16:47:20 2016 +0100
+
+    Remove unused deps
+    
+    REVIEW: 127438
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 624d7fc..335c556 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,6 @@ include(ECMInstallIcons)
+ find_package(KF5 REQUIRED COMPONENTS
+     I18n
+     Crash
+-    Sonnet
+     Config
+     ConfigWidgets
+     DocTools
+@@ -31,12 +30,10 @@ find_package(KF5 REQUIRED COMPONENTS
+     IconThemes
+     ItemViews
+     NotifyConfig
+-    KIO
+     NewStuff
+     Notifications
+     XmlGui
+     KDELibs4Support
+-    Declarative
+ )
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7065e2c..8914551 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -82,8 +82,6 @@ target_link_libraries(kwordquiz
+     KF5::NewStuff
+     KF5::Notifications
+     KF5::NotifyConfig
+-    KF5::SonnetCore
+-    KF5::Declarative
+     KF5::XmlGui
+     KF5::GuiAddons
+     KF5::KDELibs4Support
diff --git a/kde-apps/kwordquiz/kwordquiz-15.12.3-r1.ebuild b/kde-apps/kwordquiz/kwordquiz-15.12.3-r1.ebuild
new file mode 100644
index 000000000000..4d69909d6e40
--- /dev/null
+++ b/kde-apps/kwordquiz/kwordquiz-15.12.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A powerful flashcard and vocabulary learning program"
+HOMEPAGE="https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5]
+"
+RDEPEND=${DEPEND}
+
+PATCHES=( "${FILESDIR}/${P}-deps.patch" )
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
new file mode 100644
index 000000000000..1562c903e0f3
--- /dev/null
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -0,0 +1 @@
+DIST libkeduvocdocument-15.12.3.tar.xz 98868 SHA256 8c7eaa6ce54c7f2081cedd0716a00135a9f9d3cb01b7d8d6cb12d876d31e9ac4 SHA512 111b567a7c8cd88661e22a607cec64513a3c4ea2075d6f8136f770b2cea0f966a3e89aa3f82a1d9a4427f48fe72b530d3d1334d28f47575e02a6f586044bca2b WHIRLPOOL f73854496ab2e29ef3514828057ee39956cfe5c9eb092bdd57d0c5c3231e0c129119154d685c4519a4185299309c6fc797a1d1cc58cb6e7f7470a728e748e580
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.3.ebuild
new file mode 100644
index 000000000000..332a0c370b88
--- /dev/null
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for reading/writing KVTML"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+	kde5_src_prepare
+
+	if ! use test; then
+		sed -e "/add_subdirectory(autotests)/ s/^/#DONT/" \
+			-e "/add_subdirectory(tests)/ s/^/#DONT/" \
+			-i keduvocdocument/CMakeLists.txt
+	fi
+}
diff --git a/kde-apps/libkeduvocdocument/metadata.xml b/kde-apps/libkeduvocdocument/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-apps/libkeduvocdocument/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index a1ba7c2bebf9..fabee93df81e 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1 +1,2 @@
+DIST marble-15.12.3.tar.xz 23771368 SHA256 55a5476ada37e6367d4ebdda165eaad745f72c1b3b8b96e3bae7612581b4e7bf SHA512 fb0a4ce3b5a02074c0273e8cfb8540a3ef3f9ae0483d491704312ad04a65264fe8533a778d6bc44adda8ea97dc03e9c5255281a8c341af8d24fa02f6793f2a9b WHIRLPOOL 648ed4205ddaca79171749f39eb9175b1fd4b2ae3343b4abafa0eb895936c9132ccec50b14c1fc771e426e436f9f2e4a08678b665dfed1d9f4ce40777cba6951
 DIST marble-4.14.3.tar.xz 19709200 SHA256 4d6667cf67ae9976e4c1efc306be222d13f2ee5927483325411ae0e9631dc0f0 SHA512 eac20e22d4540e45cd6bb24440166eff88db90d400a7c6cd09f20bc0c49b39814aed0c1ae5f3fa2c591ea9a3a83b9bc16294e9706a38e640db35106dbcbdc1c8 WHIRLPOOL 58f053e419707e1b98f1e77f35da52e2838a54985f22a9827dbbb9191ba019137f842834ba92ff74afa0ad745bb525d6bc8ed30200ddaa6ee329292691a636b7
diff --git a/kde-apps/marble/marble-15.12.3.ebuild b/kde-apps/marble/marble-15.12.3.ebuild
new file mode 100644
index 000000000000..019ccc4ad6ed
--- /dev/null
+++ b/kde-apps/marble/marble-15.12.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Generic geographical map widget"
+HOMEPAGE="https://marble.kde.org/"
+KEYWORDS=" ~amd64 ~x86"
+
+IUSE="aprs designer-plugin gps +kde phonon shapefile"
+
+# FIXME (new packages):
+# libwlocate, WLAN-based geolocation
+# qextserialport, interface to old fashioned serial ports
+RDEPEND="
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	gps? ( >=sci-geosciences/gpsd-2.95 )
+	kde? (
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kcoreaddons)
+		$(add_frameworks_dep kcrash)
+		$(add_frameworks_dep ki18n)
+		$(add_frameworks_dep kio)
+		$(add_frameworks_dep knewstuff)
+		$(add_frameworks_dep kparts)
+		$(add_frameworks_dep krunner)
+		$(add_frameworks_dep kservice)
+		$(add_frameworks_dep kwallet)
+	)
+	phonon? ( media-libs/phonon[qt5] )
+	shapefile? ( sci-libs/shapelib )
+"
+DEPEND="${RDEPEND}
+	aprs? ( dev-lang/perl )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package aprs Perl)
+		-DBUILD_MARBLE_TESTS=$(usex test)
+		-DWITH_DESIGNER_PLUGIN=$(usex designer-plugin)
+		-DWITH_libgps=$(usex gps)
+		-DWITH_KF5=$(usex kde)
+		-DWITH_Phonon=$(usex phonon)
+		-DWITH_libshp=$(usex shapefile)
+		-DWITH_QextSerialPort=OFF
+		-DWITH_liblocation=0
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml
index 522103cbe2e7..0b17014a40fb 100644
--- a/kde-apps/marble/metadata.xml
+++ b/kde-apps/marble/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
+		<flag name="aprs">Enable support for APRS data sources</flag>
 		<flag name="designer-plugin">Enable designer plugin</flag>
 		<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag>
 		<flag name="shapefile">Enable support for ESRI shapefiles</flag>
 		<flag name="zip">Enable support for reading and displaying .kmz files</flag>
 	</use>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 39df727bede3..61f65ba81e67 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1 +1,2 @@
+DIST parley-15.12.3.tar.xz 4748728 SHA256 1e975157388141a3540b012f55daf8ac8fe2cd7e838d86b65a5e943f6f1d0802 SHA512 111287a9ef477346d1dbd89ec0172af41adf409759554eadf1d0d7786e108e62815c7b91c65361d5a254842b3f06ebb673d790deb3297c80755f5e187e1f2683 WHIRLPOOL 3b86a054aaa2a8217f9ed7a6ff3c478d054be19aeb29f57cc75d00981790ba1b8de3744f0fa858ecde1a0ff1e48862a957121effaf55e655aa32e65dba21bbbe
 DIST parley-4.14.3.tar.xz 8203748 SHA256 26e0e1620d84b71ffe3f3ee2889b658a0974f2bfa3c64848cef95656dbd1a0d7 SHA512 e9cbeb7f369ed864f12ab61721682cca475eac10a01fffdb864188387e0349122ba9b02f2ad16e73383f13a411225944938d3b01f2842ca02baf3fd17782dfc3 WHIRLPOOL 4db885f129e94f13631722bdd083c686b1f0e60d350e70a5d6e529c85fce46033db1abba789c238d587d6f22962942806b1819850fc3ac0881ab013e9c015234
diff --git a/kde-apps/parley/parley-15.12.3.ebuild b/kde-apps/parley/parley-15.12.3.ebuild
new file mode 100644
index 000000000000..58be7a1f7dc1
--- /dev/null
+++ b/kde-apps/parley/parley-15.12.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_DOC_DIR="docs"
+inherit kde5
+
+DESCRIPTION="A vocabulary trainer to help you memorize things"
+HOMEPAGE="https://www.kde.org/applications/education/parley
+https://edu.kde.org/applications/school/parley"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtmultimedia)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdeedu-data)
+"
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index bb203ab43b23..0a9dc6ef86fa 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1 +1,2 @@
+DIST rocs-15.12.3.tar.xz 533420 SHA256 58fb4c5ad06d7cee8691fc13566a3d9ca26da32d6a21d1d5c1f665f11a8d835e SHA512 eb8781bdc98a36c86c4494d08d40399e3da533a1383485ba81bab363f2682a85263adeda85bb1901b9c23088052a8d78c7a8fd20c1752517fd636cab4b854e2c WHIRLPOOL 9b2bf3f142f5f6b42116f4cefdbd39a8ee43fab16d6e96dfed1f23afcf9c967f7ef96d7d1b0e1fb5967580ddc1122010141b8869259f3afa46d294bae57f29ff
 DIST rocs-4.14.3.tar.xz 1146328 SHA256 c1dc2ea6b7e1ab0128a28df1f4e09d9bf83c2a1d0d22ff022a86e7f5fb98d4fc SHA512 f0c1d35fcd17473459a3f63ce731c3cf27da51d64b53383f1c4ff280e8df256b80c2797e0c9012cad92601e2155f3e79118a8b8af20af2b3ce10c7ab40ca9d53 WHIRLPOOL 985c58e94999d17f6d96c4b9eafa9fa1e8926001904cfa54600b96e33803336b8b58e9deda01a9923fa6a5f10466294672fbdd7d9de06dd8177a2ebb7cdbcc1f
diff --git a/kde-apps/rocs/files/rocs-15.12.3-doctools-optional.patch b/kde-apps/rocs/files/rocs-15.12.3-doctools-optional.patch
new file mode 100644
index 000000000000..a74464c882e3
--- /dev/null
+++ b/kde-apps/rocs/files/rocs-15.12.3-doctools-optional.patch
@@ -0,0 +1,29 @@
+commit c4d77a5348fcf18aff734ccff13dcc87582a35be
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Tue Mar 8 19:34:32 2016 +0100
+
+    Make KF5DocTools really optional
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cc71ba0..8e2c4e8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,7 +57,6 @@ find_package(KF5 5.15 REQUIRED COMPONENTS
+     CoreAddons
+     Crash
+     Declarative
+-    DocTools
+     I18n
+     ItemViews
+     TextEditor
+@@ -80,7 +79,9 @@ remove_definitions(-DQT_NO_KEYWORDS)
+ ecm_optional_add_subdirectory(libgraphtheory)
+ ecm_optional_add_subdirectory(src)
+ ecm_optional_add_subdirectory(icons)
+-ecm_optional_add_subdirectory(doc)
++if(KF5DocTools_FOUND)
++    ecm_optional_add_subdirectory(doc)
++endif()
+ 
+ set_package_info(Boost "Boost C++ Libraries" "http://www.boost.org")
+ feature_summary(WHAT ALL)
diff --git a/kde-apps/rocs/rocs-15.12.3.ebuild b/kde-apps/rocs/rocs-15.12.3.ebuild
new file mode 100644
index 000000000000..2027eea46fda
--- /dev/null
+++ b/kde-apps/rocs/rocs-15.12.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_MIN_VERSION="3.0.0"
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Interface to work with Graph Theory"
+HOMEPAGE="https://www.kde.org/applications/education/rocs
+https://edu.kde.org/applications/mathematics/rocs"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript 'scripttools')
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	dev-libs/grantlee:5
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.49
+"
+
+RESTRICT=test	# 1/10 tests currently fails
+
+PATCHES=( "${FILESDIR}/${P}-doctools-optional.patch" )
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index 145259500411..eca9ea8c9db8 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1 +1,2 @@
+DIST step-15.12.3.tar.xz 388744 SHA256 01bf05ffee673ff1b20a5bf32e21b4223b8b8900b91ae0a5ca9a47cc07b1e310 SHA512 1d481109830932e05faec42ffc0ed3f262928e29b3fbb70c9d9f3d5cbc5b19e2e22635df2aee66fc705f20d249513f306b81442e2e07af5a41cf9e5c9a74c59e WHIRLPOOL bf3ceb76398cfae2c547208161528484b2c4e387f3f07fb4c8698ddfd7d5f02b42a356e197dcdda71bfa8b6930a3bf2b8a0601b8ac63c4fde7987a11b32ea6a7
 DIST step-4.14.3.tar.xz 378612 SHA256 8ba3c71d725a605b37f4c19037385cc63e37062b30635ea7f5415025a650c491 SHA512 244bf52bfbf38abffa3722af67451abf5a94e81d3916a12b8b7b3d38bf6e580dc92d85590b5d6233d661f1befe0a587df9a0694f1bde2a7a2f8d830a4cac057c WHIRLPOOL 186cdbabd169503441b9a43be480dd2cd4adf648ee628ed209d80c59bbe05199dd4e31c21cc2135cb6fc37fdf0e56c30c9922995228f98450e4f9e390aaa26b1
diff --git a/kde-apps/step/files/step-15.12.2-doctools.patch b/kde-apps/step/files/step-15.12.2-doctools.patch
new file mode 100644
index 000000000000..43715987e791
--- /dev/null
+++ b/kde-apps/step/files/step-15.12.2-doctools.patch
@@ -0,0 +1,34 @@
+commit 1ba1e576e20e9008d3fd862deb7bbcca61f3e4d8
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Thu Mar 10 20:10:50 2016 +0100
+
+    Remove duplicate KF5DocTools search, make it optional
+    
+    Using ecm_optional_add_subdirectory, as long as KDELibs4Support
+    makes it impossible to disable KF5DocTools.
+    
+    REVIEW: 127335
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b0dd543..9623485 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,7 +33,6 @@ find_package(KF5 REQUIRED COMPONENTS
+     NewStuff
+     Plotting
+ )
+-find_package(KF5DocTools REQUIRED)
+ find_package(Eigen3 3.2.2 REQUIRED)
+ find_package(GSL)
+ find_package(Qalculate)
+@@ -69,7 +68,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${EIGEN3_INCLUDE_DIR})
+ 
+-add_subdirectory(doc)
++if(KF5DocTools_FOUND)
++    ecm_optional_add_subdirectory(doc)
++endif()
+ add_subdirectory(stepcore)
+ add_subdirectory(step)
+ add_subdirectory(autotests)
diff --git a/kde-apps/step/step-15.12.3.ebuild b/kde-apps/step/step-15.12.3.ebuild
new file mode 100644
index 000000000000..e37c13a992a2
--- /dev/null
+++ b/kde-apps/step/step-15.12.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Interactive physics simulator"
+HOMEPAGE="https://edu.kde.org/step"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="+gsl +qalculate"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	=dev-cpp/eigen-3.2*:3
+	sci-libs/cln
+	gsl? ( >=sci-libs/gsl-1.9-r1 )
+	qalculate? ( >=sci-libs/libqalculate-0.9.5 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-15.12.2-doctools.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: Drop duplicate upstream
+	sed -e '/find_package.*Xml Test/ s/^/#/' \
+		-i stepcore/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+	)
+	kde5_src_configure
+}