gentoo resync : 15.06.2021

3 files changed, 92 insertions, 23 deletions

diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 6e97aa95f485..e03ca7ffdd1f 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,7 +1,8 @@
+AUX rng-tools-6.13-various-autotools-fixups.patch 2854 BLAKE2B f29fc73edbf7a14e92bde4bb18982ba688cf3f11ecd4dc9c19c058c5ccb66bf110ea270ac64bf5d7aff4b5411e8713fb94ba86df6a3f0a4959be5763e0ba99ee SHA512 5dc08943a0d1f267b595ddaec6fb7faa1f4a7554fea4ea2956123cb59d041bc7c7e1fab4a1d44041ea0cba57ab42b29bf7fdbb00a74dff2cebf0a6cd46944e96
 AUX rngd-confd-6.11 2321 BLAKE2B 6cdf4cf7d61e33415df1c41933d1c38c398fd96370cb4c4e257f60479a3e69428d3735802d480e1a25714854de9bc6ed997856c1c4dbbf289b7a014026522aea SHA512 32c52316ebdffef7ec07dd97b45f124c2ecced3d0f49d75ad8d226f6eff478739dab6b008e0b1f4e55bc81bf615feee9860c45f35f0994c7c65d4d439501621f
 AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9d75253a7f84c265536db1b70b290e0029cfaf40e565c8b280e3b1ec79ab93c8f659c969b5dedc7dab SHA512 60bf2c2d4984a1db8fcfaeaebd5249ed6d428c9ccb8412813ce97e146f3143efae23058475ac8baa1c2e88b00012fc119411bcfc14b04a0128696ee69641d98d
 DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb
-DIST rng-tools-6.12.tar.gz 57309 BLAKE2B d7a12b50889065f885cb15cda9686d63950fcc1ac9099893ed9c9236a9a930627c9541980c410318b40104637df688f5622681ce1d80eee7d4aaaf696c6bc3c5 SHA512 56dd334b65dcec1456f8dbdbee5d83590de27cb6ee1b7715828b5316a913557fd178e264139dc92a82e09635ca15b1eb5f6169bfb4412fbe1b06ea28a5064c64
+DIST rng-tools-6.13.tar.gz 59311 BLAKE2B e4601a2fa8158775a8ef7188edbe61a5eb1df35dccc9e1a0ab6b31b559f2f11dd67b682cf9995f0a67834690417e283d443ae6fa54e99ab6462a1185f9b9e09b SHA512 def5f2dcdd1771e8fe5af9476de866ff89a225065416672165af6019cbb166f874fae936b3705221aa47dc13ae99fa63d054d7d49b612f3151cd922a0a129490
 EBUILD rng-tools-6.11-r1.ebuild 1793 BLAKE2B 07215f34a520bea511c8931960af5fccdf3b92cfcb5c2ba70881ae80cac1229a5cbd40a80ccc167dc0a248ac0712d47b2a9ec03fd9c314ce528bed3cc421e196 SHA512 ea1a99eb14f59c685c2d4ea8823051b807f36fd1573ccc66a6c3fe93fb10dc278a72af901767819759832549272be5de96afbac7b7d897ea72473e45b8fc8b47
