gentoo Easter resync : 12.04.2020

4 files changed, 58 insertions, 2 deletions

diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index 3cf04b017085..e9192bf5b9eb 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -1,6 +1,8 @@
+AUX libmowgli-2.1.3-cacheline-Ensure-sysconf-var-is-defined-before-use.patch 831 BLAKE2B 552140cae8b31f796826487319286fc5d59972e2036bb33a8a2c6febcf0fc8fc8bea502a0d5aa3d00e0028534c1891e19ba92ee0c4071ba3fd8b8fd9bea5158d SHA512 8f572b47fa62918be88dc11028a916897aeda46691b5b4975f87227aad2141fe472fdcff3431d61c42cdeb8322aab1e065d8ac155f2f367f4c28a6ae97799271
 DIST libmowgli-1.0.0.tar.bz2 105929 BLAKE2B f22af94e1d5693e92544e9c177f56caf7fcbbf3f46a254e1e6982ba0e6f41443bcf70d1b944cd68e7eea7a0247dd478777afcebb5db80742312149f52dd86bc4 SHA512 f3f7f9a527cb3f6f24c23d0585b55509d8721023c670df9e59a7f5667d4e12caf17ed71773cd1283a3ebfada465824653f654aa29d857c076875d36b2a824313
 DIST libmowgli-2.1.3.tar.gz 227742 BLAKE2B 9ef5c30880644247df3c98dabbd87694d0a7c92e7de0c44a73842d4c5bbc7f19a32db24acc52b27fe5f204b1f74a5c730c64edd1e8edd23bc320e4c0dc4a554c SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533
 EBUILD libmowgli-1.0.0-r1.ebuild 486 BLAKE2B db77100a9b1cb80ab0ebe85361a3cfea16ee3d5b6ff2e88c177d88012bd10ea42efbfee56628edff10a397b2c446e18578ecb647f0608309a0de3cf324363a7e SHA512 91ab512aa3ca354f648c277c67728bbb8a5c4fa151f26989e23b7aef96058bdea4a10c7b6ac84f20df0873b339621f75ec5a20a2a953f2df3d941a4b81b877c9
-EBUILD libmowgli-2.1.3.ebuild 781 BLAKE2B 1b89a244f6ad38c145198bd9af77f65fa73f28a6fd3198dbe3a0a3c9e2ccd46fdd0a533d0cca7d19884aaca08ad595c623ccbf55d1ea61e9fcf1334b10571ace SHA512 119a4b8d2db648965c31802a6835a0f0263cbf473eb07124105a171fe7ea0d56e0ce8384514bc936613528de69e3c10fc27b06d48dd3785528cbd780e6550b7b
+EBUILD libmowgli-2.1.3-r1.ebuild 865 BLAKE2B 1de5be867d01c3414202ca7fa5489a34ad5ff2890769c3ee9a8f76c08655142352cfd5d0936f931d78498cc5956a8cfd584c0ca775662cbfe542b00189830f95 SHA512 41e959de5c820bec3bfe29b9db71450571915ba460aa8c755616a32edceb235fffd6434ee3575998941da1f63e7743c260cecd7e91b882dd92adda711c995428
+EBUILD libmowgli-2.1.3.ebuild 768 BLAKE2B 2ba06b85fb6c734b51d9aca2acceccbbf064bed72fc96733f041216c4b6f524b78abc1fb062cebcdf405a5c1f886666930354fd12a67d87272fec0c0cac45fcf SHA512 e273b120af4cac325069cc9a50e90fdc1aa2e694117b9a0ae18e81e91e2e50fd85b79e8963286bfe4ef2ac10c9aa4711884a5e8e97e2e3bb970f523e9387313c
 EBUILD libmowgli-9999.ebuild 608 BLAKE2B c6dedd277c9406c534b97383d19a58a4ed461c49e96877deca89b02354ad43473a00b51e460e25c52f97323dd36d0a70100ffae2e68b4e07d4d09841f49dd390 SHA512 e4f523ef69e89ffa039494816d20cc552264d0f3fbbc054a198a5697f88aed24b3b8a812febd5eae00b5fd94ddebdcf82c7962d88b44a6ccfbfe80d6cb69f821
 MISC metadata.xml 364 BLAKE2B 3cf2dc0b9b8e9e25f34ed1e94214c05479d25ac7bb560680efec14ef19f61eef74c5edeffa9538c241ffdb7fe86bae4ee6c0865887e26f54e16cc5f064fb277c SHA512 dd547ca4323b0a3ed2d731ab482159ffdb22158bede172abcebff3460e20f284088659311c954919ce5f87e3fe6f90acce3c635612b7e0ca43ddfd85bc608843
diff --git a/dev-libs/libmowgli/files/libmowgli-2.1.3-cacheline-Ensure-sysconf-var-is-defined-before-use.patch b/dev-libs/libmowgli/files/libmowgli-2.1.3-cacheline-Ensure-sysconf-var-is-defined-before-use.patch
new file mode 100644
index 000000000000..ff070e1d00ed
--- /dev/null
+++ b/dev-libs/libmowgli/files/libmowgli-2.1.3-cacheline-Ensure-sysconf-var-is-defined-before-use.patch
@@ -0,0 +1,25 @@
+From 2b8892fe2ca51ef0334b08babad0fa9d689087c0 Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Wed, 27 Sep 2017 01:42:33 -0500
+Subject: [PATCH] cacheline: Ensure sysconf var is defined before use on Linux
+
+---
+ src/libmowgli/platform/cacheline.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libmowgli/platform/cacheline.c b/src/libmowgli/platform/cacheline.c
+index 90c803f..7651588 100644
+--- a/src/libmowgli/platform/cacheline.c
++++ b/src/libmowgli/platform/cacheline.c
+@@ -32,7 +32,7 @@ size_t cacheline_size;
+ void
+ mowgli_cacheline_bootstrap(void)
+ {
+-#ifdef MOWGLI_OS_LINUX
++#if defined(MOWGLI_OS_LINUX) && defined(_SC_LEVEL1_DCACHE_LINESIZE)
+ 	cacheline_size = sysconf(_SC_LEVEL1_DCACHE_LINESIZE);
+ #elif defined(MOWGLI_OS_OSX)
+ 	size_t size = sizeof(size_t);
+-- 
+2.24.1
+
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r1.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r1.ebuild
new file mode 100644
index 000000000000..2597f8dcc4c6
--- /dev/null
+++ b/dev-libs/libmowgli/libmowgli-2.1.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
+HOMEPAGE="https://github.com/atheme/libmowgli-2"
+SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="libressl ssl"
+
+RDEPEND="ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	!~dev-libs/libmowgli-2.1.0" # Bug 629644
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README doc/BOOST doc/design-concepts.txt )
+PATCHES=( "${FILESDIR}"/${P}-cacheline-Ensure-sysconf-var-is-defined-before-use.patch )
+S="${WORKDIR}/${PN}-2-${PV}"
+
+src_configure() {
+	econf \
+		$(use_with ssl openssl)
+}
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
index 2e32ca8747fd..a88e8a947421 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="libressl ssl"
 
 RDEPEND="ssl? (