gentoo resync : 08.01.2018

5 files changed, 16 insertions, 63 deletions

diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 5928766bdf6d..944e79646408 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,9 +1,7 @@
-AUX gzip-1.3.8-install-symlinks.patch 280 BLAKE2B 3c35bb9d17a5c8ed8f1b5b6fdbe699ada7b9abdcbf9ce6305af362335a1a3b6825af428693e23d49508807277916dedca8ec20f097e74860d0bad2562f70af6d SHA512 b804a4d4ef9294a8f241b75a06ee6464d932330824dc95f2fa1f67bb6f22f4d66287e4f47dcafce4e59e68fa3d11ac61cdbca55ab0939747d8a17464d2aa29c1
-AUX gzip-1.4-asmv.patch 702 BLAKE2B 0ed90ba497b7f1c2a7ef309c644fba40c9acc9a646088b2a51b4a1159967b160e0e58fe0d2a1d162c94143ec1016d7b0742e504a56f4394c209e7cc723efafde SHA512 34ab638432a690e1678a1754817d65f5e0258a50ea4f308f4a26ae48a2829537ae23a252ee08540c486931c617e634e6a0fc5712d8c337099029c7b3eeb3b408
-DIST gzip-1.6.tar.xz 725084 BLAKE2B 3f4e6ac2e3186de403a1be58041f4b8f86074d8659cb360a64cd1bab023c0f46a1521aadf1a8669636ec1202cca96a1b73a77c208a7eb99b0eb6b14657231a4f SHA512 06da599fc38b459d7e9a3f43fdd06d1a0d7b29ad14cb7b6552176bab584a1135bb47ba37a4eb377e6c42c4934d557079ace1e289a252ae192ee154079a62ed01
-DIST gzip-1.7.tar.xz 764056 BLAKE2B baa5a6b95cf89dffbff05d2b91c3a619dcb67e8692bdff24385b8867259a4191612e8586ebbc96c334d5bd224bf0364ffbf3c0b1384f7632a46ebe09686452c2 SHA512 e28f23738f0d2936773d9b50ea9e46c59945e227a90ca7d8e953fb5a774b8692a3341b744320e924da2d5825117dab730affce506f6fc8e65f0af372f3082539
+AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611823dfe81ab72f9e1a2bd3547b8fbbae07d2108ac255a1a9dae604f9acb77744bda3a9eec2a575580558a4ca7042164c563 SHA512 4a20d61d48c456c4f5cca31b38e6f26460f781782c66ff4cd1b193eb1a48dd9fa88967989b2698b5e45a61d64c9ce3b87fba0f6b67bf507c5bb386a847f477fd
+AUX gzip-1.4-asmv.patch 630 BLAKE2B 64508293c8257db3dafd2b20fe5bc23aa37b54f90b63eaeb7a67643ea837b88d58b90fa8b177d84a538eef183d5e49ab98e6b5f8a482303e68ef2c5acb390faf SHA512 7769c98cfc8d6c7c48bc1772d45b44c6c4e1a9fa266dbe5bfe1b9822434b96f7c42ec0d2f4444a5ee8ae8086e571f6891756c7c22f61352649721044eda61a0f
 DIST gzip-1.8.tar.xz 728116 BLAKE2B 34b707bd403791aca8620de3520637c460dbd9167a4fb693c78438115862781350ef5e256ad0accce75b25515b82fcd3e405cc310d6ea36f2d2609b0a270c4db SHA512 efd3e2439476054badeb127d9156e24e9252129111219f13fd939596c057b2a96291630b2717181984b391abf249ac8699488bbd01ceeb8a70b121c500b10c55
-EBUILD gzip-1.6.ebuild 1156 BLAKE2B 73ae857e058934518b6341a1bf123c9f5b7f00a61ba4a3452b1831a35adc4269af1b511cb817b7e4528ff7e5a0f67ab1051b8d15affc7a5a12bf82cbc38ad9ec SHA512 e20603abfd88a283b228fafa8765f84bcab7460af0be95d82304b4fa45b6683651de1dbcc6b153fba519fc65f93b1142e9efcde18511b880588355b4c8738f00
-EBUILD gzip-1.7.ebuild 1190 BLAKE2B 55d038edc86ece3e24930394bd320e9928622a8cca4c1da8bd1ddb16a2e8c239aefe95ac7d1932839769a6cf3f6986e899a4d96348a47be46ad775d6efc3a78a SHA512 9c48f878e7953e012253ab5465a656e0eac6d41d33a401ac8b43562f374a1c2ad63dd8f1f0a6d8caf4701d558de8082dd83bb3ee8682ec367d6e03a2b01272c5
+DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
 EBUILD gzip-1.8.ebuild 1189 BLAKE2B 4c6a4cb55803c6ffbb0709b3a53e11bbbd98ad12900429b283b74b4206db319bae15675520447d33a1e7292edec877b3b509c2ba1a07b6da92db5631c624325e SHA512 857d78565eea8c432ed26852c89ba0b9a45c3145b843e9f5804b8ebc4715c7e386a8c5089fad8a89f7e7dcb2c1151f056b09b00a50f6481c7a2e2704b7cf632e
+EBUILD gzip-1.9.ebuild 1122 BLAKE2B e1c85598edd62c27c4079af997cd436aa285ebcc47882d85c59859f8d67fa6b5b28212c368bcac2864010fc058b802f630adfd113d322fa2be49a92c82b4c9f0 SHA512 12bc7fca087b2aa92075d56ceae98b0654aa18c8c67d085084d74f89cd42a6a54ba1b9e6a27d178e4b75aea4cdcfdb862db0ab64d3c13085855db9ca7ef2f8a9
 MISC metadata.xml 421 BLAKE2B cd73d8b6c846ebae069903fefc36cd0c2835cee6c137e1cc642cae9628be6fd3678c9002defeb2a63ca592f96f9f8032e99535f398a60989df9fb66270d6ec4f SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96
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 8d92b609b5dd..6f04b42c7696 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 c87855018cff..1be1f63738b0 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.000000000 +0000
-+++ tailor.h	2010-01-29 13:18:15.000000000 +0000
+--- a/tailor.h
++++ b/tailor.h
 @@ -69,9 +69,6 @@
  #  include <io.h>
  #  define OS_CODE  0x00
diff --git a/app-arch/gzip/gzip-1.6.ebuild b/app-arch/gzip/gzip-1.6.ebuild
deleted file mode 100644
index f843d530c868..000000000000
--- a/app-arch/gzip/gzip-1.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="https://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="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
-	epatch "${FILESDIR}"/${PN}-1.4-asmv.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
-}
diff --git a/app-arch/gzip/gzip-1.7.ebuild b/app-arch/gzip/gzip-1.9.ebuild
index 910bb04b7dec..d582478b998d 100644
--- a/app-arch/gzip/gzip-1.7.ebuild
+++ b/app-arch/gzip/gzip-1.9.ebuild
@@ -1,30 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils flag-o-matic
+inherit flag-o-matic
 
 DESCRIPTION="Standard GNU compressor"
 HOMEPAGE="https://www.gnu.org/software/gzip/"
-SRC_URI="mirror://gnu-alpha/gzip/${P}.tar.xz
-	mirror://gnu/gzip/${P}.tar.xz
+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 ~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"
+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"
-	"${FILESDIR}/${PN}-1.4-asmv.patch"
 )
 
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
 src_configure() {
 	use static && append-flags -static
 	# avoid text relocation in gzip
@@ -39,6 +34,6 @@ src_install() {
 
 	# 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
+	mv "${ED%/}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED%/}"/bin/ || die
+	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED%/}"/bin/gunzip || die
 }