Version bump to 2.5; fixes bug #485916, proxied commit for Johan Bergström.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 54 insertions, 9 deletions

diff --git a/dev-libs/jansson/ChangeLog b/dev-libs/jansson/ChangeLog
index 3b615b173bf6..5451aae7f7ac 100644
--- a/dev-libs/jansson/ChangeLog
+++ b/dev-libs/jansson/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/jansson
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jansson/ChangeLog,v 1.13 2013/10/21 07:27:43 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jansson/ChangeLog,v 1.14 2013/10/21 07:42:19 tomwij Exp $
+
+*jansson-2.5 (21 Oct 2013)
+
+  21 Oct 2013; Tom Wijsman <TomWij@gentoo.org> +jansson-2.5.ebuild:
+  Version bump to 2.5; fixes bug #485916, proxied commit for Johan Bergström.
 
   21 Oct 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Reordered metadata to make automatic assignment easier.
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 3ecc1f854ae0..10cf8eb3068c 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -3,18 +3,20 @@ Hash: SHA256
 
 DIST jansson-2.3.1.tar.gz 397756 SHA256 5f2ebf63580c73cc115634861b5da1c919499dde37d2e73b16e28b0c8ddc3921 SHA512 cb1f622d44fde174f71f63d3fc6856da8b082d8cdde413bd153861e123d6d752c0b0cbfa701d4fbb254ddb63333c80ee361b6b09bf322a864f61be9d35a021e1 WHIRLPOOL 492e1bf63cb23c5d6ccd417f408d8b574e62f4c069533c8e73ccf758e00fd10b6d721b092d01c9cac0d06b7347dfde8c64321670accf4f03236c28a410b1c977
 DIST jansson-2.4.tar.gz 401597 SHA256 1fcbd1ac3d8b610644acf86a5731d760bb228c9acbace20a2ad0f23baec79b41 SHA512 52c82ea2e70b9a1b72a62e07d917e5b2f8dc1b0fd6022397cbdd60b98aee176cc02f8c65b60d371b4007c60644898667f6bc0dfd11a26a411f167fac0e4df9a0 WHIRLPOOL c028243d8ecd0763f6f6d012113cbbb6ac58698532f94563372994311650762a7eb2d7f1831779dabcce0be2c013d4cb103bde5c3ad919afeeb82f2c875c2460
+DIST jansson-2.5.tar.gz 408185 SHA256 dd8bbfb38ad5031ce88e066b14d3b7e9c7113243daa7f4cde1994b7fc90bb1b1 SHA512 a35a5b7e8413419e74e9a5e8a85508f6695484ea2341adcefa74365eda3fe562a586a46774e4d2baa4d99383f399b86d51b5260835d7da189b0c6adc3f66b7a6 WHIRLPOOL eb852f2a5a94790ad13f5a09417779f00abed0ce3be0cd747e4f9bef0a48b55b2b1b41e6321351241ecf83e7b3f787d5ed4d2fe811888873298f594a60aea178
 EBUILD jansson-2.3.1.ebuild 909 SHA256 dbe6700b21a840143698ffdb80e358cc5361a6a169f167bbfd91e41aa3c06e8f SHA512 afe667df7a9eb8c21b36ac1351e578066a75c3c4b07eb74a86dba1856016a52472a6b94cea9bee8393fd6c3c3470cfdd0c97bdb0ddfc4d63f515f85f52eb2d5a WHIRLPOOL dfce4539fc16d6e85e360108436437433c653bb88a78f416041a5e5158a1b3e2b9673b6aa640b52ef1a0180bcae685b5930517bfd7bc8eb45de50220242c4cb3
 EBUILD jansson-2.4.ebuild 923 SHA256 091e55fc52b1e26acea27e15093348a575de9d0d979e6d887e705770d9b0cec3 SHA512 71d92867711ee2e10a48876db3fcbc1425a30748709a59be72b6e27058826e374208ddcb4735dd19294480edd95fe5e28505fe59344786011d56b7f94cf07367 WHIRLPOOL ee4fcf4cef7d4c137b8af0289093aef4e8ba4d3b5fe7fa2919f53562ce085c99fd3f41715799ec9ff74c77498492ca61b6796a973e441c303666fc3f01512674
