gentoo auto-resync : 24:04:2023 - 00:08:50

6 files changed, 18 insertions, 4 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index c8658cfacb2a..5513e007a659 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 60a47e680095..28e14e8f1353 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -2,6 +2,6 @@ AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9
 AUX tar-1.34-fix-cve-2022-48303.patch 1123 BLAKE2B fd1fd30443372eb29ba6168ec421be849682587c40ecefe5a96050566ec198e680dd9e9baeacecb9ed01376672d826a65573f10e7dd443b7a79dcd66caf33060 SHA512 c9e21ac3bcb592262da9db07d0772d0c14b6e1d0c59542ef984b37e36987d6292343f228622433aed1bd776ca1f5fd049fe00661ec8661c608aad21637f13477
 DIST tar-1.34.tar.xz 2226068 BLAKE2B 741a662457509a6775338ffe5d2d84872fcf38b93ace70c8b748a81055b9b62f65a48c4e541955d08ae99e6f528509e89eacd7c799a65bcc3d017a259110c115 SHA512 5e77c4a7b49983ad7d15238c2bce28be7a8aa437b4b1815fc00abd13096da308b6bba196cc6e3ed79d85e62823d520ae0d8fcda2d93873842cf84dc3369fc902
 DIST tar-1.34.tar.xz.sig 181 BLAKE2B 2fae91293a9dacda0374706e1f83498042a9d5224f80f6f0e14abdb914cb5a8e980f720eb4a453485844c7fe26e0525f230c0eab11c7fa89159a1a929370795c SHA512 55297f41549deee511f5b14c6b5dc7bb3d9282dad52bcc85f9dddfad24b677f989ba86387ad9b133c3698feedbd6b6cd7e9f005e8e4c89f72c80543eeceb78f7
-EBUILD tar-1.34-r2.ebuild 2509 BLAKE2B e4867e9669e4528e654c484d36a26eb16114e61725f1d6730bc0f61beb19c453821a319657337bdcef816216a785f27594e7ad6bcf313266339563981b1d969e SHA512 fef232a1bb0331994b3e46152111143759a4a5f263db30dae0e51272863c5a92b6f1d0da8a61f66c0c09211ebfbc2b91347feb9aea161d19fdcb22971c8e479b
-EBUILD tar-1.34-r3.ebuild 2575 BLAKE2B 3aa6dce66fb212c2c993f4fee3ee2d71f2c3e2799eeba004eb24d1328a711bb6819ea7d9f63193e5de001def2054bcf76747cf8fea8d3abec74e8bffb9dfe9b6 SHA512 6101788d14d1c981d0c9f45ac9436c2a78f9dfbcb861284c36e27e41370370d51e942d824491682b6164120eaf4ae6e253bfcbb9cd31f2b139588169903ded19
+EBUILD tar-1.34-r2.ebuild 2835 BLAKE2B 055771c521466673b972532b36c8150ea6dfed14db5e9a70cb7b1dc7a6a23fcca0e141837a45fc5dc5807242d4ee473eabc95f1cf3ae55a9f756c92b64dca16d SHA512 168e92f580e1d21e92b424482dd540b79f9e9dfa0c07e2204f34f043a601c24e291c9158833f84e48a5ef13de28c5e7ef07ecda7bc22d7a4c6085ea54dd553b9
+EBUILD tar-1.34-r3.ebuild 2901 BLAKE2B 6d24402431972089e79f0756ceef13349d1a3a8b2a199c2c0a86679d57bd168294b9dbd7841fe62d62b85632e78135bae52fe6eb0f054b97c81c158a5ebba0ae SHA512 ef6969aa4c1c3dc5b864eed95949ac48767203d82e17642e23003d038f51182bb559c8cc3b5bfdd9d6ff4a9c7823a2cdfc4cb75ca247155c821ced3f251e985e
 MISC metadata.xml 388 BLAKE2B 85aba561c0c0ad8c72d8d33f66ef6504bed7747957059c19fc5b0267b048bbddbd1112239bd4d3bcdf1c2f465018a2128e086a253253205dd7b815c11f3cc6ca SHA512 83e4c69e150b6420ab2ef4b777d930fd5e0f5cc1244bf8cd9a7cf0f867219100578a4777043fccf5f95a6a44ee264b88381d94924f4f18c80cb2ff339efbce64
diff --git a/app-arch/tar/tar-1.34-r2.ebuild b/app-arch/tar/tar-1.34-r2.ebuild
index 86fdc8e05e20..805941b1f61c 100644
--- a/app-arch/tar/tar-1.34-r2.ebuild
+++ b/app-arch/tar/tar-1.34-r2.ebuild
@@ -90,6 +90,13 @@ pkg_postinst() {
 	# ensure to preserve the symlink before app-alternatives/tar
 	# is installed
 	if [[ ! -h ${EROOT}/bin/tar ]]; then
+		if [[ -e ${EROOT}/usr/bin/tar ]] ; then
+			# bug #904887
+			ewarn "${EROOT}/usr/bin/tar exists but is not a symlink."
+			ewarn "This is expected during Prefix bootstrap and unsual otherwise."
+			ewarn "Moving away unexpected ${EROOT}/usr/bin/tar to .bak."
+			mv "${EROOT}/usr/bin/tar" "${EROOT}/usr/bin/tar.bak" || die
+		fi
 		ln -s gtar "${EROOT}/bin/tar" || die
 	fi
 }
