gentoo resync : 15.12.2017

9 files changed, 82 insertions, 244 deletions

diff --git a/app-accessibility/simon/Manifest b/app-accessibility/simon/Manifest
index ff152cea4b9c..82a6a1b2bfc1 100644
--- a/app-accessibility/simon/Manifest
+++ b/app-accessibility/simon/Manifest
@@ -1,10 +1,5 @@
 AUX simon-0.4.1-libdir.patch 504 BLAKE2B b8612ddb4ddddae0cdd9bf41668dcf00e7accc1316330c3e0021e2d6bcad2927c21cffbf5a392e01771f866bf74160e17128c93fd57ca58daabb73c81f4ae3f8 SHA512 b43dc15ab893f048d6d18e7513abc1da054c1cc872c09a3f5e9916c481f63b8940a72c8454447391aafe93b4f665a54403430669de8c6351223518012e57efb1
-AUX simon-0.4.1-linguas.patch 2359 BLAKE2B 43b56d8dc064f9bbb9958a17ba8cd01932242750e90641c2621425935bb08910eba73ffdd73e6b4b4dff20122aca36d4b15a17583817b7bb320abaacd692c3f4 SHA512 b58939987238655e03f292fb15222ef87e1078c6375a2a8b45caabe83f92daa9d6c02658825a80f105c355ade316dd69b56cc5dd3320f37c6c4c5f4735e071f8
-AUX simon-0.4.1-no-qtwebkit.patch 639 BLAKE2B a406f45b45a7ce460b7c3f6ff304444278b2714b866decb3fae8ae6fc352d41e9a2a211ef763761f0b553588154d36cafbaa0e210fd0a9f18be8c7ebdced6598 SHA512 36140e80ab15d11d74df0518fd76aa147278e6f34bfe35c6ebd45650640aa2dd6dd18800aafa3fdf7a8d64d35f18e12791b0b2f94edb572abf0b74952ebd0003
-AUX simon-0.4.1-opencv-include.patch 729 BLAKE2B 607f753e06ffa8698e52b783e18db816b925fd88c95f451ea3fbe22aa01323b5e866900bcfe5769354d7fdaee2bf139713a6719172caa61cc1e860f0eb64d4f7 SHA512 f84629d51a241589c9977dd2ab412dd155435a27cb5544848b6fe73d2a292bf3aef2b07ede226e5a89d616a50f50fa6d505a281118ea7f6f333e3479c423ed0a
-AUX simon-0.4.1-sphinx.patch 881 BLAKE2B c3641d631d1011bf0ad682d8c15d8a86014fe3e4e256b2a11b548866eec342a9f52680b36d142a91fca0a66a011fb80e5c71895a97e418ae265304949c78a710 SHA512 93b0ff4ee18a51b868a89a4baa93a0b4f19ade6e0b3b7ed876f128eb3de480e8df8625abfb31d586cb0159092cac4e3e911cfcef47c5242c138019ddfb87f6d8
-DIST simon-0.4.1.tar.bz2 23856024 BLAKE2B 12b89f823ff9d13faed71d2ad5e61f3f9ca005589019687b39f79b6ff143efc1f578ebc4d36fae6f3bfa278f3fffcf5a73a411ffa403add906c51d8fab0795ab SHA512 d7349af3ec2482f18d8407891eeea7beea75630cc85aeade9f4105e3b84e82fde6284338688bbf84824d43c68de102eb34f3c21068cbe8a3307aa0586732b30d
 DIST simon-0.4.90.tar.xz 25257276 BLAKE2B d5f78c721dc55387db415a740b00831471d6325d3aa2a0282e476132d2c7e378c4b024500527fd54a4073e972494e6ecc6f094022b5651b163d78ff6fcb20fcf SHA512 88b225e6d0168b87241649019376c8726fb3cc96ccbb985fd3dac5f5b67ed2d84de2756537300d7944797bceb7e340cdaf1c5aed731c1a7e2873d284ca3f94c1
