gentoo resync : 24.12.2018

6 files changed, 86 insertions, 140 deletions

diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index 40d7686f5d14..2ba7e5d927b4 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,4 +1,3 @@
-EBUILD kdepim-meta-18.04.3-r1.ebuild 2019 BLAKE2B f677af1df6174c2d3a687b968178a75ba2116e182971121d2e3a5ca925a7c69bf301f4962714193ab5d11187c5a7dba633faa1df35aad9eb33822b1da530dcf2 SHA512 81b5bd76a47e271222e7ac3cce8502c4f5e90f3cad9d2f8315fdece2b5f1ad6c6831fa93c94043f64abff8f0b6079b1f0e0ca92874a4caeafc93864036ecba74
-EBUILD kdepim-meta-18.04.3.ebuild 2054 BLAKE2B 0859f98049ab023b4b7d9ff3c74c05b3823738572bf9f86444bb5a154894c98a31f4a787bf626bdf771c026922f6297d4b5a3c2f1efc0c093b50227b02b6e19d SHA512 7a810fef22bc3a2f0a1e98ec958676b2aa873b5409f597a95f660d1c31601f7ab6863bdea1513507ef7ba725ca3bc26e46d775198d0c1ecb393b1014f5b32cde
-EBUILD kdepim-meta-18.08.3.ebuild 2080 BLAKE2B 1093ab646dd62ac3a7ea2b9c6fe002cce3c3dc997bb336413e9ea8adf0b55834167e53c768ec76e56aa57dc1b9fb36e668c60a891e94cae5d9505cfe374c51b8 SHA512 462c32b638d811cf17a298eb1e69f4bb835780c00ed3a3f13ec304c824057b6546f93accdcd625bf5a02e47172dcce3e5ccb3dbd1757cedd8d87ced55c2814c2
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD kdepim-meta-18.08.3.ebuild 2078 BLAKE2B cb8a775aab8dbefa612ec5dfddf84f0d726b19ae516d5a44b683ae75fc4f4f0a135f4106bf7df008d75aefadaff4c4657110bb803472ce092c6cab8d27ebacf1 SHA512 ff5ad478ec5aaed7eda63dbc371ca524c390dbc98a432612b7d18f54b2978330854432631cf9fcc181c099156de01c3605604bd5505fd3164d2f0db0d8453b6a
+EBUILD kdepim-meta-18.12.0.ebuild 2662 BLAKE2B dd568e14d60bcf2c675e1f2f335d95595a7b072e872f6695bb81303d2787fb535ae6daa5012841a7e1c7f9410028cbd27b4c795c62918a6a0bf2d58fd39ef345 SHA512 d27890fcb62af9194d76d5ded0de48437414c86e00c6fde20ac72be4c8a4805f35b191070799fd1769920e4b0343c36afde9c9a7c904b2da0b189f867824c250
+MISC metadata.xml 650 BLAKE2B 27e2fa91fe17cd24da17294c2c8a54cd4eee5342c07d8a1a7ad1515d9c52bfe47fe938f3c96e4e2d1ae9b99e2100de9252e180d55458a46aaab03d46725ab9a0 SHA512 dff51eb660ecab8f80e9d865f9e2a9ce5ace1cea6ff322cd2b71af2e3ce83e45d0ea3fbd499a37413bd9572853b90fe860a040d3e3828836ecf842872a4eed88
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.04.3-r1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.04.3-r1.ebuild
deleted file mode 100644
index 30981eb2a39c..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-18.04.3-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5-meta-pkg
-
-DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://www.kde.org/applications/development"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadiconsole)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-import-wizard)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep akregator)
-	$(add_kdeapps_dep calendarjanitor)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep grantlee-editor)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kaddressbook)
-	$(add_kdeapps_dep kalarm)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-addons)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kdepim-runtime)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kleopatra)
-	$(add_kdeapps_dep kmail)
-	$(add_kdeapps_dep kmail-account-wizard)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep knotes)
-	$(add_kdeapps_dep konsolekalendar)
-	$(add_kdeapps_dep kontact)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep korganizer)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep ksmtp)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkgapi)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep mbox-importer)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pim-data-exporter)
-	$(add_kdeapps_dep pim-sieve-editor)
-	$(add_kdeapps_dep pimcommon)
-"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.04.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.04.3.ebuild
deleted file mode 100644
index 519cf03a9f07..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-18.04.3.ebuild
+++ /dev/null
@@ -1,68 +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 PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://www.kde.org/applications/development"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadiconsole)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-import-wizard)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep akregator)
-	$(add_kdeapps_dep calendarjanitor)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep grantlee-editor)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kaddressbook)
-	$(add_kdeapps_dep kalarm)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-addons)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kdepim-runtime)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kleopatra)
-	$(add_kdeapps_dep kmail)
-	$(add_kdeapps_dep kmail-account-wizard)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep knotes)
-	$(add_kdeapps_dep konsolekalendar)
-	$(add_kdeapps_dep kontact)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep korganizer)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep ksmtp)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkgapi)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep mbox-importer)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pim-data-exporter)
-	$(add_kdeapps_dep pim-sieve-editor)
-	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep syndication)
-"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.08.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.08.3.ebuild
index 34bc562e0bbe..f9ca1c115f44 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-18.08.3.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-18.08.3.ebuild
@@ -7,7 +7,7 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
 HOMEPAGE="https://www.kde.org/applications/development"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.12.0.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.12.0.ebuild
