gentoo resync : 28.04.2021

5 files changed, 11 insertions, 42 deletions

diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest
index 4388ed82ca35..48e11e67d6e0 100644
--- a/sci-libs/superlu/Manifest
+++ b/sci-libs/superlu/Manifest
@@ -1,8 +1,8 @@
-AUX superlu-4.3-autotools.patch 18676 BLAKE2B c6312a4db288aed46f696b57291268cfe435f531b5cade47f146fce74bdc8e9e7efb6b200448c06b6aa0cd57188d87fe2e20557678e98f83dab07526bcc42d91 SHA512 62f868126af7acc3658bdff6eda8839d06dd14b5195d23a2b7bbbe1008e9258875ac3c9bc4ed40f4ac58443ac4aeef786499b02ff45f2adb304160f3b25b0bf3
-AUX superlu-4.3-format-security.patch 312 BLAKE2B 2ab1eaa7072a06abf80373a86e73d3cd131a5dfb1fee370fac330c7932d0b20dc94f2711be077d3739af0f1d6b9779080f0ccf75a65b50156aab35cfd451b7d4 SHA512 86072c671b946a73e8857fcf60499c589c0de8ca2433c2310701a2249eb32968e7ab83e638be1fcee3358d3b1432cba988cf11644962dbf09045b4907b9ebf6a
-AUX superlu-5.2.2-no-internal-blas.patch 733 BLAKE2B d289296570a02914591ed213e1c866124ae29f94348ca5cbfe9313dc581e12aba20fd34741b89b84988365c4c64b14c47d08b82c79870ab57f21dc8d0a0f6370 SHA512 496f5ed971cdd2dfaedf065d5ec52e0c6435506fcace45ed9059cb17d9ea1914cc9b0276b68a250728cc5bcf48a184bca5638e3fcadabd170eb1c8c9d342844c
+AUX superlu-4.3-autotools.patch 17799 BLAKE2B 0676f8a5ca9019aaf047503fc9be675a8de5ac8d68c182c50b23b75b46b793e04ee3560cfbdce2e9b3febc725520177d1e9571f2c75455e7e5ae65b7b8079e74 SHA512 c1f8bc4b0e5314266be9c11f0d536495e7414d62f0df996d5c9192796aa3604e363e1c07b5b6de5755006184cdd2efe04b938598b7936482f9ea091ea3c4dfec
+AUX superlu-4.3-format-security.patch 178 BLAKE2B 3e4982f52d99c79054449822caf2edf37b325e7eb2a49312f4ead42cc733877325c01b63502c1ebf45006ba5b0875109e4d38f919e7ad9f1f99d502daf619deb SHA512 661211470c6e0cefed1c403592c308354331fa9bf8332b86da36284036ba4f98d904b0d510c27232f7b3d84306d182e172a9a2acdd4f4618fec893ca74d27455
+AUX superlu-5.2.2-no-internal-blas.patch 658 BLAKE2B 63c782d994b8caded0b707c2a26e614b935cc6a067cdd80cc29a4456d419ac20a2b7454f64c27c6dcafaba5eaa1fac1f957d2f78749e4209e73647346e2f62a9 SHA512 c0f5d203c7f764f3cc9e61a4d703cbbe66d0bb982412046af617be8935143026e8cc07d2fee2911d7e9cb7488bcdd32a26850b15eab4776f62a26f139066bb3c
 DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c
 DIST superlu_5.2.2.tar.gz 2481538 BLAKE2B db9d6437c8012f1aeeb3313212298a77e4ef04405c6ec853ceeef8b80426ea80d8b9fc30a0ca2dd7288131a0e21c43e17cafafaa7fb615d6d825b54f4beb84a2 SHA512 091928a3df3433b337ebdacdb28de341d6d29d655965de6ffd656a6de18cf11171555bfd3af73082af62b1cead6835b4c11e4ba524a32db7f7d28db47c9d490c
