* [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-socialutils/, kde-apps/akonadi-notes/, ...
@ 2016-02-09 10:53 Michael Palimaka
0 siblings, 0 replies; only message in thread
From: Michael Palimaka @ 2016-02-09 10:53 UTC (permalink / raw
To: gentoo-commits
commit: 8c1232ed927bba4f4824ddb2bbe5979928c4be70
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Feb 5 20:06:24 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 9 10:53:05 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8c1232ed
kde-apps: Fix kdepimlibs DEPENDs, FRAMEWORKS_MINIMAL=5.19.0
Package-Manager: portage-2.2.27
.../akonadi-contact-15.12.49.9999.ebuild | 6 +++---
kde-apps/akonadi-contact/akonadi-contact-9999.ebuild | 15 +++++++++------
kde-apps/akonadi-mime/akonadi-mime-9999.ebuild | 19 +++++++------------
kde-apps/akonadi-notes/akonadi-notes-9999.ebuild | 17 ++++++-----------
.../akonadi-socialutils-9999.ebuild | 17 ++++++-----------
.../kdepim-kioslaves/kdepim-kioslaves-9999.ebuild | 15 ++++++++-------
6 files changed, 39 insertions(+), 50 deletions(-)
diff --git a/kde-apps/akonadi-contact/akonadi-contact-15.12.49.9999.ebuild b/kde-apps/akonadi-contact/akonadi-contact-15.12.49.9999.ebuild
index 328a43c..43db14d 100644
--- a/kde-apps/akonadi-contact/akonadi-contact-15.12.49.9999.ebuild
+++ b/kde-apps/akonadi-contact/akonadi-contact-15.12.49.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_TEST=true
KMNAME=kdepimlibs
@@ -46,7 +46,8 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepimlibs
+ !kde-apps/kdepimlibs:4
+ !kde-apps/kdepimlibs:5
"
if [[ ${KDE_BUILD_TYPE} = live ]] ; then
@@ -58,7 +59,6 @@ fi
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package prison KF5Prison)
- $(cmake-utils_use_build test TESTING)
)
kde5_src_configure
}
diff --git a/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild b/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild
index 4667315..99d76f7 100644
--- a/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild
+++ b/kde-apps/akonadi-contact/akonadi-contact-9999.ebuild
@@ -2,10 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-KDE_TEST=true
-KMNAME=kdepimlibs
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_TEST="forceoptional"
+KMNAME="kdepimlibs"
+QT_MINIMAL="5.5.0"
inherit kde5
DESCRIPTION="Library for akonadi contact integration"
@@ -38,8 +40,9 @@ COMMON_DEPEND="
$(add_kdeapps_dep kmime)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
+ $(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
- media-libs/phonon[qt5]
+ dev-libs/grantlee:5
prison? ( media-libs/prison:5 )
"
DEPEND="${COMMON_DEPEND}
@@ -47,7 +50,8 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!<kde-apps/kdepim-15.12.50
- !kde-apps/kdepimlibs
+ !kde-apps/kdepimlibs:4
+ !kde-apps/kdepimlibs:5
"
if [[ ${KDE_BUILD_TYPE} = live ]] ; then
@@ -57,7 +61,6 @@ fi
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package prison KF5Prison)
- $(cmake-utils_use_build test TESTING)
)
kde5_src_configure
}
diff --git a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
index c99e8e8..e0a6ed7 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-9999.ebuild
@@ -2,10 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-KDE_TEST=true
-KMNAME=kdepimlibs
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_TEST="true"
+KMNAME="kdepimlibs"
inherit kde5
DESCRIPTION="Library for akonadi mime types"
@@ -27,26 +28,20 @@ COMMON_DEPEND="
$(add_frameworks_dep kxmlgui)
$(add_kdeapps_dep akonadi)
$(add_kdeapps_dep kmime)
- dev-libs/libxslt
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
+ dev-libs/libxslt
x11-misc/shared-mime-info
"
DEPEND="${COMMON_DEPEND}
sys-devel/gettext
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepimlibs
+ !kde-apps/kdepimlibs:4
+ !kde-apps/kdepimlibs:5
"
if [[ ${KDE_BUILD_TYPE} = live ]] ; then
S="${WORKDIR}/${P}/${PN}"
fi
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build test TESTING)
- )
- kde5_src_configure
-}
diff --git a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
index 7312e6c..357368e 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-9999.ebuild
@@ -2,10 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-KDE_TEST=true
-KMNAME=kdepimlibs
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_TEST="true"
+KMNAME="kdepimlibs"
inherit kde5
DESCRIPTION="Library for akonadi notes integration"
@@ -27,16 +28,10 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepimlibs
+ !kde-apps/kdepimlibs:4
+ !kde-apps/kdepimlibs:5
"
if [[ ${KDE_BUILD_TYPE} = live ]] ; then
S="${WORKDIR}/${P}/${PN}"
fi
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build test TESTING)
- )
- kde5_src_configure
-}
diff --git a/kde-apps/akonadi-socialutils/akonadi-socialutils-9999.ebuild b/kde-apps/akonadi-socialutils/akonadi-socialutils-9999.ebuild
index 2d52433..f4c10c0 100644
--- a/kde-apps/akonadi-socialutils/akonadi-socialutils-9999.ebuild
+++ b/kde-apps/akonadi-socialutils/akonadi-socialutils-9999.ebuild
@@ -2,10 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-KDE_TEST=true
-KMNAME=kdepimlibs
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_TEST="true"
+KMNAME="kdepimlibs"
inherit kde5
DESCRIPTION="Library for social utils integration"
@@ -29,16 +30,10 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepimlibs
+ !kde-apps/kdepimlibs:4
+ !kde-apps/kdepimlibs:5
"
if [[ ${KDE_BUILD_TYPE} = live ]] ; then
S="${WORKDIR}/${P}/${PN}"
fi
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build test TESTING)
- )
- kde5_src_configure
-}
diff --git a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild
index f145674..50a5f42 100644
--- a/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild
+++ b/kde-apps/kdepim-kioslaves/kdepim-kioslaves-9999.ebuild
@@ -2,12 +2,13 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-KDE_DOC_DIR=docs
-KDE_HANDBOOK=true
-KDE_TEST=true
-KMNAME=kdepimlibs
+FRAMEWORKS_MINIMAL="5.19.0"
+KDE_DOC_DIR="docs"
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+KMNAME="kdepimlibs"
VIRTUALX_REQUIRED=test
inherit kde5
@@ -31,7 +32,8 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext
"
RDEPEND="${COMMON_DEPEND}
- !kde-apps/kdepimlibs
+ !kde-apps/kdepimlibs:4
+ !kde-apps/kdepimlibs:5
"
if [[ ${KDE_BUILD_TYPE} = live ]] ; then
@@ -43,7 +45,6 @@ fi
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package ssl Sasl2)
- $(cmake-utils_use_build test TESTING)
)
kde5_src_configure
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-02-09 10:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-09 10:53 [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-socialutils/, kde-apps/akonadi-notes/, Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox