gentoo new year resync : 01.01.2021

5 files changed, 2 insertions, 231 deletions

diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index a24a23bda19f..4d8abde1e0d8 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -1,7 +1,4 @@
-AUX ngrep-1.45-build-fixes.patch 4778 BLAKE2B 058c0414edf1c37efd85f00a38d41d27ceb65e4f4c5e7636f6133964cd8fb75d66f02a45844cf56a8822d321d7937a5f3f8cdd99f85b79fec335c9d02dde75d2 SHA512 5e11682d6b360e96840135d8963bdf4c9bf5def0bd38ba716ce201c7bf9b5ce787338f2cff86d38318e0356d9118fde6985ed9a71728549842577ecdb3a5011e
-AUX ngrep-1.45-prefix.patch 575 BLAKE2B 1d5933c457507bdd10662005dac7a14a1b78d221f126a8cc33d0d952b81b10c936a86b83471be76219445d9332ea165a0fac3d3e6f37ae15096fef337ece404a SHA512 e33321ded5c0b86a279108a0d72d5e1d65699c39f50ac9291c4256867ce3f2b06d86d7186e51359deac82beadb7e8503ca5023c5401068aecebaffa4d01c2afc
-AUX ngrep-1.45-setlocale.patch 495 BLAKE2B 10d70be3c787344f120ed2faf527425af68ab723b23840ae5d1c460431b06777b0b691760854bf3fb64a72dfec85aa1b8110558f0037981f10a674cd53428ffb SHA512 007cf6793ef407b4069ebe84b9fe5e5a23c3d2d7f5c538ce0a81d1b6c2643b79387136854d50eb68b13aaaf6e3d7b1a469e7afdeebedba79efea1960b2d1a87e
 AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827ef96efd4ad284be313dd234c15603bcd842c7d2c96a46900de46205cec1d0270cc83d36b5e9feedf1f3b2b3 SHA512 e435f1e4fb35fbed0eeef414da2fd19c09311287b466e667c9150d53a1ae52abbe31173758192c9638eaecf54e4c3be99020e9831a2543b2e4d0c61f5b9f55de
 DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657