-EBUILD superlu-4.3-r2.ebuild 1583 BLAKE2B f1eeb354d7a41826a980aee35707f1d3d6c15753cce38615f8f360b8feb1ab2efda9cc65b1d30e6e0513eba136adbff4113a0a6a4ca06139f19da8e45bddcbff SHA512 89562c3f9521cac172068a6185b6b2a8970c9f04f298587734cd360b41cba4d2072577bdc2afe68c2203fc6c8ce157448aa3a870bb6c63f12bad8bb35374c9e4
+EBUILD superlu-4.3-r2.ebuild 1626 BLAKE2B 96ecd71fb11f356a11326173139b5927d629704a7a751d775f6b11bfe3f0f0ccd5c5959c12400fa689d49edf59cf09fc528b73861ed60d933fbdaad3657992bd SHA512 64bc5dba99ab70e37f088da00b45b8a78e69a23a54e0f35b7688db37c531070f3b8c02c4b7500527dc7105af2bef51bb53695da6d85f64920c7fd3f77e542d4d
 EBUILD superlu-5.2.2.ebuild 1170 BLAKE2B 2c65c4428e1564385032efb8c6d40cceca3c0b64f5c56d4f44f11e5f92f4eb241dd15e4510eff40546557eb211dbd04d5b2c1235db997850f65d394705587d3b SHA512 1480bbac2e9beb3333cd4c4c569da6e3089b9e8ae823e8f770ad464994a741497e65f39068eae439c29e6ef5a3d466ad06695ddb0b29058de2f342ade16f6ce6
 MISC metadata.xml 1404 BLAKE2B 3ab566d18d18307d9fc7dea889e492e19b76aa9fdebe0dce86b46b1cf7a2d53f65404f56da04cc8420e6a7c21867b948e537833693cb60521746c5a48f16bc6b SHA512 8b758572ed599bdf43898050e265ce8ea82c4952af97471c09ee0013e56cf6928df3f3a436516c4fae7a38a13bba4a3437e130f294f942eaaae05125fa5fbdea
diff --git a/sci-libs/superlu/files/superlu-4.3-autotools.patch b/sci-libs/superlu/files/superlu-4.3-autotools.patch
index c5aae0159344..5deeba83cf3f 100644
--- a/sci-libs/superlu/files/superlu-4.3-autotools.patch
+++ b/sci-libs/superlu/files/superlu-4.3-autotools.patch
@@ -1,14 +1,3 @@
- EXAMPLE/Makefile |   68 +++++++++---------
- FORTRAN/Makefile |   14 ++--
- Makefile.am      |    4 +
- SRC/Makefile.am  |  110 +++++++++++++++++++++++++++++
- ax_blas.m4       |  201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.ac     |   16 ++++
- superlu.pc.in    |   13 ++++
- 7 files changed, 385 insertions(+), 41 deletions(-)
-
-diff --git a/EXAMPLE/Makefile b/EXAMPLE/Makefile
-index c286ded..37950dc 100644
 --- a/EXAMPLE/Makefile
 +++ b/EXAMPLE/Makefile
 @@ -1,4 +1,3 @@
@@ -21,8 +10,8 @@ index c286ded..37950dc 100644
  #######################################################################
  
 -HEADER   = ../SRC
-+HEADER = $(shell pkg-config --cflags superlu)
-+LIBS   = $(shell pkg-config --libs superlu)
++HEADER = $(shell ${PKG_CONFIG} --cflags superlu)
++LIBS   = $(shell ${PKG_CONFIG} --libs superlu)
 +CDEFS  = -DAdd_
  
  SLINEXM		= slinsol.o
@@ -164,8 +153,6 @@ index c286ded..37950dc 100644
  
  clean:	
  	rm -f *.o *linsol *linsol1 *linsolx *linsolx1 *linsolx2 \
-diff --git a/FORTRAN/Makefile b/FORTRAN/Makefile
-index 23671a7..54da751 100644
 --- a/FORTRAN/Makefile
 +++ b/FORTRAN/Makefile
 @@ -1,12 +1,12 @@
@@ -179,8 +166,8 @@ index 23671a7..54da751 100644
  
 -HEADER   = ../SRC
 -LIBS	= $(SUPERLULIB) $(BLASLIB) -lm
