summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-09-01 00:29:29 +1000
committerMichael Palimaka <kensington@gentoo.org>2016-09-01 00:30:07 +1000
commitcae4c2337cff0a927842a57f1b6bee520fd87a9c (patch)
tree55644512895d52ff5a9f18df70b64f1b97b29ea2 /dev-util
parent661f2a7f99f4c0268d8fbec256ed4b3d08342906 (diff)
downloadkde-cae4c2337cff0a927842a57f1b6bee520fd87a9c.tar.gz
kde-cae4c2337cff0a927842a57f1b6bee520fd87a9c.tar.bz2
kde-cae4c2337cff0a927842a57f1b6bee520fd87a9c.zip
dev-util/kdevelop: moved to main tree
Package-Manager: portage-2.3.0
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/kdevelop/Manifest1
-rw-r--r--dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch47
-rw-r--r--dev-util/kdevelop/kdevelop-5.0.0.ebuild99
3 files changed, 0 insertions, 147 deletions
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
deleted file mode 100644
index b9ff9991923..00000000000
--- a/dev-util/kdevelop/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kdevelop-5.0.tar.xz 4969604 SHA256 5e034b8670f4ba13ccb2948c28efa0b54df346e85b648078698cca8974ea811c SHA512 dc16785593ed11dcd6ff96a0fddd4f639abbcaaa3c139d703a1af267c8e0f75c45b866b9542c10c79eb4351e811edcc5e466a5ce7acbdecac60f4c28747e66b6 WHIRLPOOL e0e3f66b79b302d30fc006714a3d10b01bdd8d098e87aa3dc5f4e5556ce2214d9d5b1bee9fc189a12fab71e590134bdb9fc4e683c0c0263f7fbee899f7470f8d
diff --git a/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch b/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch
deleted file mode 100644
index 9b15fe95482..00000000000
--- a/dev-util/kdevelop/files/kdevelop-5.0.0-fix-cpp.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Milian Wolff <mail@milianw.de>
-Date: Mon, 22 Aug 2016 10:47:26 +0000
-Subject: Fix compile
-X-Git-Url: http://quickgit.kde.org/?p=kdevelop.git&a=commitdiff&h=f4b5b7538be64328cf8462ee438caaac6c0907aa
----
-Fix compile
-
-BUG: 367659
----
-
-
---- a/languages/cpp/cppduchain/cppducontext.cpp
-+++ b/languages/cpp/cppduchain/cppducontext.cpp
-@@ -39,7 +39,8 @@
- REGISTER_DUCHAIN_ITEM_WITH_DATA(CppNormalDUContext, DUContextData);
-
- template<>
--QWidget* CppDUContext<TopDUContext>::createNavigationWidget( Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix ) const {
-+QWidget* CppDUContext<TopDUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix,
-+ AbstractNavigationWidget::DisplayHints /*hints*/) const {
- if( decl == 0 ) {
- Path path( url().str() );
- IncludeItem i;
-@@ -55,7 +56,8 @@
- }
-
- template<>
--QWidget* CppDUContext<DUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix) const {
-+QWidget* CppDUContext<DUContext>::createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix,
-+ AbstractNavigationWidget::DisplayHints /*hints*/) const {
- if( decl == 0 ) {
- if( owner() )
- return new NavigationWidget( DeclarationPointer(owner()), TopDUContextPointer(topContext ? topContext : this->topContext()), htmlPrefix, htmlSuffix );
-
---- a/languages/cpp/cppduchain/cppducontext.h
-+++ b/languages/cpp/cppduchain/cppducontext.h
-@@ -652,7 +652,8 @@
- return instantiateDeclarationAndContext( surroundingContext, source, this, info, 0, 0 );
- }
-
-- virtual QWidget* createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix) const override;
-+ virtual QWidget* createNavigationWidget(Declaration* decl, TopDUContext* topContext, const QString& htmlPrefix, const QString& htmlSuffix,
-+ KDevelop::AbstractNavigationWidget::DisplayHints hints = KDevelop::AbstractNavigationWidget::NoHints) const override;
-
- enum {
- Identity = BaseContext::Identity + 50
-
diff --git a/dev-util/kdevelop/kdevelop-5.0.0.ebuild b/dev-util/kdevelop/kdevelop-5.0.0.ebuild
deleted file mode 100644
index c5338246cab..00000000000
--- a/dev-util/kdevelop/kdevelop-5.0.0.ebuild
+++ /dev/null
@@ -1,99 +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 +cmake +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}/${PN}-ninja-optional.patch"
- "${FILESDIR}/${P}-fix-cpp.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DLEGACY_CPP_SUPPORT=$(usex !cxx)
- -DBUILD_cpp=OFF
- -DBUILD_cmake=$(usex cmake)
- -DBUILD_cmakebuilder=$(usex cmake)
- $(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
-}