commit: 8dab526f281fd2d3a10cf742e51762fcfbb702af Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Fri Jul 8 20:28:52 2016 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Sat Jul 9 15:48:26 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8dab526f
kde-apps: Fix KDE PIM LICENSEs Package-Manager: portage-2.2.28 Signed-off-by: Johannes Huber <johu <AT> gentoo.org> kde-apps/accountwizard/accountwizard-9999.ebuild | 1 + kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild | 2 +- kde-apps/akonadi-contact/akonadi-contact-9999.ebuild | 2 +- kde-apps/akonadi-mime/akonadi-mime-9999.ebuild | 9 +++------ kde-apps/akonadi-notes/akonadi-notes-9999.ebuild | 3 +-- kde-apps/akonadi-search/akonadi-search-9999.ebuild | 3 ++- kde-apps/akonadiconsole/akonadiconsole-9999.ebuild | 1 + kde-apps/akregator/akregator-9999.ebuild | 1 + kde-apps/blogilo/blogilo-9999.ebuild | 1 + kde-apps/calendarjanitor/calendarjanitor-9999.ebuild | 1 + kde-apps/calendarsupport/calendarsupport-9999.ebuild | 11 ++++------- kde-apps/eventviews/eventviews-9999.ebuild | 9 +++------ kde-apps/gpgmepp/gpgmepp-9999.ebuild | 2 +- kde-apps/grantleeeditor/grantleeeditor-9999.ebuild | 1 + kde-apps/grantleetheme/grantleetheme-9999.ebuild | 3 +-- kde-apps/importwizard/importwizard-9999.ebuild | 1 + kde-apps/incidenceeditor/incidenceeditor-9999.ebuild | 9 +++------ kde-apps/kaddressbook/kaddressbook-9999.ebuild | 1 + kde-apps/kalarm/kalarm-9999.ebuild | 1 + kde-apps/kalarmcal/kalarmcal-9999.ebuild | 6 +++--- kde-apps/kblog/kblog-9999.ebuild | 2 +- kde-apps/kcalcore/kcalcore-9999.ebuild | 2 +- kde-apps/kcalutils/kcalutils-9999.ebuild | 8 +++----- kde-apps/kcontacts/kcontacts-9999.ebuild | 2 +- kde-apps/kdepim-addons/kdepim-addons-9999.ebuild | 2 +- kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild | 2 +- kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild | 1 + kde-apps/kdgantt2/kdgantt2-9999.ebuild | 9 +++------ kde-apps/kholidays/kholidays-16.04.3.ebuild | 2 +- kde-apps/kholidays/kholidays-16.04.49.9999.ebuild | 2 +- kde-apps/kholidays/kholidays-9999.ebuild | 2 +- kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild | 8 ++++---- kde-apps/kimap/kimap-9999.ebuild | 4 ++-- kde-apps/kldap/kldap-9999.ebuild | 2 +- kde-apps/kleopatra/kleopatra-9999.ebuild | 1 + kde-apps/kmail/kmail-9999.ebuild | 1 + kde-apps/kmailtransport/kmailtransport-9999.ebuild | 2 +- kde-apps/kmbox/kmbox-9999.ebuild | 2 +- kde-apps/kmime/kmime-9999.ebuild | 2 +- kde-apps/knotes/knotes-9999.ebuild | 1 + kde-apps/konsolekalendar/konsolekalendar-9999.ebuild | 1 + kde-apps/kontact/kontact-9999.ebuild | 1 + kde-apps/kontactinterface/kontactinterface-9999.ebuild | 2 +- kde-apps/korganizer/korganizer-9999.ebuild | 1 + kde-apps/kpimtextedit/kpimtextedit-9999.ebuild | 2 +- kde-apps/ktnef/ktnef-9999.ebuild | 1 + kde-apps/libgravatar/libgravatar-9999.ebuild | 9 +++------ kde-apps/libkdepim/libkdepim-9999.ebuild | 2 +- kde-apps/libkleo/libkleo-9999.ebuild | 3 +-- kde-apps/libksieve/libksieve-9999.ebuild | 2 +- kde-apps/libktnef/libktnef-9999.ebuild | 2 +- kde-apps/mboximporter/mboximporter-9999.ebuild | 2 +- kde-apps/pimcommon/pimcommon-9999.ebuild | 2 +- kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild | 1 + kde-apps/sieveeditor/sieveeditor-9999.ebuild | 1 + .../storageservicemanager/storageservicemanager-9999.ebuild | 1 + 56 files changed, 78 insertions(+), 80 deletions(-) diff --git a/kde-apps/accountwizard/accountwizard-9999.ebuild b/kde-apps/accountwizard/accountwizard-9999.ebuild index e55f968..25f3184 100644 --- a/kde-apps/accountwizard/accountwizard-9999.ebuild +++ b/kde-apps/accountwizard/accountwizard-9999.ebuild @@ -13,6 +13,7 @@ inherit kde5 DESCRIPTION="Editor for Sieve scripts used for email filtering on a mail server" HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild index 07d3131..168df50 100644 --- a/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild +++ b/kde-apps/akonadi-calendar/akonadi-calendar-9999.ebuild @@ -9,7 +9,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Library for akonadi calendar integration" -LICENSE="GPL-2+" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="" diff --git a/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild b/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild index e165770..bde274d 100644 --- a/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild +++ b/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild @@ -12,7 +12,7 @@ inherit kde5 DESCRIPTION="Library for akonadi contact integration" KEYWORDS="" -LICENSE="LGPL-2.1" +LICENSE="GPL-2+" IUSE="prison" # some akonadi tests time out, that probably needs more work as it's ~700 tests diff --git a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild index 0f1d333..542a6f6 100644 --- a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild +++ b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild @@ -10,13 +10,13 @@ inherit kde5 DESCRIPTION="Library for akonadi mime types" KEYWORDS="" -LICENSE="LGPL-2.1" +LICENSE="GPL-2+ LGPL-2.1+" IUSE="" # some akonadi tests time out, that probably needs more work as it's ~700 tests RESTRICT="test" -COMMON_DEPEND=" +DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) @@ -33,10 +33,7 @@ COMMON_DEPEND=" dev-libs/libxslt x11-misc/shared-mime-info " -DEPEND="${COMMON_DEPEND} - sys-devel/gettext -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} !kde-apps/kdepimlibs:4 !kde-apps/kdepimlibs:5 " diff --git a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild index 5f0ddba..7f46d50 100644 --- a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild +++ b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild @@ -10,7 +10,7 @@ inherit kde5 DESCRIPTION="Library for akonadi notes integration" KEYWORDS="" -LICENSE="LGPL-2.1" +LICENSE="GPL-2+" IUSE="" # some akonadi tests time out, that probably needs more work as it's ~700 tests @@ -24,7 +24,6 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} $(add_kdeapps_dep akonadi) - sys-devel/gettext " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepimlibs:4 diff --git a/kde-apps/akonadi-search/akonadi-search-9999.ebuild b/kde-apps/akonadi-search/akonadi-search-9999.ebuild index 8beae18..83f14c3 100644 --- a/kde-apps/akonadi-search/akonadi-search-9999.ebuild +++ b/kde-apps/akonadi-search/akonadi-search-9999.ebuild @@ -9,6 +9,7 @@ inherit kde5 DESCRIPTION="Libraries and daemons to implement searching in Akonadi" HOMEPAGE="https://projects.kde.org/projects/playground/pim/akonadi-search" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="" @@ -26,10 +27,10 @@ RDEPEND=" $(add_kdeapps_dep kcalcore) $(add_kdeapps_dep kcontacts) $(add_kdeapps_dep kmime) - >=dev-libs/xapian-1.3:=[chert] $(add_qt_dep qtdbus) $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) + >=dev-libs/xapian-1.3:=[chert] " DEPEND="${RDEPEND} dev-libs/boost diff --git a/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild b/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild index 4255f6d..27bad88 100644 --- a/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild +++ b/kde-apps/akonadiconsole/akonadiconsole-9999.ebuild @@ -10,6 +10,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Akonadi developer console" +LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )" HOMEPAGE="https://www.kde.org/" KEYWORDS="" diff --git a/kde-apps/akregator/akregator-9999.ebuild b/kde-apps/akregator/akregator-9999.ebuild index c163cee..6dc6957 100644 --- a/kde-apps/akregator/akregator-9999.ebuild +++ b/kde-apps/akregator/akregator-9999.ebuild @@ -12,6 +12,7 @@ inherit kde5 DESCRIPTION="News feed aggregator" HOMEPAGE="https://www.kde.org/applications/internet/akregator" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/blogilo/blogilo-9999.ebuild b/kde-apps/blogilo/blogilo-9999.ebuild index 6a1cb32..0ae1a57 100644 --- a/kde-apps/blogilo/blogilo-9999.ebuild +++ b/kde-apps/blogilo/blogilo-9999.ebuild @@ -12,6 +12,7 @@ inherit kde5 DESCRIPTION="KDE Blogging Client" HOMEPAGE="https://www.kde.org/applications/internet/blogilo" +LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="google" diff --git a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild index 84faadc..aec5829 100644 --- a/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild +++ b/kde-apps/calendarjanitor/calendarjanitor-9999.ebuild @@ -11,6 +11,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="A tool to scan calendar data for buggy instances" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/calendarsupport/calendarsupport-9999.ebuild b/kde-apps/calendarsupport/calendarsupport-9999.ebuild index f6900e2..39471cb 100644 --- a/kde-apps/calendarsupport/calendarsupport-9999.ebuild +++ b/kde-apps/calendarsupport/calendarsupport-9999.ebuild @@ -9,11 +9,11 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Calendar support library" -LICENSE="LGPL-2+" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="" -COMMON_DEPEND=" +DEPEND=" $(add_frameworks_dep kcodecs) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) @@ -36,16 +36,13 @@ COMMON_DEPEND=" $(add_kdeapps_dep kmime) $(add_kdeapps_dep libkdepim) $(add_kdeapps_dep pimcommon) - dev-libs/libical $(add_qt_dep designer) $(add_qt_dep qtgui) $(add_qt_dep qtprintsupport) $(add_qt_dep qtwidgets) + dev-libs/libical " -DEPEND="${COMMON_DEPEND} - sys-devel/gettext -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} !<kde-apps/kdepim-15.08.50:5 !kde-apps/kdepim-common-libs:4 " diff --git a/kde-apps/eventviews/eventviews-9999.ebuild b/kde-apps/eventviews/eventviews-9999.ebuild index 35a3b8b..3640489 100644 --- a/kde-apps/eventviews/eventviews-9999.ebuild +++ b/kde-apps/eventviews/eventviews-9999.ebuild @@ -9,11 +9,11 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Calendar viewer for KDE PIM" -LICENSE="LGPL-2+" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="" -COMMON_DEPEND=" +DEPEND=" $(add_frameworks_dep kcodecs) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) @@ -41,10 +41,7 @@ COMMON_DEPEND=" $(add_qt_dep qtwidgets) dev-libs/libical " -DEPEND="${COMMON_DEPEND} - sys-devel/gettext -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} !<kde-apps/kdepim-15.08.50:5 !kde-apps/kdepim-common-libs:4 " diff --git a/kde-apps/gpgmepp/gpgmepp-9999.ebuild b/kde-apps/gpgmepp/gpgmepp-9999.ebuild index bc47d38..41e600f 100644 --- a/kde-apps/gpgmepp/gpgmepp-9999.ebuild +++ b/kde-apps/gpgmepp/gpgmepp-9999.ebuild @@ -9,7 +9,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="C++ bindings for gpgme" -LICENSE="LGPL-2+" +LICENSE="LGPL-2.1+" KEYWORDS="" IUSE="" diff --git a/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild b/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild index d4f975b..910a423 100644 --- a/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild +++ b/kde-apps/grantleeeditor/grantleeeditor-9999.ebuild @@ -10,6 +10,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Editor for Sieve scripts used for email filtering on a mail server" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/grantleetheme/grantleetheme-9999.ebuild b/kde-apps/grantleetheme/grantleetheme-9999.ebuild index 027eaed..9c6b020 100644 --- a/kde-apps/grantleetheme/grantleetheme-9999.ebuild +++ b/kde-apps/grantleetheme/grantleetheme-9999.ebuild @@ -9,7 +9,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Library for Grantlee plugins" -LICENSE="LGPL-2+" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="" @@ -26,7 +26,6 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} $(add_qt_dep qtnetwork) - sys-devel/gettext " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 diff --git a/kde-apps/importwizard/importwizard-9999.ebuild b/kde-apps/importwizard/importwizard-9999.ebuild index f8ed079..c0bbde8 100644 --- a/kde-apps/importwizard/importwizard-9999.ebuild +++ b/kde-apps/importwizard/importwizard-9999.ebuild @@ -11,6 +11,7 @@ inherit kde5 DESCRIPTION="Import emails, settings, addressbook and calendar data from various mailers" HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild index 324e047..363e2a3 100644 --- a/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild +++ b/kde-apps/incidenceeditor/incidenceeditor-9999.ebuild @@ -10,11 +10,11 @@ VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Incidence editor for korganizer" -LICENSE="LGPL-2+" +LICENSE="GPL-2+" KEYWORDS="" IUSE="" -COMMON_DEPEND=" +DEPEND=" $(add_frameworks_dep kcodecs) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) @@ -50,10 +50,7 @@ COMMON_DEPEND=" $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) " -DEPEND="${COMMON_DEPEND} - sys-devel/gettext -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} !<kde-apps/kdepim-15.08.50:5 !kde-apps/kdepim-common-libs:4 " diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild b/kde-apps/kaddressbook/kaddressbook-9999.ebuild index e12d115..0f0a080 100644 --- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild +++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild @@ -13,6 +13,7 @@ inherit kde5 DESCRIPTION="The KDE Address Book" HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="prison" diff --git a/kde-apps/kalarm/kalarm-9999.ebuild b/kde-apps/kalarm/kalarm-9999.ebuild index 25e8062..f533383 100644 --- a/kde-apps/kalarm/kalarm-9999.ebuild +++ b/kde-apps/kalarm/kalarm-9999.ebuild @@ -11,6 +11,7 @@ inherit kde5 DESCRIPTION="Personal alarm message, command and email scheduler for KDE" HOMEPAGE+=" https://userbase.kde.org/KAlarm" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="X" diff --git a/kde-apps/kalarmcal/kalarmcal-9999.ebuild b/kde-apps/kalarmcal/kalarmcal-9999.ebuild index a24c74d..9628b5f 100644 --- a/kde-apps/kalarmcal/kalarmcal-9999.ebuild +++ b/kde-apps/kalarmcal/kalarmcal-9999.ebuild @@ -8,10 +8,11 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Client library to access and handling of KAlarm calendar data" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="" -RDEPEND=" +DEPEND=" $(add_frameworks_dep kdelibs4support) $(add_frameworks_dep ki18n) $(add_kdeapps_dep akonadi) @@ -20,6 +21,5 @@ RDEPEND=" $(add_kdeapps_dep kidentitymanagement) $(add_qt_dep qtgui) " -DEPEND="${RDEPEND} - sys-devel/gettext +RDEPEND="${DEPEND} " diff --git a/kde-apps/kblog/kblog-9999.ebuild b/kde-apps/kblog/kblog-9999.ebuild index 523f311..1ff2ede 100644 --- a/kde-apps/kblog/kblog-9999.ebuild +++ b/kde-apps/kblog/kblog-9999.ebuild @@ -9,7 +9,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Library providing client-side support for web application remote blogging APIs" -LICENSE="LGPL-2+" +LICENSE="GPL-2+" KEYWORDS="" IUSE="" diff --git a/kde-apps/kcalcore/kcalcore-9999.ebuild b/kde-apps/kcalcore/kcalcore-9999.ebuild index 0b9fcb2..d76f379 100644 --- a/kde-apps/kcalcore/kcalcore-9999.ebuild +++ b/kde-apps/kcalcore/kcalcore-9999.ebuild @@ -10,7 +10,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Library for handling calendar data" -LICENSE="LGPL-2+" +LICENSE="GPL-2+ test? ( LGPL-3+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/kcalutils/kcalutils-9999.ebuild b/kde-apps/kcalutils/kcalutils-9999.ebuild index 460d9e7..9d68ff8 100644 --- a/kde-apps/kcalutils/kcalutils-9999.ebuild +++ b/kde-apps/kcalutils/kcalutils-9999.ebuild @@ -10,11 +10,11 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Library providing utility functions for the handling of calendar data" -LICENSE="LGPL-2+" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="" -RDEPEND=" +DEPEND=" $(add_frameworks_dep kcodecs) $(add_frameworks_dep kconfig) $(add_frameworks_dep kcoreaddons) @@ -28,6 +28,4 @@ RDEPEND=" $(add_qt_dep qtwidgets) dev-libs/grantlee:5 " -DEPEND="${RDEPEND} - sys-devel/gettext -" +RDEPEND="${DEPEND}" diff --git a/kde-apps/kcontacts/kcontacts-9999.ebuild b/kde-apps/kcontacts/kcontacts-9999.ebuild index a881bd1..404e78a 100644 --- a/kde-apps/kcontacts/kcontacts-9999.ebuild +++ b/kde-apps/kcontacts/kcontacts-9999.ebuild @@ -10,7 +10,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Address book API based on KDE Frameworks" -LICENSE="LGPL-2+" +LICENSE="GPL-2+" KEYWORDS="" IUSE="" diff --git a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild index 2a33868..14c0e66 100644 --- a/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild +++ b/kde-apps/kdepim-addons/kdepim-addons-9999.ebuild @@ -12,6 +12,7 @@ inherit kde5 DESCRIPTION="Plugins for KDE Personal Information Management Suite" HOMEPAGE="https://www.kde.org/applications/office/kontact/" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" PIM_FTS="akregator kaddressbook kmail korganizer plugins" @@ -53,7 +54,6 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} $(add_kdeapps_dep gpgmepp) - sys-devel/gettext " RDEPEND="${COMMON_DEPEND} !kde-apps/kdepim:5 diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild index 6bd3fd1..86e91ca 100644 --- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild +++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild @@ -9,7 +9,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Libraries for KDE PIM applications" -LICENSE="LGPL-2+" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="prison" diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild index 066fed0..420b7eb 100644 --- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild +++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild @@ -11,6 +11,7 @@ VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="google ssl" diff --git a/kde-apps/kdgantt2/kdgantt2-9999.ebuild b/kde-apps/kdgantt2/kdgantt2-9999.ebuild index ca150c5..44d90b5 100644 --- a/kde-apps/kdgantt2/kdgantt2-9999.ebuild +++ b/kde-apps/kdgantt2/kdgantt2-9999.ebuild @@ -9,19 +9,16 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="KDGantt library" -LICENSE="LGPL-2+" +LICENSE="GPL-2+" KEYWORDS="" IUSE="" -COMMON_DEPEND=" +DEPEND=" $(add_qt_dep qtgui) $(add_qt_dep qtprintsupport) $(add_qt_dep qtwidgets) " -DEPEND="${COMMON_DEPEND} - sys-devel/gettext -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} !<kde-apps/kdepim-15.08.50:5 !kde-apps/kdepim-common-libs:4 " diff --git a/kde-apps/kholidays/kholidays-16.04.3.ebuild b/kde-apps/kholidays/kholidays-16.04.3.ebuild index d751bf0..ea37843 100644 --- a/kde-apps/kholidays/kholidays-16.04.3.ebuild +++ b/kde-apps/kholidays/kholidays-16.04.3.ebuild @@ -8,7 +8,7 @@ KDE_TEST="true" inherit kde5 DESCRIPTION="Library to determine holidays and other special events for a geographical region" -LICENSE="LGPL-2+" +LICENSE="GPL-2+" KEYWORDS="~amd64 ~x86" IUSE="" diff --git a/kde-apps/kholidays/kholidays-16.04.49.9999.ebuild b/kde-apps/kholidays/kholidays-16.04.49.9999.ebuild index 82b83e2..f6acd8a 100644 --- a/kde-apps/kholidays/kholidays-16.04.49.9999.ebuild +++ b/kde-apps/kholidays/kholidays-16.04.49.9999.ebuild @@ -8,7 +8,7 @@ KDE_TEST="true" inherit kde5 DESCRIPTION="Library to determine holidays and other special events for a geographical region" -LICENSE="LGPL-2+" +LICENSE="GPL-2+" KEYWORDS="" IUSE="" diff --git a/kde-apps/kholidays/kholidays-9999.ebuild b/kde-apps/kholidays/kholidays-9999.ebuild index 6ccbdd7..acab4f3 100644 --- a/kde-apps/kholidays/kholidays-9999.ebuild +++ b/kde-apps/kholidays/kholidays-9999.ebuild @@ -9,7 +9,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Library to determine holidays and other special events for a geographical region" -LICENSE="LGPL-2+" +LICENSE="GPL-2+" KEYWORDS="" IUSE="" diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild index 29fbc30..74a923e 100644 --- a/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild +++ b/kde-apps/kidentitymanagement/kidentitymanagement-9999.ebuild @@ -10,12 +10,11 @@ VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Library for managing identitites" -LICENSE="LGPL-2+" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="" -RDEPEND=" - $(add_kdeapps_dep kpimtextedit) +DEPEND=" $(add_frameworks_dep kcodecs) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) @@ -25,9 +24,10 @@ RDEPEND=" $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) + $(add_kdeapps_dep kpimtextedit) $(add_qt_dep qtdbus) $(add_qt_dep qtgui) $(add_qt_dep qtnetwork) $(add_qt_dep qtwidgets) " -DEPEND="${RDEPEND}" +RDEPEND="${DEPEND}" diff --git a/kde-apps/kimap/kimap-9999.ebuild b/kde-apps/kimap/kimap-9999.ebuild index b843a12..f472143 100644 --- a/kde-apps/kimap/kimap-9999.ebuild +++ b/kde-apps/kimap/kimap-9999.ebuild @@ -9,7 +9,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Library for interacting with IMAP servers" -LICENSE="LGPL-2+" +LICENSE="GPL-2+" KEYWORDS="" IUSE="" @@ -19,7 +19,7 @@ DEPEND=" $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) $(add_kdeapps_dep kmime) - dev-libs/cyrus-sasl $(add_qt_dep qtgui) + dev-libs/cyrus-sasl " RDEPEND="${DEPEND}" diff --git a/kde-apps/kldap/kldap-9999.ebuild b/kde-apps/kldap/kldap-9999.ebuild index 6b13bf7..28eb3fd 100644 --- a/kde-apps/kldap/kldap-9999.ebuild +++ b/kde-apps/kldap/kldap-9999.ebuild @@ -10,7 +10,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Library for interacting with LDAP servers" -LICENSE="LGPL-2+" +LICENSE="GPL-2+" KEYWORDS="" IUSE="ssl" diff --git a/kde-apps/kleopatra/kleopatra-9999.ebuild b/kde-apps/kleopatra/kleopatra-9999.ebuild index 5331f26..6ced84c 100644 --- a/kde-apps/kleopatra/kleopatra-9999.ebuild +++ b/kde-apps/kleopatra/kleopatra-9999.ebuild @@ -12,6 +12,7 @@ inherit kde5 DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography" HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/kmail/kmail-9999.ebuild b/kde-apps/kmail/kmail-9999.ebuild index 183fd06..445e42a 100644 --- a/kde-apps/kmail/kmail-9999.ebuild +++ b/kde-apps/kmail/kmail-9999.ebuild @@ -13,6 +13,7 @@ inherit kde5 DESCRIPTION="Email component of Kontact, the integrated personal information manager of KDE" HOMEPAGE="https://www.kde.org/applications/internet/kmail/" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/kmailtransport/kmailtransport-9999.ebuild b/kde-apps/kmailtransport/kmailtransport-9999.ebuild index 2a5f369..73adbb3 100644 --- a/kde-apps/kmailtransport/kmailtransport-9999.ebuild +++ b/kde-apps/kmailtransport/kmailtransport-9999.ebuild @@ -10,7 +10,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Mail transport service" -LICENSE="GPL-2" +LICENSE="GPL-2+" KEYWORDS="" IUSE="ssl" diff --git a/kde-apps/kmbox/kmbox-9999.ebuild b/kde-apps/kmbox/kmbox-9999.ebuild index fd8bae5..a4ff0af 100644 --- a/kde-apps/kmbox/kmbox-9999.ebuild +++ b/kde-apps/kmbox/kmbox-9999.ebuild @@ -9,7 +9,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Library for accessing MBox format mail storages" -LICENSE="LGPL-2+" +LICENSE="GPL-2+" KEYWORDS="" IUSE="" diff --git a/kde-apps/kmime/kmime-9999.ebuild b/kde-apps/kmime/kmime-9999.ebuild index 715f358..953d451 100644 --- a/kde-apps/kmime/kmime-9999.ebuild +++ b/kde-apps/kmime/kmime-9999.ebuild @@ -9,7 +9,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Libary for handling mail messages and newsgroup articles" -LICENSE="LGPL-2+" +LICENSE="GPL-2+" KEYWORDS="" IUSE="" diff --git a/kde-apps/knotes/knotes-9999.ebuild b/kde-apps/knotes/knotes-9999.ebuild index 81c9cb4..b2231a1 100644 --- a/kde-apps/knotes/knotes-9999.ebuild +++ b/kde-apps/knotes/knotes-9999.ebuild @@ -13,6 +13,7 @@ inherit kde5 DESCRIPTION="KDE Notes application" HOMEPAGE="https://www.kde.org/" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild index f26599e..1d97cbf 100644 --- a/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild +++ b/kde-apps/konsolekalendar/konsolekalendar-9999.ebuild @@ -11,6 +11,7 @@ inherit kde5 DESCRIPTION="A command line interface to KDE calendars" HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/kontact/kontact-9999.ebuild b/kde-apps/kontact/kontact-9999.ebuild index a45b7b0..0301e83 100644 --- a/kde-apps/kontact/kontact-9999.ebuild +++ b/kde-apps/kontact/kontact-9999.ebuild @@ -10,6 +10,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="KDE personal information manager" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/kontactinterface/kontactinterface-9999.ebuild b/kde-apps/kontactinterface/kontactinterface-9999.ebuild index 02ef54d..efe842c 100644 --- a/kde-apps/kontactinterface/kontactinterface-9999.ebuild +++ b/kde-apps/kontactinterface/kontactinterface-9999.ebuild @@ -8,7 +8,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Library for embedding KParts in a Kontact component" -LICENSE="LGPL-2+" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="" diff --git a/kde-apps/korganizer/korganizer-9999.ebuild b/kde-apps/korganizer/korganizer-9999.ebuild index 2b99300..44287d7 100644 --- a/kde-apps/korganizer/korganizer-9999.ebuild +++ b/kde-apps/korganizer/korganizer-9999.ebuild @@ -13,6 +13,7 @@ inherit kde5 DESCRIPTION="Personal Organizer by KDE" HOMEPAGE="https://www.kde.org/applications/office/korganizer/" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="X" diff --git a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild index d54a998..79b7fce 100644 --- a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild +++ b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild @@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="A textedit with PIM-specific features" -LICENSE="LGPL-2+" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="speech" diff --git a/kde-apps/ktnef/ktnef-9999.ebuild b/kde-apps/ktnef/ktnef-9999.ebuild index a25cf68..cda7298 100644 --- a/kde-apps/ktnef/ktnef-9999.ebuild +++ b/kde-apps/ktnef/ktnef-9999.ebuild @@ -12,6 +12,7 @@ inherit kde5 DESCRIPTION="A viewer for TNEF attachments" HOMEPAGE="https://www.kde.org/" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/libgravatar/libgravatar-9999.ebuild b/kde-apps/libgravatar/libgravatar-9999.ebuild index d4478e8..70075e9 100644 --- a/kde-apps/libgravatar/libgravatar-9999.ebuild +++ b/kde-apps/libgravatar/libgravatar-9999.ebuild @@ -10,11 +10,11 @@ VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Library for gravatar integration" -LICENSE="LGPL-2+" +LICENSE="GPL-2+" KEYWORDS="" IUSE="" -COMMON_DEPEND=" +DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep ki18n) $(add_frameworks_dep ktextwidgets) @@ -24,10 +24,7 @@ COMMON_DEPEND=" $(add_qt_dep qtnetwork) $(add_qt_dep qtwidgets) " -DEPEND="${COMMON_DEPEND} - sys-devel/gettext -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} !<kde-apps/kdepim-15.08.50:5 !kde-apps/kdepim-common-libs:4 " diff --git a/kde-apps/libkdepim/libkdepim-9999.ebuild b/kde-apps/libkdepim/libkdepim-9999.ebuild index 16700ea..b12f489 100644 --- a/kde-apps/libkdepim/libkdepim-9999.ebuild +++ b/kde-apps/libkdepim/libkdepim-9999.ebuild @@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Common PIM libraries" -LICENSE="LGPL-2+" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="" diff --git a/kde-apps/libkleo/libkleo-9999.ebuild b/kde-apps/libkleo/libkleo-9999.ebuild index 0a021ac..816cdca 100644 --- a/kde-apps/libkleo/libkleo-9999.ebuild +++ b/kde-apps/libkleo/libkleo-9999.ebuild @@ -9,7 +9,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Library for encryption handling" -LICENSE="LGPL-2+" +LICENSE="GPL-2+" KEYWORDS="" IUSE="" @@ -32,7 +32,6 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} dev-libs/boost - sys-devel/gettext " RDEPEND="${COMMON_DEPEND} !<kde-apps/kdepim-15.08.50:5 diff --git a/kde-apps/libksieve/libksieve-9999.ebuild b/kde-apps/libksieve/libksieve-9999.ebuild index 6533a5e..c412533 100644 --- a/kde-apps/libksieve/libksieve-9999.ebuild +++ b/kde-apps/libksieve/libksieve-9999.ebuild @@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Common PIM libraries" -LICENSE="LGPL-2+" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="ssl" diff --git a/kde-apps/libktnef/libktnef-9999.ebuild b/kde-apps/libktnef/libktnef-9999.ebuild index a3567f6..2bc1323 100644 --- a/kde-apps/libktnef/libktnef-9999.ebuild +++ b/kde-apps/libktnef/libktnef-9999.ebuild @@ -10,7 +10,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Library for handling TNEF data" -LICENSE="LGPL-2+" +LICENSE="GPL-2+" KEYWORDS="" IUSE="" diff --git a/kde-apps/mboximporter/mboximporter-9999.ebuild b/kde-apps/mboximporter/mboximporter-9999.ebuild index 3218e48..ffc8cc1 100644 --- a/kde-apps/mboximporter/mboximporter-9999.ebuild +++ b/kde-apps/mboximporter/mboximporter-9999.ebuild @@ -10,7 +10,7 @@ QT_MINIMAL="5.6.0" inherit kde5 DESCRIPTION="Import mbox data from various sources" -LICENSE="LGPL-2+" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild b/kde-apps/pimcommon/pimcommon-9999.ebuild index c14387d..8018956 100644 --- a/kde-apps/pimcommon/pimcommon-9999.ebuild +++ b/kde-apps/pimcommon/pimcommon-9999.ebuild @@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Common PIM libraries" -LICENSE="LGPL-2+" +LICENSE="GPL-2+ LGPL-2.1+" KEYWORDS="" IUSE="" diff --git a/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild b/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild index 297aa8a..3ab4eef 100644 --- a/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild +++ b/kde-apps/pimsettingexporter/pimsettingexporter-9999.ebuild @@ -13,6 +13,7 @@ inherit kde5 DESCRIPTION="Export and import PIM settings and local mail" HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/sieveeditor/sieveeditor-9999.ebuild b/kde-apps/sieveeditor/sieveeditor-9999.ebuild index 13e109b..0b55ebb 100644 --- a/kde-apps/sieveeditor/sieveeditor-9999.ebuild +++ b/kde-apps/sieveeditor/sieveeditor-9999.ebuild @@ -12,6 +12,7 @@ VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Editor for Sieve scripts used for email filtering on a mail server" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE="" diff --git a/kde-apps/storageservicemanager/storageservicemanager-9999.ebuild b/kde-apps/storageservicemanager/storageservicemanager-9999.ebuild index 913af8b..5c7ef16 100644 --- a/kde-apps/storageservicemanager/storageservicemanager-9999.ebuild +++ b/kde-apps/storageservicemanager/storageservicemanager-9999.ebuild @@ -12,6 +12,7 @@ VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Cloud storage manager" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" IUSE=""