Merge branch 'kdevelop' of https://github.com/a17r/kde

13 files changed, 360 insertions, 18 deletions

diff --git a/dev-util/kdevelop-css/kdevelop-css-5.0.9999.ebuild b/dev-util/kdevelop-css/kdevelop-css-5.0.9999.ebuild
new file mode 100644
index 00000000000..b794d1a5635
--- /dev/null
+++ b/dev-util/kdevelop-css/kdevelop-css-5.0.9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_BRANCH="5.0"
+KDEBASE="kdevelop"
+KMNAME="kdev-css"
+inherit kde5
+
+DESCRIPTION="CSS Language Support plugin for KDevelop 5"
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	dev-qt/qtgui:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevplatform:5
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-util/kdevelop:5
+"
diff --git a/dev-util/kdevelop-krazy2/kdevelop-krazy2-9999.ebuild b/dev-util/kdevelop-krazy2/kdevelop-krazy2-9999.ebuild
index 1a636c2e0c7..b49658adbbe 100644
--- a/dev-util/kdevelop-krazy2/kdevelop-krazy2-9999.ebuild
+++ b/dev-util/kdevelop-krazy2/kdevelop-krazy2-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 KDEBASE="kdevelop"
+KDE_TEST="forceoptional"
 KMNAME="kdev-krazy2"
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -14,19 +15,21 @@ LICENSE="GPL-2+"
 KEYWORDS=""
 IUSE=""
 
-RESTRICT="test"
-
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kxmlgui)
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-util/kdevplatform:5
 "
-
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep threadweaver)
+"
+RDEPEND="${COMMON_DEPEND}
 	dev-util/kdevelop:5
 "
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.9999.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.9999.ebuild
new file mode 100644
index 00000000000..99896eb63fb
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_BRANCH="2.0"
+KDEBASE="kdevelop"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
+LICENSE="LGPL-2"
+IUSE=""
+
+DEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="
+	!dev-util/kdevelop-pg-qt:4
+"
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
index 2dd9cbb609d..8918ee9e957 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="A LL(1) parser generator used mainly by KDevelop language plugins"
+DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
 LICENSE="LGPL-2"
 IUSE=""
 
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.0.9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.0.9999.ebuild
new file mode 100644
index 00000000000..f1939be8fd2
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.0.9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_BRANCH="5.0"
+KDEBASE="kdevelop"
+KDE_DOXYGEN="true"
+KMNAME="kdev-php"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="PHP plugin for KDevelop 5"
+LICENSE="GPL-2 LGPL-2"
+IUSE=""
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="
+	$(add_frameworks_dep kapidox)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	dev-qt/qtgui:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-util/kdevelop-pg-qt:5
+	>=dev-util/kdevplatform-${PV}:${SLOT}
+"
+RDEPEND="${DEPEND}
+	!dev-util/kdevelop-php-docs
+	dev-util/kdevelop:${SLOT}
+"
+
+src_prepare() {
+	use doc || comment_add_subdirectory docs
+	kde5_src_prepare
+}
diff --git a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
index fb816bc4b0e..5cc451c7a2a 100644
--- a/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-9999.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=5
 
-EGIT_REPONAME="${KMNAME}"
 KDEBASE="kdevelop"
 KDE_DOXYGEN="true"
 KMNAME="kdev-php"
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.0.9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.0.9999.ebuild
new file mode 100644
index 00000000000..9b5823ef246
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.0.9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_BRANCH="5.0"
+KDEBASE="kdevelop"
+KMNAME="kdev-python"
+PYTHON_COMPAT=( python3_5 )
+inherit kde5 python-any-r1
+
+DESCRIPTION="Python plugin for KDevelop 5"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-util/kdevplatform:5
+	${PYTHON_DEPS}
+"
+RDEPEND="${DEPEND}
+	dev-util/kdevelop:5
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_compile() {
+	pushd "${WORKDIR}"/${P}_build > /dev/null || die
+	emake parser
+	popd > /dev/null || die
+
+	kde5_src_compile
+}
diff --git a/dev-util/kdevelop-python/kdevelop-python-9999.ebuild b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
index 6b82d98a56f..5eaefafedf9 100644
--- a/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-9999.ebuild
@@ -12,15 +12,13 @@ inherit kde5 python-any-r1
 DESCRIPTION="Python plugin for KDevelop 5"
 IUSE=""
 
-COMMON_DEPEND=""
 DEPEND="
-	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
 	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep ktexteditor)
@@ -32,8 +30,7 @@ DEPEND="
 	dev-util/kdevplatform:5
 	${PYTHON_DEPS}
 "
-RDEPEND="
-	${DEPEND}
+RDEPEND="${DEPEND}
 	dev-util/kdevelop:5
 "
 
