summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2013-03-23 19:51:07 +0000
committerChristoph Junghans <ottxor@gentoo.org>2013-03-23 19:51:07 +0000
commit040618a8517c8a108a70e8a6b38420131a312beb (patch)
treee22890b4119e93766489bc03fa7771fe348b0c03 /net-misc/grive
parentConvert to unpacker eclass for .deb unpacking. (diff)
downloadgentoo-2-040618a8517c8a108a70e8a6b38420131a312beb.tar.gz
gentoo-2-040618a8517c8a108a70e8a6b38420131a312beb.tar.bz2
gentoo-2-040618a8517c8a108a70e8a6b38420131a312beb.zip
used new include json-c include path (bug #462632)
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Diffstat (limited to 'net-misc/grive')
-rw-r--r--net-misc/grive/ChangeLog5
-rw-r--r--net-misc/grive/grive-0.2.0.ebuild9
2 files changed, 12 insertions, 2 deletions
diff --git a/net-misc/grive/ChangeLog b/net-misc/grive/ChangeLog
index 149a6e119d99..a722136456ed 100644
--- a/net-misc/grive/ChangeLog
+++ b/net-misc/grive/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/grive
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/grive/ChangeLog,v 1.9 2013/01/11 22:36:50 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/grive/ChangeLog,v 1.10 2013/03/23 19:51:07 ottxor Exp $
+
+ 23 Mar 2013; Christoph Junghans <ottxor@gentoo.org> grive-0.2.0.ebuild:
+ used new include json-c include path (bug #462632)
11 Jan 2013; Christoph Junghans <ottxor@gentoo.org> grive-0.2.0.ebuild:
updated SRC_URI
diff --git a/net-misc/grive/grive-0.2.0.ebuild b/net-misc/grive/grive-0.2.0.ebuild
index 7092cc7a204d..95794de32806 100644
--- a/net-misc/grive/grive-0.2.0.ebuild
+++ b/net-misc/grive/grive-0.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/grive/grive-0.2.0.ebuild,v 1.6 2013/01/11 22:36:50 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/grive/grive-0.2.0.ebuild,v 1.7 2013/03/23 19:51:07 ottxor Exp $
EAPI=4
@@ -40,4 +40,11 @@ DOCS=( "README" )
src_prepare() {
epatch "${FILESDIR}"/"${P}"-check-bfd.h.patch
+
+ #bug #462632 due to bug #452234
+ if has_version ">=dev-libs/json-c-0.10-r1" ; then
+ sed -i -e '/\(include\|INCLUDE\)/s@json/@json-c/@' \
+ libgrive/src/protocol/Json.cc \
+ cmake/Modules/FindJSONC.cmake || die
+ fi
}