* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevplatform/files/, dev-util/kdevplatform/
@ 2015-09-07 9:46 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2015-09-07 9:46 UTC (permalink / raw
To: gentoo-commits
commit: a82a6030cd3169d9335ffdb088d3d43d81560e13
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 09:40:23 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 09:46:11 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a82a6030
dev-util/kdevplatform: remove old.
Package-Manager: portage-2.2.20.1
dev-util/kdevplatform/Manifest | 2 -
.../files/kdevplatform-1.6.0-appwizard.patch | 24 ----------
dev-util/kdevplatform/kdevplatform-1.5.2.ebuild | 51 --------------------
dev-util/kdevplatform/kdevplatform-1.6.0-r1.ebuild | 54 ----------------------
4 files changed, 131 deletions(-)
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index 5429a3f..4e54101 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,3 +1 @@
-DIST kdevplatform-1.5.2.tar.xz 1895448 SHA256 a12656cfe137172db5feed9795b4f40b7fb42a93b6caf90838e5f9c205ee186a SHA512 019f7df0ca232d6627517c8677633f44807dddf6efc610df8b96a548f5280cce331e0afc8b4743f7badbe3fd7918def6c6c9b0c5806e9a8be2c9dafed4a95f03 WHIRLPOOL b6ba6103a8146912fe49d84cc21373746804cfaa4b607a63c7db7e92df5b44884b7f3880cc01399ba7eb3618b216e1d2b727cefdc24ee50d8c22c6206b34450b
-DIST kdevplatform-1.6.0.tar.xz 1889840 SHA256 cdf7c88ca8860258f46e41d2107c826a307212fd041345bee54fbd70c9794f80 SHA512 3f9d6aeb5fdb12dc0a719343ac81b8852d1680f2637fea8f3a8b97eaa32af38bd799e215a539792ec2e33dc0c0f53ba5f9347abc3633c4c31a71422bd2a8065f WHIRLPOOL 897cdb1f0893bd22e73c68ed3860cc8953c78ce8406eb0d41442d1402395cf4e00f17bf27a804f67857e160311aa979d178c2700b0370eea66d92759194a7b65
DIST kdevplatform-1.7.1.tar.xz 1930560 SHA256 dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac SHA512 b19c925c973ab00b25b03f1bcf1e34a98b8108728f20e7b058bd391a1dde78e33b80705c39632ff594ecf834878e1c54732031b8110400433266c258632468d0 WHIRLPOOL 9e687644b1f31ca317bb3fa0000f388aca80ee305eaa3b43d044181d2b2374ad57613104a400a8a052ed07e5157fbbdc26b7174314cc04ca5b8c788afe4c8f4f
diff --git a/dev-util/kdevplatform/files/kdevplatform-1.6.0-appwizard.patch b/dev-util/kdevplatform/files/kdevplatform-1.6.0-appwizard.patch
deleted file mode 100644
index d4f93f6..0000000
--- a/dev-util/kdevplatform/files/kdevplatform-1.6.0-appwizard.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 33b660dfefe02ecd4391a284f6fd6de9439b2b45
-Author: Milian Wolff <mail@milianw.de>
-Date: Thu Mar 20 11:50:07 2014 +0100
-
- Keep backwards compatibility: replace "dest" variable.
-
- Its an alias for PROJECTDIR and used in quite some templates
- apparently.
-
- BUG: 329392
-
-diff --git a/plugins/appwizard/appwizardplugin.cpp b/plugins/appwizard/appwizardplugin.cpp
-index 3e22183..7948e47 100644
---- a/plugins/appwizard/appwizardplugin.cpp
-+++ b/plugins/appwizard/appwizardplugin.cpp
-@@ -238,6 +238,8 @@ QString AppWizardPlugin::createProject(const ApplicationInfo& info)
- m_variables["APPNAMELC"] = info.name.toLower();
- m_variables["APPNAMEID"] = generateIdentifier(info.name);
- m_variables["PROJECTDIR"] = dest.toLocalFile();
-+ // backwards compatibility
-+ m_variables["dest"] = m_variables["PROJECTDIR"];
- m_variables["PROJECTDIRNAME"] = dest.fileName();
- m_variables["VERSIONCONTROLPLUGIN"] = info.vcsPluginName;
-
diff --git a/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild b/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild
deleted file mode 100644
index b5a2131..0000000
--- a/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdevelop"
-KDE_MINIMAL="4.7"
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nb nds nl pl
-pt pt_BR ru sk sl sv th uk zh_CN zh_TW"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-EGIT_REPONAME="${PN}"
-inherit kde4-base
-
-DESCRIPTION="KDE development support libraries and apps"
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs debug reviewboard subversion"
-SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
-
-if [[ $PV == *9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="amd64 ppc x86"
-fi
-
-DEPEND="
- dev-libs/boost:=
- dev-libs/grantlee:0
- reviewboard? ( dev-libs/qjson )
- subversion? (
- dev-libs/apr
- dev-libs/apr-util
- dev-vcs/subversion
- )
-"
-RDEPEND="${DEPEND}
- !<dev-util/kdevelop-${KDEVELOP_VERSION}:4
- $(add_kdeapps_dep konsole)
- cvs? ( dev-vcs/cvs )
-"
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_build cvs)
- $(cmake-utils_use_find_package reviewboard QJSON)
- $(cmake-utils_use_build subversion)
- )
-
- kde4-base_src_configure
-}
diff --git a/dev-util/kdevplatform/kdevplatform-1.6.0-r1.ebuild b/dev-util/kdevplatform/kdevplatform-1.6.0-r1.ebuild
deleted file mode 100644
index f817a72..0000000
--- a/dev-util/kdevplatform/kdevplatform-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdevelop"
-KDE_LINGUAS="bs ca ca@valencia da de el es et fi fr gl it kk nb nl pl pt pt_BR
-ru sk sl sv th uk zh_CN zh_TW"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-EGIT_REPONAME="${PN}"
-inherit kde4-base
-
-DESCRIPTION="KDE development support libraries and apps"
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs debug reviewboard subversion"
-SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
-
-if [[ $PV == *9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-RESTRICT="test"
-
-DEPEND="
- dev-libs/boost:=
- dev-libs/grantlee:0
- reviewboard? ( dev-libs/qjson )
- subversion? (
- dev-libs/apr
- dev-libs/apr-util
- dev-vcs/subversion
- )
-"
-RDEPEND="${DEPEND}
- !<dev-util/kdevelop-${KDEVELOP_VERSION}:4
- $(add_kdeapps_dep konsole)
- cvs? ( dev-vcs/cvs )
-"
-
-PATCHES=( "${FILESDIR}/${P}-appwizard.patch" )
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use_build cvs)
- $(cmake-utils_use_find_package reviewboard QJSON)
- $(cmake-utils_use_build subversion)
- )
-
- kde4-base_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevplatform/files/, dev-util/kdevplatform/
@ 2017-02-18 23:33 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-02-18 23:33 UTC (permalink / raw
To: gentoo-commits
commit: 9cbbc021c699959be69810b3a271dc46a393f6cc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 22:59:55 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 23:33:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cbbc021
dev-util/kdevplatform: Fix build w/ >=KF-5.30
Gentoo-bug: 606158
Reported-by: Simon Gander <simongander <AT> gmx.ch>
Package-Manager: portage-2.3.3
.../files/kdevplatform-5.0.3-kconfig-5.30.patch | 109 ++++++++++++++++++++
dev-util/kdevplatform/kdevplatform-5.0.3-r1.ebuild | 112 +++++++++++++++++++++
2 files changed, 221 insertions(+)
diff --git a/dev-util/kdevplatform/files/kdevplatform-5.0.3-kconfig-5.30.patch b/dev-util/kdevplatform/files/kdevplatform-5.0.3-kconfig-5.30.patch
new file mode 100644
index 0000000000..ad6b896851
--- /dev/null
+++ b/dev-util/kdevplatform/files/kdevplatform-5.0.3-kconfig-5.30.patch
@@ -0,0 +1,109 @@
+commit e84645d1694bdad7f179cd41babce723fe07aa63
+Author: Kevin Funk <kfunk@kde.org>
+Date: Mon Dec 5 15:20:53 2016 +0100
+
+ Hotfix for restoring build with newer KConfig
+
+ https://phabricator.kde.org/D3386 is a SIC change, handle that
+
+diff --git a/project/projectconfigskeleton.cpp b/project/projectconfigskeleton.cpp
+index 0e06149..c4c9767 100644
+--- a/project/projectconfigskeleton.cpp
++++ b/project/projectconfigskeleton.cpp
+@@ -46,6 +46,10 @@ ProjectConfigSkeleton::ProjectConfigSkeleton( const QString & configname )
+ ProjectConfigSkeleton::ProjectConfigSkeleton( KSharedConfigPtr config )
+ : KConfigSkeleton( config ), d( new ProjectConfigSkeletonPrivate )
+ {
++ // FIXME: Check if that does the right thing.
++ // https://phabricator.kde.org/D3386 broke source compat in kconfig, thus requiring us to make this ctor public
++ Q_ASSERT(config);
++ d->m_developerTempFile = config->name();
+ }
+
+ void ProjectConfigSkeleton::setDeveloperTempFile( const QString& cfg )
+diff --git a/project/projectconfigskeleton.h b/project/projectconfigskeleton.h
+index ed17ed0..c8314df 100644
+--- a/project/projectconfigskeleton.h
++++ b/project/projectconfigskeleton.h
+@@ -55,16 +55,12 @@ public:
+
+ Path projectFile() const;
+ Path developerFile() const;
++
++protected:
++ explicit ProjectConfigSkeleton( KSharedConfigPtr config );
++
+ private:
+- /**
+- * There's no way in KDE4 API to find out the file that the config object
+- * was created from, so we can't apply defaults when using this
+- * constructors. Thus I'm making this private, so we can find out when
+- * this constructor is used and see if we need to add appropriate API to
+- * kdelibs
+- */
+- explicit ProjectConfigSkeleton( KSharedConfigPtr config );
+- struct ProjectConfigSkeletonPrivate * const d;
++ struct ProjectConfigSkeletonPrivate * const d;
+ };
+
+ }
+commit 3fc389e64b2955cd7347d6798202b2bf22ab5643
+Author: Kevin Funk <kfunk@kde.org>
+Date: Fri Dec 9 12:00:49 2016 +0100
+
+ ProjectConfigSkeleton: Remove FIXME
+
+ Code works as expected, just verified. Also fix the visibility of the
+ other ctor
+
+diff --git a/project/projectconfigskeleton.cpp b/project/projectconfigskeleton.cpp
+index c4c9767..9d37a54 100644
+--- a/project/projectconfigskeleton.cpp
++++ b/project/projectconfigskeleton.cpp
+@@ -46,8 +46,6 @@ ProjectConfigSkeleton::ProjectConfigSkeleton( const QString & configname )
+ ProjectConfigSkeleton::ProjectConfigSkeleton( KSharedConfigPtr config )
+ : KConfigSkeleton( config ), d( new ProjectConfigSkeletonPrivate )
+ {
+- // FIXME: Check if that does the right thing.
+- // https://phabricator.kde.org/D3386 broke source compat in kconfig, thus requiring us to make this ctor public
+ Q_ASSERT(config);
+ d->m_developerTempFile = config->name();
+ }
+diff --git a/project/projectconfigskeleton.h b/project/projectconfigskeleton.h
+index c8314df..ad3c063 100644
+--- a/project/projectconfigskeleton.h
++++ b/project/projectconfigskeleton.h
+@@ -32,17 +32,8 @@ class Path;
+ class KDEVPLATFORMPROJECT_EXPORT ProjectConfigSkeleton: public KConfigSkeleton
+ {
+ Q_OBJECT
+-public:
+-
+- /**
+- * Constructs a new skeleton, the skeleton will write to the developer
+- * configuration file, which is by default located in projectdir/.kdev4
+- * The defaults will be set from the project file, which is in the projectdir
+- *
+- * @param configname The absolute filename of the developer configuration file
+- */
+- explicit ProjectConfigSkeleton( const QString & configname );
+
++public:
+ ~ProjectConfigSkeleton() override;
+
+ void setDeveloperTempFile( const QString& );
+@@ -58,6 +49,14 @@ public:
+
+ protected:
+ explicit ProjectConfigSkeleton( KSharedConfigPtr config );
++ /**
++ * Constructs a new skeleton, the skeleton will write to the developer
++ * configuration file, which is by default located in projectdir/.kdev4
++ * The defaults will be set from the project file, which is in the projectdir
++ *
++ * @param configname The absolute filename of the developer configuration file
++ */
++ explicit ProjectConfigSkeleton( const QString & configname );
+
+ private:
+ struct ProjectConfigSkeletonPrivate * const d;
diff --git a/dev-util/kdevplatform/kdevplatform-5.0.3-r1.ebuild b/dev-util/kdevplatform/kdevplatform-5.0.3-r1.ebuild
new file mode 100644
index 0000000000..0c1e18998f
--- /dev/null
+++ b/dev-util/kdevplatform/kdevplatform-5.0.3-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_BRANCH="5.0"
+KDEBASE="kdevelop"
+KDE_TEST="forceoptional-recursive"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE development support libraries and apps"
+IUSE="cvs reviewboard subversion +welcomepage"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+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 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 qtgui)
+ $(add_qt_dep qttest)
+ $(add_qt_dep qtwebkit)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/grantlee:5
+ reviewboard? ( dev-libs/purpose )
+ subversion? (
+ dev-libs/apr:1
+ dev-libs/apr-util:1
+ dev-vcs/subversion
+ )
+ welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ $(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+ cvs? ( dev-vcs/cvs )
+ !dev-util/kdevelop:4
+ !dev-util/kdevplatform:4
+"
+
+REQUIRED_USE="test? ( welcomepage )"
+
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.0.1-unused-deps.patch"
+ "${FILESDIR}/${P}-kconfig-5.30.patch"
+)
+
+src_prepare() {
+ kde5_src_prepare
+ # root tests subdirectory actually does not contain tests, installs stuff
+ if ! use test; then
+ sed -i -e "/add_subdirectory(tests)/ s/#DONOTCOMPILE //" \
+ CMakeLists.txt || die "Failed to fix CMakeLists.txt"
+ sed -i -e '1s/^/find_package(Qt5Test \$\{QT_MIN_VERSION\})\n/' \
+ tests/CMakeLists.txt || die "Failed to fix tests/CMakeLists.txt"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_cvs=$(usex cvs)
+ $(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
+ $(cmake-utils_use_find_package subversion SubversionLibrary)
+ $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
+ )
+
+ kde5_src_configure
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ if ! has_version "kde-apps/konsole" ; then
+ echo
+ elog "For konsole view, please install kde-apps/konsole"
+ echo
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevplatform/files/, dev-util/kdevplatform/
@ 2017-03-04 12:22 Johannes Huber
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2017-03-04 12:22 UTC (permalink / raw
To: gentoo-commits
commit: 447a293fcf970b041a7a2a7187b5e4e4e27a9b28
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 12:09:24 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 12:19:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=447a293f
dev-util/kdevplatform: Remove 5.0.3-r1
Package-Manager: Portage-2.3.4, Repoman-2.3.2
.../files/kdevplatform-5.0.3-kconfig-5.30.patch | 109 --------------------
dev-util/kdevplatform/kdevplatform-5.0.3-r1.ebuild | 111 ---------------------
2 files changed, 220 deletions(-)
diff --git a/dev-util/kdevplatform/files/kdevplatform-5.0.3-kconfig-5.30.patch b/dev-util/kdevplatform/files/kdevplatform-5.0.3-kconfig-5.30.patch
deleted file mode 100644
index ad6b8968516..00000000000
--- a/dev-util/kdevplatform/files/kdevplatform-5.0.3-kconfig-5.30.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-commit e84645d1694bdad7f179cd41babce723fe07aa63
-Author: Kevin Funk <kfunk@kde.org>
-Date: Mon Dec 5 15:20:53 2016 +0100
-
- Hotfix for restoring build with newer KConfig
-
- https://phabricator.kde.org/D3386 is a SIC change, handle that
-
-diff --git a/project/projectconfigskeleton.cpp b/project/projectconfigskeleton.cpp
-index 0e06149..c4c9767 100644
---- a/project/projectconfigskeleton.cpp
-+++ b/project/projectconfigskeleton.cpp
-@@ -46,6 +46,10 @@ ProjectConfigSkeleton::ProjectConfigSkeleton( const QString & configname )
- ProjectConfigSkeleton::ProjectConfigSkeleton( KSharedConfigPtr config )
- : KConfigSkeleton( config ), d( new ProjectConfigSkeletonPrivate )
- {
-+ // FIXME: Check if that does the right thing.
-+ // https://phabricator.kde.org/D3386 broke source compat in kconfig, thus requiring us to make this ctor public
-+ Q_ASSERT(config);
-+ d->m_developerTempFile = config->name();
- }
-
- void ProjectConfigSkeleton::setDeveloperTempFile( const QString& cfg )
-diff --git a/project/projectconfigskeleton.h b/project/projectconfigskeleton.h
-index ed17ed0..c8314df 100644
---- a/project/projectconfigskeleton.h
-+++ b/project/projectconfigskeleton.h
-@@ -55,16 +55,12 @@ public:
-
- Path projectFile() const;
- Path developerFile() const;
-+
-+protected:
-+ explicit ProjectConfigSkeleton( KSharedConfigPtr config );
-+
- private:
-- /**
-- * There's no way in KDE4 API to find out the file that the config object
-- * was created from, so we can't apply defaults when using this
-- * constructors. Thus I'm making this private, so we can find out when
-- * this constructor is used and see if we need to add appropriate API to
-- * kdelibs
-- */
-- explicit ProjectConfigSkeleton( KSharedConfigPtr config );
-- struct ProjectConfigSkeletonPrivate * const d;
-+ struct ProjectConfigSkeletonPrivate * const d;
- };
-
- }
-commit 3fc389e64b2955cd7347d6798202b2bf22ab5643
-Author: Kevin Funk <kfunk@kde.org>
-Date: Fri Dec 9 12:00:49 2016 +0100
-
- ProjectConfigSkeleton: Remove FIXME
-
- Code works as expected, just verified. Also fix the visibility of the
- other ctor
-
-diff --git a/project/projectconfigskeleton.cpp b/project/projectconfigskeleton.cpp
-index c4c9767..9d37a54 100644
---- a/project/projectconfigskeleton.cpp
-+++ b/project/projectconfigskeleton.cpp
-@@ -46,8 +46,6 @@ ProjectConfigSkeleton::ProjectConfigSkeleton( const QString & configname )
- ProjectConfigSkeleton::ProjectConfigSkeleton( KSharedConfigPtr config )
- : KConfigSkeleton( config ), d( new ProjectConfigSkeletonPrivate )
- {
-- // FIXME: Check if that does the right thing.
-- // https://phabricator.kde.org/D3386 broke source compat in kconfig, thus requiring us to make this ctor public
- Q_ASSERT(config);
- d->m_developerTempFile = config->name();
- }
-diff --git a/project/projectconfigskeleton.h b/project/projectconfigskeleton.h
-index c8314df..ad3c063 100644
---- a/project/projectconfigskeleton.h
-+++ b/project/projectconfigskeleton.h
-@@ -32,17 +32,8 @@ class Path;
- class KDEVPLATFORMPROJECT_EXPORT ProjectConfigSkeleton: public KConfigSkeleton
- {
- Q_OBJECT
--public:
--
-- /**
-- * Constructs a new skeleton, the skeleton will write to the developer
-- * configuration file, which is by default located in projectdir/.kdev4
-- * The defaults will be set from the project file, which is in the projectdir
-- *
-- * @param configname The absolute filename of the developer configuration file
-- */
-- explicit ProjectConfigSkeleton( const QString & configname );
-
-+public:
- ~ProjectConfigSkeleton() override;
-
- void setDeveloperTempFile( const QString& );
-@@ -58,6 +49,14 @@ public:
-
- protected:
- explicit ProjectConfigSkeleton( KSharedConfigPtr config );
-+ /**
-+ * Constructs a new skeleton, the skeleton will write to the developer
-+ * configuration file, which is by default located in projectdir/.kdev4
-+ * The defaults will be set from the project file, which is in the projectdir
-+ *
-+ * @param configname The absolute filename of the developer configuration file
-+ */
-+ explicit ProjectConfigSkeleton( const QString & configname );
-
- private:
- struct ProjectConfigSkeletonPrivate * const d;
diff --git a/dev-util/kdevplatform/kdevplatform-5.0.3-r1.ebuild b/dev-util/kdevplatform/kdevplatform-5.0.3-r1.ebuild
deleted file mode 100644
index 4236dbcab34..00000000000
--- a/dev-util/kdevplatform/kdevplatform-5.0.3-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.0"
-KDEBASE="kdevelop"
-KDE_TEST="forceoptional-recursive"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE development support libraries and apps"
-IUSE="cvs reviewboard subversion +welcomepage"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
-
-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 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 qtgui)
- $(add_qt_dep qttest)
- $(add_qt_dep qtwebkit)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-libs/grantlee:5
- reviewboard? ( dev-libs/purpose )
- subversion? (
- dev-libs/apr:1
- dev-libs/apr-util:1
- dev-vcs/subversion
- )
- welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- $(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
- cvs? ( dev-vcs/cvs )
- !dev-util/kdevelop:4
- !dev-util/kdevplatform:4
-"
-
-REQUIRED_USE="test? ( welcomepage )"
-
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.0.1-unused-deps.patch"
- "${FILESDIR}/${P}-kconfig-5.30.patch"
-)
-
-src_prepare() {
- kde5_src_prepare
- # root tests subdirectory actually does not contain tests, installs stuff
- if ! use test; then
- sed -i -e "/add_subdirectory(tests)/ s/#DONOTCOMPILE //" \
- CMakeLists.txt || die "Failed to fix CMakeLists.txt"
- sed -i -e '1s/^/find_package(Qt5Test \$\{QT_MIN_VERSION\})\n/' \
- tests/CMakeLists.txt || die "Failed to fix tests/CMakeLists.txt"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_cvs=$(usex cvs)
- $(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
- $(cmake-utils_use_find_package subversion SubversionLibrary)
- $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
- )
-
- kde5_src_configure
-}
-
-pkg_postinst() {
- kde5_pkg_postinst
-
- if ! has_version "kde-apps/konsole" ; then
- echo
- elog "For konsole view, please install kde-apps/konsole"
- echo
- fi
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevplatform/files/, dev-util/kdevplatform/
@ 2017-05-06 20:05 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-05-06 20:05 UTC (permalink / raw
To: gentoo-commits
commit: 02c47af2995de37176a7c0f9fb5d27ee5845038f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 6 18:49:48 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 6 20:02:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c47af2
dev-util/kdevplatform: Drop old
Package-Manager: Portage-2.3.5, Repoman-2.3.1
dev-util/kdevplatform/Manifest | 2 -
.../files/kdevplatform-5.0.1-unused-deps.patch | 24 -----
dev-util/kdevplatform/kdevplatform-5.0.3.ebuild | 108 --------------------
dev-util/kdevplatform/kdevplatform-5.0.4.ebuild | 110 ---------------------
4 files changed, 244 deletions(-)
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index 2d6be285ab6..09bec9a9f59 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,3 +1 @@
-DIST kdevplatform-5.0.3.tar.xz 2018600 SHA256 643d1145e1948af221f9ae148d0a10809f3d89af4b97ff0d6c4d571004f46bd4 SHA512 ef48c0de41d1fe20269400eea4d2b04efa04cd62caaa987e6814c5513e843c3cac030479a8a0576b9fc532d7771827fcc4acda128448ff34dec9fbd55bd05d55 WHIRLPOOL 24cbc44345867b78b669993fcc8d1b680c051cce7c6ce91761de14877f05e6f983f562fe99d0ffa2586611d7daee8d66a2a530f7700ae2c44832f9d980069099
-DIST kdevplatform-5.0.4.tar.xz 2012332 SHA256 01abfcd71383048d017fe989ccce0e7590010a3975bbe6e161f55ababe2ad471 SHA512 659802a31d493507bf9b787a9dc4799fe35c38ebf5545afc0cde17bd41d9a84e9402c594e7e3dba908b0c2164183e5fa9de3b8056064add480707349d3a99d2f WHIRLPOOL e303a688f2fc4435b09f2723773622e3707d59f74661bf2d4b02ac90e867fcd4b7d0e2eadcca3019b2330ee06a307fce24aeed9354b0b5ce771ad5650b0c0d21
DIST kdevplatform-5.1.0.tar.xz 2048172 SHA256 f09f3b807c9d360b894bc4439cce5b1cb23ff0754941dd26abf45c33b731aedb SHA512 b94fcd1294855654c3183c7bc0dbfefd099cfaadeb44180788f439b11c0e61609863aae5a06776d9e6a4915c9768a794760c8a931678d9cc5d9c5e98560a7998 WHIRLPOOL 301620ff6ebc9012f0f7bce4d771b83b8b03ab75602cae0182a0b23173ff1d9382a0536c16acc512e5ee27bd01861b308b5388b853ac701ec83b44f3b913e714
diff --git a/dev-util/kdevplatform/files/kdevplatform-5.0.1-unused-deps.patch b/dev-util/kdevplatform/files/kdevplatform-5.0.1-unused-deps.patch
deleted file mode 100644
index 0a0d0f7332c..00000000000
--- a/dev-util/kdevplatform/files/kdevplatform-5.0.1-unused-deps.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 9d2423f20458d735454b9917b4b0f5e39a7929f5
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun Oct 16 09:36:03 2016 +0200
-
- Remove unused dependencies
-
- Qt5Quick, Qt5QuickWidgets only used in welcomepage
-
- REVIEW: 129196
-
-diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
-index 97666f3..118acf1 100644
---- a/shell/CMakeLists.txt
-+++ b/shell/CMakeLists.txt
-@@ -121,9 +121,6 @@ LINK_PUBLIC
- KDev::OutputView
- KDev::Interfaces
- LINK_PRIVATE
-- Qt5::Quick
-- Qt5::QuickWidgets
--
- KF5::GuiAddons
- KF5::ConfigWidgets
- KF5::IconThemes
diff --git a/dev-util/kdevplatform/kdevplatform-5.0.3.ebuild b/dev-util/kdevplatform/kdevplatform-5.0.3.ebuild
deleted file mode 100644
index 5b1492bb6d1..00000000000
--- a/dev-util/kdevplatform/kdevplatform-5.0.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.0"
-KDEBASE="kdevelop"
-KDE_TEST="forceoptional-recursive"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE development support libraries and apps"
-IUSE="cvs reviewboard subversion +welcomepage"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 ~x86"
-
-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 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 qtgui)
- $(add_qt_dep qttest)
- $(add_qt_dep qtwebkit)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-libs/grantlee:5
- reviewboard? ( dev-libs/purpose )
- subversion? (
- dev-libs/apr:1
- dev-libs/apr-util:1
- dev-vcs/subversion
- )
- welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- $(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
- cvs? ( dev-vcs/cvs )
- !dev-util/kdevelop:4
- !dev-util/kdevplatform:4
-"
-
-REQUIRED_USE="test? ( welcomepage )"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-5.0.1-unused-deps.patch" )
-
-src_prepare() {
- kde5_src_prepare
- # root tests subdirectory actually does not contain tests, installs stuff
- if ! use test; then
- sed -i -e "/add_subdirectory(tests)/ s/#DONOTCOMPILE //" \
- CMakeLists.txt || die "Failed to fix CMakeLists.txt"
- sed -i -e '1s/^/find_package(Qt5Test \$\{QT_MIN_VERSION\})\n/' \
- tests/CMakeLists.txt || die "Failed to fix tests/CMakeLists.txt"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_cvs=$(usex cvs)
- $(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
- $(cmake-utils_use_find_package subversion SubversionLibrary)
- $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
- )
-
- kde5_src_configure
-}
-
-pkg_postinst() {
- kde5_pkg_postinst
-
- if ! has_version "kde-apps/konsole" ; then
- echo
- elog "For konsole view, please install kde-apps/konsole"
- echo
- fi
-}
diff --git a/dev-util/kdevplatform/kdevplatform-5.0.4.ebuild b/dev-util/kdevplatform/kdevplatform-5.0.4.ebuild
deleted file mode 100644
index 1725935ca8a..00000000000
--- a/dev-util/kdevplatform/kdevplatform-5.0.4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.0"
-KDEBASE="kdevelop"
-KDE_TEST="forceoptional-recursive"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE development support libraries and apps"
-IUSE="cvs reviewboard subversion +welcomepage"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
-
-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 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 qtgui)
- $(add_qt_dep qttest)
- $(add_qt_dep qtwebkit)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-libs/grantlee:5
- reviewboard? ( dev-libs/purpose )
- subversion? (
- dev-libs/apr:1
- dev-libs/apr-util:1
- dev-vcs/subversion
- )
- welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- $(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
- cvs? ( dev-vcs/cvs )
- !dev-util/kdevelop:4
- !dev-util/kdevplatform:4
-"
-
-REQUIRED_USE="test? ( welcomepage )"
-
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.0.1-unused-deps.patch"
-)
-
-src_prepare() {
- kde5_src_prepare
- # root tests subdirectory actually does not contain tests, installs stuff
- if ! use test; then
- sed -i -e "/add_subdirectory(tests)/ s/#DONOTCOMPILE //" \
- CMakeLists.txt || die "Failed to fix CMakeLists.txt"
- sed -i -e '1s/^/find_package(Qt5Test \$\{QT_MIN_VERSION\})\n/' \
- tests/CMakeLists.txt || die "Failed to fix tests/CMakeLists.txt"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_cvs=$(usex cvs)
- $(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
- $(cmake-utils_use_find_package subversion SubversionLibrary)
- $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
- )
-
- kde5_src_configure
-}
-
-pkg_postinst() {
- kde5_pkg_postinst
-
- if ! has_version "kde-apps/konsole" ; then
- echo
- elog "For konsole view, please install kde-apps/konsole"
- echo
- fi
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevplatform/files/, dev-util/kdevplatform/
@ 2017-12-16 12:45 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2017-12-16 12:45 UTC (permalink / raw
To: gentoo-commits
commit: ff3e416ce736a3d9b62dcfb1c6176d98280f1fd1
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 12:43:54 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 12:45:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff3e416c
dev-util/kdevplatform: remove 5.1.1
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-util/kdevplatform/Manifest | 1 -
.../files/kdevplatform-5.1.1-tests-optional.patch | 229 ---------------------
dev-util/kdevplatform/kdevplatform-5.1.1.ebuild | 97 ---------
3 files changed, 327 deletions(-)
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index 08d97e172ec..d0c70a99794 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,2 +1 @@
-DIST kdevplatform-5.1.1.tar.xz 2047948 BLAKE2B 3fada2faaf824aab269c4b5f77e68d8d8ac9a9412d629915c9bfe6b099de1bad6f32ec8479cbc3e6a3124cd5ba3761ee682c1e73ee57ef1372bc6998e14716e8 SHA512 2780bc8f321be262bb9c2152fa8c58d52c93d48411122a5ce8d00f11becc8885c9697be7159cbcbb57c0a3f049912f96e67bc274af7ffa90cebf62eeba1eb572
DIST kdevplatform-5.1.2.tar.xz 2051776 BLAKE2B 3e7e91d5438b8a528e640671418399d302c8c9ee96d3e98cfe2ab68e64be63d7af98b1f4f11e512e9e79e17cddbd75731528d7dd9deab52c753a9f5be7dbce8e SHA512 cba58144b1c431789c6ceedee673f365af411a185944c5f6e2d8a8f46bf8bd817de0bbbb454d8ee6c2db28675a78940cb4293bb5e6430bdce77e4bd98e335889
diff --git a/dev-util/kdevplatform/files/kdevplatform-5.1.1-tests-optional.patch b/dev-util/kdevplatform/files/kdevplatform-5.1.1-tests-optional.patch
deleted file mode 100644
index 385e37c3865..00000000000
--- a/dev-util/kdevplatform/files/kdevplatform-5.1.1-tests-optional.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-Patch autogenerated by KDE_TEST=forceoptional-recursive and edited.
-
---- a/project/CMakeLists.txt 2017-08-19 13:39:27.223931674 +0200
-+++ b/project/CMakeLists.txt 2017-08-19 13:39:27.230931474 +0200
-@@ -38,7 +38,9 @@
- Qt5::Concurrent
- )
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- install(FILES
- interfaces/iprojectbuilder.h
---- a/sublime/CMakeLists.txt 2017-08-19 13:39:27.242931131 +0200
-+++ b/sublime/CMakeLists.txt 2017-08-19 13:39:27.249930930 +0200
-@@ -1,7 +1,9 @@
- add_definitions(-DTRANSLATION_DOMAIN=\"kdevplatform\")
-
- add_subdirectory(examples)
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(sublime_LIB_SRCS
- area.cpp
---- a/vcs/CMakeLists.txt 2017-08-19 13:39:27.258930673 +0200
-+++ b/vcs/CMakeLists.txt 2017-08-19 13:39:27.264930501 +0200
-@@ -1,7 +1,9 @@
- add_definitions(-DTRANSLATION_DOMAIN=\"kdevplatform\")
-
-+if(BUILD_TESTING)
- add_subdirectory(dvcs/tests)
- add_subdirectory(models/tests)
-+endif()
-
- set(KDevPlatformVcs_UIS
- widgets/vcscommitdialog.ui
---- a/shell/CMakeLists.txt 2017-08-19 13:39:27.274930215 +0200
-+++ b/shell/CMakeLists.txt 2017-08-19 13:39:27.281930015 +0200
-@@ -1,6 +1,8 @@
- add_definitions(-DTRANSLATION_DOMAIN=\"kdevplatform\")
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(KDevPlatformShell_LIB_SRCS
- workingsetcontroller.cpp
---- a/language/CMakeLists.txt 2017-08-19 13:39:27.292929700 +0200
-+++ b/language/CMakeLists.txt 2017-08-19 13:39:27.299929500 +0200
-@@ -6,11 +6,13 @@
- check_include_file("malloc.h" HAVE_MALLOC_H)
- check_symbol_exists(malloc_trim "malloc.h" HAVE_MALLOC_TRIM)
-
-+if(BUILD_TESTING)
- add_subdirectory(highlighting/tests)
- add_subdirectory(duchain/tests)
- add_subdirectory(backgroundparser/tests)
- add_subdirectory(codegen/tests)
- add_subdirectory(util/tests)
-+endif()
-
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/language-features.h.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/language-features.h )
---- a/language/codegen/tests/data/CMakeLists.txt 2017-08-19 13:39:27.309929214 +0200
-+++ b/language/codegen/tests/data/CMakeLists.txt 2017-08-19 13:39:27.316929014 +0200
-@@ -1 +1,3 @@
-+if(BUILD_TESTING)
- add_subdirectory(kdevcodegentest)
-+endif()
---- a/outputview/CMakeLists.txt 2017-08-19 13:39:27.326928728 +0200
-+++ b/outputview/CMakeLists.txt 2017-08-19 13:39:27.334928499 +0200
-@@ -31,4 +31,6 @@
- outputexecutejob.h
- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/outputview COMPONENT Devel)
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/serialization/CMakeLists.txt 2017-08-19 13:39:27.343928241 +0200
-+++ b/serialization/CMakeLists.txt 2017-08-19 13:39:27.351928013 +0200
-@@ -27,4 +27,6 @@
- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/serialization COMPONENT Devel
- )
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/util/CMakeLists.txt 2017-08-19 13:39:27.360927755 +0200
-+++ b/util/CMakeLists.txt 2017-08-19 13:39:27.368927526 +0200
-@@ -39,7 +39,9 @@
-
- add_subdirectory(duchainify)
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- ki18n_wrap_ui(KDevPlatformUtil_LIB_SRCS ${KDevPlatformUtil_LIB_US})
- kdevplatform_add_library(KDevPlatformUtil SOURCES ${KDevPlatformUtil_LIB_SRCS})
---- a/debugger/CMakeLists.txt 2017-08-19 13:39:27.377927269 +0200
-+++ b/debugger/CMakeLists.txt 2017-08-19 13:39:27.385927040 +0200
-@@ -63,4 +63,6 @@
- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/debugger/framestack COMPONENT Devel
- )
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/bazaar/CMakeLists.txt 2017-08-19 13:39:27.394926782 +0200
-+++ b/plugins/bazaar/CMakeLists.txt 2017-08-19 13:39:27.402926554 +0200
-@@ -16,4 +16,6 @@
- )
-
- add_subdirectory(icons)
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/standardoutputview/CMakeLists.txt 2017-08-19 13:39:27.410926325 +0200
-+++ b/plugins/standardoutputview/CMakeLists.txt 2017-08-19 13:39:27.418926096 +0200
-@@ -1,5 +1,7 @@
- add_definitions(-DTRANSLATION_DOMAIN=\"kdevstandardoutputview\")
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- ########### next target ###############
-
---- a/plugins/cvs/CMakeLists.txt 2017-08-19 13:39:27.426925867 +0200
-+++ b/plugins/cvs/CMakeLists.txt 2017-08-19 13:39:27.434925638 +0200
-@@ -1,5 +1,7 @@
- add_definitions(-DTRANSLATION_DOMAIN=\"kdevcvs\")
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
-
- ########### next target ###############
---- a/plugins/quickopen/CMakeLists.txt 2017-08-19 13:39:27.443925381 +0200
-+++ b/plugins/quickopen/CMakeLists.txt 2017-08-19 13:39:27.450925181 +0200
-@@ -1,5 +1,7 @@
- add_definitions(-DTRANSLATION_DOMAIN=\"kdevquickopen\")
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- set(kdevquickopen_PART_SRCS
- quickopenplugin.cpp
---- a/plugins/genericprojectmanager/CMakeLists.txt 2017-08-19 13:39:27.458924952 +0200
-+++ b/plugins/genericprojectmanager/CMakeLists.txt 2017-08-19 13:39:27.465924752 +0200
-@@ -1,6 +1,8 @@
- add_definitions(-DTRANSLATION_DOMAIN=\"kdevgenericprojectmanager\")
-
-+if(BUILD_TESTING)
- add_subdirectory(test)
-+endif()
-
- ########### next target ###############
-
---- a/plugins/subversion/CMakeLists.txt 2017-08-19 13:39:27.473924523 +0200
-+++ b/plugins/subversion/CMakeLists.txt 2017-08-19 13:39:27.479924351 +0200
-@@ -7,7 +7,9 @@
-
- string(REPLACE "-Wdocumentation" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- add_subdirectory(icons)
-
- include_directories(
---- a/plugins/grepview/CMakeLists.txt 2017-08-19 13:39:27.488924094 +0200
-+++ b/plugins/grepview/CMakeLists.txt 2017-08-19 13:39:27.494923922 +0200
-@@ -39,4 +39,6 @@
-
- ########### install files ###############
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/perforce/CMakeLists.txt 2017-08-19 13:39:27.503923665 +0200
-+++ b/plugins/perforce/CMakeLists.txt 2017-08-19 13:39:27.509923493 +0200
-@@ -1,5 +1,7 @@
- add_subdirectory(p4clientstub)
-+if(BUILD_TESTING)
- add_subdirectory(test)
-+endif()
-
- set(kdevperforce_PART_SRCS
- perforceplugin.cpp
---- a/plugins/filetemplates/CMakeLists.txt 2017-08-19 13:39:27.517923264 +0200
-+++ b/plugins/filetemplates/CMakeLists.txt 2017-08-19 13:39:27.523923092 +0200
-@@ -89,4 +89,6 @@
- KF5::NewStuff
- )
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/git/CMakeLists.txt 2017-08-19 13:39:27.531922863 +0200
-+++ b/plugins/git/CMakeLists.txt 2017-08-19 13:39:27.538922663 +0200
-@@ -1,6 +1,8 @@
- add_definitions(-DTRANSLATION_DOMAIN=\"kdevgit\")
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- add_subdirectory(icons)
-
- set(kdevgit_PART_SRCS
---- a/plugins/projectfilter/CMakeLists.txt 2017-08-19 13:39:27.546922435 +0200
-+++ b/plugins/projectfilter/CMakeLists.txt 2017-08-19 13:39:27.552922263 +0200
-@@ -26,4 +26,6 @@
- KDev::Interfaces
- )
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/problemreporter/CMakeLists.txt 2017-08-19 13:39:27.560922034 +0200
-+++ b/plugins/problemreporter/CMakeLists.txt 2017-08-19 13:39:27.567921834 +0200
-@@ -15,4 +15,6 @@
- kdevplatform_add_plugin(kdevproblemreporter JSON kdevproblemreporter.json SOURCES ${kdevproblemreporter_PART_SRCS})
- target_link_libraries(kdevproblemreporter KF5::TextEditor KF5::Parts KDev::Language KDev::Interfaces KDev::Util KDev::Project KDev::Shell)
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
diff --git a/dev-util/kdevplatform/kdevplatform-5.1.1.ebuild b/dev-util/kdevplatform/kdevplatform-5.1.1.ebuild
deleted file mode 100644
index 8f3366b15ea..00000000000
--- a/dev-util/kdevplatform/kdevplatform-5.1.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.1"
-KDEBASE="kdevelop"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE development support libraries and apps"
-IUSE="cvs reviewboard subversion +welcomepage"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-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 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 qtgui)
- $(add_qt_dep qttest)
- $(add_qt_dep qtwebkit)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-libs/grantlee:5
- reviewboard? ( dev-libs/purpose )
- subversion? (
- dev-libs/apr:1
- dev-libs/apr-util:1
- dev-vcs/subversion
- )
- welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- $(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
- cvs? ( dev-vcs/cvs )
- !dev-util/kdevelop:4
- !dev-util/kdevplatform:4
-"
-
-REQUIRED_USE="test? ( welcomepage )"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_cvs=$(usex cvs)
- $(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
- $(cmake-utils_use_find_package subversion SubversionLibrary)
- $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
- )
-
- kde5_src_configure
-}
-
-pkg_postinst() {
- kde5_pkg_postinst
-
- if ! has_version "kde-apps/konsole" ; then
- echo
- elog "For konsole view, please install kde-apps/konsole"
- echo
- fi
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-12-16 12:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-06 20:05 [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevplatform/files/, dev-util/kdevplatform/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2017-12-16 12:45 Michael Palimaka
2017-03-04 12:22 Johannes Huber
2017-02-18 23:33 Andreas Sturmlechner
2015-09-07 9:46 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox