[gentoo-commits] repo/gentoo:master commit in: app-arch/gzip/, app-arch/gzip/files/

2021-05-23 Thread David Seifert 
commit: 5f913c7498baba6b4e1ad45749c21fb5a8201ddc
Author: David Seifert  gentoo  org>
AuthorDate: Sun May 23 11:47:53 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun May 23 11:47:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f913c74

app-arch/gzip: drop 1.9

Signed-off-by: David Seifert  gentoo.org>

 app-arch/gzip/Manifest |   1 -
 .../gzip/files/gzip-1.9-gnulib-glibc-2.28.patch| 134 -
 app-arch/gzip/gzip-1.9.ebuild  |  40 --
 3 files changed, 175 deletions(-)

diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 81f9c56bf5d..223ecc3c791 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,2 +1 @@
 DIST gzip-1.10.tar.xz 775144 BLAKE2B 
431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b
 SHA512 
e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
-DIST gzip-1.9.tar.xz 762516 BLAKE2B 
4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0
 SHA512 
c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad

diff --git a/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch 
b/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch
deleted file mode 100644
index 20039b9f0d2..000
--- a/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-fix build failure against glibc-2.28
-
-https://bugs.gentoo.org/663928
-
-Adopted gnulib's upstream patch:
-
-From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
-From: Paul Eggert 
-Date: Mon, 5 Mar 2018 10:56:29 -0800
-Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by Daniel P. Berrangé in:
-https://lists.gnu.org/r/bug-gnulib/2018-03/msg0.html
-* lib/fflush.c (clear_ungetc_buffer_preserving_position)
-(disable_seek_optimization, rpl_fflush):
-* lib/fpurge.c (fpurge):
-* lib/freadahead.c (freadahead):
-* lib/freading.c (freading):
-* lib/fseeko.c (fseeko):
-* lib/fseterr.c (fseterr):
-Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
-* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
-Define if not already defined.

- lib/fflush.c |  6 +++---
- lib/fpurge.c |  2 +-
- lib/freading.c   |  2 +-
- lib/fseeko.c |  4 ++--
- lib/fseterr.c|  2 +-
- lib/stdio-impl.h |  6 ++
-
 a/lib/fflush.c
-+++ b/lib/fflush.c
-@@ -33,7 +33,7 @@
- #undef fflush
- 
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, 
Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */
- 
- /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
- static void
-@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
- 
- #endif
- 
--#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, 
Haiku, Linux libc5 */)
-+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */)
- 
- # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && 
defined __SNPT
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
-@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
-   if (stream == NULL || ! freading (stream))
- return fflush (stream);
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, 
Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */
- 
-   clear_ungetc_buffer_preserving_position (stream);
- 
 a/lib/fpurge.c
