gentoo resync : 14.07.2018

10 files changed, 0 insertions, 512 deletions

diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
deleted file mode 100644
index 459a68bce3bc..000000000000
--- a/app-arch/zip/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX zip-3.0-build.patch 923 BLAKE2B 0a8b7d8fb98f9bc8750c3bb6ff9a672db86481ca88349e5e08d2e96ae0cabac4ef75651a91e9b0fb8e70e1c075ea721060a3851bdd6e103b1f4c020a8b4f4979 SHA512 c9cf162505938a0200eed0333849c2c4a3b59088a6549377a3af9ac89cd7a26fd388d09df55a6cd117e607c1a2f2960bc5e85f7384ff30565c2be01ce4ff442d
-AUX zip-3.0-exec-stack.patch 548 BLAKE2B 3ded2568eea78c89422ea043bb68917d4a508d6ee6d8d65e9db6c22f6d5dbcac15836a94ad5d1209112cb73c1da4f266346e722cafcf3a6a91080261c4d5df93 SHA512 575516abe5ed633bdda22c3ee41109400360eef437671f9b658d7591bb8fa3b3854c1cd92d6396e47d91545b23ecbbc1218190192e39a60b00d6b7b5bb793eab
-AUX zip-3.0-format-security.patch 507 BLAKE2B f595179f8267fc2866e21b8a943323e2146e118e44ed4dd6b03a65a2c433940efd5ccc98f72f8d85dd7291f9b0bcb8eb5068ad22b9bd6fa040265253e54d4b63 SHA512 172e842e1cd43006713f570ceb8bd4998595282b973569d0e264bd9599375668a4045d691fc952a75088ad6f17e6ff90baf22606388f73ad2f2c0ac64d250fa2
-AUX zip-3.0-natspec.patch 6800 BLAKE2B 6363c941894d7de7611392ea3e883ad724093bf6fb090ce84a4c99d36ab8688ef5083d09a83431bcc1f399327e1071d4b2c4cc03cef2c1548b776699ddb4763b SHA512 67cf89ad016d51ec99e153cb05ee150318c18b3243b04daad0a9a0c0fce7e908bf7ed6fcd6361029bdd4da68759c22abf02dcbcca704b45a75367b1f42ebe964
-AUX zip-3.0-no-crypt.patch 1108 BLAKE2B 92de0a453e128a87a6d37f0a9cca55f5451946c14316992898c8f3451336a7f526d8283a57fff841c5b990374b0cea163723a25522f5ecd194b294e39bf137d4 SHA512 89a99e694fa2ad289ecc93a514e7b408e4b9e01778e622b2c2928d98181de3823446e91085f401e3478afce1ccbf8775fb227c1908144889dd0106c2d7029b83
-AUX zip-3.0-pic.patch 499 BLAKE2B 0b3ad7552ed4b3900b720360145f2466bb2835823a828ed4e3fe7e8ce22c547296ff0f74416f8b9a75ae4ef70d9cce521f96becbbbcc9ddb89481c3944d6b501 SHA512 a5f4381de900821c91bb164f580b7abe0bb61ebbbcb00e376f38763255bc647bda678fd66af59e9d56cb8bb7a2166553a77af79cfa75f3e0ea4dbc515b876b8e
-AUX zip-3.0-zipnote-freeze.patch 2170 BLAKE2B b0080c9d5310a9cdd14eebc503d76e7463969982717476aa4359ae1c4651290112654f25c202defeddec5efaf1f32ec74c824a7370727b7e6a055dcac6211908 SHA512 c7db2d8c43d33bff4be6068c89603d2f67876f2b5ea72a01ad53f1baa42206c7a0a967f101a54092715f7fcc3ee2bf45a448e76a0ef55e64dc0fe0b204966367
-DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
-EBUILD zip-3.0-r3.ebuild 1730 BLAKE2B 01d5169b8d3f6315161f0c2a6d2000fa72dcd96f91f381f0fa414a0d64a78f04dcb359835f937b01ce7f82ebff9b3aeb6e86f9589730e88d8ae2ef8ea7ac234c SHA512 8f0305fe1e428a310534adbfba75c500cc242c62c1027f686ba5c5d22970bed0d6e2b96784072099716dfdac9c178568b3bcc1d8ef228e276ca7af102b9aa148
-MISC metadata.xml 573 BLAKE2B 1818315ab71e9bbcd96875d0bd99f11fc41131c1d082bd6468465a3dd8e48f79817958c8aa4d31f4d0ad0aa28bfced7fbdc5567cebd23badf2a9b9a623f6a80a SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131
diff --git a/app-arch/zip/files/zip-3.0-build.patch b/app-arch/zip/files/zip-3.0-build.patch
deleted file mode 100644
index 595303cc48d4..000000000000
--- a/app-arch/zip/files/zip-3.0-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-respect build environment settings
-
---- zip/unix/configure
-+++ zip/unix/configure
-@@ -18,7 +18,7 @@
- 
- CC=${1-cc}
- CFLAGS=${2-"-I. -DUNIX"}
--LFLAGS1=''
-+LFLAGS1="${LDFLAGS}"
- LFLAGS2=''
- LN="ln -s"
- 
-@@ -118,7 +118,7 @@ _EOF_
- fi
- 
- # optimization flags
--if test -n "${CFLAGS_OPT}"; then
-+if false; then
-   CFLAGS="${CFLAGS} ${CFLAGS_OPT}"
-   CFLAGS_BZ="${CFLAGS_BZ} ${CFLAGS_OPT}"
- fi
-@@ -220,13 +220,6 @@ fi
- echo Check for the C preprocessor
- # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp.
- CPP="${CC} -E"
--# solaris as(1) needs -P, maybe others as well ?
--[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
--[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
--[ -f /lib/cpp ] && CPP=/lib/cpp
--[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
--[ -f /xenix ] && CPP="${CC} -E"
--[ -f /lynx.os ] && CPP="${CC} -E"
- 
- echo "#include <stdio.h>" > conftest.c
- $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E"
diff --git a/app-arch/zip/files/zip-3.0-exec-stack.patch b/app-arch/zip/files/zip-3.0-exec-stack.patch
deleted file mode 100644
index 80719c961298..000000000000
--- a/app-arch/zip/files/zip-3.0-exec-stack.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-add proper GNU stack markings so we dont get the default: executable
-
---- zip-2.31/crc_i386.S
-+++ zip-2.31/crc_i386.S
-@@ -238,3 +238,7 @@
- #endif /* i386 || _i386 || _I386 || __i386 */
- 
- #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
-+
-+#if defined __ELF__ && defined __linux__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- zip-2.31/match.S
-+++ zip-2.31/match.S
-@@ -405,3 +405,7 @@
- #endif /* i386 || _I386 || _i386 || __i386  */
- 
- #endif /* !USE_ZLIB */
-+
-+#if defined __ELF__ && defined __linux__
-+.section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/app-arch/zip/files/zip-3.0-format-security.patch b/app-arch/zip/files/zip-3.0-format-security.patch
deleted file mode 100644
index 1edc2d6a1b88..000000000000
--- a/app-arch/zip/files/zip-3.0-format-security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- zip.c
-+++ zip.c
-@@ -1028,7 +1028,7 @@
- 
-   for (i = 0; i < sizeof(text)/sizeof(char *); i++)
-   {
--    printf(text[i]);
-+    fputs(text[i], stdout);
-     putchar('\n');
-   }
- #ifdef DOS
-@@ -1225,7 +1225,7 @@
-             CR_MAJORVER, CR_MINORVER, CR_BETA_VER, CR_VERSION_DATE);
-   for (i = 0; i < sizeof(cryptnote)/sizeof(char *); i++)
-   {
--    printf(cryptnote[i]);
-+    fputs(cryptnote[i], stdout);
-     putchar('\n');
-   }
-   ++i;  /* crypt support means there IS at least one compilation option */
diff --git a/app-arch/zip/files/zip-3.0-natspec.patch b/app-arch/zip/files/zip-3.0-natspec.patch
deleted file mode 100644
index 1dfce09d1331..000000000000
--- a/app-arch/zip/files/zip-3.0-natspec.patch
+++ /dev/null
@@ -1,214 +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
-
-Also I've added natspec support to output of zipnote (thank vapier for notice).
-
-Gentoo reference:
-https://bugs.gentoo.org/show_bug.cgi?id=275244
-
---
-pva@gentoo.org
-
-=== modified file 'fileio.c'
---- fileio.c	2010-12-22 13:02:43 +0000
-+++ fileio.c	2010-12-22 13:03:00 +0000
-@@ -929,7 +929,7 @@
-   }
-   if ((zname = in2ex(iname)) == NULL)
-     return ZE_MEM;
--#ifdef UNICODE_SUPPORT
-+#if defined(UNICODE_SUPPORT) && !defined(UNIX)
-   /* Convert name to display or OEM name */
-   oname = local_to_display_string(iname);
- #else
-
-=== modified file 'globals.c'
---- globals.c	2010-12-22 13:02:43 +0000
-+++ globals.c	2010-12-22 13:03:00 +0000
-@@ -32,7 +32,7 @@
- int scanimage = 1;      /* 1=scan through image files */
- #endif
- int method = BEST;      /* one of BEST, DEFLATE (only), or STORE (only) */
--int dosify = 0;         /* 1=make new entries look like MSDOS */
-+int dosify = 1;         /* 1=make new entries look like MSDOS */
- int verbose = 0;        /* 1=report oddities in zip file structure */
- int fix = 0;            /* 1=fix the zip file, 2=FF, 3=ZipNote */
- int filesync = 0;       /* 1=file sync, delete entries not on file system */
-
-=== modified file 'unix/Makefile'
---- unix/Makefile	2010-12-22 13:02:43 +0000
-+++ unix/Makefile	2010-12-22 15:43:40 +0000
-@@ -38,7 +38,7 @@
- MANFLAGS = 644
- 
- # target directories - where to install executables and man pages to
--prefix = /usr/local
-+prefix = /usr
- BINDIR = $(prefix)/bin
- MANEXT=1
- MANDIR = $(prefix)/man/man$(MANEXT)
-@@ -61,6 +61,7 @@
- CFLAGS = -O2 $(CFLAGS_NOOPT)
- LFLAGS1 =
- LFLAGS2 = -s
-+LDADD = -lnatspec
- 
- # object file lists
- OBJZ = zip.o zipfile.o zipup.o fileio.o util.o globals.o crypt.o ttyio.o \
-@@ -125,9 +126,9 @@
- zipsman: $(ZIPS) $(ZIPMANUALs)
- 
- zip$E: $(OBJZ) $(OBJI) $(OBJA) $(LIB_BZ)
--	$(BIND) -o zip$E $(LFLAGS1) $(OBJZ) $(OBJI) $(OBJA) $(LFLAGS2)
-+	$(BIND) -o zip$E $(LFLAGS1) $(OBJZ) $(OBJI) $(OBJA) $(LFLAGS2) $(LDADD)
- zipnote$E: $(OBJN)
--	$(BIND) -o zipnote$E $(LFLAGS1) $(OBJN) $(LFLAGS2)
-+	$(BIND) -o zipnote$E $(LFLAGS1) $(OBJN) $(LFLAGS2) $(LDADD)
- zipcloak$E: $(OBJC) $(OCRCTB)
- 	$(BIND) -o zipcloak$E $(LFLAGS1) $(OBJC) $(LFLAGS2)
- zipsplit$E: $(OBJS)
-
-=== modified file 'unix/osdep.h'
---- unix/osdep.h	2010-12-22 13:02:43 +0000
-+++ unix/osdep.h	2010-12-22 15:45:29 +0000
-@@ -78,3 +78,6 @@
- #if !defined(NO_EF_UT_TIME) && !defined(USE_EF_UT_TIME)
- #  define USE_EF_UT_TIME
- #endif
-+
-+/* Set Windows code as archive type */
-+#  define OS_CODE  0xb00
-
-=== modified file 'unix/unix.c'
---- unix/unix.c	2010-12-22 13:02:43 +0000
-+++ unix/unix.c	2010-12-22 13:03:00 +0000
-@@ -14,6 +14,11 @@
- 
- #include <time.h>
- 
-+#ifdef UNIX
-+#  include <natspec.h>
-+#  include <locale.h>
-+#endif
-+
- #if defined(MINIX) || defined(__mpexl)
- #  ifdef S_IWRITE
- #    undef S_IWRITE
-@@ -60,6 +65,7 @@
- 
- /* Local functions */
- local char *readd OF((DIR *));
-+local const char *oem_charset = NULL;
- 
- 
- #ifdef NO_DIR                    /* for AT&T 3B1 */
-@@ -262,6 +268,16 @@
-   if (!pathput)
-     t = last(t, PATH_END);
- 
-+#ifdef UNIX
-+  if (!oem_charset) {
-+    setlocale(LC_CTYPE, "");
-+    oem_charset = natspec_get_charset_by_locale(NATSPEC_DOSCS, "");
-+  }
-+  /* Convert to internal encoding */
-+  if ((n = natspec_convert(t, oem_charset, 0, 0)) == NULL)
-+    return NULL;
-+  return n;
-+#else
-   /* Malloc space for internal name and copy it */
-   if ((n = malloc(strlen(t) + 1)) == NULL)
-     return NULL;
-@@ -269,6 +285,7 @@
- 
-   if (dosify)
-     msname(n);
-+#endif
- 
- #ifdef EBCDIC
-   strtoasc(n, n);       /* here because msname() needs native coding */
-@@ -289,8 +306,19 @@
- {
-   char *x;              /* external file name */
- 
-+#ifdef UNIX
-+  if (!oem_charset) {
-+    oem_charset = natspec_get_charset_by_locale(NATSPEC_DOSCS, "");
-+    setlocale(LC_CTYPE, "");
-+  }
-+  /* Convert to internal encoding */
-+  if ((x = natspec_convert(n, 0, oem_charset, 0)) == NULL)
-+    return NULL;
-+  return x;
-+#else
-   if ((x = malloc(strlen(n) + 1 + PAD)) == NULL)
-     return NULL;
-+#endif
- #ifdef EBCDIC
-   strtoebc(x, n);
- #else
-
-=== modified file 'zip.c'
---- zip.c	2010-12-22 13:02:43 +0000
-+++ zip.c	2010-12-22 13:03:00 +0000
-@@ -2025,6 +2025,7 @@
- #endif /* ?MACOS */
-     {"J",  "junk-sfx",    o_NO_VALUE,       o_NOT_NEGATABLE, 'J',  "strip self extractor from archive"},
-     {"k",  "DOS-names",   o_NO_VALUE,       o_NOT_NEGATABLE, 'k',  "force use of 8.3 DOS names"},
-+    {"K",  "no DOS-names",o_NO_VALUE,       o_NOT_NEGATABLE, 'K',  "no use 8.3 DOS names"},
-     {"l",  "to-crlf",     o_NO_VALUE,       o_NOT_NEGATABLE, 'l',  "convert text file line ends - LF->CRLF"},
-     {"ll", "from-crlf",   o_NO_VALUE,       o_NOT_NEGATABLE, o_ll, "convert text file line ends - CRLF->LF"},
-     {"lf", "logfile-path",o_REQUIRED_VALUE, o_NOT_NEGATABLE, o_lf, "log to log file at path (default overwrite)"},
-@@ -2289,7 +2290,7 @@
-   dispose = 0;         /* 1=remove files after put in zip file */
-   pathput = 1;         /* 1=store path with name */
-   method = BEST;       /* one of BEST, DEFLATE (only), or STORE (only) */
--  dosify = 0;          /* 1=make new entries look like MSDOS */
-+  dosify = 1;          /* 1=make new entries look like MSDOS */
-   verbose = 0;         /* 1=report oddities in zip file structure */
-   fix = 0;             /* 1=fix the zip file */
-   adjust = 0;          /* 1=adjust offsets for sfx'd file (keep preamble) */
-@@ -2859,6 +2860,8 @@
-           junk_sfx = 1;  break;
-         case 'k':   /* Make entries using DOS names (k for Katz) */
-           dosify = 1;  break;
-+        case 'K':   /* Make entries using DOS names (K for Kompat) */
-+          dosify = 0;  break;
-         case 'l':   /* Translate end-of-line */
-           translate_eol = 1; break;
-         case o_ll:
-
-=== modified file 'zipnote.c'
---- zipnote.c	2010-12-22 13:02:43 +0000
-+++ zipnote.c	2010-12-22 15:42:45 +0000
-@@ -21,6 +21,11 @@
- #include "revision.h"
- #include <signal.h>
- 
-+#ifdef UNIX
-+#  include <natspec.h>
-+#  include <locale.h>
-+#endif
-+
- /* Calculate size of static line buffer used in write (-w) mode. */
- #define WRBUFSIZ 2047
- /* The line buffer size should be at least as large as FNMAX. */
-@@ -537,7 +542,13 @@
-   {
-     for (z = zfiles; z != NULL; z = z->nxt)
-     {
-+#ifdef UNIX
-+      char *oem_charset = NULL;
-+      oem_charset = natspec_get_charset_by_locale(NATSPEC_DOSCS, "");
-+      printf("%c %s\n", MARK, natspec_convert(z->zname, 0, oem_charset, 0));
-+#else
-       printf("%c %s\n", MARK, z->zname);
-+#endif
-       putclean(z->comment, z->com);
-       printf("%c%s\n", MARK, MARKE);
-     }
-
diff --git a/app-arch/zip/files/zip-3.0-no-crypt.patch b/app-arch/zip/files/zip-3.0-no-crypt.patch
deleted file mode 100644
index 2858b51ec2c9..000000000000
--- a/app-arch/zip/files/zip-3.0-no-crypt.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-fix building when NO_CRYPT is used
-
-forward ported from zip-2.32
-
-http://bugs.gentoo.org/238398
-
---- zip.c
-+++ zip.c
-@@ -3452,6 +3452,9 @@ char **argv;            /* command line tokens */
- 
-   /* Key not yet specified.  If needed, get/verify it now. */
-   if (key_needed) {
-+#if !CRYPT
-+    ZIPERR(ZE_PARMS, "encryption not supported");
-+#else /* CRYPT */
-     if ((key = malloc(IZ_PWLEN+1)) == NULL) {
-       ZIPERR(ZE_MEM, "was getting encryption password");
-     }
-@@ -3478,6 +3481,7 @@ char **argv;            /* command line tokens */
-     if (r) {
-       ZIPERR(ZE_PARMS, "password verification failed");
-     }
-+#endif
-   }
-   if (key) {
-     /* if -P "" could get here */
---- zipcloak.c
-+++ zipcloak.c
-@@ -744,6 +744,28 @@ struct option_struct far options[] = {
- 
- int main OF((void));
- 
-+void zipmessage_nl(a, nl)
-+ZCONST char *a;
-+int nl;
-+{
-+}
-+
-+void zipmessage(a, b)
-+ZCONST char *a, *b;
-+{
-+}
-+
-+int set_filetype(out_path)
-+  char *out_path;
-+{
-+}
-+
-+int rename_split(temp_name, out_path)
-+  char *temp_name;
-+  char *out_path;
-+{
-+}
-+
- void zipwarn(msg1, msg2)
- ZCONST char  *msg1, *msg2;
- {
diff --git a/app-arch/zip/files/zip-3.0-pic.patch b/app-arch/zip/files/zip-3.0-pic.patch
deleted file mode 100644
index b4c53de694f7..000000000000
--- a/app-arch/zip/files/zip-3.0-pic.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-if our toolchain generates PIC by default, then do not use the hand written
-assembly files as none of it is PIC friendly.
-
---- unix/configure
-+++ unix/configure
-@@ -29,6 +29,9 @@
- echo Check if we can use asm code
- OBJA=""
- OCRCU8=""
-+piclib="$(echo | $CPP -dM $CFLAGS - | grep -i __pic__)"
-+echo "Checking if compiler wants to create pic code"
-+[ "$piclib" == "" ] && \
- if eval "$CPP match.S > _match.s 2>/dev/null"; then
-   if test ! -s _match.s || grep error < _match.s > /dev/null; then
-     :
diff --git a/app-arch/zip/files/zip-3.0-zipnote-freeze.patch b/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
deleted file mode 100644
index cfe78f0a100a..000000000000
--- a/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -dupr zip30-old/fileio.c zip30/fileio.c
---- zip30-old/fileio.c	2008-05-28 20:13:24.000000000 +0200
-+++ zip30/fileio.c	2012-06-12 17:30:29.794547493 +0200
-@@ -3502,7 +3502,7 @@ zwchar *local_to_wide_string(local_strin
-   if ((wc_string = (wchar_t *)malloc((wsize + 1) * sizeof(wchar_t))) == NULL) {
-     ZIPERR(ZE_MEM, "local_to_wide_string");
-   }
--  wsize = mbstowcs(wc_string, local_string, strlen(local_string) + 1);
-+  wsize = mbstowcs(wc_string, local_string, wsize + 1);
-   wc_string[wsize] = (wchar_t) 0;
- 
-   /* in case wchar_t is not zwchar */
-diff -dupr zip30-old/zipfile.c zip30/zipfile.c
---- zip30/zipfile.c	2008-07-01 00:15:30.000000000 +0200
-+++ zip30/zipfile.c	2012-06-10 01:59:42.571706181 +0200
-@@ -5406,6 +5406,8 @@ int putlocal(z, rewrite)
-     if (z->flg & UTF8_BIT) {
-       /* If this flag is set, then restore UTF-8 as path name */
-       use_uname = 1;
-+      tempzn -= nam;
-       nam = strlen(z->uname);
-+      tempzn += nam;
-     } else {
-       /* use extra field */
-       add_Unicode_Path_local_extra_field(z);
-@@ -5647,7 +5650,9 @@ int putcentral(z)
-     if (z->flg & UTF8_BIT) {
-       /* If this flag is set, then restore UTF-8 as path name */
-       use_uname = 1;
-+      tempzn -= nam;
-       nam = strlen(z->uname);
-+      tempzn += nam;
-     } else {
-       add_Unicode_Path_cen_extra_field(z);
-     }
-diff -dupr zip30/zipnote.c zip30/zipnote.c
---- zip30/zipnote.c	2008-05-08 04:17:08.000000000 +0200
-+++ zip30/zipnote.c	2012-06-10 02:33:36.372663528 +0200
-@@ -575,6 +575,13 @@ char **argv;            /* command line
-       strcpy(z->iname, a+2);
- #endif
- 
-+#ifdef UNICODE_SUPPORT
-+#define UTF8_BIT (1 << 11)
-+      if (using_utf8) {
-+        z->uname = z->iname;
-+      }
-+#endif
-+
- /*
-  * Don't update z->nam here, we need the old value a little later.....
-  * The update is handled in zipcopy().
-@@ -661,7 +668,7 @@ char **argv;            /* command line
-     if ((r = zipcopy(z)) != ZE_OK)
-       ziperr(r, "was copying an entry");
-   }
--  fclose(x);
-+  fclose(in_file);
- 
-   /* Write central directory and end of central directory with new comments */
-   if ((c = zftello(y)) == (zoff_t)-1)    /* get start of central */
diff --git a/app-arch/zip/metadata.xml b/app-arch/zip/metadata.xml
deleted file mode 100644
index 71d52343602a..000000000000
--- a/app-arch/zip/metadata.xml
+++ /dev/null
@@ -1,15 +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>
-	<longdescription>Application that supports the Info Zip series of encryption.</longdescription>
-	<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/zip/zip-3.0-r3.ebuild b/app-arch/zip/zip-3.0-r3.ebuild
deleted file mode 100644
index 27cba28e5c95..000000000000
--- a/app-arch/zip/zip-3.0-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit toolchain-funcs eutils flag-o-matic
-
-MY_P="${PN}${PV//.}"
-DESCRIPTION="Info ZIP (encryption support)"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~arm-linux"
-IUSE="bzip2 crypt natspec unicode"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-crypt.patch #238398
-	epatch "${FILESDIR}"/${P}-pic.patch
-	epatch "${FILESDIR}"/${P}-exec-stack.patch #122849
-	epatch "${FILESDIR}"/${P}-build.patch #200995
-	epatch "${FILESDIR}"/${P}-zipnote-freeze.patch #322047
-	epatch "${FILESDIR}"/${P}-format-security.patch #512414
-	use natspec && epatch "${FILESDIR}"/${PN}-3.0-natspec.patch #275244
-}
-
-src_configure() {
-	append-cppflags \
-		-DLARGE_FILE_SUPPORT \
-		-DUIDGID_NOT_16BIT \
-		-D$(usex bzip2 '' NO)BZIP2_SUPPORT \
-		-D$(usex crypt '' NO)CRYPT \
-		-D$(usex unicode '' NO)UNICODE_SUPPORT
-	# Third arg disables bzip2 logic as we handle it ourselves above.
-	sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}" || die
-	if use bzip2 ; then
-		sed -i -e "s:LFLAGS2=:&'-lbz2 ':" flags || die
-	fi
-}
-
-src_compile() {
-	emake \
-		CPP="$(tc-getCPP)" \
-		-f unix/Makefile generic
-}
-
-src_install() {
-	dobin zip zipnote zipsplit
-	doman man/zip{,note,split}.1
-	if use crypt ; then
-		dobin zipcloak
-		doman man/zipcloak.1
-	fi
-	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
-}