-EBUILD simon-0.4.1.ebuild 2129 BLAKE2B 708580477838ffceaa89a5e4fcd69c38613eb00449d444a038e4632096793145c158cd91424629bd501f108ae374cde409c1de57509355d408326f17a2dc279e SHA512 1321c489ebf1622e53cb27139994373cb9183fd8a39fdb6bd6548f528482651e77c0533460d4a139079ccdc27a5b3eb81f02f05f94c7c00a83eba460e60cc27a
-EBUILD simon-0.4.90-r1.ebuild 1465 BLAKE2B e3bcca0657538ca3732b7db89a17b352cff7e362a8dbe8349230f629b936ecaab108b0a4be8d8b0516ea784e6e3d4f3d862783433ca4d3ba310eac815b0d5d28 SHA512 756b003d4323fd2e4887346c4d4277c6f202e30d09b5a14d3ecc3afc982656e4b479cd74b5516bed24aa5eefb4864239e4aeb9b0a0d78adc474ae3e2d2d4739f
-MISC metadata.xml 451 BLAKE2B ffc1a52ac33bd8599c4067408a58046ca8bcc4e331ad5d339c7f0bf2e45e2351e7e6596b2e6880b8412fa4de8c61ecd28846d5c5183deaeb7ef1be0af8aa8246 SHA512 eb8227475d109a54c445968c6e7ad98da678e7647547b42d04e369ad9dfe3fa8029398fe903ceff8bcb6ef61bb35298584363fb7d40fa2f7fed763d0e97f7b89
+EBUILD simon-0.4.90-r1.ebuild 1484 BLAKE2B d8b62acdac09fcf0713abe2bab42d5dc1bd6143c745ee41742ae2b1420156fa1a0676748e001f7199932837716a1b9a5ab43d3ef5787ff60ed3c8f55a113c77f SHA512 b6df979eb17aac67acbd5f520e7947d6bbab04abc9b98926c8bd50e9c5c62d8c34968a1441ce2ca0cc8c9cdda4721a6c273bb6da7d631b823ef855028ecbf4a2
+EBUILD simon-9999.ebuild 2058 BLAKE2B 5cdd32e8b39ce6b43ace50f615160bfce2e60ddc9534845771d5696de494c1d4822fe7b4a47dce519b42a61206b0166214feb1c7b040cc4ab52d07de3d133511 SHA512 630dda06440102440ee0f833aeab94140dc65b6ee00df95442bca853993d49a3f1ec50cc090dea339ddb3fded4a0f3ffa3e4cb9bcd4eb0b84e95851fe3ddac52
+MISC metadata.xml 526 BLAKE2B 90a5578ad2dd40b107c0a810ac487cf2c952f056bc8c6bb109cfceda2b66cdfc2ccc027e741d2eb0a4ee77e9ac349f43f7724b126d077c988ba4dd3c0c940375 SHA512 ab2dbc917334c5877b7654179b0f28e7d2824d98ba68c62e13ab912f5c1010198b8891ea5764c9e304727ac18be28b758f23f414e145047f99caef335006659d
diff --git a/app-accessibility/simon/files/simon-0.4.1-linguas.patch b/app-accessibility/simon/files/simon-0.4.1-linguas.patch
deleted file mode 100644
index 01f25d6550c0..000000000000
--- a/app-accessibility/simon/files/simon-0.4.1-linguas.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,6 +14,9 @@
- 
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
- 
-+# NLS
-+option(ENABLE_NLS "Enable native language support" 1)
-+
- find_package(KDE4 "4.4" REQUIRED)
- find_package(Qt4 COMPONENTS QtCore QtDbus QtGui QtTest QtXml QtScript QtConcurrent REQUIRED)
- find_package(Qwt6 REQUIRED)
-@@ -143,4 +146,6 @@
- macro_display_feature_log()
- 
- include(MacroOptionalAddSubdirectory)
--macro_optional_add_subdirectory( po )
-+if(ENABLE_NLS)
-+	macro_optional_add_subdirectory( po )
-+endif(ENABLE_NLS)
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -1,11 +1,15 @@
-+if(ENABLE_NLS)
-+	# gettext behavior
-+	execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
-+	OUTPUT_VARIABLE UNSETLINGUAS)
-+set(langs pt_BR ca nl et de it pt es sv uk)
-+
-+	foreach(mylang ${langs})
-+		if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
-+			add_subdirectory(${mylang})
-+		endif()
-+	endforeach()
-+endif(ENABLE_NLS)
-+
-+# default doc
- add_subdirectory(en_US)
--add_subdirectory(pt_BR)
--add_subdirectory(ca)
--add_subdirectory(nl)
--add_subdirectory(et)
--add_subdirectory(de)
--add_subdirectory(it)
--add_subdirectory(pt)
--add_subdirectory(es)
--add_subdirectory(sv)
--add_subdirectory(uk)
---- a/po/CMakeLists.txt
-+++ b/po/CMakeLists.txt
-@@ -11,25 +11,14 @@ endif (NOT GETTEXT_MSGMERGE_EXECUTABLE)
- if (NOT GETTEXT_MSGFMT_EXECUTABLE)
- MESSAGE(FATAL_ERROR "Please install msgmerge binary")
- endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
--add_subdirectory(de)
--add_subdirectory(da)
--add_subdirectory(fr)
--add_subdirectory(nl)
--add_subdirectory(uk)
--add_subdirectory(pt_BR)
--add_subdirectory(pl)
--add_subdirectory(es)
--add_subdirectory(cs)
--add_subdirectory(ro)
--add_subdirectory(ca)
--add_subdirectory(sk)
--add_subdirectory(sl)
--add_subdirectory(pt)
--add_subdirectory(gl)
--add_subdirectory(ca@valencia)
--add_subdirectory(sv)
--add_subdirectory(el)
--add_subdirectory(fi)
--add_subdirectory(it)
--add_subdirectory(zh_TW)
--add_subdirectory(et)
-+
-+# gettext behavior
-+execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
-+	OUTPUT_VARIABLE UNSETLINGUAS)
-+set(langs ca@valencia cs de da fr nl uk pt_BR pl es ro ca sl pt gl sk sv el fi it zh_TW et)
-+
-+foreach(mylang ${langs})
-+	if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
-+		add_subdirectory(${mylang})
-+	endif()
-+endforeach()
diff --git a/app-accessibility/simon/files/simon-0.4.1-no-qtwebkit.patch b/app-accessibility/simon/files/simon-0.4.1-no-qtwebkit.patch
deleted file mode 100644
index 53a157be38e1..000000000000
--- a/app-accessibility/simon/files/simon-0.4.1-no-qtwebkit.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 81bd3d089a19f1e23383e2da7376740152540f7f Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter@math.unl.edu>
-Date: Mon, 6 Jul 2015 09:59:56 -0500
-Subject: omit unused reference to QWebView header
-
-no cmake checks for QtWebKit either
----
- simon/src/simonview.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/simon/src/simonview.cpp b/simon/src/simonview.cpp
-index 69673bc..7a1873d 100644
---- a/simon/src/simonview.cpp
-+++ b/simon/src/simonview.cpp
-@@ -60,7 +60,6 @@
- #include <KDE/KComboBox>
- #include <QDesktopServices>
- #include <QTimeLine>
--#include <QWebView>
- 
- #include <KMessageBox>
- #include <KApplication>
--- 
-cgit v0.11.2
diff --git a/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch b/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch
deleted file mode 100644
index b6a7d33c409f..000000000000
--- a/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Peter Grasch <me@bedahr.org>
-Date: Sat, 25 Jul 2015 08:45:03 +0000
-Subject: Adding OpenCV include directories to include path
-X-Git-Url: http://quickgit.kde.org/?p=simon.git&a=commitdiff&h=b4e663e5cc36511b15ef20865c723182cd3d88c9
----
-Adding OpenCV include directories to include path
----
-
-
---- a/cmake/FindOpenCV.cmake
-+++ b/cmake/FindOpenCV.cmake
-@@ -61,6 +61,7 @@
- 		
-                 ## Include the standard CMake script
-                 include("${OpenCV_DIR}/OpenCVConfig.cmake")
-+                include_directories(${OpenCV_INCLUDE_DIRS})
-                  
-                 ## Search for a specific version
-                 set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
-
diff --git a/app-accessibility/simon/files/simon-0.4.1-sphinx.patch b/app-accessibility/simon/files/simon-0.4.1-sphinx.patch
deleted file mode 100644
index 498475c81d05..000000000000
--- a/app-accessibility/simon/files/simon-0.4.1-sphinx.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- simon-0.4.1/CMakeLists.txt
-+++ simon-0.4.1/CMakeLists.txt
-@@ -59,11 +59,11 @@
- macro_optional_find_package(QAccessibilityClient)
- macro_log_feature(QAccessibilityClient_FOUND "qaccessibilityclient" "KDE client-side accessibility library" "https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient" FALSE "" "Required to enable ATSPI plugin.")
- 
--find_package(Sphinxbase)
-+macro_optional_find_package(Sphinxbase)
- macro_log_feature(SphinxBase_LIBRARIES "Sphinxbase"
-   "Open source toolkit for speech recognition" "http://cmusphinx.sourceforge.net/"
-   FALSE "" "Required to build Sphinx backend")
--find_package(Pocketsphinx)
-+macro_optional_find_package(Pocketsphinx)
- macro_log_feature(POCKETSPHINX_LIBRARIES "PocketSphinx"
-   "PocketSphinx is a small-footprint continuous speech recognition system"
-   "http://cmusphinx.sourceforge.net/" FALSE "" 
diff --git a/app-accessibility/simon/metadata.xml b/app-accessibility/simon/metadata.xml
index 6a60622dd262..923816d1f30f 100644
--- a/app-accessibility/simon/metadata.xml
+++ b/app-accessibility/simon/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
+		<flag name="pim">Enable support for KDE PIM resources integration</flag>
 		<flag name="sphinx">Build sphinx backend (pulls <pkg>app-accessibility/julius</pkg> if disabled</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-accessibility/simon/simon-0.4.1.ebuild b/app-accessibility/simon/simon-0.4.1.ebuild
deleted file mode 100644
index 1fb96a7bf86a..000000000000
--- a/app-accessibility/simon/simon-0.4.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# KEEP KDE ECLASSES OUT OF HERE
-
-# TODO: qaccessibilityclient support (not in portage)
-# https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient/repository
-# TODO: julius
-
-EAPI=5
-
-inherit eutils multilib gnome2-utils cmake-utils
-
-DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
-HOMEPAGE="http://simon-listens.org/"
-SRC_URI="mirror://kde/stable/simon/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libsamplerate nls opencv sphinx"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsql:4
-	kde-frameworks/kdelibs:4[plasma(+)]
-	media-libs/alsa-lib
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/qwt:6[qt4(+)]
-	libsamplerate? ( media-libs/libsamplerate )
-	nls? (
-		kde-apps/kde4-l10n
-		virtual/libintl
-	)
-	opencv? ( media-libs/opencv )
-	sphinx? (
-		>=app-accessibility/pocketsphinx-0.8
-		>=app-accessibility/sphinxbase-0.8
-		>=app-accessibility/SphinxTrain-1
-	)
-	!sphinx? ( app-accessibility/julius )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libdir.patch
-	"${FILESDIR}"/${P}-linguas.patch
-	"${FILESDIR}"/${P}-sphinx.patch
-	"${FILESDIR}"/${P}-opencv-include.patch
-	"${FILESDIR}"/${P}-no-qtwebkit.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIMON_LIB_INSTALL_DIR=/usr/$(get_libdir)
-		-DBackendType=$(usex sphinx "both" "jhtk")
-		$(cmake-utils_use_with sphinx Sphinxbase)
-		$(cmake-utils_use_with sphinx Pocketsphinx)
-		-DWITH_KdepimLibs=OFF
-		$(cmake-utils_use_with libsamplerate LibSampleRate)
-		$(cmake-utils_use_with opencv OpenCV)
-		$(cmake-utils_use_enable nls NLS)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "optional dependencies:"
-	elog "  kde-apps/jovie (support for Jovie TTS system)"
-	use sphinx && elog "  app-accessibility/julius (alternative backend)"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-accessibility/simon/simon-0.4.90-r1.ebuild b/app-accessibility/simon/simon-0.4.90-r1.ebuild
index 7233beeb2d23..8402c1e19169 100644
--- a/app-accessibility/simon/simon-0.4.90-r1.ebuild
+++ b/app-accessibility/simon/simon-0.4.90-r1.ebuild
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}"/${PN}-0.4.1-libdir.patch )
 
+RESTRICT+=" test"
+
 src_configure() {
 	local mycmakeargs=(
 		-DSIMON_LIB_INSTALL_DIR=/usr/$(get_libdir)
diff --git a/app-accessibility/simon/simon-9999.ebuild b/app-accessibility/simon/simon-9999.ebuild
new file mode 100644
index 000000000000..f5fc867b2122
--- /dev/null
+++ b/app-accessibility/simon/simon-9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="kf5"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
+HOMEPAGE="http://simon-listens.org/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/simon/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE="libsamplerate opencv pim sphinx"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(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 kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep okular)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtx11extras)
+	media-libs/alsa-lib
+	media-libs/libqaccessibilityclient:5
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/qwt:6=[qt5]
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pim KF5CalendarCore)
+		$(cmake-utils_use_find_package pim KF5Akonadi)
+		-DWITH_LibSampleRate=$(usex libsamplerate)
+		-DWITH_OpenCV=$(usex opencv)
+		-DBackendType=$(usex sphinx "both" "jhtk")
+		$(cmake-utils_use_find_package sphinx Sphinxbase)
+		$(cmake-utils_use_find_package sphinx Pocketsphinx)
+		-DQWT_INCLUDE_DIR=/usr/include/qwt6
+		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	elog "Optional dependency:"
+	use sphinx && elog "  app-accessibility/julius (alternative backend)"
+}