gentoo resync : 13.10.2019

5 files changed, 168 insertions, 49 deletions

diff --git a/mail-client/kube/Manifest b/mail-client/kube/Manifest
index 864a1aac3b72..b164ee2167f0 100644
--- a/mail-client/kube/Manifest
+++ b/mail-client/kube/Manifest
@@ -1,3 +1,5 @@
-DIST kube-0.7.0.tar.gz 1073502 BLAKE2B 0636167ed1717b8e3eed8e82b805b3bf2de0131365d5f72a15c85f2eaff7c1fd4c9b27a1afc1ecadcd6276ed9307403533ee335b1b93019efb402f2f0b23d303 SHA512 0399eba9c39b1d35be00c502c84cb7e903ab3f23b0b9dffd154e8fb2c071d8bdfdd16b606c66e5e7d52c5440a60008771d15d8e6abf866df86d2bb3733f34deb
-EBUILD kube-0.7.0.ebuild 1077 BLAKE2B b849b5d164ee5aaf7e025a62e77102528b2b9784e100e11140806909d0444ade748541444a4b0bfed2235bbf5eb120c7ed93b44c6b559b9e9a97fcea98d581ed SHA512 0907e6db1a64db0a2bf029c36ab1bc60ffa02e7d7d05e79aa8fbed982e04056f4ea5c50a97ec4552aa2b2be2f96967470c3e4ef56418cc59b896daf9a3a6a7c6
+AUX kube-0.7.0-require-cxx14.patch 1178 BLAKE2B 8a5cc7253df28f2da7cd211802f340106f56fe5ee97d53959ed30470158fe8ebdd24781d0bcf21b62449ab6a99e62e5d864412ef8e6f9374c0bf1201a7b73aeb SHA512 8023b089fd46f6c47d93f485539d582d18e2332638db274bb69432bb2592b601461889c0542c618f2b521d8cd38ce6b37e61444e3699be1e7dc1b13b99127d01
+AUX kube-0.7.0-tests-optional.patch 1778 BLAKE2B 27c16346086039f8604f47ca1f54dec51f553633cc1a96594ab8c99cf6ae58dcfe06f9599276e27aad6b9cf335f9bb682f2972264a2ae2f873a4d101c2ddb021 SHA512 0e018d404437a00c5a8d673d1e6db76af810c7e97e6a2d19bdb884d592fe09ccccb0c35d91c314c95dccf44b3d8f67881038590d2ea181ba87f366cb05690599
+DIST kube-0.7.0.tar.xz 627968 BLAKE2B 3dcdbd3a26c7940e360a8a97039ae832dd0e143b0a595f7a5dc30ddf20b41d0fdb3132bb6aa26d0322dac66fd1a6b0adc52e684c76205066d751a0b3067b3a5a SHA512 48ca740e54393da4aaa9b662860a479f2d9458f1d2da0fce3efa7091ccabc56d7e4778b9df994d53c3bcd6f26a367280337e785da6f0a34bd31e81c764fcd8ad
+EBUILD kube-0.7.0-r1.ebuild 1514 BLAKE2B ffc3f515bd886523df862322532e842b55d5f565bc0357944da7c903a8b347a5b1f89eebbc8d3cd283efd83019616dc52553bf610b41123f6181f3b2aa255fab SHA512 466359e239e5cd4ede4615f2a764e6297e8b98c95f8b046814a4683e9d3eff77beef56f12a493d99d428f73598ff2fb0923bef901239953ec63c0ddd7b361f49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/mail-client/kube/files/kube-0.7.0-require-cxx14.patch b/mail-client/kube/files/kube-0.7.0-require-cxx14.patch
new file mode 100644
index 000000000000..86578099e269
--- /dev/null
+++ b/mail-client/kube/files/kube-0.7.0-require-cxx14.patch
@@ -0,0 +1,37 @@
+Upstream commits combined (and backported) to save space:
+c38edcfe12b68585641eb925321067e3db811766
+6b15ef07013259176aac938ac529715aaf88fdfe
+fceffd0d10ff203334a933e99a3ea52593ea14d5
+
+Subject: [PATCH] Properly require c++ 14
+
+--- b/extensions/api/src/CMakeLists.txt
++++ b/extensions/api/src/CMakeLists.txt
+@@ -1,5 +1,4 @@
+ set(CMAKE_CXX_VISIBILITY_PRESET default)
+-set(CMAKE_CXX_STANDARD_REQUIRED 14)
+ 
+ find_package(Qt5 COMPONENTS REQUIRED Core Concurrent Quick Qml WebEngineWidgets Test WebEngine Gui)
+ find_package(KF5Mime 4.87.0 CONFIG REQUIRED)
+--- b/framework/src/CMakeLists.txt
++++ b/framework/src/CMakeLists.txt
+@@ -11,7 +11,6 @@
+ include(GenerateExportHeader)
+ 
+ set(CMAKE_CXX_VISIBILITY_PRESET default)
+-set(CMAKE_CXX_STANDARD_REQUIRED 14)
+ 
+ include_directories(. domain/mime/mimetreeparser domain/ domain/mime)
+ 
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -50,6 +50,9 @@ configure_file(kube_version.h.in ${CMAKE_BINARY_DIR}/kube_version.h)
+ 
+ enable_testing()
+ 
++set(CMAKE_CXX_STANDARD 14)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+ add_subdirectory(framework)
+ add_subdirectory(components)
diff --git a/mail-client/kube/files/kube-0.7.0-tests-optional.patch b/mail-client/kube/files/kube-0.7.0-tests-optional.patch
new file mode 100644
index 000000000000..0756cfb0cadd
--- /dev/null
+++ b/mail-client/kube/files/kube-0.7.0-tests-optional.patch
@@ -0,0 +1,62 @@
+--- a/CMakeLists.txt	2019-09-29 21:36:28.419106801 +0200
++++ b/CMakeLists.txt	2019-09-29 21:36:28.423106839 +0200
+@@ -43,7 +43,9 @@
+ add_subdirectory(applications)
+ add_subdirectory(views)
+ add_subdirectory(accounts)
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ if (${ENABLE_EXTENSION})
+     add_subdirectory(extensions)
+ endif()
+--- a/framework/CMakeLists.txt	2019-09-29 21:36:28.428106886 +0200
++++ b/framework/CMakeLists.txt	2019-09-29 21:36:28.433106934 +0200
+@@ -4,4 +4,6 @@
+ install(FILES qmldir DESTINATION ${FRAMEWORK_INSTALL_DIR})
+ 
+ add_subdirectory(src)
++if(BUILD_TESTING)
+ add_subdirectory(qml/tests)
++endif()
+--- a/framework/src/CMakeLists.txt	2019-09-29 21:36:28.437106972 +0200
++++ b/framework/src/CMakeLists.txt	2019-09-29 21:36:28.450107095 +0200
+@@ -86,10 +86,16 @@
+ 
+ set(BUILD_TESTING ON)
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ add_subdirectory(domain/mime)
++if(BUILD_TESTING)
+ add_subdirectory(domain/mime/tests)
++endif()
+ add_subdirectory(domain/mime/mimetreeparser)
++if(BUILD_TESTING)
+ add_subdirectory(domain/settings/tests)
++endif()
+ 
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+--- a/framework/src/domain/mime/mimetreeparser/CMakeLists.txt	2019-09-29 21:36:28.455107143 +0200
++++ b/framework/src/domain/mime/mimetreeparser/CMakeLists.txt	2019-09-29 21:36:28.458107171 +0200
+@@ -49,5 +49,7 @@
+     Gpgme::Gpgme
+ )
+ 
++if(BUILD_TESTING)
+ add_subdirectory(autotests)
+ add_subdirectory(tests)
++endif()
+--- a/components/CMakeLists.txt	2019-09-29 21:36:28.463107218 +0200
++++ b/components/CMakeLists.txt	2019-09-29 21:36:28.476107341 +0200
+@@ -8,7 +8,9 @@
+ endmacro(install_qml_component)
+ 
+ install_qml_component(kube)
++if(BUILD_TESTING)
+ add_subdirectory(kube/tests)
++endif()
+ install_qml_component(accounts)
+ 
+ 
diff --git a/mail-client/kube/kube-0.7.0-r1.ebuild b/mail-client/kube/kube-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..78e5b56d0627
--- /dev/null
+++ b/mail-client/kube/kube-0.7.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Mail client based on KDE Frameworks"
+HOMEPAGE="https://kube-project.com"
+SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	>=app-crypt/gpgme-1.7.1:=[cxx,qt5]
+	dev-libs/kasync:5
+	>=dev-libs/sink-0.7.0:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	kde-apps/kmime:5
+	kde-frameworks/breeze-icons:5
+	kde-frameworks/extra-cmake-modules:5
+	kde-frameworks/kcodecs:5
+	|| (
+		kde-frameworks/kcontacts:5
+		kde-apps/kcontacts:5
+	)
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-tests-optional.patch"
+	"${FILESDIR}/${P}-require-cxx14.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "/find_package.*Qt5/s/ Concurrent//" \
+		-i {extensions/api,framework}/src/CMakeLists.txt || die
+
+	if ! use test; then
+		sed -e "/find_package.*Qt5/s/ Test//" \
+			-i {,components/}CMakeLists.txt CMakeLists.txt \
+				{extensions/api,framework}/src/CMakeLists.txt || die
+		sed -e "/Qt5::Test/s/^/#DISABLED/" \
+			-i {extensions/api,framework}/src/CMakeLists.txt || die
+		sed -e "/set(BUILD_TESTING ON)/s/^/#DISABLED /" \
+			-e "/domain\/modeltest.cpp/s/^/#DISABLED /" \
+			-i framework/src/CMakeLists.txt || die
+	fi
+}
diff --git a/mail-client/kube/kube-0.7.0.ebuild b/mail-client/kube/kube-0.7.0.ebuild
deleted file mode 100644
index 75753f8bb2f6..000000000000
--- a/mail-client/kube/kube-0.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional-recursive"
-inherit kde5
-
-DESCRIPTION="A mail client by KDE"
-HOMEPAGE="https://kube.kde.org/"
-SRC_URI="https://github.com/KDE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	$(add_frameworks_dep breeze-icons)
-	$(add_frameworks_dep kcodecs)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1:=[cxx,qt5]
-	dev-libs/kasync
-	>=dev-libs/sink-0.7.0
-"
-DEPEND="${RDEPEND}
-	test? ( $(add_qt_dep qttest) )
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use test; then
-		sed \
-			-e "/Qt5::Test/s/^/#DISABLED/" \
-			-e "/set(BUILD_TESTING ON)/s/^/#DISABLED /" \
-			-e "/domain\/modeltest.cpp/s/^/#DISABLED /" \
-			-i framework/src/CMakeLists.txt || die
-	fi
-}