diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2013-04-27 23:02:56 +0000 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2013-04-27 23:02:56 +0000 |
| commit | 9f471b08b0cb5f468946c59ce195dc5f2586f3bd (patch) | |
| tree | 92166bd728baad04fa080d4e8b97839c2e8755ae /net-misc | |
| parent | Taking main, revbump to fix automagic dep on libspnav[x] (bug 454150), add la... (diff) | |
| download | gentoo-2-9f471b08b0cb5f468946c59ce195dc5f2586f3bd.tar.gz gentoo-2-9f471b08b0cb5f468946c59ce195dc5f2586f3bd.tar.bz2 gentoo-2-9f471b08b0cb5f468946c59ce195dc5f2586f3bd.zip | |
fix build with >=dev-libs/json-c-0.11:0 (bug #467432, thx to Jouni Kosonen for the patch)
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/grive/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/grive/grive-0.2.0-r1.ebuild | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/net-misc/grive/ChangeLog b/net-misc/grive/ChangeLog index 9a3f24333390..e1e56822a9ff 100644 --- a/net-misc/grive/ChangeLog +++ b/net-misc/grive/ChangeLog @@ -1,6 +1,10 @@ # 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.11 2013/04/14 17:44:13 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/grive/ChangeLog,v 1.12 2013/04/27 23:02:56 ottxor Exp $ + + 27 Apr 2013; Christoph Junghans <ottxor@gentoo.org> grive-0.2.0-r1.ebuild: + fix build with >=dev-libs/json-c-0.11:0 (bug #467432, thx to Jouni Kosonen for + the patch) *grive-0.2.0-r1 (14 Apr 2013) diff --git a/net-misc/grive/grive-0.2.0-r1.ebuild b/net-misc/grive/grive-0.2.0-r1.ebuild index 70ea50e6b82d..08a131736411 100644 --- a/net-misc/grive/grive-0.2.0-r1.ebuild +++ b/net-misc/grive/grive-0.2.0-r1.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-r1.ebuild,v 1.1 2013/04/14 17:44:13 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/grive/grive-0.2.0-r1.ebuild,v 1.2 2013/04/27 23:02:56 ottxor Exp $ EAPI=5 @@ -40,10 +40,15 @@ 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 + #include dir change in json-c-0.10 #462632 and #452234 + if has_version ">=dev-libs/json-c-0.10" ; then sed -i -e '/\(include\|INCLUDE\)/s@json/@json-c/@' \ libgrive/src/protocol/Json.cc \ cmake/Modules/FindJSONC.cmake || die fi + #json-c library changed in 0.11, bug #467432 + if has_version ">=dev-libs/json-c-0.11" ; then + sed -i -e '/LIBRARY/s@json)@json-c)@' \ + cmake/Modules/FindJSONC.cmake || die + fi } |