commit: 5e54f32f94c2ad2f562b191c966966d4fc8670e6
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 17:38:14 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 17:40:01 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e54f32f
kde-apps: fix 16.04.0 to be based on 16.04.49.9999 instead of 9999
kde-apps/blogilo/blogilo-16.04.0.ebuild | 2 +-
.../grantleetheme/grantleetheme-16.04.0.ebuild | 1 +
.../incidenceeditor/incidenceeditor-16.04.0.ebuild | 1 +
kde-apps/kblog/kblog-16.04.0.ebuild | 1 +
.../kcolorchooser/kcolorchooser-16.04.0.ebuild | 1 +
.../kdeadmin-meta/kdeadmin-meta-16.04.0.ebuild | 3 ++-
.../kdepim-addons/kdepim-addons-16.04.0.ebuild | 1 +
.../kdepim-apps-libs-16.04.0.ebuild | 1 +
kde-apps/kdepim-meta/kdepim-meta-16.04.0.ebuild | 2 ++
.../kdepim-runtime/kdepim-runtime-16.04.0.ebuild | 7 +++----
kde-apps/kdepim/kdepim-16.04.0.ebuild | 2 ++
.../kdeutils-meta/kdeutils-meta-16.04.0.ebuild | 3 ++-
kde-apps/kdf/kdf-16.04.0.ebuild | 23 +++-------------------
kde-apps/kldap/kldap-16.04.0.ebuild | 7 +------
kde-apps/kleopatra/kleopatra-16.04.0.ebuild | 2 --
.../kmailtransport/kmailtransport-16.04.0.ebuild | 12 +----------
kde-apps/libkgeomap/libkgeomap-16.04.0.ebuild | 1 +
kde-apps/libksieve/libksieve-16.04.0.ebuild | 12 ++---------
kde-apps/messagelib/messagelib-16.04.0.ebuild | 1 +
kde-apps/pimcommon/pimcommon-16.04.0.ebuild | 4 ++++
.../signon-kwallet-extension-16.04.0.ebuild | 2 +-
21 files changed, 32 insertions(+), 57 deletions(-)
diff --git a/kde-apps/blogilo/blogilo-16.04.0.ebuild
b/kde-apps/blogilo/blogilo-16.04.0.ebuild
index 7e550fb..8e15033 100644
--- a/kde-apps/blogilo/blogilo-16.04.0.ebuild
+++ b/kde-apps/blogilo/blogilo-16.04.0.ebuild
@@ -4,6 +4,7 @@
EAPI=6
+FRAMEWORKS_MINIMAL="5.19.0"
KDE_HANDBOOK="true"
KDE_PUNT_BOGUS_DEPS="true"
KMNAME="kdepim"
@@ -41,7 +42,6 @@ DEPEND="
"
RDEPEND="${DEPEND}
!<kde-apps/kdepim-15.12.2:5
- !<kde-apps/kdepim-apps-libs-16.04.50
"
if [[ ${KDE_BUILD_TYPE} = live ]] ; then
diff --git a/kde-apps/grantleetheme/grantleetheme-16.04.0.ebuild
b/kde-apps/grantleetheme/grantleetheme-16.04.0.ebuild
index 4262a88..a61b16b 100644
--- a/kde-apps/grantleetheme/grantleetheme-16.04.0.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-16.04.0.ebuild
@@ -4,6 +4,7 @@
EAPI=6
+FRAMEWORKS_MINIMAL="5.19.0"
KDE_TEST="forceoptional"
inherit kde5
diff --git a/kde-apps/incidenceeditor/incidenceeditor-16.04.0.ebuild
b/kde-apps/incidenceeditor/incidenceeditor-16.04.0.ebuild
index 8d5e4eb..d908089 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-16.04.0.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-16.04.0.ebuild
@@ -4,6 +4,7 @@
EAPI=6
+FRAMEWORKS_MINIMAL="5.19.0"
KDE_TEST="forceoptional"
inherit kde5
diff --git a/kde-apps/kblog/kblog-16.04.0.ebuild
b/kde-apps/kblog/kblog-16.04.0.ebuild
index b2eaeac..93a13d0 100644
--- a/kde-apps/kblog/kblog-16.04.0.ebuild
+++ b/kde-apps/kblog/kblog-16.04.0.ebuild
@@ -4,6 +4,7 @@
EAPI=6
+FRAMEWORKS_MINIMAL="5.19.0"
KDE_DOXYGEN="true"
KDE_TEST="true"
inherit kde5
diff --git a/kde-apps/kcolorchooser/kcolorchooser-16.04.0.ebuild
b/kde-apps/kcolorchooser/kcolorchooser-16.04.0.ebuild
index 14df053..d5903c5 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-16.04.0.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-16.04.0.ebuild
@@ -14,6 +14,7 @@ IUSE=""
DEPEND="
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-16.04.0.ebuild
b/kde-apps/kdeadmin-meta/kdeadmin-meta-16.04.0.ebuild
index 3664b2b..6787640 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-16.04.0.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-16.04.0.ebuild
@@ -10,8 +10,9 @@ DESCRIPTION="KDE administration tools - merge this to pull in
all kdeadmin-deriv
KEYWORDS="~amd64 ~x86"
IUSE="+cron"
+# FIXME: Add back when ported
+# $(add_kdeapps_dep kuser)
RDEPEND="
$(add_kdeapps_dep ksystemlog)
- $(add_kdeapps_dep kuser)
cron? ( $(add_kdeapps_dep kcron) )
"
diff --git a/kde-apps/kdepim-addons/kdepim-addons-16.04.0.ebuild
b/kde-apps/kdepim-addons/kdepim-addons-16.04.0.ebuild
index b784700..b01c5ca 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-16.04.0.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-16.04.0.ebuild
@@ -4,6 +4,7 @@
EAPI=6
+FRAMEWORKS_MINIMAL="5.19.0"
KDE_EXAMPLES="true"
KDE_TEST="forceoptional"
inherit kde5
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.04.0.ebuild
b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.04.0.ebuild
index 7907395..1a97bb8 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.04.0.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.04.0.ebuild
@@ -4,6 +4,7 @@
EAPI=6
+FRAMEWORKS_MINIMAL="5.19.0"
KDE_TEST="false"
inherit kde5
diff --git a/kde-apps/kdepim-meta/kdepim-meta-16.04.0.ebuild
b/kde-apps/kdepim-meta/kdepim-meta-16.04.0.ebuild
index ccb3acc..1759411 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-16.04.0.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-16.04.0.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
$(add_kdeapps_dep akonadi-mime)
$(add_kdeapps_dep akonadi-notes)
$(add_kdeapps_dep akonadi-search)
+ $(add_kdeapps_dep akonadi-socialutils)
$(add_kdeapps_dep akregator)
$(add_kdeapps_dep blogilo)
$(add_kdeapps_dep calendarjanitor)
@@ -38,6 +39,7 @@ RDEPEND="
$(add_kdeapps_dep kdepim)
$(add_kdeapps_dep kdepim-addons)
$(add_kdeapps_dep kdepim-apps-libs)
+ $(add_kdeapps_dep kdepim-kioslaves)
$(add_kdeapps_dep kdepim-runtime)
$(add_kdeapps_dep kdgantt2)
$(add_kdeapps_dep kholidays)
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-16.04.0.ebuild
b/kde-apps/kdepim-runtime/kdepim-runtime-16.04.0.ebuild
index db70998..758f068 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-16.04.0.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-16.04.0.ebuild
@@ -4,12 +4,13 @@
EAPI=6
+FRAMEWORKS_MINIMAL="5.19.0"
KDE_TEST="forceoptional"
inherit kde5
DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
KEYWORDS="~amd64 ~x86"
-IUSE="google ssl"
+IUSE="google"
# TODO kolab, Qt5TextToSpeech
@@ -40,6 +41,7 @@ CDEPEND="
$(add_kdeapps_dep akonadi-contact)
$(add_kdeapps_dep akonadi-mime)
$(add_kdeapps_dep akonadi-notes)
+ $(add_kdeapps_dep akonadi-socialutils)
$(add_kdeapps_dep kalarmcal)
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcalutils)
@@ -56,7 +58,6 @@ CDEPEND="
$(add_qt_dep qtxml)
$(add_qt_dep qtxmlpatterns)
dev-libs/libical:=
- ssl? ( dev-libs/cyrus-sasl )
"
DEPEND="${CDEPEND}
$(add_frameworks_dep kross)
@@ -68,7 +69,6 @@ DEPEND="${CDEPEND}
google? ( >=net-libs/libkgapi-5.1.0:5 )
"
RDEPEND="${CDEPEND}
- !<kde-apps/kdepim-kioslaves-16.04.50
!kde-apps/kdepim-runtime:4
$(add_frameworks_dep oxygen-icons)
"
@@ -76,7 +76,6 @@ RDEPEND="${CDEPEND}
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package google KF5GAPI)
- $(cmake-utils_use_find_package ssl Sasl2)
)
kde5_src_configure
diff --git a/kde-apps/kdepim/kdepim-16.04.0.ebuild
b/kde-apps/kdepim/kdepim-16.04.0.ebuild
index 3494de3..0fd9a88 100644
--- a/kde-apps/kdepim/kdepim-16.04.0.ebuild
+++ b/kde-apps/kdepim/kdepim-16.04.0.ebuild
@@ -60,6 +60,7 @@ COMMON_DEPEND="
$(add_kdeapps_dep akonadi-mime)
$(add_kdeapps_dep akonadi-notes)
$(add_kdeapps_dep akonadi-search)
+ $(add_kdeapps_dep akonadi-socialutils)
$(add_kdeapps_dep calendarsupport)
$(add_kdeapps_dep eventviews)
$(add_kdeapps_dep grantleetheme)
@@ -68,6 +69,7 @@ COMMON_DEPEND="
$(add_kdeapps_dep kcalcore)
$(add_kdeapps_dep kcontacts)
$(add_kdeapps_dep kdepim-apps-libs)
+ $(add_kdeapps_dep kdepim-kioslaves)
$(add_kdeapps_dep kdgantt2)
$(add_kdeapps_dep kholidays)
$(add_kdeapps_dep kidentitymanagement)
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-16.04.0.ebuild
b/kde-apps/kdeutils-meta/kdeutils-meta-16.04.0.ebuild
index 4c93d4d..0257af2 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-16.04.0.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-16.04.0.ebuild
@@ -11,6 +11,8 @@ HOMEPAGE="https://www.kde.org/applications/utilities
https://utils.kde.org";
KEYWORDS="~amd64 ~x86"
IUSE="cups floppy lirc"
+# FIXME: Add back when ported
+# $(add_kdeapps_dep kgpg)
RDEPEND="
$(add_kdeapps_dep ark)
$(add_kdeapps_dep filelight)
@@ -18,7 +20,6 @@ RDEPEND="
$(add_kdeapps_dep kcharselect)
$(add_kdeapps_dep kdebugsettings)
$(add_kdeapps_dep kdf)
- $(add_kdeapps_dep kgpg)
$(add_kdeapps_dep kteatime)
$(add_kdeapps_dep ktimer)
$(add_kdeapps_dep kwalletmanager)
diff --git a/kde-apps/kdf/kdf-16.04.0.ebuild b/kde-apps/kdf/kdf-16.04.0.ebuild
index 15aebaf..4bded61 100644
--- a/kde-apps/kdf/kdf-16.04.0.ebuild
+++ b/kde-apps/kdf/kdf-16.04.0.ebuild
@@ -4,27 +4,10 @@
EAPI=6
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+KDE_HANDBOOK="optional"
+inherit kde4-base
DESCRIPTION="KDE free disk space utility"
HOMEPAGE="https://utils.kde.org/projects/kdf";
KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
+IUSE="debug"
diff --git a/kde-apps/kldap/kldap-16.04.0.ebuild
b/kde-apps/kldap/kldap-16.04.0.ebuild
index 259431f..290eb5d 100644
--- a/kde-apps/kldap/kldap-16.04.0.ebuild
+++ b/kde-apps/kldap/kldap-16.04.0.ebuild
@@ -5,7 +5,6 @@
EAPI=6
KDE_DOXYGEN="true"
-KDE_HANDBOOK="forceoptional"
KDE_TEST="true"
inherit kde5
@@ -17,17 +16,13 @@ IUSE="ssl"
DEPEND="
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
$(add_frameworks_dep kwidgetsaddons)
- $(add_kdeapps_dep kmbox)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
net-nds/openldap
ssl? ( dev-libs/cyrus-sasl )
"
-RDEPEND="${DEPEND}
- !<kde-apps/kdepim-kioslaves-16.04.50
-"
+RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
diff --git a/kde-apps/kleopatra/kleopatra-16.04.0.ebuild
b/kde-apps/kleopatra/kleopatra-16.04.0.ebuild
index 1876050..e2e03ff 100644
--- a/kde-apps/kleopatra/kleopatra-16.04.0.ebuild
+++ b/kde-apps/kleopatra/kleopatra-16.04.0.ebuild
@@ -34,7 +34,6 @@ COMMON_DEPEND="
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
$(add_qt_dep qtwidgets)
>=app-crypt/gpgme-1.3.2
dev-libs/boost:=
@@ -48,5 +47,4 @@ RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim[kdepim_features_kleopatra]
!<kde-apps/kdepim-15.12.2-r1
>=app-crypt/gnupg-2.1
- app-crypt/paperkey
"
diff --git a/kde-apps/kmailtransport/kmailtransport-16.04.0.ebuild
b/kde-apps/kmailtransport/kmailtransport-16.04.0.ebuild
index 9d9e7de..4f23f7e 100644
--- a/kde-apps/kmailtransport/kmailtransport-16.04.0.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-16.04.0.ebuild
@@ -4,14 +4,13 @@
EAPI=6
-KDE_HANDBOOK="forceoptional"
KDE_TEST="true"
inherit kde5
DESCRIPTION="Mail transport service"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
+IUSE=""
DEPEND="
$(add_frameworks_dep kcmutils)
@@ -30,18 +29,9 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwidgets)
- ssl? ( dev-libs/cyrus-sasl )
"
RDEPEND="${DEPEND}
- !<kde-apps/kdepim-kioslaves-16.04.50
!kde-apps/kdepimlibs:4
"
RESTRICT="test"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package ssl Sasl2)
- )
- kde5_src_configure
-}
diff --git a/kde-apps/libkgeomap/libkgeomap-16.04.0.ebuild
b/kde-apps/libkgeomap/libkgeomap-16.04.0.ebuild
index f712cd8..1dc3edf 100644
--- a/kde-apps/libkgeomap/libkgeomap-16.04.0.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-16.04.0.ebuild
@@ -20,6 +20,7 @@ DEPEND="
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kio)
+ $(add_frameworks_dep ktextwidgets)
$(add_kdeapps_dep marble 'kde' '' '5=')
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtgui)
diff --git a/kde-apps/libksieve/libksieve-16.04.0.ebuild
b/kde-apps/libksieve/libksieve-16.04.0.ebuild
index 9dbad56..087cd1e6 100644
--- a/kde-apps/libksieve/libksieve-16.04.0.ebuild
+++ b/kde-apps/libksieve/libksieve-16.04.0.ebuild
@@ -4,13 +4,14 @@
EAPI=6
+FRAMEWORKS_MINIMAL="5.19.0"
KDE_TEST="true"
inherit kde5
DESCRIPTION="Common PIM libraries"
LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
+IUSE=""
COMMON_DEPEND="
$(add_frameworks_dep karchive)
@@ -28,20 +29,11 @@ COMMON_DEPEND="
$(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
- ssl? ( dev-libs/cyrus-sasl )
"
DEPEND="${COMMON_DEPEND}
sys-devel/gettext
"
RDEPEND="${COMMON_DEPEND}
!<kde-apps/kdepim-15.08.50:5
- !<kde-apps/kdepim-kioslaves-16.04.50
!kde-apps/kmail:4
"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package ssl Sasl2)
- )
- kde5_src_configure
-}
diff --git a/kde-apps/messagelib/messagelib-16.04.0.ebuild
b/kde-apps/messagelib/messagelib-16.04.0.ebuild
index 437e653..8018543 100644
--- a/kde-apps/messagelib/messagelib-16.04.0.ebuild
+++ b/kde-apps/messagelib/messagelib-16.04.0.ebuild
@@ -53,6 +53,7 @@ COMMON_DEPEND="
$(add_kdeapps_dep libgravatar)
$(add_kdeapps_dep libkdepim)
$(add_kdeapps_dep libkleo)
+ $(add_kdeapps_dep pimcommon)
$(add_qt_dep designer)
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
diff --git a/kde-apps/pimcommon/pimcommon-16.04.0.ebuild
b/kde-apps/pimcommon/pimcommon-16.04.0.ebuild
index 614ea16..b59400b 100644
--- a/kde-apps/pimcommon/pimcommon-16.04.0.ebuild
+++ b/kde-apps/pimcommon/pimcommon-16.04.0.ebuild
@@ -4,6 +4,7 @@
EAPI=6
+FRAMEWORKS_MINIMAL="5.19.0"
KDE_TEST="forceoptional"
inherit kde5
@@ -20,6 +21,7 @@ COMMON_DEPEND="
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
@@ -28,10 +30,12 @@ COMMON_DEPEND="
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwallet)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
$(add_kdeapps_dep akonadi)
$(add_kdeapps_dep akonadi-contact)
$(add_kdeapps_dep akonadi-mime)
diff --git
a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.04.0.ebuild
b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.04.0.ebuild
index 97ecd73..e229e2e 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.04.0.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.04.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="KWallet extension for signond"
HOMEPAGE="https://01.org/gsso/";
KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
+LICENSE="LGPL-2.1"
DEPEND="
$(add_frameworks_dep kwallet)
