gentoo resync : 14.12.2020

2 files changed, 0 insertions, 164 deletions

diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest
index 66944ffb1d23..e5b3955260da 100644
--- a/net-analyzer/cnet/Manifest
+++ b/net-analyzer/cnet/Manifest
@@ -1,4 +1,3 @@
-AUX cnet-3.3.1-gentoo.patch 4936 BLAKE2B 18796d6fd211d1539c6e1417aa49d46d68f24df9a9e4116ea83d8bc5d10389d15bcbabdd6cf336db9832d1b695c725ff0f55df1d1316d5783bfa80add1e45f0f SHA512 a0d8e35e998befa7c145ce79e92f8725b6343269a84f8b34a4787cedcf4df8e9f7723c4e44223f556df99892ac0fbd313dcdae1f8e88e2b000cd1eb393fd2753
 AUX cnet-3.3.1-tcl.patch 350 BLAKE2B 87816729c1705cb8d22676af3fe7172ae651fd565ba96f8fc0665c4e041c9f2844a6833b76f7a297d7b12ff94c4077ba4c337e374283619ae49c3c3a2a64a9d8 SHA512 c35ef7b83b161d258f75c61466aeccbb0ccfdadb839e6d7b9cd60cb4aaa6a5df9c5eb0a5067ee1e17fb46974b409220a4e5d35d3a490013eb270febdd0405fb1
 AUX cnet-3.3.4-gentoo.patch 4898 BLAKE2B 5a50a13c33b83717ee73b3c7c70d1cce2b913c35819bb62ef14bea9131d1aebd8e122c8cae837b891025c0c0a3e6d0d151af499b9e2e777d332708ce9a1ff7ec SHA512 58efef31fdb88ed401ba1aa26e8afce506ab77da47207cf2730c2f2efe47efa8dd916578eab34c6c2dc38f499073e14bf16d3c7d03b4412d1fb1fab0eb26614c
 DIST cnet-3.3.4.tgz 2687235 BLAKE2B dec8b4510cfb9a39ade046dee56955d4ab39094d07acf373b056ce1917f3bbddcf22cf5feefe864b472be4c4a47da3147a3b977cdbf8b0295e0c3a8da95a8420 SHA512 51457541d1023e49bdad4df3502c51d11ea6d62e3e6ae857becfb60229626ba777226b2b42d313d95b982b2790c6b1f80b39e344d9d4bcd4c38ccc31b055d8f9
