From 1b2135c07b2093d67af646fede19f6f3c8feb9f9 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 14 Jan 2022 19:49:33 +0100 Subject: [PATCH] app-arch/cpio: Sync with gentoo It's from gentoo commit d79ffcedaa6def6e1107707f520e308cbce0e3fc. --- .../portage-stable/app-arch/cpio/Manifest | 1 + .../app-arch/cpio/cpio-2.12-r1.ebuild | 17 ++++++------ .../app-arch/cpio/cpio-2.13.ebuild | 27 +++++++++++++++++++ .../cpio/files/cpio-2.12-gcc-10.patch | 27 +++++++++++++++++++ .../portage-stable/app-arch/cpio/metadata.xml | 5 +++- 5 files changed, 67 insertions(+), 10 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/cpio/files/cpio-2.12-gcc-10.patch diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/cpio/Manifest index 82a7c3443d..e3d8f9e77f 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/cpio/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-arch/cpio/Manifest @@ -1 +1,2 @@ DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120 +DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3 diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.12-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.12-r1.ebuild index 91efd5e449..8e803897a8 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.12-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.12-r1.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" - -inherit eutils +EAPI=7 DESCRIPTION="A file archival tool which can also read and write tar files" HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html" @@ -11,13 +9,14 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -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 ~arm-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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls" -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295 - epatch "${FILESDIR}"/${PN}-2.12-name-overflow.patch #572428 -} +PATCHES=( + "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295 + "${FILESDIR}"/${PN}-2.12-name-overflow.patch #572428 + "${FILESDIR}"/${PN}-2.12-gcc-10.patch #705900 +) src_configure() { econf \ diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13.ebuild new file mode 100644 index 0000000000..89a3336d5a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2021 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 ~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[@]}" +} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/files/cpio-2.12-gcc-10.patch b/sdk_container/src/third_party/portage-stable/app-arch/cpio/files/cpio-2.12-gcc-10.patch new file mode 100644 index 0000000000..9c7d7edd88 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/cpio/files/cpio-2.12-gcc-10.patch @@ -0,0 +1,27 @@ +From 641d3f489cf6238bb916368d4ba0d9325a235afb Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Mon, 20 Jan 2020 07:45:39 +0200 +Subject: Minor fix * src/global.c: Remove superfluous declaration of + program_name + +--- + src/global.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/global.c b/src/global.c +index fb3abe9..acf92bc 100644 +--- a/src/global.c ++++ b/src/global.c +@@ -184,9 +184,6 @@ unsigned int warn_option = 0; + /* Extract to standard output? */ + bool to_stdout_option = false; + +-/* The name this program was run with. */ +-char *program_name; +- + /* A pointer to either lstat or stat, depending on whether + dereferencing of symlinks is done for input files. */ + int (*xstat) (); +-- +cgit v1.2.1 + diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/metadata.xml b/sdk_container/src/third_party/portage-stable/app-arch/cpio/metadata.xml index 56c1244130..3f89d2d293 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/cpio/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-arch/cpio/metadata.xml @@ -1,8 +1,11 @@ - + base-system@gentoo.org Gentoo Base System + + cpe:/a:gnu:cpio +