-+++ b/lib/fpurge.c
-@@ -62,7 +62,7 @@ fpurge (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-  , because they need it for implementing getc() and putc() as
-  fast macros.  */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, 
Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */
-   fp->_IO_read_end = fp->_IO_read_ptr;
-   fp->_IO_write_ptr = fp->_IO_write_base;
-   /* Avoid memory leak when there is an active ungetc buffer.  */
 a/lib/freading.c
-+++ b/lib/freading.c
-@@ -31,7 +31,7 @@ freading (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-  , because they need it for implementing getc() and putc() as
-  fast macros.  */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, 
Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */
-   return ((fp->_flags & _IO_NO_WRITES) != 0
-   || ((fp->_flags

[gentoo-commits] repo/gentoo:master commit in: app-arch/gzip/, app-arch/gzip/files/

2018-10-14 Thread Sergei Trofimovich 
commit: 4952386d936a48aba253b0b850cea4a245298a8e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Oct 14 10:51:53 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Oct 14 10:52:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4952386d

app-arch/gzip: fix build failure against glibc-2.28, bug #663928

Adopted gnulib's upstream patch:
http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e

Closes: https://bugs.gentoo.org/663928
Signed-off-by: Sergei Trofimovich  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../gzip/files/gzip-1.9-gnulib-glibc-2.28.patch| 134 +
 app-arch/gzip/gzip-1.9.ebuild  |   1 +
 2 files changed, 135 insertions(+)

diff --git a/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch 
b/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch
new file mode 100644
index 000..20039b9f0d2
--- /dev/null
+++ b/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch
@@ -0,0 +1,134 @@
+fix build failure against glibc-2.28
+
+https://bugs.gentoo.org/663928
+
+Adopted gnulib's upstream patch:
+
+From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
+From: Paul Eggert 
+Date: Mon, 5 Mar 2018 10:56:29 -0800
+Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Daniel P. Berrangé in:
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg0.html
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpurge.c (fpurge):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
+* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
+Define if not already defined.
+---
+ lib/fflush.c |  6 +++---
+ lib/fpurge.c |  2 +-
+ lib/freading.c   |  2 +-
+ lib/fseeko.c |  4 ++--
+ lib/fseterr.c|  2 +-
+ lib/stdio-impl.h |  6 ++
+
+--- a/lib/fflush.c
 b/lib/fflush.c
+@@ -33,7 +33,7 @@
+ #undef fflush
+ 
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, 
Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */
+ 
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
+ static void
+@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
+ 
+ #endif
+ 
+-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, 
Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */)
+ 
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && 
defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
+   if (stream == NULL || ! freading (stream))
+ return fflush (stream);
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, 
Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */
+ 
+   clear_ungetc_buffer_preserving_position (stream);
+ 
+--- a/lib/fpurge.c
 b/lib/fpurge.c
+@@ -62,7 +62,7 @@ fpurge (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+  , because they need it for implementing getc() and putc() as
+  fast macros.  */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, 
Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */
+   fp->_IO_read_end = fp->_IO_read_ptr;
+   fp->_IO_write_ptr = fp->_IO_write_base;
+   /* Avoid memory leak when there is an active ungetc buffer.  */
+--- a/lib/freading.c
 b/lib/freading.c
+@@ -31,7 +31,7 @@ freading (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+  , because they need it for implementing getc() and putc() as
+  fast macros.  */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, 
Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */
+   return ((fp->_flags & _IO_NO_WRITES) != 0
+   || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+   && fp->_IO_read_base != NULL));
+--- a/lib/fseeko.c
 b/lib/fseeko.c
+@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+ 
+   /* These tests are based on fpurge.c.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, 
Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, 
Linux libc5 */
+   if (fp->_IO_read_end == fp->_IO_read_ptr
+   && fp->_IO_write_ptr == fp->_IO_write_base
+   &&

[gentoo-commits] repo/gentoo:master commit in: app-arch/gzip/, app-arch/gzip/files/

2018-01-08 Thread Lars Wendler 
commit: 2f149a2ea9ff654e305feea7693e6ff9e2663c9a
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jan  8 08:30:55 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jan  8 08:32:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f149a2e

app-arch/gzip: Bump to version 1.9

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-arch/gzip/Manifest |  1 +
 .../gzip/files/gzip-1.3.8-install-symlinks.patch   |  4 +--
 app-arch/gzip/files/gzip-1.4-asmv.patch|  4 +--
 app-arch/gzip/gzip-1.9.ebuild  | 39 ++
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 472b9a3b396..3233d4dd97c 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,3 +1,4 @@
 DIST gzip-1.6.tar.xz 725084 BLAKE2B 
3f4e6ac2e3186de403a1be58041f4b8f86074d8659cb360a64cd1bab023c0f46a1521aadf1a8669636ec1202cca96a1b73a77c208a7eb99b0eb6b14657231a4f
 SHA512 
06da599fc38b459d7e9a3f43fdd06d1a0d7b29ad14cb7b6552176bab584a1135bb47ba37a4eb377e6c42c4934d557079ace1e289a252ae192ee154079a62ed01
 DIST gzip-1.7.tar.xz 764056 BLAKE2B 
baa5a6b95cf89dffbff05d2b91c3a619dcb67e8692bdff24385b8867259a4191612e8586ebbc96c334d5bd224bf0364ffbf3c0b1384f7632a46ebe09686452c2
 SHA512 
e28f23738f0d2936773d9b50ea9e46c59945e227a90ca7d8e953fb5a774b8692a3341b744320e924da2d5825117dab730affce506f6fc8e65f0af372f3082539
 DIST gzip-1.8.tar.xz 728116 BLAKE2B 
34b707bd403791aca8620de3520637c460dbd9167a4fb693c78438115862781350ef5e256ad0accce75b25515b82fcd3e405cc310d6ea36f2d2609b0a270c4db
 SHA512 
efd3e2439476054badeb127d9156e24e9252129111219f13fd939596c057b2a96291630b2717181984b391abf249ac8699488bbd01ceeb8a70b121c500b10c55
+DIST gzip-1.9.tar.xz 762516 BLAKE2B 
4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0
 SHA512 
c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad

diff --git a/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch 
b/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch
index 8d92b609b5d..6f04b42c769 100644
--- a/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch
+++ b/app-arch/gzip/files/gzip-1.3.8-install-symlinks.patch
@@ -1,5 +1,5 @@
 Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
 b/Makefile.in
 @@ -926,7 +926,7 @@
 rm -f "$$dest" && \
 case $@ in \

diff --git a/app-arch/gzip/files/gzip-1.4-asmv.patch 
b/app-arch/gzip/files/gzip-1.4-asmv.patch
index c87855018cf..1be1f63738b 100644
--- a/app-arch/gzip/files/gzip-1.4-asmv.patch
+++ b/app-arch/gzip/files/gzip-1.4-asmv.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/show_bug.cgi?id=302773
 
 tailor.h.old   2010-01-29 11:13:02.0 +
-+++ tailor.h   2010-01-29 13:18:15.0 +
+--- a/tailor.h
 b/tailor.h
 @@ -69,9 +69,6 @@
  #  include 
  #  define OS_CODE  0x00

diff --git a/app-arch/gzip/gzip-1.9.ebuild b/app-arch/gzip/gzip-1.9.ebuild
new file mode 100644
index 000..d582478b998
--- /dev/null
+++ b/app-arch/gzip/gzip-1.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="pic static"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
+)
+
+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
+}