* [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-upload/, dev-util/kdevelop-pg-qt/, dev-util/kdevelop-php/, ...
@ 2019-11-10 17:11 Andreas Sturmlechner
0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2019-11-10 17:11 UTC (permalink / raw
To: gentoo-commits
commit: 6156b5385297a103a127206b678f7245b57e5b51
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 6 01:48:31 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 17:06:56 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6156b538
dev-util/kdevelop*: 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>
dev-util/kdevelop-css/kdevelop-css-9999.ebuild | 24 +++--
.../kdevelop-embedded-9999.ebuild | 41 ++++----
.../kdevelop-krazy2/kdevelop-krazy2-9999.ebuild | 30 +++---
dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild | 6 +-
dev-util/kdevelop-php/kdevelop-php-5.4.9999.ebuild | 40 ++++----
dev-util/kdevelop-php/kdevelop-php-9999.ebuild | 40 ++++----
.../kdevelop-python-5.4.9999.ebuild | 41 ++++----
.../kdevelop-python/kdevelop-python-9999.ebuild | 41 ++++----
.../kdevelop-upload/kdevelop-upload-9999.ebuild | 32 +++---
.../kdevelop-valgrind-9999.ebuild | 36 ++++---
dev-util/kdevelop/kdevelop-5.4.9999.ebuild | 113 +++++++++++----------
dev-util/kdevelop/kdevelop-9999.ebuild | 113 +++++++++++----------
12 files changed, 302 insertions(+), 255 deletions(-)
diff --git a/dev-util/kdevelop-css/kdevelop-css-9999.ebuild b/dev-util/kdevelop-css/kdevelop-css-9999.ebuild
index 94c08bd0fe..dc0daffe24 100644
--- a/dev-util/kdevelop-css/kdevelop-css-9999.ebuild
+++ b/dev-util/kdevelop-css/kdevelop-css-9999.ebuild
@@ -3,13 +3,17 @@
EAPI=7
-KDE_TEST="true"
-KMNAME="kdev-css"
-inherit kde5
+ECM_TEST="true"
+KDE_ORG_NAME="kdev-css"
+KF5MIN=5.60.0
+QT5MIN=5.12.3
+inherit ecm kde.org
DESCRIPTION="CSS Language Support plugin for KDevelop"
HOMEPAGE="https://www.kdevelop.org/"
+
LICENSE="GPL-2"
+SLOT="5"
KEYWORDS=""
IUSE=""
@@ -18,13 +22,13 @@ BDEPEND="
test? ( >=dev-util/kdevelop-5.1.80:5[test] )
"
DEPEND="
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep threadweaver)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/ktexteditor-${KF5MIN}:5
+ >=kde-frameworks/kxmlgui-${KF5MIN}:5
+ >=kde-frameworks/threadweaver-${KF5MIN}:5
+ >=dev-qt/qtgui-${QT5MIN}:5
+ >=dev-qt/qtwidgets-${QT5MIN}:5
dev-util/kdevelop-pg-qt:5
>=dev-util/kdevelop-5.1.80:5=
"
diff --git a/dev-util/kdevelop-embedded/kdevelop-embedded-9999.ebuild b/dev-util/kdevelop-embedded/kdevelop-embedded-9999.ebuild
index 862c224394..61c5d56fe4 100644
--- a/dev-util/kdevelop-embedded/kdevelop-embedded-9999.ebuild
+++ b/dev-util/kdevelop-embedded/kdevelop-embedded-9999.ebuild
@@ -3,30 +3,35 @@
EAPI=7
-KMNAME="kdev-embedded"
-inherit kde5
+KDE_ORG_NAME="kdev-embedded"
+KF5MIN=5.60.0
+QT5MIN=5.12.3
+inherit ecm kde.org
DESCRIPTION="Plugin for KDevelop to support the development of embedded systems"
HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
IUSE=""
DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_frameworks_dep threadweaver)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwidgets)
+ >=kde-frameworks/karchive-${KF5MIN}:5
+ >=kde-frameworks/kcompletion-${KF5MIN}:5
+ >=kde-frameworks/kconfig-${KF5MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kitemmodels-${KF5MIN}:5
+ >=kde-frameworks/knewstuff-${KF5MIN}:5
+ >=kde-frameworks/kparts-${KF5MIN}:5
+ >=kde-frameworks/ktexteditor-${KF5MIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+ >=kde-frameworks/kxmlgui-${KF5MIN}:5
+ >=kde-frameworks/solid-${KF5MIN}:5
+ >=kde-frameworks/threadweaver-${KF5MIN}:5
+ >=dev-qt/qtgui-${QT5MIN}:5
+ >=dev-qt/qtnetwork-${QT5MIN}:5
+ >=dev-qt/qtwidgets-${QT5MIN}:5
dev-util/kdevelop-pg-qt:5
dev-util/kdevelop:5=
"
diff --git a/dev-util/kdevelop-krazy2/kdevelop-krazy2-9999.ebuild b/dev-util/kdevelop-krazy2/kdevelop-krazy2-9999.ebuild
index 6f71204000..875eea9015 100644
--- a/dev-util/kdevelop-krazy2/kdevelop-krazy2-9999.ebuild
+++ b/dev-util/kdevelop-krazy2/kdevelop-krazy2-9999.ebuild
@@ -3,29 +3,33 @@
EAPI=7
-KDE_TEST="forceoptional"
-KMNAME="kdev-krazy2"
+ECM_TEST="forceoptional"
+KDE_ORG_NAME="kdev-krazy2"
+KF5MIN=5.60.0
+QT5MIN=5.12.3
VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
DESCRIPTION="Plugin for KDevelop to perform Krazy2 analysis"
HOMEPAGE="https://www.kdevelop.org/"
+
LICENSE="GPL-2+"
+SLOT="5"
KEYWORDS=""
IUSE=""
RDEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
+ >=kde-frameworks/kconfig-${KF5MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kio-${KF5MIN}:5
+ >=kde-frameworks/ktexteditor-${KF5MIN}:5
+ >=kde-frameworks/kxmlgui-${KF5MIN}:5
+ >=dev-qt/qtgui-${QT5MIN}:5
+ >=dev-qt/qtwidgets-${QT5MIN}:5
dev-util/kdevelop:5=
"
DEPEND="${RDEPEND}
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep threadweaver)
+ >=kde-frameworks/kdelibs4support-${KF5MIN}:5
+ >=kde-frameworks/threadweaver-${KF5MIN}:5
"
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
index e9ebafe8d7..fcae103606 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+inherit ecm kde.org
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
@@ -13,7 +13,9 @@ fi
DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
HOMEPAGE="https://www.kdevelop.org/"
+
LICENSE="LGPL-2+ LGPL-2.1+"
+SLOT="5"
IUSE=""
BDEPEND="
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.4.9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.9999.ebuild
index 736a5e6971..8894dc8e4a 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.4.9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.4.9999.ebuild
@@ -3,12 +3,14 @@
EAPI=7
-KDE_DOC_DIR="docs"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-KMNAME="kdev-php"
+ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="true"
+KDE_ORG_NAME="kdev-php"
+KF5MIN=5.60.0
+QT5MIN=5.12.3
VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
if [[ ${KDE_BUILD_TYPE} = release ]]; then
KEYWORDS="~amd64 ~x86"
@@ -16,25 +18,27 @@ fi
DESCRIPTION="PHP plugin for KDevelop"
HOMEPAGE="https://www.kdevelop.org/"
+
LICENSE="GPL-2 LGPL-2"
+SLOT="5"
IUSE=""
BDEPEND="
test? ( dev-util/kdevelop:5[test] )
"
DEPEND="
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep threadweaver)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
+ >=kde-frameworks/kcmutils-${KF5MIN}:5
+ >=kde-frameworks/kconfig-${KF5MIN}:5
+ >=kde-frameworks/kconfigwidgets-${KF5MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kio-${KF5MIN}:5
+ >=kde-frameworks/ktexteditor-${KF5MIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+ >=kde-frameworks/kxmlgui-${KF5MIN}:5
+ >=kde-frameworks/threadweaver-${KF5MIN}:5
+ >=dev-qt/qtgui-${QT5MIN}:5
+ >=dev-qt/qtwidgets-${QT5MIN}:5
dev-util/kdevelop-pg-qt:5
dev-util/kdevelop:5=
"
@@ -48,5 +52,5 @@ src_test() {
local myctestargs=(
-E "(completionbenchmark|duchain_multiplefiles)"
)
- kde5_src_test
+ ecm_src_test
}
diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
index 736a5e6971..8894dc8e4a 100644
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
@@ -3,12 +3,14 @@
EAPI=7
-KDE_DOC_DIR="docs"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-KMNAME="kdev-php"
+ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="true"
+KDE_ORG_NAME="kdev-php"
+KF5MIN=5.60.0
+QT5MIN=5.12.3
VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
if [[ ${KDE_BUILD_TYPE} = release ]]; then
KEYWORDS="~amd64 ~x86"
@@ -16,25 +18,27 @@ fi
DESCRIPTION="PHP plugin for KDevelop"
HOMEPAGE="https://www.kdevelop.org/"
+
LICENSE="GPL-2 LGPL-2"
+SLOT="5"
IUSE=""
BDEPEND="
test? ( dev-util/kdevelop:5[test] )
"
DEPEND="
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep threadweaver)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
+ >=kde-frameworks/kcmutils-${KF5MIN}:5
+ >=kde-frameworks/kconfig-${KF5MIN}:5
+ >=kde-frameworks/kconfigwidgets-${KF5MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kio-${KF5MIN}:5
+ >=kde-frameworks/ktexteditor-${KF5MIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+ >=kde-frameworks/kxmlgui-${KF5MIN}:5
+ >=kde-frameworks/threadweaver-${KF5MIN}:5
+ >=dev-qt/qtgui-${QT5MIN}:5
+ >=dev-qt/qtwidgets-${QT5MIN}:5
dev-util/kdevelop-pg-qt:5
dev-util/kdevelop:5=
"
@@ -48,5 +52,5 @@ src_test() {
local myctestargs=(
-E "(completionbenchmark|duchain_multiplefiles)"
)
- kde5_src_test
+ ecm_src_test
}
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.9999.ebuild
index f85c7d2da5..2c70208f30 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.4.9999.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.4.9999.ebuild
@@ -3,10 +3,12 @@
EAPI=7
-KDE_TEST="forceoptional"
-KMNAME="kdev-python"
+ECM_TEST="forceoptional"
+KDE_ORG_NAME="kdev-python"
PYTHON_COMPAT=( python3_{6,7} )
-inherit kde5 python-single-r1
+KF5MIN=5.60.0
+QT5MIN=5.12.3
+inherit ecm kde.org python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
KEYWORDS="~amd64 ~x86"
@@ -14,25 +16,28 @@ fi
DESCRIPTION="Python plugin for KDevelop"
HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep threadweaver)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
+ >=kde-frameworks/kcompletion-${KF5MIN}:5
+ >=kde-frameworks/kconfig-${KF5MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kio-${KF5MIN}:5
+ >=kde-frameworks/kitemmodels-${KF5MIN}:5
+ >=kde-frameworks/knewstuff-${KF5MIN}:5
+ >=kde-frameworks/kparts-${KF5MIN}:5
+ >=kde-frameworks/ktexteditor-${KF5MIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+ >=kde-frameworks/kxmlgui-${KF5MIN}:5
+ >=kde-frameworks/threadweaver-${KF5MIN}:5
+ >=dev-qt/qtgui-${QT5MIN}:5
+ >=dev-qt/qtwidgets-${QT5MIN}:5
dev-util/kdevelop:5=
"
RDEPEND="${DEPEND}
@@ -43,5 +48,5 @@ RESTRICT+=" test"
pkg_setup() {
python-single-r1_pkg_setup
- kde5_pkg_setup
+ ecm_pkg_setup
}
diff --git a/dev-util/kdevelop-python/kdevelop-python-9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
index f85c7d2da5..2c70208f30 100644
--- a/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
@@ -3,10 +3,12 @@
EAPI=7
-KDE_TEST="forceoptional"
-KMNAME="kdev-python"
+ECM_TEST="forceoptional"
+KDE_ORG_NAME="kdev-python"
PYTHON_COMPAT=( python3_{6,7} )
-inherit kde5 python-single-r1
+KF5MIN=5.60.0
+QT5MIN=5.12.3
+inherit ecm kde.org python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
KEYWORDS="~amd64 ~x86"
@@ -14,25 +16,28 @@ fi
DESCRIPTION="Python plugin for KDevelop"
HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep threadweaver)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
+ >=kde-frameworks/kcompletion-${KF5MIN}:5
+ >=kde-frameworks/kconfig-${KF5MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kio-${KF5MIN}:5
+ >=kde-frameworks/kitemmodels-${KF5MIN}:5
+ >=kde-frameworks/knewstuff-${KF5MIN}:5
+ >=kde-frameworks/kparts-${KF5MIN}:5
+ >=kde-frameworks/ktexteditor-${KF5MIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+ >=kde-frameworks/kxmlgui-${KF5MIN}:5
+ >=kde-frameworks/threadweaver-${KF5MIN}:5
+ >=dev-qt/qtgui-${QT5MIN}:5
+ >=dev-qt/qtwidgets-${QT5MIN}:5
dev-util/kdevelop:5=
"
RDEPEND="${DEPEND}
@@ -43,5 +48,5 @@ RESTRICT+=" test"
pkg_setup() {
python-single-r1_pkg_setup
- kde5_pkg_setup
+ ecm_pkg_setup
}
diff --git a/dev-util/kdevelop-upload/kdevelop-upload-9999.ebuild b/dev-util/kdevelop-upload/kdevelop-upload-9999.ebuild
index 5bf9ec2cf8..0a50cbe4fe 100644
--- a/dev-util/kdevelop-upload/kdevelop-upload-9999.ebuild
+++ b/dev-util/kdevelop-upload/kdevelop-upload-9999.ebuild
@@ -3,28 +3,32 @@
EAPI=7
-KMNAME="kdev-upload"
-inherit kde5
+KDE_ORG_NAME="kdev-upload"
+KF5MIN=5.60.0
+QT5MIN=5.12.3
+inherit ecm kde.org
DESCRIPTION="Plugin for uploading files to a remote server"
HOMEPAGE="https://www.kdevelop.org/"
+
LICENSE="GPL-2"
+SLOT="5"
KEYWORDS=""
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 kio)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
+ >=kde-frameworks/kcmutils-${KF5MIN}:5
+ >=kde-frameworks/kcompletion-${KF5MIN}:5
+ >=kde-frameworks/kconfig-${KF5MIN}:5
+ >=kde-frameworks/kconfigwidgets-${KF5MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kio-${KF5MIN}:5
+ >=kde-frameworks/kjobwidgets-${KF5MIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+ >=kde-frameworks/kxmlgui-${KF5MIN}:5
+ >=dev-qt/qtgui-${QT5MIN}:5
+ >=dev-qt/qtwidgets-${QT5MIN}:5
dev-util/kdevelop:5=
"
RDEPEND="${DEPEND}"
diff --git a/dev-util/kdevelop-valgrind/kdevelop-valgrind-9999.ebuild b/dev-util/kdevelop-valgrind/kdevelop-valgrind-9999.ebuild
index f6b4877935..4ccb088226 100644
--- a/dev-util/kdevelop-valgrind/kdevelop-valgrind-9999.ebuild
+++ b/dev-util/kdevelop-valgrind/kdevelop-valgrind-9999.ebuild
@@ -3,33 +3,37 @@
EAPI=7
-KMNAME="kdev-valgrind"
-inherit kde5
+KDE_ORG_NAME="kdev-valgrind"
+KF5MIN=5.60.0
+QT5MIN=5.12.3
+inherit ecm kde.org
DESCRIPTION="Plugin offering full integration of the valgrind suite to KDevelop"
HOMEPAGE="https://www.kdevelop.org/"
+
LICENSE="GPL-2"
+SLOT="5"
KEYWORDS=""
IUSE=""
COMMON_DEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep threadweaver)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwidgets)
+ >=kde-frameworks/kconfig-${KF5MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kio-${KF5MIN}:5
+ >=kde-frameworks/kjobwidgets-${KF5MIN}:5
+ >=kde-frameworks/ktexteditor-${KF5MIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+ >=kde-frameworks/kxmlgui-${KF5MIN}:5
+ >=kde-frameworks/threadweaver-${KF5MIN}:5
+ >=dev-qt/qtgui-${QT5MIN}:5
+ >=dev-qt/qtnetwork-${QT5MIN}:5
+ >=dev-qt/qtwidgets-${QT5MIN}:5
dev-util/kdevelop:5=
"
DEPEND="${COMMON_DEPEND}
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kitemmodels)
+ >=kde-frameworks/kiconthemes-${KF5MIN}:5
+ >=kde-frameworks/kitemmodels-${KF5MIN}:5
"
RDEPEND="${COMMON_DEPEND}
dev-util/valgrind
diff --git a/dev-util/kdevelop/kdevelop-5.4.9999.ebuild b/dev-util/kdevelop/kdevelop-5.4.9999.ebuild
index 5ed1e8f93f..17f640bc89 100644
--- a/dev-util/kdevelop/kdevelop-5.4.9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.9999.ebuild
@@ -3,11 +3,14 @@
EAPI=7
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_APPS_MINIMAL=19.04.3
+KF5MIN=5.60.0
+QT5MIN=5.12.3
VIRTUALDBUS_TEST="true"
VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
if [[ ${KDE_BUILD_TYPE} = release ]]; then
KEYWORDS="~amd64 ~x86"
@@ -21,76 +24,76 @@ SLOT="5/54" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
COMMON_DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kdeclarative)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep sonnet)
- $(add_frameworks_dep threadweaver)
- $(add_kdeapps_dep libkomparediff2)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative 'widgets')
- $(add_qt_dep qtgui)
- $(add_qt_dep qthelp)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qttest)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
+ >=kde-frameworks/karchive-${KF5MIN}:5
+ >=kde-frameworks/kbookmarks-${KF5MIN}:5
+ >=kde-frameworks/kcmutils-${KF5MIN}:5
+ >=kde-frameworks/kcodecs-${KF5MIN}:5
+ >=kde-frameworks/kcompletion-${KF5MIN}:5
+ >=kde-frameworks/kconfig-${KF5MIN}:5
+ >=kde-frameworks/kconfigwidgets-${KF5MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/kcrash-${KF5MIN}:5
+ >=kde-frameworks/kdeclarative-${KF5MIN}:5
+ >=kde-frameworks/kguiaddons-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kiconthemes-${KF5MIN}:5
+ >=kde-frameworks/kio-${KF5MIN}:5
+ >=kde-frameworks/kitemmodels-${KF5MIN}:5
+ >=kde-frameworks/kitemviews-${KF5MIN}:5
+ >=kde-frameworks/kjobwidgets-${KF5MIN}:5
+ >=kde-frameworks/knewstuff-${KF5MIN}:5
+ >=kde-frameworks/knotifications-${KF5MIN}:5
+ >=kde-frameworks/knotifyconfig-${KF5MIN}:5
+ >=kde-frameworks/kparts-${KF5MIN}:5
+ >=kde-frameworks/kservice-${KF5MIN}:5
+ >=kde-frameworks/ktexteditor-${KF5MIN}:5
+ >=kde-frameworks/ktextwidgets-${KF5MIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+ >=kde-frameworks/kwindowsystem-${KF5MIN}:5
+ >=kde-frameworks/kxmlgui-${KF5MIN}:5
+ >=kde-frameworks/sonnet-${KF5MIN}:5
+ >=kde-frameworks/threadweaver-${KF5MIN}:5
+ >=kde-apps/libkomparediff2-${KDE_APPS_MINIMAL}:5
+ >=dev-qt/qtdbus-${QT5MIN}:5
+ >=dev-qt/qtdeclarative-${QT5MIN}:5[widgets]
+ >=dev-qt/qtgui-${QT5MIN}:5
+ >=dev-qt/qthelp-${QT5MIN}:5
+ >=dev-qt/qtnetwork-${QT5MIN}:5
+ >=dev-qt/qttest-${QT5MIN}:5
+ >=dev-qt/qtwidgets-${QT5MIN}:5
+ >=dev-qt/qtxml-${QT5MIN}:5
dev-libs/grantlee:5
>=dev-util/astyle-3.1:=
>=sys-devel/clang-3.8.0:=
- gdbui? ( $(add_plasma_dep libksysguard) )
+ gdbui? ( >=kde-plasma/libksysguard-5.16.5:5 )
hex? ( app-editors/okteta:5 )
plasma? (
- $(add_frameworks_dep krunner)
- $(add_frameworks_dep plasma)
+ >=kde-frameworks/krunner-${KF5MIN}:5
+ >=kde-frameworks/plasma-${KF5MIN}:5
)
qmake? ( dev-util/kdevelop-pg-qt:5 )
- reviewboard? ( $(add_frameworks_dep purpose) )
+ reviewboard? ( >=kde-frameworks/purpose-${KF5MIN}:5 )
subversion? (
dev-libs/apr:1
dev-libs/apr-util:1
dev-vcs/subversion
)
webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
- !webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+ !webkit? ( >=dev-qt/qtwebengine-${QT5MIN}:5[widgets] )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
- $(add_qt_dep qtconcurrent)
+ >=dev-qt/qtconcurrent-${QT5MIN}:5
"
RDEPEND="${COMMON_DEPEND}
- $(add_kdeapps_dep kapptemplate)
- $(add_kdeapps_dep kio-extras)
- $(add_qt_dep qdbus)
- $(add_qt_dep qtquickcontrols)
- $(add_qt_dep qtquickcontrols2)
+ >=kde-apps/kapptemplate-${KDE_APPS_MINIMAL}:5
+ >=kde-apps/kio-extras-${KDE_APPS_MINIMAL}:5
+ >=dev-qt/qdbus-${QT5MIN}:5
+ >=dev-qt/qtquickcontrols-${QT5MIN}:5
+ >=dev-qt/qtquickcontrols2-${QT5MIN}:5
dev-util/ninja
>=sys-devel/gdb-7.0[python]
- reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
+ reviewboard? ( >=kde-apps/ktp-accounts-kcm-${KDE_APPS_MINIMAL}:5 )
!dev-util/kdevelop-clang-tidy
!dev-util/kdevplatform
"
@@ -112,11 +115,11 @@ src_configure() {
use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
- kde5_src_configure
+ ecm_src_configure
}
pkg_postinst() {
- kde5_pkg_postinst
+ ecm_pkg_postinst
if ! has_version "kde-apps/konsole" ; then
elog "For konsole view, please install kde-apps/konsole"
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 6dbf5501f1..b469bf1e51 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -3,11 +3,14 @@
EAPI=7
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_APPS_MINIMAL=19.04.3
+KF5MIN=5.60.0
+QT5MIN=5.12.3
VIRTUALDBUS_TEST="true"
VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
if [[ ${KDE_BUILD_TYPE} = release ]]; then
KEYWORDS="~amd64 ~x86"
@@ -21,76 +24,76 @@ SLOT="5/55" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
COMMON_DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kdeclarative)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep sonnet)
- $(add_frameworks_dep threadweaver)
- $(add_kdeapps_dep libkomparediff2)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative 'widgets')
- $(add_qt_dep qtgui)
- $(add_qt_dep qthelp)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qttest)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
+ >=kde-frameworks/karchive-${KF5MIN}:5
+ >=kde-frameworks/kbookmarks-${KF5MIN}:5
+ >=kde-frameworks/kcmutils-${KF5MIN}:5
+ >=kde-frameworks/kcodecs-${KF5MIN}:5
+ >=kde-frameworks/kcompletion-${KF5MIN}:5
+ >=kde-frameworks/kconfig-${KF5MIN}:5
+ >=kde-frameworks/kconfigwidgets-${KF5MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/kcrash-${KF5MIN}:5
+ >=kde-frameworks/kdeclarative-${KF5MIN}:5
+ >=kde-frameworks/kguiaddons-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kiconthemes-${KF5MIN}:5
+ >=kde-frameworks/kio-${KF5MIN}:5
+ >=kde-frameworks/kitemmodels-${KF5MIN}:5
+ >=kde-frameworks/kitemviews-${KF5MIN}:5
+ >=kde-frameworks/kjobwidgets-${KF5MIN}:5
+ >=kde-frameworks/knewstuff-${KF5MIN}:5
+ >=kde-frameworks/knotifications-${KF5MIN}:5
+ >=kde-frameworks/knotifyconfig-${KF5MIN}:5
+ >=kde-frameworks/kparts-${KF5MIN}:5
+ >=kde-frameworks/kservice-${KF5MIN}:5
+ >=kde-frameworks/ktexteditor-${KF5MIN}:5
+ >=kde-frameworks/ktextwidgets-${KF5MIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+ >=kde-frameworks/kwindowsystem-${KF5MIN}:5
+ >=kde-frameworks/kxmlgui-${KF5MIN}:5
+ >=kde-frameworks/sonnet-${KF5MIN}:5
+ >=kde-frameworks/threadweaver-${KF5MIN}:5
+ >=kde-apps/libkomparediff2-${KDE_APPS_MINIMAL}:5
+ >=dev-qt/qtdbus-${QT5MIN}:5
+ >=dev-qt/qtdeclarative-${QT5MIN}:5[widgets]
+ >=dev-qt/qtgui-${QT5MIN}:5
+ >=dev-qt/qthelp-${QT5MIN}:5
+ >=dev-qt/qtnetwork-${QT5MIN}:5
+ >=dev-qt/qttest-${QT5MIN}:5
+ >=dev-qt/qtwidgets-${QT5MIN}:5
+ >=dev-qt/qtxml-${QT5MIN}:5
dev-libs/grantlee:5
>=dev-util/astyle-3.1:=
>=sys-devel/clang-3.8.0:=
- gdbui? ( $(add_plasma_dep libksysguard) )
+ gdbui? ( >=kde-plasma/libksysguard-5.16.5:5 )
hex? ( app-editors/okteta:5 )
plasma? (
- $(add_frameworks_dep krunner)
- $(add_frameworks_dep plasma)
+ >=kde-frameworks/krunner-${KF5MIN}:5
+ >=kde-frameworks/plasma-${KF5MIN}:5
)
qmake? ( dev-util/kdevelop-pg-qt:5 )
- reviewboard? ( $(add_frameworks_dep purpose) )
+ reviewboard? ( >=kde-frameworks/purpose-${KF5MIN}:5 )
subversion? (
dev-libs/apr:1
dev-libs/apr-util:1
dev-vcs/subversion
)
webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
- !webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+ !webkit? ( >=dev-qt/qtwebengine-${QT5MIN}:5[widgets] )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
- $(add_qt_dep qtconcurrent)
+ >=dev-qt/qtconcurrent-${QT5MIN}:5
"
RDEPEND="${COMMON_DEPEND}
- $(add_kdeapps_dep kapptemplate)
- $(add_kdeapps_dep kio-extras)
- $(add_qt_dep qdbus)
- $(add_qt_dep qtquickcontrols)
- $(add_qt_dep qtquickcontrols2)
+ >=kde-apps/kapptemplate-${KDE_APPS_MINIMAL}:5
+ >=kde-apps/kio-extras-${KDE_APPS_MINIMAL}:5
+ >=dev-qt/qdbus-${QT5MIN}:5
+ >=dev-qt/qtquickcontrols-${QT5MIN}:5
+ >=dev-qt/qtquickcontrols2-${QT5MIN}:5
dev-util/ninja
>=sys-devel/gdb-7.0[python]
- reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
+ reviewboard? ( >=kde-apps/ktp-accounts-kcm-${KDE_APPS_MINIMAL}:5 )
!dev-util/kdevelop-clang-tidy
!dev-util/kdevplatform
"
@@ -112,11 +115,11 @@ src_configure() {
use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
- kde5_src_configure
+ ecm_src_configure
}
pkg_postinst() {
- kde5_pkg_postinst
+ ecm_pkg_postinst
if ! has_version "kde-apps/konsole" ; then
elog "For konsole view, please install kde-apps/konsole"
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-11-10 17:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-10 17:11 [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-upload/, dev-util/kdevelop-pg-qt/, dev-util/kdevelop-php/, Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox