public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/
@ 2015-09-07  9:46 Michael Palimaka
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2015-09-07  9:46 UTC (permalink / raw
  To: gentoo-commits

commit:     b493e34cc9c01319b90d5f292f5b87777918795c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  7 09:33:40 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=b493e34c

dev-util/kdevelop: remove old.

Package-Manager: portage-2.2.20.1

 dev-util/kdevelop/Manifest                         |  2 -
 ...kdevelop-4.5.2-kdevplatform-without-qjson.patch | 32 -------------
 dev-util/kdevelop/kdevelop-4.5.2.ebuild            | 55 ----------------------
 dev-util/kdevelop/kdevelop-4.6.0.ebuild            | 52 --------------------
 dev-util/kdevelop/kdevelop-4.7.1.ebuild            | 52 --------------------
 dev-util/kdevelop/metadata.xml                     |  1 -
 6 files changed, 194 deletions(-)

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 4735036..2f6dc57 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1 @@
-DIST kdevelop-4.5.2.tar.xz 4901660 SHA256 d157224a81c886cbe32d25600a29042a6fec1e0c535202dc85748cd15877fe30 SHA512 6bb1103e739f33f07e7c5278b284a5f991c9537acb94b7e103a449a7702ea97a0daf2d4fe7c24aeb45e6dfff3af7fc7accc67815283d28e20bf1c15206dbdc0e WHIRLPOOL 5de50b372b75f29118aef58114d5ac3f7a69b043a95c1233f11886412625ccaca6090bc28426eaf31cb26c30a0177bc4c7753b2fec26ae019120cde7fa9c4217
-DIST kdevelop-4.6.0.tar.xz 4867960 SHA256 1ee9e7b8c46f575dd29d920cfd6284130f2e738a2e1f52dfd97b075fab2e4c73 SHA512 0d2239f4fdf9b78e757161911e44cbf9543347cf291504adde8b5d46390993ba907b55aa0653ba3b0de3d9aad949a7c7135b6626c1e733f9f2b7cc013b09eb77 WHIRLPOOL 8cf4562fbe0a3d87bd5ab0c03b0907fa7777db2909f0511f065cc6ec52deb24a12cd7d234125d000803f4897ffada0b614b1a0eefcc3acec558d05192670ce91
 DIST kdevelop-4.7.1.tar.xz 4441540 SHA256 e3ad5377f53739a67216d37cda3f88c03f8fbb0c96e2a9ef4056df3c124e95c1 SHA512 a5fcdb4b83f6b9512350d73314df3ed8fd4f8a6544f358c480295f1f1f81799f18e30b44c24b73b4db244e63f01c29990854532688bf0a866c7fe83f924a48bd WHIRLPOOL 630802a540db94a6f56b0c15ff8910ea6168401f88aaf3e14476461d169f4e456f83444fbf8f9c927c7c196b0797c40d58972d1b05a912eeb18d8d5b1239e4f9

diff --git a/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch b/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch
deleted file mode 100644
index b456236..0000000
--- a/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit fb4234cd72ceebb200bef13234ea9c36c9a62046
-Author: Kevin Funk <kevin@kfunk.org>
-Date:   Sun Nov 3 22:09:56 2013 +0100
-
-    Check if kdevplatform has JSON support
-    
-    BUG: 327095
-
-diff --git a/languages/cpp/tests/CMakeLists.txt b/languages/cpp/tests/CMakeLists.txt
-index 84ce3ee..fbdd4db 100644
---- a/languages/cpp/tests/CMakeLists.txt
-+++ b/languages/cpp/tests/CMakeLists.txt
-@@ -55,7 +55,9 @@ target_link_libraries(buddiestest
- ########### next target ###############
- 
- find_package(QJSON)
--if(QJSON_FOUND)
-+# Also check that kdevplatform is built with JSON support
-+# see: https://bugs.kde.org/show_bug.cgi?id=327095
-+if(QJSON_FOUND AND KDEVPLATFORM_JSONTESTS_LIBRARIES)
-   set(cppfilestest_SRCS test_cppfiles.cpp)
-   kde4_add_unit_test(cppfilestest ${cppfilestest_SRCS})
-   configure_file("testfilepaths.h.cmake" "testfilepaths.h" ESCAPE_QUOTES)
-@@ -67,7 +69,7 @@ if(QJSON_FOUND)
-       ${KDEVPLATFORM_JSONTESTS_LIBRARIES}
-       kdev4cppduchain
-   )
--endif(QJSON_FOUND)
-+endif()
- 
- ########### next target ###############
- 

diff --git a/dev-util/kdevelop/kdevelop-4.5.2.ebuild b/dev-util/kdevelop/kdevelop-4.5.2.ebuild
deleted file mode 100644
index 58f0d40..0000000
--- a/dev-util/kdevelop/kdevelop-4.5.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
-pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
-VIRTUALX_REQUIRED=test
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug okteta qthelp reviewboard"
-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-util/kdevplatform-${KDEVPLATFORM_VERSION}[reviewboard?]
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	okteta? ( $(add_kdeapps_dep okteta) )
-	qthelp? ( dev-qt/qthelp:4 )
-	reviewboard? ( dev-libs/qjson )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kdebase-kioslaves)
-	dev-qt/qtdeclarative:4[webkit]
-	cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-RESTRICT="test"
-# see bug 366471
-
-PATCHES=( "${FILESDIR}/${P}-kdevplatform-without-qjson.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cmake)
-		$(cmake-utils_use_build cmake cmakebuilder)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_with okteta LibKasten)
-		$(cmake-utils_use_with okteta LibOkteta)
-		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qthelp)
-		$(cmake-utils_use_find_package reviewboard QJSON)
-	)
-
-	kde4-base_src_configure
-}

diff --git a/dev-util/kdevelop/kdevelop-4.6.0.ebuild b/dev-util/kdevelop/kdevelop-4.6.0.ebuild
deleted file mode 100644
index 9161fab..0000000
--- a/dev-util/kdevelop/kdevelop-4.6.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
-pl pt pt_BR ru sk sl sv th uk zh_CN zh_TW"
-VIRTUALX_REQUIRED=test
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug okteta qthelp"
-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/qjson
-	>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	okteta? ( $(add_kdeapps_dep okteta) )
-	qthelp? ( dev-qt/qthelp:4 )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kdebase-kioslaves)
-	dev-qt/qtdeclarative:4[webkit]
-	cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-RESTRICT="test"
-# see bug 366471
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cmake)
-		$(cmake-utils_use_build cmake cmakebuilder)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_with okteta LibKasten)
-		$(cmake-utils_use_with okteta LibOkteta)
-		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qthelp)
-	)
-
-	kde4-base_src_configure
-}

diff --git a/dev-util/kdevelop/kdevelop-4.7.1.ebuild b/dev-util/kdevelop/kdevelop-4.7.1.ebuild
deleted file mode 100644
index addf588..0000000
--- a/dev-util/kdevelop/kdevelop-4.7.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
-pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
-VIRTUALX_REQUIRED="test"
-EGIT_BRANCH="4.7"
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug +gdbui okteta qthelp"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-DEPEND="
-	dev-libs/qjson
-	dev-qt/qtdeclarative:4[webkit]
-	gdbui? (
-		$(add_kdebase_dep ksysguard)
-		$(add_kdebase_dep libkworkspace)
-	)
-	okteta? ( $(add_kdeapps_dep okteta) )
-	qthelp? ( dev-qt/qthelp:4 )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kdebase-kioslaves)
-	cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-RESTRICT="test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build cmake)
-		$(cmake-utils_use_build cmake cmakebuilder)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_with gdbui KDE4Workspace)
-		$(cmake-utils_use_with okteta LibKasten)
-		$(cmake-utils_use_with okteta LibOkteta)
-		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qthelp)
-	)
-
-	kde4-base_src_configure
-}

diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index ced196a..2c5525e 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -7,6 +7,5 @@
 	<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
 	<flag name="okteta">Enable hex editor plugin</flag>
 	<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
-	<flag name="reviewboard">Enable reviewboard support</flag>
 </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/
@ 2016-10-30 18:09 Johannes Huber
  0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2016-10-30 18:09 UTC (permalink / raw
  To: gentoo-commits

commit:     3501a5903cc23757f0f1a95d3372735048fe75e3
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 18:01:39 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 18:09:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3501a590

dev-util/kdevelop: Rename patch

Package-Manager: portage-2.3.2

 ...develop-ninja-optional.patch => kdevelop-5.0.2-ninja-optional.patch} | 0
 dev-util/kdevelop/kdevelop-5.0.2.ebuild                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/kdevelop/files/kdevelop-ninja-optional.patch b/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch
similarity index 100%
rename from dev-util/kdevelop/files/kdevelop-ninja-optional.patch
rename to dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch

diff --git a/dev-util/kdevelop/kdevelop-5.0.2.ebuild b/dev-util/kdevelop/kdevelop-5.0.2.ebuild
index f0231ec..783a48f 100644
--- a/dev-util/kdevelop/kdevelop-5.0.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.0.2.ebuild
@@ -76,7 +76,7 @@ RESTRICT+=" test"
 # see bug 366471
 
 PATCHES=(
-	"${FILESDIR}/${PN}-ninja-optional.patch"
+	"${FILESDIR}/${P}-ninja-optional.patch"
 	"${FILESDIR}/${P}-github-crash.patch"
 )
 


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/
@ 2016-12-01 18:26 Johannes Huber
  0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2016-12-01 18:26 UTC (permalink / raw
  To: gentoo-commits

commit:     ae1e1766d93b19965aa432133304d02bd006392d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 18:25:21 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 18:26:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae1e1766

dev-util/kdevelop: Remove 5.0.2

Package-Manager: portage-2.3.2

 dev-util/kdevelop/Manifest                         |  1 -
 .../files/kdevelop-5.0.2-github-crash.patch        | 39 ---------
 dev-util/kdevelop/kdevelop-5.0.2.ebuild            | 97 ----------------------
 3 files changed, 137 deletions(-)

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 2684623..130783f 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,4 +1,3 @@
 DIST kdevelop-4.7.2.tar.xz 4441896 SHA256 5801a38a9abfebead18b74c0a0f5a6d68118b297c96ef1e2f75c8bfae3463b19 SHA512 f05643f185a02ce9f07b5e48b0cf61de5e0e2ed892b4fbe4edf749319c37466a2e904c7b64604cdff3b1c5c20e384ea23e7fdd1e30ed15642fd70f5e172e570a WHIRLPOOL 2caf928f84e22aacfa2691fc7a2752f84a38cdfccc4b3c176c04c0f81445a25548f7723ee57da293a921f7934789386bce7e4c50751cd4d61da2d15c39490695
 DIST kdevelop-4.7.3.tar.bz2 4826588 SHA256 9db388d1c8274da7d168c13db612c7e94ece7815757b945b0aa0371620a06b35 SHA512 e6d410bda001cfaed7c15383497992d6aad0a878c4c6f786c154dc9de581139baf05e592a8355481dd25c7f8d3b52b3a9516187e1e85c1f229ba32bc7cc57636 WHIRLPOOL 521b58b688344884ed178b9f7eaa87f11c0eb7e631a83c33ba4b6b23ae49ca866da667e2e2d726ad17ea3bf311b66a2f2695627d50c4dbbed8074bb338270790
-DIST kdevelop-5.0.2.tar.xz 4994268 SHA256 9b017901167723230dee8b565cdc7b0e61762415ffcc0a32708f04f7ab668666 SHA512 a92d0c795442642f2bd7db9e37c3f13d67b19e9bb3d5e076ba409ae271062d3e022e284b5a2ce6be0b01d753c5ff4a3522a8149ab6f5f007bc6f24e7bd68e6db WHIRLPOOL 26152f4f78421e45d5ac6a5c8058a155cb5da38c8b348afeceb8868fe11d984d020f2e8b993f617209a118fc959684890bb78b5f0173f14e0d085d3975c319ca
 DIST kdevelop-5.0.3.tar.xz 5004500 SHA256 17a58dfc38b853c6c5987084e8973b4f7f5015a6c2c20f94c2a9f96b0c13f601 SHA512 5fa799412c5a847bdefeca3f339c3b17b7693761209f646b6aee35734abded234d871ec9763079db7a4236047d68b3ab9a89ac22a0abb8b7a23d4c67cf749444 WHIRLPOOL fa1688d2dfd5d94cf71ae397c9b6c96f0e8c0999c714a41932e9aecd9bea40159f9e39d183cac23a509f63666445b026e05905ddfc176e1e7673f78c9651438a

diff --git a/dev-util/kdevelop/files/kdevelop-5.0.2-github-crash.patch b/dev-util/kdevelop/files/kdevelop-5.0.2-github-crash.patch
deleted file mode 100644
index 09cb944..00000000
--- a/dev-util/kdevelop/files/kdevelop-5.0.2-github-crash.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Kevin Funk <kfunk@kde.org>
-Date: Tue, 18 Oct 2016 07:47:28 +0000
-Subject: GitHub: Don't crash when Git plugin not loaded
-X-Git-Url: http://quickgit.kde.org/?p=kdevelop.git&a=commitdiff&h=3afcc322a94878c8f5f662c1c5795b75a3bf62a5
----
-GitHub: Don't crash when Git plugin not loaded
-
-BUG: 331883
-FIXED-IN: 5.0.3
----
-
-
---- a/providers/ghprovider/ghproviderwidget.cpp
-+++ b/providers/ghprovider/ghproviderwidget.cpp
-@@ -91,17 +91,20 @@
-     if (!pos.isValid())
-         return nullptr;
- 
-+    auto plugin = ICore::self()->pluginController()->pluginForExtension("org.kdevelop.IBasicVersionControl", "kdevgit");
-+    if (!plugin) {
-+        KMessageBox::error(0, i18n("The Git plugin could not be loaded which is required to import a Github project."), i18n("Github Provider Error"));
-+        return nullptr;
-+    }
-+
-     QString url = pos.data(ProviderModel::VcsLocationRole).toString();
-     if (m_account->validAccount())
-       url = "https://" + m_account->token() + "@" + url.mid(8);
-     QUrl real = QUrl(url);
-     VcsLocation loc(real);
- 
--    auto plugin = ICore::self()->pluginController()->pluginForExtension("org.kdevelop.IBasicVersionControl", "kdevgit");
--    Q_ASSERT(plugin);
-     auto vc = plugin->extension<IBasicVersionControl>();
-     Q_ASSERT(vc);
--
-     return vc->createWorkingCopy(loc, dest);
- }
- 
-

diff --git a/dev-util/kdevelop/kdevelop-5.0.2.ebuild b/dev-util/kdevelop/kdevelop-5.0.2.ebuild
deleted file mode 100644
index 783a48f..00000000
--- a/dev-util/kdevelop/kdevelop-5.0.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGIT_BRANCH="5.0"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cxx +gdbui +ninja okteta +plasma +qmake qthelp"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(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 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 knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=dev-util/kdevplatform-${PV}:5
-	x11-misc/shared-mime-info
-	cxx? ( >=sys-devel/clang-3.5.0 )
-	gdbui? ( $(add_plasma_dep libksysguard) )
-	okteta? ( $(add_kdeapps_dep okteta) )
-	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	qthelp? ( $(add_qt_dep qthelp) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	>=sys-devel/gdb-7.0[python]
-	ninja? ( dev-util/ninja )
-	!dev-util/kdevelop:4
-	!dev-util/kdevelop-clang
-	!dev-util/kdevelop-qmake
-	!dev-util/kdevelop-qmljs
-	!<kde-apps/kapptemplate-16.04.0
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-PATCHES=(
-	"${FILESDIR}/${P}-ninja-optional.patch"
-	"${FILESDIR}/${P}-github-crash.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DLEGACY_CPP_SUPPORT=$(usex !cxx)
-		-DBUILD_cpp=OFF
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		-DBUILD_ninjabuilder=$(usex ninja)
-		$(cmake-utils_use_find_package okteta OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		-DBUILD_qthelp=$(usex qthelp)
-	)
-
-	kde5_src_configure
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/
@ 2017-12-16 12:45 Michael Palimaka
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2017-12-16 12:45 UTC (permalink / raw
  To: gentoo-commits

commit:     268f7967595a527c8ae82c13ae90c71794770cd0
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 12:42:50 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=268f7967

dev-util/kdevelop: remove 5.1.1

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 dev-util/kdevelop/Manifest                         |  1 -
 .../files/kdevelop-5.0.2-ninja-optional.patch      | 11 ---
 dev-util/kdevelop/kdevelop-5.1.1.ebuild            | 92 ----------------------
 dev-util/kdevelop/metadata.xml                     |  2 -
 4 files changed, 106 deletions(-)

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 5e788264029..2f03ea5aa27 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,2 @@
-DIST kdevelop-5.1.1.tar.xz 4685416 BLAKE2B 423e18e5d6f87305b5261c5616344a148a081759230903e77196b1dbaf0c5a3835609505004db925596e037c89901d81f8200efa90b75ae66b7dfb3b38f6fefe SHA512 e2c1a4885bab9815341a53da6a98dd4939b7128eee174e79c616cc020f464362a2730508b3a8d66f00e4ea95f2098b92d6328b43b9f22bd77145bbe6ce096529
 DIST kdevelop-5.1.2.tar.xz 4688696 BLAKE2B 6ad2fa04bbeba54b92cfc3be48d21ad6bd22158b588e0342a5a00d7f3122f9261e40103fdfa622ba29114e86f6b36d335ffacf56de14ec430ff6a7eb23590bd5 SHA512 3f359587c7dca3ad4d0db4940cc9557bb61647672432f21c21d6f493e5e5c96e026c7dc155b66a7be4d20b06972fe961d8a3dda28e8aa273d0a4044a6242e39b
 DIST kdevelop-5.2.1.tar.xz 6653576 BLAKE2B 800ab50b62ca70e54d66bc7956b257e6d14f5a2c2fda7c7720aa0ddf1dad1dd2d7f993103c7f4caed0fc78734643a89f2710cb598319695d9ea6d79f62fd6305 SHA512 ee4a7f93c4f5168e6c63ca415a1f757cb7d2615370201700db16abdf1799e5c12421e382f5937be4a65af026a00df679b745fc4dab4d73974275d95d53173cd0

diff --git a/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch b/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch
deleted file mode 100644
index a60da91df6d..00000000000
--- a/dev-util/kdevelop/files/kdevelop-5.0.2-ninja-optional.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/projectbuilders/CMakeLists.txt b/projectbuilders/CMakeLists.txt
-index 80d7866..825ca8b 100644
---- a/projectbuilders/CMakeLists.txt
-+++ b/projectbuilders/CMakeLists.txt
-@@ -1,5 +1,5 @@
- add_subdirectory(makebuilder)
--add_subdirectory(ninjabuilder)
-+ecm_optional_add_subdirectory(ninjabuilder)
- ecm_optional_add_subdirectory(cmakebuilder)
- if (KDevelop-PG-Qt_FOUND)
-     ecm_optional_add_subdirectory(qmakebuilder)

diff --git a/dev-util/kdevelop/kdevelop-5.1.1.ebuild b/dev-util/kdevelop/kdevelop-5.1.1.ebuild
deleted file mode 100644
index 681bc324503..00000000000
--- a/dev-util/kdevelop/kdevelop-5.1.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.1"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+gdbui +ninja okteta +plasma +qmake qthelp"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(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 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 knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=dev-util/kdevplatform-${PV}:5
-	>=sys-devel/clang-3.5.0:*
-	x11-misc/shared-mime-info
-	gdbui? ( $(add_plasma_dep libksysguard) )
-	okteta? ( $(add_kdeapps_dep okteta) )
-	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	qthelp? ( $(add_qt_dep qthelp) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	>=sys-devel/gdb-7.0[python]
-	ninja? ( dev-util/ninja )
-	!dev-util/kdevelop:4
-	!dev-util/kdevelop-clang
-	!dev-util/kdevelop-cppcheck
-	!dev-util/kdevelop-qmake
-	!dev-util/kdevelop-qmljs
-	!<kde-apps/kapptemplate-16.04.0
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-PATCHES=( "${FILESDIR}/${PN}-5.0.2-ninja-optional.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		-DBUILD_ninjabuilder=$(usex ninja)
-		$(cmake-utils_use_find_package okteta OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		-DBUILD_qthelp=$(usex qthelp)
-	)
-
-	kde5_src_configure
-}

diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index 75711dc9844..a5bf469b2fb 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -7,10 +7,8 @@
 	</maintainer>
 	<use>
 		<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
-		<flag name="ninja">Enable support for Ninja build system</flag>
 		<flag name="okteta">Enable hex editor plugin via <pkg>kde-apps/okteta</pkg></flag>
 		<flag name="qmake">Enable support for QMake build system</flag>
-		<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
 		<flag name="reviewboard">Enable reviewboard support</flag>
 		<flag name="webkit">Enable deprecated <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg> for integrated documentation</flag>
 		<flag name="welcomepage">Enable welcome page, requires <pkg>dev-qt/qtdeclarative</pkg></flag>


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/
@ 2019-10-26 22:42 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-10-26 22:42 UTC (permalink / raw
  To: gentoo-commits

commit:     12c30df64845559af3367d4d8efe957e29648fd5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 26 22:13:40 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 26 22:41:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12c30df6

dev-util/kdevelop: Drop 5.3.3

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/kdevelop/Manifest                         |   1 -
 .../files/kdevelop-5.3.3-missing-header.patch      |  25 ----
 dev-util/kdevelop/kdevelop-5.3.3.ebuild            | 133 ---------------------
 3 files changed, 159 deletions(-)

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 9df3f52d71a..831ef01b91c 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,2 @@
-DIST kdevelop-5.3.3.tar.xz 6977420 BLAKE2B 8cccce2b7473551dc4ee9b9b06e8777e7f98869870ed7ee797b0e3a7c27f68d75b7af0f030dc9b0302a44ff246f69ec9125994cd72e6020e2778ac55f6d593fb SHA512 a089763045f02ef3167fab1f663503cc7a6e29cd8a42d3caa8b3a71fc1b2150162504bf4404ea070f73b3786a7389b6ee5af9ff922515445b57a0041b07e7d5d
 DIST kdevelop-5.4.2.tar.xz 7006096 BLAKE2B 105f7377e960f6012e9e976a14475b67e15038cb376c6ec499ef33f17c59ff1e068866deafb24aa1392bf0a3c833cdffeac122262dd38dc45eeca8fea69f0df8 SHA512 de25d70f2e82f61ef95ce2c6289146c52c368e93a3d23b17a2b95d14e64b599b64af32c2de2501c236f2954d981709c168fecddb4dbcf5425014d6a6e938d53b
 DIST kdevelop-5.4.3.tar.xz 7010496 BLAKE2B 2f6aa0073321ad1e6c6eb905879c628717927957e60c26b353b691560438afdbd42c7803c227e8de8ada0fca6da38ef02664afa0fc3e9d372d53b2d879b64665 SHA512 f21f282ca772fea6a4bf8f000ddd71386c98c17956c151d71b824a5a9b30223530015e3a73979856580dc318caa9da7bae6b3cf914ffa8aa7ea56cacded1c524

diff --git a/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch b/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch
deleted file mode 100644
index 39b1122f718..00000000000
--- a/dev-util/kdevelop/files/kdevelop-5.3.3-missing-header.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 125259eab4ddc525e816a9479d93038bffb73353 Mon Sep 17 00:00:00 2001
-From: Tomaz Canabrava <tcanabrava@kde.org>
-Date: Thu, 18 Jul 2019 18:07:39 +0200
-Subject: Add missing include
-
-(cherry picked from commit 8a3d8936fc4fce7eee1bcd62c0eb473ef908268d)
----
- kdevplatform/shell/mainwindow_p.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kdevplatform/shell/mainwindow_p.h b/kdevplatform/shell/mainwindow_p.h
-index 3020957..1e915a0 100644
---- a/kdevplatform/shell/mainwindow_p.h
-+++ b/kdevplatform/shell/mainwindow_p.h
-@@ -25,7 +25,7 @@ Boston, MA 02110-1301, USA.
- #include <QObject>
- #include <QPointer>
- #include <QWidget>
--
-+#include <QMap>
- #include <KXMLGUIClient>
- 
- #include <language/util/navigationtooltip.h>
--- 
-cgit v1.1

diff --git a/dev-util/kdevelop/kdevelop-5.3.3.ebuild b/dev-util/kdevelop/kdevelop-5.3.3.ebuild
deleted file mode 100644
index 0e818dc362f..00000000000
--- a/dev-util/kdevelop/kdevelop-5.3.3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
-LICENSE="GPL-2 LGPL-2"
-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)
-	dev-libs/grantlee:5
-	>=sys-devel/clang-3.8.0:=
-	gdbui? ( $(add_plasma_dep libksysguard) )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( $(add_frameworks_dep purpose) )
-	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') )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	$(add_qt_dep qdbus)
-	dev-util/ninja
-	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
-	!dev-util/kdevplatform
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package hex OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake-utils_use_find_package reviewboard KF5Purpose)
-		$(cmake-utils_use_find_package subversion SubversionLibrary)
-		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
-	)
-
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-
-	if ! has_version "dev-util/clazy" ; then
-		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
-	fi
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/
@ 2023-03-26 22:57 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-03-26 22:57 UTC (permalink / raw
  To: gentoo-commits

commit:     51211f99f14f80bc92049cbbf1717a39c50887b2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 22:55:54 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 22:56:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51211f99

dev-util/kdevelop: fix build with Clang 16, use llvm.eclass

Closes: https://bugs.gentoo.org/902101
Thanks-to: Michael Uleysky <uleysky <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../kdevelop/files/kdevelop-22.12.3-clang16.patch  | 24 ++++++++++++++++++++++
 ...p-22.12.3.ebuild => kdevelop-22.12.3-r1.ebuild} | 18 ++++++++++------
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch b/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch
new file mode 100644
index 000000000000..38676cc16473
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/902101
+--- a/cmake/modules/FindClang.cmake
++++ b/cmake/modules/FindClang.cmake
+@@ -97,6 +97,8 @@
+   # dito for git
+   string(REPLACE "git" "" CLANG_VERSION_CLEAN "${CLANG_VERSION}")
+ 
++  string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_STRIPPED "${CLANG_VERSION}")
++  string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_CLEAN_STRIPPED "${CLANG_VERSION_CLEAN}")
+   find_path(CLANG_BUILTIN_DIR
+             # cpuid.h because it is defined in ClangSupport constructor as valid clang builtin dir indicator
+             NAMES "cpuid.h"
+@@ -106,6 +108,10 @@
+                           "../../../clang/${CLANG_VERSION}/include"
+                           "clang/${CLANG_VERSION_CLEAN}/include"
+                           "../../../clang/${CLANG_VERSION_CLEAN}/include"
++                          "clang/${CLANG_VERSION_STRIPPED}/include"
++                          "../../../clang/${CLANG_VERSION_STRIPPED}/include"
++                          "clang/${CLANG_VERSION_CLEAN_STRIPPED}/include"
++                          "../../../clang/${CLANG_VERSION_CLEAN_STRIPPED}/include"
+             NO_DEFAULT_PATH
+   )
+ 
+

diff --git a/dev-util/kdevelop/kdevelop-22.12.3.ebuild b/dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild
similarity index 93%
rename from dev-util/kdevelop/kdevelop-22.12.3.ebuild
rename to dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild
index cb912cc23d10..6788033f46fe 100644
--- a/dev-util/kdevelop/kdevelop-22.12.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild
@@ -7,10 +7,11 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 KDE_ORG_CATEGORY="kdevelop"
 KFMIN=5.101.0
+LLVM_MAX_SLOT=16
 QTMIN=5.15.5
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit ecm gear.kde.org optfeature
+inherit ecm gear.kde.org llvm optfeature
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
 HOMEPAGE="https://www.kdevelop.org/"
@@ -65,7 +66,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
 	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=sys-devel/clang-6.0:=
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
 	gdbui? ( kde-plasma/libksysguard:5= )
 	hex? ( app-editors/okteta:5 )
 	plasma? (
@@ -95,12 +96,17 @@ RDEPEND="${COMMON_DEPEND}
 	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
 "
 
-src_configure() {
-	local clang_version=$(best_version sys-devel/clang)
-	local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
+PATCHES=(
+	"${FILESDIR}"/${PN}-22.12.3-clang16.patch
+)
+
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
 
+src_configure() {
 	local mycmakeargs=(
-		-DLLVM_ROOT=${llvm_root}
+		-DLLVM_ROOT="$(get_llvm_prefix ${LLVM_SLOT})"
 		$(cmake_use_find_package gdbui KSysGuard)
 		-DBUILD_executeplasmoid=$(usex plasma)
 		$(cmake_use_find_package plasma KF5Plasma)


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/
@ 2023-04-29 14:21 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2023-04-29 14:21 UTC (permalink / raw
  To: gentoo-commits

commit:     5de02490fb974329506bbffd61e3830532a6347e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 12:48:02 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 14:21:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de02490

dev-util/kdevelop: drop 22.12.3, 22.12.3-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/kdevelop/Manifest                         |   1 -
 .../kdevelop/files/kdevelop-22.12.3-clang16.patch  |  24 ----
 dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild       | 136 ---------------------
 dev-util/kdevelop/kdevelop-22.12.3.ebuild          | 130 --------------------
 4 files changed, 291 deletions(-)

diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index a88049a8ea61..469e9c1321b0 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,2 +1 @@
-DIST kdevelop-22.12.3.tar.xz 8652864 BLAKE2B a60de8549ccc949811c6c755c729b51711b2a7b0dbd8cf4c8f853623f27f42328dc82f732dd45abf7bfbf248841c72a55f1799c19110d2dd497c96fe5e7ef9ed SHA512 465bf3639e3fd61058af1217904fe0904d7c380e1f073dcb3af28d5758bba1d477e2f1313c61c233cf2acef4362c5380b30bcae6a02eb704a8a3fdf80ddfd75a
 DIST kdevelop-23.04.0.tar.xz 8656872 BLAKE2B 10127854f56fc6d07e8ed974d5d9aacd33c74f6bc21c3ef77541ed446ae33562551708b8b46796bbd3cdc423642d3a6a07f719e81d56c7fd108fa30b671eae5c SHA512 1660f5e819302e3783358556c36d09197f5de4fc4acf25c597e86982ea0ff419f6fdabb718ed74e4a56d3cf9623758c32978f7a12afe0a619a97b626c8c04173

diff --git a/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch b/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch
deleted file mode 100644
index 38676cc16473..000000000000
--- a/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/902101
---- a/cmake/modules/FindClang.cmake
-+++ b/cmake/modules/FindClang.cmake
-@@ -97,6 +97,8 @@
-   # dito for git
-   string(REPLACE "git" "" CLANG_VERSION_CLEAN "${CLANG_VERSION}")
- 
-+  string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_STRIPPED "${CLANG_VERSION}")
-+  string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_CLEAN_STRIPPED "${CLANG_VERSION_CLEAN}")
-   find_path(CLANG_BUILTIN_DIR
-             # cpuid.h because it is defined in ClangSupport constructor as valid clang builtin dir indicator
-             NAMES "cpuid.h"
-@@ -106,6 +108,10 @@
-                           "../../../clang/${CLANG_VERSION}/include"
-                           "clang/${CLANG_VERSION_CLEAN}/include"
-                           "../../../clang/${CLANG_VERSION_CLEAN}/include"
-+                          "clang/${CLANG_VERSION_STRIPPED}/include"
-+                          "../../../clang/${CLANG_VERSION_STRIPPED}/include"
-+                          "clang/${CLANG_VERSION_CLEAN_STRIPPED}/include"
-+                          "../../../clang/${CLANG_VERSION_CLEAN_STRIPPED}/include"
-             NO_DEFAULT_PATH
-   )
- 
-

diff --git a/dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild b/dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild
deleted file mode 100644
index 6788033f46fe..000000000000
--- a/dev-util/kdevelop/kdevelop-22.12.3-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KFMIN=5.101.0
-LLVM_MAX_SLOT=16
-QTMIN=5.15.5
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm gear.kde.org llvm optfeature
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5/57" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
-IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-# see bug 366471
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qthelp-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-util/astyle-3.1:=
-	kde-apps/libkomparediff2:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
-	gdbui? ( kde-plasma/libksysguard:5= )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		>=kde-frameworks/krunner-${KFMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qdbus-${QTMIN}:*
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	dev-util/ninja
-	kde-apps/kapptemplate:5
-	kde-apps/kio-extras:5
-	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-22.12.3-clang16.patch
-)
-
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_ROOT="$(get_llvm_prefix ${LLVM_SLOT})"
-		$(cmake_use_find_package gdbui KSysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake_use_find_package plasma KF5Plasma)
-		$(cmake_use_find_package hex OktetaKastenControllers)
-		$(cmake_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake_use_find_package reviewboard KF5Purpose)
-		$(cmake_use_find_package subversion SubversionLibrary)
-	)
-
-	use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "konsole view" kde-apps/konsole
-		optfeature "static C++ Qt code analysis" dev-util/clazy
-		optfeature "static C/C++ code analysis" dev-util/cppcheck
-		optfeature "heap memory profiling" "dev-util/heaptrack[gui]"
-		optfeature "meson project manager plugin" dev-util/meson
-		optfeature "formatting configurations via customscript plugin" dev-util/indent
-		optfeature "formatting configurations via customscript plugin" dev-util/uncrustify
-	fi
-	ecm_pkg_postinst
-}

diff --git a/dev-util/kdevelop/kdevelop-22.12.3.ebuild b/dev-util/kdevelop/kdevelop-22.12.3.ebuild
deleted file mode 100644
index 4d314ca3def7..000000000000
--- a/dev-util/kdevelop/kdevelop-22.12.3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KFMIN=5.101.0
-QTMIN=5.15.5
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5/57" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
-IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
-
-# see bug 366471
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qthelp-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-util/astyle-3.1:=
-	kde-apps/libkomparediff2:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=sys-devel/clang-6.0:=
-	gdbui? ( kde-plasma/libksysguard:5= )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		>=kde-frameworks/krunner-${KFMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qdbus-${QTMIN}:*
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	dev-util/ninja
-	kde-apps/kapptemplate:5
-	kde-apps/kio-extras:5
-	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
-"
-
-src_configure() {
-	local clang_version=$(best_version sys-devel/clang)
-	local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
-
-	local mycmakeargs=(
-		-DLLVM_ROOT=${llvm_root}
-		$(cmake_use_find_package gdbui KSysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake_use_find_package plasma KF5Plasma)
-		$(cmake_use_find_package hex OktetaKastenControllers)
-		$(cmake_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake_use_find_package reviewboard KF5Purpose)
-		$(cmake_use_find_package subversion SubversionLibrary)
-	)
-
-	use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "konsole view" kde-apps/konsole
-		optfeature "static C++ Qt code analysis" dev-util/clazy
-		optfeature "static C/C++ code analysis" dev-util/cppcheck
-		optfeature "heap memory profiling" "dev-util/heaptrack[gui]"
-		optfeature "meson project manager plugin" dev-util/meson
-		optfeature "formatting configurations via customscript plugin" dev-util/indent
-		optfeature "formatting configurations via customscript plugin" dev-util/uncrustify
-	fi
-	ecm_pkg_postinst
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-04-29 14:21 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-29 14:21 [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2023-03-26 22:57 Sam James
2019-10-26 22:42 Andreas Sturmlechner
2017-12-16 12:45 Michael Palimaka
2016-12-01 18:26 Johannes Huber
2016-10-30 18:09 Johannes Huber
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