-MISC ChangeLog 1835 SHA256 458e8796fea0888c306b3bcf6b374db83ebbfae309b0b07612db3bc4390f7f59 SHA512 8772676fef05fb6e999008f8f7137325d4d8a218b42296244d678130a4f3ef243527472060cbd0d081dab6384d66e2c8d058f9176f44e9beaaa5f027de65a226 WHIRLPOOL d0adc1c8c04079b3878d7cd23211ab3e374e815690ff760c8feef3fa582b7dccff4537709d844dd68c5aad577c5297ff32c483398dcdb50d785da5ca4f8a7d9f
+EBUILD jansson-2.5.ebuild 923 SHA256 5d86146631b01ccaeca5ec32377c05b1ac95ac9f703308e572c71711b6b32560 SHA512 bc799e95257b684a54816a037ce9706088f1d70c08a3091af051c3c4c1100985c74bbbdb61aaa72f6b61ddd45da1dfe91a09c4e1182edcba491a12e79497a8b4 WHIRLPOOL 1473a2872b2aa57c39bfd0c3640378eed240ace56e14d3e01595335f8a97012734b0e6274b5c9f8b0ba1bc82b13a040300226f14e5fa33ce5bc8998ce3b9fa5d
+MISC ChangeLog 2011 SHA256 71635ff5c73392ee486964643e23c677dfbc97affa3641369995b925b5ff7705 SHA512 6809baf83578b5709145a2d1019185b4e4eca350370895e830d8e71b818ac2ec67247e905b9e8edf093758e9184ab5e3fb32dfa4935fbfcc6bd3cec7ade0e149 WHIRLPOOL fc55a0cf73ed0abaf66a0e280bbe53d5177d8d58a7436bb0e5881a867f15f9651994ec111d2b1489808f3486f516fe59c3925dbdabd7d3afed7c91d174395b53
 MISC metadata.xml 524 SHA256 1ee2892d97f4395fb1c0410cb372a6b38675496db5c3220818a9acdb353862ba SHA512 c700333cee614e9ec31665ff46a7a05553241eda98569872c1d3de1770e895025af4a89132d914024a8334b1e8074c9350d7391750cafd30dfcaa848da4f657c WHIRLPOOL 5fcfc353f16c3dcede2511279773d681e4d9fe952f9eedad6a24bdec8aa23738bfb9af61a0dccaa76a673cf442715bcd98ac747c62b5f7afd54c3e5954cc859e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSZNdqAAoJEJWyH81tNOV9nE0H/i/0U1qdDqdgaab1UNZqjj1b
-TcenuKWu2uTqvobGeLLu8PCCphkMT6QRPO6NrZUWj0ICTocjA1/yd4ibzLCylDZL
-qB09iTJwdLaB6+ct4o12Y2hsPkbSR/fjAdQyEHRCIrrkX/dzf+10jOBC5JyXWVg9
-HduMAc8wdU1MEzmqbrPT3ZhbGC08Rh1rGCv8tednnyL/hvAHNr5c0C0saGYRLNv0
-BLOaE7vdZz+9GIkDJcvxC/538ku7cf1LWqNBRQQf1QQC/v910KnvL9V22/ojF1Ou
-xeknOxyaHPWNzOEYv6yvEd6DPkZrz+4NlLlXmtOtPYiF8QGd77H2yvtIsmIwAOk=
-=V779
+iQEcBAEBCAAGBQJSZNrUAAoJEJWyH81tNOV95RwIAIaCsVGrbQyaKufBQj1xHgvJ
+Mi0MTZpBjm0NCV9f7x9aTolIxznaLJha+IWf1S4OZihPE+aKuJZkfOuWR/NrB2zP
+rAO5xqJlWHyePqyDGff87VE+5JvMTOtFUTQFOkD+hfgoqe8lbdTc++/TY+VKA8E+
+jjcjZ1GBU7Z1G1Hpng2mDmDaG9REOYQytArzFHxEzzhwXj0T0zGISWmxHgXRzr1F
+ddg71N37WnUqZ1OyMtFiGz99bVGHjCGIR4Rov8Akp6DDK+SXfKSRgSNCxyQ2z3b1
+8SNe1ATqNCfcXkSu0AbNJf8g1Q34d8VHdIU/9v8x9hT+byeWhqsjOmojeEG4pHs=
+=V+dz
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/jansson/jansson-2.5.ebuild b/dev-libs/jansson/jansson-2.5.ebuild
new file mode 100644
index 000000000000..4d65f5351010
--- /dev/null
+++ b/dev-libs/jansson/jansson-2.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jansson/jansson-2.5.ebuild,v 1.1 2013/10/21 07:42:19 tomwij Exp $
+
+EAPI="4"
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils
+
+DESCRIPTION="C library for encoding, decoding and manipulating JSON data"
+HOMEPAGE="http://www.digip.org/jansson/"
+SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
+RDEPEND=""
+
+DOCS=(CHANGES README.rst)
+
+src_prepare() {
+	sed -ie 's/-Werror//' src/Makefile.am || die
+	autotools-utils_src_prepare
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	use doc && autotools-utils_src_compile html
+}
+
+src_install() {
+	use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/doc/_build/html/")
+	autotools-utils_src_install
+}