gentoo resync : 24.12.2018

4 files changed, 45 insertions, 44 deletions

diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index 4adcc07f003f..63dbeb6899fe 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeedu-meta-18.04.3.ebuild 1044 BLAKE2B 1d20c11f4dbb093f4822dc84c36baba673e4f215dc770d8414654c6298f90d18f8082f4f51865cadc129a3d1d472ba70e64ade7985a28c256984944bdff564c1 SHA512 bc2217d651699fe4306cd9a30eaaaab0cf59a60cfd2da06e4e0494910b54fe520fca5e7141b0a5d325f770a6699cf8b7a3331ce29a967ebce43f17d1ca1926f1
-EBUILD kdeedu-meta-18.08.3.ebuild 1063 BLAKE2B b44447e639ebd4dd13a8a54090dc16dc1684bfca8ae8eae1186e642085a5ad13e64b08001fb14c8e48787217d95426eced4c1dd3afeb7a30ec08d58216017eea SHA512 dc5306cb7b3370abe8d2d1e2d36f1d037582c3451826ff078cef542074dba84119bccb5018a9df452b2f22c6da1ec53b9df717a754a19e68a0ff0c1012010801
+EBUILD kdeedu-meta-18.08.3.ebuild 1061 BLAKE2B 5cb235a62ba467633ffe9f60ae71bfec2f725b18bb7e1715c287b1f64fcdbfacbc2561eabbd308d526be4035248011013c5d2595278fa090d5692a2add2901df SHA512 350d485e3ce1ac5f4321a7a660aedd7e3d13c1591b5fcede5bf5021e2cc6cc4bc8a3aa40e62ca91627fe9a27e711714552fe9e1717ed9800c7aa2e67bf2eab9f
+EBUILD kdeedu-meta-18.12.0.ebuild 1222 BLAKE2B 66fc65f472178d1c193defb18c16bb455697ed67d2f4a61fcb7bc251461b0dd8185dcddf4cb94212a11139fbc83da98ce7b5c015305d3cd5e607b65517315913 SHA512 044e9fc21c312e168e82400aca614e56a316fc1f40825b10b465a9bd292aacbe5a29a80cbc9edf703bd84453ab0ab54089911c453f82daa8838c4defdc7ec0ad
 MISC metadata.xml 403 BLAKE2B 0cd42ab85cbd256e6080ce92fd939e8138a9639832c2f0a87ce4fec0364ead3a180d344c16672a2631dd294cbb7f50f9d748a6a3d0585c6a834bffb05469792c SHA512 50f9c120fc6e8705b2b40f21a3e119a1a52fdb1bafcaed645f41bd13311cac342f4ccff3090a9fa3ba031904871954f81ef3301c73a58e0688d071ddba5d0152
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.04.3.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.04.3.ebuild
deleted file mode 100644
index bf36c2eb3623..000000000000
--- a/kde-apps/kdeedu-meta/kdeedu-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,41 +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 educational apps - merge this to pull in all kdeedu-derived packages"
-HOMEPAGE="https://edu.kde.org"
-KEYWORDS="amd64 x86"
-IUSE="+webengine"
-
-RDEPEND="
-	$(add_kdeapps_dep analitza)
-	$(add_kdeapps_dep artikulate)
-	$(add_kdeapps_dep blinken)
-	$(add_kdeapps_dep cantor)
-	$(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 ktouch)
-	$(add_kdeapps_dep kturtle)
-	$(add_kdeapps_dep kwordquiz)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_kdeapps_dep marble)
-	$(add_kdeapps_dep minuet)
-	$(add_kdeapps_dep rocs)
-	$(add_kdeapps_dep step)
-	webengine? (
-		$(add_kdeapps_dep kalgebra)
-		$(add_kdeapps_dep parley)
-	)
-"
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.08.3.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.08.3.ebuild
index df0c70a95b08..f5c5beae015f 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-18.08.3.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-18.08.3.ebuild
@@ -7,7 +7,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="+webengine +webkit"
 
 RDEPEND="
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.12.0.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..798b7d6d7040
--- /dev/null
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-18.12.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
+HOMEPAGE="https://edu.kde.org"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+webengine +webkit"
+
+RDEPEND="
+	>=kde-apps/analitza-${PV}:${SLOT}
+	>=kde-apps/artikulate-${PV}:${SLOT}
+	>=kde-apps/blinken-${PV}:${SLOT}
+	>=kde-apps/cantor-${PV}:${SLOT}
+	>=kde-apps/kalzium-${PV}:${SLOT}
+	>=kde-apps/kanagram-${PV}:${SLOT}
+	>=kde-apps/kbruch-${PV}:${SLOT}
+	>=kde-apps/kdeedu-data-${PV}:${SLOT}
+	>=kde-apps/kgeography-${PV}:${SLOT}
+	>=kde-apps/khangman-${PV}:${SLOT}
+	>=kde-apps/kig-${PV}:${SLOT}
+	>=kde-apps/kiten-${PV}:${SLOT}
+	>=kde-apps/klettres-${PV}:${SLOT}
+	>=kde-apps/kmplot-${PV}:${SLOT}
+	>=kde-apps/kqtquickcharts-${PV}:${SLOT}
+	>=kde-apps/ktouch-${PV}:${SLOT}
+	>=kde-apps/kturtle-${PV}:${SLOT}
+	>=kde-apps/kwordquiz-${PV}:${SLOT}
+	>=kde-apps/libkeduvocdocument-${PV}:${SLOT}
+	>=kde-apps/marble-${PV}:${SLOT}
+	>=kde-apps/minuet-${PV}:${SLOT}
+	>=kde-apps/step-${PV}:${SLOT}
+	webengine? (
+		>=kde-apps/kalgebra-${PV}:${SLOT}
+		>=kde-apps/parley-${PV}:${SLOT}
+	)
+	webkit? ( >=kde-apps/rocs-${PV}:${SLOT} )
+"