gentoo resync : 24.12.2018

5 files changed, 40 insertions, 34 deletions

diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index fd55ebf57c44..a6e6060315ee 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdecore-meta-18.04.3.ebuild 564 BLAKE2B ab892f36312833261e1e698df5d0b79a04f340189169b59d93fcbe9c00f8fe6a50c80af09260675600080669a8c2c444307a946ae934914f8140fd429ad242d5 SHA512 e0a096c7a226d6ebec34759d4cba1b06531be6fdc553bf90fdeacda8f30dd2570fcc0bc112a7acd6c877a7e3a3c44406d1050cb985948ca5ceaaf96af8acdba3
-EBUILD kdecore-meta-18.08.3.ebuild 541 BLAKE2B 1e1dcccc525dc571747f6c51fd5c215c8d9db1adaf1a21faf62a74f3c6a967a4362d001f22c549ca7a46221db9a6bb4264f4459a46653a436bb3b5c1207e3939 SHA512 e3b9b0d3d7df1a7d78617e11c3b67ee88fa2bc6daa40c249e61f15b5a04a466806e552b34e894c59842113dc6baad1d006f8408cfdf6437318caad232af03fe2
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD kdecore-meta-18.08.3-r1.ebuild 614 BLAKE2B f4f08be0d86f2373771f2298ad8d2425ae18da26d481c4c83f31f8c7df6e15d99595866eb02d07cf1424019a1bf0eacf2bb0a06a740a276de9bdccd88a707c93 SHA512 b4eb2309283655dba67e3842256260abf0778d8c0f283e38d015a5af693fee41d60f404dc9f797c04635bc54c27fbc3883c61316ef07f879bcbfec666bc05518
+EBUILD kdecore-meta-18.12.0.ebuild 704 BLAKE2B 7e4f3d5d2ed1c7f7b7e284ed90061927f05c7b1f0ba98abfa68472a56912697fa8d0c2c9eb8fc5c0923b353b7456a6d299ecba5eefe3da6256b101421cb9c6de SHA512 d518bab2b00e6677a8650997759175e8b99473ba28031c808740d2b4d11dfde1e17c18ae0586240c5d6304d58c54ad169908d12728aa2335342c887453be22a7
+MISC metadata.xml 379 BLAKE2B 2a24219261d6d38e3bd4b1587306924e5e313cb4e1670f9067ae32cc2a139f04d1b8c1e626580723d01e0c75b98304fa48eb1930792e9d68d0b28a65a05bc9d3 SHA512 bf09bd560e358d4a279b8b4c3f8e937bd683778c60cd0af445168fd5bf6a4ba571b42e9efd3d202a0e2da11c5e481583ff55e67881cc12945da3a5f35f1985a6
diff --git a/kde-apps/kdecore-meta/kdecore-meta-18.04.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.04.3.ebuild
deleted file mode 100644
index 71c701acb64f..000000000000
--- a/kde-apps/kdecore-meta/kdecore-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,25 +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="kdecore - merge this to pull in the most basic applications"
-KEYWORDS="amd64 x86"
-IUSE="+handbook"
-
-RDEPEND="
-	$(add_kdeapps_dep dolphin)
-	$(add_kdeapps_dep kdialog)
-	$(add_kdeapps_dep keditbookmarks)
-	$(add_kdeapps_dep kfind)
-	|| (
-		www-client/falkon
-		www-client/qupzilla
-		$(add_kdeapps_dep konqueror)
-	)
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep kwrite)
-	handbook? ( $(add_kdeapps_dep khelpcenter) )
-"
diff --git a/kde-apps/kdecore-meta/kdecore-meta-18.08.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.08.3-r1.ebuild
index 94065acab4a2..e40f6e06852d 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-18.08.3.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-18.08.3-r1.ebuild
@@ -6,19 +6,20 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="kdecore - merge this to pull in the most basic applications"
-KEYWORDS="~amd64 ~x86"
-IUSE="+handbook"
+KEYWORDS="amd64 x86"
+IUSE="+handbook +webengine webkit"
 
 RDEPEND="
 	$(add_kdeapps_dep dolphin)
 	$(add_kdeapps_dep kdialog)
 	$(add_kdeapps_dep keditbookmarks)
 	$(add_kdeapps_dep kfind)
-	|| (
-		www-client/falkon
-		$(add_kdeapps_dep konqueror)
-	)
 	$(add_kdeapps_dep konsole)
 	$(add_kdeapps_dep kwrite)
 	handbook? ( $(add_kdeapps_dep khelpcenter) )
+	webengine? ( www-client/falkon )
+	webkit? (
+		$(add_kdeapps_dep konqueror 'webengine?')
+		kde-misc/kwebkitpart:5
+	)
 "
diff --git a/kde-apps/kdecore-meta/kdecore-meta-18.12.0.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..1a31e8c41e72
--- /dev/null
+++ b/kde-apps/kdecore-meta/kdecore-meta-18.12.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdecore - merge this to pull in the most basic applications"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+handbook +webengine webkit"
+
+RDEPEND="
+	>=kde-apps/dolphin-${PV}:${SLOT}
+	>=kde-apps/kdialog-${PV}:${SLOT}
+	>=kde-apps/keditbookmarks-${PV}:${SLOT}
+	>=kde-apps/kfind-${PV}:${SLOT}
+	>=kde-apps/konsole-${PV}:${SLOT}
+	>=kde-apps/kwrite-${PV}:${SLOT}
+	handbook? ( >=kde-apps/khelpcenter-${PV}:${SLOT} )
+	webengine? ( www-client/falkon )
+	webkit? (
+		>=kde-apps/konqueror-${PV}:${SLOT}[webengine?]
+		kde-misc/kwebkitpart:5
+	)
+"
diff --git a/kde-apps/kdecore-meta/metadata.xml b/kde-apps/kdecore-meta/metadata.xml
index 2fdbf33d963d..8a440f7049ca 100644
--- a/kde-apps/kdecore-meta/metadata.xml
+++ b/kde-apps/kdecore-meta/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="webengine">Enable <pkg>www-client/falkon</pkg> which depends on <pkg>dev-qt/qtwebengine</pkg></flag>
+	</use>
 </pkgmetadata>