gentoo resync : 12.01.2019

3 files changed, 42 insertions, 3 deletions

diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index eb62bc4ede13..23975aecad58 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,5 +1,7 @@
 DIST jansson-2.10.tar.gz 487855 BLAKE2B b1d83ad1a37e66cb7c497284a7958882d5a7e13cec2260d9cc2b5eaef648feea66b70305dec9193f10cf77f37bdda17605277ea41735708ca6a9898b79fef807 SHA512 e331d5c097b4acb0b1df7d90d1d3453c26bd34bfe2e06af0027665bee9efecc2bc61cc7ab5b70dab1262bf80a3315ffb53b4176874fe07e20eee4b9ea7071d44
 DIST jansson-2.11.tar.gz 483686 BLAKE2B 873283a1b41eef1c57fbcb3d4cdb8c33b850d95ee93c800cbcc009e3e9c9e87278beff11800e63894087e51c767dcbd555fbde48163376d53be2bf72b2eac72d SHA512 0ae77cf7ec264536313639458ba20b66e221078cddd209df3ce45c895b897799954abc1ca4b0d5993b974135652804be6bede2825503469d56303470888382f8
+DIST jansson-2.12.tar.gz 489154 BLAKE2B cf6bc6d03daba921ec5e033bf57ff0055741cc935adb14d5d4a5f04056fa93c292bf88367db071ef7bb32fbc5d2d6f5f2ce658815a17939bd38ed5c0676ad091 SHA512 e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb
 EBUILD jansson-2.10.ebuild 857 BLAKE2B 7b1b318f3a0dab579b82019dc0fd07caee375f19c0a19f4c92ba0f59a094432d85e722eea298c1d38ffd8d0508139dd160e99c29d1bb2c3a8d6512f1d5ce9465 SHA512 4ff618e64579443a2811717259086ad988991a773b1d35f05456647b9e19d2b757107cdedb1e840ede68c36b82714117acf5a42f46d89b020a835ff67b2a2fac
-EBUILD jansson-2.11.ebuild 845 BLAKE2B c1dc7acd0b9bb849774c43cb60a51011e067228348e4f81f4a3005e4f3c47ad310b707e53270efa7163c50a5fb3b79d1b95e296d2f2efa82983090644b1b4645 SHA512 665569db3edf7d1bc9701536c75226b71b2860a56cda6b5a76c37882eacd9f018267a97dd10ab987c1b6e628a08762f8754019a570bbdab54d2717b0beea9849
+EBUILD jansson-2.11.ebuild 835 BLAKE2B 8418b7e36bef00dea25d625c70f473285f69cebeeb166b7a9a3049d43b98b6505c9bec1a90110f6b2f305bf67e7f5e85d47d4c0991238c392f9945e2a45c9768 SHA512 d4db2975eb58192f6786127b820d97d9ef7ab073e6b50360f3dafe0fb74b430368352dbf6943e90b592e7852328f0caf08667a5bf1ca2644332a3c0459ee48a9
+EBUILD jansson-2.12.ebuild 843 BLAKE2B 845079169e230b7e38d2746e59d64e5d50c1ec4f31a65358a57e3ba070ca8bbe4311508a357818df6a2b6b95f5d5a7e6d38c4706209f77af71f4977ffc554924 SHA512 a63d2a052aef16c61b356faf80e1255c986a77415994be0c6e53e170eb77cad7d48d67889cd319f0abd068485a3b7f32eb7b1fa3aa555095da321719b46f06a2
 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.11.ebuild b/dev-libs/jansson/jansson-2.11.ebuild
index 595c96d72f9c..bdccaed5cbce 100644
--- a/dev-libs/jansson/jansson-2.11.ebuild
+++ b/dev-libs/jansson/jansson-2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/jansson/jansson-2.12.ebuild b/dev-libs/jansson/jansson-2.12.ebuild
new file mode 100644
index 000000000000..5fee180dfaaa
--- /dev/null
+++ b/dev-libs/jansson/jansson-2.12.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc static-libs"
+
+BDEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
+RDEPEND=""
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		emake html
+		HTML_DOCS=( "${BUILD_DIR}"/doc/_build/html/. )
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}