diff --git a/app-arch/tar/tar-1.34-r3.ebuild b/app-arch/tar/tar-1.34-r3.ebuild
index f92891dceff1..da958a84470e 100644
--- a/app-arch/tar/tar-1.34-r3.ebuild
+++ b/app-arch/tar/tar-1.34-r3.ebuild
@@ -94,6 +94,13 @@ pkg_postinst() {
 	# ensure to preserve the symlink before app-alternatives/tar
 	# is installed
 	if [[ ! -h ${EROOT}/bin/tar ]]; then
+		if [[ -e ${EROOT}/usr/bin/tar ]] ; then
+			# bug #904887
+			ewarn "${EROOT}/usr/bin/tar exists but is not a symlink."
+			ewarn "This is expected during Prefix bootstrap and unsual otherwise."
+			ewarn "Moving away unexpected ${EROOT}/usr/bin/tar to .bak."
+			mv "${EROOT}/usr/bin/tar" "${EROOT}/usr/bin/tar.bak" || die
+		fi
 		ln -s gtar "${EROOT}/bin/tar" || die
 	fi
 }
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index c4ec057d6864..2e127583b765 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -10,6 +10,6 @@ DIST xz-5.4.2.tar.gz.sig 566 BLAKE2B 95c9c70fdd25b92095dd9691e4d9d4306a3f982becf
 EBUILD xz-utils-5.2.10.ebuild 2918 BLAKE2B 5772efb5b671c373b4d6cbb82d50bea4815b63fa2a8fc54e0e5823c7115837bb7a16c63cbc1045de139248d0b337109232b269272d2fe29129444f65a2d0aa7a SHA512 b200fe4c27ad62ed1de5d52fd2224711fd27d40c5724451b35e67b8658120fbf55ce7ae280917629e95c9e856a5951a85e5186ef993d2617318c13850874a473
 EBUILD xz-utils-5.2.11.ebuild 2926 BLAKE2B e735a4b1069f81aaa792596fa3bdba5f76579eecfebb768d4dccf56866965a9ff3bb5baabfe8d04fea9fd92c08d17f68c32a8fe3a6725a3b365aa4af710d2632 SHA512 65ca4fb9544b37487ac2643af3999c4f37cdb1be653f73006b1e3d1241ab855bb797d731ece66582fdca1b4ff5d5500cfbe45c0a058738ddd1a632011efec61a
 EBUILD xz-utils-5.4.1.ebuild 3114 BLAKE2B a25077bf6a903524fabce7bc7959acd7ea820741a8de98b04094f02920947d49fe9f4d0019046ac5b10c1f6907422549274b9e34db1736ddd17b0a972443aed7 SHA512 b44f2777f700852dc3d619a2b5c9e132005c158e04aaad80a0d8046c55386b50eae5a52a15d02d36bbcf0ab9caac417408bffaafea3918e0c6c54133c835ee05
-EBUILD xz-utils-5.4.2.ebuild 3243 BLAKE2B 11dade9c96d5569546849f6b5ac8274016502c2490738697a40a0f00ef1078920ac8cade1a12f6c7b74bbcecd9e2576c1c5ccf49357dbd2240f4008f48ed880b SHA512 283b41808c46fd19b74fa53c418be3fb0bc6e48e2250fb8dc4ef8fc90772238345863a95f9b88b5ac0a5aef70478ccaf37d362a4bd42e34f6081f691be6b406a
+EBUILD xz-utils-5.4.2.ebuild 3236 BLAKE2B bdebd39d5952cdc19d43733d2fd2620ee864ee29f15c32a731aa74543c3ccfd7829f0074ba92da53eea0eef1b9d79ef3136bb575cd90f3d2490f3003c363aac8 SHA512 ce48c9c305c6b5df30be55a2085484b62024c734b852a36a9b32c7eed1785ada1a35a22259f0e2f7da5b6a71904f8930ac3762777d2c6c69ffc5394db0fcd81d
 EBUILD xz-utils-9999.ebuild 3187 BLAKE2B 6d4af22029b01d33fb1a9bb5b981622f4510b10aab70948e2b546381d5e8b3471d26a0ba78cb61478e00985cc3dfc200b41dfbbc0a920cb16e28b93367138dfa SHA512 8334ac61832be9baaacb690465fb933b50d79777757a3f07802bca8eff1150b973339a3f9805e3f96451e84fe69ce2558d6487ba71918ab067ea44ef5dfcfc9a
 MISC metadata.xml 663 BLAKE2B 7a6625813cb3bdbab8a37845c9c64ac53ff377db394f776357d4fff60fbfe7c7b0e954fdc15abcc8874dd6c0f9ee90bc6e179a00bc5d12cd2e7cedc6f998c019 SHA512 696e573853d5d401f22079492d8e2b5f3c27e9ec4b6095f5ff46f109366b1c65c11976123abed06f302b8f03aaa1b0c54884f0156fdfdce23f4bf28feaafd39c
diff --git a/app-arch/xz-utils/xz-utils-5.4.2.ebuild b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
index 736b0038dc69..d33859844c75 100644
--- a/app-arch/xz-utils/xz-utils-5.4.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.2.ebuild
@@ -35,7 +35,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 
 	S="${WORKDIR}/${MY_P}"