gentoo auto-resync : 06:09:2022 - 04:25:47

6 files changed, 24 insertions, 16 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index ee3f5a3b53d3..75ac81af0c9c 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index a4e09160e4fb..28308d1a98c5 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -7,6 +7,6 @@ AUX bzip2-1.0.8-out-of-tree-build.patch 1997 BLAKE2B 87791ad7b5c702110a7a45bb4a0
 AUX bzip2-1.0.8-saneso.patch 463 BLAKE2B 83c5a905dbb3dd6481abe7ad7f57f9ce5c5cac8ababee2b5ff0221965f1ee6675c4060cec841dcf4370018a7fc6376cced900c6410eca96579962d52fd07563d SHA512 19d1a721680e4113c3b3267af74fa5a7ec5947c6630946c60ac5cf165476d9e7c2229e0cb099029dc9f5708b5ba15864f84af198940709144b65dbd2cd3a76a8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d
-EBUILD bzip2-1.0.8-r1.ebuild 3670 BLAKE2B bae4ee31bb17aff53375ada6fe1c7cf0e9bffc10cdf4175a4b9f9d70557c3ea58de50a8bd57ec54c2913e38ac824335a7a22224dcafe99e594a57dfc0475ad7b SHA512 35203cd9cfd48b6802476c3c14b91d05ba47ea9f813611b17c2a112dc31f08123712d97a51c974ccdcb693e49b496e36b20ea012c86ee17d6f3dd971f1a74c8a
-EBUILD bzip2-9999.ebuild 1623 BLAKE2B 792eb2334df87eaa765d1f6d86216b63cb47f96e4087425ba6b5320ba1cdd5a6a9fa8d16252c62e7b6087812e9c33905cfe40fff2354aeb41eabd52ba4e5d999 SHA512 8551d0bd27cb3c8bc2d5859ceefad97a132e32f01e41430377fb95228419f5f008d77ba4be2c4bbaa180da20a0fa4a6458831bc628cb287a65b4f812ea14918e
+EBUILD bzip2-1.0.8-r2.ebuild 3313 BLAKE2B 0c5240ac54fc42e23569a5aeb6da754e57de369081be556d7637defd556b4b1ee25259f351569a264d6be05c7dac50c74560b3c19c4ca7b7a405f8be539f8071 SHA512 bf80f3751912f71874655b0f899167be7c0be52b7dec2db1844376a8291e4e8d0780d436da43a3602bdbfa74502e0441c9025974adbe2132965d10a7048db877
+EBUILD bzip2-9999.ebuild 1663 BLAKE2B a67e5e80a21cf37faffd80f57c304332c455647858ffab50c09e016ad43f9575c8e8aaa5539650fa8e1a10e4aca943fd240df9e0768c8530a1cf7ca49c6f30c9 SHA512 396add57854b6af4bbcefad341ca7622582e33a40d9ee3dd49e9a56303d8d3ddc87db210b7b0b889daa6bcbeaf2bc7975918d53dc1360b55530339e647266ab4
 MISC metadata.xml 333 BLAKE2B 88bbfff022309d663b728da241623e9a9dd2cd00d4638cc97c4809433a3645421239d2f51360f9d848617891e7600ad6b63b17acf8c6ecd65a4e355dc1372084 SHA512 15620686ec250b2547fc7ff369c9c0854a7217e731da556db1224896cfd4e63eba836469722b12115e359a9701acea0ac09d7ecc89fa1dbf8683106432f1f9bb
diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r2.ebuild
index 62a13959bff9..b2e7d764d2eb 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r2.ebuild
@@ -9,10 +9,6 @@ EAPI=7
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg
 inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig
 
-if [[ ${PVR} != 1.0.8-r1 ]]; then
-	die "Please remove libbz2.so.1.0 logic from multilib_src_install"
-fi
-
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="https://sourceware.org/bzip2/"
 SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
@@ -24,6 +20,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 IUSE="static static-libs"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bzip2 )"
+RDEPEND="!app-arch/lbzip2[symlink(-)]"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
@@ -85,13 +82,6 @@ multilib_src_install() {
 		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
 	done
 
-	# Install libbz2.so.1.0 due to accidental soname change in 1.0.7.
-	# Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24.
-	# OK to remove one year after 2020-04-11.
-	if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then
-		dosym libbz2.so.${PV} "/usr/$(get_libdir)/libbz2.so.1.0"
-	fi
-
 	use static-libs && dolib.a libbz2.a
 
 	if multilib_is_native_abi ; then
diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild
index a5f4b823c2f1..80435914e091 100644
--- a/app-arch/bzip2/bzip2-9999.ebuild
+++ b/app-arch/bzip2/bzip2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,6 +19,8 @@ SLOT="0/1" # subslot = SONAME
 
 IUSE="static-libs"
 
+RDEPEND="!app-arch/lbzip2[symlink(-)]"
+
 multilib_src_configure() {
 	local emesonargs=(
 		-Ddefault_library=$(usex static-libs both shared)
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 4e28874e7a05..c23435d6eb0e 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,5 +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.ebuild 1319 BLAKE2B 7be24fc5524f01b061eaae1bd63c8fea077f7719afb59a16948e02c6af8c94c370e616a2884eb48c93a19ad50cb848e9b7f3fea0b0099126b90998bf2c53f21a SHA512 d71241cce7e73ed987d1c7a7d2b66321b9557419056643c3a8abc200a2d59e3765eebc55bfe56b064e1f8e62b7cb85f96cab081e62a2bb1ffd73ba89c8082579
+EBUILD gzip-1.12-r2.ebuild 1714 BLAKE2B 8d82034a3f80035a76a34f8f584a64629f236e11c433f2d95c0b2074d07afd9c8f9cab35f4ce7522a09d9ff1dc8bfb0592858b3e6bfeb05c6234cd4310a88055 SHA512 bea28030c54307f25282e99ae767f44d431fd397ffbb635d69f5def196ccccfad0378735e2371d822505a6a44c05884196bc692aea9d22d3da2387568887f3cd
 MISC metadata.xml 422 BLAKE2B b3ba7db4fdf23c9b1b801f21a3230898f260b131344538ff8644bc842dcd5f6bef5e4e2f8d475267d6d39047a87c00e1138e69d49892d21d58249346bde1e57c SHA512 6241ec1357f2f326c745589a18622987e9444e515157a53cb1188a21cd90e14e392db1e31b24f833ba05647ddfcfd6a89e13f6125ca15451bceb1a14e80fbc23
diff --git a/app-arch/gzip/gzip-1.12.ebuild b/app-arch/gzip/gzip-1.12-r2.ebuild
index dd0eefb15a93..444146cdfb69 100644
--- a/app-arch/gzip/gzip-1.12.ebuild
+++ b/app-arch/gzip/gzip-1.12-r2.ebuild
@@ -21,6 +21,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 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"
@@ -42,8 +43,23 @@ src_install() {
 	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,uncompress,zcat} "${ED}"/bin/ || die
+	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
+}