gentoo (valentine's day) resync : 14.02.2021

5 files changed, 90 insertions, 48 deletions

diff --git a/app-crypt/dieharder/Manifest b/app-crypt/dieharder/Manifest
index 623a4b791b4a..b0d12e776180 100644
--- a/app-crypt/dieharder/Manifest
+++ b/app-crypt/dieharder/Manifest
@@ -1,5 +1,6 @@
-AUX dieharder-3.31.1-build.patch 4920 BLAKE2B 8d297ff8519d0e0b197c1975dc84b7f8d04b9af78bbe957836d7e486f1876cd17dd7cc0f2d84b43d946a3ad9e6a4a9bf86e088f2d0e81cb47395ce519360806f SHA512 4a10cfb295e2a79ca76e7812d92e55db8c07ebba5061fb61d512afcd5c6f0548810b0c7ac859d0a89c88a83775b74e192b2682ebe19ca1e1412d93ff3830dc05
-AUX dieharder-3.31.1-urandom-64bit.patch 2689 BLAKE2B 9c7d27bdfdf53b5884d9fcb32331231ce034bd4342e73822e8f6b224de6b44fb2b49fd7a0e86d5f5334d61bf231ca0a6f8cd2254fd28a74db5dd580e495c81e2 SHA512 2c99ab9df82fca20123ec3950032b9c6b6e8cd919ef06e0a7ac72818474b5147d68e195db5334fd9689580cc1d669b9893f3784ad645a69598b707537ae63851
+AUX dieharder-3.31.1-build.patch 4500 BLAKE2B 03317321419ef75c0d20300c3ae178702cfcae3840021d4396beac306d1c4b2260e34dc3f50bc53d451ed5dea9fed6a2b129bfdba44d8dcc01f5f50866736771 SHA512 62fa204571662a81bd3b1cc27a9ee77ce229b79e374c1be57cb8280362e5b336564f109b6811f459e1be5e59a4565200d927f94fb6afaa18b71eb80c0bc323de
+AUX dieharder-3.31.1-cross-compile.patch 2048 BLAKE2B aee35b8d192a2e78fe1da2a35ad662c30764cc07dbf861d3ded9d551f880b5473d63a29acbd67eed50b3622c9ecd294f99f211fe14a13b4a5cb8dadef95f2b66 SHA512 effb05cc65ef8b5ca565abaebffa947b162b0d51fa3ae97d7cdff4b278737339a6a3524acc114b462df8756c07180478ea0f82be961d6dc7cc4025941d2c261f
+AUX dieharder-3.31.1-urandom-64bit.patch 2034 BLAKE2B 989640b3d5a946f3d81ec5cee9747329ecb7246b5ab0473b906d42e5faa971d1aaad43ac54be7b7cad1483cc5605ad70c0f71338b9cf9a22616d2662318bed57 SHA512 2a8d7f766b1eff4911e6aa7cd788cbbffe6ed05cfd27053042d8631786164383ca56783c43a2b4403e5cbf45c2d3d83fd46e427490d3bc2dd8eca880ea3e93da
 DIST dieharder-3.31.1.tgz 1149780 BLAKE2B 12937b54e713ce87d6cb815b9b1e00989085b7661538316649caea4a514518528039441d0d42f377c363c62db179f362feb9d64612a75f724ac363744f884a47 SHA512 e01ed4266b4fe5d5fadde3c92c30e430d0ca5f7fedd26b26ed2ab98b7602aa9c35bb5c8fd9314ef2f5235b5087645ab13e5e6550156e26643baa5aeb77088dc5
-EBUILD dieharder-3.31.1-r3.ebuild 1135 BLAKE2B 4fc3d75c362ad65b14b0485defc18f7d6378ef8ea9479e621e1287cc2789269c080c58711198d5206f9c29b67ff46067800ccab5c916565742d4103b6e51af67 SHA512 c09c9af6b8cd1b75ceb1449f70f8d14e8b21acacc6495028271112c8405aded49fc490e2f501a45e61356a48697e1e433b7e74f2966c37b0db9b1c5904a97e0c
+EBUILD dieharder-3.31.1-r3.ebuild 1151 BLAKE2B 0c83dca88ebd150dd2d72247459655e2e774de73aeb44c1570a70ffcaeca0b314afd7e813d19995382ccf515c2a9809e8bb0a1c66a365a049e6574e83fcaadaa SHA512 0fa26bdb8c663207ce231fdcd88e239b56a9c374d81c930acf4edce8e4870feb124f0203ad1f8f77800ace107aaf3ecd8147a0039a5583ed1c0a950bd9e76925
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/dieharder/dieharder-3.31.1-r3.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r3.ebuild
index 269cb352cf1f..fe4f37aa10e3 100644
--- a/app-crypt/dieharder/dieharder-3.31.1-r3.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r3.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools flag-o-matic
+
 DESCRIPTION="An advanced suite for testing the randomness of RNG's"
-HOMEPAGE="http://www.phy.duke.edu/~rgb/General/dieharder.php"
-SRC_URI="http://www.phy.duke.edu/~rgb/General/${PN}/${P}.tgz"
+HOMEPAGE="https://www.phy.duke.edu/~rgb/General/dieharder.php"
+SRC_URI="https://www.phy.duke.edu/~rgb/General/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -14,30 +16,22 @@ IUSE="doc"
 RESTRICT="test" # Way too long
 
 RDEPEND="sci-libs/gsl"
-DEPEND="${RDEPEND}
-	doc? ( dev-tex/latex2html )"
-
-DOCS=(
-	NOTES
-)
-HTML_DOCS=()
+DEPEND="${RDEPEND}"
+BDEPEND=" doc? ( dev-tex/latex2html )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-urandom-64bit.patch"
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-urandom-64bit.patch
+	"${FILESDIR}"/${P}-cross-compile.patch
 )
 