-EBUILD ngrep-1.47.ebuild 976 BLAKE2B ae6431ab7b83c039dc2bc83adf85ad77b36e2191e89362a259dbd66649898851b086553fb05e2e85fa01991baaee54cbb678deab0f49aaf38addf4a91f83865d SHA512 ec26676f4873a6ef973b96c3668f92b99e29932785b9c8850b7847664512552f47ba253983047a18d558a2e1af8650a1ad5bfa94a31f180a4c05e9e53adc07cd
+EBUILD ngrep-1.47.ebuild 977 BLAKE2B d21dfa617c287895d12884125ddd71c7120f4927ae272144d51ee219b939511c19869a59911339d0ed72991abf4e8814ce7909d714353959c1857dc8dde872fe SHA512 46b2fbbef2f0471cd0c72f2daf7e7bd655c98fd4ca397cfffbacdb6b094a7a3d22c28ab553a72936d3abe6a2cef3fcc8e5dd587e1f0b4602e750c197c230889d
 MISC metadata.xml 669 BLAKE2B 79852bd4c0d1185bcbf60e5ba9e5a9c58b6d6720942cd0cd6d7f8f4f6d445d9ba3fa888bbfba625d1627df4a0aaed22513163075806483a576e199acb9c5fb4d SHA512 d680774ca1d7a66bbe9badb840ebf3f0249c80d0850a229797d17a09da27e2fad9510449ceecfb62b3141ad105fd2970713a14879df57e0bb14c26ac66c807ad
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch b/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch
deleted file mode 100644
index 9cde0f81926d..000000000000
--- a/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-This patch fixes a number of problems with have with build:
-
- * more clean cut off pcre library; we'll never use bundled pcre library, so
-   some autoconf added REGEX_LIBS to pass correct system libs and header change.
-
- * We use AC_CONFIG_SUBDIRS to pass make autoconf reconfigure gnuregex library
-   - this way ./configure will be called correctly and correct comipler will be
-   selected automatically.
-
- * With the previous change some modifications were required to make gnuregex
-   buildable: a) we should not overide CFLAGS in Makefile.in (as they together
-   with -DHAVE_CONFIG_H will be passed to gnuregex and it'll fail to build,
-   since no config.h exist) b) obvious way to remove warning "_GNU_SOURCE"
-   redefined
-
- * also we don't pass $(MAKEFLAGS) since it caused us problems in the past (bug
-   #178684)
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -7,7 +7,8 @@
- 
- CC=@CC@
- 
--CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@ 
-+# Never redefine CFLAGS, as it pollutes env and gnuregex build failes
-+EXTRA_CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@ 
- INCLUDES=-I@srcdir@ @PCAP_INCLUDE@ @EXTRA_INCLUDES@
- 
- LDFLAGS=@LDFLAGS@ @PCAP_LINK@
-@@ -34,25 +35,25 @@
- 
- REGEX_DIR=@REGEX_DIR@
- REGEX_OBJS=@REGEX_OBJS@
--
-+REGEX_LIBS=@REGEX_LIBS@
- 
- all: $(TARGET) 
- 
- $(TARGET): $(REGEX_OBJS) $(OBJS) 
--	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
-+	$(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) 
- 
- debug: $(REGEX_OBJS) $(OBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -g -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) 
-+	$(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -g -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) 
- 
- static: $(REGEX_OBJS) $(OBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET).static -static $(OBJS) $(REGEX_OBJS) $(LIBS) 
-+	$(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -o $(TARGET).static -static $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) 
- 
- install: $(TARGET)
- 	$(INSTALL) -c -m 0755 $(TARGET)  $(DESTDIR)/$(BINDIR_INSTALL)/$(TARGET)
- 	$(INSTALL) -c -m 0644 $(MANPAGE) $(DESTDIR)/$(MANDIR_INSTALL)/$(MANPAGE)
- 
- .c.o:	
--	$(CC) $(CFLAGS) $(INCLUDES) -g -c $<
-+	$(CC) $(EXTRA_CFLAGS) $(INCLUDES) -g -c $<
- 
- clean:
- 	make -C $(REGEX_DIR) clean
-@@ -63,7 +64,7 @@
- 	rm -f config.status config.cache config.log config.h Makefile 
- 
- $(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h
--	$(MAKE) $(MAKEFLAGS) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
-+	$(MAKE) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
- 
- $(OBJS): Makefile ngrep.c ngrep.h
- 
-
---- a/configure.in
-+++ b/configure.in
-@@ -124,14 +124,16 @@
-   use_pcre="no"
- ])
- 
-+REGEX_DIR=""
-+REGEX_OBJS=""
-+REGEX_LIBS=""
- if test $use_pcre = yes; then
- 
-   echo 
--  echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...' 
-+  echo 'Using System Perl-Compatible Regular Expression (PCRE) library ...' 
-   echo 
- 
--  REGEX_DIR='pcre-5.0'
--  REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
-+  REGEX_LIBS="`pcre-config --libs`"
-   USE_PCRE="1"
- 
- else
-@@ -144,12 +146,19 @@
-   REGEX_OBJS="$REGEX_DIR/regex.o"
-   USE_PCRE="0"
- 
-+  AC_CONFIG_SUBDIRS([regex-0.12])
-+
-+  echo
-+  echo 'GNU Regular Expression library is configured...'
-+  echo
-+
- fi
- 
--( cd $REGEX_DIR && ./configure )
- 
- AC_SUBST(REGEX_DIR)
- AC_SUBST(REGEX_OBJS)
-+AC_SUBST(REGEX_LIBS)
-+
- 
- 
- echo
-
---- a/ngrep.c
-+++ b/ngrep.c
-@@ -92,7 +92,7 @@
- #endif
- 
- #if USE_PCRE
--#include "pcre-5.0/pcre.h"
-+#include <pcre.h>
- #else
- #include "regex-0.12/regex.h"
- #endif
-
---- a/regex-0.12/Makefile.in
-+++ b/regex-0.12/Makefile.in
-@@ -18,23 +18,6 @@
- 
- version = 0.12
- 
--# You can define CPPFLAGS on the command line.  Aside from system-specific
--# flags, you can define:
--#   -DREGEX_MALLOC to use malloc/realloc/free instead of alloca.
--#   -DDEBUG to enable the compiled pattern disassembler and execution
--#           tracing; code runs substantially slower.
--#   -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to
--#           the corresponding C procedures).  If not -DDEBUG, the macros
--#           are used.
--CPPFLAGS = 
--
--# Likewise, you can override CFLAGS to optimize, use -Wall, etc.
--CFLAGS = -g
--
--# Ditto for LDFLAGS and LOADLIBES.
--LDFLAGS =
--LOADLIBES =
--
- srcdir = @srcdir@
- VPATH = @srcdir@
- 
-@@ -43,7 +26,7 @@
- 
- SHELL = /bin/sh
- 
--subdirs = doc test
-+subdirs = 
- 
- default all:: regex.o
- .PHONY: default all
-
---- a/regex-0.12/configure.in
-+++ b/regex-0.12/configure.in
-@@ -34,4 +34,4 @@
- 
- esac
- 
--AC_OUTPUT(Makefile doc/Makefile test/Makefile)
-+AC_OUTPUT(Makefile)
-
-=== modified file 'regex-0.12/regex.c'
---- a/regex-0.12/regex.c
-+++ b/regex-0.12/regex.c
-@@ -34,7 +34,9 @@
-   #pragma alloca
- #endif
- 
-+#ifndef _GNU_SOURCE
- #define _GNU_SOURCE
-+#endif
- 
- /* We need this for `regex.h', and perhaps for the Emacs include files.  */
- #include <sys/types.h>
-
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch b/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch
deleted file mode 100644
index 8618f5daae31..000000000000
--- a/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-* refrain from doing an absolutely insane check (to see if pcap is
-  installed in more than one place)
-
---- a/configure.in
-+++ b/configure.in
-@@ -268,10 +268,7 @@
- 
- AC_MSG_CHECKING(for a complete set of pcap headers)
- 
--possible_dirs="`eval echo -n ${includedir}` \
--	       /usr/include /usr/include/pcap \
--               /usr/local/include /usr/local/include/pcap \
--               /usr/share/include /usr/share/include/pcap"
-+possible_dirs="`eval echo -n ${includedir}`"
- 
- AC_ARG_WITH(pcap-includes,
- [  --with-pcap-includes        specify the pcap include directory],
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch b/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch
deleted file mode 100644
index 8789e5b8c76b..000000000000
--- a/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Call setlocale to make isprint() decide what's printable depending
-on the current locale.  See bugs.debian.org/307496 .
-
---- a/ngrep.c
-+++ b/ngrep.c
-@@ -97,6 +97,8 @@
- #include "regex-0.12/regex.h"
- #endif
- 
-+#include <locale.h>
-+
- #include "ngrep.h"
- 
- 
-@@ -195,6 +197,8 @@
-     signal(SIGWINCH, update_windowsize);
- #endif
- 
-+    setlocale(LC_ALL, "");
-+
-     while ((c = getopt(argc, argv, "LNhXViwqpevxlDtTRMs:n:c:d:A:I:O:S:P:F:W:")) != EOF) {
-         switch (c) {
-             case 'W': {
diff --git a/net-analyzer/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47.ebuild
index 641f886507d9..6ca8a342aa3a 100644
--- a/net-analyzer/ngrep/ngrep-1.47.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.47.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jpr5/ngrep/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ngrep"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6"
 
 DEPEND="