gentoo resync : 01.12.2017

5 files changed, 3 insertions, 118 deletions

diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index af928eba8ff2..07340f7b8c4f 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,4 +1,2 @@
-EBUILD kdepim-meta-17.04.3.ebuild 2130 BLAKE2B 8c9788f02188bb396e3fce0d829524cc585dc8a5b5400a0021ed3da91d9a215fa6f803cb75c08a272b23e547f6afb50b38d4194fe1c0f5d4f041a542aa26745b SHA512 1bf15f6344fd2c0a02064f829461b0b0fe28b02e767da9b54ab7f274369467fc6e47ecadf1fdb29ee104db31e2bdc38616790223c174124428f9bcef4aaa441d
-EBUILD kdepim-meta-17.08.3-r1.ebuild 2060 BLAKE2B 1b43cfc4a0fda5d386eb2611df9f55d3f9871d49ef2ff8280f78f0614f44a65f38bbe392090264698bc19afd8616fbb7a32dd65b0ea9192709765cf03ad7352e SHA512 288aa17f8a635c1fd88eb5ac896152511aaee9d15dc676459d3872720f1e51ef3ec6d2128a06bc9cc95656dc6ac8dd853ccc515cc9823ed2914c890e16006f03
-EBUILD kdepim-meta-4.4.2017.04.ebuild 1107 BLAKE2B 968072acb0271a35ee6d8565f0803c86298790f8a0110f507c600cd4d62e0e87eda9411f58cd9e202f9e5039be9e5fcdceeebf6c82c90dd24ed42d175ca0308c SHA512 28304ef7c7f384d30c23201a39a737070d86092af2c5da948ce583fe816bfabdfa6915a289f4a5f5ce3a232039803105db7c8a54c1b2b84e01223c5a7630f598
-MISC metadata.xml 353 BLAKE2B 52e711876c9add31711d9218f9f45a704f799ddad939f6276e4375ce19c46ccbb963b0540100fbc5fdabd1a6030f1512b8f1858b263a069e98a32a0e1ac3a404 SHA512 6429aa1ae45111fdf80c68d44be5879f80ebf3c2c904343de5fa88e7eb1d0e7fbc9cb8f0da2730d0cb8b51d25e7e3adc3631b57120ba9834c910a2bdb86ffd72
+EBUILD kdepim-meta-17.08.3-r1.ebuild 2058 BLAKE2B 4498d54fdc8d50d3d4d98e4804c5f8c749a522d3849e77cc9ed282af5a9ee3a4a1f6f89622c41cdbbfc9b870fa9ce5bd38e846a11063654bb291a20092689c4e SHA512 3d39f54d5dc8ec11114d4e1f58abda89016fdd43d476b0f796eb6341790fe40319a7c154081164b83fbb2aee0b8b528913efff55d15f6abee8f4f0ac5e652d14
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-meta/kdepim-meta-17.04.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-17.04.3.ebuild
deleted file mode 100644
index 98e5dad25f03..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-17.04.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 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="google"
-
-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 blogilo)
-	$(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 kblog)
-	$(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 kholidays)
-	$(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 libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(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)
-	google? ( $(add_kdeapps_dep libkgapi) )
-"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-17.08.3-r1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-17.08.3-r1.ebuild
index 274d14fb21bc..74ff88d96816 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-17.08.3-r1.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-17.08.3-r1.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-4.4.2017.04.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.4.2017.04.ebuild
deleted file mode 100644
index 8ad7d506bee5..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-
-LICENSE="metapackage"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-SLOT="4"
-
-RDEPEND="
-	=kde-apps/akregator-4.4.2017*:4
-	=kde-apps/blogilo-4.4.2017*:4
-	=kde-apps/kabcclient-4.4.2017*:4
-	=kde-apps/kaddressbook-4.4.2017*:4
-	=kde-apps/kalarm-4.4.2017*:4
-	=kde-apps/kdepim-kresources-4.4.2017*:4
-	=kde-apps/kdepim-wizards-4.4.2017*:4
-	=kde-apps/kjots-4.4.2017*:4
-	=kde-apps/kleopatra-4.4.2017*:4
-	=kde-apps/kmail-4.4.2017*:4
-	=kde-apps/knode-4.4.2017*:4
-	=kde-apps/knotes-4.4.2017*:4
-	=kde-apps/konsolekalendar-4.4.2017*:4
-	=kde-apps/kontact-4.4.2017*:4
-	=kde-apps/korganizer-4.4.2017*:4
-	=kde-apps/ktimetracker-4.4.2017*:4
-	=kde-apps/libkdepim-4.4.2017*:4
-	=kde-apps/libkleo-4.4.2017*:4
-	=kde-apps/libkpgp-4.4.2017*:4
-	kde-frameworks/oxygen-icons:5
-	nls? (
-		>=kde-apps/kde4-l10n-4.14.3:4
-		>=kde-apps/kdepim-l10n-4.4.11.1-r1:4
-	)
-	!kde-apps/kdepim-runtime
-"
diff --git a/kde-apps/kdepim-meta/metadata.xml b/kde-apps/kdepim-meta/metadata.xml
index d52095404d1c..2fdbf33d963d 100644
--- a/kde-apps/kdepim-meta/metadata.xml
+++ b/kde-apps/kdepim-meta/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="google">Google service integration via <pkg>kde-apps/libkgapi</pkg></flag>
-	</use>
 </pkgmetadata>