gentoo resync : 24.12.2018

4 files changed, 20 insertions, 18 deletions

diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index 4a2fe592ee99..12e226ac4111 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeadmin-meta-18.04.3.ebuild 346 BLAKE2B e02288f4f94c2cfcefad4805143e8256ef440d6227a1e77ed4b338fd11c35b194932e416b9539103fe55ac60408d4fc5bfad953a7bbc550f47877a313f6c562d SHA512 89332ce2348e6105ea23a41ad6299cd91eef4d232add22e98e8bbbfc29c7f28be81e90e56fd14a9f10872fd21a72984eb9ecfd273c663a07f2d36f19bda76aeb
-EBUILD kdeadmin-meta-18.08.3.ebuild 345 BLAKE2B 5205566bc5f8a6afa98710d9d5ac1cefe8724535420908af0e1e971c46af3ced38c388b1e1d9bb00a1d97fc777a40f2e05aa8c66bb11fd18315b05c5a4868be1 SHA512 e934c11312db226c00831142e4ffbbc21f81c5bc53cb2cc63c0396c2c2f2d4c5686d48c54c6adf057613aef9c395c205bb2f655f9d69e50e1757d0cc55e883ac
+EBUILD kdeadmin-meta-18.08.3.ebuild 343 BLAKE2B 9c4d5bb6cbede83503129d6952208202dec0442faacb1a5591649abb5dc87c94f428866536254b1db1cca63567b94b310056540d988242994d1b569407bcdb7b SHA512 be7d8cc3841a14b7df8d163769261f84f0f45401b3df486fb5246c4dc28ac1d09ebfc2b6de33077d3ca3bd61bcb4e623a0a153c03ecc55e614f307f005fa1615
+EBUILD kdeadmin-meta-18.12.0.ebuild 398 BLAKE2B a602697838f6eab447eb3770088c16fd72982db4b8dadf7de5fc78fcc2f15869851df64337efdf772d887c50c1dfb950392e92946da7daadf8fc440e5998360d SHA512 9c31cc676c90e1a0ba6d49ff16011945148c2b0baa1fc0f015e3c04d282b9e175abcd9aed309eb3d308165b3d38a969fcc7fee9c991dabbc12f3ae676e637f80
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.3.ebuild
deleted file mode 100644
index 6ea3535889ad..000000000000
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,15 +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 administration tools - merge this to pull in all kdeadmin-derived packages"
-KEYWORDS="amd64 x86"
-IUSE="+cron"
-
-RDEPEND="
-	$(add_kdeapps_dep ksystemlog)
-	cron? ( $(add_kdeapps_dep kcron) )
-"
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.08.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.08.3.ebuild
index 0c2139b095f6..b6316938d249 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.08.3.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.08.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+cron"
 
 RDEPEND="
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.0.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..cbdb7d370e0f
--- /dev/null
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cron"
+
+RDEPEND="
+	>=kde-apps/ksystemlog-${PV}:${SLOT}
+	cron? ( >=kde-apps/kcron-${PV}:${SLOT} )
+"