gentoo resync : 15.12.2019

5 files changed, 65 insertions, 55 deletions

diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index 22e9e51ec4b0..89aeddd323f2 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,5 +1,5 @@
-DIST kate-19.04.3.tar.xz 5790932 BLAKE2B a6eb6b73a671cff1c5ba7b4f46e790fbfbabbc7d97322983fa524ddbd8b0d12f528275b9d90210c66332081edea3c10968933f151894a3048d9a815d28c3f82b SHA512 57ea4a527307dd45818b7e3f1b59ac346f5e82090b01fb010d4e3e31d00eda9c1b8e554ab203c3320fa073fbd65e775e27375f254f05f2dee512a32ef09bc218
 DIST kate-19.08.3.tar.xz 5844532 BLAKE2B 34aaceab92783a869de616be9290887f75eba5ef6198e93d90a71d62b441a907a7893916c72ac85c46d6156330322d5297c60c8c9b43cbcd615c05b51cdd0000 SHA512 0a0b33858bd4856bdf29d354603d33541b2c0aab134025db3014aa31cf3231fa2bcc244252872c0b51c28b7cd715556966d9049ce85a8ad614e1f552479c1bc8
-EBUILD kwrite-19.04.3.ebuild 1186 BLAKE2B e0bda0df0a0c1b18f5bb0f6542cd2b0b23ff62ce8423e0d1d7ab478580b521e0a74c20c48185de8d6f429812fb2248c081d28b5c5b494091345dacd08d4f39a2 SHA512 73535bef1bf33a06417b5669932354552f64a15693811b5c3274d4552b23c3e196a4b632234f45d08b7a285f26d3218102cfc28d4ac4440e24496b440c9a0ae2
-EBUILD kwrite-19.08.3.ebuild 1355 BLAKE2B 727080897d82d55a8075eb3e6d6da8713b79577d9db8f4ca6d52a06c6a481d01fb6f8937ec76bd75f060c8a1f1880994dd6250ab021266279538e5253b5a9cdd SHA512 c2119781c821df9e62735b0337eccb68ba78aefa954390cb325d8e5fbca8daeeb2cbf7c74a14c53c87e49667cb14d3d794137d113574b50ac920a2cbd378fa36
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+DIST kate-19.12.0.tar.xz 5695096 BLAKE2B 8b783c86879ccf49d8d028b02eb5ff89e85ff061605e1fd46e0d5952611455a1832a20fba2158eff61617617f95207a158a6e36975602fb4ff0dcd7147928f8a SHA512 37106b3db09c302d69922cb81a425b2a74bc7bac8cc7d767d6efa59d60b5e80b4f1d2e20dc1e87a2cc57b534fdaefd58b40ce463894f58b56d8ec9a229487db8
+EBUILD kwrite-19.08.3.ebuild 1352 BLAKE2B 18fde4c907ef8a39d72f4eade94b7f152d0dc9dc100552709e594512aad73201212b288005b84ea8af93e3429e30dbab8215500caf1950f30de9d93f5a8c30b8 SHA512 927234c2ae520cd640eced082a138595cd80e0c000ec4112e7d6334dfd449ce7179d4cda73d05306eb4e592700990deaa909b17f5f9bb36d8afd2c93f620a818
+EBUILD kwrite-19.12.0.ebuild 1471 BLAKE2B d776bedd64518c9eadc24889cd665bc6c8fbe36a7c215ad2b7196229e718154568b0918d0b40ab223d694817b1442dec62177a22f4af44a50a2a5b91ee058777 SHA512 82058e9e2dfdf1b6287a277a1a2a16367a6851dc1c7ea8710ea4bf86dfe5e6cdf3890ae1822c26007790768db4995092a7756196eb8b744d9e18a7538afd2455
+MISC metadata.xml 372 BLAKE2B 80ff693fe7c7c67aee3a23b6a658a150e33589f9a42df15e7d1956290947555993789ee023345b585fecda3ae828b9d99107aa72b15a6dbaeaa806d0bc2fc2f0 SHA512 3c9a012ef2f6e23889c5c73b3c418e9e60439ea3e3a58995eb8a8b730bfafa5659c7cdb848d0b340f1456828105d92e85c9cdcf55faf22ac676d2d377a004093
diff --git a/kde-apps/kwrite/kwrite-19.04.3.ebuild b/kde-apps/kwrite/kwrite-19.04.3.ebuild
deleted file mode 100644
index 00349a2ac53b..000000000000
--- a/kde-apps/kwrite/kwrite-19.04.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KMNAME="kate"
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="KDE simple text editor"
-HOMEPAGE="https://kde.org/applications/utilities/kwrite"
-KEYWORDS="amd64 arm64 x86"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-	# delete colliding kate translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -not -name "kwrite*" -delete || die
-		rm -rf po/*/docs/kate* || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_addons=FALSE
-		-DBUILD_kate=FALSE
-	)
-	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kwrite/kwrite-19.08.3.ebuild b/kde-apps/kwrite/kwrite-19.08.3.ebuild
index c622764d1b11..37cfd2789ff4 100644
--- a/kde-apps/kwrite/kwrite-19.08.3.ebuild
+++ b/kde-apps/kwrite/kwrite-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE simple text editor"
 HOMEPAGE="https://kde.org/applications/utilities/kwrite"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 DEPEND="
 	>=kde-frameworks/kactivities-${KFMIN}:5
diff --git a/kde-apps/kwrite/kwrite-19.12.0.ebuild b/kde-apps/kwrite/kwrite-19.12.0.ebuild
new file mode 100644
index 000000000000..0862c397eb87
--- /dev/null
+++ b/kde-apps/kwrite/kwrite-19.12.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="kate"
+ECM_HANDBOOK="optional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Simple text editor based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.kwrite"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="activities"
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+	# delete colliding kate translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "kwrite*" -delete || die
+		rm -rf po/*/docs/kate* || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities KF5Activities)
+		-DBUILD_addons=FALSE
+		-DBUILD_kate=FALSE
+	)
+	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kwrite/metadata.xml b/kde-apps/kwrite/metadata.xml
index 2fdbf33d963d..e86df5ddbf6b 100644
--- a/kde-apps/kwrite/metadata.xml
+++ b/kde-apps/kwrite/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="activities">Enable Plasma Activities support via <pkg>kde-frameworks/kactivities</pkg></flag>
+	</use>
 </pkgmetadata>