gentoo resync : 25.08.2020

4 files changed, 11 insertions, 52 deletions

diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index fbb92f7727b3..d73f262fd467 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,7 +1,5 @@
-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 842 BLAKE2B af64bdad4ba158adeeadbc300150a217e9f3d20467f23191f1bea15fab3da644fa9e266438fb5678f56667ec60a7dd1b55ffee93d3ddc2986eb0dfdd66fd9fef SHA512 453a1e121cf054b395c209e30632fa0710e023c0b1bfa2452bd14696f87ef9273b46f3a4f7def1cab9f65a7270d7b4929046ebcca3d8294ed8a5511723e2ea44
-EBUILD jansson-2.11.ebuild 817 BLAKE2B 99ccfd23b44723da53c5e82346397d8871eb04cc6ceb831994c65b8133659f57a79db6d7c5c5f8d4994e37e9209777e1c6fc250740e9a82bea7f1123052c9c0b SHA512 62794ce12be688f3e793f3155b7aabd2af7d063ad8e6ca3bf322f15876a0c056eda0276a9ace6c9252e34afa753d5e73dcb05d013324737d64777c757ac35002
-EBUILD jansson-2.12.ebuild 820 BLAKE2B 14b93f916bf78abe59a239b1dce2ab361114f4111fd908caac1927d6ae50963ae73f60ad841adfd58272888679ed0885dcfb31ef27194fbd03eaa823c9ab7a4a SHA512 76322dcd0385251f3bf20af46231aca8bbf607e2989ad0a9f3f263703908c7fb44139c536e2f70ea70584799d8b55fed6cddb52a5dd40a4c907d4370a51f36de
+DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
+EBUILD jansson-2.12.ebuild 817 BLAKE2B e517e55debf4bd3971c2d93b906a1081baa510222deff3e2c8e09388e28af1891c3d0d43b6800abdbc33b6380bdf5627a8409f6da21d2356c146fb6c2155427f SHA512 500d974d2708280e1ae4a157e39034bab3b73ba56e4aad3ed7ed6e9942165b31500fb92fafcf0b94328fa863ef2c01308069fa1f6f13cb32dcd6287913fc3b2e
+EBUILD jansson-2.13.1.ebuild 891 BLAKE2B afd3ae0f565b15b21caf145772d0e18d88233e48bff6e5f108f7a1c9ad48af06c7dc962557bb930b1121976ae19ae3bbfb1c4cfdf8a16c95fffb65815832bb9c SHA512 0119aad5dad85732f2385466f74b4bfb8527cec51e706adea00938e5f63e64acad1317a34d24daf3f736d9be28763b142ea3dfa5f1d1ab0616943cece82303e7
 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.10.ebuild b/dev-libs/jansson/jansson-2.10.ebuild
deleted file mode 100644
index bc96765a19c1..000000000000
--- a/dev-libs/jansson/jansson-2.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools 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 sparc x86"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
-RDEPEND=""
-
-src_prepare() {
-	default
-	sed -ie 's/-Werror//' src/Makefile.am || die
-	eautoreconf
-}
-
-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
-}
diff --git a/dev-libs/jansson/jansson-2.12.ebuild b/dev-libs/jansson/jansson-2.12.ebuild
index 7e824cc73235..68ae0abd38b9 100644
--- a/dev-libs/jansson/jansson-2.12.ebuild
+++ b/dev-libs/jansson/jansson-2.12.ebuild
@@ -11,10 +11,10 @@ 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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc static-libs"
 
-BDEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
+BDEPEND="doc? ( <dev-python/sphinx-3.0.0 )"
 RDEPEND=""
 
 multilib_src_configure() {
diff --git a/dev-libs/jansson/jansson-2.11.ebuild b/dev-libs/jansson/jansson-2.13.1.ebuild
index 8fed85e9a635..8b9c7d1b6c5e 100644
--- a/dev-libs/jansson/jansson-2.11.ebuild
+++ b/dev-libs/jansson/jansson-2.13.1.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+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"
+HOMEPAGE="https://www.digip.org/jansson/"
+SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc static-libs"
 
-DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
-RDEPEND=""
+# dev-libs/jansson-2.13.1[doc]: fails to build with >=sphinx-3.0, #731668
+BDEPEND="doc? ( <dev-python/sphinx-3.0.0 )"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)