gentoo auto-resync : 30:10:2022 - 21:04:03

4 files changed, 6 insertions, 75 deletions

diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 67db18d5b4d3..8daff37d7c3c 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -7,7 +7,5 @@ DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108
 DIST cpio-2.13-CVE-2021-38185.patch.xz 7844 BLAKE2B e338950e03c3eed3b4288435c9c75af8f0c3497b43680be4ee347e628db7cfac616b437a848094bf82cfc2c7f29d59b388bf0f6368b3b99770022e3f9533be11 SHA512 4d2cafefcd1ae9d86cb5171de2896799713490dfd9ed27d3dce0886fa4588c8df2b16ad8508a5dbb9155c9de6e40b6d1083bdb4774d967193a270a1dcbe37a33
 DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
 EBUILD cpio-2.12-r1.ebuild 828 BLAKE2B dbb7332b54ed751015b8e17c687f088344244543447ddd6f7bd1c66caf0af578f4fe96a8fa0389009aafff3fec0f9a433334dd4c4b047ff9bc0ef675542d2ef9 SHA512 803b31960635ce881ec7c2ce3a3f4e7176899d000c8e30c7a00ab9597c1c09a291e2f6b157226d41e527be740b9b54c7f1655641c52e395351611db7b61944cd
-EBUILD cpio-2.13-r2.ebuild 1159 BLAKE2B 22b32689c424595ca277f9c090afa22d375967c45c5c4b49fcad4cb9b720b585940be056b419b0d6f5f1b1e4d4f975392173ec74bc59646c57b7da5b1f296f71 SHA512 ea6bd48e0dfd7475bbc094f81217ae0af9892d70844b433c298c82c90943a786f07fbb5b98f4cf2fc4c514b8ca3d7df4128e2c7649d81534ca4f0d4c803bf3bd
-EBUILD cpio-2.13-r3.ebuild 1430 BLAKE2B e5221a09a5b314e729e3f134d5b8a00b807604d307a1e3516bd20a648e7623d01c57faa56ebfb102ee22f4930819dea5b8c74a7456ec33a833b6ee72ae326bb4 SHA512 7f4d6e31c33cfd5fdc5ad7f1dc928436ca8e05ec4236128460074d9517c83586f076723589b721a4ca5517405d945b8fa8a5f8296b46a9e4264758d288236808
-EBUILD cpio-2.13.ebuild 819 BLAKE2B 0c7c7f0166c1557cc7ad9cef1e471e5a24cb9378682b7a4fc204e9eeddaa0edeea436f5de2a1a58abf9106e4fdbb743b4161df45a6d1a2285251a197e200e15d SHA512 fac44856237a01f8284526ed1743220c4cf5bf65aca048a6d6bfe69be9c27d23cd6a820716950734f1ed4347c5b2e17808420d9517e01f5e73da3e6a203e5982
+EBUILD cpio-2.13-r3.ebuild 1364 BLAKE2B 0928510f98e6ad7ad51c7c0de3f488284f59d9c5716806f185bdd252ceaa9e3c1930de501c5ef5f1a17629b0c8347965d6a19b5cbf80dc4831415b82d12ab1ac SHA512 8fc572c47585462e46ea60a8aab904494b1fe5075117115736d479c21c3e9e875355d00e6544f337fb3265e66677af38ee63f32859130f083bcd6d682c98ca78
 MISC metadata.xml 328 BLAKE2B f8b8bff5b160351a92837553de20eda1da31a6c0594c1118e1f71b3cd19d9ea8d3420bdce943d83644f5ffc234950f95fb9229a213660767dc5281120085b26f SHA512 08e1c6a03b894946bf6332bf46c8a7534ed0998777b30cb9eecb9c746bb333b65fb41dfeeb6938cbc08d0ad0a303d752ea70a6a6a6ae2c5c2935b2b4e4d9928f
diff --git a/app-arch/cpio/cpio-2.13-r2.ebuild b/app-arch/cpio/cpio-2.13-r2.ebuild
deleted file mode 100644
index c3924649236b..000000000000
--- a/app-arch/cpio/cpio-2.13-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A file archival tool which can also read and write tar files"
-HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
-SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-CVE-2021-38185.patch.xz"
-
-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="nls"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
-	"${WORKDIR}"/${P}-CVE-2021-38185.patch
-	"${FILESDIR}"/${PN}-2.13-sysmacros-glibc-2.26.patch
-	"${FILESDIR}"/${PN}-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch
-)
-
-src_prepare() {
-	default
-
-	# Drop after 2.13 (only here for CVE patch)
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--bindir="${EPREFIX}"/bin
-		--with-rmt="${EPREFIX}"/usr/sbin/rmt
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/app-arch/cpio/cpio-2.13-r3.ebuild b/app-arch/cpio/cpio-2.13-r3.ebuild
index c2b24b09a8a5..a09ffc983c4c 100644
--- a/app-arch/cpio/cpio-2.13-r3.ebuild
+++ b/app-arch/cpio/cpio-2.13-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-CVE-2021
 
 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="nls"
 
 PATCHES=(
@@ -34,6 +34,8 @@ src_configure() {
 		$(use_enable nls)
 		--bindir="${EPREFIX}"/bin
 		--with-rmt="${EPREFIX}"/usr/sbin/rmt
+		# install as gcpio for better compatibility with non-GNU userland
+		--program-prefix=g
 	)
 
 	econf "${myeconfargs[@]}"
@@ -41,10 +43,8 @@ src_configure() {
 
 src_install() {
 	default
-	# install as gcpio for better compatibility with non-GNU userland
-	# and make cpio as a symlink
-	mv "${ED}"/bin/{,g}cpio || die
+
+	# make cpio a symlink
 	dosym gcpio /bin/cpio
-	mv "${ED}"/usr/share/man/man1/{,g}cpio.1 || die
 	dosym gcpio.1 /usr/share/man/man1/cpio.1
 }
diff --git a/app-arch/cpio/cpio-2.13.ebuild b/app-arch/cpio/cpio-2.13.ebuild
deleted file mode 100644
index e2628b6b7e94..000000000000
--- a/app-arch/cpio/cpio-2.13.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A file archival tool which can also read and write tar files"
-HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
-SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
-
-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="nls"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
-	"${FILESDIR}"/${PN}-2.12-gcc-10.patch #705900
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--bindir="${EPREFIX}"/bin
-		--with-rmt="${EPREFIX}"/usr/sbin/rmt
-	)
-	econf "${myeconfargs[@]}"
-}