net-dialup/linux-atm: sync with ::gentoo

Bug: https://bugs.gentoo.org/859040
Signed-off-by: Sam James <sam@gentoo.org>

5 files changed, 63 insertions, 24 deletions

diff --git a/net-dialup/linux-atm/Manifest b/net-dialup/linux-atm/Manifest
index 95349ed8..36616ee5 100644
--- a/net-dialup/linux-atm/Manifest
+++ b/net-dialup/linux-atm/Manifest
@@ -1 +1 @@
-DIST linux-atm-2.5.2.tar.gz 1082256 SHA256 9645481a2b16476b59220aa2d6bc5bc41043f291326c9b37581018fbd16dd53a SHA512 0a50e91513e4e1f882dc6f4792dc032e89497ff745c0eaea0c0c848b0f84e40d19e038e4ab5aa70c1f915c28a9f845340c332ac5c3ae838b8f539466e10a0a08 WHIRLPOOL ddff2b022bd94a64662e2feb8588b0b7a1d33380aaca91888d57c90602ec777f8db308f62b33846f9b2f40dfd7d6b40ca4ddd9d430e1c6bc8a36cdbb4e370771
+DIST linux-atm-2.5.2.tar.gz 1082256 BLAKE2B 329aad437a1e6a17fd7d7d2b81c976a76c684aaf127006ed3af1e998a0f52df056747cc84fc13c933dc15c07246f1f00e4ff101ac98ef1dd1bea102830a83625 SHA512 0a50e91513e4e1f882dc6f4792dc032e89497ff745c0eaea0c0c848b0f84e40d19e038e4ab5aa70c1f915c28a9f845340c332ac5c3ae838b8f539466e10a0a08
diff --git a/net-dialup/linux-atm/files/linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch b/net-dialup/linux-atm/files/linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch
new file mode 100644
index 00000000..ff91c7f1
--- /dev/null
+++ b/net-dialup/linux-atm/files/linux-atm-2.5.2-linux-5.2-SIOCGSTAMP.patch
@@ -0,0 +1,41 @@
+Fix build failure against linux-5.2+:
+  https://www.spinics.net/lists/linux-sh/msg53430.html
+
+--- a/src/maint/atmdump.c
++++ b/src/maint/atmdump.c
+@@ -17,6 +17,16 @@
+ #include <netinet/in.h> /* for htonl and ntohl */
+ #include <atm.h>
+ 
++#ifndef SIOCGSTAMP
++/* linux-5.2+ added support for 64-bit time_t into ioctls
++   that support 'struct timeval' and removed 'SIOCGSTAMP'
++   define.
++
++   Include 'SIOCGSTAMP' wrapper via linux/sockios.h
++   if does not exist.
++  */
++#    include <linux/sockios.h>
++#endif
+ 
+ static const char *pti[] = { "Data SDU 0","Data SDU 1","Data SDU 0, CE",
+   "Data SDU 1, CE","Segment OAM F5","End-to-end OAM F5","Reserved (RM)",
+--- a/src/maint/saaldump.c
++++ b/src/maint/saaldump.c
+@@ -24,6 +24,16 @@
+ 
+ #define MAX_ITEM  2048 /* longest string emitted by q.dump */
+ 
++#ifndef SIOCGSTAMP
++/* linux-5.2+ added support for 64-bit time_t into ioctls
++   that support 'struct timeval' and removed 'SIOCGSTAMP'
++   define.
++
++   Include 'SIOCGSTAMP' wrapper via linux/sockios.h
++   if does not exist.
++  */
++#    include <linux/sockios.h>
++#endif
+ 
+ static int interval = 0; /* display absolute time by default */
+ static int quiet = 0; /* decode Q.2931 messages by default */
diff --git a/net-dialup/linux-atm/files/linux-atm-2.5.2-mask-on_exit.patch b/net-dialup/linux-atm/files/linux-atm-2.5.2-mask-on_exit.patch
index 7e526f1e..f3ff24a3 100644
--- a/net-dialup/linux-atm/files/linux-atm-2.5.2-mask-on_exit.patch
+++ b/net-dialup/linux-atm/files/linux-atm-2.5.2-mask-on_exit.patch
@@ -1,7 +1,5 @@
-diff --git a/linux-atm-2.5.2.orig/src/sigd/atmsigd.c b/linux-atm-2.5.2/src/sigd/atmsigd.c
-index 52e41c7..3546f65 100644
---- a/linux-atm-2.5.2.orig/src/sigd/atmsigd.c
-+++ b/linux-atm-2.5.2/src/sigd/atmsigd.c
+--- a/src/sigd/atmsigd.c
++++ b/src/sigd/atmsigd.c
 @@ -283,7 +283,7 @@
  /* ------------------------------- main ...  ------------------------------- */
  
diff --git a/net-dialup/linux-atm/files/linux-atm-2.5.2-remove-SYS_poll-hack.patch b/net-dialup/linux-atm/files/linux-atm-2.5.2-remove-SYS_poll-hack.patch
index 8a00b674..49d74b1f 100644
--- a/net-dialup/linux-atm/files/linux-atm-2.5.2-remove-SYS_poll-hack.patch
+++ b/net-dialup/linux-atm/files/linux-atm-2.5.2-remove-SYS_poll-hack.patch
@@ -1,6 +1,5 @@
-diff -Naur linux-atm-2.5.2.orig/src/mpoad/io.c linux-atm-2.5.2/src/mpoad/io.c
---- linux-atm-2.5.2.orig/src/mpoad/io.c	2007-12-31 19:14:51.000000000 -0500
-+++ linux-atm-2.5.2/src/mpoad/io.c	2015-07-15 13:25:41.500014905 -0400
+--- a/src/mpoad/io.c	2007-12-31 19:14:51.000000000 -0500
++++ b/src/mpoad/io.c	2015-07-15 13:25:41.500014905 -0400
 @@ -10,14 +10,7 @@
  #include <errno.h>
  #include <sys/ioctl.h>
diff --git a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild b/net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild
index cf5651dc..b5ee36db 100644
--- a/net-dialup/linux-atm/linux-atm-2.5.2.ebuild
+++ b/net-dialup/linux-atm/linux-atm-2.5.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit eutils flag-o-matic libtool linux-info
+inherit autotools flag-o-matic linux-info
 
 DESCRIPTION="Tools for ATM"
 HOMEPAGE="http://linux-atm.sourceforge.net/"
@@ -11,37 +11,38 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-IUSE="static-libs"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
-RDEPEND=""
-DEPEND="virtual/yacc"
+BDEPEND="virtual/yacc"
 
 RESTRICT="test"
 
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS )
-
 CONFIG_CHECK="~ATM"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-headers.patch
+	"${FILESDIR}"/${P}-linux-5.2-SIOCGSTAMP.patch
+
+	"${FILESDIR}"/${P}-mask-on_exit.patch
+	"${FILESDIR}"/${P}-remove-SYS_poll-hack.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-headers.patch
-	epatch "${FILESDIR}"/${P}-mask-on_exit.patch
-	epatch "${FILESDIR}"/${P}-remove-SYS_poll-hack.patch
+	default
 
 	sed -i '/#define _LINUX_NETDEVICE_H/d' \
 		src/arpd/*.c || die "sed command on arpd/*.c files failed"
 
-	elibtoolize
+	eautoreconf
 }
 
 src_configure() {
 	append-flags -fno-strict-aliasing
-
-	econf $(use_enable static-libs static)
+	econf
 }
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 	dodoc doc/README* doc/atm*
 }