gentoo resync : 24.12.2018

5 files changed, 50 insertions, 33 deletions

diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index c914e733126a..f9fd86152a5e 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeutils-meta-18.04.3.ebuild 808 BLAKE2B db0af0cdceff2e6d3012637829d2cafbb9c931fde649b74d996deb9eb0bdb732a979782b41bec1009b360dde2f5dfb6d480588e347b9b3c920ebad43c09abbf8 SHA512 661a80f10cbc6b4cb249bd077640bcab21419278a11a0ea3f7eb46b6e0b114d0947d542d6d93c4300de31d20a3721b8e8d5e4601d8c43b19f17a9e711c5715ba
-EBUILD kdeutils-meta-18.08.3.ebuild 807 BLAKE2B 28d1bc2ecb6cb3c4dd2e05888b2f1ada9c85d416b85dd56e823c2d68a80d6fad2472586848a14165e32e1b0cf7a8e75919cca9209a94610248f9f8b2f1fd1947 SHA512 c0c8359da2dbae62d08a8cc9c3c84a0e29473521e6ecf0a404164686171ea0621402ac572902fde50e2c2fbd820cbcd11a80962f17ab0ecf93d8c52daa84dd30
-MISC metadata.xml 389 BLAKE2B 7f665fc6407ec0455464d44f43b98afba7702a6b7a2e65841d2bd54dc7c229cc5c227cdd47fd81eb7cb97e45b69957c2d4085a61e2e2eecd2e2f8186d896971a SHA512 f991910e5080fab1810b9762700b528556370472cb796e02c5f03fe63058f4e5d665ad39b6de597d49c04c233b09a4b703c80408205a3df175025c14767cf564
+EBUILD kdeutils-meta-18.08.3.ebuild 805 BLAKE2B c31bb07b92ebbca7801c59dcdf286030a33a9b05d9ac5c68ba9e783c1fd72d1338ab247f043449c8f2bd0f917204964b15842e2fcf637a774af50383c84ae00c SHA512 6be922a9d5b1ebb444fcdb1169b6c4d312a75936a9d11838bf87f5000a786c4136156a53419380a20b944dba67a63fb6223da06cfcbf03f7e23df35f1a77841d
+EBUILD kdeutils-meta-18.12.0.ebuild 1133 BLAKE2B 77777e7a283d0724ec55a81c901306005061138221f7375e672b782ea84270a108a003849e35e4cb47a5958161a348ba8cd9d66926307af283989263fdc17261 SHA512 94cd83baab6ee7eb9169f045cb487a5b4f4bb78e638ecf8749e113340e107ebbb91763b8138982426b53f3a5802f0fd9820793188c3ff2dc8617624781fb2998
+MISC metadata.xml 752 BLAKE2B 44ef1551929d69e70d5af562ca212c8e2498ff26e27e38d718a2ae0a2499a002c382cdcef6b51a6273d2c372174509636a5c5bf705b2b60c31dc4e7368727a5f SHA512 35e4ed0057daf09428e123daefebbda024445d4fd324d813a95d1ec1f135b90bf7380ec3fa5553fb13e143194b9d61b82fae2bb16ed33757da6f8dceb1d4b27c
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-18.04.3.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-18.04.3.ebuild
deleted file mode 100644
index 71710fad16dc..000000000000
--- a/kde-apps/kdeutils-meta/kdeutils-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,29 +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="kdeutils - merge this to pull in all kdeutils-derived packages"
-HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
-KEYWORDS="amd64 x86"
-IUSE="cups floppy"
-
-RDEPEND="
-	$(add_kdeapps_dep ark)
-	$(add_kdeapps_dep filelight)
-	$(add_kdeapps_dep kbackup)
-	$(add_kdeapps_dep kcalc)
-	$(add_kdeapps_dep kcharselect)
-	$(add_kdeapps_dep kdebugsettings)
-	$(add_kdeapps_dep kdf)
-	$(add_kdeapps_dep kgpg)
-	$(add_kdeapps_dep kimagemapeditor)
-	$(add_kdeapps_dep kteatime)
-	$(add_kdeapps_dep ktimer)
-	$(add_kdeapps_dep kwalletmanager)
-	$(add_kdeapps_dep sweeper)
-	cups? ( $(add_kdeapps_dep print-manager) )
-	floppy? ( $(add_kdeapps_dep kfloppy) )
-"
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-18.08.3.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-18.08.3.ebuild
index eee02d6e0745..b8382ba37654 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-18.08.3.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-18.08.3.ebuild
@@ -7,7 +7,7 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
 HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cups floppy"
 
 RDEPEND="
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-18.12.0.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..ea86b513debe
--- /dev/null
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-18.12.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
+HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="7zip cups floppy lrz rar"
+
+RDEPEND="
+	>=kde-apps/ark-${PV}:${SLOT}
+	>=kde-apps/filelight-${PV}:${SLOT}
+	>=kde-apps/kate-${PV}:${SLOT}
+	>=kde-apps/kbackup-${PV}:${SLOT}
+	>=kde-apps/kcalc-${PV}:${SLOT}
+	>=kde-apps/kcharselect-${PV}:${SLOT}
+	>=kde-apps/kdebugsettings-${PV}:${SLOT}
+	>=kde-apps/kdf-${PV}:${SLOT}
+	>=kde-apps/kgpg-${PV}:${SLOT}
+	>=kde-apps/kimagemapeditor-${PV}:${SLOT}
+	>=kde-apps/kteatime-${PV}:${SLOT}
+	>=kde-apps/ktimer-${PV}:${SLOT}
+	>=kde-apps/kwalletmanager-${PV}:${SLOT}
+	>=kde-apps/sweeper-${PV}:${SLOT}
+	cups? ( >=kde-apps/print-manager-${PV}:${SLOT} )
+	floppy? ( >=kde-apps/kfloppy-${PV}:${SLOT} )
+"
+# Optional runtime deps: kde-apps/ark
+RDEPEND="${RDEPEND}
+	7zip? ( app-arch/p7zip )
+	lrz? ( app-arch/lrzip )
+	rar? (
+		|| (
+			app-arch/unar
+			app-arch/unrar
+		)
+		app-arch/rar
+	)
+"
diff --git a/kde-apps/kdeutils-meta/metadata.xml b/kde-apps/kdeutils-meta/metadata.xml
index 2061e1b7f6f8..702bd89bbd3e 100644
--- a/kde-apps/kdeutils-meta/metadata.xml
+++ b/kde-apps/kdeutils-meta/metadata.xml
@@ -6,6 +6,9 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="7zip">Install <pkg>app-arch/p7zip</pkg> for 7zip archive support in <pkg>kde-apps/ark</pkg></flag>
 		<flag name="floppy">Install <pkg>kde-apps/kfloppy</pkg> to format and create DOS or ext2fs filesystems in a floppy.</flag>
+		<flag name="lrz">Install <pkg>app-arch/lrzip</pkg> for LRZ archive support in <pkg>kde-apps/ark</pkg></flag>
+		<flag name="rar">Install <pkg>app-arch/unar</pkg> or <pkg>app-arch/unrar</pkg> for RAR archive support in <pkg>kde-apps/ark</pkg></flag>
 	</use>
 </pkgmetadata>