diff --git a/net-analyzer/cnet/files/cnet-3.3.1-gentoo.patch b/net-analyzer/cnet/files/cnet-3.3.1-gentoo.patch
deleted file mode 100644
index 9754fb4ebf84..000000000000
--- a/net-analyzer/cnet/files/cnet-3.3.1-gentoo.patch
+++ /dev/null
@@ -1,163 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -6,7 +6,7 @@
- # Comment/uncomment the following 4 constants to suit your system:
- #
- # PREFIX defines the directory below which cnet will be installed.
--PREFIX		= /usr/local
-+PREFIX		= /usr
- #PREFIX		= $(HOME)
- #
- # BINDIR defines the directory where the cnet binary will be installed.
-@@ -16,26 +16,24 @@
- LIBDIR		= $(PREFIX)/lib64/cnet
- #
- # WWWDIR defines the directory to hold cnet's web-based documentation
--WWWDIR		= /home/httpd/html/cnet
-+#WWWDIR		= /home/httpd/html/cnet
- #WWWDIR		= $(HOME)/WWW/cnet
- #
- # ---------------------------------------------------------------------
- #
- it:
--	make -C src
--	make -C support
-+	$(MAKE) -C src
-+	$(MAKE) -C support
- 	@ls -l bin/$(NAME) lib/*.a
- 
- install:
--	make
--	@mkdir -p  $(BINDIR) $(LIBDIR)
--	@chmod 755 $(BINDIR) $(LIBDIR)
--	@cp bin/$(NAME) $(BINDIR)/$(NAME)
--	@chmod 755 $(BINDIR)/$(NAME)
--	@rm -rf $(LIBDIR)/*
--	@cp lib/* $(LIBDIR)
--	@chmod 644 $(LIBDIR)/*
--	@ls -l $(BINDIR)/$(NAME) $(LIBDIR)/*.a
-+	@mkdir -p  $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
-+	@chmod 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
-+	@cp bin/$(NAME) $(DESTDIR)$(BINDIR)/$(NAME)
-+	@chmod 755 $(DESTDIR)$(BINDIR)/$(NAME)
-+	@rm -rf $(DESTDIR)$(LIBDIR)/*
-+	@cp lib/* $(DESTDIR)$(LIBDIR)
-+	@chmod 644 $(DESTDIR)$(LIBDIR)/*
- 
- AND	= html/CLICK html/KEYBOARD html/STOPANDWAIT html/TICKTOCK
- www:
---- a/src/Makefile.linux
-+++ b/src/Makefile.linux
-@@ -5,7 +5,7 @@
- #	binutils 2.5.2, and
- #	libelf (0.6.4 onwards)
- #
--WARNINGS =	-Wall -Werror -Wshadow -Wpointer-arith -Wcast-qual \
-+WARNINGS =	-Wall -Wshadow -Wpointer-arith -Wcast-qual \
- 		-Wcast-align -Wwrite-strings -Wconversion \
- 		-Wstrict-prototypes -Wredundant-decls -Winline \
- 		-Wcomments -Wtrigraphs -Wimport -Wundef
-@@ -20,8 +20,8 @@
- XINCLUDES	= -I/usr/include/tcl8.5
- XLIBS		= -ltcl8.5 -ltk8.5 -lX11
- #
--C99		= gcc -std=c99 -Wall -Werror -pedantic
--CFLAGS		= -O3 -fPIC $(INCLUDES) $(XINCLUDES)
-+C99		= $(CC) -std=c99 -Wall -pedantic
-+CFLAGS		+= -fPIC $(INCLUDES) $(XINCLUDES)
- #
- LD		= gcc -rdynamic
- LIBDIRS		= $(XLIBDIRS)
---- a/support/Makefile
-+++ b/support/Makefile
-@@ -7,21 +7,21 @@
- 
- it:
- 	@if uname -s -r | grep -q "Linux" ; then \
--		make -f Makefile.linux ; fi
-+		$(MAKE) -f Makefile.linux ; fi
- 	@if uname -s -r | grep -q "Darwin" ; then \
--		make -f Makefile.macosx ; fi
-+		$(MAKE) -f Makefile.macosx ; fi
- 	@if uname -s -r | grep -q "SunOS 4" ; then \
--		make -f Makefile.sunos ; fi
-+		$(MAKE) -f Makefile.sunos ; fi
- 	@if uname -s -r | grep -q "SunOS 5" ; then \
--		make -f Makefile.solaris ; fi
-+		$(MAKE) -f Makefile.solaris ; fi
- 	@if uname -s -r | grep -q "OSF1" ; then \
--		make -f Makefile.osf1 ; fi
-+		$(MAKE) -f Makefile.osf1 ; fi
- 	@if uname -s -r | grep -q "IRIX" ; then \
--		make -f Makefile.irix5 ; fi
-+		$(MAKE) -f Makefile.irix5 ; fi
- 	@if uname -s -r | grep -q "FreeBSD" ; then \
--		make -f Makefile.freebsd ; fi
-+		$(MAKE) -f Makefile.freebsd ; fi
- 	@if uname -s -r | grep -q "NetBSD" ; then \
--		make -f Makefile.netbsd ; fi
-+		$(MAKE) -f Makefile.netbsd ; fi
- 	@cp -p cnetsupport.h ../lib
- 
- # ---------------------------------------------------------------------
---- a/support/Makefile.common
-+++ b/support/Makefile.common
-@@ -1,13 +1,13 @@
- #
--CC		= gcc
--CFLAGS		= -std=c99 -pedantic -Wall -Werror -O3 -fPIC
-+#CC		= gcc
-+CFLAGS		+= -std=c99 -pedantic -Wall -fPIC
- 
- DOTH		= cnetsupport.h
- OBJ		= hashtable.o haversine.o lexical.o md5.o queue.o vector.o
- 
- $(NAME):	$(OBJ)
--		ar rc $(NAME) $(OBJ)
--		ranlib $(NAME)
-+		$(AR) rc $(NAME) $(OBJ)
-+		$(RANLIB) $(NAME)
- 		@cp -p $(NAME) ../lib
- 
- %.o : %.c $(DOTH)
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -8,21 +8,21 @@
- 
- it:
- 	@if uname -s -r | grep -q "Linux" ; then \
--		make -f Makefile.linux $(NAME) ; fi
-+		$(MAKE) -f Makefile.linux $(NAME) ; fi
- 	@if uname -s -r | grep -q "Darwin" ; then \
--		make -f Makefile.macosx $(NAME) ; fi
-+		$(MAKE) -f Makefile.macosx $(NAME) ; fi
- 	@if uname -s -r | grep -q "SunOS 4" ; then \
--		make -f Makefile.sunos $(NAME) ; fi
-+		$(MAKE) -f Makefile.sunos $(NAME) ; fi
- 	@if uname -s -r | grep -q "SunOS 5" ; then \
--		make -f Makefile.solaris $(NAME) ; fi
-+		$(MAKE) -f Makefile.solaris $(NAME) ; fi
- 	@if uname -s -r | grep -q "OSF1" ; then \
--		make -f Makefile.osf1 $(NAME) ; fi
-+		$(MAKE) -f Makefile.osf1 $(NAME) ; fi
- 	@if uname -s -r | grep -q "IRIX" ; then \
--		make -f Makefile.irix5 $(NAME) ; fi
-+		$(MAKE) -f Makefile.irix5 $(NAME) ; fi
- 	@if uname -s -r | grep -q "FreeBSD" ; then \
--		make -f Makefile.freebsd $(NAME) ; fi
-+		$(MAKE) -f Makefile.freebsd $(NAME) ; fi
- 	@if uname -s -r | grep -q "NetBSD" ; then \
--		make -f Makefile.netbsd $(NAME) ; fi
-+		$(MAKE) -f Makefile.netbsd $(NAME) ; fi
- 	@cp -p $(NAME) ../bin
- 	@cp -p cnet.h  ../lib
- 
-@@ -33,7 +33,7 @@
- 	@rm -rf HTML GPATH GRTAGS GSYMS GTAGS
- 
- hide:
--	make clean
-+	$(MAKE) clean
- 	echo '#if	HIDE_GLOBAL_NAMES'		 > hidenames.h
- 	sort < HIDENAMES | \
- 	awk '{ if($$0 !~ /#/) printf("#define\t%-36s\t__CN%03d\n", $$0,++n);}'\