-+HEADER   = $(shell pkg-config --cflags superlu)
-+LIBS	= $(shell pkg-config --libs superlu)
++HEADER   = $(shell ${PKG_CONFIG} --cflags superlu)
++LIBS	= $(shell ${PKG_CONFIG} --libs superlu)
  
  # double real
  F77EXM	= f77_main.o hbcode1.o c_fortran_dgssv.o
@@ -208,8 +195,6 @@ index 23671a7..54da751 100644
  
  clean:	
  	rm -f *.o f77exm zf77exm
-diff --git a/Makefile.am b/Makefile.am
-new file mode 100644
 index 0000000..7e51046
 --- /dev/null
 +++ b/Makefile.am
@@ -218,8 +203,6 @@ index 0000000..7e51046
 +
 +pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfig_DATA = superlu.pc
-diff --git a/SRC/Makefile.am b/SRC/Makefile.am
-new file mode 100644
 index 0000000..748e5e9
 --- /dev/null
 +++ b/SRC/Makefile.am
@@ -334,9 +317,6 @@ index 0000000..748e5e9
 +libsuperlu_la_CFLAGS = $(CFLAGS_SAV)
 +libsuperlu_la_LIBADD = $(BLAS_LIBS) libnoopt.la
 +libsuperlu_la_LDFLAGS = -no-undefined -version-info 4:2:0
-diff --git a/ax_blas.m4 b/ax_blas.m4
-new file mode 100644
-index 0000000..e4f96cb
 --- /dev/null
 +++ b/ax_blas.m4
 @@ -0,0 +1,201 @@
@@ -541,9 +521,6 @@ index 0000000..e4f96cb
 +        $2
 +fi
 +])dnl AX_BLAS
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..f6707be
 --- /dev/null
 +++ b/configure.ac
 @@ -0,0 +1,16 @@
@@ -563,9 +540,6 @@ index 0000000..f6707be
 +AC_CHECK_LIB([m], [floor])
 +AC_CONFIG_FILES([Makefile SRC/Makefile superlu.pc])
 +AC_OUTPUT
-diff --git a/superlu.pc.in b/superlu.pc.in
-new file mode 100644
-index 0000000..7bf9942
 --- /dev/null
 +++ b/superlu.pc.in
 @@ -0,0 +1,13 @@
diff --git a/sci-libs/superlu/files/superlu-4.3-format-security.patch b/sci-libs/superlu/files/superlu-4.3-format-security.patch
index 809408a166ab..a2fee7e7c20c 100644
--- a/sci-libs/superlu/files/superlu-4.3-format-security.patch
+++ b/sci-libs/superlu/files/superlu-4.3-format-security.patch
@@ -1,8 +1,3 @@
- SRC/util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SRC/util.c b/SRC/util.c
-index 858fbbc..c038ccf 100644
 --- a/SRC/util.c
 +++ b/SRC/util.c
 @@ -29,7 +29,7 @@
diff --git a/sci-libs/superlu/files/superlu-5.2.2-no-internal-blas.patch b/sci-libs/superlu/files/superlu-5.2.2-no-internal-blas.patch
index e48a7c86fa31..cbfc013141b5 100644
--- a/sci-libs/superlu/files/superlu-5.2.2-no-internal-blas.patch
+++ b/sci-libs/superlu/files/superlu-5.2.2-no-internal-blas.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 08027ce..8884585 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -121,13 +121,7 @@ if(BLAS_FOUND)
diff --git a/sci-libs/superlu/superlu-4.3-r2.ebuild b/sci-libs/superlu/superlu-4.3-r2.ebuild
index 7ff9a6d2020e..14c89813db21 100644
--- a/sci-libs/superlu/superlu-4.3-r2.ebuild
+++ b/sci-libs/superlu/superlu-4.3-r2.ebuild
@@ -46,7 +46,9 @@ src_configure() {
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 	)
 
-	econf
+	tc-export PKG_CONFIG
+
+	econf "${myeconfargs[@]}"
 
 	rm EXAMPLE/*itersol1 || die
 }