-pkg_setup() {
-	use doc && DOCS+=(
-		ChangeLog
-		manual/dieharder.pdf manual/dieharder.ps
-	)
-	use doc && HTML_DOCS+=(
-		dieharder.html
-	)
+src_prepare() {
+	default
+	eautoreconf
 }
 
 src_configure() {
+	append-flags -fcommon
 	econf --disable-static
 }
 
@@ -46,17 +40,18 @@ src_compile() {
 	use doc && emake -C manual
 }
 
-src_test() {
-	"${S}/dieharder/dieharder" -g 501 -a
-}
-
 src_install() {
+	if use doc; then
+		DOCS=( ChangeLog manual/dieharder.pdf manual/dieharder.ps)
+		HTML_DOCS=( dieharder.html )
+	fi
+
 	default
 
-	docinto "dieharder"
-	dodoc dieharder/README dieharder/NOTES
-	docinto "libdieharder"
-	dodoc libdieharder/README libdieharder/NOTES
+	docinto dieharder
+	dodoc dieharder/{NOTES,README}
+	docinto libdieharder
+	dodoc libdieharder/{NOTES,README}
 
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-crypt/dieharder/files/dieharder-3.31.1-build.patch b/app-crypt/dieharder/files/dieharder-3.31.1-build.patch
index 50e2119030c9..07d33171a4cb 100644
--- a/app-crypt/dieharder/files/dieharder-3.31.1-build.patch
+++ b/app-crypt/dieharder/files/dieharder-3.31.1-build.patch
@@ -1,5 +1,3 @@
-diff --git a/include/dieharder/libdieharder.h b/include/dieharder/libdieharder.h
-index 2138ebf..f6d471b 100644
 --- a/include/dieharder/libdieharder.h
 +++ b/include/dieharder/libdieharder.h
 @@ -6,6 +6,8 @@
@@ -34,8 +32,6 @@ Subject: [PATCH 1/2] rgb_operm: convert to noop as implementation missing
  include/dieharder/rgb_operm.h | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/include/dieharder/rgb_operm.h b/include/dieharder/rgb_operm.h
-index c48fa37..f33fc1f 100644
 --- a/include/dieharder/rgb_operm.h
 +++ b/include/dieharder/rgb_operm.h
 @@ -1,3 +1,4 @@
@@ -62,8 +58,6 @@ Subject: [PATCH 2/2] dab_filltree2: inline cannot have prototype nor can it be
  libdieharder/dab_filltree2.c | 48 +++++++++++++++++-------------------
  2 files changed, 41 insertions(+), 44 deletions(-)
 
-diff --git a/libdieharder/dab_filltree.c b/libdieharder/dab_filltree.c
-index 9cc5ce7..3ed6b00 100644
 --- a/libdieharder/dab_filltree.c
 +++ b/libdieharder/dab_filltree.c
 @@ -34,7 +34,24 @@ static double targetData[] = {
@@ -117,8 +111,6 @@ index 9cc5ce7..3ed6b00 100644
  #include<time.h>
  
  int main_filltree(int argc, char **argv) {
-diff --git a/libdieharder/dab_filltree2.c b/libdieharder/dab_filltree2.c
-index 1e33af2..7102d3c 100644
 --- a/libdieharder/dab_filltree2.c
 +++ b/libdieharder/dab_filltree2.c
 @@ -92,7 +92,29 @@ static double targetData[128] = {  // size=128, generated from 6e9 samples
diff --git a/app-crypt/dieharder/files/dieharder-3.31.1-cross-compile.patch b/app-crypt/dieharder/files/dieharder-3.31.1-cross-compile.patch
new file mode 100644
index 000000000000..18bbf659fc04
--- /dev/null
+++ b/app-crypt/dieharder/files/dieharder-3.31.1-cross-compile.patch
@@ -0,0 +1,57 @@
+From: Tom Hughes <tomhughes@chromium.org>
+Fix cross-compilation by removing gsl header/library check (these are enforced
+through ebuild DEPENDS) and using AC_C_BIGENDIAN instead of the non-standard
+AC_C_ENDIAN macro which tries to execute code.
+--- a/configure.ac
++++ b/configure.ac
+@@ -108,48 +108,7 @@
+ AC_SUBST(DIEHARDER_LIBS)
+ AC_SUBST(ACLOCAL_AMFLAGS)
+ 
+-#==================================================================
+-# Checks for libraries, and headers.  Test for dependency libraries
+-# FIRST in reverse order that you need -lwhatever to appear on
+-# compile line as it accumulates libraries to build e.g.
+-#   -lgsl -lgslcblas
+-# for the SECOND test, required (in that order) to succeed.
+-#==================================================================
+-AC_CHECK_HEADER([gsl/gsl_sf_gamma.h],,[AC_MSG_ERROR([Couldn't find GSL headers.  Please install the gsl-devel package.])])
+-AC_CHECK_LIB([gslcblas], [main],,[AC_MSG_ERROR([Couldn't find libgsl. Please install the gsl package.])])
+-AC_CHECK_LIB([gsl],[gsl_sf_gamma])
+-
+-
+-#==================================================================
+-# Check if we're a little-endian or a big-endian system, needed by
+-# brg_endian.h in the build of rng_threefish.  This is a very
+-# certain test, and therefore is checked FIRST in this header file.
+-#==================================================================
+-AC_DEFUN([AC_C_ENDIAN],
+-[AC_CACHE_CHECK(for endianness, ac_cv_c_endian,
+-[
+-  AC_RUN_IFELSE(
+-    [AC_LANG_PROGRAM([], [dnl
+-        long val = 1;
+-        char *c = (char *) &val;
+-        exit(*c == 1);
+-    ])
+-  ],[
+-    ac_cv_c_endian=big
+-  ],[
+-    ac_cv_c_endian=little
+-  ])
+-])
+-if test $ac_cv_c_endian = big; then
+-  AC_SUBST(LITTLE_ENDIAN,0) 
+-fi
+-if test $ac_cv_c_endian = little; then
+-  AC_SUBST(LITTLE_ENDIAN,1) 
+-fi
+-])
+-
+-AC_C_ENDIAN
+- 
++AC_C_BIGENDIAN([AC_SUBST(LITTLE_ENDIAN,0)],[AC_SUBST(LITTLE_ENDIAN,1)])
+ 
+ #==================================================================
+ # Checks for typedefs, structures, and compiler characteristics.
+
diff --git a/app-crypt/dieharder/files/dieharder-3.31.1-urandom-64bit.patch b/app-crypt/dieharder/files/dieharder-3.31.1-urandom-64bit.patch
index c5615b673fd0..e8a28ea41775 100644
--- a/app-crypt/dieharder/files/dieharder-3.31.1-urandom-64bit.patch
+++ b/app-crypt/dieharder/files/dieharder-3.31.1-urandom-64bit.patch
@@ -1,6 +1,5 @@
-diff -ru dieharder-3.31.1/libdieharder/rng_dev_arandom.c dieharder-3.31.1_fixed/libdieharder/rng_dev_arandom.c
---- dieharder-3.31.1/libdieharder/rng_dev_arandom.c	2011-10-14 15:41:37.000000000 +0200
-+++ dieharder-3.31.1_fixed/libdieharder/rng_dev_arandom.c	2014-01-03 22:51:30.010534418 +0100
+--- a/libdieharder/rng_dev_arandom.c
++++ b/libdieharder/rng_dev_arandom.c
 @@ -6,6 +6,7 @@
   */
  
@@ -27,9 +26,8 @@ diff -ru dieharder-3.31.1/libdieharder/rng_dev_arandom.c dieharder-3.31.1_fixed/
  }
  
  static void
-diff -ru dieharder-3.31.1/libdieharder/rng_dev_random.c dieharder-3.31.1_fixed/libdieharder/rng_dev_random.c
---- dieharder-3.31.1/libdieharder/rng_dev_random.c	2011-10-14 15:41:37.000000000 +0200
-+++ dieharder-3.31.1_fixed/libdieharder/rng_dev_random.c	2014-01-03 22:50:57.852321485 +0100
+--- a/libdieharder/rng_dev_random.c
++++ b/libdieharder/rng_dev_random.c
 @@ -6,6 +6,7 @@
   */
  
@@ -56,9 +54,8 @@ diff -ru dieharder-3.31.1/libdieharder/rng_dev_random.c dieharder-3.31.1_fixed/l
  }
  
  static void
-diff -ru dieharder-3.31.1/libdieharder/rng_dev_urandom.c dieharder-3.31.1_fixed/libdieharder/rng_dev_urandom.c
---- dieharder-3.31.1/libdieharder/rng_dev_urandom.c	2011-10-14 15:41:37.000000000 +0200
-+++ dieharder-3.31.1_fixed/libdieharder/rng_dev_urandom.c	2014-01-03 23:06:24.124239582 +0100
+--- a/libdieharder/rng_dev_urandom.c
++++ b/libdieharder/rng_dev_urandom.c
 @@ -3,6 +3,7 @@
   */