gentoo resync : 20.03.2021

4 files changed, 43 insertions, 5 deletions

diff --git a/sci-libs/m4rie/Manifest b/sci-libs/m4rie/Manifest
index 3ce6c35a33fa..6788ae118972 100644
--- a/sci-libs/m4rie/Manifest
+++ b/sci-libs/m4rie/Manifest
@@ -1,3 +1,4 @@
+AUX m4rie-20200115-link-libm.patch 654 BLAKE2B af7ff7b56c14078817b6a12a8184c81e1547a0c75b682d7398a040645be7e392ce3f923be56110bbf282f0ed729aa5ea2fadb23d6815aa96370d99ba29f7b2b6 SHA512 6d85c998f0f2f85c9f3cb77861318eab31b38bcb88ff3133fc3bbef0492fcb412e832d92f5d76c63aa3c979cd21e55164a2a53bc08c67da6f22bd1d27d08e883
 DIST m4rie-20200115.tar.gz 500702 BLAKE2B d8b1506ef9902def6577851a97dd6f7da986dce39b3250f9f9b66f9caf8f811568b7975165fb75b6b8ab3c9faf65d890f7c2254725224266f1250a0bcf18a464 SHA512 22c990cf06de9ac790f82f48e498b2bfc87fdf6834257f4e4a4c44e2446b4226438d21692d654008b58df36d8da746bba04dcf1a3d50e34ccf8c678efd5b642b
-EBUILD m4rie-20200115.ebuild 811 BLAKE2B bbab8fa2c8d29c1588974ad14d996887db63ef86d401889d7951450cd269a17d202961101b64e2b5872474e5739bbe11d0f90289750762479bf96eca04389446 SHA512 010eac87309db539996a29fbb421856c94376838de5653bd4e54734481f7bc9dedf2fc46ee32c32141e94f0bc938fe8dc89402f39abb8b11f9d7b5cda671ccac
-MISC metadata.xml 957 BLAKE2B 4f5e134533fe60df5f32154614dbd0ca69fbf2fdace991689c6a65ae03804593d4f45cdecdc12f73f366c765f314302fbcbeaf0de12f2fb7cdc7a3a26120dfbc SHA512 640ec04b19e1c3194d9abd0abb15cbba3294784bcde56d5bf6b0d661f551ab0d9f7f0b932ccec872cb74bc7536d027d27b5e95ca33f6220d0b8c74d5039f5c7c
+EBUILD m4rie-20200115-r1.ebuild 932 BLAKE2B 79b3a80e25e099b92e89ef08fc4406985e58cafff395d0d2dc5a5f72f8aa443de9bedfd12b4979ec60c575ea47d24b5211158dc01765dd7676c5e54017a19ceb SHA512 4cb268e946e00b54df1c06d7fc2f645c417d84b6cf0d1bb07d66eae4320af6f3918b765aa780cda7d7e42d32cccaab6ff3d0b99dd5a7abf64c12d2b0be6231e6
+MISC metadata.xml 987 BLAKE2B c77aa43b41816be2a6851c896ea7831fdab66dd4536122678a73ff9e6231f1c55b10e6858c594bf6ec09bf2748e80adab548ddf8e950a3bc66f97dacd412162e SHA512 16da47e2bc386108d2e74eb5942ebe4cfb80734e90f5cc9e48d4908f8374cb53d7fe26cecc31914d3d51048c0b7f77255620e48b50ade0c1f2df6cf6ef23d298
diff --git a/sci-libs/m4rie/files/m4rie-20200115-link-libm.patch b/sci-libs/m4rie/files/m4rie-20200115-link-libm.patch
new file mode 100644
index 000000000000..d640b5085661
--- /dev/null
+++ b/sci-libs/m4rie/files/m4rie-20200115-link-libm.patch
@@ -0,0 +1,27 @@
+From afab50ea468b0b44be6e8584793c8ee98045f8f8 Mon Sep 17 00:00:00 2001
+From: "Martin R. Albrecht" <martinralbrecht@googlemail.com>
+Date: Fri, 12 Mar 2021 09:49:45 +0000
+Subject: [PATCH] we use sqrt() so link libm
+
+fixes #22
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 1f19d49..71ed81c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,6 +18,9 @@ AC_PROG_CXX
+ 
+ AC_PROG_CC_C99()
+ 
++AC_SEARCH_LIBS([sqrt], [m], [], [
++  AC_MSG_ERROR([unable to find the sqrt() function])
++])
+ 
+ if test "$ac_cv_prog_cc_c99" = "no"; then
+    AC_MSG_ERROR([C99 support is required but not found.])
+-- 
+2.10.5
+
diff --git a/sci-libs/m4rie/m4rie-20200115.ebuild b/sci-libs/m4rie/m4rie-20200115-r1.ebuild
index 7030c39b71d0..48f2dd3f0476 100644
--- a/sci-libs/m4rie/m4rie-20200115.ebuild
+++ b/sci-libs/m4rie/m4rie-20200115-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="Fast dense matrix arithmetic over GF(2^e) for 2 <= e <= 16"
 HOMEPAGE="https://bitbucket.org/malb/m4rie/"
 SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz"
@@ -12,9 +14,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug static-libs"
 
-DEPEND=">=sci-libs/m4ri-20140914"
+DEPEND="sci-libs/m4ri"
 RDEPEND="${DEPEND}"
 
+# Requires eautoreconf.
+PATCHES=( "${FILESDIR}/${P}-link-libm.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	# m4rie doesn't actually have any openmp code. The configure flag
 	# stems from a mistaken belief that it needs to be there to use the
diff --git a/sci-libs/m4rie/metadata.xml b/sci-libs/m4rie/metadata.xml
index 33cb9a18e32a..911668116031 100644
--- a/sci-libs/m4rie/metadata.xml
+++ b/sci-libs/m4rie/metadata.xml
@@ -9,11 +9,11 @@
       long before I moved it into ::gentoo. You don't need an ACK from me
       to merge his changes.
   -->
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>frp.bissey@gmail.com</email>
     <name>François Bissey</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>