Version bump. Fixes handling of embedded NUL bytes.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

diff --git a/dev-libs/jsoncpp/ChangeLog b/dev-libs/jsoncpp/ChangeLog
index a6d24348631f9bcc76aa35a70a9302fb67ebcab7..b76de36a0cb9683a7bc8ef4ce50b63ea37fabd73 100644 (file)
--- a/dev-libs/jsoncpp/ChangeLog
+++ b/dev-libs/jsoncpp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/jsoncpp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/ChangeLog,v 1.15 2015/04/13 19:22:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/ChangeLog,v 1.16 2015/05/01 14:50:46 mgorny Exp $
+
+*jsoncpp-0.10.2 (01 May 2015)
+
+  01 May 2015; Michał Górny <mgorny@gentoo.org> +jsoncpp-0.10.2.ebuild:
+  Version bump. Fixes handling of embedded NUL bytes.
 
   13 Apr 2015; Mike Frysinger <vapier@gentoo.org> jsoncpp-0.10.1.ebuild:
   Add mips love.

diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 66cd2e39e26b9caafde5a7fe2c165764469352a3..903e83d0dfb456bb717121edd480846333cc8505 100644 (file)
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -2,27 +2,31 @@
 Hash: SHA256
 
 DIST jsoncpp-0.10.1.tar.gz 196664 SHA256 ff933ad6d25db77a33c819350ff65842111edb2c8dcbb806efc9d93d0ec53ea5 SHA512 867d5ddb56b02da4d423914f3a553cf9e9b160f876730ba781f077d9333d7ca38d4e000b2a933963f7117f0ace2266c3eb9e4305d23cb6c24501ad6d4036da08 WHIRLPOOL ed605c8775f0ae7847fc0129909c7aad1bc99f1511c3a8780e7d8ec7292c6bd7ad0449904dae52295db93590c717fc903566568753bf68bdc104850398300ac2
+DIST jsoncpp-0.10.2.tar.gz 197188 SHA256 37bb72615018522bb78a5eb425b36dfc79e049c1d5471b724f7ccadeac0ed479 SHA512 8e451e3ba37094445ab098d5b9f7236ac84e2f15d98e2039c565e609b757c2383e91850bd86aca507ca5cd2f733fedc484bb7760eeeee7fe9bace71d97ae0d2e WHIRLPOOL 85f9861e77a7c3cecd5e859adde832b7f12a0c5eae04ecbee203e5d8c4b8b13ba034b4aa6b78a3b981aa392a4ea6a26c2e1d411ae97768d7ed422f71ec2e5d79
 DIST jsoncpp-src-0.5.0.tar.gz 107466 SHA256 22b14ecd0de8cdad2b6b6839f6d0804d3b84e91f42861ebd843832a26a927433 SHA512 2815d3523f92c33a5be3221161a590a0fddd16cb22e5dc634791535ee44271ec4fbb64f81cc958a87b1f029a8108ed9f169cda5a2d0422f60699ac286386a1bc WHIRLPOOL f6174f08dc647a189fc17f93343a72fb83bea66f27e60707b6bf300a185d4d3e8d5f347dd6f0d06462e45086c7c1dbd352e22ac08fef13d9235a65bad44f0d67
 DIST jsoncpp-src-0.6.0-rc2.tar.gz 117661 SHA256 d4d193d163f520b08b9155cba978615892ca1359d77e3fb261fce2f86d09b283 SHA512 5d44e766aa2d7657bc68cf16173130febaa6744d5fca0c6df5465617a3f306023a17cbeb07a62ad1a34c2d183d916401b4be48f37c2416c895db4ad5d9481b3d WHIRLPOOL bfa7e70e14f3ed0911c5127da0d2099ca8b9159a900a5bc5147d1e50b5a9f9d5be69a8d46a761d277ca1edabaab8d0d3b9f81417572e4664ed8239fd83c953e6
 EBUILD jsoncpp-0.10.1.ebuild 1395 SHA256 3e44a8f291c7e7baf2880b96a60fe2e01b6f4b07f7921d7169017f86409fb412 SHA512 a70444b99dbc67e90f52c62342ffbf3bc2fb8054c3938095605f63b84e0f34f143be51bbd9277b08cb4be9d6fbd13e0d7ddfd3366294935aab518d4c3a69351f WHIRLPOOL 432c6bf597cd5f4e866181d8e6b58e9fc959f2ce83bf3326024d5cb4435db4151f6fbabd5807ecb4246e3922c5628c4a9bbe937876397599df9c91fe418147d5
