gentoo resync : 25.11.2020

5 files changed, 36 insertions, 55 deletions

diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index 071aaa9938c2..8a04b693e918 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD kde-apps-meta-20.04.3.ebuild 793 BLAKE2B 68bd8c5855d00606a00d362ffa6410a962902de928a8d2ec3b3aade2e156e2206f24a609a8cf677b53f5491b771f2602fc586ad20f3f270ad5742f260fccf575 SHA512 3d036ac6fc2143f6060bc4e4a8e2d079c72c978fa674132123557731a099c9c66d7c065013fec5b086ccc6449cb24e1ff389f1b1f1d1ff0773f2257b472066e9
-EBUILD kde-apps-meta-20.08.1.ebuild 796 BLAKE2B 3c748e587c7a812d7a7df7b7384c4505933df37b8dc1c22eb37a92d3a023250c911cb53441b51316e895df8a33902a3dd37386c0f05664445fabf645e48aec9b SHA512 d5f93214334bc9722ee4ac6b5522cf4be5e04a615573fc2a8d3f808ae56c18f284d4d46b392ff6555cb1f450ed732a73f84322252fb294b64128f5504469fa48
-MISC metadata.xml 379 BLAKE2B 7144d7c2d05ea49b428bf76314c83a1150296ea19006204241298a707ae28fe67a6feb328f0516cc34859bc1af61df6cda3074d58f96d61be1ef1c21892468b4 SHA512 9dd851fa81ee09c64dff5019b7fe60ff945159b14cf92af707df486969d72a0896b2116c4b203afccf056ff4b2e9704d29022ed0b5d8fb60f65c1cf6d6935ed9
+EBUILD kde-apps-meta-20.08.3.ebuild 950 BLAKE2B 3ab8395a5f36299423fb0c77afbc0e5cb7d001b89b45e6ad430eb582681dc60099e0b6f951b17e25ffab93f6fa7393fe7362ecacc437e4de22f427f60bba433d SHA512 b813ea98a858277e23f744d66964fcf45b32f8d1b168fe1690b892e00ae67298e05ff20352f7bbceaa56c2c50307d0e41a84e6b3bcf63b48b2bbab0376b91695
+MISC metadata.xml 1049 BLAKE2B 778017619970b4273fe80289685d475957f475d667835e05c90b7e39066e1bc33e2bb30d44d24d22adb0f15ff23fcb30fe9be96870192c66ff2c110826d3c697 SHA512 9841707a510b2b7a948fe4e06ecb79aec4650d9f40a4a4acbbcaf1e5500d5ec7767496bd7d1daf194a66a919284dc1c04c8fed73e81d1cacac4b1aee3839c77c
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-20.04.3.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-20.04.3.ebuild
deleted file mode 100644
index d9b207db8161..000000000000
--- a/kde-apps/kde-apps-meta/kde-apps-meta-20.04.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Meta package for the KDE Applications collection"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="accessibility pim sdk"
-
-RDEPEND="
-	>=kde-apps/kdeadmin-meta-${PV}:${SLOT}
-	>=kde-apps/kdecore-meta-${PV}:${SLOT}
-	>=kde-apps/kdeedu-meta-${PV}:${SLOT}
-	>=kde-apps/kdegames-meta-${PV}:${SLOT}
-	>=kde-apps/kdegraphics-meta-${PV}:${SLOT}
-	>=kde-apps/kdemultimedia-meta-${PV}:${SLOT}
-	>=kde-apps/kdenetwork-meta-${PV}:${SLOT}
-	>=kde-apps/kdeutils-meta-${PV}:${SLOT}
-	accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:${SLOT} )
-	pim? ( >=kde-apps/kdepim-meta-${PV}:${SLOT} )
-	sdk? ( >=kde-apps/kdesdk-meta-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-20.08.1.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-20.08.1.ebuild
deleted file mode 100644
index 02fb05e6b0ad..000000000000
--- a/kde-apps/kde-apps-meta/kde-apps-meta-20.08.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Meta package for the KDE Applications collection"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="accessibility pim sdk"
-
-RDEPEND="
-	>=kde-apps/kdeadmin-meta-${PV}:${SLOT}
-	>=kde-apps/kdecore-meta-${PV}:${SLOT}
-	>=kde-apps/kdeedu-meta-${PV}:${SLOT}
-	>=kde-apps/kdegames-meta-${PV}:${SLOT}
-	>=kde-apps/kdegraphics-meta-${PV}:${SLOT}
-	>=kde-apps/kdemultimedia-meta-${PV}:${SLOT}
-	>=kde-apps/kdenetwork-meta-${PV}:${SLOT}
-	>=kde-apps/kdeutils-meta-${PV}:${SLOT}
-	accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:${SLOT} )
-	pim? ( >=kde-apps/kdepim-meta-${PV}:${SLOT} )
-	sdk? ( >=kde-apps/kdesdk-meta-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-20.08.3.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-20.08.3.ebuild
new file mode 100644
index 000000000000..4ea71e1ef409
--- /dev/null
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-20.08.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Meta package for the KDE Release Service collection"
+HOMEPAGE="https://kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="amd64 arm64 x86"
+IUSE="accessibility +admin +education +games +graphics +multimedia +network pim sdk +utils"
+
+RDEPEND="
+	>=kde-apps/kdecore-meta-${PV}:${SLOT}
+	accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:${SLOT} )
+	admin? ( >=kde-apps/kdeadmin-meta-${PV}:${SLOT} )
+	education? ( >=kde-apps/kdeedu-meta-${PV}:${SLOT} )
+	games? ( >=kde-apps/kdegames-meta-${PV}:${SLOT} )
+	graphics? ( >=kde-apps/kdegraphics-meta-${PV}:${SLOT} )
+	multimedia? ( >=kde-apps/kdemultimedia-meta-${PV}:${SLOT} )
+	network? ( >=kde-apps/kdenetwork-meta-${PV}:${SLOT} )
+	pim? ( >=kde-apps/kdepim-meta-${PV}:${SLOT} )
+	sdk? ( >=kde-apps/kdesdk-meta-${PV}:${SLOT} )
+	utils? ( >=kde-apps/kdeutils-meta-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kde-apps-meta/metadata.xml b/kde-apps/kde-apps-meta/metadata.xml
index eeec87d32c98..4a40e9568e79 100644
--- a/kde-apps/kde-apps-meta/metadata.xml
+++ b/kde-apps/kde-apps-meta/metadata.xml
@@ -6,7 +6,15 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="accessibility">Pull in <pkg>kde-apps/kdeaccessibility-meta</pkg> packages</flag>
+		<flag name="admin">Pull in <pkg>kde-apps/kdeadmin-meta</pkg> packages</flag>
+		<flag name="education">Pull in <pkg>kde-apps/kdeedu-meta</pkg> packages</flag>
+		<flag name="games">Pull in <pkg>kde-apps/kdegames-meta</pkg> packages</flag>
+		<flag name="graphics">Pull in <pkg>kde-apps/kdegraphics-meta</pkg> packages</flag>
+		<flag name="multimedia">Pull in <pkg>kde-apps/kdemultimedia-meta</pkg> packages</flag>
+		<flag name="network">Pull in <pkg>kde-apps/kdenetwork-meta</pkg> packages</flag>
 		<flag name="pim">Pull in KDE PIM suite</flag>
 		<flag name="sdk">Pull in developer-specific meta-packages</flag>
+		<flag name="utils">Pull in <pkg>kde-apps/kdeutils-meta</pkg> packages</flag>
 	</use>
 </pkgmetadata>