gentoo auto-resync : 28:12:2022 - 02:11:45

3 files changed, 2 insertions, 68 deletions

diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 17948b778d32..a7039944742a 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,6 +1,5 @@
 AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611823dfe81ab72f9e1a2bd3547b8fbbae07d2108ac255a1a9dae604f9acb77744bda3a9eec2a575580558a4ca7042164c563 SHA512 4a20d61d48c456c4f5cca31b38e6f26460f781782c66ff4cd1b193eb1a48dd9fa88967989b2698b5e45a61d64c9ce3b87fba0f6b67bf507c5bb386a847f477fd
 DIST gzip-1.12.tar.xz 825548 BLAKE2B 7e2d482c08555f5fb0ff5408c0afe48c61034e9779eed6e3dd8046c847234c0a8a6bc34d49a934a54db0d73033e12c71a228d373551384a4cd663315071637e0 SHA512 116326fe991828227de150336a0c016f4fe932dfbb728a16b4a84965256d9929574a4f5cfaf3cf6bb4154972ef0d110f26ab472c93e62ec9a5fd7a5d65abea24
 DIST gzip-1.12.tar.xz.sig 833 BLAKE2B ab7b4a759ef163d67f20773607ba0408ea9f1f7c7c224f43635fc3752acc521b74dbea4ec9ebb58a2f4fa13ecae19e00779b4b56c2cb95976301445beff817aa SHA512 1f4702797f7c5f1873c2f9c2f6210ba23824455d17ee82f50f0bf24240ed5bdf0090cf85338ccf76ba82422f8b4ad3a329d8bbf1350cb094d7bd61aa45550397
-EBUILD gzip-1.12-r2.ebuild 1715 BLAKE2B fa1cb140c6ff9bc61559a1b03124c57a484c7664012bee6d447717205c08468cdc7136e8f3de47144d54a8bf25ddf44915224ca48842a73dbcf780a1ac452d11 SHA512 3c9d7e44a6362dde64f1f44b833df22080b45119f4a4bd9f20fcba93a1e73e73d7f112ed3669c48ca6ff9da61f2751852c94dd399b1206a2e533a0777737a3b4
-EBUILD gzip-1.12-r3.ebuild 2221 BLAKE2B 3dbc658d3e008cb7ea36b744666fadd8df5b5f4c351cd45b2e4172f25bdb5f867d078eeb949f45fc24386c0cf29bf1b4cf2a7b41a962aca90290ac8a8e913857 SHA512 a59bfc5153683a106a3f20525b2d306403b22be6a08900f2c7af3aebb8aeb45af47920a09c778d164bcf7d25cd84c43eb145e8e1683acac01f057f795972881f
+EBUILD gzip-1.12-r3.ebuild 2216 BLAKE2B 0e504b091287555832c27f125e50641fdb517467ff815573242a7aa6a0850e25d6343ed3a2d49f381ff87b2391d131106fb75052d32c2a7e595cdaef76d44394 SHA512 5d4468f39482473c4fbfb2241a2ed80273aaf0e9f43db141b057a0e022df92e67895216f3dec2061ee9f61f65db84120e8544ed1d74628ee7eb07e361287585d
 MISC metadata.xml 422 BLAKE2B b3ba7db4fdf23c9b1b801f21a3230898f260b131344538ff8644bc842dcd5f6bef5e4e2f8d475267d6d39047a87c00e1138e69d49892d21d58249346bde1e57c SHA512 6241ec1357f2f326c745589a18622987e9444e515157a53cb1188a21cd90e14e392db1e31b24f833ba05647ddfcfd6a89e13f6125ca15451bceb1a14e80fbc23
diff --git a/app-arch/gzip/gzip-1.12-r2.ebuild b/app-arch/gzip/gzip-1.12-r2.ebuild
deleted file mode 100644
index 4b4363030fef..000000000000
--- a/app-arch/gzip/gzip-1.12-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gzip.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="https://www.gnu.org/software/gzip/"
-SRC_URI="mirror://gnu/gzip/${P}.tar.xz
-	https://alpha.gnu.org/gnu/gzip/${P}.tar.xz"
-SRC_URI+=" verify-sig? (
-		mirror://gnu/gzip/${P}.tar.xz.sig
-		https://alpha.gnu.org/gnu/gzip/${P}.tar.xz.sig
-	)"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="pic static"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )"
-RDEPEND="!app-arch/pigz[symlink(-)]"
-
-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"
-
-	# bug #663928
-	econf --disable-gcc-warnings
-}
-
-src_install() {
-	default
-
-	docinto txt
-	dodoc algorithm.doc gzip.doc
-
-	# Avoid conflict with app-arch/ncompress
-	rm "${ED}"/usr/bin/uncompress || die
-
-	# keep most things in /usr, just the fun stuff in /
-	dodir /bin
-	mv "${ED}"/usr/bin/{gunzip,gzip,zcat} "${ED}"/bin/ || die
-	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die
-}
-
-pkg_postinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		local ver
-		for ver in ${REPLACING_VERSIONS}; do
-			if ver_test "${ver}" -lt "1.12-r2"; then
-				ewarn "This package no longer installs 'uncompress'."
-				ewarn "Please use 'gzip -d' to decompress .Z files."
-			fi
-		done
-	fi
-}
diff --git a/app-arch/gzip/gzip-1.12-r3.ebuild b/app-arch/gzip/gzip-1.12-r3.ebuild
index 481c60650046..652ddbb3151e 100644
--- a/app-arch/gzip/gzip-1.12-r3.ebuild
+++ b/app-arch/gzip/gzip-1.12-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" verify-sig? (
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )"