From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4C609138247 for ; Fri, 27 Dec 2013 16:19:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A47E2E099B; Fri, 27 Dec 2013 16:19:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1965BE0999 for ; Fri, 27 Dec 2013 16:19:16 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 139BE33F758 for ; Fri, 27 Dec 2013 16:19:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 80921E5534 for ; Fri, 27 Dec 2013 16:19:12 +0000 (UTC) From: "Chris Reffett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chris Reffett" Message-ID: <1388157637.d5e16e90c83bdafb4ffa72a749887b1a99ce349a.creffett@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/files/, dev-util/kdevelop/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch dev-util/kdevelop/kdevelop-4.6.0.ebuild dev-util/kdevelop/metadata.xml X-VCS-Directories: dev-util/kdevelop/files/ dev-util/kdevelop/ X-VCS-Committer: creffett X-VCS-Committer-Name: Chris Reffett X-VCS-Revision: d5e16e90c83bdafb4ffa72a749887b1a99ce349a X-VCS-Branch: master Date: Fri, 27 Dec 2013 16:19:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1b7a1924-9c78-463a-a230-68adb121c7dd X-Archives-Hash: 56a10ec26a9feec958f698b4298c0ea5 commit: d5e16e90c83bdafb4ffa72a749887b1a99ce349a Author: Chris Reffett gentoo org> AuthorDate: Fri Dec 27 15:20:37 2013 +0000 Commit: Chris Reffett gentoo org> CommitDate: Fri Dec 27 15:20:37 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d5e16e90 [dev-util/kdevelop] Bump to 4.6.0 Package-Manager: portage-2.2.7 --- ...kdevelop-4.5.2-kdevplatform-without-qjson.patch | 32 +++++++++++++ dev-util/kdevelop/kdevelop-4.6.0.ebuild | 52 ++++++++++++++++++++++ dev-util/kdevelop/metadata.xml | 1 + 3 files changed, 85 insertions(+) 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 new file mode 100644 index 0000000..b456236 --- /dev/null +++ b/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch @@ -0,0 +1,32 @@ +commit fb4234cd72ceebb200bef13234ea9c36c9a62046 +Author: Kevin Funk +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 new file mode 100644 index 0000000..1841d14 --- /dev/null +++ b/dev-util/kdevelop/kdevelop-4.6.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2013 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/metadata.xml b/dev-util/kdevelop/metadata.xml index d2b28f6..2316b9a 100644 --- a/dev-util/kdevelop/metadata.xml +++ b/dev-util/kdevelop/metadata.xml @@ -6,5 +6,6 @@ Enable support for CMake build system Enable hex editor plugin Enable support for QtHelp documentation browsing + Enable reviewboard support