gentoo resync : 16.09.2020

3 files changed, 34 insertions, 4 deletions

diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index e9192bf5b9eb..d298ef3432d4 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -1,8 +1,9 @@
 AUX libmowgli-2.1.3-cacheline-Ensure-sysconf-var-is-defined-before-use.patch 831 BLAKE2B 552140cae8b31f796826487319286fc5d59972e2036bb33a8a2c6febcf0fc8fc8bea502a0d5aa3d00e0028534c1891e19ba92ee0c4071ba3fd8b8fd9bea5158d SHA512 8f572b47fa62918be88dc11028a916897aeda46691b5b4975f87227aad2141fe472fdcff3431d61c42cdeb8322aab1e065d8ac155f2f367f4c28a6ae97799271
+AUX libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch 531 BLAKE2B 13627cf2420f8a9f1c90010e9b40fd4234a6c6603857f463de7d469a1e2e148bdf1ac5dc620ddfc622b2fe6da64f52f9756b2e980e529a78d519bcdd9ef36cf6 SHA512 b4e35ea2cb241a48ce698f7fe094a9a55b0c901f3a9f613a308898714496c4b3b531380d81ab34651b6f24dd877341eeb1c694120d420096854daad03240bd01
 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-r1.ebuild 865 BLAKE2B 1de5be867d01c3414202ca7fa5489a34ad5ff2890769c3ee9a8f76c08655142352cfd5d0936f931d78498cc5956a8cfd584c0ca775662cbfe542b00189830f95 SHA512 41e959de5c820bec3bfe29b9db71450571915ba460aa8c755616a32edceb235fffd6434ee3575998941da1f63e7743c260cecd7e91b882dd92adda711c995428
+EBUILD libmowgli-2.1.3-r2.ebuild 1101 BLAKE2B ad30f4069f29175a3c6264d1912552d6233acd8ded90f74981ba3a51d10467566c450cc7c38f5607c8f50d7869cb255c7966da65337ccb94d34ee61bb7d3f9dc SHA512 7b14216532d8c2c870e8029671e48e9cc62657138f403b64f3cc0e0dd1aef7fd25e746582d4ccea6d23d633db2fa5d373594ea3e3e2c2d90784b739d53f4f883
 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-use-host-tools-for-ar-and-ranlib.patch b/dev-libs/libmowgli/files/libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch
new file mode 100644
index 000000000000..e49e7c2c99b5
--- /dev/null
+++ b/dev-libs/libmowgli/files/libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index dfebb14..b3bd072 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,8 +36,8 @@ if test "$pgac_cv_var_PS_STRINGS" = yes ; then
+   AC_DEFINE([HAVE_PS_STRINGS], [], [Define to 1 if the PS_STRINGS struct exists on your platform (likely no).])
+ fi
+ 
+-AC_PATH_PROG(AR, ar)
+-AC_PATH_PROG(RANLIB, ranlib)
++AC_CHECK_TOOL(AR, ar)
++AC_CHECK_TOOL(RANLIB, ranlib)
+ 
+ LIBMOWGLI_MODULES="core base container dns eventloop ext linebuf module object platform thread vio"
+ AC_SUBST(LIBMOWGLI_MODULES)
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r1.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
index 2597f8dcc4c6..4158cb1b6e2c 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3-r1.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit autotools
+
 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"
@@ -20,10 +22,22 @@ RDEPEND="ssl? (
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README doc/BOOST doc/design-concepts.txt )
-PATCHES=( "${FILESDIR}"/${P}-cacheline-Ensure-sysconf-var-is-defined-before-use.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-cacheline-Ensure-sysconf-var-is-defined-before-use.patch
+	"${FILESDIR}"/${P}-use-host-tools-for-ar-and-ranlib.patch
+)
+
 S="${WORKDIR}/${PN}-2-${PV}"
 
+src_prepare() {
+	default
+
+	# $(MAKE) invocation will handle passing down flags.
+	sed -i -e 's/${MFLAGS}//' buildsys.mk.in || die
+
+	AT_M4DIR="m4" eautoreconf
+}
+
 src_configure() {
-	econf \
-		$(use_with ssl openssl)
+	econf $(use_with ssl openssl)
 }