fix build with >=dev-libs/json-c-0.11:0 (bug #467432, thx to Jouni Kosonen for the patch)

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

3 files changed, 22 insertions, 13 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/Manifest b/net-misc/grive/Manifest
index c50270085065..7b35b311f14b 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
 
 AUX grive-0.2.0-check-bfd.h.patch 1025 SHA256 850ec759e76421bf7670195971280bf60c69dfb787d417b5ef5f9be705849cef SHA512 fbdd2e101507fd39066a4f854495d080b17896e0ea308d112f421e54fd86b4752f9ee6a48591edc992b3ce77c665a183aca054a05f790e726ba6e09b03b89a7f WHIRLPOOL eae83c2f75b95ecd59660437099001763bc8b518f4ec5140d8a881a0f7f44f1f784bf6e9d0d79c28ee075b9540fbef9bebc3ac7d5fc2bf696ed9692cafe0e2b9
 DIST grive-0.2.0.tar.gz 145760 SHA256 bb0de191cbe98e8efda6ce8fd5bcef3ae4903984aaaa9592909ddb4a24175f45 SHA512 5bae5d1de4655775347ca3148a0ae8b3294c56dff659cbd32f8c53d6cfa40f645d6f710a2e26e2189e51632bccaba494f45bec55a7721d6f7a40b467b1f3c7fd WHIRLPOOL 167093c15348bfdd6bd9b9db31919708ccd1f79b349ea43bd478227c500d8773d64cbf845e3c2f9747c3097945c4fea68462b3babfd81c0211cc52f03767c92e
-EBUILD grive-0.2.0-r1.ebuild 1101 SHA256 627d4874f4f336652d7c76d7d7cd26d75af539a4f2d9999bc13235b3a8b33de1 SHA512 dd4147a1c678546e4a197b58b55da5938b48aea193690bf2cf716cdd2536194666907a3e76a3a5657a1dcea7fadff78bf934b2e4b5873ada1590678757381249 WHIRLPOOL 808c29abd98d8c5ce10671c4ef4faed48f5b4a81a52a68fb5f8beb0173fb240c984cbc8e1bcc6b0a6c2e0226d944a8f059974fe8a8f24c9255cf4fcb04a0714d
-MISC ChangeLog 1566 SHA256 b06dfd4de32d00970dea4c03ee3ad344d5174acafafa817b2d84b348db4f54da SHA512 7950e6930a70e6e8a19a064f17add4d4e4af3885c2c33a58f5be59203a527affa4d318ccdc4fe9b833d61de65db1e848e80b0fb8ad7ab69d06e906ac38edcdf1 WHIRLPOOL 20e124907deab35ad2bf06776756c8331bdbc136fb96135656a47d9edecb3535850887a5846674a1987e128105d1dc7fdc459008f21eb6dcf582c8aa1db96a75
+EBUILD grive-0.2.0-r1.ebuild 1301 SHA256 69a277561f675269779a7fca2dffece14eec667d03ff10ce244c2aabfe7362e3 SHA512 6e47f073ab9573a3080eaa981346224aa2861fc4b9b49ae650acd6e741ba0421c6e6783dd3cb16c2eeb1f6805dfc370b5d52ba0e55b091aec3692c8008abe2f8 WHIRLPOOL c2ed00e7c41b6680b03bbd286b8cc33d916c1525c1276e1bbf9e6210df8f612bee59590d36aa7e0d0e5a1291fcd8a48cbb706f69e4e008173e337571c73e27f2
+MISC ChangeLog 1738 SHA256 698fe17b5abde020d9e5de746f128dcfae6c0e4e4369cf95abde4d3b6fa89f40 SHA512 79e443b4400f23e1a0221360b59d31b8f4fbcee0050a06965ec281c78e2471c63cf878b8222af98b2ef04de41b3b56c8f97d41af869655af3cf41e3b9b149da6 WHIRLPOOL 86b7d91e0cdfe86f16fd91d871583c658fc9db0753a9c7f875c80bae3beed59c79f781e732729ca84e00c635378983d1dd49831f9b61ae19dd4d66be256ae37c
 MISC metadata.xml 313 SHA256 f67a9c752c8561c241a638539d47d28bb85a21315907bd15cb396004e940da2b SHA512 86df8f31a98011727c883fac775dee1a9a4906e93af5e2021459a712cdb9a1e6f8e7d731fdba3725f40b9d713cb73b5a9012742f4399c83f04585ca7933ebba5 WHIRLPOOL 4c78edd5c13498a0dc7d795a5026bd4141f07cf5a885a26992d5ebe50f73c364b6c2eadd6264b4f8ac77e07eeacdf77e7ce9c4bd1a04b4ff04ec5f04b661e922
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRauruAAoJEOeBhlrCAAWGBOQIAL1qUqB5vYQjmeWzFx4GGGm/
-i4qh+L0/7xUSTSYywErVp1xDXl0TI9iEJWY71YaovwJAg8QHKPcYGz7fMOeSC3Te
-OOlZdn9PTv9LzSy9aWvJHJK738yvnpuu5+rwzQjjvcQvVknP7cvtsMK6Ej4HIB81
-lj/+WQKrrqJDS/7eB3F/+R8Cqz73I/uuzECwzGjsxcs3eh9cVka/vv/dczN2Mhex
-0GAkS/XzSWw3C8g4jjMl6IzkrKKEAuaBT+I5ToL07JbQMIFCidA4wvX/X0q0/ZeQ
-Hvs3wQymk0Tfj06kwYIPqO/DZGOX0Bu/0oKA32dExHTn9b668jiUFK6JokJ5bj8=
-=HCVZ
+iQEcBAEBCAAGBQJRfFknAAoJEOeBhlrCAAWGYhsH/2VhfkdJHzfjvA0vZHT4wjSX
+qnnnK4aHmghwwbsupY//efn64zlJ6QTohuzKsDRbrq0+6AkH3vuhyl3b6QJI7YQS
+JPXYMdYL86vs0gz+d/F9SHmfXkaPq60ymA4Y52tod4f6MapnSdlNEck2enbZmf2Z
+0cZ3u4a/4hmDJOe3TWTOJYQG1kC8faIapTdi8v2maUUDTZFzA4GXheR51Nw5lIlS
+W3icV/VnE7HTDkUkZCmwIultaLnsYemhrbaow1xMKYq+iCf5oJohpFLgIrmAPzvO
+TJjyaBhoIpGO7RB2HGjkn72/LrFYHeolhJZ7HPKWX0TU/x0AYs5iyMlzYMv05Rk=
+=p0ho
 -----END PGP SIGNATURE-----
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
 }