| 1 |
johu 13/11/04 14:30:29 |
| 2 |
|
| 3 |
Modified: metadata.xml kdevelop-4.5.2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix build on dev-util/kdevplatform[-reviewboard] by adding upstream patch and introducing a use flag reviewboard wrt bug #490002. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.9 dev-util/kdevelop/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevelop/metadata.xml?rev=1.9&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevelop/metadata.xml?rev=1.9&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevelop/metadata.xml?r1=1.8&r2=1.9 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/kdevelop/metadata.xml,v |
| 19 |
retrieving revision 1.8 |
| 20 |
retrieving revision 1.9 |
| 21 |
diff -u -r1.8 -r1.9 |
| 22 |
--- metadata.xml 23 Aug 2012 07:24:18 -0000 1.8 |
| 23 |
+++ metadata.xml 4 Nov 2013 14:30:28 -0000 1.9 |
| 24 |
@@ -6,5 +6,6 @@ |
| 25 |
<flag name="cmake">Enable support for CMake build system</flag> |
| 26 |
<flag name="okteta">Enable hex editor plugin</flag> |
| 27 |
<flag name="qthelp">Enable support for QtHelp documentation browsing</flag> |
| 28 |
+ <flag name="reviewboard">Enable reviewboard support</flag> |
| 29 |
</use> |
| 30 |
</pkgmetadata> |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
1.2 dev-util/kdevelop/kdevelop-4.5.2.ebuild |
| 35 |
|
| 36 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevelop/kdevelop-4.5.2.ebuild?rev=1.2&view=markup |
| 37 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevelop/kdevelop-4.5.2.ebuild?rev=1.2&content-type=text/plain |
| 38 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevelop/kdevelop-4.5.2.ebuild?r1=1.1&r2=1.2 |
| 39 |
|
| 40 |
Index: kdevelop-4.5.2.ebuild |
| 41 |
=================================================================== |
| 42 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.5.2.ebuild,v |
| 43 |
retrieving revision 1.1 |
| 44 |
retrieving revision 1.2 |
| 45 |
diff -u -r1.1 -r1.2 |
| 46 |
--- kdevelop-4.5.2.ebuild 31 Oct 2013 17:32:16 -0000 1.1 |
| 47 |
+++ kdevelop-4.5.2.ebuild 4 Nov 2013 14:30:28 -0000 1.2 |
| 48 |
@@ -1,6 +1,6 @@ |
| 49 |
# Copyright 1999-2013 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.5.2.ebuild,v 1.1 2013/10/31 17:32:16 johu Exp $ |
| 52 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.5.2.ebuild,v 1.2 2013/11/04 14:30:28 johu Exp $ |
| 53 |
|
| 54 |
EAPI=5 |
| 55 |
|
| 56 |
@@ -11,7 +11,7 @@ |
| 57 |
|
| 58 |
DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages." |
| 59 |
LICENSE="GPL-2 LGPL-2" |
| 60 |
-IUSE="+cmake +cxx debug okteta qthelp" |
| 61 |
+IUSE="+cmake +cxx debug okteta qthelp reviewboard" |
| 62 |
SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz" |
| 63 |
|
| 64 |
if [[ $PV == *9999* ]]; then |
| 65 |
@@ -21,10 +21,12 @@ |
| 66 |
fi |
| 67 |
|
| 68 |
DEPEND=" |
| 69 |
+ >=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}[reviewboard?] |
| 70 |
$(add_kdebase_dep ksysguard) |
| 71 |
$(add_kdebase_dep libkworkspace) |
| 72 |
okteta? ( $(add_kdebase_dep okteta) ) |
| 73 |
qthelp? ( dev-qt/qthelp:4 ) |
| 74 |
+ reviewboard? ( dev-libs/qjson ) |
| 75 |
" |
| 76 |
RDEPEND="${DEPEND} |
| 77 |
$(add_kdebase_dep kapptemplate) |
| 78 |
@@ -34,6 +36,8 @@ |
| 79 |
RESTRICT="test" |
| 80 |
# see bug 366471 |
| 81 |
|
| 82 |
+PATCHES=( "${FILESDIR}/${P}-kdevplatform-without-qjson.patch" ) |
| 83 |
+ |
| 84 |
src_configure() { |
| 85 |
mycmakeargs=( |
| 86 |
$(cmake-utils_use_build cmake) |
| 87 |
@@ -43,6 +47,7 @@ |
| 88 |
$(cmake-utils_use_with okteta LibOkteta) |
| 89 |
$(cmake-utils_use_with okteta LibOktetaKasten) |
| 90 |
$(cmake-utils_use_build qthelp) |
| 91 |
+ $(cmake-utils_use_find_package reviewboard QJSON) |
| 92 |
) |
| 93 |
|
| 94 |
kde4-base_src_configure |
| 95 |
|
| 96 |
|
| 97 |
|
| 98 |
1.252 dev-util/kdevelop/ChangeLog |
| 99 |
|
| 100 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevelop/ChangeLog?rev=1.252&view=markup |
| 101 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevelop/ChangeLog?rev=1.252&content-type=text/plain |
| 102 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/kdevelop/ChangeLog?r1=1.251&r2=1.252 |
| 103 |
|
| 104 |
Index: ChangeLog |
| 105 |
=================================================================== |
| 106 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v |
| 107 |
retrieving revision 1.251 |
| 108 |
retrieving revision 1.252 |
| 109 |
diff -u -r1.251 -r1.252 |
| 110 |
--- ChangeLog 31 Oct 2013 17:32:16 -0000 1.251 |
| 111 |
+++ ChangeLog 4 Nov 2013 14:30:29 -0000 1.252 |
| 112 |
@@ -1,6 +1,12 @@ |
| 113 |
# ChangeLog for dev-util/kdevelop |
| 114 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 115 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.251 2013/10/31 17:32:16 johu Exp $ |
| 116 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.252 2013/11/04 14:30:29 johu Exp $ |
| 117 |
+ |
| 118 |
+ 04 Nov 2013; Johannes Huber <johu@g.o> |
| 119 |
+ +files/kdevelop-4.5.2-kdevplatform-without-qjson.patch, kdevelop-4.5.2.ebuild, |
| 120 |
+ metadata.xml: |
| 121 |
+ Fix build on dev-util/kdevplatform[-reviewboard] by adding upstream patch and |
| 122 |
+ introducing a use flag reviewboard wrt bug #490002. |
| 123 |
|
| 124 |
*kdevelop-4.5.2 (31 Oct 2013) |
Archives