new file mode 100644
index 000000000000..cc9d9e6aa318
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-18.12.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
+HOMEPAGE="https://www.kde.org/applications/development"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="bogofilter clamav spamassassin"
+
+RDEPEND="
+	>=kde-apps/akonadi-${PV}:${SLOT}
+	>=kde-apps/akonadiconsole-${PV}:${SLOT}
+	>=kde-apps/akonadi-calendar-${PV}:${SLOT}
+	>=kde-apps/akonadi-contacts-${PV}:${SLOT}
+	>=kde-apps/akonadi-import-wizard-${PV}:${SLOT}
+	>=kde-apps/akonadi-mime-${PV}:${SLOT}
+	>=kde-apps/akonadi-notes-${PV}:${SLOT}
+	>=kde-apps/akonadi-search-${PV}:${SLOT}
+	>=kde-apps/akregator-${PV}:${SLOT}
+	>=kde-apps/calendarjanitor-${PV}:${SLOT}
+	>=kde-apps/calendarsupport-${PV}:${SLOT}
+	>=kde-apps/eventviews-${PV}:${SLOT}
+	>=kde-apps/grantlee-editor-${PV}:${SLOT}
+	>=kde-apps/grantleetheme-${PV}:${SLOT}
+	>=kde-apps/incidenceeditor-${PV}:${SLOT}
+	>=kde-apps/kaddressbook-${PV}:${SLOT}
+	>=kde-apps/kalarm-${PV}:${SLOT}
+	>=kde-apps/kalarmcal-${PV}:${SLOT}
+	>=kde-apps/kcalcore-${PV}:${SLOT}
+	>=kde-apps/kcalutils-${PV}:${SLOT}
+	>=kde-apps/kcontacts-${PV}:${SLOT}
+	>=kde-apps/kdepim-addons-${PV}:${SLOT}
+	>=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
+	>=kde-apps/kdepim-runtime-${PV}:${SLOT}
+	>=kde-apps/kidentitymanagement-${PV}:${SLOT}
+	>=kde-apps/kimap-${PV}:${SLOT}
+	>=kde-apps/kitinerary-${PV}:${SLOT}
+	>=kde-apps/kldap-${PV}:${SLOT}
+	>=kde-apps/kleopatra-${PV}:${SLOT}
+	>=kde-apps/kmail-${PV}:${SLOT}
+	>=kde-apps/kmail-account-wizard-${PV}:${SLOT}
+	>=kde-apps/kmailtransport-${PV}:${SLOT}
+	>=kde-apps/kmbox-${PV}:${SLOT}
+	>=kde-apps/kmime-${PV}:${SLOT}
+	>=kde-apps/knotes-${PV}:${SLOT}
+	>=kde-apps/konsolekalendar-${PV}:${SLOT}
+	>=kde-apps/kontact-${PV}:${SLOT}
+	>=kde-apps/kontactinterface-${PV}:${SLOT}
+	>=kde-apps/korganizer-${PV}:${SLOT}
+	>=kde-apps/kpimtextedit-${PV}:${SLOT}
+	>=kde-apps/kpkpass-${PV}:${SLOT}
+	>=kde-apps/ksmtp-${PV}:${SLOT}
+	>=kde-apps/libgravatar-${PV}:${SLOT}
+	>=kde-apps/libkdepim-${PV}:${SLOT}
+	>=kde-apps/libkgapi-${PV}:${SLOT}
+	>=kde-apps/libkleo-${PV}:${SLOT}
+	>=kde-apps/libksieve-${PV}:${SLOT}
+	>=kde-apps/libktnef-${PV}:${SLOT}
+	>=kde-apps/mailcommon-${PV}:${SLOT}
+	>=kde-apps/mailimporter-${PV}:${SLOT}
+	>=kde-apps/mbox-importer-${PV}:${SLOT}
+	>=kde-apps/messagelib-${PV}:${SLOT}
+	>=kde-apps/pim-data-exporter-${PV}:${SLOT}
+	>=kde-apps/pim-sieve-editor-${PV}:${SLOT}
+	>=kde-apps/pimcommon-${PV}:${SLOT}
+	!kde-apps/kdepim-meta:4
+"
+# Optional runtime dependencies: kde-apps/kmail
+RDEPEND="${RDEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	clamav? ( app-antivirus/clamav )
+	spamassassin? ( mail-filter/spamassassin )
+"
diff --git a/kde-apps/kdepim-meta/metadata.xml b/kde-apps/kdepim-meta/metadata.xml
index 2fdbf33d963d..42d0035b36bc 100644
--- a/kde-apps/kdepim-meta/metadata.xml
+++ b/kde-apps/kdepim-meta/metadata.xml
@@ -5,4 +5,9 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="bogofilter">Install <pkg>mail-filter/bogofilter</pkg> for spam filter support in <pkg>kde-apps/kmail</pkg></flag>
+		<flag name="clamav">Install <pkg>app-antivirus/clamav</pkg> for virus detection support in <pkg>kde-apps/kmail</pkg></flag>
+		<flag name="spamassassin">Install <pkg>mail-filter/spamassassin</pkg> for spam filter support in <pkg>kde-apps/kmail</pkg></flag>
+	</use>
 </pkgmetadata>