gentoo resync : 14.07.2018

7 files changed, 0 insertions, 673 deletions

diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
deleted file mode 100644
index f2041b45b3dc..000000000000
--- a/app-arch/unzip/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX unzip-6.0-format-security.patch 4424 BLAKE2B c76ac7c9874238ff20c85e35d8bab809c4b668ff22eb93a3ac614653ab3843fbd80aebb552d285640b13f38f5bb264f6fe3c192b1d30128dfbd33fd9f28da40f SHA512 78340a1a16ed1951e5311fcfb76e38ec58ec0b6dcd74951624dc7778e41ae067d7dba38f394ed3a03436df197582f5d47c49e7c2d62d04c4fcd974eedb9bc726
-AUX unzip-6.0-natspec.patch 14304 BLAKE2B 87f724fcdb0960bfa17d609dbb764f3469b1ddfee1abc810e57cef52780482abd8c25950cf0da4d976d89745f4aa65b6269f21d0eac290230621b782fa1e0d06 SHA512 189ce2045430d2d04e27049672a3cfb205319edab1ac1522700a7f89344e5718235d8a15238390f6b4317af493796a65cac6a83f7dceb402bc736628d7a89cda
-AUX unzip-6.0-no-exec-stack.patch 381 BLAKE2B c298afe0df1c903c0894bf55e55b3f4f0d616662e3fa706bcb9813707af3f2bfebff1a2b4290d943718ca35aa2ce098f20b5d370a624c1a16b81d4e921a3bdeb SHA512 a00ba3c805aa64bebeb3194cd75093c1e7c951366d40bba4852837dcb355eedf1ca6a6e648ea007fcb71124e778e54b5168a7b38a7b7268bc3983d87594633a5
-DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
-DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe
-DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
-EBUILD unzip-6.0_p20.ebuild 2557 BLAKE2B 55203420f8676c64899a6e8572ea31ce3318018402e7f02790f7510d955d69fd3371e08ffa50bcb2867025e8542e6d745f20a0ba60562b2f8f7e7b42c25f53b8 SHA512 72014935da1e7acec784f189568fbec2756968811d348594d98e5a4f440579471b9e6348aa57877a18e0e34b6434aa144cd7015a88c5b999805428d4192dd212
-EBUILD unzip-6.0_p21-r2.ebuild 2600 BLAKE2B cac4f2b6cdf5b50cfa84601e2644f0cd76210127f49da752755def5c468beabd6ec9f4856cc4a04214f4a3600367ee805fca0ca24b50154a485e56223f6a566f SHA512 2bb257106ef4f6c7ff0cfd4c0305565974ca89f127126b7abad9feb52745779e544950b524faead36e63437e311b4b09f50abfa0ed2ebb6997b6b02cc5f7cbe7
-MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653
diff --git a/app-arch/unzip/files/unzip-6.0-format-security.patch b/app-arch/unzip/files/unzip-6.0-format-security.patch
deleted file mode 100644
index c61c13596365..000000000000
--- a/app-arch/unzip/files/unzip-6.0-format-security.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Fix build with -Werror=format-security
-
-Origin: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=master-next&id=f7d80257afcfefdc85b6745328f2d12b957a848b
-Author: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
-
-diff --git a/extract.c b/extract.c
-index 7cd9123..25c5a62 100644
---- a/extract.c
-+++ b/extract.c
-@@ -475,7 +475,7 @@ int extract_or_test_files(__G)    /* return PK-type error code */
-                     Info(slide, 0x401, ((char *)slide,
-                       LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1));
-                     Info(slide, 0x401, ((char *)slide,
--                      LoadFarString(ReportMsg)));
-+                      "%s",LoadFarString(ReportMsg)));
-                     error_in_archive = PK_BADERR;
-                 }
-                 reached_end = TRUE;     /* ...so no more left to do */
-@@ -754,8 +754,8 @@ int extract_or_test_files(__G)    /* return PK-type error code */
-
- #ifndef SFX
-     if (no_endsig_found) {                      /* just to make sure */
--        Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
--        Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg)));
-+        Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
-+        Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(ReportMsg)));
-         if (!error_in_archive)       /* don't overwrite stronger error */
-             error_in_archive = PK_WARN;
-     }
-diff --git a/list.c b/list.c
-index 15e0011..0b484f6 100644
---- a/list.c
-+++ b/list.c
-@@ -181,7 +181,7 @@ int list_files(__G)    /* return PK-type error code */
-                 Info(slide, 0x401,
-                      ((char *)slide, LoadFarString(CentSigMsg), j));
-                 Info(slide, 0x401,
--                     ((char *)slide, LoadFarString(ReportMsg)));
-+                     ((char *)slide, "%s", LoadFarString(ReportMsg)));
-                 return PK_BADERR;   /* sig not found */
-             }
-         }
-@@ -507,7 +507,7 @@ int list_files(__G)    /* return PK-type error code */
-             && (!G.ecrec.is_zip64_archive)
-             && (memcmp(G.sig, end_central_sig, 4) != 0)
-            ) {          /* just to make sure again */
--            Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
-+            Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
-             error_in_archive = PK_WARN;   /* didn't find sig */
-         }
-
-@@ -591,7 +591,7 @@ int get_time_stamp(__G__ last_modtime, nmember)  /* return PK-type error code */
-                 Info(slide, 0x401,
-                      ((char *)slide, LoadFarString(CentSigMsg), j));
-                 Info(slide, 0x401,
--                     ((char *)slide, LoadFarString(ReportMsg)));
-+                     ((char *)slide, "%s", LoadFarString(ReportMsg)));
-                 return PK_BADERR;   /* sig not found */
-             }
-         }
-@@ -674,7 +674,7 @@ int get_time_stamp(__G__ last_modtime, nmember)  /* return PK-type error code */
-   ---------------------------------------------------------------------------*/
- 
-     if (memcmp(G.sig, end_central_sig, 4)) {    /* just to make sure again */
--        Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
-+        Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
-         error_in_archive = PK_WARN;
-     }
-     if (*nmember == 0L && error_in_archive <= PK_WARN)
-diff --git a/zipinfo.c b/zipinfo.c
-index 0ac75b3..1e7fa82 100644
---- a/zipinfo.c
-+++ b/zipinfo.c
-@@ -833,7 +833,7 @@ int zipinfo(__G)   /* return PK-type error code */
-                 Info(slide, 0x401,
-                      ((char *)slide, LoadFarString(CentSigMsg), j));
-                 Info(slide, 0x401,
--                     ((char *)slide, LoadFarString(ReportMsg)));
-+                     ((char *)slide, "%s", LoadFarString(ReportMsg)));
-                 error_in_archive = PK_BADERR;   /* sig not found */
-                 break;
-             }
-@@ -1022,7 +1022,7 @@ int zipinfo(__G)   /* return PK-type error code */
-             && (!G.ecrec.is_zip64_archive)
-             && (memcmp(G.sig, end_central_sig, 4) != 0)
-            ) {          /* just to make sure again */
--            Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
-+            Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
-             error_in_archive = PK_WARN;   /* didn't find sig */
-         }
- 
diff --git a/app-arch/unzip/files/unzip-6.0-natspec.patch b/app-arch/unzip/files/unzip-6.0-natspec.patch
deleted file mode 100644
index 0cf87fd4644f..000000000000
--- a/app-arch/unzip/files/unzip-6.0-natspec.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-This patch makes zip use libnatspec to recode file names is national charset.
-Initially this patch was written for altlinux:
-http://sisyphus.ru/ru/srpm/Sisyphus/zip/patches
-
-Later it was a bit improved and improved version was posted here (in Russian):
-http://www.opennet.ru/tips/info/2494.shtml
-
-Gentoo reference:
-https://bugs.gentoo.org/show_bug.cgi?id=275244
-
-diff -pur unzip60orig/unix/configure unzip60/unix/configure
---- unzip60orig/unix/configure	2009-04-16 23:25:12.000000000 +0400
-+++ unzip60/unix/configure	2010-11-26 19:07:43.000000000 +0300
-@@ -17,7 +17,7 @@ CFLAGSR=${CFLAGS}
- IZ_BZIP2=${3}
- CFLAGS="${CFLAGS} -I. -DUNIX"
- LFLAGS1=""
--LFLAGS2="-s"
-+LFLAGS2="-l natspec"
- LN="ln -s"
- 
- CFLAGS_OPT=''
-diff -pur unzip60orig/unix/Makefile unzip60/unix/Makefile
---- unzip60orig/unix/Makefile	2009-01-19 01:41:18.000000000 +0300
-+++ unzip60/unix/Makefile	2010-11-29 14:25:58.461000001 +0300
-@@ -45,14 +45,14 @@
- CC = cc#	try using "gcc" target rather than changing this (CC and LD
- LD = $(CC)#	must match, else "unresolved symbol:  ___main" is possible)
- AS = as
--LOC = $(D_USE_BZ2) $(LOCAL_UNZIP)
-+LOC = $(D_USE_BZ2) -DNO_SETLOCALE $(LOCAL_UNZIP)
- AF = $(LOC)
- CFLAGS = -O
- CF_NOOPT = -I. -I$(IZ_BZIP2) -DUNIX $(LOC)
- CF = $(CFLAGS) $(CF_NOOPT)
- LFLAGS1 =
- LF = -o unzip$E $(LFLAGS1)
--LF2 = -s
-+LF2 = -l natspec
- 
- # UnZipSFX flags
- SL = -o unzipsfx$E $(LFLAGS1)
-@@ -121,7 +121,7 @@ INSTALL_PROGRAM = $(INSTALL)
- INSTALL_D = mkdir -p
- # on some systems, manext=l and MANDIR=/usr/man/man$(manext) may be appropriate
- manext = 1
--prefix = /usr/local
-+prefix = /usr
- BINDIR = $(prefix)/bin#			where to install executables
- MANDIR = $(prefix)/man/man$(manext)#	where to install man pages
- INSTALLEDBIN = $(BINDIR)/funzip$E $(BINDIR)/unzip$E $(BINDIR)/unzipsfx$E \
-diff -pur unzip60orig/unix/unix.c unzip60/unix/unix.c
---- unzip60orig/unix/unix.c	2009-01-24 02:31:26.000000000 +0300
-+++ unzip60/unix/unix.c	2010-11-26 16:58:35.000000000 +0300
-@@ -30,6 +30,9 @@
- #define UNZIP_INTERNAL
- #include "unzip.h"
- 
-+#include <iconv.h>
-+#include <natspec.h>
-+
- #ifdef SCO_XENIX
- #  define SYSNDIR
- #else  /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
-@@ -1874,3 +1877,44 @@ static void qlfix(__G__ ef_ptr, ef_len)
-     }
- }
- #endif /* QLZIP */
-+
-+
-+char OEM_CP[MAX_CP_NAME] = "";
-+char ISO_CP[MAX_CP_NAME] = "";
-+
-+/* Getr the default value of OEM_CP based on the current locale.
-+ * ISO_CP is left alone for now. */
-+void init_conversion_charsets()
-+{
-+    /* Make a guess only if OEM_CP not already set. */ 
-+    if(*OEM_CP == '\0') {
-+        const char * archive_charset = natspec_get_charset_by_locale(NATSPEC_DOSCS, "");
-+        strncpy(OEM_CP, archive_charset, sizeof(OEM_CP));
-+    }
-+
-+    if(*ISO_CP == '\0') {
-+        const char * archive_charset = natspec_get_charset_by_locale(NATSPEC_WINCS, "");
-+        strncpy(ISO_CP, archive_charset, sizeof(ISO_CP));
-+    }
-+
-+}
-+
-+/* Convert a string from OEM_CP to the current locale charset. */
-+inline void oem_intern(char *string)
-+{
-+    char *buf = natspec_convert(string, 0, OEM_CP, 0);
-+	/* Since Ext_ASCII_TO_Native used only for G.filename[FILNAMESIZE],
-+	   use FILNAMSIZ as string size */
-+    strncpy(string, buf, FILNAMSIZ);
-+	free (buf);
-+}
-+
-+/* Convert a string from ISO_CP to the current locale charset. */
-+inline void iso_intern(char *string)
-+{
-+    char *buf = natspec_convert(string, 0, ISO_CP, 0);
-+	/* Since Ext_ASCII_TO_Native used only for G.filename[FILNAMESIZE],
-+	   use FILNAMSIZ as string size */
-+    strncpy(string, buf, FILNAMSIZ);
-+	free (buf);
-+}
-diff -pur unzip60orig/unix/unxcfg.h unzip60/unix/unxcfg.h
---- unzip60orig/unix/unxcfg.h	2009-04-16 22:36:12.000000000 +0400
-+++ unzip60/unix/unxcfg.h	2010-11-26 16:58:35.000000000 +0300
-@@ -227,4 +227,30 @@ typedef struct stat z_stat;
- /* wild_dir, dirname, wildname, matchname[], dirnamelen, have_dirname, */
- /*    and notfirstcall are used by do_wild().                          */
- 
-+
-+#define MAX_CP_NAME 25 
-+   
-+#ifdef SETLOCALE
-+#  undef SETLOCALE
-+#endif
-+#define SETLOCALE(category, locale) setlocale(category, locale)
-+#include <locale.h>
-+   
-+#ifdef _ISO_INTERN
-+#  undef _ISO_INTERN
-+#endif
-+#define _ISO_INTERN(str1) iso_intern(str1)
-+
-+#ifdef _OEM_INTERN
-+#  undef _OEM_INTERN
-+#endif
-+#ifndef IZ_OEM2ISO_ARRAY
-+#  define IZ_OEM2ISO_ARRAY
-+#endif
-+#define _OEM_INTERN(str1) oem_intern(str1)
-+
-+void iso_intern(char *);
-+void oem_intern(char *);
-+void init_conversion_charsets(void);
-+   
- #endif /* !__unxcfg_h */
-diff -pur unzip60orig/unzip.c unzip60/unzip.c
---- unzip60orig/unzip.c	2009-04-16 22:26:52.000000000 +0400
-+++ unzip60/unzip.c	2010-11-26 16:58:35.000000000 +0300
-@@ -331,7 +331,9 @@ static ZCONST char Far ZipInfoUsageLine3
-   -h  print header line       -t  print totals for listed files or for all\n\
-   -z  print zipfile comment   -T  print file times in sortable decimal format\
- \n  -C  be case-insensitive   %s\
--  -x  exclude filenames that follow from listing\n";
-+  -x  exclude filenames that follow from listing\n\
-+  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
-+  -I CHARSET  specify a character encoding for UNIX and other archives\n";
- #ifdef MORE
-    static ZCONST char Far ZipInfoUsageLine4[] =
-      "  -M  page output through built-in \"more\"\n";
-@@ -673,7 +674,9 @@ modifiers:\n\
-   -j  junk paths (do not make directories)   -aa treat ALL files as text\n\
-   -U  use escapes for all non-ASCII Unicode  -UU ignore any Unicode fields\n\
-   -C  match filenames case-insensitively     -L  make (some) names \
--lowercase\n %-42s  -V  retain VMS version numbers\n%s";
-+lowercase\n %-42s  -V  retain VMS version numbers\n%s\
-+  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
-+  -I CHARSET  specify a character encoding for UNIX and other archives\n";
- #endif /* ?VMS */
- #else /* !UNICODE_SUPPORT */
- #ifdef VMS
-@@ -692,7 +695,9 @@ modifiers:\n\
-   -o  overwrite files WITHOUT prompting      -a  auto-convert any text files\n\
-   -j  junk paths (do not make directories)   -aa treat ALL files as text\n\
-   -C  match filenames case-insensitively     -L  make (some) names \
--lowercase\n %-42s  -V  retain VMS version numbers\n%s";
-+lowercase\n %-42s  -V  retain VMS version numbers\n%s\
-+  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
-+  -I CHARSET  specify a character encoding for UNIX and other archives\n";
- #endif /* ?VMS */
- #endif /* ?UNICODE_SUPPORT */
- 
-@@ -803,6 +808,10 @@ int unzip(__G__ argc, argv)
- #endif /* UNICODE_SUPPORT */
- 
- 
-+#ifdef UNIX
-+    init_conversion_charsets();
-+#endif
-+
- #if (defined(__IBMC__) && defined(__DEBUG_ALLOC__))
-     extern void DebugMalloc(void);
- 
-@@ -1336,6 +1345,11 @@ int uz_opts(__G__ pargc, pargv)
-     argc = *pargc;
-     argv = *pargv;
- 
-+#ifdef UNIX
-+    extern char OEM_CP[MAX_CP_NAME];
-+    extern char ISO_CP[MAX_CP_NAME];
-+#endif
-+    
-     while (++argv, (--argc > 0 && *argv != NULL && **argv == '-')) {
-         s = *argv + 1;
-         while ((c = *s++) != 0) {    /* "!= 0":  prevent Turbo C warning */
-@@ -1517,6 +1531,35 @@ int uz_opts(__G__ pargc, pargv)
-                     }
-                     break;
- #endif  /* MACOS */
-+#ifdef UNIX
-+    			case ('I'):
-+                    if (negative) {
-+                        Info(slide, 0x401, ((char *)slide,
-+                          "error:  encodings can't be negated"));
-+                        return(PK_PARAM);
-+    				} else {
-+    					if(*s) { /* Handle the -Icharset case */
-+    						/* Assume that charsets can't start with a dash to spot arguments misuse */
-+    						if(*s == '-') { 
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						strncpy(ISO_CP, s, sizeof(ISO_CP));
-+    					} else { /* -I charset */
-+    						++argv;
-+    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						s = *argv;
-+    						strncpy(ISO_CP, s, sizeof(ISO_CP));
-+    					}
-+    					while(*(++s)); /* No params straight after charset name */
-+    				}
-+    				break;
-+#endif /* ?UNIX */
-                 case ('j'):    /* junk pathnames/directory structure */
-                     if (negative)
-                         uO.jflag = FALSE, negative = 0;
-@@ -1592,6 +1635,35 @@ int uz_opts(__G__ pargc, pargv)
-                     } else
-                         ++uO.overwrite_all;
-                     break;
-+#ifdef UNIX
-+    			case ('O'):
-+                    if (negative) {
-+                        Info(slide, 0x401, ((char *)slide,
-+                          "error:  encodings can't be negated"));
-+                        return(PK_PARAM);
-+    				} else {
-+    					if(*s) { /* Handle the -Ocharset case */
-+    						/* Assume that charsets can't start with a dash to spot arguments misuse */
-+    						if(*s == '-') { 
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						strncpy(OEM_CP, s, sizeof(OEM_CP));
-+    					} else { /* -O charset */
-+    						++argv;
-+    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -O argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						s = *argv;
-+    						strncpy(OEM_CP, s, sizeof(OEM_CP));
-+    					}
-+    					while(*(++s)); /* No params straight after charset name */
-+    				}
-+    				break;
-+#endif /* ?UNIX */
-                 case ('p'):    /* pipes:  extract to stdout, no messages */
-                     if (negative) {
-                         uO.cflag = FALSE;
-diff -pur unzip60orig/unzpriv.h unzip60/unzpriv.h
---- unzip60orig/unzpriv.h	2009-04-20 03:59:26.000000000 +0400
-+++ unzip60/unzpriv.h	2010-11-26 16:58:35.000000000 +0300
-@@ -3008,7 +3008,7 @@ char    *GetLoadPath     OF((__GPRO));  
-          !(((islochdr) || (isuxatt)) && \
-            ((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \
-         (hostnum) == FS_HPFS_ || \
--        ((hostnum) == FS_NTFS_ && (hostver) == 50)) { \
-+        ((hostnum) == FS_NTFS_/* && (hostver) == 50*/)) { \
-         _OEM_INTERN((string)); \
-     } else { \
-         _ISO_INTERN((string)); \
-diff -pur unzip60orig/zipinfo.c unzip60/zipinfo.c
---- unzip60orig/zipinfo.c	2009-02-08 20:04:30.000000000 +0300
-+++ unzip60/zipinfo.c	2010-11-26 16:58:35.000000000 +0300
-@@ -457,6 +457,10 @@ int zi_opts(__G__ pargc, pargv)
-     int    tflag_slm=TRUE, tflag_2v=FALSE;
-     int    explicit_h=FALSE, explicit_t=FALSE;
- 
-+#ifdef UNIX
-+    extern char OEM_CP[MAX_CP_NAME];
-+    extern char ISO_CP[MAX_CP_NAME];
-+#endif
- 
- #ifdef MACOS
-     uO.lflag = LFLAG;         /* reset default on each call */
-@@ -501,6 +505,35 @@ int zi_opts(__G__ pargc, pargv)
-                             uO.lflag = 0;
-                     }
-                     break;
-+#ifdef UNIX
-+    			case ('I'):
-+                    if (negative) {
-+                        Info(slide, 0x401, ((char *)slide,
-+                          "error:  encodings can't be negated"));
-+                        return(PK_PARAM);
-+    				} else {
-+    					if(*s) { /* Handle the -Icharset case */
-+    						/* Assume that charsets can't start with a dash to spot arguments misuse */
-+    						if(*s == '-') { 
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						strncpy(ISO_CP, s, sizeof(ISO_CP));
-+    					} else { /* -I charset */
-+    						++argv;
-+    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						s = *argv;
-+    						strncpy(ISO_CP, s, sizeof(ISO_CP));
-+    					}
-+    					while(*(++s)); /* No params straight after charset name */
-+    				}
-+    				break;
-+#endif /* ?UNIX */
-                 case 'l':      /* longer form of "ls -l" type listing */
-                     if (negative)
-                         uO.lflag = -2, negative = 0;
-@@ -521,6 +554,35 @@ int zi_opts(__G__ pargc, pargv)
-                         G.M_flag = TRUE;
-                     break;
- #endif
-+#ifdef UNIX
-+    			case ('O'):
-+                    if (negative) {
-+                        Info(slide, 0x401, ((char *)slide,
-+                          "error:  encodings can't be negated"));
-+                        return(PK_PARAM);
-+    				} else {
-+    					if(*s) { /* Handle the -Ocharset case */
-+    						/* Assume that charsets can't start with a dash to spot arguments misuse */
-+    						if(*s == '-') { 
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						strncpy(OEM_CP, s, sizeof(OEM_CP));
-+    					} else { /* -O charset */
-+    						++argv;
-+    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -O argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						s = *argv;
-+    						strncpy(OEM_CP, s, sizeof(OEM_CP));
-+    					}
-+    					while(*(++s)); /* No params straight after charset name */
-+    				}
-+    				break;
-+#endif /* ?UNIX */
-                 case 's':      /* default:  shorter "ls -l" type listing */
-                     if (negative)
-                         uO.lflag = -2, negative = 0;
diff --git a/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch b/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch
deleted file mode 100644
index 7973378704e1..000000000000
--- a/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Make sure that the asm files don't incorrectly trigger an executable
-stack marking in the final shared library.  That's bad, mmmkay.
-
---- unzip/crc_i386.S
-+++ unzip/crc_i386.S
-@@ -302,3 +302,7 @@
- #endif /* i386 || _i386 || _I386 || __i386 */
- 
- #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/app-arch/unzip/metadata.xml b/app-arch/unzip/metadata.xml
deleted file mode 100644
index 564fd76677c8..000000000000
--- a/app-arch/unzip/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>base-system@gentoo.org</email>
-		<name>Gentoo Base System</name>
-	</maintainer>
-	<use>
-		<flag name="natspec">Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">infozip</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild
deleted file mode 100644
index e97847b09501..000000000000
--- a/app-arch/unzip/unzip-6.0_p20.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV//.}"
-MY_PV="${MY_PV%_p*}"
-MY_P="${PN}${MY_PV}"
-
-DESCRIPTION="unzipper for pkzip-compressed files"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
-	mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="bzip2 natspec unicode"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local deb="${WORKDIR}"/debian/patches
-	rm \
-		"${deb}"/series \
-		"${deb}"/02-branding-patch-this-is-debian-unzip \
-		|| die
-	epatch "${deb}"/*
-
-	epatch "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
-	use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
-	sed -i -r \
-		-e '/^CFLAGS/d' \
-		-e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
-		-e '/^STRIP/s:=.*:=true:' \
-		-e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
-		-e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
-		-e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
-		-e 's:LF2 = -s:LF2 = :' \
-		-e 's:LF = :LF = $(LDFLAGS) :' \
-		-e 's:SL = :SL = $(LDFLAGS) :' \
-		-e 's:FL = :FL = $(LDFLAGS) :' \
-		-e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
-		-e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
-		unix/Makefile \
-		|| die "sed unix/Makefile failed"
-
-	# Delete bundled code to make sure we don't use it.
-	rm -r bzip2 || die
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-	i?86*-*linux*)       TARGET="linux_asm" ;;
-	*linux*)             TARGET="linux_noasm" ;;
-	i?86*-*bsd* | \
-	i?86*-dragonfly*)    TARGET="freebsd" ;; # mislabelled bsd with x86 asm
-	*bsd* | *dragonfly*) TARGET="bsd" ;;
-	*-darwin*)           TARGET="macosx" ;;
-	*-cygwin*)           TARGET="cygwin" ;;
-	*) die "Unknown target; please update the ebuild to handle ${CHOST}	" ;;
-	esac
-
-	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
-	use bzip2 && append-cppflags -DUSE_BZIP2
-	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
-	append-cppflags -DLARGE_FILE_SUPPORT #281473
-}
-
-src_compile() {
-	ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
-	emake -f unix/Makefile ${TARGET}
-}
-
-src_install() {
-	dobin unzip funzip unzipsfx unix/zipgrep
-	dosym unzip /usr/bin/zipinfo
-	doman man/*.1
-	dodoc BUGS History* README ToDo WHERE
-}
diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
deleted file mode 100644
index 475c481ec075..000000000000
--- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV//.}"
-MY_PV="${MY_PV%_p*}"
-MY_P="${PN}${MY_PV}"
-
-DESCRIPTION="unzipper for pkzip-compressed files"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
-	mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="bzip2 natspec unicode"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	local deb="${WORKDIR}"/debian/patches
-	rm "${deb}"/02-this-is-debian-unzip.patch || die
-	eapply "${deb}"/*.patch
-
-	eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
-	eapply "${FILESDIR}"/${PN}-6.0-format-security.patch
-	use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
-	sed -i -r \
-		-e '/^CFLAGS/d' \
-		-e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
-		-e '/^STRIP/s:=.*:=true:' \
-		-e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
-		-e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
-		-e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
-		-e 's:LF2 = -s:LF2 = :' \
-		-e 's:LF = :LF = $(LDFLAGS) :' \
-		-e 's:SL = :SL = $(LDFLAGS) :' \
-		-e 's:FL = :FL = $(LDFLAGS) :' \
-		-e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
-		-e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
-		unix/Makefile \
-		|| die "sed unix/Makefile failed"
-
-	# Delete bundled code to make sure we don't use it.
-	rm -r bzip2 || die
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-	i?86*-*linux*)       TARGET="linux_asm" ;;
-	*linux*)             TARGET="linux_noasm" ;;
-	i?86*-*bsd* | \
-	i?86*-dragonfly*)    TARGET="freebsd" ;; # mislabelled bsd with x86 asm
-	*bsd* | *dragonfly*) TARGET="bsd" ;;
-	*-darwin*)           TARGET="macosx" ;;
-	*-cygwin*)           TARGET="cygwin" ;;
-	*) die "Unknown target; please update the ebuild to handle ${CHOST}	" ;;
-	esac
-
-	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
-	use bzip2 && append-cppflags -DUSE_BZIP2
-	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
-	append-cppflags -DLARGE_FILE_SUPPORT #281473
-}
-
-src_compile() {
-	ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
-	emake -f unix/Makefile ${TARGET}
-}
-
-src_install() {
-	dobin unzip funzip unzipsfx unix/zipgrep
-	dosym unzip /usr/bin/zipinfo
-	doman man/*.1
-	dodoc BUGS History* README ToDo WHERE
-}