+EBUILD jsoncpp-0.10.2.ebuild 1395 SHA256 99fa70f130f1173e20abc8fa2882bc9c8335a7454e16825cafc8f27087f9ffe4 SHA512 2c146fe4ceb09f6e35cfb98cfc5496d401d50d2cdd52abd4784f384a4b849f486b853d32b40be180d77684f20070dda870788f5bab8ed8d48e6418db3f505f8d WHIRLPOOL c85e07122ec6acfeb3d6ec322ac5c75e4a0d7bb4992773063132104389c31e7a64136d20848c49c3f3e99ed228359947f68c5088fbf37698847a50542701514a
 EBUILD jsoncpp-0.5.0-r1.ebuild 1255 SHA256 c61db8f16bd9d0e77deb7d1b965fee0e419b05a3b4950d17211f6fadb0764b48 SHA512 3605de7eed9486b316a6e4317d92042745089bcff7d472131607f6f5c04c902e760985c77ff7c8cc62c8926a7c823db1010fcb3306c44a0600113249dd42fa21 WHIRLPOOL c6cff36b942b530850618f83006a2e5d838a427ff78b8d3c70f7ed31d7600ba564199446f1cae2a0751c82446bc9299bdd311606a99477631f7366f6c80d38e2
 EBUILD jsoncpp-0.6.0_rc2.ebuild 1380 SHA256 952378041c5fdd279d4142cb355b8f0f275d0be797dea4ab99737542b30a784b SHA512 2fc76032e8a295e3cf245e876cf55671f31602052eeecda0a686c2f6f4f4a04c52c12454e18fa9991db4ff82c288688a349a3e632c5ab6ac4c8ae25a20971d5e WHIRLPOOL 7206ac2645ce33330310dca9c4b9e2bd21496ca3d84fae195ad2f47ff471a56f52293b6dc3281757fbfe03b04a4c7899b101db3db03351b0631a860b8cc34463
-MISC ChangeLog 2030 SHA256 80879ff7614bdb579475d487c3fbd43dc3acc13d8e15503d67ba6dd424f44cf8 SHA512 75eaccc2a75560960252b280754ea43a37a7c358f3c2805bf216b5af37686083aa21687bbba6f0cc9475657a324d537ee170581f5e16cc674e8c56fccf4e1ce8 WHIRLPOOL ccbdc244c9f9734c207ef6001a52f8930480baafab04f266e29184ca921afe16e7f95b5181605b9ba4efcbbf9c8ddcdf418816c6d6366fd704ce527178eba491
+MISC ChangeLog 2190 SHA256 b8c838c09356bfaf86362a62db2838d46ce8960139ab6f074a1b1189a3a415c9 SHA512 4619d4e206c4b9a29186494e3bdd0db25eab91ee0502f7c973e196a07c9d2de916340ac7b70c95a2e0131088174407708d92659201e534d98d3e016a48a842b6 WHIRLPOOL 8f4e4e3448c4a3144998f2f57f47d408a4d5b59da01c9e8c38e64c6d44786f9dbf59eddfaad74c996a7b8ebd3cac61efbc360957e6b7b19c15205594244b32fc
 MISC metadata.xml 344 SHA256 0e2c74486b38948bd35a2b844d12a4b385c427b29c658a7c06407d857cbbfb29 SHA512 7319802e9400eef2e90570cc23cf94f6ffa96bcfd7552c0d01e96c4cc7dba16ade6018f29d7e811c1030f27bc1a30d1584f3f0bfffbf785e901a5732cd897846 WHIRLPOOL 4640d7868576e11809d1caafe414d7664adf3bf67a178bd935f509a38c834483a729dc07de8773334e845a22102d097f05732cab57c49b35355ed1efffa4c4e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVLBeLAAoJEPGu1DbS6WIAE4cP/Rb2tDN+AMlnAiLz3JwNCki+
