gentoo resync : 24.12.2018

5 files changed, 42 insertions, 32 deletions

diff --git a/kde-apps/kdesdk-meta/Manifest b/kde-apps/kdesdk-meta/Manifest
index 4a5e1be60639..4b24c090aa8b 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdesdk-meta-18.04.3.ebuild 787 BLAKE2B ef971af318c8bbf0bc0831ec896eff1c866e1dfe4366f0b3a046a13930f5ebb6d8bc7091ddaa93516044610ea47d3ba24bb826d485ce84254d1e525ae4868028 SHA512 69534d2fe222ff9a01b50c616d878643c4b8305332b7a78a5494006d2c2bba4d491ead1141627deb8923330ca951d786dfe6bddfe3c5de28d6ed3ae1fd27daf7
-EBUILD kdesdk-meta-18.08.3.ebuild 806 BLAKE2B b3134ed6d37b82a353f5d7a4ac35f9edfae0f61eda5cbcf50049d9c9977f03bebc1e873216a7695eee75187ef9c26ecaa564c5ad35a4c655860ec207a7cef42d SHA512 838927c369d50ae2d0a95079ac01aa0290b4f1ebcb2d699d42591b041af32047027152426ba5020be39a948e70441c3ea63b574f85501883f31f35cc542206c0
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD kdesdk-meta-18.08.3.ebuild 804 BLAKE2B de68e25ff1b99161687352d20d31732fcd0e1c6d9d823cb4e93caadd2395f3869e65ddd67d53330991a33446a36fafd545c032f08f9837ee223f7506720645ee SHA512 21c8ef1fe9043d0d678d64e9d34ed81f933417548b83e72226dbf8641bd6c3641843b9b9107040f4ba9863d66ec33afa11b2180744a80c59eebbd7e8bcd7be32
+EBUILD kdesdk-meta-18.12.0.ebuild 1141 BLAKE2B e33d3a65f2a55bd013711a8cf8c7d629b74aefa5a1f2197b9824fee8518c54a2900820fd86d9cebf02b74faf8d93b4d62baab7e53db17a6bef99c7fad8f838ff SHA512 69b69e4dbeebb0e12bb61c353a7534b8c7242fb25bb07d769fe21b47644d643e9615b551603bec8dc61edba086866123431c4cbe9518dea69eccc4887a5e3fd7
+MISC metadata.xml 831 BLAKE2B 3ff18fb8e3bd5dc045b904b841e1ed10639381802d746be424ec00dc40e3119fb6f3c066f4706aede87b1e659f4978c6b5a573ead33851983db01cde8d54d566 SHA512 138c632546c3860be6daafdf94c969d2c55e837bb2da18c112d5835511018399ff180ef3417727264899fddbfc3291845420df37c60853a6c9d6b9db5b758349
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-18.04.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-18.04.3.ebuild
deleted file mode 100644
index ac85038b84e3..000000000000
--- a/kde-apps/kdesdk-meta/kdesdk-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
-HOMEPAGE="https://www.kde.org/applications/development"
-KEYWORDS="amd64 x86"
-IUSE="cvs"
-
-RDEPEND="
-	$(add_kdeapps_dep dolphin-plugins)
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kcachegrind)
-	$(add_kdeapps_dep kde-dev-scripts)
-	$(add_kdeapps_dep kde-dev-utils)
-	$(add_kdeapps_dep kdesdk-kioslaves)
-	$(add_kdeapps_dep kdesdk-thumbnailers)
-	$(add_kdeapps_dep kompare)
-	$(add_kdeapps_dep kross-interpreters)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_kdeapps_dep lokalize)
-	$(add_kdeapps_dep poxml)
-	$(add_kdeapps_dep umbrello)
-	cvs? ( $(add_kdeapps_dep cervisia) )
-"
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-18.08.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-18.08.3.ebuild
index ce489a02766c..4f3f3652a3a6 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-18.08.3.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-18.08.3.ebuild
@@ -7,7 +7,7 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
 HOMEPAGE="https://www.kde.org/applications/development"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cvs +webkit"
 
 RDEPEND="
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-18.12.0.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..b2166bb058e4
--- /dev/null
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-18.12.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
+HOMEPAGE="https://www.kde.org/applications/development"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="bazaar cvs git mercurial subversion +webkit"
+
+RDEPEND="
+	>=kde-apps/kapptemplate-${PV}:${SLOT}
+	>=kde-apps/kcachegrind-${PV}:${SLOT}
+	>=kde-apps/kde-dev-scripts-${PV}:${SLOT}
+	>=kde-apps/kde-dev-utils-${PV}:${SLOT}
+	>=kde-apps/kdesdk-kioslaves-${PV}:${SLOT}
+	>=kde-apps/kdesdk-thumbnailers-${PV}:${SLOT}
+	>=kde-apps/kompare-${PV}:${SLOT}
+	>=kde-apps/kross-interpreters-${PV}:${SLOT}
+	>=kde-apps/libkomparediff2-${PV}:${SLOT}
+	>=kde-apps/lokalize-${PV}:${SLOT}
+	>=kde-apps/poxml-${PV}:${SLOT}
+	bazaar? ( >=kde-apps/dolphin-plugins-bazaar-${PV}:${SLOT} )
+	cvs? ( >=kde-apps/cervisia-${PV}:${SLOT} )
+	git? ( >=kde-apps/dolphin-plugins-git-${PV}:${SLOT} )
+	mercurial? ( >=kde-apps/dolphin-plugins-mercurial-${PV}:${SLOT} )
+	subversion? ( >=kde-apps/dolphin-plugins-subversion-${PV}:${SLOT} )
+	webkit? ( >=kde-apps/umbrello-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdesdk-meta/metadata.xml b/kde-apps/kdesdk-meta/metadata.xml
index 2fdbf33d963d..381989d26259 100644
--- a/kde-apps/kdesdk-meta/metadata.xml
+++ b/kde-apps/kdesdk-meta/metadata.xml
@@ -5,4 +5,10 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="bazaar">Enable support for Bazaar VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-bazaar</pkg></flag>
+		<flag name="git">Enable support for Git VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-git</pkg></flag>
+		<flag name="mercurial">Enable support for Mercurial VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-mercurial</pkg></flag>
+		<flag name="subversion">Enable support for Apache Subversion VCS in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-subversion</pkg></flag>
+	</use>
 </pkgmetadata>