gentoo resync : 24.12.2018

5 files changed, 28 insertions, 24 deletions

diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index e994bb608538..43e310023a01 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdenetwork-meta-18.04.3.ebuild 511 BLAKE2B 0627b330695a6747c664dd26304985af3675be0cece5e42c9780ec34ca4be767f2d1854eb25f75042b59e2f4ce8f4266e8800f534be3b80b0bd795252ad65b55 SHA512 5b5f2f98f9bc8fc2b47a6b18356c169e3ad631e3aace2f9014b4641664d362d16b3d338cc3c1b27dd58bb7ee256e6966dfa691c3102b7502ac048e107d3a8df9
-EBUILD kdenetwork-meta-18.08.3.ebuild 510 BLAKE2B 7a498a0a179b9b1f22540446b6bc3e4b684c726b773ccf42a520343bd69ab0de6e386b3ceb171e6256f15d51189991b3e148c125ddc77cc16b8549b78f23c148 SHA512 d351396aba161ee1814d16d2acde0238730a768004007d880b59474d94f9e53fc54bf1f1796faabd0e9cc8f99a3d1b14276797bb19c8a75598c79efdce74165a
-MISC metadata.xml 410 BLAKE2B 8d98bd833e50db75f604cdb99878a614b28ad320b4a377b75897b7bcb6d0b95f5b2fa102661fc26474533eeda09e7cd5f8fe2131d0162f85b87c45a8aee9649f SHA512 049780b067ed1159cac1db34a6408997d614c74445b74c01d0fb3bca4beb46185b8bed2e2280f590501b44177fe13a5bf3fa090c21cfb5455b4e7a3a44ef1436
+EBUILD kdenetwork-meta-18.08.3.ebuild 508 BLAKE2B 7d56875f96683b3ecb637f7eb5a1a1353186313dfc30f0c13f5726319ff2d1b9953a4e50e13af2b404c8e368b624ab5bf4035362b6a69af77f054ef014063072 SHA512 29de2da6d4fc33402be78f36dc822f9bb23315fd3dbac8108c81d8eb1602dc3ac32321552b945fe0bf7105565777723bb661c9bee13d3de41fa4c2c0c4f0e7e1
+EBUILD kdenetwork-meta-18.12.0.ebuild 664 BLAKE2B 77d53d9aca2425a150fcbfe286893054e472a22135ce5e3da8025f7608666b8911ff14318cc973b4595fbb3aff63536f8757435bd1b40ac1036cff4241a7bb73 SHA512 84dfb7863e38801ea222174a66d479f4c0035b6db58bf9d510a886abe134e63ea6fdb9071e2f6f170878c877699f47a84ac92bd8524257721bb6818af0b19dcf
+MISC metadata.xml 546 BLAKE2B c0eaa549235c2cf501ecfb5eb2b39bf466193e892715224ff8979528e49d2dd129873714302505f54ea200707eba0682a75a4232bbfe89b78244b5483d93a2dc SHA512 a423dbfbd45bd72c6d5aa9f196c9a4f1b4740400ac31112f358246e40f22ebaf76d3fc66136b4f477ebdfb59c967b45351841718621fc88f5576b71338136e6a
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.3.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.3.ebuild
deleted file mode 100644
index 482972d2d7bd..000000000000
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,20 +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="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-KEYWORDS="amd64 x86"
-IUSE="+telepathy"
-
-RDEPEND="
-	$(add_kdeapps_dep kdenetwork-filesharing)
-	$(add_kdeapps_dep kget)
-	$(add_kdeapps_dep krdc)
-	$(add_kdeapps_dep kopete)
-	$(add_kdeapps_dep krfb)
-	$(add_kdeapps_dep zeroconf-ioslave)
-	telepathy? ( $(add_kdeapps_dep plasma-telepathy-meta) )
-"
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.08.3.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.08.3.ebuild
index 53d2827dcc7f..56f4e495e66c 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.08.3.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+telepathy"
 
 RDEPEND="
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.0.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..f8032c178faf
--- /dev/null
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="dropbox +telepathy"
+
+RDEPEND="
+	>=kde-apps/kdenetwork-filesharing-${PV}:${SLOT}
+	>=kde-apps/kget-${PV}:${SLOT}
+	>=kde-apps/krdc-${PV}:${SLOT}
+	>=kde-apps/kopete-${PV}:${SLOT}
+	>=kde-apps/krfb-${PV}:${SLOT}
+	>=kde-apps/zeroconf-ioslave-${PV}:${SLOT}
+	dropbox? ( >=kde-apps/dolphin-plugins-dropbox-${PV}:${SLOT} )
+	telepathy? ( >=kde-apps/plasma-telepathy-meta-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdenetwork-meta/metadata.xml b/kde-apps/kdenetwork-meta/metadata.xml
index 0eb226e532aa..0225cc74ae93 100644
--- a/kde-apps/kdenetwork-meta/metadata.xml
+++ b/kde-apps/kdenetwork-meta/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="dropbox">Enable support for Dropbox in <pkg>kde-apps/dolphin</pkg> via <pkg>kde-apps/dolphin-plugins-dropbox</pkg></flag>
 		<flag name="telepathy">Enable support for Plasma Telepathy (instant messaging) integration via <pkg>kde-apps/plasma-telepathy-meta</pkg></flag>
 	</use>
 </pkgmetadata>