From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: app-office/calligraplan/
Date: Sun, 10 Nov 2019 17:11:46 +0000 (UTC) [thread overview]
Message-ID: <1573405844.c408ea8d4d337528cb787697c2c86f238cada4dd.asturm@gentoo> (raw)
commit: c408ea8d4d337528cb787697c2c86f238cada4dd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 7 18:26:06 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 17:10:44 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c408ea8d
app-office/calligraplan: Port to ecm.eclass and kde.org.eclass
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligraplan/calligraplan-3.1.90.ebuild | 72 +++++++++++----------
app-office/calligraplan/calligraplan-9999.ebuild | 74 +++++++++++-----------
2 files changed, 75 insertions(+), 71 deletions(-)
diff --git a/app-office/calligraplan/calligraplan-3.1.90.ebuild b/app-office/calligraplan/calligraplan-3.1.90.ebuild
index 4d4fc9ecbe..99941b4c26 100644
--- a/app-office/calligraplan/calligraplan-3.1.90.ebuild
+++ b/app-office/calligraplan/calligraplan-3.1.90.ebuild
@@ -3,10 +3,11 @@
EAPI=7
-KDE_APPS_MINIMAL="19.08.0"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KF5MIN=5.60.0
+QT5MIN=5.12.3
+inherit ecm kde.org
DESCRIPTION="Project management application"
HOMEPAGE="https://www.calligra.org/"
@@ -17,6 +18,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then
fi
LICENSE="GPL-2"
+SLOT="5"
IUSE="activities +holidays kwallet X"
# FIXME: Disabled by upstream for good reason
@@ -27,49 +29,49 @@ IUSE="activities +holidays kwallet X"
# =dev-libs/kproperty-3.0*:5
# =dev-libs/kreport-3.0*:5
DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kglobalaccel)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep khtml)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep designer)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
+ >=dev-qt/designer-${QT5MIN}:5
+ >=dev-qt/qtdbus-${QT5MIN}:5
+ >=dev-qt/qtgui-${QT5MIN}:5
+ >=dev-qt/qtprintsupport-${QT5MIN}:5
+ >=dev-qt/qtwidgets-${QT5MIN}:5
+ >=dev-qt/qtxml-${QT5MIN}:5
+ >=kde-frameworks/karchive-${KF5MIN}:5
+ >=kde-frameworks/kconfig-${KF5MIN}:5
+ >=kde-frameworks/kconfigwidgets-${KF5MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/kdbusaddons-${KF5MIN}:5
+ >=kde-frameworks/kglobalaccel-${KF5MIN}:5
+ >=kde-frameworks/kguiaddons-${KF5MIN}:5
+ >=kde-frameworks/khtml-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kiconthemes-${KF5MIN}:5
+ >=kde-frameworks/kio-${KF5MIN}:5
+ >=kde-frameworks/kitemviews-${KF5MIN}:5
+ >=kde-frameworks/kjobwidgets-${KF5MIN}:5
+ >=kde-frameworks/knotifications-${KF5MIN}:5
+ >=kde-frameworks/kparts-${KF5MIN}:5
+ >=kde-frameworks/kservice-${KF5MIN}:5
+ >=kde-frameworks/ktextwidgets-${KF5MIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+ >=kde-frameworks/kwindowsystem-${KF5MIN}:5
+ >=kde-frameworks/kxmlgui-${KF5MIN}:5
dev-lang/perl
dev-libs/kdiagram:5
sys-libs/zlib
- activities? ( $(add_frameworks_dep kactivities) )
- holidays? ( $(add_frameworks_dep kholidays) )
+ activities? ( >=kde-frameworks/kactivities-${KF5MIN}:5 )
+ holidays? ( >=kde-frameworks/kholidays-${KF5MIN}:5 )
kwallet? (
- $(add_frameworks_dep kwallet)
app-crypt/qca:2[qt5(+)]
+ >=kde-frameworks/kwallet-${KF5MIN}:5
)
X? (
- $(add_qt_dep qtx11extras)
+ >=dev-qt/qtx11extras-${QT5MIN}:5
x11-libs/libX11
)
"
RDEPEND="${DEPEND}
!app-office/calligra[calligra_features_plan(-)]
- $(add_qt_dep qtsvg)
+ >=dev-qt/qtsvg-${QT5MIN}:5
"
RESTRICT+=" test"
diff --git a/app-office/calligraplan/calligraplan-9999.ebuild b/app-office/calligraplan/calligraplan-9999.ebuild
index ec0b0d326a..99941b4c26 100644
--- a/app-office/calligraplan/calligraplan-9999.ebuild
+++ b/app-office/calligraplan/calligraplan-9999.ebuild
@@ -3,20 +3,22 @@
EAPI=7
-KDE_APPS_MINIMAL="19.08.0"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KF5MIN=5.60.0
+QT5MIN=5.12.3
+inherit ecm kde.org
DESCRIPTION="Project management application"
HOMEPAGE="https://www.calligra.org/"
if [[ ${KDE_BUILD_TYPE} == release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PN}-${PV}.tar.xz"
+ SRC_URI="mirror://kde/unstable/calligra/${PN}-${PV}.tar.xz"
KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-2"
+SLOT="5"
IUSE="activities +holidays kwallet X"
# FIXME: Disabled by upstream for good reason
@@ -27,49 +29,49 @@ IUSE="activities +holidays kwallet X"
# =dev-libs/kproperty-3.0*:5
# =dev-libs/kreport-3.0*:5
DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kglobalaccel)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep khtml)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep designer)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
+ >=dev-qt/designer-${QT5MIN}:5
+ >=dev-qt/qtdbus-${QT5MIN}:5
+ >=dev-qt/qtgui-${QT5MIN}:5
+ >=dev-qt/qtprintsupport-${QT5MIN}:5
+ >=dev-qt/qtwidgets-${QT5MIN}:5
+ >=dev-qt/qtxml-${QT5MIN}:5
+ >=kde-frameworks/karchive-${KF5MIN}:5
+ >=kde-frameworks/kconfig-${KF5MIN}:5
+ >=kde-frameworks/kconfigwidgets-${KF5MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/kdbusaddons-${KF5MIN}:5
+ >=kde-frameworks/kglobalaccel-${KF5MIN}:5
+ >=kde-frameworks/kguiaddons-${KF5MIN}:5
+ >=kde-frameworks/khtml-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kiconthemes-${KF5MIN}:5
+ >=kde-frameworks/kio-${KF5MIN}:5
+ >=kde-frameworks/kitemviews-${KF5MIN}:5
+ >=kde-frameworks/kjobwidgets-${KF5MIN}:5
+ >=kde-frameworks/knotifications-${KF5MIN}:5
+ >=kde-frameworks/kparts-${KF5MIN}:5
+ >=kde-frameworks/kservice-${KF5MIN}:5
+ >=kde-frameworks/ktextwidgets-${KF5MIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+ >=kde-frameworks/kwindowsystem-${KF5MIN}:5
+ >=kde-frameworks/kxmlgui-${KF5MIN}:5
dev-lang/perl
dev-libs/kdiagram:5
sys-libs/zlib
- activities? ( $(add_frameworks_dep kactivities) )
- holidays? ( $(add_frameworks_dep kholidays) )
+ activities? ( >=kde-frameworks/kactivities-${KF5MIN}:5 )
+ holidays? ( >=kde-frameworks/kholidays-${KF5MIN}:5 )
kwallet? (
- $(add_frameworks_dep kwallet)
app-crypt/qca:2[qt5(+)]
+ >=kde-frameworks/kwallet-${KF5MIN}:5
)
X? (
- $(add_qt_dep qtx11extras)
+ >=dev-qt/qtx11extras-${QT5MIN}:5
x11-libs/libX11
)
"
RDEPEND="${DEPEND}
!app-office/calligra[calligra_features_plan(-)]
- $(add_qt_dep qtsvg)
+ >=dev-qt/qtsvg-${QT5MIN}:5
"
RESTRICT+=" test"
next reply other threads:[~2019-11-10 17:11 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-10 17:11 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-08 17:36 [gentoo-commits] proj/kde:master commit in: app-office/calligraplan/ Andreas Sturmlechner
2023-05-27 10:50 Andreas Sturmlechner
2022-11-24 18:51 Andreas Sturmlechner
2022-10-11 15:18 Andreas Sturmlechner
2021-01-28 21:48 Andreas Sturmlechner
2020-10-26 16:15 Andreas Sturmlechner
2020-05-20 19:35 Andreas Sturmlechner
2019-11-30 14:29 Andreas Sturmlechner
2019-11-30 14:29 Andreas Sturmlechner
2019-11-12 0:01 Andreas Sturmlechner
2019-11-10 21:09 Andreas Sturmlechner
2019-11-10 20:53 Andreas Sturmlechner
2019-11-01 23:24 Andreas Sturmlechner
2019-10-24 18:37 Andreas Sturmlechner
2019-08-16 14:47 Andreas Sturmlechner
2019-07-10 10:30 Andreas Sturmlechner
2019-01-26 20:29 Andreas Sturmlechner
2019-01-04 23:32 Andreas Sturmlechner
2019-01-01 21:46 Andreas Sturmlechner
2018-11-11 12:12 Andreas Sturmlechner
2018-11-11 12:05 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1573405844.c408ea8d4d337528cb787697c2c86f238cada4dd.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox