gzip: upgraded package to upstream
Upgraded app-arch/gzip to version 1.8 for all
BUG=chromium:617950
TEST=precq passes
Change-Id: Ife6d0645a4463b84cb43baf6525c0560c2b0d31f
Reviewed-on: https://chromium-review.googlesource.com/368600
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 7700daa..9fa832d 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1 +1 @@
-DIST gzip-1.5.tar.xz 720956 RMD160 bffba2488ac06b314072cb51f131e021970667c7 SHA1 473aaac6a48445221fd5b03fde52f0236c7486ab SHA256 9ac20a3841a1246a8bedd800ea1fb93ef76521535d89cb59397d267026b6a173
+DIST gzip-1.8.tar.xz 728116 SHA256 ff1767ec444f71e5daf8972f6f8bf68cfcca1d2f76c248eb18e8741fc91dbbd3 SHA512 efd3e2439476054badeb127d9156e24e9252129111219f13fd939596c057b2a96291630b2717181984b391abf249ac8699488bbd01ceeb8a70b121c500b10c55 WHIRLPOOL 490a1f0c157c880a68758a60cc460df525145d6a3bd7567666f194759b471001a29bf409e1628eb86c8d8e598d0c2a0bdd713ed31e5bd17719511aef93361605
diff --git a/app-arch/gzip/files/gzip-1.4-asmv.patch b/app-arch/gzip/files/gzip-1.4-asmv.patch
new file mode 100644
index 0000000..c878550
--- /dev/null
+++ b/app-arch/gzip/files/gzip-1.4-asmv.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/show_bug.cgi?id=302773
+
+--- tailor.h.old 2010-01-29 11:13:02.000000000 +0000
++++ tailor.h 2010-01-29 13:18:15.000000000 +0000
+@@ -69,9 +69,6 @@
+ # include <io.h>
+ # define OS_CODE 0x00
+ # define SET_BINARY_MODE(fd) setmode(fd, O_BINARY)
+-# if !defined(NO_ASM) && !defined(ASMV)
+-# define ASMV
+-# endif
+ #else
+ # define near
+ #endif
+@@ -182,7 +179,6 @@
+ # define PATH_SEP2 ':'
+ # define STDC_HEADERS
+ # define OS_CODE 0x01
+-# define ASMV
+ # ifdef __GNUC__
+ # define HAVE_DIRENT_H
+ # define HAVE_FCNTL_H
+@@ -201,7 +197,6 @@
+ #endif
+
+ #if defined(ATARI) || defined(atarist)
+-# define ASMV
+ # define OS_CODE 0x05
+ # ifdef TOSFS
+ # define PATH_SEP2 '\\'
diff --git a/app-arch/gzip/files/gzip-1.4-assembler.patch b/app-arch/gzip/files/gzip-1.4-assembler.patch
deleted file mode 100644
index 76aade5..0000000
--- a/app-arch/gzip/files/gzip-1.4-assembler.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-http://bugs.gentoo.org/309079
-http://lists.gnu.org/archive/html/bug-gzip/2010-02/msg00032.html
-
-From 61af16213a488af3a8e994399ebd0859d390edb6 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@redhat.com>
-Date: Sat, 20 Mar 2010 13:05:58 +0100
-Subject: [PATCH] use assembly code matcher when possible
-
-* configure.ac (ASCPPPOST): Backslash-escape "#" in AC_SUBST'd
-variable, to keep make from seeing it as a comment-introducer.
-Based on a patch by Petr Pisar.
-* lib/Makefile.am (match.$(OBJEXT)): Use AM_V_GEN and AM_V_at.
-* lib/match.c: Don't include <config.h>.
-It would impede configure-time assembler test.
-* .x-sc_require_config_h: Exempt lib/match.c from syntax-check.
-* .x-sc_require_config_h_first: Likewise.
----
- .x-sc_require_config_h | 1 +
- .x-sc_require_config_h_first | 1 +
- THANKS | 1 +
- configure.ac | 2 +-
- lib/Makefile.am | 12 ++++++------
- lib/match.c | 2 --
- 6 files changed, 10 insertions(+), 9 deletions(-)
- create mode 100644 .x-sc_require_config_h
- create mode 100644 .x-sc_require_config_h_first
-
---- a/configure
-+++ b/configure
-@@ -22588,5 +22588,5 @@
-
- # cc -E produces incorrect asm files on SVR4, so postprocess it.
--ASCPPPOST="sed '/^ *#/d; s,//.*,,; s/% /%/g; s/\\. /./g'"
-+ASCPPPOST="sed '/^ *\\#/d; s,//.*,,; s/% /%/g; s/\\. /./g'"
-
-
-diff --git a/lib/match.c b/lib/match.c
-index 4ef6128..5dd8d64 100644
---- a/lib/match.c
-+++ b/lib/match.c
-@@ -28,8 +28,6 @@
- * David Mosberger-Tang <davidm@hpl.hp.com>.
- */
-
--#include <config.h>
--
- /* Preprocess with -DNO_UNDERLINE if your C compiler does not prefix
- * external symbols with an underline character '_'.
- */
---
-1.7.1.1
-
diff --git a/app-arch/gzip/files/gzip-1.4-no-gets.patch b/app-arch/gzip/files/gzip-1.4-no-gets.patch
deleted file mode 100644
index 6da6e64..0000000
--- a/app-arch/gzip/files/gzip-1.4-no-gets.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-hack until gzip pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -125,7 +125,6 @@
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/app-arch/gzip/gzip-1.5.ebuild b/app-arch/gzip/gzip-1.5.ebuild
deleted file mode 100644
index b4fee0b..0000000
--- a/app-arch/gzip/gzip-1.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.5.ebuild,v 1.8 2012/09/09 15:56:45 armin76 Exp $
-
-inherit eutils flag-o-matic unpacker
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="http://www.gnu.org/software/gzip/"
-SRC_URI="mirror://gnu-alpha/gzip/${P}.tar.xz
- mirror://gnu/gzip/${P}.tar.xz
- mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="*"
-IUSE="nls pic static"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-src_unpack() {
- unpacker
- cd "${S}"
- #epatch "${FILESDIR}"/${PN}-1.3.5-rsync.patch
- epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
-}
-
-src_compile() {
- use static && append-flags -static
- # avoid text relocation in gzip
- use pic && export DEFS="NO_ASM"
- econf || die
- emake || die
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- dodoc ChangeLog NEWS README THANKS TODO
- docinto txt
- dodoc algorithm.doc gzip.doc
-
- # keep most things in /usr, just the fun stuff in /
- dodir /bin
- mv "${D}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${D}"/bin/ || die
- sed -e 's:/usr::' -i "${D}"/bin/gunzip || die
-}
diff --git a/app-arch/gzip/gzip-1.8.ebuild b/app-arch/gzip/gzip-1.8.ebuild
new file mode 100644
index 0000000..f9ec5c0
--- /dev/null
+++ b/app-arch/gzip/gzip-1.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Standard GNU compressor"
+HOMEPAGE="https://www.gnu.org/software/gzip/"
+SRC_URI="mirror://gnu/gzip/${P}.tar.xz
+ mirror://gnu-alpha/gzip/${P}.tar.xz
+ mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="*"
+IUSE="pic static"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
+ "${FILESDIR}/${PN}-1.4-asmv.patch"
+)
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+}
+
+src_configure() {
+ use static && append-flags -static
+ # avoid text relocation in gzip
+ use pic && export DEFS="NO_ASM"
+ econf
+}
+
+src_install() {
+ default
+ docinto txt
+ dodoc algorithm.doc gzip.doc
+
+ # keep most things in /usr, just the fun stuff in /
+ dodir /bin
+ mv "${ED}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED}"/bin/ || die
+ sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die
+}
diff --git a/app-arch/gzip/metadata.xml b/app-arch/gzip/metadata.xml
index 630ce45..bbcfb3d 100644
--- a/app-arch/gzip/metadata.xml
+++ b/app-arch/gzip/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
-<use>
-<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
-</use>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<upstream>
-<remote-id type="cpe">cpe:/a:gnu:gzip</remote-id>
+ <remote-id type="cpe">cpe:/a:gnu:gzip</remote-id>
</upstream>
+<use>
+<flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
+</use>
</pkgmetadata>
diff --git a/metadata/md5-cache/app-arch/gzip-1.5 b/metadata/md5-cache/app-arch/gzip-1.5
deleted file mode 100644
index b0a5450..0000000
--- a/metadata/md5-cache/app-arch/gzip-1.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=nls? ( sys-devel/gettext )
-DESCRIPTION=Standard GNU compressor
-HOMEPAGE=http://www.gnu.org/software/gzip/
-IUSE=nls pic static
-KEYWORDS=*
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu-alpha/gzip/gzip-1.5.tar.xz mirror://gnu/gzip/gzip-1.5.tar.xz mirror://gentoo/gzip-1.5.tar.xz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 48b38a216afb92db6314d6c3187abea3 unpacker 04385b0f181c42fa9c18ec0e31729d1f
-_md5_=eb8c6caa41cd1a4651c316547058ad14
diff --git a/metadata/md5-cache/app-arch/gzip-1.8 b/metadata/md5-cache/app-arch/gzip-1.8
new file mode 100644
index 0000000..af41970
--- /dev/null
+++ b/metadata/md5-cache/app-arch/gzip-1.8
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Standard GNU compressor
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/gzip/
+IUSE=pic static
+KEYWORDS=*
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://gnu/gzip/gzip-1.8.tar.xz mirror://gnu-alpha/gzip/gzip-1.8.tar.xz mirror://gentoo/gzip-1.8.tar.xz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 48b38a216afb92db6314d6c3187abea3
+_md5_=aeea296db049c4f21ab76e18dd4eb62a