diff --git a/dev-util/kdevelop/kdevelop-5.0.9999.ebuild b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
new file mode 100644
index 00000000000..9cc10e9d293
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.0.9999.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_BRANCH="5.0"
+KDE_HANDBOOK="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Integrated Development Environment, supporting KDE/Qt, C/C++ and much more"
+LICENSE="GPL-2 LGPL-2"
+IUSE="+clang +cmake +cxx debug +ninja +plasma +qmake qthelp"
+KEYWORDS=""
+
+# TODO: disabled upstream
+# okteta? ( $(add_kdeapps_dep okteta) )
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep threadweaver)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	>=dev-util/kdevplatform-${PV}:5
+	cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) )
+	plasma? (
+		$(add_frameworks_dep krunner)
+		$(add_frameworks_dep plasma)
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	qthelp? ( dev-qt/qthelp:5 )
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kio-extras)
+	cxx? ( >=sys-devel/gdb-7.0[python] )
+	ninja? ( dev-util/ninja )
+	!dev-util/kdevelop:4
+	!dev-util/kdevelop-qmake
+	!dev-util/kdevelop-qmljs
+	cxx? ( clang? ( !dev-util/kdevelop-clang ) )
+"
+
+RESTRICT="test"
+# see bug 366471
+
+PATCHES=( "${FILESDIR}/${PN}-ninja-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DLEGACY_CPP_SUPPORT=$(usex !clang)
+		$(cmake-utils_use_build cmake)
+		$(cmake-utils_use_build cmake cmakebuilder)
+		$(cmake-utils_use_build ninja ninjabuilder)
+		$(cmake-utils_use_build cxx clang)
+		$(cmake-utils_use_build cxx cpp)
+		$(cmake-utils_use_build qthelp)
+		$(cmake-utils_use_find_package plasma KF5Plasma)
+		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+	# fix file collision with <kde-apps/kapptemplate-15.12.50
+	rm "${ED}"usr/share/kdevappwizard/templates/qmake_qt4guiapp.tar.bz2 || die
+}
diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild
index 228c72e463a..1f91fee2134 100644
--- a/dev-util/kdevelop/kdevelop-9999.ebuild
+++ b/dev-util/kdevelop/kdevelop-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+KDE_HANDBOOK="forceoptional"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
@@ -31,13 +32,13 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep threadweaver)
-	dev-util/kdevplatform:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtscript:5
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
+	>=dev-util/kdevplatform-${PV}:5
 	cxx? ( clang? ( >=sys-devel/clang-3.5.0 ) )
 	plasma? (
 		$(add_frameworks_dep krunner)
@@ -54,6 +55,7 @@ RDEPEND="${DEPEND}
 	!dev-util/kdevelop:4
 	!dev-util/kdevelop-qmake
 	!dev-util/kdevelop-qmljs
+	!<kde-apps/kapptemplate-15.12.50
 	cxx? ( clang? ( !dev-util/kdevelop-clang ) )
 "
 
diff --git a/dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild b/dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild
new file mode 100644
index 00000000000..fcd993d2ddc
--- /dev/null
+++ b/dev-util/kdevplatform/kdevplatform-5.0.9999.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# TODO tests hang + fail
+# KDE_TEST="true"
+# VIRTUALDBUS_TEST="true"
+# VIRTUALX_REQUIRED="test"
+EGIT_BRANCH="5.0"
+RESTRICT="test"
+KDE_DOXYGEN="true"
+KDEBASE="kdevelop"
+inherit kde5
+
+DESCRIPTION="KDE development support libraries and apps"
+IUSE="classbrowser cvs konsole reviewboard subversion +templates"
+KEYWORDS=""
+
+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)
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+	templates? ( dev-libs/grantlee:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	dev-qt/qtconcurrent:5
+	dev-qt/qttest:5
+"
+RDEPEND="${COMMON_DEPEND}
+	cvs? ( dev-vcs/cvs )
+	konsole? ( $(add_kdeapps_dep konsole) )
+	!dev-util/kdevelop:4
+	!dev-util/kdevplatform:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build classbrowser)
+		$(cmake-utils_use_build cvs)
+		$(cmake-utils_use_build konsole)
+		$(cmake-utils_use_build reviewboard)
+		$(cmake-utils_use_find_package subversion SubversionLibrary)
+		$(cmake-utils_use_find_package templates Grantlee5)
+	)
+
+	kde5_src_configure
+}
diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild b/dev-util/kdevplatform/kdevplatform-9999.ebuild
index 67e7b04c250..579875d7d46 100644
--- a/dev-util/kdevplatform/kdevplatform-9999.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild
@@ -9,12 +9,12 @@ EAPI=5
 # VIRTUALDBUS_TEST="true"
 # VIRTUALX_REQUIRED="test"
 RESTRICT="test"
-KMNAME="kdevelop"
-EGIT_REPONAME="${PN}"
+KDE_DOXYGEN="true"
+KDEBASE="kdevelop"
 inherit kde5
 
 DESCRIPTION="KDE development support libraries and apps"
-IUSE="classbrowser cvs konsole reviewboard subversion"
+IUSE="classbrowser cvs konsole reviewboard subversion +templates"
 KEYWORDS=""
 
 COMMON_DEPEND="
@@ -47,12 +47,10 @@ COMMON_DEPEND="
 	$(add_frameworks_dep sonnet)
 	$(add_frameworks_dep threadweaver)
 	$(add_kdeapps_dep libkomparediff2)
-	dev-libs/grantlee:5
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5[widgets]
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
-	dev-qt/qtquick1:5
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
@@ -61,6 +59,7 @@ COMMON_DEPEND="
 		dev-libs/apr-util:1
 		dev-vcs/subversion
 	)
+	templates? ( dev-libs/grantlee:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
@@ -81,6 +80,7 @@ src_configure() {
 		$(cmake-utils_use_build konsole)
 		$(cmake-utils_use_build reviewboard)
 		$(cmake-utils_use_find_package subversion SubversionLibrary)
+		$(cmake-utils_use_find_package templates Grantlee5)
 	)
 
 	kde5_src_configure
diff --git a/dev-util/kdevplatform/metadata.xml b/dev-util/kdevplatform/metadata.xml
index 8def1ed5932..0d24adb56ad 100644
--- a/dev-util/kdevplatform/metadata.xml
+++ b/dev-util/kdevplatform/metadata.xml
@@ -6,5 +6,6 @@
 		<flag name="classbrowser">Enable the class browser plugin</flag>
 		<flag name="konsole">Enable Konsole integration</flag>
 		<flag name="reviewboard">Enable reviewboard support</flag>
+		<flag name="templates">Enable file templates through <pkg>dev-libs/grantlee</pkg></flag>
 	</use>
 </pkgmetadata>