[gentoo-commits] repo/gentoo:master commit in: sys-apps/rng-tools/files/, sys-apps/rng-tools/

["David Seifert" <soap@gentoo.org>]

commit:     9bef75f8b67dad193e3da2aacf4ae6019c9c179e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  3 11:27:55 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct  3 11:27:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bef75f8

sys-apps/rng-tools: drop 6.13-r2

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-apps/rng-tools/Manifest                        |   1 -
 .../rng-tools-6.13-various-autotools-fixups.patch  | 103 ---------------------
 sys-apps/rng-tools/rng-tools-6.13-r2.ebuild        |  73 ---------------
 3 files changed, 177 deletions(-)

diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 0fbe4f3074f..8d1413398ee 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,2 +1 @@
-DIST rng-tools-6.13.tar.gz 59311 BLAKE2B e4601a2fa8158775a8ef7188edbe61a5eb1df35dccc9e1a0ab6b31b559f2f11dd67b682cf9995f0a67834690417e283d443ae6fa54e99ab6462a1185f9b9e09b SHA512 def5f2dcdd1771e8fe5af9476de866ff89a225065416672165af6019cbb166f874fae936b3705221aa47dc13ae99fa63d054d7d49b612f3151cd922a0a129490
 DIST rng-tools-6.14.tar.gz 60277 BLAKE2B 177065f9ea68b68459d034d38278f866a0c9d5c499578fabcc29ceb387b49667393f23dcae9f13ff401599846e872dbada73f5e319a99dfa4605cdb77ee3e896 SHA512 6a267257292697023cd349a5bda4998e39e874969f2b437eb2498f2d7d70a7ed293ca76b4c83aebf80955e33f6c8f8bbb65c6636cc0979e0e0d80d148380b8c7

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
deleted file mode 100644
index 8cb68ae9b02..00000000000
--- a/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-https://github.com/nhorman/rng-tools/pull/132
-https://github.com/nhorman/rng-tools/pull/143
-
-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,
-From 800d7c6e23f0a04bd893ee748a74b622657017a9 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sun, 1 Aug 2021 13:16:16 +0200
-Subject: [PATCH] configure.ac: Add missing `test`
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0fe06fc..7c8e327 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -68,8 +68,8 @@ AC_PROG_GCC_TRADITIONAL
- 
- AX_PTHREAD
- 
--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([RDRAND], [test $host_cpu = x86_64 || test $host_cpu = i686])
-+AS_IF([test $host_cpu = x86_64 || test $host_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
- 
- AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le])
- AS_IF([test $host_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])

diff --git a/sys-apps/rng-tools/rng-tools-6.13-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.13-r2.ebuild
deleted file mode 100644
index f70781ca79d..00000000000
--- a/sys-apps/rng-tools/rng-tools-6.13-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="https://github.com/nhorman/rng-tools"
-SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
-IUSE="jitterentropy nistbeacon pkcs11 selinux"
-
-DEPEND="
-	dev-libs/openssl:0=
-	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 )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-rngd )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	# backport, remove on bump
-	"${FILESDIR}"/${P}-various-autotools-fixups.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable jitterentropy)
-		$(use_with nistbeacon)
-		$(use_with pkcs11)
-		--without-rtlsdr # no librtlsdr in the tree
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/rngd-initd-6.11 rngd
-	newconfd "${FILESDIR}"/rngd-confd-6.11 rngd
-	systemd_dounit rngd.service
-
-	if use pkcs11; then
-		local DISABLE_AUTOFORMATTING=1
-		local DOC_CONTENTS="
-The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
-to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
-	'${EPREFIX}/etc/conf.d/rngd'
-reflects the correct PKCS11 engine path to be used by rngd.
-"
-		readme.gentoo_create_doc
-	fi
-}
-
-pkg_postinst() {
-	use pkcs11 && readme.gentoo_print_elog
-}