-EBUILD rng-tools-6.12.ebuild 1780 BLAKE2B d68f962d287041b3c0d3b811479743efb47e38d187dfdb731439ee2b93a234d243a5ce0aa8a825206fcfeddb8f192d360ab1e5e26ababfa184b222be0d973fa2 SHA512 aa466ceaba148c0d322b9d8dc805083ca453a2a5322a1f46c66b30924d578500e4c6f800c19f6a94562cb9b47c44d157fd279ab29d94730f3548a2a615e70d2d
+EBUILD rng-tools-6.13.ebuild 1710 BLAKE2B 65df841cfeecdb4523b737c9d809a0b200514b0480c2210c062afbf131c5a2608dc6cab0c6e828bb974cc6e433ba90102e8712dfa097c63fc99cd085fa4b27f5 SHA512 8e8701bcdc62d91b61be93b5d98672540336882f75e4e48853bbf78abb15f5382f9bcb5ecd36c05083c1397de937cc4cfef1ff00222c9c99e3c1460d80351eb6
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch b/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch
new file mode 100644
index 000000000000..4ad2348dad96
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch
@@ -0,0 +1,78 @@
+https://github.com/nhorman/rng-tools/pull/132
+
+From 16b728f9a5bb138386fa770de817ec244a158be5 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 12 Jun 2021 22:15:06 +0200
+Subject: [PATCH 1/3] Use `AM_PROG_AR` over `AC_CHECK_TOOLS`
+
+* `AM_PROG_AR` is the canonical way to detect the archiver
+  and includes workarounds for Cygwin.
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,10 +62,9 @@ AM_PROG_AS
+ dnl Checks for programs
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_PROG_GCC_TRADITIONAL
+ 
+-AC_CHECK_TOOLS([AR], [ar gar], :)
+-
+ AX_PTHREAD
+ 
+ AM_CONDITIONAL([RDRAND], [test $target_cpu = x86_64 -o $target_cpu = i686])
+
+From 2ce93190cb0111fcab2f622a539689d70960643a Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 12 Jun 2021 22:15:09 +0200
+Subject: [PATCH 2/3] Build `randstat` binary
+--- a/contrib/Makefile.am
++++ b/contrib/Makefile.am
+@@ -1,3 +1,2 @@
+-
+-EXTRA_DIST = randstat.c
+-
++bin_PROGRAMS = randstat
++randstat_SOURCES = randstat.c
+
+From 3adf2613e262efbda0a3455e59c8cb3390271563 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 12 Jun 2021 22:15:12 +0200
+Subject: [PATCH 3/3] `AC_CANONICAL_TARGET` -> `AC_CANONICAL_HOST`
+
+* `AC_CANONICAL_TARGET` is the type of system for which code
+  will be produced, not on which it will run. This is a common
+  confusion with Autoconf's target triplet.
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,8 @@ dnl Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA
+ AC_INIT(rng-tools, 6.13, [Neil Horman <nhorman@tuxdriver.com>])
+ AC_PREREQ(2.52)
+ AC_CONFIG_SRCDIR([rngd.c])
+-AC_CANONICAL_TARGET
++AC_CANONICAL_HOST
++AC_CANONICAL_TARGET dnl required for broken AX_PTHREAD
+ AM_INIT_AUTOMAKE([foreign])
+ AC_CONFIG_HEADERS([rng-tools-config.h])
+ AC_CONFIG_MACRO_DIRS([m4])
+@@ -67,14 +68,14 @@ AC_PROG_GCC_TRADITIONAL
+ 
+ AX_PTHREAD
+ 
+-AM_CONDITIONAL([RDRAND], [test $target_cpu = x86_64 -o $target_cpu = i686])
+-AS_IF([test $target_cpu = x86_64 -o $target_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
++AM_CONDITIONAL([RDRAND], [test $host_cpu = x86_64 || $host_cpu = i686])
++AS_IF([test $host_cpu = x86_64 || $host_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
+ 
+-AM_CONDITIONAL([DARN], [test $target_cpu = powerpc64le])
+-AS_IF([test $target_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
++AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le])
++AS_IF([test $host_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
+ 
+-AM_CONDITIONAL([RNDR], [test $target_cpu = aarch64])
+-AS_IF([test $target_cpu = aarch64], [AC_DEFINE([HAVE_RNDR],1,[Enable RNDR])],[])
++AM_CONDITIONAL([RNDR], [test $host_cpu = aarch64])
++AS_IF([test $host_cpu = aarch64], [AC_DEFINE([HAVE_RNDR],1,[Enable RNDR])],[])
+ AM_CONDITIONAL([JITTER], [false])
+ 
+ AC_ARG_ENABLE(jitterentropy,
diff --git a/sys-apps/rng-tools/rng-tools-6.12.ebuild b/sys-apps/rng-tools/rng-tools-6.13.ebuild
index b2e6591164cd..b4a1ee5c7006 100644
--- a/sys-apps/rng-tools/rng-tools-6.12.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.13.ebuild
@@ -16,36 +16,26 @@ IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="
 	dev-libs/openssl:0=
-	jitterentropy? (
-		app-crypt/jitterentropy:=
-	)
+	jitterentropy? ( app-crypt/jitterentropy:= )
 	nistbeacon? (
 		dev-libs/jansson
 		dev-libs/libxml2:2=
 		net-misc/curl[ssl]
 	)
-	pkcs11? (
-		dev-libs/libp11:=
-	)
-	elibc_musl? ( sys-libs/argp-standalone )
-"
+	pkcs11? ( dev-libs/libp11:= )
+	elibc_musl? ( sys-libs/argp-standalone )"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-rngd )"
-BDEPEND="
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+PATCHES=(
+	# backport, remove on bump
+	"${FILESDIR}"/${P}-various-autotools-fixups.patch
+)
 
+src_prepare() {
 	default
-
-	mv README.md README || die
-
 	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
 }
 
 src_configure() {
@@ -61,9 +51,10 @@ src_configure() {
 
 src_install() {
 	default
+
 	newinitd "${FILESDIR}"/rngd-initd-6.11 rngd
 	newconfd "${FILESDIR}"/rngd-confd-6.11 rngd
-	systemd_dounit "${S}"/rngd.service
+	systemd_dounit rngd.service
 
 	if use pkcs11; then
 		local DISABLE_AUTOFORMATTING=1
@@ -75,7 +66,6 @@ reflects the correct PKCS11 engine path to be used by rngd.
 "
 		readme.gentoo_create_doc
 	fi
-
 }
 
 pkg_postinst() {