gentoo resync : 20.10.2021

4 files changed, 42 insertions, 13 deletions

diff --git a/app-misc/srm/Manifest b/app-misc/srm/Manifest
index 36ad6a2e18c5..3ca5364244a3 100644
--- a/app-misc/srm/Manifest
+++ b/app-misc/srm/Manifest
@@ -1,4 +1,5 @@
-AUX srm-1.2.15-cflags.patch 343 BLAKE2B e6159fdc6211273859215dc2a90fe598a1c956bef5aa69c02cb6bef54129873e71189d1646d04cb89f3be8bf968cc23631452e089a819d57d4fe3681ff3e4dd9 SHA512 81196944b68b0bff7b32a16dd749cc15ce73c125dba6bfa175dbc38b4baf3a291702139ae63f900e94c3babdacf769fc943992e192371c5c7073275320f0f9c6
+AUX srm-1.2.15-cflags.patch 435 BLAKE2B 6b3b0a87a2cd193ead17aa3588d1636ab632a77f50bd4d250948c5b0d68b876e540d258523824d2e578afb1fccaaaef32a447d012e253b18e9a24a34d5806816 SHA512 1b2e7a53a2518d805892804911d52b4e9ccef6cbd7e2b1c2b0da52ac3b512d2b12eb06cb893c498b6ed28e8f6d5a9ca68d7381fef7ba2a94fffcfe0760bc1407
+AUX srm-1.2.15-musl.patch 472 BLAKE2B eea5d31861785ce74d0c8de4641ea0697bda80962fb2a72488393c5b7164901b60be1203cf3bd401f0d6eba1c62d5243cb556c19437a936dd611ac679ac6a7c3 SHA512 515fa37d3cad0dc5e917908c308c33fba9bbf89ca04301610d02540e1afbad29874755dc59e6464776cf2e31b8bd0bbbee403c8d0449020f99366905a21ebccb
 DIST srm-1.2.15.tar.gz 132031 BLAKE2B f01fd8fce0095f5d2247026d3627fc8100b1bc9263f947f2d8500c999220c781ff109283c25b480fe295deb7e162f246afbad68c0797e0fec180ff57f1ff87be SHA512 a8ec78473c55b70557fca88f525998ed51df3be58618b9da220e1bb73df013163f4e1563cbe2062b9cf1512152afeb9004b5be0be69cc1278c0d28597310dfd2
-EBUILD srm-1.2.15.ebuild 822 BLAKE2B 8b82bae77a52035b8a0b09123eb0c6cd45e722ad3a5988224953752d5c5733740f22839842a254739cef88c3af5cd98f635f6366c2b5127e9f51245f1b7a43aa SHA512 54c1b081bb8f02f75846615458c49e71c14ea6ceeb6fa26190b3af49b0e836060c73f42917b165e408baed3df0b5ca309497ed0ae4c270ca889ca15d2362ed92
+EBUILD srm-1.2.15.ebuild 889 BLAKE2B 400862c383b0c0ace4f39f3e4653978d72fabd5a6f6cabe5e5c0e1cf17b4e0377293d9b76759b61c66c4053c9af811b07aab39655d444d51f44d81223a12e804 SHA512 2474e155459c6c07c703f39b567b4fd40c3b440cf9ad889e25e1ee9938f05e4e156dcce330b0ede28156fb73f07e12bc6a7c4401bbadda0fc784c24e43c3f905
 MISC metadata.xml 327 BLAKE2B 8b76b855e466f402df68277c417d0c7deec7a25f5b89ac6935fb0b3a9678cfa350ac5d59a4e04bd850d5f6c6512a8adc5fc1e3e04011f422fcd7bf9330946c1a SHA512 48ee707e4446bb599761bdf02980bbd486ca30ccc9ec40ca87cdd9bc1723c23d26619153c21d016c9ee2a0ba7fb6907cc110d5bbb32dbf7cbae81784772a177a
diff --git a/app-misc/srm/files/srm-1.2.15-cflags.patch b/app-misc/srm/files/srm-1.2.15-cflags.patch
index 0a45bdc12520..22710b8af389 100644
--- a/app-misc/srm/files/srm-1.2.15-cflags.patch
+++ b/app-misc/srm/files/srm-1.2.15-cflags.patch
@@ -1,6 +1,14 @@
---- srm-1.2.15/configure.ac
-+++ srm-1.2.15/configure.ac
-@@ -42,7 +42,6 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,6 +9,7 @@
+ 
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl enable 64bit file ops
+ AC_SYS_LARGEFILE
+@@ -42,7 +43,6 @@
  AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes] turn on debugging
                         [default=$debug_default]],, enable_debug=$debug_default)
  if test "x$enable_debug" = "xyes"; then
diff --git a/app-misc/srm/files/srm-1.2.15-musl.patch b/app-misc/srm/files/srm-1.2.15-musl.patch
new file mode 100644
index 000000000000..e22c5efcc8b3
--- /dev/null
+++ b/app-misc/srm/files/srm-1.2.15-musl.patch
@@ -0,0 +1,17 @@
+musl doesn't have an internal __sighandler_t type,
+and only makes sighandler_t visible if _GNU_SOURCE
+is defined.
+https://bugs.gentoo.org/714026
+
+--- a/src/sunlink.c
++++ b/src/sunlink.c
+@@ -102,9 +102,6 @@
+ static volatile int SIGINT_received = 0;
+ #if defined(__unix__)
+ #include <signal.h>
+-#if defined(__linux__) && !defined(__USE_GNU)
+-typedef __sighandler_t sighandler_t;
+-#endif
+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
+ typedef sig_t sighandler_t;
+ #endif
diff --git a/app-misc/srm/srm-1.2.15.ebuild b/app-misc/srm/srm-1.2.15.ebuild
index a086636c2048..cedaa944e3f7 100644
--- a/app-misc/srm/srm-1.2.15.ebuild
+++ b/app-misc/srm/srm-1.2.15.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit autotools epatch
+inherit autotools flag-o-matic
 
 DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking"
 HOMEPAGE="https://sourceforge.net/projects/srm/"
@@ -14,23 +14,26 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="debug"
 
-DEPEND="!app-misc/secure-delete
-		sys-kernel/linux-headers
-"
+DEPEND="sys-kernel/linux-headers"
 
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.15-cflags.patch
+	"${FILESDIR}"/${PN}-1.2.15-musl.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.15-cflags.patch"
+	default
 	eautoreconf
 }
 
 src_configure() {
+	# enable the sighandler_t decl on glibc and musl
+	append-cppflags -D_GNU_SOURCE
 	econf $(use_enable debug)
 }
 
 pkg_postinst() {
 	ewarn "Please note that srm will not work as expected with any journaled file"
 	ewarn "system (e.g., reiserfs, ext3)."
-	ewarn "See: ${EROOT%/}/usr/share/doc/${PF}/README"
+	ewarn "See: ${EROOT}/usr/share/doc/${PF}/README"
 }