commit: cafe4a8ac6827a7bd010c3a2b5459d7fb54fb717 Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Wed Mar 12 12:24:20 2014 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Wed Mar 12 12:24:20 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cafe4a8a
[dev-util/kdevelop] Bumped in tree + sync Package-Manager: portage-2.2.8-r1 --- ...kdevelop-4.5.2-kdevplatform-without-qjson.patch | 32 ------------- dev-util/kdevelop/kdevelop-4.6.0.ebuild | 52 ---------------------- dev-util/kdevelop/kdevelop-9999.ebuild | 11 ++--- 3 files changed, 6 insertions(+), 89 deletions(-) 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 <ke...@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.6.0.ebuild b/dev-util/kdevelop/kdevelop-4.6.0.ebuild deleted file mode 100644 index d845dac..0000000 --- a/dev-util/kdevelop/kdevelop-4.6.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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_kdebase_dep okteta) ) - qthelp? ( dev-qt/qthelp:4 ) - reviewboard? ( dev-libs/qjson ) -" -RDEPEND="${DEPEND} - $(add_kdebase_dep kapptemplate) - 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) - $(cmake-utils_use_find_package reviewboard QJSON) - ) - - kde4-base_src_configure -} diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild index 80bdbfa..4b6f969 100644 --- a/dev-util/kdevelop/kdevelop-9999.ebuild +++ b/dev-util/kdevelop/kdevelop-9999.ebuild @@ -4,15 +4,14 @@ EAPI=5 -KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it nb nds nl pl pt -pt_BR ru sl sv th uk zh_CN zh_TW" +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" +IUSE="+cmake +cxx debug okteta qthelp reviewboard" if [[ $PV == *9999* ]]; then KEYWORDS="" @@ -21,11 +20,12 @@ else fi DEPEND=" + >=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}[reviewboard?] $(add_kdebase_dep ksysguard) $(add_kdebase_dep libkworkspace) - dev-libs/qjson okteta? ( $(add_kdebase_dep okteta) ) qthelp? ( dev-qt/qthelp:4 ) + reviewboard? ( dev-libs/qjson ) " RDEPEND="${DEPEND} $(add_kdebase_dep kapptemplate) @@ -44,6 +44,7 @@ src_configure() { $(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