-UhMxpVf7itEhiP98rLy3HEKjNH4RqujAIdnbZJfdUISnnh30J3k0cQL1PTZRdMvD
-Imebo8kqaR6a123YnV3yqv62Tg6XjfRUZ5DZLLq3RzKAQGus9hCUnd5An6DyXNlD
-oA813aRIKFq9hMaYKzj3jifkOI2X0yopzVMVOirKK96B0Jwgwwva+UfALfcTFR94
-OpUB8+Qti2dQ96zSLS2KY+qUdTGnh1nM0g9TUoZ2wXYwhfrq4JjXOHxmZf//vNba
-PcATB/KJ//wuDxNzMvHiUjpjN7aLp1MzaAMpo1IXG28VjCHtIfO6oXOe2X8Y6iM1
-QfRqACzH2eW4DDchvXt3mZ17Hvy1g7+y88UfyMN0lvwpf80+WEUWTYIWJU4PS77u
-twbAjPbNfBOy/0I30DpTGWdQIoQLPjO7MsODt8cm68yhqkQLok5tgIkoGlaQv+ZF
-Kw9f+nW1QGC0/KA/GWUCrxmX3I2oFd4PUDMZ+3wsBQLYzvz2xjd4E/jnxGJPRYbh
-Tsdiaes5YNM09FXxLxAzMbBKFpHksUwaMCR5TVmX88WrO9SLXZRlAiWzRHnkDQ+m
-nO2LIRT4VggKX5gxIBo1myRzPZc/kuQXWXIfHa27NOooGIghRMU+zWM48m/9/Rv8
-N3XVOd3vQ+LbhqdZGsly
-=4kfS
+iQJ8BAEBCABmBQJVQ5LIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZODFEP/RB/RQUAXUv5DpVs33pgV1cH
+E9gsYjuyOsmmVYcNQiG5yeJSbNaXTQdALvSbIfDl0AYPPBpXQEt5p06uQBE0ryVN
+N9nTAOPO3EsTa+Pr6pNUKUL3dLXYnvESXIcGD7PiRdWwYQGuHqgM9xSwxXeXq/6o
+A8IXyX/dEMpIzHFNJI0UWYhIWcMfyTMoRyFwos8GxUY0XZDeLC3M79R3g/GqqZpk
+FMDTKhFIjfWxkD2Hpmi62IQlk1Out4Ap5e5e1x1L8xcBhroKvYhmHSsrrGuPHqLD
+2ow1MJ80K3s4VopTeEyIDq0py28QidIgw4iAYsW6AjGO3ylB/1g8/ka+ELywY32D
+9CJfvLzTmdInt0G7awpgQbkZeFs1t1Zc8Ds63SxCBkzAMT03EFrpb1sPSHpKvwig
+ouxotevZGpvP8DgKNzfTjLv0bgZzHBIbPQRVDf4kD2d6X9fXwkz/3ipIMQfg/JES
+CGToPAn1/rwCoajeKJM/GKFKXxAwUej4ksFLaPQDh8b7q6DQD95CYkfMVXe0/EO+
+xd7DrRptdbpNBo+E8nOmM3xbVIDdE3ktz4e3WiletUrAQ1l3B759BkbB59/dpjhT
+mXN9KjQsP2jK9NZiCUz5JLkLMiqaZjTxJJPDSJXSYM6sB3XXZCDNod8jo+RUmwTj
+KoFk3Ov757Zj76sCYeRv
+=agic
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/jsoncpp/jsoncpp-0.10.2.ebuild b/dev-libs/jsoncpp/jsoncpp-0.10.2.ebuild
new file mode 100644 (file)
index 0000000..b9c41d1
--- /dev/null
+++ b/dev-libs/jsoncpp/jsoncpp-0.10.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jsoncpp/jsoncpp-0.10.2.ebuild,v 1.1 2015/05/01 14:50:46 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="C++ JSON reader and writer"
+HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
+SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( public-domain MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~x86"
+IUSE="doc test"
+
+DEPEND="
+       doc? (
+               app-doc/doxygen
+               ${PYTHON_DEPS}
+       )
+       test? (
+               ${PYTHON_DEPS}
+       )"
+RDEPEND=""
+
+pkg_setup() {
+       if use doc || use test; then
+               python-any-r1_pkg_setup
+       fi
+}
+
+src_configure() {
+       local mycmakeargs=(
+               -DJSONCPP_WITH_TESTS=$(usex test)
+               -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
+               -DJSONCPP_WITH_CMAKE_PACKAGE=ON
+
+               -DBUILD_SHARED_LIBS=ON
+               # Follow Debian, Ubuntu, Arch convention for headers location
+               # bug #452234
+               -DINCLUDE_INSTALL_DIR="${EPREFIX}"/usr/include/jsoncpp
+       )
+
+       cmake-utils_src_configure
+}
+
+src_compile() {
+       cmake-utils_src_compile
+
+       if use doc; then
+               "${EPYTHON}" doxybuild.py --doxygen=/usr/bin/doxygen || die
+       fi
+}
+
+src_test() {
+       emake -C "${BUILD_DIR}" jsoncpp_check
+}
+
+src_install() {
+       cmake-utils_src_install
+
+       if use doc; then
+               dohtml dist/doxygen/jsoncpp*/*
+       fi
+}