From 350345ef46609a532958399cacfe6ced8992ccfe Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:47 +0000 Subject: [PATCH 001/202] app-alternatives/awk: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/app-alternatives/awk/awk-4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/awk/awk-4.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/awk/awk-4.ebuild index 172cdcb19f..6defdf74c7 100644 --- a/sdk_container/src/third_party/portage-stable/app-alternatives/awk/awk-4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-alternatives/awk/awk-4.ebuild @@ -13,7 +13,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="split-usr" RDEPEND=" From b125adf591cca8fa3085cfe70782b3ff8307f3bd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:47 +0000 Subject: [PATCH 002/202] app-alternatives/bc: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../third_party/portage-stable/app-alternatives/bc/bc-0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/bc/bc-0.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/bc/bc-0.ebuild index f7a484bbe1..d12bfba00f 100644 --- a/sdk_container/src/third_party/portage-stable/app-alternatives/bc/bc-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-alternatives/bc/bc-0.ebuild @@ -11,7 +11,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="bc symlink" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" ! Date: Mon, 5 Jun 2023 07:11:47 +0000 Subject: [PATCH 003/202] app-alternatives/bzip2: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/app-alternatives/bzip2/bzip2-1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/bzip2/bzip2-1.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/bzip2/bzip2-1.ebuild index dd91586565..e56ad8e6a0 100644 --- a/sdk_container/src/third_party/portage-stable/app-alternatives/bzip2/bzip2-1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-alternatives/bzip2/bzip2-1.ebuild @@ -12,7 +12,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="bzip2 symlink" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="split-usr" RDEPEND=" From 74c78c30e21b9bccc56a9d82ac2562ae1a4f91df Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:48 +0000 Subject: [PATCH 004/202] app-alternatives/cpio: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/app-alternatives/cpio/cpio-0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/cpio/cpio-0.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/cpio/cpio-0.ebuild index 483dab8f7c..2d45ec5bef 100644 --- a/sdk_container/src/third_party/portage-stable/app-alternatives/cpio/cpio-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-alternatives/cpio/cpio-0.ebuild @@ -11,7 +11,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="CPIO symlink" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="split-usr" RDEPEND=" From 110becc771277518433ae962e7bf1a61fbe8e27b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:48 +0000 Subject: [PATCH 005/202] app-alternatives/gzip: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/app-alternatives/gzip/gzip-0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/gzip/gzip-0.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/gzip/gzip-0.ebuild index 4b7c266a79..bab2af2ef6 100644 --- a/sdk_container/src/third_party/portage-stable/app-alternatives/gzip/gzip-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-alternatives/gzip/gzip-0.ebuild @@ -11,7 +11,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="gzip symlinks" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="split-usr" RDEPEND=" From d6facf94383c3f256c0051ca40bd786c071b760f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:48 +0000 Subject: [PATCH 006/202] app-alternatives/lex: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/app-alternatives/lex/lex-0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/lex/lex-0-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/lex/lex-0-r1.ebuild index 2b9d804b78..e01caeecd2 100644 --- a/sdk_container/src/third_party/portage-stable/app-alternatives/lex/lex-0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-alternatives/lex/lex-0-r1.ebuild @@ -11,7 +11,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="lex symlinks" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" ! Date: Mon, 5 Jun 2023 07:11:48 +0000 Subject: [PATCH 007/202] app-alternatives/sh: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../third_party/portage-stable/app-alternatives/sh/sh-0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/sh/sh-0.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/sh/sh-0.ebuild index 09adc3362e..c62843c07c 100644 --- a/sdk_container/src/third_party/portage-stable/app-alternatives/sh/sh-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-alternatives/sh/sh-0.ebuild @@ -15,7 +15,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="/bin/sh (POSIX shell) symlink" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" !app-eselect/eselect-sh From 5dbf9e98a022ed6591043731b91d3455a7aeaee5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:48 +0000 Subject: [PATCH 008/202] app-alternatives/tar: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/app-alternatives/tar/tar-0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/tar/tar-0.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/tar/tar-0.ebuild index 9aecb25fcb..ed49560569 100644 --- a/sdk_container/src/third_party/portage-stable/app-alternatives/tar/tar-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-alternatives/tar/tar-0.ebuild @@ -11,7 +11,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="Tar symlink" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="split-usr" RDEPEND=" From 7c0465fe6cec0a0a92388f12ad61e30e5a77cdd7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:48 +0000 Subject: [PATCH 009/202] app-alternatives/yacc: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/app-alternatives/yacc/yacc-1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/yacc/yacc-1-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/yacc/yacc-1-r2.ebuild index b8fc0708d3..95f81862d4 100644 --- a/sdk_container/src/third_party/portage-stable/app-alternatives/yacc/yacc-1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-alternatives/yacc/yacc-1-r2.ebuild @@ -12,7 +12,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="yacc symlinks" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" ! Date: Mon, 5 Jun 2023 07:11:49 +0000 Subject: [PATCH 010/202] app-arch/cpio: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/app-arch/cpio/cpio-2.13-r5.ebuild | 2 +- .../third_party/portage-stable/app-arch/cpio/cpio-2.14.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13-r5.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13-r5.ebuild index b184309b5c..6eb8fef260 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13-r5.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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls" PDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.14.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.14.ebuild index 1d3937b4bb..1747effe8b 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.14.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.14.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls" PDEPEND=" From 933fe00511e25cd74b97da7549d3820aa2aa7b71 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:50 +0000 Subject: [PATCH 011/202] app-arch/gzip: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/app-arch/gzip/gzip-1.12-r4.ebuild | 2 +- .../portage-stable/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12-r4.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12-r4.ebuild index fc60f1fba9..214186e680 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12-r4.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 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="pic static" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild index ac592b8588..808d9bc4e8 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.12_p20221228-r1.ebuild @@ -31,7 +31,7 @@ fi LICENSE="GPL-3+" SLOT="0" if [[ ${PV} != *_p* ]] ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="pic static" From 19c9a03d8d76f79254e1cd131749fa3acf456cee Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:51 +0000 Subject: [PATCH 012/202] app-arch/libarchive: Sync with Gentoo It's from Gentoo commit 8a1a1296dcee4dbbd2b98fa1efa98483f14ddfc6. --- .../app-arch/libarchive/libarchive-3.6.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.6.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.6.2-r1.ebuild index 83dafd346a..dc59aa2446 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.6.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.6.2-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="BSD BSD-2 BSD-4 public-domain" SLOT="0/13" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd" VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc From 4e4c4ec92ded95f447fcec9f13b58f8b93205874 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:51 +0000 Subject: [PATCH 013/202] app-arch/ncompress: Sync with Gentoo It's from Gentoo commit 4aebe55f8c434205f2ea3d28ffacb834a401bc1f. --- .../portage-stable/app-arch/ncompress/ncompress-5.0-r1.ebuild | 2 +- .../portage-stable/app-arch/ncompress/ncompress-5.0.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0-r1.ebuild index 0e83901912..aad48b1bec 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0.ebuild index dacdcbd8a7..4e38495d25 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/ncompress/ncompress-5.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/vapier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" src_prepare() { From d85f1bd798b12cc046e37640d335e3ed2aaf35ac Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:52 +0000 Subject: [PATCH 014/202] app-arch/pigz: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../third_party/portage-stable/app-arch/pigz/pigz-2.7-r1.ebuild | 2 +- .../third_party/portage-stable/app-arch/pigz/pigz-2.7.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.7-r1.ebuild index f0a9d1f454..e4a9431787 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.7-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.7-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos" IUSE="static test" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.7.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.7.ebuild index 7fed310a03..1bef2d6920 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/pigz/pigz-2.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos" IUSE="static test" RESTRICT="!test? ( test )" From 514f5ba6737a1d1e3c3c611a10ad9feaf37da6eb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:52 +0000 Subject: [PATCH 015/202] app-arch/rpm2targz: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild index f6e5c4e88e..25f3db016b 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz LICENSE="BSD-1" 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" DEPEND="" From b6f259d76df88f6b3be18cba792a601a211e696b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:52 +0000 Subject: [PATCH 016/202] app-arch/sharutils: Sync with Gentoo It's from Gentoo commit 4aebe55f8c434205f2ea3d28ffacb834a401bc1f. --- .../app-arch/sharutils/sharutils-4.15.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/sharutils/sharutils-4.15.2-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/sharutils/sharutils-4.15.2-r2.ebuild index 43e0c4f8be..c9304129d2 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/sharutils/sharutils-4.15.2-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/sharutils/sharutils-4.15.2-r2.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls" DEPEND="app-arch/xz-utils From 4324a6d9c23a4fc3f612fe593bd82ee0012efb1c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:53 +0000 Subject: [PATCH 017/202] app-arch/tar: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../third_party/portage-stable/app-arch/tar/tar-1.34-r2.ebuild | 2 +- .../third_party/portage-stable/app-arch/tar/tar-1.34-r3.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.34-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.34-r2.ebuild index 805941b1f6..d6d4d51609 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.34-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.34-r2.ebuild @@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? ( LICENSE="GPL-3+" SLOT="0" if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="acl minimal nls selinux xattr" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.34-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.34-r3.ebuild index 9ded78207c..adec4f0f75 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.34-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.34-r3.ebuild @@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? ( LICENSE="GPL-3+" SLOT="0" if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="acl minimal nls selinux xattr" From de59f05940a1893092e5cd8177827e755dd9f784 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:53 +0000 Subject: [PATCH 018/202] app-arch/unzip: Sync with Gentoo It's from Gentoo commit f9070294fb313a63b7e34963cb356847d09f7143. --- .../portage-stable/app-arch/unzip/unzip-6.0_p27-r1.ebuild | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p27-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p27-r1.ebuild index 51ed5fd2a3..c2354e7edc 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p27-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p27-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz LICENSE="Info-ZIP" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 ) @@ -64,13 +64,9 @@ src_configure() { case ${CHOST} in i?86*-*linux*) TARGET="linux_asm" ;; *linux*) TARGET="linux_noasm" ;; - i?86*-*bsd* | \ - i?86*-dragonfly*) TARGET="freebsd" ;; # mislabelled bsd with x86 asm - *bsd* | *dragonfly*) TARGET="bsd" ;; *-darwin*) TARGET="macosx" ;; *-solaris*) TARGET="generic" ;; - *-cygwin*) TARGET="generic" ;; - *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; + *) die "Unknown target; please update the ebuild to handle ${CHOST}" ;; esac # Needed for Clang 16 From 99f0d4fdc578297183f30f27340fa51357351102 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:53 +0000 Subject: [PATCH 019/202] app-arch/xz-utils: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/app-arch/xz-utils/xz-utils-5.2.11.ebuild | 2 +- .../portage-stable/app-arch/xz-utils/xz-utils-5.2.12.ebuild | 2 +- .../portage-stable/app-arch/xz-utils/xz-utils-5.4.2.ebuild | 2 +- .../portage-stable/app-arch/xz-utils/xz-utils-5.4.3.ebuild | 2 +- .../portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.11.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.11.ebuild index ee655f3ae8..7397f2e30c 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.11.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.11.ebuild @@ -28,7 +28,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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.12.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.12.ebuild index 52e2b5940b..f2abb2fedf 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.2.12.ebuild @@ -28,7 +28,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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.2.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.2.ebuild index c5051bd242..55b9f1f390 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.3.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.3.ebuild index e30876d4e1..f2b9287eae 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.3.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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild index e30876d4e1..f2b9287eae 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/${MY_P}" From 1df398f0af9d7b0de18bffcc587b11868447bc75 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:53 +0000 Subject: [PATCH 020/202] app-arch/zip: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../third_party/portage-stable/app-arch/zip/zip-3.0-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/zip/zip-3.0-r7.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/zip/zip-3.0-r7.ebuild index f21af88f5e..2797a63290 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/zip/zip-3.0-r7.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/zip/zip-3.0-r7.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="Info-ZIP" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="bzip2 crypt natspec unicode" RDEPEND="bzip2? ( app-arch/bzip2 ) From 77d70ea08d1d7ab78e6136ccb4a9d5c065f0f688 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:53 +0000 Subject: [PATCH 021/202] app-arch/zstd: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../third_party/portage-stable/app-arch/zstd/zstd-1.4.9.ebuild | 2 +- .../portage-stable/app-arch/zstd/zstd-1.5.2-r3.ebuild | 2 +- .../portage-stable/app-arch/zstd/zstd-1.5.4-r2.ebuild | 2 +- .../portage-stable/app-arch/zstd/zstd-1.5.4-r3.ebuild | 2 +- .../third_party/portage-stable/app-arch/zstd/zstd-1.5.5.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.4.9.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.4.9.ebuild index b5d8da6a35..82fba5d469 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.4.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.4.9.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( BSD GPL-2 )" SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="lz4 static-libs +threads" RDEPEND="app-arch/xz-utils diff --git a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.2-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.2-r3.ebuild index 77a8812b9d..ce92fbcf49 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.2-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.2-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( BSD GPL-2 )" SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="lz4 static-libs" RDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.4-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.4-r2.ebuild index 32debc36a3..c133ba97ff 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.4-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.4-r2.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}"/${P}/build/meson LICENSE="|| ( BSD GPL-2 )" SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+lzma lz4 static-libs test zlib" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.4-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.4-r3.ebuild index 25236497c5..b42b244708 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.4-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.4-r3.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}"/${P}/build/meson LICENSE="|| ( BSD GPL-2 )" SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+lzma lz4 static-libs test zlib" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.5.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.5.ebuild index 384e7a767d..b954dd49e2 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/zstd/zstd-1.5.5.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}/build/meson LICENSE="|| ( BSD GPL-2 )" SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+lzma lz4 static-libs test zlib" RESTRICT="!test? ( test )" From 84fc40d72d26e22a3d150f29a29c09155910245e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:54 +0000 Subject: [PATCH 022/202] app-cdr/cdrtools: Sync with Gentoo It's from Gentoo commit 4aebe55f8c434205f2ea3d28ffacb834a401bc1f. --- .../app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild | 2 +- .../app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild index 5079d36212..00968a87ae 100644 --- a/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$ LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="acl caps nls unicode selinux" BDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild b/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild index 0bd54271fe..a5ba82f4c1 100644 --- a/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$ LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="acl caps nls unicode selinux" BDEPEND=" From aacb1ce86e3884d71019344860f88fc45f33a4ce Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:56 +0000 Subject: [PATCH 023/202] app-crypt/pinentry: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/app-crypt/pinentry/pinentry-1.2.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.1-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.1-r3.ebuild index d4f9672639..4a1f6a8007 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.1-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.1-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="GPL-2" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="caps efl emacs gtk keyring ncurses qt5 wayland X" DEPEND=" From 82f260430bb0298a9ff468550a8de9540dc7225c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:56 +0000 Subject: [PATCH 024/202] app-editors/nano: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../portage-stable/app-editors/nano/files/gentoo.nanorc-r1 | 2 +- .../third_party/portage-stable/app-editors/nano/nano-7.2.ebuild | 2 +- .../portage-stable/app-editors/nano/nano-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-editors/nano/files/gentoo.nanorc-r1 b/sdk_container/src/third_party/portage-stable/app-editors/nano/files/gentoo.nanorc-r1 index b6b04800eb..2de46b1e92 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/nano/files/gentoo.nanorc-r1 +++ b/sdk_container/src/third_party/portage-stable/app-editors/nano/files/gentoo.nanorc-r1 @@ -20,7 +20,7 @@ color green "-(eq|ne|gt|lt|ge|le|ef|ot|nt)\>" ## Variables... official portage ones in red, all others in bright red: color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*" color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})" -color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[BIPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>" +color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[BIPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT)\>" color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|(B|E|E?SYS)?ROOT|WORKDIR)\>" color red "\<(T|TMPDIR|HOME)\>" color red "\<(AS|C(PP|XX)?|FF|GO|LD|RUST)FLAGS\>" "\" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>" diff --git a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-7.2.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-7.2.ebuild index 9c1f9193b9..44242488ed 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-7.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-7.2.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then else MY_P="${PN}-${PV/_}" SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="GNU GPL'd Pico clone with more functionality" diff --git a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-9999.ebuild index 1cc0796fdf..7657f6c0b3 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/nano/nano-9999.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then else MY_P="${PN}-${PV/_}" SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="GNU GPL'd Pico clone with more functionality" From 1868f39bfa4f016c0c9d6e89e2d94ef3d524e47f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:56 +0000 Subject: [PATCH 025/202] app-editors/vim: Sync with Gentoo It's from Gentoo commit 4510a3a7669d750fb405c71c18609ee91f076678. --- .../portage-stable/app-editors/vim/vim-9.0.1157.ebuild | 2 +- .../portage-stable/app-editors/vim/vim-9.0.1403.ebuild | 2 +- .../portage-stable/app-editors/vim/vim-9.0.1503.ebuild | 2 +- .../third_party/portage-stable/app-editors/vim/vim-9999.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1157.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1157.ebuild index ce978f7e8d..0d0487eb73 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1157.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1157.ebuild @@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1403.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1403.ebuild index ce978f7e8d..0d0487eb73 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1403.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1403.ebuild @@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1503.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1503.ebuild index 50428d19e4..60fb1da615 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1503.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1503.ebuild @@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild index 50428d19e4..832f1a12c5 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild @@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" From 53c839610acc4a9ab669dde0dea75f182d46dfc5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:56 +0000 Subject: [PATCH 026/202] app-editors/vim-core: Sync with Gentoo It's from Gentoo commit 4510a3a7669d750fb405c71c18609ee91f076678. --- .../app-editors/vim-core/vim-core-9.0.1157.ebuild | 2 +- .../app-editors/vim-core/vim-core-9.0.1403.ebuild | 2 +- .../app-editors/vim-core/vim-core-9.0.1503.ebuild | 2 +- .../portage-stable/app-editors/vim-core/vim-core-9999.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1157.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1157.ebuild index 22272dba15..0b299f9cf9 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1157.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1157.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/vim-${PV}" diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1403.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1403.ebuild index 22272dba15..0b299f9cf9 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1403.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1403.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/vim-${PV}" diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1503.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1503.ebuild index 890bcfa4b5..e077dcbef7 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1503.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1503.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/vim-${PV}" diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild index 890bcfa4b5..3e024c9265 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}/vim-${PV}" From f41c623258f930a35c10cad16fb9454d2c7ea620 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:56 +0000 Subject: [PATCH 027/202] app-emulation/qemu: Sync with Gentoo It's from Gentoo commit 27b1e2d7ca67da5e21653f7c0876180ffc4faade. --- .../app-emulation/qemu/Manifest | 1 + .../app-emulation/qemu/metadata.xml | 1 + .../app-emulation/qemu/qemu-7.2.0-r3.ebuild | 2 +- .../app-emulation/qemu/qemu-8.0.2.ebuild | 963 ++++++++++++++++++ .../app-emulation/qemu/qemu-9999.ebuild | 11 +- 5 files changed, 972 insertions(+), 6 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest index 2fae7fda43..ecf04b209c 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest @@ -3,3 +3,4 @@ DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 415ff621356c59f88b29cfe3ef5db1e282b26bb DIST qemu-7.2.1.tar.xz 122400592 BLAKE2B bae1df5d332beaca313c4bac88f06dd5992988d7c1b6fdc6ced4043d858f437339cd7d0009ae667f9e66705117697bee7ee44ec4e911cc203d34eecc3d8f139b SHA512 e286dc66c923a5df77eb02d69235d048e80a7cced638fae52fbed385b4c3cd736cfea66bb3c9843bebf0a33e81ea141fc015e0bd82108df304f148ce59d9ae8a DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa SHA512 d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054 DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f SHA512 1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27 +DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a SHA512 4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml index 55860ffa18..93729e025f 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml @@ -35,6 +35,7 @@ Pin the versions of BIOS firmware to the version included in the upstream release. This is needed to sanely support migration/suspend/resume/snapshotting/etc... of instances. When the blobs are different, random corruption/bugs/crashes/etc... may be observed. + Enable pipewire output for sound emulation Enable qemu plugin API via shared library loading. Enable pulseaudio output for sound emulation Enable rados block device backend support, see https://docs.ceph.com/en/mimic/rbd/qemu-rbd/ diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0-r3.ebuild index c7c0a1525b..74224d9d66 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0-r3.ebuild @@ -41,7 +41,7 @@ else fi S="${WORKDIR}/${MY_P}" - [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv x86" + [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.2.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.2.ebuild new file mode 100644 index 0000000000..3000130b6f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.2.ebuild @@ -0,0 +1,963 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs +# Set to 1 if prebuilt, 0 if not +# (the construct below is to allow overriding from env for script) +QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1} +QEMU_DOCS_PREBUILT_DEV=sam +QEMU_DOCS_VERSION="8.0.0" +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +# bug #830088 +QEMU_DOC_USEFLAG="+doc" + +PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_REQ_USE="ncurses,readline" + +FIRMWARE_ABI_VERSION="7.2.0" + +inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \ + pax-utils xdg-utils + +if [[ ${PV} == *9999* ]]; then + QEMU_DOCS_PREBUILT=0 + + EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/" + EGIT_SUBMODULES=( + tests/fp/berkeley-softfloat-3 + tests/fp/berkeley-testfloat-3 + ui/keycodemapdb + ) + inherit git-r3 + SRC_URI="" +else + MY_P="${PN}-${PV/_rc/-rc}" + SRC_URI="https://download.qemu.org/${MY_P}.tar.xz" + + if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz )" + fi + + S="${WORKDIR}/${MY_P}" + [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" +HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" + +LICENSE="GPL-2 LGPL-2 BSD-2" +SLOT="0" + +[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc" + +IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG} + +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring + jack jemalloc +jpeg + lzo multipath + ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs + plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux + +slirp + smartcard snappy spice ssh static-user systemtap test udev usb + usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen + zstd" + +COMMON_TARGETS=" + aarch64 + alpha + arm + cris + hppa + i386 + loongarch64 + m68k + microblaze + microblazeel + mips + mips64 + mips64el + mipsel + nios2 + or1k + ppc + ppc64 + riscv32 + riscv64 + s390x + sh4 + sh4eb + sparc + sparc64 + x86_64 + xtensa + xtensaeb +" +IUSE_SOFTMMU_TARGETS=" + ${COMMON_TARGETS} + avr + rx + tricore +" +IUSE_USER_TARGETS=" + ${COMMON_TARGETS} + aarch64_be + armeb + hexagon + mipsn32 + mipsn32el + ppc64le + sparc32plus +" + +use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) +use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) +IUSE+=" ${use_softmmu_targets} ${use_user_targets}" + +RESTRICT="!test? ( test )" + +# Allow no targets to be built so that people can get a tools-only build. +# Block USE flag configurations known to not work. +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + qemu_softmmu_targets_arm? ( fdt ) + qemu_softmmu_targets_microblaze? ( fdt ) + qemu_softmmu_targets_mips64el? ( fdt ) + qemu_softmmu_targets_ppc64? ( fdt ) + qemu_softmmu_targets_ppc? ( fdt ) + qemu_softmmu_targets_riscv32? ( fdt ) + qemu_softmmu_targets_riscv64? ( fdt ) + qemu_softmmu_targets_x86_64? ( fdt ) + sdl-image? ( sdl ) + static-user? ( !plugins ) + virgl? ( opengl ) + virtfs? ( xattr ) + vnc? ( gnutls ) + vte? ( gtk ) + multipath? ( udev ) + plugins? ( !static-user ) +" +for smname in ${IUSE_SOFTMMU_TARGETS} ; do + REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( seccomp ) " +done + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# and user/softmmu targets (qemu-*, qemu-system-*). +# +# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. +# +# The attr lib isn't always linked in (although the USE flag is always +# respected). This is because qemu supports using the C library's API +# when available rather than always using the external library. +ALL_DEPEND=" + dev-libs/glib:2[static-libs(+)] + sys-libs/zlib[static-libs(+)] + python? ( ${PYTHON_DEPS} ) + systemtap? ( dev-util/systemtap ) + xattr? ( sys-apps/attr[static-libs(+)] )" + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# softmmu targets (qemu-system-*). +SOFTMMU_TOOLS_DEPEND=" + sys-libs/libcap-ng[static-libs(+)] + >=x11-libs/pixman-0.28.0[static-libs(+)] + accessibility? ( + app-accessibility/brltty[api] + app-accessibility/brltty[static-libs(+)] + ) + aio? ( dev-libs/libaio[static-libs(+)] ) + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bpf? ( dev-libs/libbpf:= ) + bzip2? ( app-arch/bzip2[static-libs(+)] ) + capstone? ( dev-libs/capstone:=[static-libs(+)] ) + curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) + fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) + fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) + gnutls? ( + >=net-libs/gnutls-3.0:=[static-libs(+)] + dev-libs/nettle:=[static-libs(+)] + ) + gtk? ( + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libX11 + vte? ( x11-libs/vte:2.91 ) + ) + infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) + iscsi? ( net-libs/libiscsi ) + io-uring? ( sys-libs/liburing:=[static-libs(+)] ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc ) + jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] ) + lzo? ( dev-libs/lzo:2[static-libs(+)] ) + multipath? ( sys-fs/multipath-tools ) + ncurses? ( + sys-libs/ncurses:=[unicode(+)] + sys-libs/ncurses:=[static-libs(+)] + ) + nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) + numa? ( sys-process/numactl[static-libs(+)] ) + opengl? ( + virtual/opengl + media-libs/libepoxy[static-libs(+)] + media-libs/mesa[static-libs(+)] + media-libs/mesa[egl(+),gbm(+)] + ) + pam? ( sys-libs/pam ) + png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] ) + pulseaudio? ( media-libs/libpulse ) + rbd? ( sys-cluster/ceph ) + sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) + sdl? ( + media-libs/libsdl2[video] + media-libs/libsdl2[static-libs(+)] + ) + sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) + seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) + slirp? ( net-libs/libslirp[static-libs(+)] ) + smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) + snappy? ( app-arch/snappy:= ) + spice? ( + >=app-emulation/spice-protocol-0.14.0 + >=app-emulation/spice-0.14.0[static-libs(+)] + ) + ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) + udev? ( virtual/libudev:= ) + usb? ( >=virtual/libusb-1-r2:1[static-libs(+)] ) + usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) + vde? ( net-misc/vde[static-libs(+)] ) + virgl? ( media-libs/virglrenderer[static-libs(+)] ) + virtfs? ( sys-libs/libcap ) + xen? ( app-emulation/xen-tools:= ) + zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) +" + +EDK2_OVMF_VERSION="202202" +SEABIOS_VERSION="1.16.0" + +X86_FIRMWARE_DEPEND=" + pin-upstream-blobs? ( + ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + ~sys-firmware/ipxe-1.21.1[binary,qemu] + ~sys-firmware/seabios-bin-${SEABIOS_VERSION} + ~sys-firmware/sgabios-0.1_pre10[binary] + ) + !pin-upstream-blobs? ( + || ( + >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + ) + sys-firmware/ipxe[qemu] + || ( + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] + >=sys-firmware/seabios-bin-${SEABIOS_VERSION} + ) + sys-firmware/sgabios + )" +PPC_FIRMWARE_DEPEND=" + pin-upstream-blobs? ( + ~sys-firmware/seabios-bin-${SEABIOS_VERSION} + ) + !pin-upstream-blobs? ( + || ( + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] + >=sys-firmware/seabios-bin-${SEABIOS_VERSION} + ) + ) +" + +BDEPEND=" + $(python_gen_impl_dep) + dev-lang/perl + dev-util/meson + sys-apps/texinfo + virtual/pkgconfig + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ) + gtk? ( nls? ( sys-devel/gettext ) ) + test? ( + dev-libs/glib[utils] + sys-devel/bc + ) +" +CDEPEND=" + ${ALL_DEPEND//\[static-libs(+)]} + ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} + qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} ) +" +DEPEND="${CDEPEND} + kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) + static-user? ( ${ALL_DEPEND} )" +RDEPEND="${CDEPEND} + acct-group/kvm + selinux? ( + sec-policy/selinux-qemu + sys-libs/libselinux + )" + +PATCHES=( + "${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch + "${FILESDIR}"/${PN}-8.0.0-make.patch + "${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch + "${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch + "${FILESDIR}"/${PN}-7.2.0-disable-gmp.patch + "${FILESDIR}"/${PN}-8.0.0-remove-python-meson-check.patch +) + +QA_PREBUILT=" + usr/share/qemu/hppa-firmware.img + usr/share/qemu/openbios-ppc + usr/share/qemu/openbios-sparc64 + usr/share/qemu/openbios-sparc32 + usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf + usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf + usr/share/qemu/palcode-clipper + usr/share/qemu/s390-ccw.img + usr/share/qemu/s390-netboot.img + usr/share/qemu/u-boot.e500 +" + +QA_WX_LOAD="usr/bin/qemu-i386 + usr/bin/qemu-x86_64 + usr/bin/qemu-alpha + usr/bin/qemu-arm + usr/bin/qemu-cris + usr/bin/qemu-m68k + usr/bin/qemu-microblaze + usr/bin/qemu-microblazeel + usr/bin/qemu-mips + usr/bin/qemu-mipsel + usr/bin/qemu-or1k + usr/bin/qemu-ppc + usr/bin/qemu-ppc64 + usr/bin/qemu-sh4 + usr/bin/qemu-sh4eb + usr/bin/qemu-sparc + usr/bin/qemu-sparc64 + usr/bin/qemu-armeb + usr/bin/qemu-sparc32plus + usr/bin/qemu-s390x + usr/bin/qemu-unicore32 +" + +DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the +kernel module loaded before running kvm. The easiest way to ensure that the +kernel module is loaded is to load it on boot. + For AMD CPUs the module is called 'kvm-amd'. + For Intel CPUs the module is called 'kvm-intel'. +Please review /etc/conf.d/modules for how to load these. + +Make sure your user is in the 'kvm' group. Just run + $ gpasswd -a kvm +then have re-login. + +For brand new installs, the default permissions on /dev/kvm might not let +you access it. You can tell udev to reset ownership/perms: + $ udevadm trigger -c add /dev/kvm + +If you want to register binfmt handlers for qemu user targets: +For openrc: + # rc-update add qemu-binfmt +For systemd: + # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" + +pkg_pretend() { + if use kernel_linux && kernel_is lt 2 6 25; then + eerror "This version of KVM requires a host kernel of 2.6.25 or higher." + elif use kernel_linux; then + if ! linux_config_exists; then + eerror "Unable to check your kernel for KVM support" + else + CONFIG_CHECK="~KVM ~TUN ~BRIDGE" + ERROR_KVM="You must enable KVM in your kernel to continue" + ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" + ERROR_KVM_AMD+=" your kernel configuration." + ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" + ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." + ERROR_TUN="You will need the Universal TUN/TAP driver compiled" + ERROR_TUN+=" into your kernel or loaded as a module to use the" + ERROR_TUN+=" virtual network device if using -net tap." + ERROR_BRIDGE="You will also need support for 802.1d" + ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." + use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" + ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" + ERROR_VHOST_NET+=" support" + + if use amd64 || use x86 || use amd64-linux || use x86-linux; then + if grep -q AuthenticAMD /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_AMD" + elif grep -q GenuineIntel /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_INTEL" + fi + fi + + use python && CONFIG_CHECK+=" ~DEBUG_FS" + ERROR_DEBUG_FS="debugFS support required for kvm_stat" + + # Now do the actual checks setup above + check_extra_config + fi + fi + + if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then + eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" + eerror "instances are still pointing to it. Please update your" + eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" + eerror "and the right system binary (e.g. qemu-system-x86_64)." + die "update your virt configs to not use qemu-kvm" + fi +} + +# Sanity check to make sure target lists are kept up-to-date. +check_targets() { + local var=$1 mak=$2 + local detected sorted + + pushd "${S}"/configs/targets/ >/dev/null || die + + # Force C locale until glibc is updated. #564936 + detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) + sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) + if [[ ${sorted} != "${detected}" ]] ; then + eerror "The ebuild needs to be kept in sync." + eerror "${var}: ${sorted}" + eerror "$(printf '%-*s' ${#var} configure): ${detected}" + die "sync ${var} to the list of targets" + fi + + popd >/dev/null +} + +src_prepare() { + check_targets IUSE_SOFTMMU_TARGETS softmmu + check_targets IUSE_USER_TARGETS linux-user + + default + + # Use correct toolchain to fix cross-compiling + tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS + export WINDRES=${CHOST}-windres + + # Verbose builds + MAKEOPTS+=" V=1" + + # We already force -D_FORTIFY_SOURCE=2 (or 3) in our toolchain, but + # this setting (-U then -D..=2) will prevent us from trying out 3, so + # drop it. No change to level of protection b/c we patch our toolchain. + sed -i -e 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2//' configure || die + + # Remove bundled modules + rm -r dtc meson roms/*/ || die +} + +## +# configures qemu based on the build directory and the build type +# we are using. +# +qemu_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + local buildtype=$1 + local builddir="${S}/${buildtype}-build" + + mkdir "${builddir}" || die + + local conf_opts=( + --prefix=/usr + --sysconfdir=/etc + --bindir=/usr/bin + --libdir=/usr/$(get_libdir) + --datadir=/usr/share + --docdir=/usr/share/doc/${PF}/html + --mandir=/usr/share/man + --localstatedir=/var + --disable-bsd-user + --disable-containers # bug #732972 + --disable-guest-agent + --disable-strip + --with-git-submodules=ignore + + # bug #746752: TCG interpreter has a few limitations: + # - it does not support FPU + # - it's generally slower on non-self-modifying code + # It's advantage is support for host architectures + # where native codegeneration is not implemented. + # Gentoo has qemu keyworded only on targets with + # native code generation available. Avoid the interpreter. + --disable-tcg-interpreter + + --disable-werror + # We support gnutls/nettle for crypto operations. It is possible + # to use gcrypt when gnutls/nettle are disabled (but not when they + # are enabled), but it's not really worth the hassle. Disable it + # all the time to avoid automatically detecting it. #568856 + --disable-gcrypt + --cc="$(tc-getCC)" + --cxx="$(tc-getCXX)" + --host-cc="$(tc-getBUILD_CC)" + + $(use_enable alsa) + $(use_enable debug debug-info) + $(use_enable debug debug-tcg) + $(use_enable jack) + $(use_enable nls gettext) + $(use_enable oss) + $(use_enable plugins) + $(use_enable pulseaudio pa) + $(use_enable selinux) + $(use_enable xattr attr) + ) + + # Disable options not used by user targets. This simplifies building + # static user targets (USE=static-user) considerably. + conf_notuser() { + if [[ ${buildtype} == "user" ]] ; then + echo "--disable-${2:-$1}" + else + use_enable "$@" + fi + } + # Enable option only for softmmu build, but not 'user' or 'tools' + conf_softmmu() { + if [[ ${buildtype} == "softmmu" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } + # Enable option only for tools build, but not 'user' or 'softmmu' + conf_tools() { + if [[ ${buildtype} == "tools" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } + # Special case for the malloc flag, because the --disable flag does + # not exist and trying like above will break configuring. + conf_malloc() { + if [[ ! ${buildtype} == "user" ]] ; then + usex "${1}" "--enable-malloc=${1}" "" + fi + } + conf_opts+=( + $(conf_notuser accessibility brlapi) + $(conf_notuser aio linux-aio) + $(conf_softmmu bpf) + $(conf_notuser bzip2) + $(conf_notuser capstone) + $(conf_notuser curl) + $(conf_tools doc docs) + $(conf_notuser fdt) + $(conf_notuser fuse) + $(conf_notuser glusterfs) + $(conf_notuser gnutls) + $(conf_notuser gnutls nettle) + $(conf_notuser gtk) + $(conf_notuser infiniband rdma) + $(conf_notuser iscsi libiscsi) + $(conf_notuser io-uring linux-io-uring) + $(conf_malloc jemalloc) + $(conf_notuser jpeg vnc-jpeg) + $(conf_notuser kernel_linux kvm) + $(conf_notuser lzo) + $(conf_notuser multipath mpath) + $(conf_notuser ncurses curses) + $(conf_notuser nfs libnfs) + $(conf_notuser numa) + $(conf_notuser opengl) + $(conf_notuser pam auth-pam) + $(conf_notuser png) + $(conf_notuser rbd) + $(conf_notuser sasl vnc-sasl) + $(conf_notuser sdl) + $(conf_softmmu sdl-image) + $(conf_notuser seccomp) + $(conf_notuser slirp) + $(conf_notuser smartcard) + $(conf_notuser snappy) + $(conf_notuser spice) + $(conf_notuser ssh libssh) + $(conf_notuser udev libudev) + $(conf_notuser usb libusb) + $(conf_notuser usbredir usb-redir) + $(conf_notuser vde) + $(conf_notuser vhost-net) + $(conf_notuser virgl virglrenderer) + $(conf_softmmu virtfs) + $(conf_notuser vnc) + $(conf_notuser vte) + $(conf_notuser xen) + $(conf_notuser xen xen-pci-passthrough) + # use prebuilt keymaps, bug #759604 + --disable-xkbcommon + $(conf_notuser zstd) + ) + + if [[ ! ${buildtype} == "user" ]] ; then + # audio options + local audio_opts=( + # Note: backend order matters here: #716202 + # We iterate from higher-level to lower level. + $(usex pulseaudio pa "") + $(usev jack) + $(usev sdl) + $(usev alsa) + $(usev oss) + ) + conf_opts+=( + --audio-drv-list=$(IFS=,; echo "${audio_opts[*]}") + ) + fi + + case ${buildtype} in + user) + conf_opts+=( + --enable-linux-user + --disable-system + --disable-tools + --disable-cap-ng + --disable-seccomp + ) + local static_flag="static-user" + ;; + softmmu) + conf_opts+=( + --disable-linux-user + --enable-system + --disable-tools + --enable-cap-ng + --enable-seccomp + ) + local static_flag="none" + ;; + tools) + conf_opts+=( + --disable-linux-user + --disable-system + --enable-tools + --enable-cap-ng + ) + local static_flag="none" + ;; + esac + + local targets="${buildtype}_targets" + [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) + + # Add support for SystemTAP + use systemtap && conf_opts+=( --enable-trace-backends="dtrace" ) + + # We always want to attempt to build with PIE support as it results + # in a more secure binary. But it doesn't work with static or if + # the current GCC doesn't have PIE support. + if [[ ${static_flag} != "none" ]] && use ${static_flag}; then + conf_opts+=( --static --disable-pie ) + else + tc-enables-pie && conf_opts+=( --enable-pie ) + fi + + # Meson will not use a cross-file unless cross_prefix is set. + tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" ) + + # Plumb through equivalent of EXTRA_ECONF to allow experiments + # like bug #747928. + conf_opts+=( ${EXTRA_CONF_QEMU} ) + + echo "../configure ${conf_opts[*]}" + cd "${builddir}" + ../configure "${conf_opts[@]}" || die "configure failed" +} + +src_configure() { + local target + + python_setup + + softmmu_targets= softmmu_bins=() + user_targets= user_bins=() + + for target in ${IUSE_SOFTMMU_TARGETS} ; do + if use "qemu_softmmu_targets_${target}"; then + softmmu_targets+=",${target}-softmmu" + softmmu_bins+=( "qemu-system-${target}" ) + fi + done + + for target in ${IUSE_USER_TARGETS} ; do + if use "qemu_user_targets_${target}"; then + user_targets+=",${target}-linux-user" + user_bins+=( "qemu-${target}" ) + fi + done + + softmmu_targets=${softmmu_targets#,} + user_targets=${user_targets#,} + + [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" + [[ -n ${user_targets} ]] && qemu_src_configure "user" + qemu_src_configure "tools" +} + +src_compile() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" || die + default + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" || die + default + fi + + cd "${S}/tools-build" || die + default +} + +src_test() { + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" || die + pax-mark m */qemu-system-* #515550 + emake check + fi +} + +qemu_python_install() { + python_domodule "${S}/python/qemu" + + python_doscript "${S}/scripts/kvm/vmxcap" + python_doscript "${S}/scripts/qmp/qmp-shell" + python_doscript "${S}/scripts/qmp/qemu-ga-client" +} + +# Generate binfmt support files. +# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) +# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) +generate_initd() { + local out="${T}/qemu-binfmt" + local out_systemd="${T}/qemu.conf" + local d="${T}/binfmt.d" + + einfo "Generating qemu binfmt scripts and configuration files" + + # Generate the debian fragments first. + mkdir -p "${d}" + "${S}"/scripts/qemu-binfmt-conf.sh \ + --debian \ + --exportdir "${d}" \ + --qemu-path "${EPREFIX}/usr/bin" \ + || die + # Then turn the fragments into a shell script we can source. + sed -E -i \ + -e 's:^([^ ]+) (.*)$:\1="\2":' \ + "${d}"/* || die + + # Generate the init.d script by assembling the fragments from above. + local f qcpu package interpreter magic mask + cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die + for f in "${d}"/qemu-* ; do + source "${f}" + + # Normalize the cpu logic like we do in the init.d for the native cpu. + qcpu=${package#qemu-} + case ${qcpu} in + arm*) qcpu="arm";; + mips*) qcpu="mips";; + ppc*) qcpu="ppc";; + s390*) qcpu="s390";; + sh*) qcpu="sh";; + sparc*) qcpu="sparc";; + esac + + # we use 'printf' here to be portable across 'sh' + # implementations: #679168 + cat <>"${out}" + if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then + printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register + fi +EOF + + echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" + + done + cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die +} + +src_install() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + emake DESTDIR="${ED}" install + + # Install binfmt handler init script for user targets. + generate_initd + doinitd "${T}/qemu-binfmt" + + # Install binfmt/qemu.conf. + insinto "/usr/share/qemu/binfmt.d" + doins "${T}/qemu.conf" + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + emake DESTDIR="${ED}" install + + # This might not exist if the test failed. #512010 + [[ -e check-report.html ]] && dodoc check-report.html + + if use kernel_linux; then + udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules + fi + + if use python; then + python_foreach_impl qemu_python_install + fi + fi + + cd "${S}/tools-build" || die + emake DESTDIR="${ED}" install + + # If USE=doc, there'll be newly generated docs which we install instead. + if ! use doc && [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${QEMU_DOCS_VERSION}-docs/docs/*.[0-8] + fi + + # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 + pushd "${ED}"/usr/bin >/dev/null || die + pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 + popd >/dev/null || die + + # Install config file example for qemu-bridge-helper + insinto "/etc/qemu" + doins "${FILESDIR}/bridge.conf" + + cd "${S}" || die + dodoc MAINTAINERS docs/specs/pci-ids.txt + newdoc pc-bios/README README.pc-bios + + # Disallow stripping of prebuilt firmware files. + dostrip -x ${QA_PREBUILT} + + if [[ -n ${softmmu_targets} ]]; then + # Remove SeaBIOS since we're using the SeaBIOS packaged one + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin + fi + + # Remove vgabios since we're using the seavgabios packaged one + rm "${ED}/usr/share/qemu/vgabios.bin" + rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" + rm "${ED}/usr/share/qemu/vgabios-qxl.bin" + rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" + rm "${ED}/usr/share/qemu/vgabios-virtio.bin" + rm "${ED}/usr/share/qemu/vgabios-vmware.bin" + + # PPC/PPC64 loads vgabios-stdvga + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then + dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin + dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin + dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin + dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin + dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin + dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin + fi + + # Remove sgabios since we're using the sgabios packaged one + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin + fi + + # Remove iPXE since we're using the iPXE packaged one + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom + dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom + dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom + dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom + dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom + dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom + fi + fi + + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +firmware_abi_change() { + local pv + for pv in ${REPLACING_VERSIONS}; do + if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then + return 0 + fi + done + return 1 +} + +pkg_postinst() { + if [[ -n ${softmmu_targets} ]] && use kernel_linux; then + udev_reload + fi + + xdg_icon_cache_update + + [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ + fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper + + DISABLE_AUTOFORMATTING=true + readme.gentoo_print_elog + + if use pin-upstream-blobs && firmware_abi_change; then + ewarn "This version of qemu pins new versions of firmware blobs:" + + if has_version 'sys-firmware/edk2-ovmf-bin'; then + ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" + else + ewarn " $(best_version sys-firmware/edk2-ovmf)" + fi + + if has_version 'sys-firmware/seabios-bin'; then + ewarn " $(best_version sys-firmware/seabios-bin)" + else + ewarn " $(best_version sys-firmware/seabios)" + fi + + ewarn " $(best_version sys-firmware/ipxe)" + ewarn " $(best_version sys-firmware/sgabios)" + ewarn "This might break resume of hibernated guests (started with a different" + ewarn "firmware version) and live migration to/from qemu versions with different" + ewarn "firmware. Please (cold) restart all running guests. For functional" + ewarn "guest migration ensure that all" + ewarn "hosts run at least" + ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." + fi +} + +pkg_info() { + echo "Using:" + echo " $(best_version app-emulation/spice-protocol)" + + if has_version 'sys-firmware/edk2-ovmf-bin'; then + echo " $(best_version sys-firmware/edk2-ovmf-bin)" + else + echo " $(best_version sys-firmware/edk2-ovmf)" + fi + + if has_version 'sys-firmware/seabios-bin'; then + echo " $(best_version sys-firmware/seabios-bin)" + else + echo " $(best_version sys-firmware/seabios)" + fi + + echo " $(best_version sys-firmware/ipxe)" + echo " $(best_version sys-firmware/sgabios)" +} + +pkg_postrm() { + xdg_icon_cache_update + udev_reload +} diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild index 39ab489f9c..507154de31 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild @@ -13,7 +13,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-3) # bug #830088 QEMU_DOC_USEFLAG="+doc" -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{9,10,11,12} ) PYTHON_REQ_USE="ncurses,readline" FIRMWARE_ABI_VERSION="7.2.0" @@ -28,7 +28,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_SUBMODULES=( tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3 - ui/keycodemapdb + subprojects/keycodemapdb ) inherit git-r3 SRC_URI="" @@ -56,7 +56,7 @@ IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG} +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg lzo multipath - ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs + ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static-user systemtap test udev usb @@ -203,6 +203,7 @@ SOFTMMU_TOOLS_DEPEND=" media-libs/mesa[egl(+),gbm(+)] ) pam? ( sys-libs/pam ) + pipewire? ( media-video/pipewire ) png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] ) pulseaudio? ( media-libs/libpulse ) rbd? ( sys-cluster/ceph ) @@ -301,7 +302,6 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch - "${FILESDIR}"/${PN}-8.0.0-make.patch "${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch "${FILESDIR}"/${PN}-8.1.0-also-build-virtfs-proxy-helper.patch ) @@ -449,7 +449,7 @@ src_prepare() { sed -i -e 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2//' configure || die # Remove bundled modules - rm -r dtc roms/*/ || die + rm -r subprojects/dtc roms/*/ || die } ## @@ -504,6 +504,7 @@ qemu_src_configure() { $(use_enable jack) $(use_enable nls gettext) $(use_enable oss) + $(use_enable pipewire) $(use_enable plugins) $(use_enable pulseaudio pa) $(use_enable selinux) From 614a9d2e7872a36363ec4af003267d76be58e5bc Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:59 +0000 Subject: [PATCH 028/202] app-eselect/eselect-lua: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../app-eselect/eselect-lua/eselect-lua-4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild index b8de36957a..3b082835f9 100644 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" RDEPEND="app-admin/eselect From f10ce8e141111c86ea1d6998496480afb1632925 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:11:59 +0000 Subject: [PATCH 029/202] app-misc/c_rehash: Sync with Gentoo It's from Gentoo commit b76b6d3eeb85be1dbc96c1a7b0c638a2766789d6. --- .../portage-stable/app-misc/c_rehash/c_rehash-1.7-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/c_rehash/c_rehash-1.7-r1.ebuild index a1e262077a..7a55138a80 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/c_rehash/c_rehash-1.7-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-misc/c_rehash/c_rehash-1.7-r1.ebuild @@ -10,7 +10,7 @@ S="${WORKDIR}" LICENSE="openssl" 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 ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="! Date: Mon, 5 Jun 2023 07:12:00 +0000 Subject: [PATCH 030/202] app-misc/editor-wrapper: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild index 295071bbb5..816b190aae 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" LICENSE="MIT" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" S="${WORKDIR}" From abee365e8a374ce2017d03f7962224a4a86e2249 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:00 +0000 Subject: [PATCH 031/202] app-portage/elt-patches: Sync with Gentoo It's from Gentoo commit b76b6d3eeb85be1dbc96c1a7b0c638a2766789d6. --- .../app-portage/elt-patches/elt-patches-20220831.ebuild | 2 +- .../app-portage/elt-patches/elt-patches-20221210.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20220831.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20220831.ebuild index 892c4ce4bd..22f95e05ba 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20220831.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20220831.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="sys-apps/gentoo-functions" BDEPEND="app-arch/xz-utils" diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20221210.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20221210.ebuild index 892c4ce4bd..22f95e05ba 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20221210.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20221210.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="sys-apps/gentoo-functions" BDEPEND="app-arch/xz-utils" From 9da35aef297b65c249e80b33442280a5254ee709 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:00 +0000 Subject: [PATCH 032/202] app-portage/portage-utils: Sync with Gentoo It's from Gentoo commit 6108fcd3c56baf90d60c8fba516f14a2bb231339. --- .../app-portage/portage-utils/Manifest | 3 +- .../portage-utils/portage-utils-0.94.3.ebuild | 75 ------------------- .../portage-utils/portage-utils-0.95.ebuild | 2 +- ....94.4.ebuild => portage-utils-0.96.ebuild} | 2 +- .../portage-utils/portage-utils-9999.ebuild | 2 +- 5 files changed, 4 insertions(+), 80 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.94.3.ebuild rename sdk_container/src/third_party/portage-stable/app-portage/portage-utils/{portage-utils-0.94.4.ebuild => portage-utils-0.96.ebuild} (89%) diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest index 42390f8918..4ec99a05b3 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/Manifest @@ -1,3 +1,2 @@ -DIST portage-utils-0.94.3.tar.xz 1804720 BLAKE2B b0239a26d878db6dd73c9ee54f586526f8812921775126ef74afbe089186fdc5ca7197847e204c6ecbf9d79b6e2a6173cb0c39d4a26653ed0db2d7f9b10e88c5 SHA512 bf8fcccc26bb985bf7664f6ab0227a5251c3f918199de0c4e4c95b7107eb72eee367d1d524b5d9608b3c7eea9b1fae789456390cbb0d375297b807bb98644e01 -DIST portage-utils-0.94.4.tar.xz 1804252 BLAKE2B 4bdb3dca331eeeaeca34b949aa0228d81df71888fa7cb07f878958939f7820f6887ebb43f0a89d8ed8d787c152a631a731bc53f30c8241ca2530ee9420fea1e2 SHA512 d59a09c9b2dd4de8ed320a5b1c943a1d5dcdef41a057fbfeb00ed136e2ba87375d4562861de5b0e44bad986916d0f58487f3d93deaeb44e96385535d85d74217 DIST portage-utils-0.95.tar.xz 1806140 BLAKE2B 5a468a7b4006073203ba634a5d70398e254ef5db7e9b71fbcf20bce68942f74acce1d42b5d315931f93e8698c8dd2f38f328fcc6fdaa86addba7dbcc21fce5fa SHA512 2d1f4b986a377249043259d8ada1a35a7dd55179f0ef5c2c18a4180c8f1f7064133ab2677426098e61b1355fa26cb0f8aa3c6ea06d46af4c4ba2df4eb53489a4 +DIST portage-utils-0.96.tar.xz 1806032 BLAKE2B 93ef9658a4b0bae7fb0527462bd9d0d19f396262818380d8ec2022c9fda596265c50adc262bdf296a4dd8c6b891b064316281d21444c8b903db20ca2463879e3 SHA512 cc32f53532c082544cabe505d8b90b947b6ab48742678aa98cbe9ba291625e8449ed0ecd90e01dc00b06c209b34001ad57a060918658e53d3babdc5c76ea7b02 diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.94.3.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.94.3.ebuild deleted file mode 100644 index 108dddddf0..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.94.3.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Small and fast Portage helper tools written in C" -HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 autotools - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" -else - SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" - 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 - -LICENSE="GPL-2" -SLOT="0" -IUSE="openmp +qmanifest +qtegrity static" - -RDEPEND=" - qmanifest? ( - !static? ( - app-crypt/gpgme:= - app-crypt/libb2:= - dev-libs/openssl:= - sys-libs/zlib:= - ) - ) - qtegrity? ( - !static? ( - dev-libs/openssl:= - ) - )" -DEPEND="${RDEPEND} - qmanifest? ( - static? ( - app-crypt/gpgme[static-libs] - app-crypt/libb2[static-libs] - dev-libs/openssl[static-libs] - sys-libs/zlib[static-libs] - ) - ) - qtegrity? ( - static? ( - dev-libs/openssl[static-libs] - ) - )" -BDEPEND="virtual/pkgconfig" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - [[ ${PV} == *9999 ]] && eautoreconf -} - -src_configure() { - use static && append-ldflags -static - - econf \ - --disable-maintainer-mode \ - --with-eprefix="${EPREFIX}" \ - $(use_enable qmanifest) \ - $(use_enable qtegrity) \ - $(use_enable openmp) -} diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.95.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.95.ebuild index 108dddddf0..b70c8d6732 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.95.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.95.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" else SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.94.4.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.96.ebuild similarity index 89% rename from sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.94.4.ebuild rename to sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.96.ebuild index 75fac83987..2df55d2cb1 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.94.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-0.96.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" else SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-9999.ebuild index 75fac83987..2df55d2cb1 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/portage-utils/portage-utils-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git" else SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" From 9e944332c838367637c3da80893d9d28461009f8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:00 +0000 Subject: [PATCH 033/202] app-shells/bash: Sync with Gentoo It's from Gentoo commit d9278cc22a2e84f19bb758b569870470c69562e2. --- .../app-shells/bash/bash-4.4_p23-r2.ebuild | 2 +- ...-5.0_p18.ebuild => bash-5.0_p18-r1.ebuild} | 4 +-- ...1_p16-r2.ebuild => bash-5.1_p16-r4.ebuild} | 26 ++++++++------ ...1_p16-r3.ebuild => bash-5.1_p16-r5.ebuild} | 26 ++++++++------ ...2_p15-r2.ebuild => bash-5.2_p15-r3.ebuild} | 30 ++++++++++------ .../app-shells/bash/bash-9999.ebuild | 36 ++++++++++++------- 6 files changed, 78 insertions(+), 46 deletions(-) rename sdk_container/src/third_party/portage-stable/app-shells/bash/{bash-5.0_p18.ebuild => bash-5.0_p18-r1.ebuild} (97%) rename sdk_container/src/third_party/portage-stable/app-shells/bash/{bash-5.1_p16-r2.ebuild => bash-5.1_p16-r4.ebuild} (91%) rename sdk_container/src/third_party/portage-stable/app-shells/bash/{bash-5.1_p16-r3.ebuild => bash-5.1_p16-r5.ebuild} (91%) rename sdk_container/src/third_party/portage-stable/app-shells/bash/{bash-5.2_p15-r2.ebuild => bash-5.2_p15-r3.ebuild} (91%) diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-4.4_p23-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-4.4_p23-r2.ebuild index d560deaae1..47f6a05f86 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-4.4_p23-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-4.4_p23-r2.ebuild @@ -54,7 +54,7 @@ fi LICENSE="GPL-3" SLOT="${MY_PV}" -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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" DEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.0_p18.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.0_p18-r1.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.0_p18.ebuild rename to sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.0_p18-r1.ebuild index 23ec36757d..8634159cb1 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.0_p18.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.0_p18-r1.ebuild @@ -54,7 +54,7 @@ fi 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" DEPEND=" @@ -218,7 +218,7 @@ src_install() { done local sed_args=( - -e "s:#${USERLAND}#@::" + -e 's:#GNU#@::' -e '/#@/d' ) diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r4.ebuild similarity index 91% rename from sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r2.ebuild rename to sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r4.ebuild index a9b7b120cc..25028ea0a9 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r4.ebuild @@ -45,21 +45,27 @@ if is_release ; then # bash-5.1 -> bash51 my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2)) - patch_url= + patch_url= my_patch_index= + upstream_url_base="mirror://gnu/bash" + mirror_url_base="ftp://ftp.cwru.edu/pub/bash" + for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do - for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do - patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index}) - SRC_URI+=" ${patch_url}" - SRC_URI+=" verify-sig? ( ${patch_url}.sig )" + printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} + patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}" - done + SRC_URI+=" ${patch_url}" + SRC_URI+=" verify-sig? ( ${patch_url}.sig )" - MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) ) + # Add in the mirror URL too. + SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + + MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_pn patch_url my_patch_index + unset my_p patch_url my_patch_index upstream_url_base mirror_url_base fi else SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" @@ -73,7 +79,7 @@ fi LICENSE="GPL-3" SLOT="0" [[ "${PV}" == *_rc* ]] || \ -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" DEPEND=" @@ -250,7 +256,7 @@ src_install() { done local sed_args=( - -e "s:#${USERLAND}#@::" + -e 's:#GNU#@::' -e '/#@/d' ) diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r5.ebuild similarity index 91% rename from sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r3.ebuild rename to sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r5.ebuild index 9ff113498a..230aaaf033 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.1_p16-r5.ebuild @@ -45,21 +45,27 @@ if is_release ; then # bash-5.1 -> bash51 my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2)) - patch_url= + patch_url= my_patch_index= + upstream_url_base="mirror://gnu/bash" + mirror_url_base="ftp://ftp.cwru.edu/pub/bash" + for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do - for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do - patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index}) - SRC_URI+=" ${patch_url}" - SRC_URI+=" verify-sig? ( ${patch_url}.sig )" + printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} + patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}" - done + SRC_URI+=" ${patch_url}" + SRC_URI+=" verify-sig? ( ${patch_url}.sig )" - MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) ) + # Add in the mirror URL too. + SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + + MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_pn patch_url my_patch_index + unset my_p patch_url my_patch_index upstream_url_base mirror_url_base fi else SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" @@ -73,7 +79,7 @@ fi LICENSE="GPL-3" SLOT="0" [[ "${PV}" == *_rc* ]] || \ -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" DEPEND=" @@ -252,7 +258,7 @@ src_install() { done local sed_args=( - -e "s:#${USERLAND}#@::" + -e 's:#GNU#@::' -e '/#@/d' ) diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p15-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p15-r3.ebuild similarity index 91% rename from sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p15-r2.ebuild rename to sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p15-r3.ebuild index 6d741db845..4d0dbeb387 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p15-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p15-r3.ebuild @@ -53,17 +53,24 @@ elif is_release ; then patch_url= my_patch_index= - for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do - for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do - patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index}) - SRC_URI+=" ${patch_url}" - SRC_URI+=" verify-sig? ( ${patch_url}.sig )" - done + upstream_url_base="mirror://gnu/bash" + mirror_url_base="ftp://ftp.cwru.edu/pub/bash" - MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) ) + for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do + printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} + patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}" + + SRC_URI+=" ${patch_url}" + SRC_URI+=" verify-sig? ( ${patch_url}.sig )" + + # Add in the mirror URL too. + SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + + MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_pn patch_url my_patch_index + unset my_p patch_url my_patch_index upstream_url_base mirror_url_base fi else SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" @@ -77,7 +84,7 @@ fi LICENSE="GPL-3+" SLOT="0" if is_release ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline" @@ -165,6 +172,9 @@ src_prepare() { sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die touch -r . doc/* || die + # Sometimes hangs (more noticeable w/ pgo), bug #907403. + rm tests/run-jobs || die + eapply -p0 "${PATCHES[@]}" eapply_user } @@ -292,7 +302,7 @@ src_install() { done local sed_args=( - -e "s:#${USERLAND}#@::" + -e 's:#GNU#@::' -e '/#@/d' ) diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-9999.ebuild index 7d9c7837f3..af8066bbfd 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-9999.ebuild @@ -33,7 +33,7 @@ is_release() { # The version of readline this bash normally ships with. # Note: right now, we don't use the system copy of readline for bash for non-releases. -READLINE_VER="8.2" +READLINE_VER="8.2_p1" DESCRIPTION="The standard GNU Bourne again shell" HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git" @@ -53,17 +53,24 @@ elif is_release ; then patch_url= my_patch_index= - for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do - for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do - patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index}) - SRC_URI+=" ${patch_url}" - SRC_URI+=" verify-sig? ( ${patch_url}.sig )" - done + upstream_url_base="mirror://gnu/bash" + mirror_url_base="ftp://ftp.cwru.edu/pub/bash" - MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) ) + for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do + printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} + patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}" + + SRC_URI+=" ${patch_url}" + SRC_URI+=" verify-sig? ( ${patch_url}.sig )" + + # Add in the mirror URL too. + SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + + MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_pn patch_url my_patch_index + unset my_p patch_url my_patch_index upstream_url_base mirror_url_base fi else SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" @@ -77,7 +84,7 @@ fi LICENSE="GPL-3+" SLOT="0" if is_release ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline" @@ -92,8 +99,8 @@ RDEPEND=" ${DEPEND} " # We only need yacc when the .y files get patched (bash42-005, bash51-011) -#BDEPEND="app-alternatives/yacc" BDEPEND=" + app-alternatives/yacc pgo? ( dev-util/gperf ) verify-sig? ( sec-keys/openpgp-keys-chetramey ) " @@ -106,7 +113,7 @@ QA_CONFIGURE_OPTIONS="--disable-static" PATCHES=( #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/ - # Patches from Chet sent to bashbug ml + # Patches from Chet sent to bash-bug ml "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch ) @@ -163,6 +170,9 @@ src_prepare() { sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die touch -r . doc/* || die + # Sometimes hangs (more noticeable w/ pgo), bug #907403. + rm tests/run-jobs || die + eapply -p0 "${PATCHES[@]}" eapply_user } @@ -290,7 +300,7 @@ src_install() { done local sed_args=( - -e "s:#${USERLAND}#@::" + -e 's:#GNU#@::' -e '/#@/d' ) From de51344eadfbabb377b7d03c5d778b2757c7f049 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:00 +0000 Subject: [PATCH 034/202] app-shells/bash-completion: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../app-shells/bash-completion/bash-completion-2.11.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.11.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.11.ebuild index 6353cab239..c6323ea788 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.11.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash-completion/bash-completion-2.11.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="+eselect test" RESTRICT="!test? ( test )" From a9481ba76c8420903e5d7941a2fed5a3ea0b1830 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:01 +0000 Subject: [PATCH 035/202] app-text/asciidoc: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../portage-stable/app-text/asciidoc/asciidoc-10.2.0.ebuild | 2 +- .../portage-stable/app-text/asciidoc/asciidoc-9.1.0.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-10.2.0.ebuild b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-10.2.0.ebuild index 28d44e37b4..8293d38ca4 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-10.2.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-10.2.0.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc-py/asciidoc-py/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 diff --git a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.1.0.ebuild b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.1.0.ebuild index b7c383f474..0758215907 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.1.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/asciidoc/asciidoc-9.1.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" From c4b7dab94f5d6842a799e9a256cb69338dcd6a6e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:01 +0000 Subject: [PATCH 036/202] app-text/build-docbook-catalog: Sync with Gentoo It's from Gentoo commit 3b39d80fd498cd2bc611b2c70496c66accd56874. --- .../build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild | 2 +- .../build-docbook-catalog/build-docbook-catalog-2.4.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild index 4ff7fa5a21..38a0dee4c0 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.3-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}. LICENSE="GPL-2" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" dev-libs/libxml2 diff --git a/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild b/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild index ab5f58f571..38a0dee4c0 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/build-docbook-catalog/build-docbook-catalog-2.4.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}. LICENSE="GPL-2" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" dev-libs/libxml2 From 895e298d2baa137a9907969d353a96b01f7b7bde Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:01 +0000 Subject: [PATCH 037/202] app-text/docbook-xml-dtd: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild | 2 +- .../app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild | 2 +- .../app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild | 2 +- .../app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild | 2 +- .../app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild index 9f7d5b3088..41625f30b9 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65 diff --git a/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild index 415d97c7cf..42302b0379 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65 diff --git a/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild index 415d97c7cf..42302b0379 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65 diff --git a/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild index f23985641c..b2e0f454ce 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65 diff --git a/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild index f23985641c..b2e0f454ce 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip" LICENSE="docbook" SLOT="${PV}" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65 From f50be0f1c41f0bae165865c0b91aa8be82f785d0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:02 +0000 Subject: [PATCH 038/202] app-text/docbook-xsl-stylesheets: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../docbook-xsl-stylesheets-1.79.1-r3.ebuild | 2 +- .../docbook-xsl-stylesheets-1.79.1-r4.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r3.ebuild index 86f5b5e538..5f6844714d 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r3.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="ruby" # Makefile is broken since 1.76.0 RESTRICT="test" diff --git a/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild b/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild index 552379eab7..7477720d1c 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r4.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="ruby" # Makefile is broken since 1.76.0 RESTRICT="test" From 68e7ef036cabd9f345c4b344e1b3bd386ea2c293 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:02 +0000 Subject: [PATCH 039/202] app-text/manpager: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../portage-stable/app-text/manpager/manpager-1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-text/manpager/manpager-1.ebuild b/sdk_container/src/third_party/portage-stable/app-text/manpager/manpager-1.ebuild index feb8ab432d..e9a237b608 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/manpager/manpager-1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/manpager/manpager-1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" S=${WORKDIR} From 77980987c36401e82fb556d81431c0011f8394fd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:02 +0000 Subject: [PATCH 040/202] app-text/sgml-common: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../app-text/sgml-common/sgml-common-0.6.3-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild index 23b2def300..d7c9a1fb78 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz" # install-catalog is GPL LICENSE="FDL-1.1+ GPL-2" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" DEPEND="" From e62036542a898060afa961729061817049901ad5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:03 +0000 Subject: [PATCH 041/202] dev-db/sqlite: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/dev-db/sqlite/sqlite-3.41.2-r1.ebuild | 2 +- .../portage-stable/dev-db/sqlite/sqlite-3.42.0.ebuild | 2 +- .../third_party/portage-stable/dev-db/sqlite/sqlite-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.41.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.41.2-r1.ebuild index 7c78a3c55e..b123ebe2b6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.41.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.41.2-r1.ebuild @@ -24,7 +24,7 @@ else " S="${WORKDIR}/${PN}-src-${SRC_PV}" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="public-domain" diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.42.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.42.0.ebuild index 8312b26c92..8e4f233695 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.42.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.42.0.ebuild @@ -24,7 +24,7 @@ else " S="${WORKDIR}/${PN}-src-${SRC_PV}" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="public-domain" diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-9999.ebuild index 0731c15101..2595b6ad1b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-9999.ebuild @@ -24,7 +24,7 @@ else " S="${WORKDIR}/${PN}-src-${SRC_PV}" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="public-domain" From 0c20f0c80f77f6485d55bc641ded0e38eb5cd551 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:05 +0000 Subject: [PATCH 042/202] dev-lang/go-bootstrap: Sync with Gentoo It's from Gentoo commit bc9d5a4864125643afb5c0945c2489b336c64aa6. --- .../dev-lang/go-bootstrap/Manifest | 15 ++++++ .../go-bootstrap/go-bootstrap-1.19.1.ebuild | 50 +++++++++++++++++++ .../dev-lang/go-bootstrap/metadata.xml | 12 +++++ 3 files changed, 77 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/go-bootstrap-1.19.1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/Manifest index cfdba9a400..e695250583 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/Manifest @@ -1,10 +1,25 @@ DIST go-darwin-amd64-bootstrap-1.18.6.tbz 145727291 BLAKE2B 3fa2efac8ff4b8527a946875af9bd5a2214bb97a7ec0cf24486b25eca964a19c47d8a5fd0c163efdeb24cd11eb3246eb3886b687a0009e96fdc9f5580c8e227c SHA512 b5b91d230ea80e852c251bc884327c398141962ea93a2e776f0d506a754e5006a47c429fc2fd019631cf5b82c1734c092af00b5260e4a41f05f00d7e59412a41 +DIST go-darwin-amd64-bootstrap-1.19.1.tbz 153199405 BLAKE2B d1da88b2d367fc8f014dea5c92ba39a8dbc0a43babc1f2ecc85405c8c4b9339bdb9058af77d986d40d54ea38665f2b02dcd64565d5616bdb22c183eb40df8329 SHA512 ab35caeb32503515b918f9313ba8dac5893fa8321a435e35eeda5624701098784b0072c2c789986a46c8fa8482fc8b2caa2b296e5bbddab5127942c24bc4e9a1 DIST go-linux-386-bootstrap-1.18.6.tbz 142678990 BLAKE2B 9dfd44ee127d822a91f48ecedb898583dfc7428e023b9adf78e2d44bfaef3d6126d2c87e455c3020dd71e23cef26fe683176037a07ba9e5931e8ce2979b90bcb SHA512 4d8ada5b623a9e804ac0a0fa47d0bc2551431114f8d7998d79037f9db6f6a091228e09a79c51b8ee0223970c00183a408aba2bb71aaf634ab92428022aebc35c +DIST go-linux-386-bootstrap-1.19.1.tbz 150297103 BLAKE2B 3c3eb2ac2d7daaad42c95b061b24417fc50ff295f0d55e0051c5edd39a8e8070a76bd8bf7c39a945a9955b12c0cb75785717089cb45f37e8e6a1f0fa8c0bcabf SHA512 8017672ba9befaf466dc12cb460c9374a78fe420b3b8393e663f4db48c27d0318131c74db2fef9c9445a65c9aff931617f0bae32c55efeb00913bd7d3eaf3401 DIST go-linux-amd64-bootstrap-1.18.6.tbz 143005294 BLAKE2B fdb4f31824b2cc37a9e96c6a77371543186636de5f4ab13468f2b9ee9bff84fdcd863b29340d48e85bb1ff15c4b03127997a08a631d959c14fe8e80fe713bebc SHA512 ffd31e523c1c3a576c67b623c99c96eec2598056a344c575d2fcf33e64fc84ed80cd54f35eb252754fa2d13ff2d25290ee5946433ce54557592e1a7d299bb4eb +DIST go-linux-amd64-bootstrap-1.19.1.tbz 150216372 BLAKE2B c66c7965382d119fe02495c5b0eb3e2872c33f5df772481f5d55863223ef91a6fe817005eb26c6fa65faaf1debf709036e46ca6fb92297567de9d71be50f1df8 SHA512 53dc31a1737cbdce233056ac0e8a91479dbbc116e821ef8a49588992f167b81fe006d0e4b4234186af3e6201f5718082bf8cf5540f99b1faef8de1b563214c9f DIST go-linux-arm-bootstrap-1.18.6.tbz 138008731 BLAKE2B a8bd1af70bfd6a74699f59c1700232b09087b567f052a61feae6a91680d89a3fb864c59d8970c0fa45f922188fec6b7232ce141b9031463d9449ff923914deba SHA512 c2e3bb0bfba0ac094172786ee24f6432f2add9827da07a56651b88551a556be4650a081ada3ea2f9b39094761c7c2541e3d37df287b6632418ffb86e25e8856a +DIST go-linux-arm-bootstrap-1.19.1.tbz 144999949 BLAKE2B 68b31bcefab6b4cd65cb27b02d74f807d8df6e3cfd9d1c295d98db89e3c35705880b3af3f37325175226974f926e77cb06ae3ecf2e01c17363a65c929239ecde SHA512 d1f3bdceefa074d2eb4c946ed0e75c3356704e0db65edcb61fc3ee36ca02111a2b3f1d8ba5ef46a4fe7c347eadb179815d4f9136e7b10a16ae8b52d188f53a48 DIST go-linux-arm64-bootstrap-1.18.6.tbz 135780283 BLAKE2B bda7bdd6cabd7627f64606cfefcf2696e48daac60149ee842d869a422171e65ee29557d3a0dfe8f34d56106622a5e4e0949c8e9f812b52f25fb13f74355466b4 SHA512 88421b37b0a9eac61f9d27534bc5f306b7ada4d31abd5b5d6fa6c44e2b743550297067f0dfd22a74497569d9d6e28d37697c55d66d4cc100db58f5d8bce676f4 +DIST go-linux-arm64-bootstrap-1.19.1.tbz 142434487 BLAKE2B c6523b1be480fd8f18b98b3197bbdb6e263c6d27f548422a2cc0ffa07b39ea6b68437398d2269e687eb76806bee9ac409f4fd9284c106a1559a698cf26906fd3 SHA512 9f4b731a6f201f60d641e477bc8dbb6a99c0966875246dae8499084399c717250ef45f0a4610fc970ed76bf3d3a30c8dad89c6517e57ec70bff8c13ed5f2f3e0 +DIST go-linux-loong64-bootstrap-1.19.1.tbz 144958192 BLAKE2B c8644914050161d7e36da18baff02217861d9d0a704ada9a994c460d3aab034917318a81d2ad3fce4bb91c129d162f52cca70da97764c033f713a54373add0a0 SHA512 73376a84b03624f6572de86ca767657db5d29da869e02c3f5fbbd89e058d7a9b32c1f0b45141fb307152f1ed62ab4ac2021be344ff843e5eb00c0a0886cf2eda +DIST go-linux-mips-bootstrap-1.19.1.tbz 142865670 BLAKE2B 4da6a5e6cbb12ad5eb6306cef65d009dcd9fc4cbb03aad8215379b2417c4ae326a9c939da2fd981989cce2fe5fc7afa691affc56e441e7b2735964fd97d98665 SHA512 7fc80ec14b82008a3063f131ba194af9c31dbf134e497a366515eb8f239338a8dab74c8dea16ac560c867f19874b55a35d3406f51512cf5af02ea43c13c9e9a7 +DIST go-linux-mips64-bootstrap-1.19.1.tbz 143078687 BLAKE2B 5c133cffff59a58fc6a1a9ef99ab75340ae2314c81592c5b7f49a3abf6b8a60586c724fc9afac0766f7dd69f27a803d10a352b6ec8c1d42c1a9d95aed2ba49e9 SHA512 a44ab9b513da34a05a1e6e0335230dbe1e8391723673454c95c6f31ea7cb2baf61dce56f99e41aa063dee05ccf578249383fb4ff102659b6ab844d185016378f +DIST go-linux-mips64le-bootstrap-1.19.1.tbz 142400838 BLAKE2B 6da25db9f866e10f65a177e31adcc97f5aa95ab4792de2f2d5bfe0869410d51ca5fd20863edaafda6b41a4c478bc6ec872f4d73724bcb6b918544f68c2d4883e SHA512 563a76ef5594f719e2e53b665733d947d98073976bf3981af2da565f8a256ed58acec410a045bc547e1d159a872e4f06dc9aba5549335e37ac0efd067bf15e42 +DIST go-linux-mipsle-bootstrap-1.19.1.tbz 142788425 BLAKE2B 36f0ce23e7453a46e5d1a86ca348075ef34d1ad69a3b69b84b8d8aaa6fca4109c5da52467b43b048ca718dd3e2b07b39f96166d72018d22dce9cda614991e2d6 SHA512 0b87edc6bf3027adc83bb4724b2d5234001cc7fa78c5236335baec00eeb32717e83312ac80cf9968ea304598b273e5d7803375e9ea091991961fd49b626610a5 DIST go-linux-ppc64-bootstrap-1.18.6.tbz 136492180 BLAKE2B 7aea27604839360161c1c2e668b733842c7cee4636cd3321fce51a793081f6d273a1231045570aa9bd7892df4c66227cfeec0c8174aff4514c98e93520bd14f2 SHA512 69188b5d42b446ad815eab4d1a094a38dd06d9a265f4a005500a132ba1bbbc3f50424188594c3f9dfde0e2a4aa2339639dd6c6d52d9b846dc5c450225648e541 +DIST go-linux-ppc64-bootstrap-1.19.1.tbz 143323280 BLAKE2B 38d3812ebb1a25411eed651c306249a111a04df9011b8dca0238f9f633344f58f60a9b4644f665327b88d727c4641c21b0bcc62f9a20bfc07b6588b997bcfc77 SHA512 d34aaf79240a7c6a77c786b97fd2c15c1f44c02d8fbdc3675744d6a19dc46f1679467f39a79a5f133256d4b51d09912796620db9899ccc8de63c8655e88875e2 DIST go-linux-ppc64le-bootstrap-1.18.6.tbz 136068938 BLAKE2B 262d253af2bb34fac1edede10b1a3508a434f185f1ac2e449c297b7ea92b44a5d9864a53b0f314fb63340c7d3a594bd429c73ff9f911f29ba6cc43e0932c10f8 SHA512 38e65e691bf8e8acda56f4f77b4d4e2bb76f5b9f036c927e2f5b3172fd08176f68c93e7740e34b42188b1b9ce41d5f3c1af7c24a2016d86dc07432cebd288c4d +DIST go-linux-ppc64le-bootstrap-1.19.1.tbz 142914504 BLAKE2B 6346407ff2d0825e9a05829d6174019c1c04cdc7ec2c8667262048f298291c195435adf462aef34b3e1af9d5c2dbd3eba3b7a4224a00ac10c34d6f6eea69cde3 SHA512 42fde59e3869149941d8d20a0172ff67f2d8c92b65d9bcc7a39414b3979a06d218793ba3c63bbc2fbecbb4bb46c5be3547664c258776ab27423b3a911f3d11f6 DIST go-linux-riscv64-bootstrap-1.18.6.tbz 140059606 BLAKE2B 427042a724e31c13455161ce362c336a36ed35d703621a45b08789611dc59e077bbb925271e065fa2224be41273b07cd837823676a3d1e5580fd214ef202bbba SHA512 d3e034e875ee29796b1843d4c484d5fbb92f57d9c11a1563793b4faf51d54b3dcdb7b864cfcc0cf6032bfaf7fc271c2109a019eadc1c8bbf016574bbfeb2fd74 +DIST go-linux-riscv64-bootstrap-1.19.1.tbz 145882340 BLAKE2B 754419f525bc2011bd8756ef3837591016be193e5821972d22b9ea1f5707030374d0d1e60a35bb3cc8f5cdae5a57771b1f9b4025a981a581d541b94a20a3fbc8 SHA512 9d358149ff7ad77722029888fce32e739a5174e5971c7ee6de342c86b389b3e08a025a21027f6b1b676b4c734e1f12c9794dbd7e3cc4de5bd01d813d3f67532f DIST go-linux-s390x-bootstrap-1.18.6.tbz 138788800 BLAKE2B 6dda205707b28f875515ed5659a2c021044fba3ec5542c6a297187d030bcdb9412c1e860f6f73e28b2db7d468e679665adae81afef856cb1f29501356f3bb4c3 SHA512 ec07ed7191f823faa08cfed0b5bc0e4898cdb15f7d41b4399ad1b6fee09314ac107d8339e9cd66afd1a3c5ce85dc14e76e440d699b728ee3354ce442c6f17d79 +DIST go-linux-s390x-bootstrap-1.19.1.tbz 146325007 BLAKE2B f7aa1172c1a7254997994948fd27490d771109283e152a57052e7f470f815a1e256e0dad0d6ca83bbfecdde69f2cf6392f584a25f719141433873061b2e962a4 SHA512 f4f400be5354771b3cfff480a35ec413f4c38468737f7e9f7da82f33c41253577f2818f157dbe593960dcbd085e840702c31b36d9e4196276abf27b45c6a67d2 DIST go-solaris-amd64-bootstrap-1.18.6.tbz 141998723 BLAKE2B f64902f2407e8873ecd0e4a441653bed69d8ef1cea6fb91e9e3a5a1b42db0df8409642f65184a8b875a450516268da03f166486884b7ac6fd7de8609efe61013 SHA512 77bc6f7d3656a6bb0a7bd2eb3eac0cb29eb1f897587eac681ebabb94305906cd0f5d3ffda43248c65d98f78afa3acb4e1c5b49cfcc729626378fbe7cf9eb79e8 +DIST go-solaris-amd64-bootstrap-1.19.1.tbz 149277390 BLAKE2B f5654865a63dc85727ed48b05879222b760f02a95710e427c3379c356e58b5cf2269b28fec931e07c0a74f02c9151c64c7bf792d0f8b476b9331f90fa06f3d8a SHA512 659b0956deed4ee7c5e0068618d4bd30ed1245f21c1edb919e011f4722eeb4b2850e48f5bb9ac370c353d496d3fe6d00d400ef97fed5a80fed02da73fabb4cfe diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/go-bootstrap-1.19.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/go-bootstrap-1.19.1.ebuild new file mode 100644 index 0000000000..fa9937e754 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/go-bootstrap-1.19.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Bootstrap package for dev-lang/go" +HOMEPAGE="https://golang.org" +BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist" +SRC_URI=" + amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-bootstrap-${PV}.tbz ) + arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-bootstrap-${PV}.tbz ) + arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-bootstrap-${PV}.tbz ) + loong? ( ${BOOTSTRAP_DIST}/go-linux-loong64-bootstrap-${PV}.tbz ) + mips? ( + abi_mips_o32? ( + big-endian? ( ${BOOTSTRAP_DIST}/go-linux-mips-bootstrap-${PV}.tbz ) + !big-endian? ( ${BOOTSTRAP_DIST}/go-linux-mipsle-bootstrap-${PV}.tbz ) + ) + abi_mips_n64? ( + big-endian? ( ${BOOTSTRAP_DIST}/go-linux-mips64-bootstrap-${PV}.tbz ) + !big-endian? ( ${BOOTSTRAP_DIST}/go-linux-mips64le-bootstrap-${PV}.tbz ) + ) + ) + ppc64? ( + big-endian? ( ${BOOTSTRAP_DIST}/go-linux-ppc64-bootstrap-${PV}.tbz ) + !big-endian? ( ${BOOTSTRAP_DIST}/go-linux-ppc64le-bootstrap-${PV}.tbz ) + ) + riscv? ( ${BOOTSTRAP_DIST}/go-linux-riscv64-bootstrap-${PV}.tbz ) + s390? ( ${BOOTSTRAP_DIST}/go-linux-s390x-bootstrap-${PV}.tbz ) + x86? ( ${BOOTSTRAP_DIST}/go-linux-386-bootstrap-${PV}.tbz ) + x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-bootstrap-${PV}.tbz ) + x64-solaris? ( ${BOOTSTRAP_DIST}/go-solaris-amd64-bootstrap-${PV}.tbz ) +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +IUSE="abi_mips_n64 abi_mips_o32 big-endian" +RESTRICT="strip" +QA_PREBUILT="*" + +S="${WORKDIR}" + +src_install() { + dodir /usr/lib + mv go-*-bootstrap "${ED}/usr/lib/go-bootstrap" || die + + # testdata directories are not needed on the installed system + rm -fr $(find "${ED}"/usr/lib/go-bootstrap -iname testdata -type d -print) +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/metadata.xml new file mode 100644 index 0000000000..311b2b3e46 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/go-bootstrap/metadata.xml @@ -0,0 +1,12 @@ + + + + + williamh@gentoo.org + William Hubbs + + + This package is used only to boot strap dev-lang/go. + It is not meant to be used by end users directly. + + From c996edd66287546b139d10b64da7b80c67a43a8b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:05 +0000 Subject: [PATCH 043/202] dev-lang/lua: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../portage-stable/dev-lang/lua/lua-5.1.5-r200.ebuild | 2 +- .../portage-stable/dev-lang/lua/lua-5.3.6-r102.ebuild | 2 +- .../portage-stable/dev-lang/lua/lua-5.4.4-r103.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.1.5-r200.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.1.5-r200.ebuild index eff2fdb452..56b7cc7dbb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.1.5-r200.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.1.5-r200.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz" LICENSE="MIT" SLOT="5.1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+deprecated readline" DEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.3.6-r102.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.3.6-r102.ebuild index 5f02b32717..723277fb48 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.3.6-r102.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.3.6-r102.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz" LICENSE="MIT" SLOT="5.3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+deprecated readline" DEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.4.4-r103.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.4.4-r103.ebuild index 88415e2579..ebfa8021ed 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.4.4-r103.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.4.4-r103.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz" LICENSE="MIT" SLOT="5.4" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+deprecated readline" DEPEND=" From 7c2e990c7c6c363373bd6a616467d94af27f0f83 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:05 +0000 Subject: [PATCH 044/202] dev-lang/perl: Sync with Gentoo It's from Gentoo commit df505c8dae7d4bcc13a03d5872f2a5661d8297cf. --- .../portage-stable/dev-lang/perl/Manifest | 2 + .../perl/files/perl-5.36.1-http-tiny.patch | 71 +- .../dev-lang/perl/perl-5.34.1-r4.ebuild | 6 +- .../dev-lang/perl/perl-5.36.0-r1.ebuild | 6 +- .../dev-lang/perl/perl-5.36.0-r2.ebuild | 6 +- ...5.36.1-r1.ebuild => perl-5.36.1-r2.ebuild} | 6 +- .../dev-lang/perl/perl-5.36.1.ebuild | 6 +- .../dev-lang/perl/perl-5.38.0_rc0.ebuild | 827 ++++++++++++++++++ 8 files changed, 897 insertions(+), 33 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-lang/perl/{perl-5.36.1-r1.ebuild => perl-5.36.1-r2.ebuild} (98%) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.0_rc0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/perl/Manifest index 06add5c22a..fb66db5d4e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/Manifest @@ -5,6 +5,8 @@ DIST perl-5.34.1.tar.xz 12760168 BLAKE2B 3768e55f66551c83295153e91d25d568b7b8638 DIST perl-5.36.0-patches-1.tar.xz 20352 BLAKE2B f5413c75c5bbced230ad7fa692998caef8e4041f3394ae5212dc2aaee465de619b56cf07551be1bb36f2e06b9ed7d0ddda31ad4a7ec81d5c0c64b698ddd80379 SHA512 ab24577b6d71a13d9ccf272efa0881b29933b6a39532ca0d71d4c9a134f451bbe5f3d87c6c851f26114702ac3f92af5c5a72129a458ebee31e372106955eb157 DIST perl-5.36.0.tar.xz 13051500 BLAKE2B e4864a4c21e5242df4164c73db8af10f7b9c36b075e0c05777abec79716db7778ccbf2c0c9e7e749518ad310019d2a6b32bd8b5ab2af5a8b16b5d920f83d034f SHA512 6dd6ac2a77566c173c5ab9c238cf555f2c3e592e89abb5600bc23ce1cbd0c349e0233f6417cbbf1f6d0aefc6a734ba491285af0d3dc68a605b658b65c89f1dab DIST perl-5.36.1.tar.xz 13053604 BLAKE2B baab610d16e444338ad7d529bad6a88e12010786bd25f2ab117ab4dd636859ff862cb925700095434f05a802bea5b89a9d41769f26bdbae439443020950882bd SHA512 8d1ec654c59d078bfc477f11c9526233199a85e4d4f6f5a55bf9eb7802cd355189c669cc6785d2d5e741c1de4d740b7a0cfd3c0198122586a07ac7f527fb14af +DIST perl-5.38.0-RC0.tar.gz 21163691 BLAKE2B 11f335e5811abf2d0a756414451889636969b442e1b030378b1fa1307fa4788aa0e1810ed6e01b9b9dc6829344d08246ac878104be69dfc3b29c8d9eca6a6d99 SHA512 189522d889eb3c14d3a1769c69ad1cf46a48b61a9dc67fd6b5426be45378d43217a80c69013240d67197db0281fa9d6ffe42768e057a859c97f7084420e66f72 +DIST perl-5.38.0-patches-1.tar.gz 26047 BLAKE2B 809dd5242f9868e54525ae8056598d3252c889afc72ed6f122174f828947223399a5ba4dbc16dd43501f7138205991f8c102cbe0ed94175ae3353040c53a0162 SHA512 c66160e20095555aa21d3be70050dce934d62e55e01dcf0f716129b2faa390923958a48bc448b4fab6f55e5b097eb378f7a6409a92c024fe68c8b34fddcfc5e4 DIST perl-cross-1.3.7.tar.gz 118291 BLAKE2B dc9c060857d6905c817e91c3f5b1f546b76e02c6de02dc260185e0de8628a5ead3a557501da75549e2585cd30879190558740e697b1c78a69fa08ccb5649efcd SHA512 1111274f34f8b46e9f418883e9b1652ba4a5a9b4a5880a9a5b38bc8aeb5d75a9f4943233870f5ebf5fbcdc0c30b2983ace11ad051b55d3283327d8f2c15e172c DIST perl-cross-1.4.1.tar.gz 117688 BLAKE2B e01103fb92764213dafb1ab92954fdc4bdcf1bd71a0064279ee75fed55a1c71850eaabdf667d6ab1c15eadccf7497668e5bb5ab13de33fef707fba14bfd52912 SHA512 5f403d3a52f724383d25c23b08e8001954300fa8f07a5b49df440ef4d06ef756404a6e448093c4f4d4f9a470b1c3f2b1b8b27d3d227ac1823552f6a377edd06a DIST perl-cross-1.4.tar.gz 113861 BLAKE2B 7c7783afccc6a04ab122a7c60b1cff7f0a2725655b2b63325ca25d7b8acb0cf993b496e2a590db943054336337ad215550b6b2a565f1d91a5aa9cfe3a4c36db4 SHA512 bde73cac13c0b42c4c6783d7e30dea491d70b65131e1c8434ef75db1f39a8e15ef5857568b706e8456faa3822402676dd247a1f20f4bed983597fdd5a6b4faad diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.36.1-http-tiny.patch b/sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.36.1-http-tiny.patch index 34907cc6d9..2144b4d4ff 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.36.1-http-tiny.patch +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.36.1-http-tiny.patch @@ -1,19 +1,35 @@ -in current year, we should verify tls certs by default. -not doing so is as good as not using tls -https://www.openwall.com/lists/oss-security/2023/04/18/14 - Source: -https://git.alpinelinux.org/aports/plain/main/perl/default-https-perl-http-tiny.patch?id=fc21c0f7930ae3a9e2f50bacc305fb167a456ded +https://github.com/NixOS/nixpkgs/blob/5b709277f48df630c8fa7aab0cf6157f71a5b45c/pkgs/development/interpreters/perl/http-tiny-verify-ssl-by-default.patch Bug: https://bugs.gentoo.org/905296 See-also: https://github.com/chansen/p5-http-tiny/pull/151 See-also: https://github.com/chansen/p5-http-tiny/issues/152 - +See-also: https://www.openwall.com/lists/oss-security/2023/04/18/14 -- -diff --git a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm -index 83ca06d..dc6217a 100644 +Patch for HTTP::Tiny that defaults verify_SSL to 1 + +Based on proposed Debian patch by Dominic Hargreaves: +https://salsa.debian.org/perl-team/interpreter/perl/-/commit/1490431e40e22052f75a0b3449f1f53cbd27ba92 --- a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm +++ b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm +@@ -41,7 +41,7 @@ sub _croak { require Carp; Carp::croak(@_) } + #pod read or write takes longer than the timeout, the request response status code + #pod will be 599. + #pod * C — A boolean that indicates whether to validate the SSL +-#pod certificate of an C — connection (default is false) ++#pod certificate of an C — connection (default is true) + #pod * C — A hashref of C — options to pass through to + #pod L + #pod +@@ -115,7 +115,7 @@ sub new { + max_redirect => 5, + timeout => defined $args{timeout} ? $args{timeout} : 60, + keep_alive => 1, +- verify_SSL => $args{verify_SSL} || $args{verify_ssl} || 0, # no verification by default ++ verify_SSL => $args{verify_SSL} // $args{verify_ssl} // 1, # verification by default + no_proxy => $ENV{no_proxy}, + }; + @@ -1055,7 +1055,7 @@ sub new { timeout => 60, max_line_size => 16384, @@ -23,3 +39,42 @@ index 83ca06d..dc6217a 100644 SSL_options => {}, %args }, $class; +@@ -1797,7 +1797,7 @@ C — Request timeout in seconds (default is 60) If a socket open, read + + =item * + +-C — A boolean that indicates whether to validate the SSL certificate of an C — connection (default is false) ++C — A boolean that indicates whether to validate the SSL certificate of an C — connection (default is true) + + =item * + +@@ -2069,7 +2069,7 @@ Verification of server identity + + =back + +-B. ++B. + + Server identity verification is controversial and potentially tricky because it + depends on a (usually paid) third-party Certificate Authority (CA) trust model +@@ -2077,16 +2077,14 @@ to validate a certificate as legitimate. This discriminates against servers + with self-signed certificates or certificates signed by free, community-driven + CA's such as L. + +-By default, HTTP::Tiny does not make any assumptions about your trust model, +-threat level or risk tolerance. It just aims to give you an encrypted channel +-when you need one. +- + Setting the C attribute to a true value will make HTTP::Tiny verify + that an SSL connection has a valid SSL certificate corresponding to the host + name of the connection and that the SSL certificate has been verified by a CA. + Assuming you trust the CA, this will protect against a L. If you are +-concerned about security, you should enable this option. ++attack|http://en.wikipedia.org/wiki/Man-in-the-middle_attack>. ++ ++If you are not concerned about security, and this default in Gentoo causes ++problems, you should disable this option. + + Certificate verification requires a file containing trusted CA certificates. + diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.1-r4.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.1-r4.ebuild index cf734d91d2..175835e0c9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.1-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.1-r4.ebuild @@ -58,7 +58,7 @@ LICENSE="|| ( Artistic GPL-1+ )" SLOT="0/${SUBSLOT}" if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="berkdb debug doc gdbm ithreads minimal quadmath" @@ -645,10 +645,6 @@ src_configure() { [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ append-cflags -Dinline=__inline__ -DPERL_DARWIN - # flock on 32-bit sparc Solaris is broken, fall back to fcntl - [[ ${CHOST} == sparc-*-solaris* ]] && \ - myconf -Ud_flock - # Prefix: the host system needs not to follow Gentoo multilib stuff, and in # Prefix itself we don't do multilib either, so make sure perl can find # something compatible. diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.0-r1.ebuild index f893b76669..871d19122f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.0-r1.ebuild @@ -53,7 +53,7 @@ LICENSE="|| ( Artistic GPL-1+ )" SLOT="0/${SUBSLOT}" if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="berkdb debug doc gdbm ithreads minimal quadmath" @@ -628,10 +628,6 @@ src_configure() { [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ append-cflags -Dinline=__inline__ -DPERL_DARWIN - # flock on 32-bit sparc Solaris is broken, fall back to fcntl - [[ ${CHOST} == sparc-*-solaris* ]] && \ - myconf -Ud_flock - # Prefix: the host system needs not to follow Gentoo multilib stuff, and in # Prefix itself we don't do multilib either, so make sure perl can find # something compatible. diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.0-r2.ebuild index d8c913d377..2d18c6997a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.0-r2.ebuild @@ -53,7 +53,7 @@ LICENSE="|| ( Artistic GPL-1+ )" SLOT="0/${SUBSLOT}" if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="berkdb debug doc gdbm ithreads minimal quadmath" @@ -631,10 +631,6 @@ src_configure() { [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ append-cflags -Dinline=__inline__ -DPERL_DARWIN - # flock on 32-bit sparc Solaris is broken, fall back to fcntl - [[ ${CHOST} == sparc-*-solaris* ]] && \ - myconf -Ud_flock - # Prefix: the host system needs not to follow Gentoo multilib stuff, and in # Prefix itself we don't do multilib either, so make sure perl can find # something compatible. diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.1-r2.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.1-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.1-r2.ebuild index 53995157a8..1ec9ff961c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.1-r2.ebuild @@ -53,7 +53,7 @@ LICENSE="|| ( Artistic GPL-1+ )" SLOT="0/${SUBSLOT}" if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="berkdb debug doc gdbm ithreads minimal quadmath" @@ -632,10 +632,6 @@ src_configure() { [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ append-cflags -Dinline=__inline__ -DPERL_DARWIN - # flock on 32-bit sparc Solaris is broken, fall back to fcntl - [[ ${CHOST} == sparc-*-solaris* ]] && \ - myconf -Ud_flock - # Prefix: the host system needs not to follow Gentoo multilib stuff, and in # Prefix itself we don't do multilib either, so make sure perl can find # something compatible. diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.1.ebuild index 791ad320aa..56cb67eb8d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.1.ebuild @@ -53,7 +53,7 @@ LICENSE="|| ( Artistic GPL-1+ )" SLOT="0/${SUBSLOT}" if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="berkdb debug doc gdbm ithreads minimal quadmath" @@ -628,10 +628,6 @@ src_configure() { [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ append-cflags -Dinline=__inline__ -DPERL_DARWIN - # flock on 32-bit sparc Solaris is broken, fall back to fcntl - [[ ${CHOST} == sparc-*-solaris* ]] && \ - myconf -Ud_flock - # Prefix: the host system needs not to follow Gentoo multilib stuff, and in # Prefix itself we don't do multilib either, so make sure perl can find # something compatible. diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.0_rc0.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.0_rc0.ebuild new file mode 100644 index 0000000000..4f7eb349a1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.0_rc0.ebuild @@ -0,0 +1,827 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing + +PATCH_VER=1 +CROSS_VER=1.4.1 +PATCH_BASE="perl-5.38.0-patches-${PATCH_VER}" +PATCH_DEV=dilfridge + +DIST_AUTHOR=RJBS + +# Greatest first, don't include yourself +# Devel point-releases are not ABI-intercompatible, but stable point releases are +# BIN_OLDVERSEN contains only C-ABI-intercompatible versions +PERL_BIN_OLDVERSEN="" + +if [[ "${PV##*.}" == "9999" ]]; then + DIST_VERSION=5.30.0 +else + DIST_VERSION="${PV/_rc/-RC}" +fi +SHORT_PV="${DIST_VERSION%.*}" + +# Even numbered major versions are ABI intercompatible +# Odd numbered major versions are not +if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then + SUBSLOT="${DIST_VERSION%-RC*}" +else + SUBSLOT="${DIST_VERSION%.*}" +fi + +# Used only in tar paths +MY_P="perl-${DIST_VERSION}" +# Used in library paths +MY_PV="${DIST_VERSION%-RC*}" + +DESCRIPTION="Larry Wall's Practical Extraction and Report Language" + +# mirror://cpan/src/5.0/${MY_P}.tar.xz +# mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz +SRC_URI=" + https://github.com/gentoo-perl/perl-patchset/archive/refs/tags/${PATCH_BASE}.tar.gz + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.gz + https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz + https://semiotic.systems/perl-5.38.0-RC0.tar.gz +" + +HOMEPAGE="https://www.perl.org/" + +LICENSE="|| ( Artistic GPL-1+ )" +SLOT="0/${SUBSLOT}" + +if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +IUSE="berkdb debug doc gdbm ithreads minimal quadmath" + +RDEPEND=" + berkdb? ( sys-libs/db:= ) + gdbm? ( >=sys-libs/gdbm-1.8.3:= ) + app-arch/bzip2 + >=sys-libs/zlib-1.2.12 + virtual/libcrypt:= +" +DEPEND="${RDEPEND}" +BDEPEND="${RDEPEND}" + +PDEPEND=" + !minimal? ( + >=app-admin/perl-cleaner-2.5 + >=virtual/perl-CPAN-2.290.0 + >=virtual/perl-Encode-3.120.0 + >=virtual/perl-File-Temp-0.230.400-r2 + >=virtual/perl-Data-Dumper-2.154.0 + virtual/perl-Test-Harness + ) +" +# bug 390719, bug 523624 +# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker + +S="${WORKDIR}/${MY_P}" + +dual_scripts() { + src_remove_dual perl-core/Archive-Tar 2.400.0 ptar ptardiff ptargrep + src_remove_dual perl-core/CPAN 2.360.0 cpan + src_remove_dual perl-core/Digest-SHA 6.40.0 shasum + src_remove_dual perl-core/Encode 3.190.0 enc2xs piconv + src_remove_dual perl-core/ExtUtils-MakeMaker 7.700.0 instmodsh + src_remove_dual perl-core/ExtUtils-ParseXS 3.510.0 xsubpp + src_remove_dual perl-core/IO-Compress 2.204.0 zipdetails + src_remove_dual perl-core/JSON-PP 4.160.0 json_pp + src_remove_dual perl-core/Module-CoreList 5.202.305.200 corelist + src_remove_dual perl-core/Pod-Checker 1.750.0 podchecker + src_remove_dual perl-core/Pod-Perldoc 3.280.100 perldoc + src_remove_dual perl-core/Pod-Usage 2.30.0 pod2usage + src_remove_dual perl-core/Test-Harness 3.440.0 prove + src_remove_dual perl-core/podlators 5.10.0 pod2man pod2text + src_remove_dual_man perl-core/podlators 5.10.0 /usr/share/man/man1/perlpodstyle.1 +} + +check_rebuild() { + # Fresh install + if [[ -z "${REPLACING_VERSIONS}" ]]; then + return 0; + # Major Upgrade + # doesn't matter if there's multiple copies, it still needs a rebuild + # if the string is anything other than "5.CURRENTMAJOR" + elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then + echo "" + ewarn "UPDATE THE PERL MODULES:" + ewarn "After updating dev-lang/perl the installed Perl modules" + ewarn "have to be re-installed. In most cases, this is done automatically" + ewarn "by the package manager, but subsequent steps are still recommended" + ewarn "to ensure system consistency." + ewarn + ewarn "You should start with a depclean to remove any unused perl dependencies" + ewarn "that may confuse portage in future. Regular depcleans are also encouraged" + ewarn "as part of your regular update cycle, as that will keep perl upgrades working." + ewarn "Recommended: emerge --depclean -va" + ewarn + ewarn "You should then call perl-cleaner to clean up any old files and trigger any" + ewarn "remaining rebuilds portage may have missed." + ewarn "Use: perl-cleaner --all" + return 0; + + # Reinstall w/ USE Change + elif + ( use ithreads && ! has_version dev-lang/perl[ithreads] ) || \ + ( ! use ithreads && has_version dev-lang/perl[ithreads] ) || \ + ( use quadmath && ! has_version dev-lang/perl[quadmath] ) || \ + ( ! use quadmath && has_version dev-lang/perl[quadmath] ) || \ + ( use debug && ! has_version dev-lang/perl[debug] ) || \ + ( ! use debug && has_version dev-lang/perl[debug] ) ; then + echo "" + ewarn "TOGGLED USE-FLAGS WARNING:" + ewarn "You changed one of the use-flags ithreads, quadmath, or debug." + ewarn "You must rebuild all perl-modules installed." + ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl" + fi +} + +pkg_setup() { + case ${CHOST} in + *-freebsd*) osname="freebsd" ;; + *-dragonfly*) osname="dragonfly" ;; + *-netbsd*) osname="netbsd" ;; + *-openbsd*) osname="openbsd" ;; + *-darwin*) osname="darwin" ;; + *-solaris*) osname="solaris" ;; + *-cygwin*) osname="cygwin" ;; + *) osname="linux" ;; + esac + + myarch="${CHOST%%-*}-${osname}" + if use debug ; then + myarch+="-debug" + fi + if use quadmath ; then + myarch+="-quadmath" + fi + if use ithreads ; then + mythreading="-multi" + myarch+="-thread" + fi + + PRIV_BASE="/usr/$(get_libdir)/perl5" + SITE_BASE="/usr/local/$(get_libdir)/perl5" + VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl" + + LIBPERL="libperl$(get_libname ${MY_PV} )" + + PRIV_LIB="${PRIV_BASE}/${SUBSLOT}" + ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}" + SITE_LIB="${SITE_BASE}/${SUBSLOT}" + SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}" + VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}" + VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}" + + dual_scripts +} + +src_remove_dual_file() { + local i pkg ver + pkg="$1" + ver="$2" + shift 2 + case "${EBUILD_PHASE:-none}" in + postinst|postrm) + for i in "$@" ; do + alternatives_auto_makesym "${i}" "${i}-[0-9]*" + done + ;; + setup) + for i in "$@" ; do + if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then + has_version ${pkg} && ewarn "You must reinstall ${pkg} !" + break + fi + done + ;; + install) + for i in "$@" ; do + if ! [[ -f "${ED}"${i} ]] ; then + ewarn "${i} does not exist!" + continue + fi + mv "${ED}"${i}{,-${ver}-${P}} || die + done + ;; + esac +} + +src_remove_dual_man() { + local i pkg ver ff + pkg="$1" + ver="$2" + shift 2 + case "${EBUILD_PHASE:-none}" in + postinst|postrm) + for i in "$@" ; do + ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*` + ff=${ff##*${i#${i%.[0-9]}}} + alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*" + done + ;; + install) + for i in "$@" ; do + if ! [[ -f "${ED}"${i} ]] ; then + ewarn "${i} does not exist!" + continue + fi + mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die + done + ;; + esac +} + +src_remove_dual() { + local i pkg ver + pkg="$1" + ver="$2" + shift 2 + for i in "$@" ; do + src_remove_dual_file "${pkg}" "${ver}" "/usr/bin/${i}" + src_remove_dual_man "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1" + done +} + +src_prepare_perlcross() { + cp -a ../perl-cross-${CROSS_VER}/* . || die + + # bug 794463, needs further analysis what is exactly wrong here + eapply "${FILESDIR}/perl-5.34.0-crossfit.patch" + + # bug 604072 + MAKEOPTS+=" -j1" + export MAKEOPTS +} + +src_prepare_dynamic() { + ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die + ln -s ${LIBPERL} libperl$(get_libname ) || die +} + +# Copy a patch into the patch series +# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug'] +# - description is optional, but recommended +# - all arguments after descriptions are bug URLs +add_patch() { + local patchdir="${WORKDIR}/patches" + local infodir="${WORKDIR}/patch-info" + local src_name dest_name desc + src_name="$1" + dest_name="$2" + desc="$3" + shift; shift; shift; + einfo "Adding ${dest_name} to patch bundle" + cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}" + if [[ -n "${desc}" ]]; then + printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc" + fi + if [[ $# -gt 0 ]]; then + # Note: when $@ is more than one element, this emits a + # line for each element + printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs" + fi +} + +# Remove a patch using a glob expr +# eg: +# rm_patch *-darwin-Use-CC* +# +rm_patch() { + local patchdir="${WORKDIR}/patches" + local expr="$1" + local patch="$( cd "${patchdir}"; echo $expr )" + einfo "Removing $patch ($expr) from patch bundle" + if [[ -e "${patchdir}/${patch}" ]]; then + rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )" + else + ewarn "No ${expr} found in ${patchdir} to remove" + fi +} + +# Yes, this is a reasonable amount of code for something seemingly simple +# but this is far easier to debug when things go wrong, and things went wrong +# multiple times while I was getting the exact number of slashes right, which +# requires circumnavigating both bash and sed escape mechanisms. +c_escape_string() { + local slash dquote + slash='\' + dquote='"' + re_slash="${slash}${slash}" + re_dquote="${slash}${dquote}" + + # Convert \ to \\, + # " to \" + echo "$1" |\ + sed "s|${re_slash}|${re_slash}${re_slash}|g" |\ + sed "s|${re_dquote}|${re_slash}${re_dquote}|g" +} +c_escape_file() { + c_escape_string "$(cat "$1")" +} + +apply_patchdir() { + local patchdir="${WORKDIR}/patches" + local infodir="${WORKDIR}/patch-info" + local patchoutput="patchlevel-gentoo.h" + + # Inject Patch-Level info into description for patchlevel.h patch + # to show in -V + local patch_expr="*List-packaged-patches*" + local patch="$( cd "${patchdir}"; echo $patch_expr )"; + einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )" + + if [[ -e "${patchdir}/${patch}" ]]; then + printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\ + >"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc" + else + eerror "No $patch_expr found in ${patchdir}" + fi + + # Compute patch list to apply + # different name other than PATCHES to stop default + # reapplying it + # Single depth is currently only supported, as artifacts can reside + # from the old layout being multiple-directories, as well as it grossly + # simplifying the patchlevel_gentoo.h generation. + local PERL_PATCHES=($( + find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\ + grep -E '[.](diff|patch)$' |\ + sort -n + )) + + for patch in "${PERL_PATCHES[@]}"; do + eapply "${WORKDIR}"/patches/${patch} + done + + einfo "Generating $patchoutput" + + # This code creates a header file, each iteration + # creates one-or-more-lines for each entry found in PERL_PATCHES + # and STDOUT is redirected to the .h file + for patch in "${PERL_PATCHES[@]}"; do + local desc_f="${infodir}/${patch}.desc" + local bugs_f="${infodir}/${patch}.bugs" + + printf ',"%s"\n' "${patch}" + if [[ ! -e "${desc_f}" ]]; then + ewarn "No description provided for ${patch} (expected: ${desc_f} )" + else + local desc="$(c_escape_file "${desc_f}")" + printf ',"- %s"\n' "${desc}" + fi + if [[ -e "${bugs_f}" ]]; then + while read -d $'\n' -r line; do + local esc_line="$(c_escape_string "${line}")" + printf ',"- Bug: %s"\n' "${esc_line}" + done <"${bugs_f}" + fi + done > "${S}/${patchoutput}" + printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST" + +} + +src_prepare() { + + local patchdir="${WORKDIR}/patches" + + mv -v "${WORKDIR}/perl-patchset-${PATCH_BASE}/patches" "${WORKDIR}/patches" || die + mv -v "${WORKDIR}/perl-patchset-${PATCH_BASE}/patch-info" "${WORKDIR}/patch-info" || die + + # Prepare Patch dir with additional patches / remove unwanted patches + # Inject bug/desc entries for perl -V + # Old example: + # add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\ + # "Fix broken miniperl on hppa"\ + # "https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162" + + add_patch "${FILESDIR}/${PN}-5.36.1-http-tiny.patch" "0111-5.36.1-http-tiny.patch"\ + "Enable certificate checking in HTTP::Tiny by default"\ + "https://bugs.gentoo.org/905296" "https://bugs.debian.org/954089" + + if [[ ${CHOST} == *-solaris* ]] ; then + # do NOT mess with nsl, on Solaris this is always necessary, + # when -lsocket is used e.g. to get h_errno + rm_patch "*-nsl-and-cl*" + fi + + apply_patchdir + + tc-is-cross-compiler && src_prepare_perlcross + + tc-is-static-only || src_prepare_dynamic + + if use gdbm; then + sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \ + ext/NDBM_File/Makefile.PL || die + fi + + # Use errno.h from prefix rather than from host system, bug #645804 + if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then + sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + # set a soname, fix linking against just built libperl + sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die + fi + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_name (soname) not to reference $D + sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die + + # fix environ linkage absence (only a real issue on Darwin9) + if [[ ${CHOST##*-darwin} -le 9 ]] ; then + sed -i -e '/^PLDLFLAGS =/s/=/= -include crt_externs.h -Denviron="(*_NSGetEnviron())"/' \ + Makefile.SH || die + fi + fi + + default +} + +myconf() { + # the myconf array is declared in src_configure + myconf=( "${myconf[@]}" "$@" ) +} + +# Outputs a list of versions which have been seen in any of the +# primary perl @INC prefix paths, such as: +# /usr/lib64/perl5/ +# /usr/local/lib64/perl5/ +# /usr/lib64/perl5/vendor_perl/ +# +# All values of NUMBER must be like "5.x.y" or like "5.x" +# +find_candidate_inc_versions() { + local regex='.*/5[.][0-9]+\([.][0-9]+\|\)$' + local dirs=( + "${EROOT}${PRIV_BASE}" + "${EROOT}${SITE_BASE}" + "${EROOT}${VENDOR_BASE}" + ) + for dir in "${dirs[@]}"; do + if [[ ! -e "${dir}" ]]; then + continue + fi + # Without access to readdir() on these dirs, find will not be able + # to reveal any @INC directories inside them, and will subsequently prune + # them from the built perl's @INC support, breaking our compatiblity options + # entirely. + if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then + eerror "Bad permissions on ${dir}, this will probably break things" + eerror "Ensure ${dir} is +rx for at least uid=$EUID" + eerror "Recommended permission is +rx for all" + eerror "> chmod o+rx ${dir}" + fi + done + einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}" + find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f " 2>/dev/null +} + +# Sort versions passed versiony-ly, remove self-version if present +# dedup. Takes each version as an argument +sanitize_inc_versions() { + local vexclude="${SUBSLOT}" + einfo "Normalizing/Sorting candidate list: $*" + einfo " to remove '${vexclude}'" + # Note, general numeric sort has to be used + # for the last component, or unique will convert + # 5.30.0 + 5.30 into just 5.30 + printf "%s\n" "$@" |\ + grep -vxF "${vexclude}" |\ + sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg +} + +versions_to_inclist() { + local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}" + + for v; do + has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ "; + echo -n "${v}/ "; + done +} + +versions_to_gentoolibdirs() { + local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}" + local root + local v + for v; do + for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do + local fullpath="${EROOT}${root}/${v}" + if [[ -e "${fullpath}" ]]; then + has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}"; + printf "%s:" "${fullpath}" + fi + done + done +} + +src_configure() { + declare -a myconf + + export LC_ALL="C" + [[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091 + + # Perl has problems compiling with -Os in your flags with glibc + replace-flags "-Os" "-O2" + + # xlocale.h is going away in glibc-2.26, so it's counterproductive + # if we use it and include it in CORE/perl.h ... Perl builds just + # fine with glibc and locale.h only. + # However, the darwin prefix people have no locale.h ... + use elibc_glibc && myconf -Ui_xlocale + + # This flag makes compiling crash in interesting ways + filter-flags "-malign-double" + + # Generic LTO broken since 5.28, triggers EUMM failures + filter-flags "-flto" + + use sparc && myconf -Ud_longdbl + + export BUILD_BZIP2=0 + export BZIP2_INCLUDE=${EROOT}/usr/include + export BZIP2_LIB=${EROOT}/usr/$(get_libdir) + + export BUILD_ZLIB=False + export ZLIB_INCLUDE=${EROOT}/usr/include + export ZLIB_LIB=${EROOT}/usr/$(get_libdir) + + # allow either gdbm to provide ndbm (in ) or db1 + myndbm='U' + mygdbm='U' + mydb='U' + if use gdbm ; then + mygdbm='D' + if use berkdb ; then + myndbm='D' + fi + fi + if use berkdb ; then + mydb='D' + has_version '=sys-libs/db-1*' && myndbm='D' + fi + + myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db" + + if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then + ewarn "Perl will not be built with berkdb support, use gcc if you needed it..." + myconf -Ui_db -Ui_ndbm + fi + + use ithreads && myconf -Dusethreads + + use quadmath && myconf -Dusequadmath + + if use debug ; then + append-cflags "-g" + myconf -DDEBUGGING + elif [[ ${CFLAGS} == *-g* ]] ; then + myconf -DDEBUGGING=-g + else + myconf -DDEBUGGING=none + fi + + # modifying 'optimize' prevents cross configure script from appending required flags + if tc-is-cross-compiler; then + append-cflags "-fwrapv" + fi + + # bug #877659, bug #821577 + append-cflags -fno-strict-aliasing + + # Autodiscover all old version directories, some of them will even be newer + # if you downgrade + if [[ -z ${PERL_OLDVERSEN} ]]; then + PERL_OLDVERSEN="$( find_candidate_inc_versions )" + fi + + # Fixup versions, removing self match, fixing order and dupes + PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )" + + # Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string + if [[ -n "${PERL_OLDVERSEN// }" ]]; then + local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )" + einfo "This version of perl may partially support modules previously" + einfo "installed in any of the following paths:" + for incpath in ${inclist}; do + [[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}" + [[ -e "${EROOT}${PRIV_BASE}/${incpath}" ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}" + [[ -e "${EROOT}${SITE_BASE}/${incpath}" ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}" + done + einfo "This is a temporary measure and you should aim to cleanup these paths" + einfo "via world updates and perl-cleaner" + # myconf -Dinc_version_list="${inclist}" + myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )" + fi + + [[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a" + + # Make sure we can do the final link #523730, need to set deployment + # target to override hardcoded 10.3 which breaks on modern OSX + [[ ${CHOST} == *-darwin* ]] && \ + myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)" + + # Older macOS with non-Apple GCC chokes on inline in system headers + # using c89 mode as injected by cflags.SH, in addition, we override + # cflags, so we loose PERL_DARWIN which enables compat code that + # apparently on more recent macOS releases is no longer necessary + [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ + append-cflags -Dinline=__inline__ -DPERL_DARWIN + + # Prefix: the host system needs not to follow Gentoo multilib stuff, and in + # Prefix itself we don't do multilib either, so make sure perl can find + # something compatible. + if use prefix ; then + # Set a hook to check for each detected library whether it actually works. + export libscheck=" + ( echo 'main(){}' > '${T}'/conftest.c && + $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null + ) || xxx=/dev/null" + + # Use all host paths that might contain useful stuff, the hook above will filter out bad choices. + local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib" + myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}" + elif [[ $(get_libdir) != "lib" ]] ; then + # We need to use " and not ', as the written config.sh use ' ... + myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)" + fi + + # don't try building ODBM, bug #354453 + disabled_extensions="ODBM_File" + + if ! use gdbm ; then + # workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm" + disabled_extensions="${disabled_extensions} GDBM_File NDBM_File" + fi + + myconf -Dnoextensions="${disabled_extensions}" + + [[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly + + [[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF} + # allow fiddling via EXTRA_ECONF, bug 558070 + eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})" + + # setting -Dld= to tc-getLD breaks perl and all perl things + # https://github.com/Perl/perl5/issues/17791#issuecomment-630145202 + myconf \ + -Duseshrplib \ + -Darchname="${myarch}" \ + -Dcc="$(tc-getCC)" \ + -Dar="$(tc-getAR)" \ + -Dnm="$(tc-getNM)" \ + -Dcpp="$(tc-getCPP)" \ + -Dranlib="$(tc-getRANLIB)" \ + -Accflags="${CFLAGS} -DNO_PERL_RAND_SEED" \ + -Doptimize="${CFLAGS}" \ + -Dldflags="${LDFLAGS}" \ + -Dprefix="${EPREFIX}"'/usr' \ + -Dsiteprefix="${EPREFIX}"'/usr/local' \ + -Dvendorprefix="${EPREFIX}"'/usr' \ + -Dscriptdir="${EPREFIX}"'/usr/bin' \ + -Dprivlib="${EPREFIX}${PRIV_LIB}" \ + -Darchlib="${EPREFIX}${ARCH_LIB}" \ + -Dsitelib="${EPREFIX}${SITE_LIB}" \ + -Dsitearch="${EPREFIX}${SITE_ARCH}" \ + -Dvendorlib="${EPREFIX}${VENDOR_LIB}" \ + -Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \ + -Dman1dir="${EPREFIX}"/usr/share/man/man1 \ + -Dman3dir="${EPREFIX}"/usr/share/man/man3 \ + -Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \ + -Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \ + -Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \ + -Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \ + -Dman1ext='1' \ + -Dman3ext='3pm' \ + -Dlibperl="${LIBPERL}" \ + -Dlocincpth="${EPREFIX}"'/usr/include ' \ + -Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \ + -Duselargefiles \ + -Dd_semctl_semun \ + -Dcf_by='Gentoo' \ + -Dmyhostname='localhost' \ + -Dperladmin='root@localhost' \ + -Ud_csh \ + -Dsh="${EPREFIX}"/bin/sh \ + -Dtargetsh="${EPREFIX}"/bin/sh \ + -Uusenm \ + "${EXTRA_ECONF[@]}" + + if tc-is-cross-compiler; then + ./configure \ + --target="${CHOST}" \ + --build="${CBUILD}" \ + -Dinstallprefix='' \ + -Dinstallusrbinperl='undef' \ + -Dusevendorprefix='define' \ + "${myconf[@]}" \ + || die "Unable to configure" + else + sh Configure \ + -des \ + -Dinstallprefix="${EPREFIX}"'/usr' \ + -Dinstallusrbinperl='n' \ + "${myconf[@]}" \ + || die "Unable to configure" + fi +} + +src_test() { + export NO_GENTOO_NETWORK_TESTS=1; + export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}" + export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}" + if [[ ${EUID} == 0 ]] ; then + ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..." + return 0 + fi + TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed" +} + +src_install() { + local i + local coredir="${ARCH_LIB}/CORE" + + emake DESTDIR="${D}" install + + rm -f "${ED}/usr/bin/perl${MY_PV}" + ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die + + if ! tc-is-static-only ; then + dolib.so "${ED}"${coredir}/${LIBPERL} + rm -f "${ED}"${coredir}/${LIBPERL} + ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die + ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die + + ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die + ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die + ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die + fi + + rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages" + + # This removes ${D} from Config.pm + for i in $(find "${D}" -iname "Config.pm" ) ; do + einfo "Removing ${D} from ${i}..." + sed -i -e "s:${D}::" "${i}" || die "Sed failed" + done + + dodoc Changes* README AUTHORS + + if use doc ; then + # HTML Documentation + # We expect errors, warnings, and such with the following. + + dodir /usr/share/doc/${PF}/html + LD_LIBRARY_PATH=. ./perl installhtml \ + --podroot='.' \ + --podpath='lib:ext:pod:vms' \ + --recurse \ + --htmldir="${ED}/usr/share/doc/${PF}/html" + fi + + [[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local + + dual_scripts +} + +pkg_preinst() { + check_rebuild +} + +pkg_postinst() { + dual_scripts + + if [[ -z "${ROOT}" ]] ; then + local INC DIR file + INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }') + einfo "Removing old .ph files" + for DIR in ${INC} ; do + if [[ -d "${DIR}" ]] ; then + for file in $(find "${DIR}" -name "*.ph" -type f ) ; do + rm -f "${file}" + einfo "<< ${file}" + done + fi + done + # Silently remove the now empty dirs + for DIR in ${INC} ; do + if [[ -d "${DIR}" ]] ; then + find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null + fi + done + + fi +} + +pkg_postrm() { + dual_scripts +} From 917eff99b3e26dac69d64446585fb348cc2db72d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:05 +0000 Subject: [PATCH 045/202] dev-lang/python: Sync with Gentoo It's from Gentoo commit 7227144bfb38e6dadc5ae185b8651752619663f7. --- .../portage-stable/dev-lang/python/Manifest | 9 +- .../dev-lang/python/python-3.10.11.ebuild | 3 +- .../dev-lang/python/python-3.11.3.ebuild | 3 +- ...pha7.ebuild => python-3.12.0_beta1.ebuild} | 8 +- .../python/python-3.12.0_beta1_p1.ebuild | 521 ++++++++++++++++++ .../python/python-3.12.0_beta1_p3.ebuild | 521 ++++++++++++++++++ .../python/python-3.12.0_beta1_p4.ebuild | 521 ++++++++++++++++++ .../dev-lang/python/python-3.8.16_p4.ebuild | 3 +- .../python/python-3.9.16_p3-r1.ebuild | 3 +- 9 files changed, 1581 insertions(+), 11 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-lang/python/{python-3.12.0_alpha7.ebuild => python-3.12.0_beta1.ebuild} (98%) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1_p1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1_p3.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1_p4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest index e2f6694933..409f62147d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest @@ -4,8 +4,8 @@ DIST Python-3.10.11.tar.xz 19640792 BLAKE2B ce281549cb8fdcb74e068cc76c5412af749a DIST Python-3.10.11.tar.xz.asc 833 BLAKE2B ba107904c1658374481636bc950187a7bd1a2fb33aa3fb2fd1343e5aec6e84afdadab0b2edc6f0768856ae7b847a592fc79a7476247f4ff67c38c1ff18f831e9 SHA512 edddacc81d4671851cd2a52853cabc53314fa226dac77c2248ee61cf7d58dd2f59301b7729b2ff9f5717b84268140c3bef30e358b80718c6c84b308bd560bcd8 DIST Python-3.11.3.tar.xz 19906156 BLAKE2B c23815e09a0012b2af03f3e18471389382978ef0991cb081c4c6410e98613589d47d3ad782c0a06a48ddd86fc5df7f1d59e93dbab5871b89559e225084544248 SHA512 a3bba4b69322a47bfeefe42ba0fd7331b5b67fd2ab41441e2219d16ef8c6f307f1a48977afd073c18cfd24ec6cb1bfe0c4bb4b273031eb524dc7e9fb5fbcc3b6 DIST Python-3.11.3.tar.xz.asc 833 BLAKE2B 1846858480428293047bfaf87a74f5a6cf28227f63dbc36e658ab68444a5b91c2178fca42f35a413591103a0ceeea3cd5f8b757fb2f42cbcad023c62970ab950 SHA512 34bfb6e74e2bbec15bf3f653e32a3d705961b5f724e3f4713cf9b6b530f9c9e7e94f5cf855798bdf9763235b97a60ec9ad554d24cdc793e21a0c39540b5818d8 -DIST Python-3.12.0a7.tar.xz 19819836 BLAKE2B e899a47228560219b9e2dd1520999a026bd198fa47867ef3da30f6817d85c2ba6fe3956d1da0a038a096d3e70227d43c53fab88329af7c3dd9652d8b30f89bca SHA512 181e73215666a7deb4286a70f506d788adb0d13e3b688f3c4e061819bc59cbcedaf8aca0251d4e58791be8488f43ca0075176335bd1b3ff496b4ea2f14967d8b -DIST Python-3.12.0a7.tar.xz.asc 963 BLAKE2B 9e1b223b5b0556f95fb6bacb1ae66cd6115f8b589eb8ad46d1fec7e4d64aa5cc12c993be5b1fc87966b6b1b6964d433c00920dd98de41380bd8a8ee9b4f98490 SHA512 07c27bfb649755cfe505a902ff677e146ed1e8e19e7d5801d41c5926359b7d3f2ef73961c26f6cce6dd948355324330d4e9bae79e3661f87079b1adb5bf62355 +DIST Python-3.12.0b1.tar.xz 20053428 BLAKE2B b5b0df040de6cff181689f7c53e09407ef3a92806a688faa8547b2c6a0adc1622ea15cc5efb0d1b96a711cbf16f73a1d5f8fa748983bc423e4bbe89bd6ff84a6 SHA512 7d6d009f765ba48ef48e6b25cb1f043ba66979d66cb9141452862e84ae954611361d24178cce628d1892b75d306370a56fcb30a7c1715b0eedcfef5610f3e1ae +DIST Python-3.12.0b1.tar.xz.asc 963 BLAKE2B e80cbc9cf93756b6efbce3037dfcd4fec310ce17a3db36f33ac617dae63a8c2abc8efb3cfd5ec42299b9e4c2bdd06a3405c50b5550869564ae5f6a6d79d596c9 SHA512 cea449f05ae66c28aeb4ffd99b5748ba4c09bfb2a6889a771744ea81ca2afc2420648d4ca92592d32ddb26660804e73912e6fb8d906674e9e1895ba613904b26 DIST Python-3.8.16.tar.xz 19046724 BLAKE2B cbdeec7961d39cb9ab4960760b5d4c7ae71675c174156aa9f6fca55ee92a93a937ef39defe86e423237a25e0e24703233ce4b91dc97005b6ffc1f342ddd9e22c SHA512 d206e80806409410c00ef8acd8c3d90e3cc9553f996d0a57faa63802f2415e9d7591542b2e84b5e8e79245f40f6478790b5ba2acf1da98ebbc9495999183f7fd DIST Python-3.8.16.tar.xz.asc 833 BLAKE2B 678dabc558d013b104bf9e65d4319076c4730a67093a66fefc073b429c640d4facb31a0d6b7238deb08b265586a0cfb2c345051fe4df7bf5001d7317e6c06c9b SHA512 e93c394c0c5afcaaab625a3bd540dcc8e0ab946803d212343b8d1d6d5e6b89b09b6a20607bab0d858b30389a03305d57e14548605a65277d053c7817f32f4546 DIST Python-3.9.16.tar.xz 19738796 BLAKE2B 70dedeb70d9d8f27e4f6db5106623e087c61d451c7a04639cf8d3503ad02d4d43f1b36d0cdf1131aefc9bf6e677e561227dd4baef2c2c3d2dbf6d3e7dc36bd94 SHA512 b5fd0afe131c82bbce6ddf887c59eef6945910d6a9a2bc87c0927f4e4a096bf9ca4d25bcb729c40f6ebb8a65fbe8bf7b0b97a7c4a8c9e551240eb4f34b878653 @@ -13,6 +13,9 @@ DIST Python-3.9.16.tar.xz.asc 833 BLAKE2B 416b4a4be06e101c5971c12a6f21229c425bca DIST python-gentoo-patches-2.7.18_p16.tar.xz 35448 BLAKE2B 0139c0944f62f9cdd236f6a8557e0ed19704c7d72869af1cb7d8bd3e646a746cd4a0201e1b44232a5e78ef49f254db20b0d0271bf744fbfd4fe0f1e99b8f3e6c SHA512 810be590d0e06fab4b2165e6852ca49662f09dcd7e20b47a29f613ad7653252c8dfac3f0eb228d77c8a914efa7c08788b2fbd552a4b47504f5fd0ec17450c48f DIST python-gentoo-patches-3.10.11.tar.xz 13984 BLAKE2B 00c682609876756f61d41f637d0354538823dd713c81f8a3a168d217c515d4559d24e1988c1796b2b920f3962f56e023758b292175d29d5348a87bd8b422f6e7 SHA512 f819113908bc689bb522d2cbe749c658a6b29e7f627718954b12797461a13781352b01f798e2f42b3741a0a0489049bf03405ead4ac8103a025dac11e72b0888 DIST python-gentoo-patches-3.11.3.tar.xz 7776 BLAKE2B 78bf26f554c608c68826b9ea3c63a1df2b45bff755860f39f14306ebb63f17f5111b117519c4a9cb30452a62a14a3a7393798b8920c3d108ec8b6a30db88641e SHA512 64b79c90055fd940590b72ffd3744fe02ab9e46caf7b46f4aa1d074bf3e62d355e128bb2ac68c42f228f2e1bcdee2b0b114d9e2b9bf8427512083c1c5f8680e8 -DIST python-gentoo-patches-3.12.0a7.tar.xz 5168 BLAKE2B bfc249bf634deb3fab283c5d9a1710e35e6e7331f6a4f5c0d6b3795a3419adb7fa017117496966f7b3d7430d7564c66088cfd7cb8a2b8406776f42a5801960a7 SHA512 f806aa788f86d516bb23ad255edc24716a9385b3092e06e02e83617ef103b04878bb404081e7dded9c194dd6f2e4362bc2643b61076cb387b6070be3af391651 +DIST python-gentoo-patches-3.12.0b1.tar.xz 4652 BLAKE2B fcc0b2a8dddb4857e3bd381eb04ddbb593c18e4a3c7e565bc9d386e010f4ddfbb83ed479bd054e51055f30294f7065b045efabb6d45d0be41142dd450f1cada3 SHA512 ce39f99e54c44099a4fbd6da868af3c600320c39e2723b7958a40dfb2ff838e425ef0a87907cb084d96d059054f6222c211ebd258aec255f5fa97579cf9014c7 +DIST python-gentoo-patches-3.12.0b1_p1.tar.xz 73068 BLAKE2B 6728a4dcc102cc73e0e3a7e835e25df21075727e3096769f21df1e5411ebe1ad2d9909119bb6a12f96c932cf43de69fda122dffa3c88608c3b4acd76147153b3 SHA512 a459e341418d1882067d0d228401b9ce1365cdaeb75825ca0115add3c5499103986692d0a4fbdf20001632c03eba21171390326ccada6ab3f3c804448bdb79f0 +DIST python-gentoo-patches-3.12.0b1_p3.tar.xz 127756 BLAKE2B b2e0d60cedaf2cfd798387a06e0ea16285b880526639f5050ce285482008bd034c4ee3463f396c96d7b7d6834d4e5f79a4bf441e92b0fe257369c9519d904bf5 SHA512 8e5da370301104f6520c364696b41ce9d1d2561abca096dfb626118d87ac14f8a15fb7a195903aa4aaf6a91189f3dbb9e3833c389fcabb1c9b19720c68228874 +DIST python-gentoo-patches-3.12.0b1_p4.tar.xz 127836 BLAKE2B 188fac1b90925b6f80666fd102832909490d82452bb1655c91657d6bf716fca6b4185c34e774387559234a68713ac14d0b5de21a4110ffb3fef200ba8b5379e0 SHA512 07d9dff9e8f53a8b6e79603f2a6b61f5448cf3eb83cdcd184b3131611a7f8bcb975a0ad41bd194256617696df138cff79fbf7626b29f2407435fb0f55175cc72 DIST python-gentoo-patches-3.8.16_p4.tar.xz 32436 BLAKE2B 76984bbc04e5cf32d70853891967a33366dd28ca2cd47f3538ed1e9f4d39008d04c90f616d92112f5ec3468c42119089d195ee4d936536f8da4a772164aae221 SHA512 ad6d653fec3cce1f73db4b192f7e95b35ae2cf70aa8782d7b69f9d48eee240ef1cc32257a42bbb57f3952720df68b9976164a0b2748e36600332fba488383016 DIST python-gentoo-patches-3.9.16_p3.tar.xz 27160 BLAKE2B 5a41a6ff135c3aca02b19cf9a61f554ca224173854274b872ce85e8c71f25c678604e50b87bae40d4b5ac082731c143338fcc6ef47acebad2b59ce0b1d600f5d SHA512 1ace0a9e929769c29082fdec6845a476c07c13fbbff8726a7a592fda09da8b50c996638b4e4e40acccb15630a796074329adbcc9a004c4305952fa5b0dc4146c diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.11.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.11.ebuild index c5dd75f190..b30e6ea4d9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.11.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.11.ebuild @@ -30,7 +30,7 @@ LICENSE="PSF-2" SLOT="${PYVER}" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE=" - bluetooth build +ensurepip examples gdbm hardened libedit lto + bluetooth build debug +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind +xml " RESTRICT="!test? ( test )" @@ -232,6 +232,7 @@ src_configure() { --with-system-ffi --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip + $(use_with debug assertions) $(use_with lto) $(use_enable pgo optimizations) $(use_with readline readline "$(usex libedit editline readline)") diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.3.ebuild index fed1bebc47..389e56a6a6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.3.ebuild @@ -30,7 +30,7 @@ LICENSE="PSF-2" SLOT="${PYVER}" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE=" - bluetooth build +ensurepip examples gdbm hardened libedit lto + bluetooth build debug +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind " RESTRICT="!test? ( test )" @@ -221,6 +221,7 @@ src_configure() { --with-pkg-config=yes --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip + $(use_with debug assertions) $(use_with lto) $(use_enable pgo optimizations) $(use_with readline readline "$(usex libedit editline readline)") diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha7.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha7.ebuild rename to sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1.ebuild index 95d394d31c..e79715cc64 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_alpha7.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1.ebuild @@ -5,9 +5,9 @@ EAPI="7" WANT_LIBTOOL="none" inherit autotools check-reqs flag-o-matic multiprocessing pax-utils -inherit prefix python-utils-r1 toolchain-funcs verify-sig +inherit python-utils-r1 toolchain-funcs verify-sig -MY_PV=${PV/_alpha/a} +MY_PV=${PV/_beta/b} MY_P="Python-${MY_PV%_p*}" PYVER=$(ver_cut 1-2) PATCHSET="python-gentoo-patches-${MY_PV}" @@ -30,7 +30,7 @@ LICENSE="PSF-2" SLOT="${PYVER}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE=" - bluetooth build +ensurepip examples gdbm hardened libedit lto + bluetooth build debug +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind " RESTRICT="!test? ( test )" @@ -215,6 +215,7 @@ src_configure() { --with-pkg-config=yes --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip + $(use_with debug assertions) $(use_with lto) $(use_enable pgo optimizations) $(use_with readline readline "$(usex libedit editline readline)") @@ -300,7 +301,6 @@ src_configure() { append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw fi - hprefixify setup.py econf "${myeconfargs[@]}" if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1_p1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1_p1.ebuild new file mode 100644 index 0000000000..e79715cc64 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1_p1.ebuild @@ -0,0 +1,521 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic multiprocessing pax-utils +inherit python-utils-r1 toolchain-funcs verify-sig + +MY_PV=${PV/_beta/b} +MY_P="Python-${MY_PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${MY_PV}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE=" + https://www.python.org/ + https://github.com/python/cpython/ +" +SRC_URI=" + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc + ) +" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE=" + bluetooth build debug +ensurepip examples gdbm hardened libedit lto + +ncurses pgo +readline +sqlite +ssl test tk valgrind +" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND=" + app-arch/bzip2:= + app-arch/xz-utils:= + app-crypt/libb2 + >=dev-libs/expat-2.1:= + dev-libs/libffi:= + dev-python/gentoo-common + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + ensurepip? ( dev-python/ensurepip-wheels ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + kernel_linux? ( sys-apps/util-linux:= ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( + !libedit? ( >=sys-libs/readline-4.1:= ) + libedit? ( dev-libs/libedit:= ) + ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + !! /dev/null || die + # We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating + # libdir correctly for cross. + PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \ + ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}" + + # Avoid as many dependencies as possible for the cross build. + cat >> Makefile <<-EOF || die + MODULE_NIS_STATE=disabled + MODULE__DBM_STATE=disabled + MODULE__GDBM_STATE=disabled + MODULE__DBM_STATE=disabled + MODULE__SQLITE3_STATE=disabled + MODULE__HASHLIB_STATE=disabled + MODULE__SSL_STATE=disabled + MODULE__CURSES_STATE=disabled + MODULE__CURSES_PANEL_STATE=disabled + MODULE_READLINE_STATE=disabled + MODULE__TKINTER_STATE=disabled + MODULE_PYEXPAT_STATE=disabled + MODULE_ZLIB_STATE=disabled + EOF + + # Unfortunately, we do have to build this immediately, and + # not in src_compile, because CHOST configure for Python + # will check the existence of the --with-build-python value + # immediately. + PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake + popd &> /dev/null || die + fi + + # pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get + # propagated to sysconfig for built extensions + local -x CFLAGS_NODIST=${CFLAGS} + local -x LDFLAGS_NODIST=${LDFLAGS} + local -x CFLAGS= LDFLAGS= + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + if use ncurses; then + append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + fi + + econf "${myeconfargs[@]}" + + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi + + # force-disable modules we don't want built + local disable_modules=( NIS ) + use gdbm || disable_modules+=( _GDBM _DBM ) + use sqlite || disable_modules+=( _SQLITE3 ) + use ssl || disable_modules+=( _HASHLIB _SSL ) + use ncurses || disable_modules+=( _CURSES _CURSES_PANEL ) + use readline || disable_modules+=( READLINE ) + use tk || disable_modules+=( _TKINTER ) + + local mod + for mod in "${disable_modules[@]}"; do + echo "MODULE_${mod}_STATE=disabled" + done >> Makefile || die + + # install epython.py as part of stdlib + echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + export PYTHONSTRICTEXTENSIONBUILD=1 + + # Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't + # end up writing bytecode & violating sandbox. + # bug #831897 + local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE} + + if use pgo ; then + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + + addpredict "/usr/lib/python${PYVER}/site-packages" + fi + + # also need to clear the flags explicitly here or they end up + # in _sysconfigdata* + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Restore saved value from above. + local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE} + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # this just happens to skip test_support.test_freeze that is broken + # without bundled expat + # TODO: get a proper skip for it upstream + local -x LOGNAME=buildbot + + local test_opts=( + -u-network + -j "$(makeopts_jobs)" + + # fails + -x test_gdb + ) + + if use sparc ; then + # bug #788022 + test_opts+=( + -x test_multiprocessing_fork + -x test_multiprocessing_forkserver + ) + fi + + # workaround docutils breaking tests + cat > Lib/docutils.py <<-EOF || die + raise ImportError("Thou shalt not import!") + EOF + + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + # workaround https://bugs.gentoo.org/775416 + addwrite "/usr/lib/python${PYVER}/site-packages" + + nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local ret=${?} + + rm Lib/docutils.py || die + + [[ ${ret} -eq 0 ]] || die "emake test failed" +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + # the Makefile rules are broken + # https://github.com/python/cpython/issues/100221 + mkdir -p "${libdir}"/lib-dynload || die + + # -j1 hack for now for bug #843458 + emake -j1 DESTDIR="${D}" altinstall + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + rm -r "${libdir}"/ensurepip/_bundled || die + if ! use ensurepip; then + rm -r "${libdir}"/ensurepip || die + fi + if ! use sqlite; then + rm -r "${libdir}/"sqlite3 || die + fi + if ! use tk; then + rm -r "${ED}/usr/bin/idle${PYVER}" || die + rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + fi + + ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$( + printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | + emake --no-print-directory -s -f - 2>/dev/null + ) + newins Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local EPYTHON=python${PYVER} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die + fi +} + +pkg_postinst() { + local v + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 3.11.0_beta4-r2; then + ewarn "Python 3.11.0b4 has changed its module ABI. The .pyc files" + ewarn "installed previously are no longer valid and will be regenerated" + ewarn "(or ignored) on the next import. This may cause sandbox failures" + ewarn "when installing some packages and checksum mismatches when removing" + ewarn "old versions. To actively prevent this, rebuild all packages" + ewarn "installing Python 3.11 modules, e.g. using:" + ewarn + ewarn " emerge -1v /usr/lib/python3.11/site-packages" + fi + done +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1_p3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1_p3.ebuild new file mode 100644 index 0000000000..e79715cc64 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1_p3.ebuild @@ -0,0 +1,521 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic multiprocessing pax-utils +inherit python-utils-r1 toolchain-funcs verify-sig + +MY_PV=${PV/_beta/b} +MY_P="Python-${MY_PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${MY_PV}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE=" + https://www.python.org/ + https://github.com/python/cpython/ +" +SRC_URI=" + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc + ) +" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE=" + bluetooth build debug +ensurepip examples gdbm hardened libedit lto + +ncurses pgo +readline +sqlite +ssl test tk valgrind +" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND=" + app-arch/bzip2:= + app-arch/xz-utils:= + app-crypt/libb2 + >=dev-libs/expat-2.1:= + dev-libs/libffi:= + dev-python/gentoo-common + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + ensurepip? ( dev-python/ensurepip-wheels ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + kernel_linux? ( sys-apps/util-linux:= ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( + !libedit? ( >=sys-libs/readline-4.1:= ) + libedit? ( dev-libs/libedit:= ) + ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + !! /dev/null || die + # We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating + # libdir correctly for cross. + PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \ + ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}" + + # Avoid as many dependencies as possible for the cross build. + cat >> Makefile <<-EOF || die + MODULE_NIS_STATE=disabled + MODULE__DBM_STATE=disabled + MODULE__GDBM_STATE=disabled + MODULE__DBM_STATE=disabled + MODULE__SQLITE3_STATE=disabled + MODULE__HASHLIB_STATE=disabled + MODULE__SSL_STATE=disabled + MODULE__CURSES_STATE=disabled + MODULE__CURSES_PANEL_STATE=disabled + MODULE_READLINE_STATE=disabled + MODULE__TKINTER_STATE=disabled + MODULE_PYEXPAT_STATE=disabled + MODULE_ZLIB_STATE=disabled + EOF + + # Unfortunately, we do have to build this immediately, and + # not in src_compile, because CHOST configure for Python + # will check the existence of the --with-build-python value + # immediately. + PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake + popd &> /dev/null || die + fi + + # pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get + # propagated to sysconfig for built extensions + local -x CFLAGS_NODIST=${CFLAGS} + local -x LDFLAGS_NODIST=${LDFLAGS} + local -x CFLAGS= LDFLAGS= + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + if use ncurses; then + append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + fi + + econf "${myeconfargs[@]}" + + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi + + # force-disable modules we don't want built + local disable_modules=( NIS ) + use gdbm || disable_modules+=( _GDBM _DBM ) + use sqlite || disable_modules+=( _SQLITE3 ) + use ssl || disable_modules+=( _HASHLIB _SSL ) + use ncurses || disable_modules+=( _CURSES _CURSES_PANEL ) + use readline || disable_modules+=( READLINE ) + use tk || disable_modules+=( _TKINTER ) + + local mod + for mod in "${disable_modules[@]}"; do + echo "MODULE_${mod}_STATE=disabled" + done >> Makefile || die + + # install epython.py as part of stdlib + echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + export PYTHONSTRICTEXTENSIONBUILD=1 + + # Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't + # end up writing bytecode & violating sandbox. + # bug #831897 + local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE} + + if use pgo ; then + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + + addpredict "/usr/lib/python${PYVER}/site-packages" + fi + + # also need to clear the flags explicitly here or they end up + # in _sysconfigdata* + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Restore saved value from above. + local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE} + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # this just happens to skip test_support.test_freeze that is broken + # without bundled expat + # TODO: get a proper skip for it upstream + local -x LOGNAME=buildbot + + local test_opts=( + -u-network + -j "$(makeopts_jobs)" + + # fails + -x test_gdb + ) + + if use sparc ; then + # bug #788022 + test_opts+=( + -x test_multiprocessing_fork + -x test_multiprocessing_forkserver + ) + fi + + # workaround docutils breaking tests + cat > Lib/docutils.py <<-EOF || die + raise ImportError("Thou shalt not import!") + EOF + + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + # workaround https://bugs.gentoo.org/775416 + addwrite "/usr/lib/python${PYVER}/site-packages" + + nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local ret=${?} + + rm Lib/docutils.py || die + + [[ ${ret} -eq 0 ]] || die "emake test failed" +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + # the Makefile rules are broken + # https://github.com/python/cpython/issues/100221 + mkdir -p "${libdir}"/lib-dynload || die + + # -j1 hack for now for bug #843458 + emake -j1 DESTDIR="${D}" altinstall + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + rm -r "${libdir}"/ensurepip/_bundled || die + if ! use ensurepip; then + rm -r "${libdir}"/ensurepip || die + fi + if ! use sqlite; then + rm -r "${libdir}/"sqlite3 || die + fi + if ! use tk; then + rm -r "${ED}/usr/bin/idle${PYVER}" || die + rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + fi + + ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$( + printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | + emake --no-print-directory -s -f - 2>/dev/null + ) + newins Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local EPYTHON=python${PYVER} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die + fi +} + +pkg_postinst() { + local v + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 3.11.0_beta4-r2; then + ewarn "Python 3.11.0b4 has changed its module ABI. The .pyc files" + ewarn "installed previously are no longer valid and will be regenerated" + ewarn "(or ignored) on the next import. This may cause sandbox failures" + ewarn "when installing some packages and checksum mismatches when removing" + ewarn "old versions. To actively prevent this, rebuild all packages" + ewarn "installing Python 3.11 modules, e.g. using:" + ewarn + ewarn " emerge -1v /usr/lib/python3.11/site-packages" + fi + done +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1_p4.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1_p4.ebuild new file mode 100644 index 0000000000..e79715cc64 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.0_beta1_p4.ebuild @@ -0,0 +1,521 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic multiprocessing pax-utils +inherit python-utils-r1 toolchain-funcs verify-sig + +MY_PV=${PV/_beta/b} +MY_P="Python-${MY_PV%_p*}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${MY_PV}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE=" + https://www.python.org/ + https://github.com/python/cpython/ +" +SRC_URI=" + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc + ) +" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE=" + bluetooth build debug +ensurepip examples gdbm hardened libedit lto + +ncurses pgo +readline +sqlite +ssl test tk valgrind +" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND=" + app-arch/bzip2:= + app-arch/xz-utils:= + app-crypt/libb2 + >=dev-libs/expat-2.1:= + dev-libs/libffi:= + dev-python/gentoo-common + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + ensurepip? ( dev-python/ensurepip-wheels ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + kernel_linux? ( sys-apps/util-linux:= ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( + !libedit? ( >=sys-libs/readline-4.1:= ) + libedit? ( dev-libs/libedit:= ) + ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + !! /dev/null || die + # We disable _ctypes and _crypt for CBUILD because Python's setup.py can't handle locating + # libdir correctly for cross. + PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" \ + ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}" + + # Avoid as many dependencies as possible for the cross build. + cat >> Makefile <<-EOF || die + MODULE_NIS_STATE=disabled + MODULE__DBM_STATE=disabled + MODULE__GDBM_STATE=disabled + MODULE__DBM_STATE=disabled + MODULE__SQLITE3_STATE=disabled + MODULE__HASHLIB_STATE=disabled + MODULE__SSL_STATE=disabled + MODULE__CURSES_STATE=disabled + MODULE__CURSES_PANEL_STATE=disabled + MODULE_READLINE_STATE=disabled + MODULE__TKINTER_STATE=disabled + MODULE_PYEXPAT_STATE=disabled + MODULE_ZLIB_STATE=disabled + EOF + + # Unfortunately, we do have to build this immediately, and + # not in src_compile, because CHOST configure for Python + # will check the existence of the --with-build-python value + # immediately. + PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _ctypes _crypt" emake + popd &> /dev/null || die + fi + + # pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get + # propagated to sysconfig for built extensions + local -x CFLAGS_NODIST=${CFLAGS} + local -x LDFLAGS_NODIST=${LDFLAGS} + local -x CFLAGS= LDFLAGS= + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + if use ncurses; then + append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + fi + + econf "${myeconfargs[@]}" + + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi + + # force-disable modules we don't want built + local disable_modules=( NIS ) + use gdbm || disable_modules+=( _GDBM _DBM ) + use sqlite || disable_modules+=( _SQLITE3 ) + use ssl || disable_modules+=( _HASHLIB _SSL ) + use ncurses || disable_modules+=( _CURSES _CURSES_PANEL ) + use readline || disable_modules+=( READLINE ) + use tk || disable_modules+=( _TKINTER ) + + local mod + for mod in "${disable_modules[@]}"; do + echo "MODULE_${mod}_STATE=disabled" + done >> Makefile || die + + # install epython.py as part of stdlib + echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + export PYTHONSTRICTEXTENSIONBUILD=1 + + # Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't + # end up writing bytecode & violating sandbox. + # bug #831897 + local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE} + + if use pgo ; then + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + + addpredict "/usr/lib/python${PYVER}/site-packages" + fi + + # also need to clear the flags explicitly here or they end up + # in _sysconfigdata* + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Restore saved value from above. + local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE} + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # this just happens to skip test_support.test_freeze that is broken + # without bundled expat + # TODO: get a proper skip for it upstream + local -x LOGNAME=buildbot + + local test_opts=( + -u-network + -j "$(makeopts_jobs)" + + # fails + -x test_gdb + ) + + if use sparc ; then + # bug #788022 + test_opts+=( + -x test_multiprocessing_fork + -x test_multiprocessing_forkserver + ) + fi + + # workaround docutils breaking tests + cat > Lib/docutils.py <<-EOF || die + raise ImportError("Thou shalt not import!") + EOF + + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + # workaround https://bugs.gentoo.org/775416 + addwrite "/usr/lib/python${PYVER}/site-packages" + + nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local ret=${?} + + rm Lib/docutils.py || die + + [[ ${ret} -eq 0 ]] || die "emake test failed" +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + # the Makefile rules are broken + # https://github.com/python/cpython/issues/100221 + mkdir -p "${libdir}"/lib-dynload || die + + # -j1 hack for now for bug #843458 + emake -j1 DESTDIR="${D}" altinstall + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + rm -r "${libdir}"/ensurepip/_bundled || die + if ! use ensurepip; then + rm -r "${libdir}"/ensurepip || die + fi + if ! use sqlite; then + rm -r "${libdir}/"sqlite3 || die + fi + if ! use tk; then + rm -r "${ED}/usr/bin/idle${PYVER}" || die + rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + fi + + ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$( + printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | + emake --no-print-directory -s -f - 2>/dev/null + ) + newins Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local EPYTHON=python${PYVER} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die + fi +} + +pkg_postinst() { + local v + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 3.11.0_beta4-r2; then + ewarn "Python 3.11.0b4 has changed its module ABI. The .pyc files" + ewarn "installed previously are no longer valid and will be regenerated" + ewarn "(or ignored) on the next import. This may cause sandbox failures" + ewarn "when installing some packages and checksum mismatches when removing" + ewarn "old versions. To actively prevent this, rebuild all packages" + ewarn "installing Python 3.11 modules, e.g. using:" + ewarn + ewarn " emerge -1v /usr/lib/python3.11/site-packages" + fi + done +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16_p4.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16_p4.ebuild index 9c310fbeef..67ca3cbba4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16_p4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.16_p4.ebuild @@ -30,7 +30,7 @@ LICENSE="PSF-2" SLOT="${PYVER}" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE=" - bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo + bluetooth build debug +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk valgrind wininst +xml " RESTRICT="!test? ( test )" @@ -182,6 +182,7 @@ src_configure() { --with-system-ffi --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip + $(use_with debug assertions) $(use_with valgrind) ) diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.16_p3-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.16_p3-r1.ebuild index d40463a1e9..e9ff013485 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.16_p3-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.16_p3-r1.ebuild @@ -30,7 +30,7 @@ LICENSE="PSF-2" SLOT="${PYVER}" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE=" - bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo + bluetooth build debug +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk valgrind +xml " RESTRICT="!test? ( test )" @@ -221,6 +221,7 @@ src_configure() { --with-system-ffi --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip + $(use_with debug assertions) $(use_with lto) $(use_enable pgo optimizations) $(use_with valgrind) From 2df6aae86c8f1bb5b14fbfcbf191f6b69513fa97 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:06 +0000 Subject: [PATCH 046/202] dev-lang/python-exec: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../dev-lang/python-exec/python-exec-2.4.10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.10.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.10.ebuild index 21f2aeba17..05556b1b0d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.10.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.10.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/projg2/python-exec/releases/download/v${PV}/${P}.tar LICENSE="BSD-2" SLOT="2" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # Internal Python project hack. Do not copy it. Ever. IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks test" RESTRICT="!test? ( test )" From 9fe307e064bf83f223eb3207b7c608e6315bdd01 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:06 +0000 Subject: [PATCH 047/202] dev-lang/python-exec-conf: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild index a4d93c6c8e..c0d8f90fe6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P} LICENSE="BSD-2" SLOT="2" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # Internal Python project hack. Do not copy it. Ever. IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}" From 29876e9350d3f8bc435b38858981b4c6a99fc064 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:06 +0000 Subject: [PATCH 048/202] dev-lang/yasm: Sync with Gentoo It's from Gentoo commit bd7cb186c573e4c26d83a4fd62b06e201182c847. --- .../portage-stable/dev-lang/yasm/yasm-1.3.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/yasm/yasm-1.3.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/yasm/yasm-1.3.0-r1.ebuild index 1b5a01d49a..c26af826ff 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/yasm/yasm-1.3.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/yasm/yasm-1.3.0-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]] ; then inherit autotools git-r3 else SRC_URI="https://www.tortall.net/projects/yasm/releases/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris" + KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="An assembler for x86 and x86_64 instruction sets" From 32ff47fc30fe0079c4daa8700112a32abbebc4e6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:06 +0000 Subject: [PATCH 049/202] dev-libs/boost: Sync with Gentoo It's from Gentoo commit 0bbf8e29e646a191e618744d06d0baf0f7ce65ad. --- .../portage-stable/dev-libs/boost/boost-1.81.0-r1.ebuild | 2 +- .../portage-stable/dev-libs/boost/boost-1.82.0-r1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0-r1.ebuild index a2dedb8128..4df537727e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}_${MY_PV}" LICENSE="Boost-1.0" SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # the tests will never fail because these are not intended as sanity diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.82.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.82.0-r1.ebuild index f257063c37..f574a4282e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.82.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.82.0-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}_${MY_PV}" LICENSE="Boost-1.0" SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # the tests will never fail because these are not intended as sanity From b806fef0c30b9c322069378678ea273b159daf1f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:08 +0000 Subject: [PATCH 050/202] dev-libs/cyrus-sasl: Sync with Gentoo It's from Gentoo commit 4510a3a7669d750fb405c71c18609ee91f076678. --- .../dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild | 2 +- .../dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild | 2 +- .../dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild index c5eec79523..38733ce427 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild @@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VE LICENSE="BSD-with-attribution" SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom" REQUIRED_USE="ldapdb? ( openldap )" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild index 9bf5fc8ef2..2c1eac083d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild @@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VE LICENSE="BSD-with-attribution" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom" REQUIRED_USE="ldapdb? ( openldap )" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild index 380e23c0d6..14ebb51209 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r4.ebuild @@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VE LICENSE="BSD-with-attribution" SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom" REQUIRED_USE="ldapdb? ( openldap )" From 10f7435da81bd377bfb18b06b9d75e098236e278 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:08 +0000 Subject: [PATCH 051/202] dev-libs/expat: Sync with Gentoo It's from Gentoo commit 932f1e8726ce40f5575371c44e539b81624badfd. --- .../portage-stable/dev-libs/expat/expat-2.5.0.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.5.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.5.0.ebuild index e61f58536b..16e5df5118 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.5.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.5.0.ebuild @@ -12,8 +12,9 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex LICENSE="MIT" SLOT="0" -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 ~x86-winnt" -IUSE="examples static-libs unicode" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="examples static-libs test unicode" +RESTRICT="!test? ( test )" BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" DOCS=( README.md ) @@ -37,7 +38,7 @@ src_prepare() { } multilib_src_configure() { - local myconf="$(use_enable static-libs static) --without-docbook" + local myconf="$(use_with test tests) $(use_enable static-libs static) --without-docbook" mkdir -p "${BUILD_DIR}"w || die From f9b1fe51ccc65c8628de3dbcc3ff543563d8c059 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:08 +0000 Subject: [PATCH 052/202] dev-libs/glib: Sync with Gentoo It's from Gentoo commit 1787a52a4bd03f2bb4c5c0d3f6a006d96a84be30. --- .../portage-stable/dev-libs/glib/Manifest | 1 + .../dev-libs/glib/glib-2.76.2.ebuild | 4 +- .../dev-libs/glib/glib-2.76.3.ebuild | 312 ++++++++++++++++++ 3 files changed, 315 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest index 37d2aa1b2b..8ad462b9a2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest @@ -1 +1,2 @@ DIST glib-2.76.2.tar.xz 5273836 BLAKE2B db5d5e45fe4a17bade7f5bf923ac0e5541237d19146ede33b4d52f05b82e4ecb94519393f49ac3b04e17d0f56bfd5dd99b8e81ae80956cfdb5cb2396cd5ec8cc SHA512 5a99723d72ae987999bdf3eac4f3cabe2e014616038f2006e84060b97d6d290b7d44a20d700e9c0f4572a6defed56169f624bcd21b0337f32832b311aa2737e6 +DIST glib-2.76.3.tar.xz 5273460 BLAKE2B 894635281d1a3eb60d274b8db91cd59069b6d0abe61295175c794ad44e8669d869009fac44c7d6f416a93adcea5b9aeb90b944047d013fa1f2d9b1a8ded3de1e SHA512 291b8913918d411b679442b888f56893a857a77decfe428086c8bd1da1949498938ddb0bf254ed99d192e4a09b5e8cee1905fd6932ee642463fb229cac7c226e diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.2.ebuild index ce0eb4b286..2741ab50f0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.2.ebuild @@ -16,7 +16,7 @@ IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test u RESTRICT="!test? ( test )" REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # * elfutils (via libelf) does not build on Windows. gresources are not embedded # within ELF binaries on that platform anyway and inspecting ELF binaries from @@ -153,7 +153,7 @@ src_prepare() { fi # disable native macOS integrations - sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).)/s/true/false/' \ + sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \ meson.build || die sed -i \ -e '/AvailabilityMacros.h/d' \ diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.3.ebuild new file mode 100644 index 0000000000..d25af8f101 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.3.ebuild @@ -0,0 +1,312 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{9..12} ) + +inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2.1+" +SLOT="2" +IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr" +RESTRICT="!test? ( test )" +REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +# * elfutils (via libelf) does not build on Windows. gresources are not embedded +# within ELF binaries on that platform anyway and inspecting ELF binaries from +# other platforms is not that useful so exclude the dependency in this case. +# * Technically static-libs is needed on zlib, util-linux and perhaps more, but +# these are used by GIO, which glib[static-libs] consumers don't really seem +# to need at all, thus not imposing the deps for now and once some consumers +# are actually found to static link libgio-2.0.a, we can revisit and either add +# them or just put the (build) deps in that rare consumer instead of recursive +# RDEPEND here (due to lack of recursive DEPEND). +RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) + elf? ( virtual/libelf:0= ) + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# libxml2 used for optional tests that get automatically skipped +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + gtk-doc? ( >=dev-util/gtk-doc-1.33 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 ) + systemtap? ( >=dev-util/systemtap-1.3 ) + ${PYTHON_DEPS} + test? ( >=sys-apps/dbus-1.2.14 ) + virtual/pkgconfig +" +# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen + +PDEPEND=" + dbus? ( gnome-base/dconf ) + mime? ( x11-misc/shared-mime-info ) +" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# dconf is needed to be able to save settings, bug #498436 + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gio-querymodules$(get_exeext) +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch +) + +pkg_setup() { + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + if use test ; then + CONFIG_CHECK="~IPV6" + WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." + fi + linux-info_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + if use test; then + # TODO: Review the test exclusions, especially now with meson + # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 + if ! has_version dev-util/desktop-file-utils ; then + ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," + ewarn "think on installing it to get these tests run." + sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die + sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die + fi + + # gdesktopappinfo requires existing terminal (gnome-terminal or any + # other), falling back to xterm if one doesn't exist + #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then + # ewarn "Some tests will be skipped due to missing terminal program" + # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready + # for backport (or in a bump) and file new issue if still fails + sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die + # desktop-app-info/launch* might fail similarly + sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die + #fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=722604 + sed -i -e "/timer\/stop/d" glib/tests/timer.c || die + sed -i -e "/timer\/basic/d" glib/tests/timer.c || die + + ewarn "Tests for search-utils have been skipped" + sed -i -e "/search-utils/d" glib/tests/meson.build || die + + # Play nice with network-sandbox, but this approach would defeat the purpose of the test + #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die + else + # Don't build tests, also prevents extra deps, bug #512022 + sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die + fi + + # Don't build fuzzing binaries - not used + sed -i -e '/subdir.*fuzzing/d' meson.build || die + + # gdbus-codegen is a separate package + sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die + + # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon + sed -i -e '/install_dir/d' gio/tests/meson.build || die + + cat > "${T}/glib-test-ld-wrapper" <<-EOF + #!/usr/bin/env sh + exec \${LD:-ld} "\$@" + EOF + chmod a+x "${T}/glib-test-ld-wrapper" || die + sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die + + # make default sane for us + if use prefix ; then + sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die + # bug #308609, without path, bug #314057 + export PERL=perl + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + # fix standards conflicts + sed -i \ + -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \ + -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \ + meson.build || die + sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ + glib/giounix.c || die + fi + + # disable native macOS integrations + sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \ + meson.build || die + sed -i \ + -e '/AvailabilityMacros.h/d' \ + gio/giomodule.c || die + + default + gnome2_environment_reset + # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only +} + +multilib_src_configure() { + # TODO: figure a way to pass appropriate values for all cross properties + # that glib uses (search for get_cross_property) + #if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + # TODO-meson: This should be in meson cross file as 'growing_stack' + # property; and more, look at get_cross_property + #case ${CHOST} in + #hppa*|metag*) export glib_cv_stack_grows=yes ;; + #*) export glib_cv_stack_grows=no ;; + #esac + #fi + + local emesonargs=( + --buildtype $(usex debug debug plain) + -Ddefault_library=$(usex static-libs both shared) + -Druntime_dir="${EPREFIX}"/run + $(meson_feature selinux) + $(meson_use xattr) + -Dlibmount=enabled # only used if host_system == 'linux' + -Dman=true + $(meson_use systemtap dtrace) + $(meson_use systemtap) + $(meson_feature sysprof) + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_use test tests) + -Dinstalled_tests=false + -Dnls=enabled + -Doss_fuzz=disabled + $(meson_native_use_feature elf libelf) + -Dmultiarch=false + ) + meson_src_configure +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + export TZ=UTC + unset GSETTINGS_BACKEND # bug #596380 + python_setup + + # https://bugs.gentoo.org/839807 + local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} + addpredict /usr/b + + # Related test is a bit nitpicking + mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + + meson_src_test --timeout-multiplier 2 --no-suite flaky +} + +multilib_src_install() { + meson_src_install + keepdir /usr/$(get_libdir)/gio/modules +} + +multilib_src_install_all() { + # These are installed by dev-util/glib-utils + # TODO: With patching we might be able to get rid of the python-any deps + # and removals, and test depend on glib-utils instead; revisit now with + # meson + rm "${ED}/usr/bin/glib-genmarshal" || die + rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die + rm "${ED}/usr/bin/glib-mkenums" || die + rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die + rm "${ED}/usr/bin/gtester-report" || die + rm "${ED}/usr/share/man/man1/gtester-report.1" || die + # gdbus-codegen manpage installed by dev-util/gdbus-codegen + rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die +} + +pkg_preinst() { + xdg_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"${cache} || die + else + touch "${ED}"${cache} || die + fi + } + + # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache + # file due to inability to create it and GIO might not look at any of the modules there + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_preinst + fi +} + +pkg_postinst() { + xdg_pkg_postinst + # glib installs no schemas itself, but we force update for fresh install in case + # something has dropped in a schemas file without direct glib dep; and for upgrades + # in case the compiled schema format could have changed + gnome2_schemas_update + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_postinst + else + ewarn "Updating of GIO modules cache skipped due to cross-compilation." + ewarn "You might want to run gio-querymodules manually on the target for" + ewarn "your final image for performance reasons and re-run it when packages" + ewarn "installing GIO modules get upgraded or added to the image." + fi + + for v in ${REPLACING_VERSIONS}; do + if ver_test "$v" "-lt" "2.63.6"; then + ewarn "glib no longer installs the gio-launch-desktop binary. You may need" + ewarn "to restart your session for \"Open With\" dialogs to work." + fi + done +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled + fi +} From 194a149d11cc0b6e9c00b60b864a8dc99f4f4196 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:08 +0000 Subject: [PATCH 053/202] dev-libs/gmp: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../third_party/portage-stable/dev-libs/gmp/gmp-6.2.1-r2.ebuild | 2 +- .../third_party/portage-stable/dev-libs/gmp/gmp-6.2.1-r5.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gmp/gmp-6.2.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gmp/gmp-6.2.1-r2.ebuild index f2cf7e98c6..7f25f4bab2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gmp/gmp-6.2.1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gmp/gmp-6.2.1-r2.ebuild @@ -23,7 +23,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-arm64-da LICENSE="|| ( LGPL-3+ GPL-2+ )" # The subslot reflects the C & C++ SONAMEs. SLOT="0/10.4" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+asm doc +cxx pic static-libs" BDEPEND="sys-devel/m4 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gmp/gmp-6.2.1-r5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gmp/gmp-6.2.1-r5.ebuild index 5854254998..288f625d45 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gmp/gmp-6.2.1-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gmp/gmp-6.2.1-r5.ebuild @@ -27,7 +27,7 @@ S="${WORKDIR}"/${MY_P%a} LICENSE="|| ( LGPL-3+ GPL-2+ )" # The subslot reflects the C & C++ SONAMEs. SLOT="0/10.4" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+asm doc +cpudetection +cxx pic static-libs" REQUIRED_USE="cpudetection? ( asm )" RESTRICT="!cpudetection? ( bindist )" From c471d2f68aa3e9f5a043ebe510080fe4e34184ac Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:08 +0000 Subject: [PATCH 054/202] dev-libs/gobject-introspection: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../gobject-introspection/gobject-introspection-1.76.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild index 84522f911b..256ebb39ff 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild @@ -15,7 +15,7 @@ SLOT="0" IUSE="doctool gtk-doc test" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" # virtual/pkgconfig needed at runtime, bug #505408 RDEPEND=" From c0b13b056d4ccb29337328a0edf333b64fce4251 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:09 +0000 Subject: [PATCH 055/202] dev-libs/gobject-introspection-common: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../gobject-introspection-common-1.76.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.1.ebuild index b4664c03a3..c2a490838f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.76.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection" LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" # Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like: From eda027df97286ab30cc5c197a2773258c3b7f723 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:11 +0000 Subject: [PATCH 056/202] dev-libs/jsoncpp: Sync with Gentoo It's from Gentoo commit 169da669aef3d7a8c5250d760313f6ab1cfcb61d. --- .../portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild index 19e07ba204..ba865aa3d9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="|| ( public-domain MIT )" SLOT="0/25" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-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 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" RESTRICT="!test? ( test )" From 4b8ee786cc80f51db19248b1bfd7ff48c0a4c476 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:13 +0000 Subject: [PATCH 057/202] dev-libs/libassuan: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/dev-libs/libassuan/libassuan-2.5.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.5.ebuild index f428bc5943..6129e90c24 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="GPL-3 LGPL-2.1" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # Note: On each bump, update dep bounds on each version from configure.ac! # We need >= 1.28 for gpgrt_malloc From a5aaa08deac0d23dfd88f83e7d7ed65027ce1f0e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:13 +0000 Subject: [PATCH 058/202] dev-libs/libgcrypt: Sync with Gentoo It's from Gentoo commit 1743ef2aaf6f9b7818eb94daea8ea3e2a8703ecd. --- .../dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild | 4 +--- .../dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild | 4 +--- .../portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild | 4 +--- .../dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild index fdaaf606e1..7892cef502 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="LGPL-2.1 MIT" SLOT="0/20" # subslot = soname major version -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy static-libs" # Build system only has --disable-arm-crypto-support right now @@ -135,8 +135,6 @@ multilib_src_configure() { # http://trac.videolan.org/vlc/ticket/620 $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") - # causes bus-errors on sparc64-solaris - $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") $(use asm || echo "--disable-asm") diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild index 617627a993..f8f07b438b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="LGPL-2.1 MIT" SLOT="0/20" # subslot = soname major version -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy static-libs" # Build system only has --disable-arm-crypto-support right now @@ -138,8 +138,6 @@ multilib_src_configure() { # http://trac.videolan.org/vlc/ticket/620 $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") - # causes bus-errors on sparc64-solaris - $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") $(use asm || echo "--disable-asm") diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild index fa948f3360..c9e12df8e4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="LGPL-2.1 MIT" SLOT="0/20" # subslot = soname major version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +getentropy static-libs" # Build system only has --disable-arm-crypto-support right now @@ -136,8 +136,6 @@ multilib_src_configure() { # http://trac.videolan.org/vlc/ticket/620 $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") - # causes bus-errors on sparc64-solaris - $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") $(use asm || echo "--disable-asm") diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild index cd55a6e154..fcff947f59 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="LGPL-2.1 MIT" SLOT="0/20" # subslot = soname major version -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc static-libs" # Build system only has --disable-arm-crypto-support right now @@ -108,8 +108,6 @@ multilib_src_configure() { # http://trac.videolan.org/vlc/ticket/620 $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") - # causes bus-errors on sparc64-solaris - $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") $(use asm || echo "--disable-asm") From 0cd24f05875cbdf61ee8195e6532558fe55ff2d7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:13 +0000 Subject: [PATCH 059/202] dev-libs/libgpg-error: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild | 2 +- .../dev-libs/libgpg-error/libgpg-error-1.47.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild index ca248e9c46..c11f5aecd2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild @@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="common-lisp nls static-libs test" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.47.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.47.ebuild index 4ab32fea59..0589c7f573 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.47.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.47.ebuild @@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="common-lisp nls static-libs test" RESTRICT="!test? ( test )" From 4dd4cf3d45bd8889513b559b9e9805156ea90038 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:13 +0000 Subject: [PATCH 060/202] dev-libs/libksba: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/dev-libs/libksba/libksba-1.6.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.3.ebuild index 33fc27fe44..b25b3542e3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.3.ebuild @@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="LGPL-3+ GPL-2+ 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 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs" RDEPEND=">=dev-libs/libgpg-error-1.8" From 71604c48cde9fe78d17eddfa1f7722973d5f0bd8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:14 +0000 Subject: [PATCH 061/202] dev-libs/libltdl: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild | 2 +- .../portage-stable/dev-libs/libltdl/libltdl-2.4.7.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild index 2245f18823..9aa655f9c7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}/libltdl LICENSE="GPL-2" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs" # libltdl doesn't have a testsuite. diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7.ebuild index 13cd6bb9be..1569cce642 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}/libltdl LICENSE="GPL-2" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs" # libltdl doesn't have a testsuite. From d8d10af3109740b416eca89d5892d3068bbc27de Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:15 +0000 Subject: [PATCH 062/202] dev-libs/libpcre: Sync with Gentoo It's from Gentoo commit b76b6d3eeb85be1dbc96c1a7b0c638a2766789d6. --- .../portage-stable/dev-libs/libpcre/libpcre-8.45-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r1.ebuild index 4c1bdd5438..aacb5dc0ed 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r1.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="3" -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 ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline static-libs unicode valgrind zlib" REQUIRED_USE=" readline? ( !libedit ) From 8d1c50a1a7b76762e62535ee0e78154bf4d546d0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:15 +0000 Subject: [PATCH 063/202] dev-libs/libpcre2: Sync with Gentoo It's from Gentoo commit 4510a3a7669d750fb405c71c18609ee91f076678. --- .../portage-stable/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild | 2 +- .../portage-stable/dev-libs/libpcre2/libpcre2-10.42-r1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild index 288e14a00e..94fdd19aea 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0/3" # libpcre2-posix.so version -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib" REQUIRED_USE="?? ( libedit readline )" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.42-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.42-r1.ebuild index 56e994b8bf..fc65460801 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.42-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.42-r1.ebuild @@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0/3" # libpcre2-posix.so version -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode valgrind zlib" REQUIRED_USE="?? ( libedit readline )" From b357299c802662a1b166c828015dde3f87cfe381 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:15 +0000 Subject: [PATCH 064/202] dev-libs/libpipeline: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../dev-libs/libpipeline/libpipeline-1.5.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/libpipeline-1.5.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/libpipeline-1.5.7.ebuild index fece13fae0..1379eb5d9c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/libpipeline-1.5.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpipeline/libpipeline-1.5.7.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" From 63fa179eaac40ecadf90484f822af980964f2c88 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:15 +0000 Subject: [PATCH 065/202] dev-libs/libtasn1: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/dev-libs/libtasn1/libtasn1-4.19.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libtasn1/libtasn1-4.19.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libtasn1/libtasn1-4.19.0.ebuild index 42c60f24b3..cfdda73020 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libtasn1/libtasn1-4.19.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libtasn1/libtasn1-4.19.0.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )" LICENSE="LGPL-2.1+" SLOT="0/6" # subslot = libtasn1 soname version -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs test" RESTRICT="!test? ( test )" From d52b20f8da8ea9d5455e5c0c18220451152ffe89 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:18 +0000 Subject: [PATCH 066/202] dev-libs/libuv: Sync with Gentoo It's from Gentoo commit a757b0f81078a0cffee95e3543f1053dbdf9f7bc. --- .../portage-stable/dev-libs/libuv/Manifest | 1 + .../dev-libs/libuv/libuv-1.44.2-r1.ebuild | 2 +- .../dev-libs/libuv/libuv-1.45.0.ebuild | 53 +++++++++++++++++++ .../dev-libs/libuv/libuv-9999.ebuild | 2 +- 4 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.45.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/Manifest index 6103274ae2..9d513e6f3b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/Manifest @@ -1 +1,2 @@ DIST libuv-1.44.2.tar.gz 1309062 BLAKE2B 883a1fbffcd8f55bf28ea5a79ed18aa3e2f2fac126285e8aca2ef9370eafc62f69f95ddb8bf27d4159e038bfb0a01abafdf0dadbc4309e5d31f0e77057ee84ac SHA512 d21c890787b0b364fafa5fc0cbbff296bc2ca269e1991d2f7f35fcb37b8634da377466f5af5a4245425fcf876ae6870d100ab32b12bce64f8e0b01fd25a1bc83 +DIST libuv-1.45.0.tar.gz 1307245 BLAKE2B fcd9aad052cf641e5e974b1e3c47bef7968474f4b0e38363559719a164867ce6e67630c1d0fd0386da22ba5b82e35c6ca946b7509a8a08f08f972388e70a40b9 SHA512 a156dd0ed06bc7c50515f46ef6e5636d870288636f442ce9ec46716e22fdaa664ce49e432f4737c81e9c6013b34ed150e7420ab9fc316ed23281096954359774 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild index a994456d83..e775047794 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="BSD BSD-2 ISC MIT" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.45.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.45.0.ebuild new file mode 100644 index 0000000000..0028ef084a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.45.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Cross-platform asychronous I/O" +HOMEPAGE="https://github.com/libuv/libuv" + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/libuv/libuv.git" + inherit git-r3 +else + SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="BSD BSD-2 ISC MIT" +SLOT="0/1" + +BDEPEND=" + sys-devel/libtool + virtual/pkgconfig +" + +src_prepare() { + default + + echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ + > m4/libuv-extra-automake-flags.m4 || die + + if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then + eapply "${FILESDIR}"/${PN}-1.41.0-darwin.patch + fi + + # Upstream fails to ship a configure script + eautoreconf +} + +src_configure() { + local myeconfargs=( + cc_cv_cflags__g=no + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild index 0898d659c8..771fe56d3e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="BSD BSD-2 ISC MIT" From df1c221c266896bddb77fcc2eb0939b7b898adfb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:18 +0000 Subject: [PATCH 067/202] dev-libs/libxml2: Sync with Gentoo It's from Gentoo commit 1c077c1f373119e25e4522d7952e34283e3b5be2. --- .../files/libxml2-2.11.2-0001-iconv.patch | 63 ----- ...ibxml2-2.11.2-0002-crash-old-libxslt.patch | 27 -- .../files/libxml2-2.11.2-0003-no-xpath.patch | 245 ------------------ .../files/libxml2-2.11.2-0004-huge-push.patch | 27 -- .../libxml2-2.11.2-0005-icu-detection.patch | 21 -- .../dev-libs/libxml2/libxml2-2.10.4.ebuild | 4 +- .../dev-libs/libxml2/libxml2-2.11.4.ebuild | 13 +- .../dev-libs/libxml2/libxml2-9999.ebuild | 7 +- 8 files changed, 16 insertions(+), 391 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0001-iconv.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0002-crash-old-libxslt.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0003-no-xpath.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0004-huge-push.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0005-icu-detection.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0001-iconv.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0001-iconv.patch deleted file mode 100644 index 615f413c44..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0001-iconv.patch +++ /dev/null @@ -1,63 +0,0 @@ -https://gitlab.gnome.org/GNOME/libxml2/-/commit/9c1f5fe7fbad2b57149c628802c4ded3e4f3d284 - -From 9c1f5fe7fbad2b57149c628802c4ded3e4f3d284 Mon Sep 17 00:00:00 2001 -From: Mike Dalessio -Date: Fri, 5 May 2023 17:34:57 -0400 -Subject: [PATCH] autoconf: fix iconv library paths - -and pass cflags when building executables - -See 0f77167f for prior related work ---- a/Makefile.am -+++ b/Makefile.am -@@ -145,11 +145,12 @@ runsuite_DEPENDENCIES = $(DEPS) - runsuite_LDADD= $(LDADDS) - - xmllint_SOURCES=xmllint.c --xmllint_CFLAGS = $(AM_CFLAGS) $(RDL_CFLAGS) -+xmllint_CFLAGS = $(AM_CFLAGS) $(RDL_CFLAGS) $(ICONV_CFLAGS) - xmllint_DEPENDENCIES = $(DEPS) - xmllint_LDADD= $(RDL_LIBS) $(LDADDS) - - xmlcatalog_SOURCES=xmlcatalog.c -+xmlcatalog_CFLAGS = $(AM_CFLAGS) $(RDL_CFLAGS) $(ICONV_CFLAGS) - xmlcatalog_DEPENDENCIES = $(DEPS) - xmlcatalog_LDADD = $(RDL_LIBS) $(LDADDS) - ---- a/configure.ac -+++ b/configure.ac -@@ -1036,7 +1036,7 @@ else - if test "$with_iconv" != "yes" && test "$with_iconv" != "" ; then - ICONV_DIR=$with_iconv - CPPFLAGS="$CPPFLAGS -I$ICONV_DIR/include" -- LIBS="$LIBS -L$ICONV_DIR/libs" -+ LIBS="$LIBS -L$ICONV_DIR/lib" - # Export this since our headers include iconv.h - XML_INCLUDEDIR="$XML_INCLUDEDIR -I$ICONV_DIR/include" - fi -@@ -1052,12 +1052,13 @@ else - ICONV_LIBS="-liconv"])])]) - if test "$WITH_ICONV" = "1" && test "$ICONV_DIR" != ""; then - ICONV_CFLAGS="-I$ICONV_DIR/include" -- ICONV_LIBS="-L$ICONV_DIR/libs $ICONV_LIBS" -+ ICONV_LIBS="-L$ICONV_DIR/lib $ICONV_LIBS" - fi - CPPFLAGS=$_cppflags - LIBS=$_libs - fi - AC_SUBST(WITH_ICONV) -+AC_SUBST(ICONV_CFLAGS) - - dnl - dnl Checks for ICU library. -@@ -1100,7 +1101,7 @@ else - ICU_LIBS=-licucore - if test "$ICU_DIR" != ""; then - ICU_CFLAGS="-I$ICU_DIR/include" -- ICU_LIBS="-L$ICU_DIR/libs $ICU_LIBS" -+ ICU_LIBS="-L$ICU_DIR/lib $ICU_LIBS" - fi])]) - CPPFLAGS=$_cppflags - LIBS=$_libs --- -GitLab diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0002-crash-old-libxslt.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0002-crash-old-libxslt.patch deleted file mode 100644 index 2253ea6211..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0002-crash-old-libxslt.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://gitlab.gnome.org/GNOME/libxml2/-/commit/e6a9cc8d66778c20435a46e50d4e5866deace5f6 - -From e6a9cc8d66778c20435a46e50d4e5866deace5f6 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Sat, 6 May 2023 15:28:13 +0200 -Subject: [PATCH] hash: Fix possible startup crash with old libxslt versions - -Call xmlInitParser in xmlHashCreate to make it work if the library -wasn't initialized yet. - -Otherwise, exsltRegisterAll from libxslt 1.1.24 or older might cause -a crash. - -See #534. ---- a/hash.c -+++ b/hash.c -@@ -180,6 +180,8 @@ xmlHashTablePtr - xmlHashCreate(int size) { - xmlHashTablePtr table; - -+ xmlInitParser(); -+ - if (size <= 0) - size = 256; - --- -GitLab diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0003-no-xpath.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0003-no-xpath.patch deleted file mode 100644 index f036c5814f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0003-no-xpath.patch +++ /dev/null @@ -1,245 +0,0 @@ -https://gitlab.gnome.org/GNOME/libxml2/-/commit/41e78f8f8656b8e2206c06995da6bd8dcc82823d - -From 41e78f8f8656b8e2206c06995da6bd8dcc82823d Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Mon, 8 May 2023 23:12:33 +0200 -Subject: [PATCH] xpath: Fix build without LIBXML_XPATH_ENABLED - -Move static function declaration into XPATH block. Also move comparison -functions. - -Fixes #537. ---- a/xpath.c -+++ b/xpath.c -@@ -145,6 +145,114 @@ - * any use of the macros IS_ASCII_CHARACTER and IS_ASCII_DIGIT) - */ - -+#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) -+ -+/************************************************************************ -+ * * -+ * Floating point stuff * -+ * * -+ ************************************************************************/ -+ -+double xmlXPathNAN = 0.0; -+double xmlXPathPINF = 0.0; -+double xmlXPathNINF = 0.0; -+ -+/** -+ * xmlXPathInit: -+ * -+ * DEPRECATED: Alias for xmlInitParser. -+ */ -+void -+xmlXPathInit(void) { -+ xmlInitParser(); -+} -+ -+/** -+ * xmlInitXPathInternal: -+ * -+ * Initialize the XPath environment -+ */ -+ATTRIBUTE_NO_SANITIZE("float-divide-by-zero") -+void -+xmlInitXPathInternal(void) { -+#if defined(NAN) && defined(INFINITY) -+ xmlXPathNAN = NAN; -+ xmlXPathPINF = INFINITY; -+ xmlXPathNINF = -INFINITY; -+#else -+ /* MSVC doesn't allow division by zero in constant expressions. */ -+ double zero = 0.0; -+ xmlXPathNAN = 0.0 / zero; -+ xmlXPathPINF = 1.0 / zero; -+ xmlXPathNINF = -xmlXPathPINF; -+#endif -+} -+ -+/** -+ * xmlXPathIsNaN: -+ * @val: a double value -+ * -+ * Returns 1 if the value is a NaN, 0 otherwise -+ */ -+int -+xmlXPathIsNaN(double val) { -+#ifdef isnan -+ return isnan(val); -+#else -+ return !(val == val); -+#endif -+} -+ -+/** -+ * xmlXPathIsInf: -+ * @val: a double value -+ * -+ * Returns 1 if the value is +Infinite, -1 if -Infinite, 0 otherwise -+ */ -+int -+xmlXPathIsInf(double val) { -+#ifdef isinf -+ return isinf(val) ? (val > 0 ? 1 : -1) : 0; -+#else -+ if (val >= xmlXPathPINF) -+ return 1; -+ if (val <= -xmlXPathPINF) -+ return -1; -+ return 0; -+#endif -+} -+ -+#endif /* SCHEMAS or XPATH */ -+ -+#ifdef LIBXML_XPATH_ENABLED -+ -+/* -+ * TODO: when compatibility allows remove all "fake node libxslt" strings -+ * the test should just be name[0] = ' ' -+ */ -+#ifdef DEBUG_XPATH_EXPRESSION -+#define DEBUG_STEP -+#define DEBUG_EXPR -+#define DEBUG_EVAL_COUNTS -+#endif -+ -+static xmlNs xmlXPathXMLNamespaceStruct = { -+ NULL, -+ XML_NAMESPACE_DECL, -+ XML_XML_NAMESPACE, -+ BAD_CAST "xml", -+ NULL, -+ NULL -+}; -+static xmlNsPtr xmlXPathXMLNamespace = &xmlXPathXMLNamespaceStruct; -+#ifndef LIBXML_THREAD_ENABLED -+/* -+ * Optimizer is disabled only when threaded apps are detected while -+ * the library ain't compiled for thread safety. -+ */ -+static int xmlXPathDisableOptimizer = 0; -+#endif -+ - static void - xmlXPathNodeSetClear(xmlNodeSetPtr set, int hasNsNodes); - -@@ -475,114 +583,6 @@ int wrap_cmp( xmlNodePtr x, xmlNodePtr y ); - #include "timsort.h" - #endif /* WITH_TIM_SORT */ - --#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) -- --/************************************************************************ -- * * -- * Floating point stuff * -- * * -- ************************************************************************/ -- --double xmlXPathNAN = 0.0; --double xmlXPathPINF = 0.0; --double xmlXPathNINF = 0.0; -- --/** -- * xmlXPathInit: -- * -- * DEPRECATED: Alias for xmlInitParser. -- */ --void --xmlXPathInit(void) { -- xmlInitParser(); --} -- --/** -- * xmlInitXPathInternal: -- * -- * Initialize the XPath environment -- */ --ATTRIBUTE_NO_SANITIZE("float-divide-by-zero") --void --xmlInitXPathInternal(void) { --#if defined(NAN) && defined(INFINITY) -- xmlXPathNAN = NAN; -- xmlXPathPINF = INFINITY; -- xmlXPathNINF = -INFINITY; --#else -- /* MSVC doesn't allow division by zero in constant expressions. */ -- double zero = 0.0; -- xmlXPathNAN = 0.0 / zero; -- xmlXPathPINF = 1.0 / zero; -- xmlXPathNINF = -xmlXPathPINF; --#endif --} -- --/** -- * xmlXPathIsNaN: -- * @val: a double value -- * -- * Returns 1 if the value is a NaN, 0 otherwise -- */ --int --xmlXPathIsNaN(double val) { --#ifdef isnan -- return isnan(val); --#else -- return !(val == val); --#endif --} -- --/** -- * xmlXPathIsInf: -- * @val: a double value -- * -- * Returns 1 if the value is +Infinite, -1 if -Infinite, 0 otherwise -- */ --int --xmlXPathIsInf(double val) { --#ifdef isinf -- return isinf(val) ? (val > 0 ? 1 : -1) : 0; --#else -- if (val >= xmlXPathPINF) -- return 1; -- if (val <= -xmlXPathPINF) -- return -1; -- return 0; --#endif --} -- --#endif /* SCHEMAS or XPATH */ -- --#ifdef LIBXML_XPATH_ENABLED -- --/* -- * TODO: when compatibility allows remove all "fake node libxslt" strings -- * the test should just be name[0] = ' ' -- */ --#ifdef DEBUG_XPATH_EXPRESSION --#define DEBUG_STEP --#define DEBUG_EXPR --#define DEBUG_EVAL_COUNTS --#endif -- --static xmlNs xmlXPathXMLNamespaceStruct = { -- NULL, -- XML_NAMESPACE_DECL, -- XML_XML_NAMESPACE, -- BAD_CAST "xml", -- NULL, -- NULL --}; --static xmlNsPtr xmlXPathXMLNamespace = &xmlXPathXMLNamespaceStruct; --#ifndef LIBXML_THREAD_ENABLED --/* -- * Optimizer is disabled only when threaded apps are detected while -- * the library ain't compiled for thread safety. -- */ --static int xmlXPathDisableOptimizer = 0; --#endif -- - /************************************************************************ - * * - * Error handling routines * --- -GitLab diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0004-huge-push.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0004-huge-push.patch deleted file mode 100644 index 5f3d060382..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0004-huge-push.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://gitlab.gnome.org/GNOME/libxml2/-/commit/7c14859d0779797a93ea75744266425028599944 - -From 7c14859d0779797a93ea75744266425028599944 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Tue, 9 May 2023 13:28:06 +0200 -Subject: [PATCH] parser: Fix "huge input lookup" error with push parser - -Fix parsing of larger documents without XML_PARSE_HUGE. - -Should fix #538. ---- a/parserInternals.c -+++ b/parserInternals.c -@@ -418,9 +418,10 @@ xmlParserShrink(xmlParserCtxtPtr ctxt) { - xmlParserInputBufferPtr buf = in->buf; - size_t used; - -- /* Don't shrink memory buffers. */ -+ /* Don't shrink pull parser memory buffers. */ - if ((buf == NULL) || -- ((buf->encoder == NULL) && (buf->readcallback == NULL))) -+ ((ctxt->progressive == 0) && -+ (buf->encoder == NULL) && (buf->readcallback == NULL))) - return; - - used = in->cur - in->base; --- -GitLab diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0005-icu-detection.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0005-icu-detection.patch deleted file mode 100644 index 6fffb156ea..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/files/libxml2-2.11.2-0005-icu-detection.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://gitlab.gnome.org/GNOME/libxml2/-/commit/55f221a4c57903ced5721008607d4133d6eb51cf - -From 55f221a4c57903ced5721008607d4133d6eb51cf Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Wed, 10 May 2023 18:13:47 +0200 -Subject: [PATCH] autotools: Fix ICU detection - -Fixes #540. ---- a/configure.ac -+++ b/configure.ac -@@ -1096,7 +1096,7 @@ else - fi - - AC_CHECK_HEADER(unicode/ucnv.h, [ -- AC_CHECK_LIB([icucore], [uconv_open], [ -+ AC_CHECK_LIB([icucore], [ucnv_open], [ - WITH_ICU=1 - ICU_LIBS=-licucore - if test "$ICU_DIR" != ""; then --- -GitLab diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.10.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.10.4.ebuild index dde6d39580..3fbcc2e9cd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.10.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.10.4.ebuild @@ -17,13 +17,13 @@ XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" XMLCONF_TARBALL="xmlts20130923.tar.gz" DESCRIPTION="XML C parser and toolkit" -HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home" if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" inherit autotools git-r3 else inherit gnome.org libtool - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI+=" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.4.ebuild index c04a7cb51a..e2b87b99d8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.4.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Note: Please bump in sync with dev-libs/libxslt -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="xml(+)" inherit flag-o-matic python-r1 multilib-minimal @@ -17,13 +17,13 @@ XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" XMLCONF_TARBALL="xmlts20130923.tar.gz" DESCRIPTION="XML C parser and toolkit" -HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home" if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" inherit autotools git-r3 else inherit gnome.org libtool - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI+=" @@ -42,6 +42,7 @@ RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" + virtual/libiconv >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) @@ -101,6 +102,12 @@ multilib_src_configure() { # Filter seemingly problematic CFLAGS (bug #26320) filter-flags -fprefetch-loop-arrays -funroll-loops + # Workaround for too simplistic iconv check already addressed + # upstream (bug #907065), should be dropped on next release. + if [[ ${CHOST} == *-solaris* ]] ; then + append-libs iconv + fi + # Notes: # The meaning of the 'debug' USE flag does not apply to the --with-debug # switch (enabling the libxml2 debug module). See bug #100898. diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-9999.ebuild index c04a7cb51a..23465b5962 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Note: Please bump in sync with dev-libs/libxslt -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="xml(+)" inherit flag-o-matic python-r1 multilib-minimal @@ -17,13 +17,13 @@ XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" XMLCONF_TARBALL="xmlts20130923.tar.gz" DESCRIPTION="XML C parser and toolkit" -HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home" if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" inherit autotools git-r3 else inherit gnome.org libtool - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI+=" @@ -42,6 +42,7 @@ RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" + virtual/libiconv >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) From 808474cc3e8c8f1b5e604c9a561cecf2835150b8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:18 +0000 Subject: [PATCH 068/202] dev-libs/libxslt: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../dev-libs/libxslt/libxslt-1.1.37-r1.ebuild | 2 +- .../dev-libs/libxslt/libxslt-1.1.38.ebuild | 6 +++--- .../dev-libs/libxslt/libxslt-9999.ebuild | 12 ++++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.37-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.37-r1.ebuild index 1b32d4fd65..33fcae0a7d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.37-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.37-r1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then inherit autotools git-r3 else inherit libtool gnome.org - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="MIT" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.38.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.38.ebuild index 79e567f3d6..e7d5b131b6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.38.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-1.1.38.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Note: Please bump this in sync with dev-libs/libxml2. -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit flag-o-matic python-r1 multilib-minimal DESCRIPTION="XSLT libraries and tools" @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then inherit autotools git-r3 else inherit libtool gnome.org - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="MIT" @@ -94,7 +94,7 @@ multilib_src_test() { default if multilib_is_native_abi && use python ; then - python_foreach_impl run_in_build_dir libxslt_py_emake test + python_foreach_impl run_in_build_dir libxslt_py_emake check fi } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-9999.ebuild index 827b9edd55..e7d5b131b6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxslt/libxslt-9999.ebuild @@ -5,8 +5,8 @@ EAPI=8 # Note: Please bump this in sync with dev-libs/libxml2. -PYTHON_COMPAT=( python3_{10..11} ) -inherit python-r1 multilib-minimal +PYTHON_COMPAT=( python3_{10..12} ) +inherit flag-o-matic python-r1 multilib-minimal DESCRIPTION="XSLT libraries and tools" HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt" @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then inherit autotools git-r3 else inherit libtool gnome.org - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="MIT" @@ -51,6 +51,10 @@ src_prepare() { } multilib_src_configure() { + # Remove this after upstream merge request to add AC_SYS_LARGEFILE lands: + # https://gitlab.gnome.org/GNOME/libxslt/-/merge_requests/55 + append-lfs-flags + libxslt_configure() { ECONF_SOURCE="${S}" econf \ --without-python \ @@ -90,7 +94,7 @@ multilib_src_test() { default if multilib_is_native_abi && use python ; then - python_foreach_impl run_in_build_dir libxslt_py_emake test + python_foreach_impl run_in_build_dir libxslt_py_emake check fi } From 3b467914de1e09a8d610a722dd710af689fd5174 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:18 +0000 Subject: [PATCH 069/202] dev-libs/nettle: Sync with Gentoo It's from Gentoo commit 92d3f4da6045ef59eb4fa4ac99e63ef5f4c2fc95. --- .../portage-stable/dev-libs/nettle/Manifest | 2 + .../dev-libs/nettle/nettle-3.8.1.ebuild | 2 +- .../dev-libs/nettle/nettle-3.9.1.ebuild | 89 +++++++++++++++++++ .../dev-libs/nettle/nettle-3.9.ebuild | 2 +- 4 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.9.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/Manifest index 1729d02bfa..80fa221ca4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/Manifest @@ -1,4 +1,6 @@ DIST nettle-3.8.1.tar.gz 2406251 BLAKE2B 22b4ec81645b579504356597ba87b637e46285682020c90e03ecaea386ac9b48eaf91ee76ae3b86b6060be355de20c320ab3b74958074ad23fc08ad9ab6a4cbb SHA512 a405da3438d185d96917b03b00abb9ab43e04f58f770f657f716c25d64bb258ee170a71328e74736caa7121f50c0c89d3cc840c1201d2a92cfaf1357d24bdc6a DIST nettle-3.8.1.tar.gz.sig 374 BLAKE2B e2bfce4aaa1be114fb9bf8724f25db75c69c3b98538df46e9b1428ce615f7db3b9e9f9240d232fddac195db4568439b3f58989c20beca82aa6db79f4956db547 SHA512 978304b1faa5adc3b0d6ea7e9597af6154ad5d6e328913ac19184ece94771fdb2a7d5ce0af535ae8d28cb6ccd94fb3d4ef2613c0356df9e08b5d4c26ea646e09 +DIST nettle-3.9.1.tar.gz 2396741 BLAKE2B e3ceaefa19491e58f26b900beaf8b4e746feb2357c7677f5c050f257f4a23c304773446b6283a42a82cf9640e16522b8a71c47f137759f1df23cdeee4625d142 SHA512 5939c4b43cf9ff6c6272245b85f123c81f8f4e37089fa4f39a00a570016d837f6e706a33226e4bbfc531b02a55b2756ff312461225ed88de338a73069e031ced +DIST nettle-3.9.1.tar.gz.sig 374 BLAKE2B 41c37cc0ea649445c7e4bbe2d0e9ab1c6f7bb50000adef2c2ee4828e7efdd2d7c6d823d64209f251cb7d82ce85e73768430a435ee7f1d5a3732e744987918d0c SHA512 fe6f4c9746e7dbc10f61843673de95d2faea209b1caea5c7bf69b81d3f6b2248a4907012b2baf0d65e54682f835cff465482db37615b789017ce0a9e7e267d7d DIST nettle-3.9.tar.gz 2393838 BLAKE2B 80885fa380de58765155a5d4b209e524f4bd0336156ba6f5189702007438998094df0e4e801370fd0a74251b8cf91f46638b0c0139388c2c2098b1207ed3415c SHA512 5e44f59b37ec1e92345fce0b963151d1f2aabf01b3a197b8d931067c51af4ba025059c6a07f2bcd19b17eb49d6ede98f5c200e58d340959826cda473459d2fba DIST nettle-3.9.tar.gz.sig 374 BLAKE2B 4fb9fbdafd01712db2506e070a64b6821dcc0c3ff3cea83011662ee4cdd5120ed10c6fa7b41d556069fe2d8827a312e94bb3586be845284fa7a7ac75f000a750 SHA512 8cf060e9f8e0dc0a70a7d324cf2366e0fc990fca2d8a1c677e66382f6853f96146fe30ea9b8629030991f4799430c7660ae7867c94167760bb945abb526b5bda diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.8.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.8.1.ebuild index 6fd606c5cb..8afc0e0436 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.8.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.8.1.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )" LICENSE="|| ( LGPL-3 LGPL-2.1 )" # Subslot = libnettle - libhogweed soname version SLOT="0/8-6" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul" # The arm64 crypto option controls AES, SHA1, and SHA2 usage. REQUIRED_USE="cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.9.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.9.1.ebuild new file mode 100644 index 0000000000..8e0867d6b2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.9.1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nettle.asc +inherit multilib-build multilib-minimal toolchain-funcs verify-sig + +DESCRIPTION="Low-level cryptographic library" +HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" +SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )" + +LICENSE="|| ( LGPL-3 LGPL-2.1 )" +# Subslot = libnettle - libhogweed soname version +SLOT="0/8-6" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul" +# The arm64 crypto option controls AES, SHA1, and SHA2 usage. +REQUIRED_USE=" + cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) + cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 ) + cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 ) +" + +DEPEND="gmp? ( >=dev-libs/gmp-6.1:=[static-libs?,${MULTILIB_USEDEP}] )" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-devel/m4 + doc? ( sys-apps/texinfo ) + verify-sig? ( sec-keys/openpgp-keys-nettle ) +" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/nettle/version.h +) + +DOCS=() +HTML_DOCS=() + +src_prepare() { + default + + # I do not see in config.sub reference to sunldsolaris. + # if someone complains readd + # -e 's/solaris\*)/sunldsolaris*)/' \ + sed -e '/CFLAGS=/s: -ggdb3::' \ + -i configure.ac configure || die + + if use doc ; then + DOCS+=( nettle.pdf ) + HTML_DOCS+=( nettle.html ) + fi +} + +multilib_src_configure() { + local myeconfargs=( + CC_FOR_BUILD="$(tc-getBUILD_CC)" + + $(tc-is-static-only && echo --disable-shared) + + # Intrinsics + $(use_enable cpu_flags_arm_neon arm-neon) + $(use_enable cpu_flags_arm_aes arm64-crypto) + $(use_enable cpu_flags_ppc_altivec power-altivec) + $(use_enable cpu_flags_x86_aes x86-aesni) + $(use_enable cpu_flags_x86_sha x86-sha-ni) + $(use_enable cpu_flags_x86_pclmul x86-pclmul) + # TODO: PPC crypto flag? + --disable-power-crypto-ext + # TODO: How do we detect this in ebuilds reliably? + --disable-power9 + $([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions') + # TODO: cpu_flags_s390? + --disable-s390x-vf + --disable-s390x-msa + + $(use_enable asm assembler) + $(multilib_native_use_enable doc documentation) + $(use_enable gmp public-key) + $(use_enable static-libs static) + --disable-fat + + # openssl is just used for benchmarks (bug #427526) + --disable-openssl + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.9.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.9.ebuild index 3bdb6aaa7a..8e0867d6b2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/nettle/nettle-3.9.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )" LICENSE="|| ( LGPL-3 LGPL-2.1 )" # Subslot = libnettle - libhogweed soname version SLOT="0/8-6" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul" # The arm64 crypto option controls AES, SHA1, and SHA2 usage. REQUIRED_USE=" From c0db2aa286dafe2578a9a69626244d74d1176311 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:19 +0000 Subject: [PATCH 070/202] dev-libs/oniguruma: Sync with Gentoo It's from Gentoo commit 82e9ddde6f17e843beed29bc1446c635f71efc50. --- .../portage-stable/dev-libs/oniguruma/oniguruma-6.9.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.8.ebuild index 69b6965743..b35bda73a3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/oniguruma/oniguruma-6.9.8.ebuild @@ -21,7 +21,7 @@ fi LICENSE="BSD-2" SLOT="0/5" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="crnl-as-line-terminator static-libs" BDEPEND="" From d5e0a08e15761948c4240068f00368d9375a640d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:19 +0000 Subject: [PATCH 071/202] dev-libs/popt: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../third_party/portage-stable/dev-libs/popt/popt-1.18.ebuild | 2 +- .../third_party/portage-stable/dev-libs/popt/popt-1.19.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.18.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.18.ebuild index f23e5fb1f2..872cc3e66b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.18.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.18.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz" LICENSE="MIT" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls static-libs" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.19.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.19.ebuild index 41d00ef009..d51fca7302 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.19.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.19.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz" LICENSE="MIT" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls static-libs" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" From 75f5361a1538110a09b6a6ba458520dcfa8ce6ae Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:19 +0000 Subject: [PATCH 072/202] dev-perl/File-Slurp: Sync with Gentoo It's from Gentoo commit e9431907271afc205c660caeb21d966cb1069d1d. --- .../dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild index a8e8fa4ee7..ee23bd9f75 100644 --- a/sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Simple and Efficient Reading/Writing/Modifying of Complete Files" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" From 49c524ab8d1eeb23fccd0fa52434d4d957337e25 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:20 +0000 Subject: [PATCH 073/202] dev-perl/Locale-gettext: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild index aaea2e72a0..ec0af8a75b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-perl/Locale-gettext/Locale-gettext-1.70.0-r1.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="A Perl module for accessing the GNU locale utilities" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" sys-devel/gettext From 3cf5e28ac57ecb92499d1a6641c8818b1a4d78cc Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:20 +0000 Subject: [PATCH 074/202] dev-perl/Parse-Yapp: Sync with Gentoo It's from Gentoo commit 4aebe55f8c434205f2ea3d28ffacb834a401bc1f. --- .../dev-perl/Parse-Yapp/Parse-Yapp-1.210.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0-r1.ebuild index 9703c4b390..72159b6685 100644 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0-r1.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Compiles yacc-like LALR grammars to generate Perl OO parser modules" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" ! Date: Mon, 5 Jun 2023 07:12:20 +0000 Subject: [PATCH 075/202] dev-perl/Text-Unidecode: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild index 53f4e11e89..cdb76ac3c9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild @@ -10,4 +10,4 @@ inherit perl-module DESCRIPTION="Plain ASCII transliterations of Unicode text" 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 ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" From 6282a90c1b88f8f0c4d977bd440a4c6c6ad620d8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:20 +0000 Subject: [PATCH 076/202] dev-perl/Unicode-EastAsianWidth: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild index 7d3d4536f4..46c694d0ae 100644 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="East Asian Width properties" LICENSE="CC0-1.0" 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 ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" virtual/perl-File-Spec From 24d7ea7ece453fa36955c81565e08fa80c89a797 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:21 +0000 Subject: [PATCH 077/202] dev-python/autocommand: Sync with Gentoo It's from Gentoo commit 428632a25c1fbea165f04ab9526efb17089d9a88. --- .../dev-python/autocommand/autocommand-2.2.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/autocommand/autocommand-2.2.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/autocommand/autocommand-2.2.2.ebuild index 1b6674a1e2..458d17f0cb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/autocommand/autocommand-2.2.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/autocommand/autocommand-2.2.2.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 @@ -20,6 +20,6 @@ SRC_URI=" LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" distutils_enable_tests pytest From 8da30315cac9449342ef220dcf46f4964c7a8861 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:22 +0000 Subject: [PATCH 078/202] dev-python/certifi: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../dev-python/certifi/certifi-3021.3.16-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16-r3.ebuild index 25806e4a6e..d2592058a6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16-r3.ebuild @@ -5,7 +5,7 @@ EAPI=7 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 @@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P} LICENSE="MPL-2.0" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" app-misc/ca-certificates From a6dedf6cf1b3d077785dbf410d2310bb17024853 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:22 +0000 Subject: [PATCH 079/202] dev-python/crcmod: Sync with Gentoo It's from Gentoo commit 1511eea795df9fcfeb6e66776f5a2eeb05011a79. --- .../portage-stable/dev-python/crcmod/crcmod-1.7-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/crcmod/crcmod-1.7-r5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/crcmod/crcmod-1.7-r5.ebuild index b991cf2ed1..902177adf5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/crcmod/crcmod-1.7-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/crcmod/crcmod-1.7-r5.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 From 394e71f1ecd98c1938463e827e2b9b2a6a99c2a6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:22 +0000 Subject: [PATCH 080/202] dev-python/cython: Sync with Gentoo It's from Gentoo commit a90a245bdb7fdda146d41ccbd221c9df973bc18a. --- .../portage-stable/dev-python/cython/Manifest | 4 +- .../dev-python/cython/cython-0.29.33.ebuild | 90 ------------------- .../dev-python/cython/cython-0.29.34.ebuild | 2 +- ....29.33-r1.ebuild => cython-0.29.35.ebuild} | 15 ++-- ...a2.ebuild => cython-3.0.0_beta3-r1.ebuild} | 15 ++-- .../files/cython-3.0.0_beta3-py312-long.patch | 28 ++++++ 6 files changed, 49 insertions(+), 105 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.33.ebuild rename sdk_container/src/third_party/portage-stable/dev-python/cython/{cython-0.29.33-r1.ebuild => cython-0.29.35.ebuild} (76%) rename sdk_container/src/third_party/portage-stable/dev-python/cython/{cython-3.0.0_beta2.ebuild => cython-3.0.0_beta3-r1.ebuild} (73%) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-3.0.0_beta3-py312-long.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/cython/Manifest index 46dd0ff7bd..b636c77753 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/Manifest @@ -1,3 +1,3 @@ -DIST cython-0.29.33.gh.tar.gz 2113910 BLAKE2B 9212edfa36680a3243632d28c4f5616a7336e82ee1f96df7d5e29711056619639c9a8fe9bbf9aea0a86aed39e836dc6eaa112ad35080f530add6309ccd09c53c SHA512 85f5ba7159d8793dbda980140b26086727f356a71d78f8522419657841d07b865d09c2f0a0f77d398669d071c1d261060235321a19eb7808e35d24f8ac71560d DIST cython-0.29.34.gh.tar.gz 2114639 BLAKE2B c5f70fd3e6074d9030a1035bc98d71b703e0f391b61bd91f3ffba2c35a29a98b9ff8ef2047e7c75743ead280f0f06a924abe84ae8bf7696b65da662a3c58ee0c SHA512 51679d1304d0f87dfb51e60c753f1ce60027f855a91cf130a5dcf84353884a7dcf09c01701945ae2f9173f8f095890c377d5faac28c2f01d7f764609c0130411 -DIST cython-3.0.0b2.gh.tar.gz 2669448 BLAKE2B 87602a43f77f8005adfc71ec0598a12212db917071dd2ae9a7d0d909411e38525290d860a8606600a5e1b07b014da65d2398f04818837fb15f66bcdba0cad965 SHA512 2095a556bc83669a89902a71da2164fbfab2b75cec2de95c91f95b6b3639bc5802b09808059896ed564b0d6e0539e497051614572bc8ba5d678d0410ccc3914f +DIST cython-0.29.35.gh.tar.gz 2115190 BLAKE2B ac23abbd2b560ee52a79840d995a4cf36ddb3a8705b9327010f1ad6add8028185c15703efcc1d59b581d65b5de38e123c0f07c36fe6ffe54a6efee7512161344 SHA512 35d679d94e1f731e004b83fb4ae0d569703b0800c913012308146b1c54463ce12cb1cf3733e24162fb357f179444c5ca31108a37850e6c749ddebac5175119f5 +DIST cython-3.0.0b3.gh.tar.gz 2688784 BLAKE2B 933bb48b2bf5169c973a36c877a36eae28b80409a7ff395b82a14ac0740247496df3c9f2d69884c823b7475069f0c75d6cbbb964b88de60b38082e6e36659bff SHA512 f1d0fdcec4bc6b0f6cb66078592424fdcb7a028b79c5b9d41280ae112235736d11c9f4f793e810007e880ae0def195ac25999db59065c7f7bdcfab84b06bf7d3 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.33.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.33.ebuild deleted file mode 100644 index 4bcdbfc1fa..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.33.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 toolchain-funcs elisp-common - -DESCRIPTION="A Python to C compiler" -HOMEPAGE=" - https://cython.org/ - https://github.com/cython/cython/ - https://pypi.org/project/Cython/ -" -SRC_URI=" - https://github.com/cython/cython/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Apache-2.0" -SLOT="0" -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 ~x64-solaris ~x86-solaris" -IUSE="emacs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - emacs? ( >=app-editors/emacs-23.1:* ) -" -BDEPEND=" - ${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ' python3_{8..10}) - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch" - "${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch" -) - -SITEFILE=50cython-gentoo.el - -distutils_enable_sphinx docs - -python_compile() { - # Python gets confused when it is in sys.path before build. - local -x PYTHONPATH= - - distutils-r1_python_compile -} - -python_compile_all() { - use emacs && elisp-compile Tools/cython-mode.el -} - -python_test() { - if has "${EPYTHON}" pypy3 python3.11; then - einfo "Skipping tests on ${EPYTHON} (xfail)" - return - fi - - tc-export CC - # https://github.com/cython/cython/issues/1911 - local -x CFLAGS="${CFLAGS} -fno-strict-overflow" - "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests || - die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) - distutils-r1_python_install_all - - if use emacs; then - elisp-install ${PN} Tools/cython-mode.* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.34.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.34.ebuild index 72900e9aaf..d1e81c489d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.34.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.34.ebuild @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -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 ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="emacs test" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.33-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.35.ebuild similarity index 76% rename from sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.33-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.35.ebuild index 1c030e3fca..98a01242a0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.33-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-0.29.35.ebuild @@ -3,11 +3,14 @@ EAPI=8 +DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_TESTED=( python3_{10..11} ) +# 3.12 not tested yet for https://github.com/cython/cython/issues/5285. +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 ) PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 toolchain-funcs elisp-common +inherit distutils-r1 multiprocessing toolchain-funcs elisp-common DESCRIPTION="A Python to C compiler" HOMEPAGE=" @@ -22,7 +25,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -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 ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="emacs test" RESTRICT="!test? ( test )" @@ -34,7 +37,7 @@ BDEPEND=" test? ( $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] - ' python3_{8..10}) + ' python3_{10..11}) ) " @@ -60,7 +63,7 @@ python_compile_all() { } python_test() { - if has "${EPYTHON}" pypy3 python3.11; then + if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then einfo "Skipping tests on ${EPYTHON} (xfail)" return fi @@ -68,7 +71,7 @@ python_test() { tc-export CC # https://github.com/cython/cython/issues/1911 local -x CFLAGS="${CFLAGS} -fno-strict-overflow" - "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests || + "${PYTHON}" runtests.py -vv -j "$(makeopts_jobs)" --work-dir "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}" } diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.0_beta2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.0_beta3-r1.ebuild similarity index 73% rename from sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.0_beta2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.0_beta3-r1.ebuild index a662c30596..ca84314058 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.0_beta2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.0_beta3-r1.ebuild @@ -5,10 +5,11 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_TESTED=( python3_{10..11} ) +PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 ) PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 toolchain-funcs +inherit distutils-r1 multiprocessing toolchain-funcs MY_P=${P/_beta/b} DESCRIPTION="A Python to C compiler" @@ -25,7 +26,7 @@ S=${WORKDIR}/${MY_P} LICENSE="Apache-2.0" SLOT="0" -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 ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" @@ -34,7 +35,7 @@ BDEPEND=" test? ( $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] - ' python3_{8..10}) + ' python3_{10..11}) ) " @@ -42,6 +43,8 @@ PATCHES=( "${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch" "${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch" "${FILESDIR}/${PN}-0.29.23-pythran-parallel-install.patch" + # backport upstream fix e.g. for dev-python/pysimdjson on py3.12 + "${FILESDIR}/${P}-py312-long.patch" ) distutils_enable_sphinx docs \ @@ -57,7 +60,7 @@ python_compile() { } python_test() { - if has "${EPYTHON}" pypy3 python3.11; then + if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then einfo "Skipping tests on ${EPYTHON} (xfail)" return fi @@ -65,7 +68,7 @@ python_test() { tc-export CC # https://github.com/cython/cython/issues/1911 local -x CFLAGS="${CFLAGS} -fno-strict-overflow" - "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests || + "${PYTHON}" runtests.py -vv -j "$(makeopts_jobs)" --work-dir "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}" } diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-3.0.0_beta3-py312-long.patch b/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-3.0.0_beta3-py312-long.patch new file mode 100644 index 0000000000..fb849eca86 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/files/cython-3.0.0_beta3-py312-long.patch @@ -0,0 +1,28 @@ +From d82e4e34582e908d315b912a60d81d5759850df5 Mon Sep 17 00:00:00 2001 +From: Stefan Behnel +Date: Mon, 29 May 2023 21:58:15 +0200 +Subject: [PATCH] Fix the argument type passed into the new + "PyUnstable_Long_Compact*()" C-API functions in CPython 3.12. + +--- + Cython/Utility/TypeConversion.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Cython/Utility/TypeConversion.c b/Cython/Utility/TypeConversion.c +index efc5c1373..09e87d81c 100644 +--- a/Cython/Utility/TypeConversion.c ++++ b/Cython/Utility/TypeConversion.c +@@ -149,8 +149,8 @@ static CYTHON_INLINE Py_hash_t __Pyx_PyIndex_AsHash_t(PyObject*); + ((1 - (Py_ssize_t) __Pyx_PyLong_Sign(x)) * __Pyx_PyLong_DigitCount(x)) + + #if defined(PyUnstable_Long_IsCompact) && defined(PyUnstable_Long_CompactValue) +- #define __Pyx_PyLong_IsCompact(x) PyUnstable_Long_IsCompact(x) +- #define __Pyx_PyLong_CompactValue(x) PyUnstable_Long_CompactValue(x) ++ #define __Pyx_PyLong_IsCompact(x) PyUnstable_Long_IsCompact((PyLongObject*) x) ++ #define __Pyx_PyLong_CompactValue(x) PyUnstable_Long_CompactValue((PyLongObject*) x) + #else + #define __Pyx_PyLong_IsCompact(x) (((PyLongObject*)x)->long_value.lv_tag < (2 << _PyLong_NON_SIZE_BITS)) + #define __Pyx_PyLong_CompactValue(x) ((1 - (Py_ssize_t) __Pyx_PyLong_Sign(x)) * (Py_ssize_t) __Pyx_PyLong_Digits(x)[0]) +-- +2.41.0 + From 95312824a641389e91251800fdfb052607e37eaa Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:22 +0000 Subject: [PATCH 081/202] dev-python/distro: Sync with Gentoo It's from Gentoo commit 9c6ea8c5e36b879640df82c300891daa720c26e8. --- .../portage-stable/dev-python/distro/distro-1.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/distro/distro-1.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/distro/distro-1.8.0.ebuild index 6b635b1f8d..7e69f708c1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/distro/distro-1.8.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/distro/distro-1.8.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi From 2b6aaf3d9273d1a782e776ddde7898b907e15355 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:23 +0000 Subject: [PATCH 082/202] dev-python/docutils: Sync with Gentoo It's from Gentoo commit 1869d8feb3da8a737bb89ebdb8e2b718d1e66437. --- .../dev-python/docutils/docutils-0.17.1-r1.ebuild | 2 +- .../portage-stable/dev-python/docutils/docutils-0.19.ebuild | 4 ++-- .../portage-stable/dev-python/docutils/docutils-0.20.1.ebuild | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.17.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.17.1-r1.ebuild index 7aa4477abb..4764ca403b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.17.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.17.1-r1.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="BSD-2 GPL-3 public-domain" 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" dev-python/pygments[${PYTHON_USEDEP}] diff --git a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.19.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.19.ebuild index bb359da3a8..1bbeb19e0c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.19.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.19.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{9..12} pypy3 ) inherit distutils-r1 pypi @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="BSD-2 GPL-3 public-domain" 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" dev-python/pygments[${PYTHON_USEDEP}] diff --git a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.20.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.20.1.ebuild index b93993c2b7..c3f27a31d5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.20.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.20.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="BSD-2 GPL-3 public-domain" 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" dev-python/pygments[${PYTHON_USEDEP}] From 76fdf50a151bb4daf6dea20be34de66467211fac Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:24 +0000 Subject: [PATCH 083/202] dev-python/flit-core: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../dev-python/flit-core/flit-core-3.8.0.ebuild | 2 +- .../dev-python/flit-core/flit-core-3.9.0.ebuild | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.8.0.ebuild index 2e0af2ca62..553cf9f18f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.8.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.8.0.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" dev-python/tomli[${PYTHON_USEDEP}] diff --git a/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.9.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.9.0.ebuild index 020992e541..f1210fb3b3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.9.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/flit-core/flit-core-3.9.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{10..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi @@ -17,10 +17,12 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" - dev-python/tomli[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/tomli[${PYTHON_USEDEP}] + ' 3.{9..10}) " BDEPEND=" test? ( dev-python/testpath[${PYTHON_USEDEP}] ) From d6028b8daf6776ffb2bcbb9799ee2cfa111e803f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:25 +0000 Subject: [PATCH 084/202] dev-python/gentoo-common: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../dev-python/gentoo-common/gentoo-common-1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/gentoo-common/gentoo-common-1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/gentoo-common/gentoo-common-1.ebuild index 2a8a5a6748..f7b60b8f6a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/gentoo-common/gentoo-common-1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/gentoo-common/gentoo-common-1.ebuild @@ -9,7 +9,7 @@ S=${WORKDIR} LICENSE="GPL-2" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" src_install() { insinto /usr/lib/python From 19a049077a3bb4f06722dbdca86e199fb575c3cb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:25 +0000 Subject: [PATCH 085/202] dev-python/gpep517: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../portage-stable/dev-python/gpep517/gpep517-13.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/gpep517/gpep517-13.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/gpep517/gpep517-13.ebuild index d1252f57dc..e1b324df49 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/gpep517/gpep517-13.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/gpep517/gpep517-13.ebuild @@ -5,7 +5,7 @@ EAPI=7 DISTUTILS_USE_PEP517=no -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit distutils-r1 @@ -21,11 +21,13 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" >=dev-python/installer-0.5.0[${PYTHON_USEDEP}] - >=dev-python/tomli-1.2.3[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >=dev-python/tomli-1.2.3[${PYTHON_USEDEP}] + ' 3.{9..10}) " distutils_enable_tests pytest From 615f5a6904143e66050d0a6add78242188a7d34e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:25 +0000 Subject: [PATCH 086/202] dev-python/inflect: Sync with Gentoo It's from Gentoo commit 7732d65b3d6934bc1e8d0a71d421344e6f958ea6. --- .../dev-python/inflect/Manifest | 2 -- .../dev-python/inflect/inflect-6.0.2.ebuild | 28 ------------------- .../dev-python/inflect/inflect-6.0.3.ebuild | 28 ------------------- .../dev-python/inflect/inflect-6.0.4.ebuild | 4 +-- 4 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-6.0.2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-6.0.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/inflect/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/inflect/Manifest index ad645e1c84..4d4fd5b5fc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/inflect/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/inflect/Manifest @@ -1,3 +1 @@ -DIST inflect-6.0.2.tar.gz 70830 BLAKE2B 8faa09c53f836429b6e1a2965da3c4315260e1cb3ae7dc40fe226d7f4595e9bd54498167c044f67fed5f79e2997af5425cc13680b9c2b722ffd702095f60b038 SHA512 ddb0439eeffbd21b3293208eb7e89f97fe556a3ba1e88de7e15d1c6bc5a59cdb25a224d7cfec5a010dd384728b15317c1dc752e3a8d4d95dd6eea8224a4f2877 -DIST inflect-6.0.3.tar.gz 71294 BLAKE2B ead85b2e17cbf82a1a8cd4a7a0948b43462ab40dc2bd457eadf02c4cbc4e1295c6195da4baafa84cb5d8c6c4df0bcd6439ff2004fc424bc21e786f2e423632f3 SHA512 5bcd40b71301cba7890b31720aca3261224ec909ec3bbe6830e847f040b10daf91ff73cbe8d46c8835aa391a76c88342b268142393c5b96dafee90e668dd59ba DIST inflect-6.0.4.tar.gz 71131 BLAKE2B 24ec6f25462594fde4558f7a4269c68d31989ead54c982f3a4382b5f0c192fd5fcac7544413fecef0abaf7c3fe2f9b4a8049fc7dc7d324e4397fb6a81763ef8e SHA512 96aaa74b3e8c5dcc91d81af336af73535826f3cedaa556d6baf540ca54db1a7c1f17a372c240446c0d81697520eab154bad4f0aad6195c6ab8e131ae443d3811 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-6.0.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-6.0.2.ebuild deleted file mode 100644 index ff5913eb4f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-6.0.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{9..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Correctly inflect words and numbers" -HOMEPAGE=" - https://pypi.org/project/inflect/ - https://github.com/jaraco/inflect/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" - -RDEPEND=" - >=dev-python/pydantic-1.9.1[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-6.0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-6.0.3.ebuild deleted file mode 100644 index e63aa05239..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-6.0.3.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{9..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Correctly inflect words and numbers" -HOMEPAGE=" - https://pypi.org/project/inflect/ - https://github.com/jaraco/inflect/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" - -RDEPEND=" - >=dev-python/pydantic-1.9.1[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-6.0.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-6.0.4.ebuild index d8559bd91a..47bcb2c006 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-6.0.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-6.0.4.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit distutils-r1 pypi @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" >=dev-python/pydantic-1.9.1[${PYTHON_USEDEP}] From fc6cff3c9975becb5d0175e7403f12eb0cf56ac7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:25 +0000 Subject: [PATCH 087/202] dev-python/installer: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../dev-python/installer/installer-0.7.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/installer/installer-0.7.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/installer/installer-0.7.0.ebuild index c88d3eef3c..1d8b92cdcb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/installer/installer-0.7.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/installer/installer-0.7.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=no -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi @@ -21,7 +21,7 @@ SRC_URI+=" LICENSE="MIT" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND=" app-arch/unzip From 074009510312b1244d608b7ad1457c121903d708 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:26 +0000 Subject: [PATCH 088/202] dev-python/jaraco-context: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../dev-python/jaraco-context/jaraco-context-4.3.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/jaraco-context/jaraco-context-4.3.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/jaraco-context/jaraco-context-4.3.0.ebuild index c4cfb54397..b0c8171ea6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/jaraco-context/jaraco-context-4.3.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/jaraco-context/jaraco-context-4.3.0.ebuild @@ -7,7 +7,7 @@ EAPI=7 DISTUTILS_USE_PEP517=flit PYPI_NO_NORMALIZE=1 PYPI_PN=${PN/-/.} -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi @@ -19,7 +19,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" distutils_enable_tests pytest From f4db9f3f6e894e4f9221938c39f9feec7b2a9b4a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:26 +0000 Subject: [PATCH 089/202] dev-python/jaraco-functools: Sync with Gentoo It's from Gentoo commit 7126a352fe1de08069721f0b0bb813bfb33736f4. --- .../dev-python/jaraco-functools/Manifest | 1 + .../jaraco-functools-3.6.0.ebuild | 4 +- .../jaraco-functools-3.7.0.ebuild | 56 +++++++++++++++++++ 3 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/jaraco-functools/jaraco-functools-3.7.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/jaraco-functools/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/jaraco-functools/Manifest index ce1b87f9b7..e179d28d99 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/jaraco-functools/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/jaraco-functools/Manifest @@ -1 +1,2 @@ DIST jaraco.functools-3.6.0.tar.gz 16054 BLAKE2B dad26dc73b696dfc62d21f1807a8340e770b35881f3877fdcf6e7e95080f0cd1a81339500c306f4afb2dda896a19ffffcc1715cfc4d37f36594d59af3fd58ac0 SHA512 f249e6cdcbd88e5c89663bcc0467687ea533dc70b7c9260880da8099380b5c925f05933527de6043aa0786709a0ca4d4b183cc18acab69d8e88f63a3360e9efb +DIST jaraco.functools-3.7.0.tar.gz 16107 BLAKE2B 3a8419af3d104118144bba053c94d2f1db0972f3a908fa66cc69ec4dfe31bb6ecb1f1a2f43d7ccdbca0be5094d21e15d40d9f8d75b3ba66e606fced08150872f SHA512 37b33b526a3f3cff259c93c764bdde06015440bef025d9f5a177125a654abb23f96d71f0b4f4e73cdfe7274af1575a01d8e112f9d333cbe12f53b1583bae1d5a diff --git a/sdk_container/src/third_party/portage-stable/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild index e2dac0c25f..b5ad05df53 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/jaraco-functools/jaraco-functools-3.6.0.ebuild @@ -7,7 +7,7 @@ EAPI=7 DISTUTILS_USE_PEP517=flit PYPI_NO_NORMALIZE=1 PYPI_PN=${PN/-/.} -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit distutils-r1 pypi @@ -19,7 +19,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" >=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}] diff --git a/sdk_container/src/third_party/portage-stable/dev-python/jaraco-functools/jaraco-functools-3.7.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/jaraco-functools/jaraco-functools-3.7.0.ebuild new file mode 100644 index 0000000000..0607441caa --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/jaraco-functools/jaraco-functools-3.7.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +DISTUTILS_USE_PEP517=flit +PYPI_NO_NORMALIZE=1 +PYPI_PN=${PN/-/.} +PYTHON_COMPAT=( pypy3 python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Additional functions used by other projects by developer jaraco" +HOMEPAGE=" + https://github.com/jaraco/jaraco.functools/ + https://pypi.org/project/jaraco.functools/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + >=dev-python/more-itertools-0.12.0-r1[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/jaraco-classes[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_configure() { + grep -q 'build-backend = "setuptools' pyproject.toml || + die "Upstream changed build-backend, recheck" + # write a custom pyproject.toml to ease setuptools bootstrap + cat > pyproject.toml <<-EOF || die + [build-system] + requires = ["flit_core >=3.2,<4"] + build-backend = "flit_core.buildapi" + + [project] + name = "jaraco.functools" + version = "${PV}" + description = "Functools like those found in stdlib" + EOF +} + +python_install() { + distutils-r1_python_install + # rename to workaround a bug in pkg_resources + # https://bugs.gentoo.org/834522 + mv "${D}$(python_get_sitedir)"/jaraco{_,.}functools-${PV}.dist-info || die +} From 913d1662dd1d27556b2f68c3b548ad4ef8f9f05c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:26 +0000 Subject: [PATCH 090/202] dev-python/jaraco-text: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../jaraco-text/jaraco-text-3.11.1.ebuild | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild index bf60d9f2be..3c4773fac6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild @@ -7,7 +7,8 @@ EAPI=7 DISTUTILS_USE_PEP517=flit PYPI_NO_NORMALIZE=1 PYPI_PN=${PN/-/.} -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +CLI_COMPAT=( python3_{10..11} pypy3 ) +PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_12 ) inherit distutils-r1 pypi @@ -19,7 +20,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" >=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}] @@ -28,9 +29,11 @@ RDEPEND=" # needed only for CLI tool, make it PDEPEND to reduce pain in setuptools # bootstrap PDEPEND=" - dev-python/autocommand[${PYTHON_USEDEP}] - dev-python/inflect[${PYTHON_USEDEP}] - dev-python/more-itertools[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/autocommand[${PYTHON_USEDEP}] + dev-python/inflect[${PYTHON_USEDEP}] + dev-python/more-itertools[${PYTHON_USEDEP}] + ' "${CLI_COMPAT[@]}") " BDEPEND=" test? ( @@ -59,6 +62,19 @@ src_configure() { EOF } +python_test() { + local EPYTEST_IGNORE=() + + if ! has "${EPYTHON/./_}" "${CLI_COMPAT[@]}"; then + EPYTEST_IGNORE+=( + jaraco/text/show-newlines.py + jaraco/text/strip-prefix.py + ) + fi + + epytest +} + python_install() { distutils-r1_python_install # rename to workaround a bug in pkg_resources From 24870aabbbd11811f9ba55643252bf64aa89f609 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:27 +0000 Subject: [PATCH 091/202] dev-python/jinja: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../portage-stable/dev-python/jinja/jinja-3.1.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/jinja/jinja-3.1.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/jinja/jinja-3.1.2.ebuild index a74e811210..4098122747 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/jinja/jinja-3.1.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/jinja/jinja-3.1.2.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{9..12} pypy3 ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 @@ -22,7 +22,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" IUSE="examples" RDEPEND=" From efc0ab4e7d0a7f7600123c8dae47b2fa1ca5f726 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:27 +0000 Subject: [PATCH 092/202] dev-python/lazy-object-proxy: Sync with Gentoo It's from Gentoo commit eecaaf0ac708a4c1fbb062d650e540f6ffef812b. --- .../dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild index bb2b12995a..388ac18b33 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi From c42521030bdc537ce21bba94efa0d8e2f6b6114d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:27 +0000 Subject: [PATCH 093/202] dev-python/lxml: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- ...xml-4.9.2-py3.12-drop-deprecated-imp.patch | 49 +++++++++++++++++++ .../dev-python/lxml/lxml-4.9.2.ebuild | 6 ++- 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-4.9.2-py3.12-drop-deprecated-imp.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-4.9.2-py3.12-drop-deprecated-imp.patch b/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-4.9.2-py3.12-drop-deprecated-imp.patch new file mode 100644 index 0000000000..a59a60e748 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-4.9.2-py3.12-drop-deprecated-imp.patch @@ -0,0 +1,49 @@ +https://github.com/lxml/lxml/commit/07db761f9f027d1814a43686cda6fca26e37a931 +https://github.com/lxml/lxml/commit/c6b7e621e4696c02bf8f6ea423ffbbf2109748ab + +From 07db761f9f027d1814a43686cda6fca26e37a931 Mon Sep 17 00:00:00 2001 +From: Stefan Behnel +Date: Thu, 11 May 2023 10:29:02 +0200 +Subject: [PATCH] Avoid using the deprecated "imp" module. + +Closes https://bugs.launchpad.net/lxml/+bug/2018137 +--- a/src/lxml/html/tests/test_html5parser.py ++++ b/src/lxml/html/tests/test_html5parser.py +@@ -1,5 +1,4 @@ + import os +-import imp + try: + from StringIO import StringIO + except ImportError: # python 3 +@@ -45,7 +44,10 @@ def find_module(self, fullname, path=None): + return None + + def load_module(self, fullname): +- mod = sys.modules.setdefault(fullname, imp.new_module(fullname)) ++ fake_module = object() ++ fake_module.__qualname__ = fullname ++ fake_module.__name__ = fullname.rsplit('.', 1)[-1] ++ mod = sys.modules.setdefault(fullname, fake_module) + mod.__file__, mod.__loader__, mod.__path__ = "", self, [] + mod.__dict__.update(self.mocks[fullname]) + return mod + +From c6b7e621e4696c02bf8f6ea423ffbbf2109748ab Mon Sep 17 00:00:00 2001 +From: Stefan Behnel +Date: Thu, 11 May 2023 10:30:15 +0200 +Subject: [PATCH] Avoid using the deprecated "imp" module. + +Closes https://bugs.launchpad.net/lxml/+bug/2018137 +--- a/src/lxml/html/tests/test_html5parser.py ++++ b/src/lxml/html/tests/test_html5parser.py +@@ -44,7 +44,8 @@ def find_module(self, fullname, path=None): + return None + + def load_module(self, fullname): +- fake_module = object() ++ class Cls: pass ++ fake_module = Cls() + fake_module.__qualname__ = fullname + fake_module.__name__ = fullname.rsplit('.', 1)[-1] + mod = sys.modules.setdefault(fullname, fake_module) + diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-4.9.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-4.9.2.ebuild index 6d7db74809..113c02e07b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-4.9.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-4.9.2.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 optfeature toolchain-funcs @@ -23,7 +23,7 @@ S=${WORKDIR}/lxml-${P} LICENSE="BSD ElementTree GPL-2 PSF-2" 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 ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc examples +threads test" RESTRICT="!test? ( test )" @@ -37,6 +37,7 @@ RDEPEND=" " BDEPEND=" virtual/pkgconfig + =dev-python/cython-0.29.29[${PYTHON_USEDEP}] doc? ( $(python_gen_any_dep ' @@ -53,6 +54,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch + "${FILESDIR}"/${P}-py3.12-drop-deprecated-imp.patch ) python_check_deps() { From 9f432de0fbef7b5dfd4abc81c462faaca6364f5c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:27 +0000 Subject: [PATCH 094/202] dev-python/markupsafe: Sync with Gentoo It's from Gentoo commit d3e7c43c413b26a44ec3462174dbd2f5f4e0fc55. --- .../dev-python/markupsafe/Manifest | 1 + .../markupsafe/markupsafe-2.1.2.ebuild | 5 ++-- .../markupsafe/markupsafe-2.1.3.ebuild | 25 +++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest index b1844af9f7..0424874230 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest @@ -1 +1,2 @@ DIST MarkupSafe-2.1.2.tar.gz 19080 BLAKE2B 560cc052c105c3d9f2690c3e5a2a597dd36848080e3c7d6f8273dcd03bdb613ed54cfe6e53b9ec8053deb38d0d055123da7204a671c1fff3295596d44a63b317 SHA512 84dbeddaf2df713b3cce94eb64876fea8f80c608e25130c18e4691be2b1dea56df8b772d26c0caca88231ef795125eb9678210c33bf20518c18e3047912ddb4b +DIST MarkupSafe-2.1.3.tar.gz 19132 BLAKE2B 1edca84c47c93fddfd22ee2fef2ba3907921ecb2d807c0e105c403d235e5abacba929be94970ad693f4c7d019653ece8255238d825bfc84d1a4a604fb476a783 SHA512 97dcfa9277c8b34e5ebf899069f690452e90943e0f84ba8ffac725263d84e7c2b782294f9f386be31e8b6846505f0ec70835e3965fc76a1ce07b19432de4a7de diff --git a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.2.ebuild index a76184a8e7..419df0ab12 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.2.ebuild @@ -3,10 +3,11 @@ EAPI=8 +DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 PYPI_PN="MarkupSafe" -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{9..12} pypy3 ) inherit distutils-r1 pypi @@ -19,6 +20,6 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.3.ebuild new file mode 100644 index 0000000000..c89064da04 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.3.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYPI_NO_NORMALIZE=1 +PYPI_PN="MarkupSafe" +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + +inherit distutils-r1 pypi + +DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python" +HOMEPAGE=" + https://palletsprojects.com/p/markupsafe/ + https://github.com/pallets/markupsafe/ + https://pypi.org/project/MarkupSafe/ +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + +distutils_enable_tests pytest From b8333107cd956fe8126737720f4497ddb228279c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:28 +0000 Subject: [PATCH 095/202] dev-python/more-itertools: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../dev-python/more-itertools/more-itertools-9.1.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/more-itertools/more-itertools-9.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/more-itertools/more-itertools-9.1.0.ebuild index eb192c8d06..5755901270 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/more-itertools/more-itertools-9.1.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/more-itertools/more-itertools-9.1.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=flit PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" distutils_enable_sphinx docs \ dev-python/sphinx-rtd-theme From cfa693268bf91e55b9c41bfe4454babf73a49fa8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:28 +0000 Subject: [PATCH 096/202] dev-python/nspektr: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../portage-stable/dev-python/nspektr/nspektr-0.4.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/nspektr/nspektr-0.4.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/nspektr/nspektr-0.4.0.ebuild index eefcc665b8..71d24a45e5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/nspektr/nspektr-0.4.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/nspektr/nspektr-0.4.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..12} ) inherit distutils-r1 pypi @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" >=dev-python/jaraco-context-4.1.1-r2[${PYTHON_USEDEP}] From 25bf97a8fcab9c5a25cd82a4af40e2ed8ea78b0a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:28 +0000 Subject: [PATCH 097/202] dev-python/ordered-set: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../dev-python/ordered-set/ordered-set-4.1.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/ordered-set-4.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/ordered-set-4.1.0.ebuild index e8fc5259cc..b68a3c64c3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/ordered-set-4.1.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/ordered-set-4.1.0.ebuild @@ -6,7 +6,7 @@ EAPI=7 DISTUTILS_USE_PEP517=flit PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi @@ -15,6 +15,6 @@ HOMEPAGE="https://github.com/rspeer/ordered-set" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" distutils_enable_tests pytest From 7c8a6e538ed350f177f3caac39c50967a4f11bf0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:29 +0000 Subject: [PATCH 098/202] dev-python/packaging: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../dev-python/packaging/Manifest | 1 - .../packaging/packaging-21.3-r2.ebuild | 2 +- .../packaging/packaging-23.0-r1.ebuild | 37 ------------------- .../packaging/packaging-23.1.ebuild | 4 +- 4 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/packaging/packaging-23.0-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/packaging/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/packaging/Manifest index c12a7c4f95..ffd93c1622 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/packaging/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/packaging/Manifest @@ -1,3 +1,2 @@ DIST packaging-21.3.gh.tar.gz 80471 BLAKE2B a16ba1e74f0c868816131a7cb07b7aa0c14760cf3ad4c3d6737ac30ef99276c33b1f018d29e710f28e8d0cfb0e3e6b91e375d1d17e2b7ec6302164377cd503d0 SHA512 8960deacda26877b73d98a3b632e760e902a16ec7a04707f84044980e4d4fb33e4f584db115c9008066aa876079f28633bafe37fbd5ce9a23830b6b89eb4ae7a -DIST packaging-23.0.gh.tar.gz 84318 BLAKE2B b600fc124e368ce583e16c3f4ee478e5774a830818884ff29c797410675c206b37e3cbac8e9ddd724b40ce53c00b1f0b6a58a9dacc1988e3bf59165b656b134b SHA512 5dd2f4a596e5a1ed01b461a37e063573f5ae08e181df40377a167fe2483205b3d965e10dc403cd173d0f87e0bdcae3cde05bd39024783fbe44541d0f777d94de DIST packaging-23.1.tar.gz 134240 BLAKE2B ef7ef320a98592769078581e32fcc355d05f6fbb7611e7bd83fd2ed64d5f5f5d9c1f89c2a4a91ace1221214a9047e233d8d6a339fd29066b3695137ec5a870bd SHA512 0f2246b8bfeb467623ee72e6fdb7c0416e3b4ba0e00102c1528581e0835cc8e731a812b15e2e429d3ebb0001713d95cc2675f443f4597b092e305a3ef2e9137a diff --git a/sdk_container/src/third_party/portage-stable/dev-python/packaging/packaging-21.3-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/packaging/packaging-21.3-r2.ebuild index e0e787a524..45aaeb4424 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/packaging/packaging-21.3-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/packaging/packaging-21.3-r2.ebuild @@ -18,7 +18,7 @@ SRC_URI=" SLOT="0" LICENSE="|| ( Apache-2.0 BSD-2 )" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" >=dev-python/pyparsing-3.0.7-r1[${PYTHON_USEDEP}] diff --git a/sdk_container/src/third_party/portage-stable/dev-python/packaging/packaging-23.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/packaging/packaging-23.0-r1.ebuild deleted file mode 100644 index 6c5f555c69..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/packaging/packaging-23.0-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 7 -- sys-apps/portage dep -EAPI=7 - -DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Core utilities for Python packages" -HOMEPAGE=" - https://github.com/pypa/packaging/ - https://pypi.org/project/packaging/" -SRC_URI=" - https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" - -SLOT="0" -LICENSE="|| ( Apache-2.0 BSD-2 )" -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" - -RDEPEND=" - >=dev-python/pyparsing-3.0.7-r1[${PYTHON_USEDEP}] - ! pyproject.toml <<-EOF || die - [build-system] - requires = ["flit_core >=3.2,<4"] - build-backend = "flit_core.buildapi" - - [project] - name = "${PN}" - version = "${PV}" - description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".' - EOF - # sigh - cat > src/platformdirs/version.py <<-EOF || die - __version__ = version = '${PV}' - __version_tuple__ = version_tuple = (${PV//./, }) - EOF -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.3.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.3.0.ebuild deleted file mode 100644 index 58e26b5de9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.3.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="A small Python module for determining appropriate platform-specific dirs" -HOMEPAGE=" - https://pypi.org/project/platformdirs/ - https://github.com/platformdirs/platformdirs/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" - -BDEPEND=" - test? ( - dev-python/appdirs[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_configure() { - grep -q 'build-backend = "hatchling' pyproject.toml || - die "Upstream changed build-backend, recheck" - # write a custom pyproject.toml to ease setuptools bootstrap - cat > pyproject.toml <<-EOF || die - [build-system] - requires = ["flit_core >=3.2,<4"] - build-backend = "flit_core.buildapi" - - [project] - name = "${PN}" - version = "${PV}" - description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".' - EOF - # sigh - cat > src/platformdirs/version.py <<-EOF || die - __version__ = version = '${PV}' - __version_tuple__ = version_tuple = (${PV//./, }) - EOF -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.4.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.4.0.ebuild deleted file mode 100644 index 58e26b5de9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.4.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="A small Python module for determining appropriate platform-specific dirs" -HOMEPAGE=" - https://pypi.org/project/platformdirs/ - https://github.com/platformdirs/platformdirs/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" - -BDEPEND=" - test? ( - dev-python/appdirs[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_configure() { - grep -q 'build-backend = "hatchling' pyproject.toml || - die "Upstream changed build-backend, recheck" - # write a custom pyproject.toml to ease setuptools bootstrap - cat > pyproject.toml <<-EOF || die - [build-system] - requires = ["flit_core >=3.2,<4"] - build-backend = "flit_core.buildapi" - - [project] - name = "${PN}" - version = "${PV}" - description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".' - EOF - # sigh - cat > src/platformdirs/version.py <<-EOF || die - __version__ = version = '${PV}' - __version_tuple__ = version_tuple = (${PV//./, }) - EOF -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.5.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.5.0.ebuild deleted file mode 100644 index 58e26b5de9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.5.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="A small Python module for determining appropriate platform-specific dirs" -HOMEPAGE=" - https://pypi.org/project/platformdirs/ - https://github.com/platformdirs/platformdirs/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" - -BDEPEND=" - test? ( - dev-python/appdirs[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_configure() { - grep -q 'build-backend = "hatchling' pyproject.toml || - die "Upstream changed build-backend, recheck" - # write a custom pyproject.toml to ease setuptools bootstrap - cat > pyproject.toml <<-EOF || die - [build-system] - requires = ["flit_core >=3.2,<4"] - build-backend = "flit_core.buildapi" - - [project] - name = "${PN}" - version = "${PV}" - description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".' - EOF - # sigh - cat > src/platformdirs/version.py <<-EOF || die - __version__ = version = '${PV}' - __version_tuple__ = version_tuple = (${PV//./, }) - EOF -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.5.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.5.1.ebuild index 58e26b5de9..c890201db8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.5.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/platformdirs/platformdirs-3.5.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" BDEPEND=" test? ( From b35f0dade93a591ce0937ce38046c9a513cfbd25 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:29 +0000 Subject: [PATCH 100/202] dev-python/pydantic: Sync with Gentoo It's from Gentoo commit 96d8051f9a65cd50eef8bebb250e48297e42c76d. --- .../dev-python/pydantic/Manifest | 2 + .../pydantic/pydantic-1.10.7.ebuild | 4 +- .../pydantic/pydantic-1.10.8.ebuild | 91 +++++++++++++++++++ .../pydantic/pydantic-2.0_beta2.ebuild | 49 ++++++++++ 4 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pydantic/pydantic-1.10.8.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pydantic/pydantic-2.0_beta2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pydantic/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/pydantic/Manifest index e7a07de2a6..fe208aff3f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pydantic/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/pydantic/Manifest @@ -1 +1,3 @@ DIST pydantic-1.10.7.gh.tar.gz 903379 BLAKE2B b2dd75a640ca54024a2bf141117a1d738a30a4630bed8f4d0169fc5a6a55ded719727d88c7e78b9a2acc3aec68482e9be8c8bf4776fef668fe4acc3e1fd775df SHA512 948a7935b374719773df50243aed708b3c6789243b9aa0ba239cf1502ddd0e0cec4d701e108f1cc78090c088f3cb1c78b840c39f5e7ad0e61739776f552f284d +DIST pydantic-1.10.8.gh.tar.gz 765592 BLAKE2B 0b4cc273ce6fad20baa7c8bd87ef32199cb003f52b8e9aa19eda6359ca0e5c30152c7f25d2bb146ec23027011895cf44d9eb051c6ca609fb00e3d7b5f6089e4e SHA512 3ac41cdf0eb70fb71298131a043966b85387bc953ef2f463ece80728b46251d5d5f66c3f030afc3cdf4527918ae410fcd733a774cbe0c3b7ba9fc806a76378e4 +DIST pydantic-2.0b2.tar.gz 527380 BLAKE2B 214c740ecaed3cf4e7ed1e06d75ce17b37028e41c6a7abc4174b201691e31725123f89430c430a514c59973dc327d2b8fcd21c5ef0a47aaa48fafaf7e322d7a1 SHA512 49cc058c91e48638f9809ca77d9c486e3bdfc05e1546b19ca7e419f41e152998f750cfb58927ad8189913859d27fff68de0e5848599baaf816404e0f58fd6646 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pydantic/pydantic-1.10.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pydantic/pydantic-1.10.7.ebuild index 4c4bf70203..a26efaab1c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pydantic/pydantic-1.10.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/pydantic/pydantic-1.10.7.ebuild @@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+native-extensions" RDEPEND=" @@ -34,10 +34,10 @@ BDEPEND=" dev-python/cython[${PYTHON_USEDEP}] ) test? ( + >=dev-python/email-validator-1.2.1[${PYTHON_USEDEP}] dev-python/hypothesis[${PYTHON_USEDEP}] dev-python/pytest-mock[${PYTHON_USEDEP}] dev-python/python-dotenv[${PYTHON_USEDEP}] - >=dev-python/python-email-validator-1.2.1[${PYTHON_USEDEP}] ) " diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pydantic/pydantic-1.10.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pydantic/pydantic-1.10.8.ebuild new file mode 100644 index 0000000000..6638bf3876 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pydantic/pydantic-1.10.8.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( pypy3 python3_{10..12} ) + +inherit distutils-r1 + +MY_P=${P/_beta/b} +DESCRIPTION="Data parsing and validation using Python type hints" +HOMEPAGE=" + https://github.com/pydantic/pydantic/ + https://pypi.org/project/pydantic/ +" +SRC_URI=" + https://github.com/pydantic/pydantic/archive/v${PV/_beta/b}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+native-extensions" + +RDEPEND=" + >=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}] +" +BDEPEND=" + native-extensions? ( + =dev-python/email-validator-1.2.1[${PYTHON_USEDEP}] + dev-python/hypothesis[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/python-dotenv[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_prepare() { + sed -i -e '/CFLAGS/d' setup.py || die + distutils-r1_src_prepare +} + +python_compile() { + if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then + # do not build extensions on PyPy to workaround + # https://github.com/cython/cython/issues/4763 + local -x SKIP_CYTHON=1 + fi + distutils-r1_python_compile +} + +python_test() { + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + local -x PYTEST_PLUGINS=pytest_mock + + local EPYTEST_DESELECT=( + # flaky test, known upstream + tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields + # mypy linting causes regressions with new mypy versions + tests/mypy + ) + case ${EPYTHON} in + pypy3) + EPYTEST_DESELECT+=( + tests/test_private_attributes.py::test_private_attribute + tests/test_private_attributes.py::test_private_attribute_annotation + tests/test_private_attributes.py::test_private_attribute_factory + tests/test_private_attributes.py::test_private_attribute_multiple_inheritance + tests/test_private_attributes.py::test_underscore_attrs_are_private + ) + ;; + python3.12) + EPYTEST_DESELECT+=( + tests/test_abc.py::test_model_subclassing_abstract_base_classes_without_implementation_raises_exception + tests/test_generics.py::test_partial_specification_name + tests/test_generics.py::test_parse_generic_json + tests/test_types.py::test_secretfield + ) + ;; + esac + rm -rf pydantic || die + epytest +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pydantic/pydantic-2.0_beta2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pydantic/pydantic-2.0_beta2.ebuild new file mode 100644 index 0000000000..4160bd9fd8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pydantic/pydantic-2.0_beta2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..11} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Data parsing and validation using Python type hints" +HOMEPAGE=" + https://github.com/pydantic/pydantic/ + https://pypi.org/project/pydantic/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="" + +RDEPEND=" + >=dev-python/annotated-types-0.4.0[${PYTHON_USEDEP}] + >=dev-python/pydantic-core-0.38.0[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-4.6.1[${PYTHON_USEDEP}] +" +BDEPEND=" + >=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}] + test? ( + dev-python/dirty-equals[${PYTHON_USEDEP}] + >=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_test() { + local EPYTEST_DESELECT=( + # expect -Werror + tests/test_deprecated.py::test_extra_used_as_enum + ) + local EPYTEST_IGNORE=( + # require pytest-examples + tests/test_docs.py + ) + + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest -p pytest_mock +} From 956de5da2229e7be8890b4bfeb64d06a67b89b75 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:31 +0000 Subject: [PATCH 101/202] dev-python/pygments: Sync with Gentoo It's from Gentoo commit 8a8fbe09f6e1278e501ae2a18bf14416f2b4d958. --- .../portage-stable/dev-python/pygments/pygments-2.15.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.15.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.15.1.ebuild index 7ee548a6c8..34876ce3c0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.15.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.15.1.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 PYPI_PN=${PN^} -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 bash-completion-r1 pypi From 080b51efb519abf0d99da801964a5731cbabd619 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:32 +0000 Subject: [PATCH 102/202] dev-python/pyparsing: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/dev-python/pyparsing/Manifest | 2 +- .../dev-python/pyparsing/pyparsing-3.0.9.ebuild | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/Manifest index fef86e5a9f..27ccb20466 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/Manifest @@ -1 +1 @@ -DIST pyparsing_3.0.9.tar.gz 967771 BLAKE2B c13c74661b9e0d53b4886c9949b01951d220991f916362a13ce0c32c0ab05a6b1cab4d5e5a626acb7563c0ec1716348ede205cb67bf22c0710904f07404ad82a SHA512 1158f27e31f8eced540217b7234b09005eac416fad74faf59678fdae93fe2f76e0e3b5f4adfd3ceb42c8aef19150950293e989c9a5189741175073eb7a03cd6d +DIST pyparsing_3.0.9.gh.tar.gz 967771 BLAKE2B c13c74661b9e0d53b4886c9949b01951d220991f916362a13ce0c32c0ab05a6b1cab4d5e5a626acb7563c0ec1716348ede205cb67bf22c0710904f07404ad82a SHA512 1158f27e31f8eced540217b7234b09005eac416fad74faf59678fdae93fe2f76e0e3b5f4adfd3ceb42c8aef19150950293e989c9a5189741175073eb7a03cd6d diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.9.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.9.ebuild index 3958b58369..c5fedf26d5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/pyparsing/pyparsing-3.0.9.ebuild @@ -5,19 +5,25 @@ EAPI=7 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 MY_P=${P/-/_} DESCRIPTION="Easy-to-use Python module for text parsing" -HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz" +HOMEPAGE=" + https://github.com/pyparsing/pyparsing/ + https://pypi.org/project/pyparsing/ +" +SRC_URI=" + https://github.com/pyparsing/pyparsing/archive/${MY_P}.tar.gz + -> ${MY_P}.gh.tar.gz +" S="${WORKDIR}/${PN}-${MY_P}" LICENSE="MIT" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="examples" distutils_enable_tests pytest From c0eef3971930c5c9857b79f95d3e0986b6db7124 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:32 +0000 Subject: [PATCH 103/202] dev-python/setuptools: Sync with Gentoo It's from Gentoo commit 0b1a640394fdb8ec40e69edcfc66fd95e46ff375. --- .../dev-python/setuptools/Manifest | 3 - .../setuptools/setuptools-67.6.1.ebuild | 128 ------------------ .../setuptools/setuptools-67.7.0.ebuild | 128 ------------------ .../setuptools/setuptools-67.7.1.ebuild | 128 ------------------ .../setuptools/setuptools-67.7.2.ebuild | 2 +- .../setuptools/setuptools-67.8.0.ebuild | 4 +- 6 files changed, 2 insertions(+), 391 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-67.6.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-67.7.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-67.7.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest index 7393c222a0..af75d90824 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/Manifest @@ -1,5 +1,2 @@ -DIST setuptools-67.6.1.tar.gz 2486256 BLAKE2B 7827eec689b6a4463888137660489a29cd6aa67a14f0cf42ece78463788d74b97bd951b75c48c185c5c33d5bea29c44c8660649bf79035012bc75b915e9d0a42 SHA512 197910ad4c4058af0107e240d2e27bc2c1ff373cb3fba33af09eb3cc42614c45e4bb73a65802f253466eafd94517e08b51e98f50213817ad03d88ee0ccf9adbc -DIST setuptools-67.7.0.tar.gz 2491327 BLAKE2B 3d1e89cf5b2753883397ff3a668dbfcef41c57775bd1871ada69c11a7deffe53fd4c4036b5c98146ec0496b1be86df1522c64cc981acb5ec192bd93bd800c2de SHA512 39502337b5d7f710c55219ab970a5cab23e8987598af722ad231d2dea2e1dfaaddb09dc698a5746a719b36e5e3065c48ecee2ac428e4d41470bec6ad3c99daf6 -DIST setuptools-67.7.1.tar.gz 2491346 BLAKE2B 2eb89badcbfec51fb3deca5f4267036305569bf42677b87c9eeb7cecd902c121ffc6725506bfa0ba3ac50e06c036a520dd14b6193ff048e21ed80dfeb1c93602 SHA512 c90a6ad0c215540dfd93d5c88126dab15499deb80ed601f4a90c92dfdff5fed6ff168fb8e6b9dc5ba8b1f067114d383400df390b2eebd934e2e728c3b56886af DIST setuptools-67.7.2.tar.gz 2491608 BLAKE2B bd77a85081e95813cdd8fc1f63b768c73036b2f49103defcfd09ba9df7b2c5dba84d4f1aca553e0642ab8d764ae390310f1c6bebbae31736d1b5c16802cdc0e5 SHA512 06db096193ef52111f064c327daefb12ea2bb2ebc6712436bae01f986165455fe89a1d2220cbaaa6391a182e2aee19b9cf7a709c158af8c5ab6232dfbc258bd9 DIST setuptools-67.8.0.tar.gz 2492475 BLAKE2B 37c34605a58b41e14300e389402fe6debf9eeed20c72ddf53fa798b41484d1522d2b5313c74eb69a687eaf32c225f0931f901f452aebf6f7023b2419d127b808 SHA512 5dda7082fc563ce73d810efc9cdbccb8649fef2eac52f1a902c76ab5ec67a87ff64e36e918d0e3b168f5214d787bdc22e8ef9adeccb77d8d368dcbb48f5fb35d diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-67.6.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-67.6.1.ebuild deleted file mode 100644 index 164d1f7d02..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-67.6.1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 8 -- sys-apps/portage dep -EAPI=8 - -# please bump dev-python/ensurepip-setuptools along with this package! - -DISTUTILS_USE_PEP517=standalone -PYTHON_TESTED=( python3_{9..11} pypy3 ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 multiprocessing pypi - -DESCRIPTION="Collection of extensions to Distutils" -HOMEPAGE=" - https://github.com/pypa/setuptools/ - https://pypi.org/project/setuptools/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}] - >=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}] - >=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}] - >=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}] - >=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}] - >=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}] - >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/importlib-metadata-4.11.1[${PYTHON_USEDEP}] - ' 3.9) -" -BDEPEND=" - ${RDEPEND} - >=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}] - test? ( - $(python_gen_cond_dep ' - dev-python/build[${PYTHON_USEDEP}] - >=dev-python/ini2toml-0.9[${PYTHON_USEDEP}] - >=dev-python/filelock-3.4.0[${PYTHON_USEDEP}] - >=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}] - >=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/pip-run[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-fixture-config[${PYTHON_USEDEP}] - dev-python/pytest-timeout[${PYTHON_USEDEP}] - dev-python/pytest-virtualenv[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - >=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}] - >=dev-python/virtualenv-20[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - ' "${PYTHON_TESTED[@]}") - ) -" -PDEPEND=" - >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}] - dev-python/setuptools-scm[${PYTHON_USEDEP}] -" - -DOCS=( {CHANGES,README}.rst ) - -src_prepare() { - local PATCHES=( - # TODO: remove this when we're 100% PEP517 mode - "${FILESDIR}"/setuptools-62.4.0-py-compile.patch - ) - - distutils-r1_src_prepare - - # remove bundled dependencies, setuptools will switch to system deps - # automatically - rm -r */_vendor || die - - # remove the ugly */extern hack that breaks on unvendored deps - rm -r */extern || die - find -name '*.py' -exec sed \ - -e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \ - -i {} + || die -} - -python_test() { - local -x SETUPTOOLS_USE_DISTUTILS=stdlib - - if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then - return - fi - - local EPYTEST_DESELECT=( - # network - # TODO: see if PRE_BUILT_SETUPTOOLS_* helps - setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg - setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist - setuptools/tests/test_build_meta.py::test_legacy_editable_install - setuptools/tests/test_distutils_adoption.py - setuptools/tests/test_editable_install.py - setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests - setuptools/tests/test_virtualenv.py::test_clean_env_install - setuptools/tests/test_virtualenv.py::test_no_missing_dependencies - setuptools/tests/test_virtualenv.py::test_test_command_install_requirements - # TODO - setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic - setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors - setuptools/tests/test_extern.py::test_distribution_picklable - # expects bundled deps in virtualenv - setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist - setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel - setuptools/tests/test_editable_install.py::test_editable_with_pyproject - # fails if python-xlib is installed - setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts - ) - - if has_version " Date: Mon, 5 Jun 2023 07:12:32 +0000 Subject: [PATCH 104/202] dev-python/setuptools-scm: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild index 515bec3c7b..aefcbded94 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" dev-python/packaging[${PYTHON_USEDEP}] From f7cab5a41725d2772a9c5bf4c45b3df4382e13a3 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:33 +0000 Subject: [PATCH 105/202] dev-python/six: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/dev-python/six/six-1.16.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/six/six-1.16.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/six/six-1.16.0-r1.ebuild index 5803cfb422..3f3d34b724 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/six/six-1.16.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/six/six-1.16.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="MIT" 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" distutils_enable_sphinx documentation --no-autodoc distutils_enable_tests pytest From ee90ec63484744f18c05e01e4b1f6a18a4a9be90 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:33 +0000 Subject: [PATCH 106/202] dev-python/snakeoil: Sync with Gentoo It's from Gentoo commit 8b912c36fa49d5644fe495131cad6cfb2f293814. --- .../portage-stable/dev-python/snakeoil/snakeoil-0.10.5.ebuild | 2 +- .../portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.5.ebuild index 482fefe4c7..213d63db99 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.5.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild index 74a0f38c31..d61275cf84 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 From 1c9dd2c75083fd7d4bff49447f4034d2f7a39af1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:33 +0000 Subject: [PATCH 107/202] dev-python/tomli: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../portage-stable/dev-python/tomli/tomli-2.0.1-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-2.0.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-2.0.1-r1.ebuild index c16784aaae..c54478954c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-2.0.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/tomli/tomli-2.0.1-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 DISTUTILS_USE_PEP517=no -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi @@ -22,7 +22,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND=" app-arch/unzip From 7b1b9fb99afba0cf2750dde8e70e45302d546636 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:33 +0000 Subject: [PATCH 108/202] dev-python/typing-extensions: Sync with Gentoo It's from Gentoo commit 1ce8b4a97dd244a8a588ad5ca2111708bf948a3f. --- .../dev-python/typing-extensions/Manifest | 3 ++ .../typing-extensions-4.5.0.ebuild | 2 +- .../typing-extensions-4.6.0.ebuild | 32 +++++++++++++++++++ .../typing-extensions-4.6.1.ebuild | 32 +++++++++++++++++++ .../typing-extensions-4.6.3.ebuild | 32 +++++++++++++++++++ 5 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.6.0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.6.1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.6.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/Manifest index 47c6d4b387..18d6c273bf 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/Manifest @@ -1 +1,4 @@ DIST typing_extensions-4.5.0.gh.tar.gz 52431 BLAKE2B 3d905e4f1146d23d00b695044daf653722fce9ade8f44730116bab0b8fb15c3e8d2124a6b0d395fad078878e0e4b7888e19660ca2491ccc9ec01dc11ce318fc8 SHA512 29369da83cdca57aba7d8c2089c77ad265eeb614fd34056f678e6dc9374558d1059ff2c514326115734fadbcad27ec98e1e5fcec087022a9d838cc2bfd1fe825 +DIST typing_extensions-4.6.0.gh.tar.gz 70037 BLAKE2B e5a287e839dc932b3f5777a8c575e725d414cbd5ff1444a9f67c8898866eb3863b0de4f107c5ffe73756d37e47b7a1dae4d69fead42fb887126479891bff5b17 SHA512 d78188c52ea6bf77852c5ac3e4601f9fca6fe3247974269ced8dc53e9b8c971446ff5501558200000757336a84d73db1e6e9fe89afd7cc26e025a97426475bb4 +DIST typing_extensions-4.6.1.gh.tar.gz 71263 BLAKE2B 4c4b91fd92620f9cbefd807103d035ebad46f3c384fc4a5b7f6fc9f0209ad267e2b752992628fa537f6ef2191e598223794ddd915d4a3ea89fd6a67dead346ea SHA512 c75553e7e5ade1f9e60a5432c76207452ede2c39533e9cd696e10ff36068e14bf0fe809a31a4a5d0a228228300e30d221af698c093c35dcc67338615ac77aaf7 +DIST typing_extensions-4.6.3.gh.tar.gz 75114 BLAKE2B 2c6761d26de5ce4a09c2957e93225798d282dcbc5689921f72acd2ccc338e458e21b2b73884af4a329c65f1a7eed7898e13e87fdab7fce757b4927adcdb09770 SHA512 4c8dd4e1494ed504466f3188146059203f9ce37b8f2d9f70929c1bffa7e58bee87c3ef01162cedb55ba3fd048cec0da96cc4141b25ba76dc32c7d493a69efeab diff --git a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.5.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.5.0.ebuild index 7210d9e348..273e62cd18 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.5.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.5.0.ebuild @@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P} LICENSE="PSF-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" distutils_enable_tests unittest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.6.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.6.0.ebuild new file mode 100644 index 0000000000..df5b00b2ff --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.6.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=flit +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + +inherit distutils-r1 + +MY_P=${P/-/_} +DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+" +HOMEPAGE=" + https://pypi.org/project/typing-extensions/ + https://github.com/python/typing_extensions/ +" +SRC_URI=" + https://github.com/python/typing_extensions/archive/${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +distutils_enable_tests unittest + +python_test() { + cd src || die + eunittest +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.6.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.6.1.ebuild new file mode 100644 index 0000000000..df5b00b2ff --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.6.1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=flit +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + +inherit distutils-r1 + +MY_P=${P/-/_} +DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+" +HOMEPAGE=" + https://pypi.org/project/typing-extensions/ + https://github.com/python/typing_extensions/ +" +SRC_URI=" + https://github.com/python/typing_extensions/archive/${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +distutils_enable_tests unittest + +python_test() { + cd src || die + eunittest +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.6.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.6.3.ebuild new file mode 100644 index 0000000000..df5b00b2ff --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/typing-extensions/typing-extensions-4.6.3.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=flit +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + +inherit distutils-r1 + +MY_P=${P/-/_} +DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+" +HOMEPAGE=" + https://pypi.org/project/typing-extensions/ + https://github.com/python/typing_extensions/ +" +SRC_URI=" + https://github.com/python/typing_extensions/archive/${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +distutils_enable_tests unittest + +python_test() { + cd src || die + eunittest +} From a21786d75f3b8264215d63242ef95b3aabc1fa8e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:34 +0000 Subject: [PATCH 109/202] dev-python/wheel: Sync with Gentoo It's from Gentoo commit 899f9ae407fce5807661f2976fee77e10eaf74ea. --- .../portage-stable/dev-python/wheel/wheel-0.40.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/wheel/wheel-0.40.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/wheel/wheel-0.40.0.ebuild index b078248e22..91ac147ace 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/wheel/wheel-0.40.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/wheel/wheel-0.40.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{9..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) inherit distutils-r1 pypi From 0638b554974459882bcb8b9a540e696529421d12 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:34 +0000 Subject: [PATCH 110/202] dev-util/b2: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../src/third_party/portage-stable/dev-util/b2/b2-4.9.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.6.ebuild index b7e29d4328..a12cd6f652 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.6.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src" LICENSE="Boost-1.0" 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="examples" RESTRICT="test" From 721e71ef57040d4f8a8dfdb1473898c271041893 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:37 +0000 Subject: [PATCH 111/202] dev-util/cmake: Sync with Gentoo It's from Gentoo commit a3f5fa43c40b316bcef0ccac76d2539f4b09bf43. --- .../portage-stable/dev-util/cmake/cmake-3.24.3.ebuild | 2 +- .../portage-stable/dev-util/cmake/cmake-3.25.3.ebuild | 2 +- .../portage-stable/dev-util/cmake/cmake-3.26.3.ebuild | 2 +- .../portage-stable/dev-util/cmake/cmake-3.26.4-r1.ebuild | 2 +- .../third_party/portage-stable/dev-util/cmake/cmake-9999.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.24.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.24.3.ebuild index 835f3a198d..62c47b41fd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.24.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.24.3.ebuild @@ -47,7 +47,7 @@ else https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )" fi diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.3.ebuild index 35212b661e..ace3c4677a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.3.ebuild @@ -47,7 +47,7 @@ else https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )" fi diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.3.ebuild index da765ef9cb..7ea050dcce 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.3.ebuild @@ -48,7 +48,7 @@ else https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc )" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )" fi diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.4-r1.ebuild index a2b661bbcd..4af9aa1677 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.4-r1.ebuild @@ -48,7 +48,7 @@ else https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )" fi diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-9999.ebuild index a2b661bbcd..6b56560db3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-9999.ebuild @@ -48,7 +48,7 @@ else https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )" fi From 1d0a3b6b2b37b94e27386cbc4ab9c4814f5a91ad Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:39 +0000 Subject: [PATCH 112/202] dev-util/desktop-file-utils: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../desktop-file-utils/desktop-file-utils-0.26-r1.ebuild | 2 +- .../desktop-file-utils/desktop-file-utils-0.26-r2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild index 2cce1246a3..33328074b1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" IUSE="emacs" RDEPEND=">=dev-libs/glib-2.12:2" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild index 341610f8b3..a782aad33e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" IUSE="emacs" RDEPEND=">=dev-libs/glib-2.12:2" From 2e64866ebce1c1fc9e8fab5559d47d61cf7cbbd6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:39 +0000 Subject: [PATCH 113/202] dev-util/gdbus-codegen: Sync with Gentoo It's from Gentoo commit 214971a1af7edd43d423a590d17f8cff8f36526e. --- .../dev-util/gdbus-codegen/Manifest | 1 + .../gdbus-codegen/gdbus-codegen-2.76.3.ebuild | 74 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.76.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest index 37d2aa1b2b..8ad462b9a2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest @@ -1 +1,2 @@ DIST glib-2.76.2.tar.xz 5273836 BLAKE2B db5d5e45fe4a17bade7f5bf923ac0e5541237d19146ede33b4d52f05b82e4ecb94519393f49ac3b04e17d0f56bfd5dd99b8e81ae80956cfdb5cb2396cd5ec8cc SHA512 5a99723d72ae987999bdf3eac4f3cabe2e014616038f2006e84060b97d6d290b7d44a20d700e9c0f4572a6defed56169f624bcd21b0337f32832b311aa2737e6 +DIST glib-2.76.3.tar.xz 5273460 BLAKE2B 894635281d1a3eb60d274b8db91cd59069b6d0abe61295175c794ad44e8669d869009fac44c7d6f416a93adcea5b9aeb90b944047d013fa1f2d9b1a8ded3de1e SHA512 291b8913918d411b679442b888f56893a857a77decfe428086c8bd1da1949498938ddb0bf254ed99d192e4a09b5e8cee1905fd6932ee642463fb229cac7c226e diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.76.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.76.3.ebuild new file mode 100644 index 0000000000..631cc2c2b1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.76.3.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +GNOME_ORG_MODULE="glib" +PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_REQ_USE="xml(+)" +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_SINGLE_IMPL=1 + +inherit gnome.org distutils-r1 + +DESCRIPTION="GDBus code and documentation generator" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/libxslt + app-text/docbook-xsl-stylesheets +" + +S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" + +python_prepare_all() { + PATCHES=( + "${FILESDIR}/${PN}-2.56.1-sitedir.patch" + ) + distutils-r1_python_prepare_all + + local MAJOR_VERSION=$(ver_cut 1) + local MINOR_VERSION=$(ver_cut 2) + sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die + sed -e "s:@VERSION@:${PV}:" \ + -e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \ + -e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die + cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed" + sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed" +} + +do_xsltproc_command() { + # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils) + xsltproc \ + --nonet \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 \ + -o "${2}" \ + http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ + "${1}" || die "manpage generation failed" +} + +src_compile() { + distutils-r1_src_compile + do_xsltproc_command \ + "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" \ + "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} + +src_test() { + einfo "Skipping tests. This package is tested by dev-libs/glib" + einfo "when merged with FEATURES=test" +} + +python_install_all() { + distutils-r1_python_install_all # no-op, but prevents QA warning + doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} From 87436c03cd4c69270d3a228b583b75c7b79cd57b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:39 +0000 Subject: [PATCH 114/202] dev-util/glib-utils: Sync with Gentoo It's from Gentoo commit e57424b8dfa2f6cd978b1b537b6bd7e18a2b1374. --- .../dev-util/glib-utils/Manifest | 1 + .../glib-utils/glib-utils-2.76.2.ebuild | 2 +- .../glib-utils/glib-utils-2.76.3.ebuild | 62 +++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.76.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest index 37d2aa1b2b..8ad462b9a2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest @@ -1 +1,2 @@ DIST glib-2.76.2.tar.xz 5273836 BLAKE2B db5d5e45fe4a17bade7f5bf923ac0e5541237d19146ede33b4d52f05b82e4ecb94519393f49ac3b04e17d0f56bfd5dd99b8e81ae80956cfdb5cb2396cd5ec8cc SHA512 5a99723d72ae987999bdf3eac4f3cabe2e014616038f2006e84060b97d6d290b7d44a20d700e9c0f4572a6defed56169f624bcd21b0337f32832b311aa2737e6 +DIST glib-2.76.3.tar.xz 5273460 BLAKE2B 894635281d1a3eb60d274b8db91cd59069b6d0abe61295175c794ad44e8669d869009fac44c7d6f416a93adcea5b9aeb90b944047d013fa1f2d9b1a8ded3de1e SHA512 291b8913918d411b679442b888f56893a857a77decfe428086c8bd1da1949498938ddb0bf254ed99d192e4a09b5e8cee1905fd6932ee642463fb229cac7c226e diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.76.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.76.2.ebuild index d94a24e0b1..4ba09d56ba 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.76.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.76.2.ebuild @@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+" SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature REQUIRED_USE="${PYTHON_REQUIRED_USE}" -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 ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.76.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.76.3.ebuild new file mode 100644 index 0000000000..ae99e9487c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.76.3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..12} ) +GNOME_ORG_MODULE="glib" + +inherit gnome.org python-single-r1 + +DESCRIPTION="Build utilities for GLib using projects" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2.1+" +SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/libxslt + app-text/docbook-xsl-stylesheets +" + +src_configure() { :; } + +do_xsltproc_command() { + # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen) + xsltproc \ + --nonet \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 \ + -o "${2}" \ + http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ + "${1}" || die "manpage generation failed" +} + +src_compile() { + sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die + sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die + sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die + do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1 + do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1 + do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1 +} + +src_install() { + python_fix_shebang gobject/glib-genmarshal + python_fix_shebang gobject/glib-mkenums + python_fix_shebang glib/gtester-report + exeinto /usr/bin + doexe gobject/glib-genmarshal + doexe gobject/glib-mkenums + doexe glib/gtester-report + doman docs/reference/gobject/glib-genmarshal.1 + doman docs/reference/gobject/glib-mkenums.1 + doman docs/reference/glib/gtester-report.1 +} From cd1199c901f326480f4d29f35689c912cc3e7b97 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:39 +0000 Subject: [PATCH 115/202] dev-util/gperf: Sync with Gentoo It's from Gentoo commit bd7cb186c573e4c26d83a4fd62b06e201182c847. --- .../dev-util/gperf/gperf-3.1-r1.ebuild | 2 +- .../dev-util/gperf/gperf-3.1.ebuild | 20 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r1.ebuild index ab2b4430c8..b38d7b462b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz" LICENSE="GPL-2" 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 ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" PATCHES=( "${FILESDIR}"/${P}-strncmp-decl-mismatch.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1.ebuild deleted file mode 100644 index 6825ce198e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A perfect hash function generator" -HOMEPAGE="https://www.gnu.org/software/gperf/" -SRC_URI="mirror://gnu/gperf/${P}.tar.gz" - -LICENSE="GPL-2" -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 ~x86-winnt" - -src_prepare() { - sed -i \ - -e "/^CPPFLAGS /s:=:+=:" \ - */Makefile.in || die #444078 - - default -} From 50c122af0d663ccceb66eb1ba047f3cfee5190d4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:40 +0000 Subject: [PATCH 116/202] dev-util/gtk-doc-am: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild index 64b206633f..dd679668c4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc" LICENSE="GPL-2 FDL-1.1" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND="! Date: Mon, 5 Jun 2023 07:12:40 +0000 Subject: [PATCH 117/202] dev-util/meson: Sync with Gentoo It's from Gentoo commit 1292056c79ced3da796f6363bb3f61f8a5e6fe80. --- .../portage-stable/dev-util/meson/Manifest | 1 + .../dev-util/meson/meson-1.0.1.ebuild | 2 +- .../dev-util/meson/meson-1.1.0.ebuild | 4 +- .../dev-util/meson/meson-1.1.1.ebuild | 121 ++++++++++++++++++ .../dev-util/meson/meson-9999.ebuild | 4 +- 5 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.1.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest index ea84ae7a34..8cdf77e140 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest @@ -1,2 +1,3 @@ DIST meson-1.0.1.tar.gz 2104183 BLAKE2B 23b47a2231da966de8da3032887a81458b795d5c0c1d35cf9e3ea1499f7ddbc28d1cc3ca469052c4b33c51fcf9f92a36dab44da0133d748afdbf4e5b260427f1 SHA512 3d2e2630f9eacf2fd999d5068d82b2a719400a55cfdea5d38253410a3ee74def638ac09622bceb72edf7bc867ae3de6a5f48c1846601e7e4b5afdf3ac9339ebc DIST meson-1.1.0.tar.gz 2124254 BLAKE2B 149dedc0e49b72682fa053f27f9a6c2543362539861b4b79ce65ecf4d913e221ac2d63f3b9aa350bd7622851c73be418b804ae1131dd27607eb01218e0204a5e SHA512 b8968becd1de25d8e92ecbe4c3b50694269a463430b41fcf5206f35ac952507b01f316721fb36f8c7940437e35c3588f6a4504f5b8256fa47fd9b0ceb588ae39 +DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a SHA512 c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.0.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.0.1.ebuild index d85cf742ad..0a5fa1cdd6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.0.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.0.1.ebuild @@ -16,7 +16,7 @@ else S=${WORKDIR}/${MY_P} if [[ ${PV} != *_rc* ]] ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi fi diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.1.0.ebuild index 85ac9b28d6..c9781cdd78 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.1.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.1.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools if [[ ${PV} = *9999* ]]; then @@ -16,7 +16,7 @@ else S=${WORKDIR}/${MY_P} if [[ ${PV} != *_rc* ]] ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi fi diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.1.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.1.1.ebuild new file mode 100644 index 0000000000..e9da33425e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.1.1.ebuild @@ -0,0 +1,121 @@ +# Copyright 2016-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/mesonbuild/meson" + inherit git-r3 +else + inherit pypi + + MY_P=${P/_/} + S=${WORKDIR}/${MY_P} + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi +fi + +inherit bash-completion-r1 distutils-r1 toolchain-funcs + +DESCRIPTION="Open source build system" +HOMEPAGE="https://mesonbuild.com/" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + test? ( + dev-libs/glib:2 + dev-libs/gobject-introspection + dev-util/ninja + dev-vcs/git + sys-libs/zlib[static-libs(+)] + virtual/pkgconfig + ) +" +RDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.63-xtools-support.patch +) + +python_prepare_all() { + local disable_unittests=( + # ASAN and sandbox both want control over LD_PRELOAD + # https://bugs.gentoo.org/673016 + -e 's/test_generate_gir_with_address_sanitizer/_&/' + + # ASAN is unsupported on some targets + # https://bugs.gentoo.org/692822 + -e 's/test_pch_with_address_sanitizer/_&/' + + # https://github.com/mesonbuild/meson/issues/7203 + -e 's/test_templates/_&/' + + # Broken due to python2 wrapper + -e 's/test_python_module/_&/' + ) + + sed -i "${disable_unittests[@]}" unittests/*.py || die + + # Broken due to python2 script created by python_wrapper_setup + rm -r "test cases/frameworks/1 boost" || die + + distutils-r1_python_prepare_all +} + +src_test() { + tc-export PKG_CONFIG + if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then + ewarn "Found Qt5Core but not Qt5Gui; skipping tests" + else + distutils-r1_src_test + fi +} + +python_test() { + ( + # test_meson_installed + unset PYTHONDONTWRITEBYTECODE + + # https://bugs.gentoo.org/687792 + unset PKG_CONFIG + + # test_cross_file_system_paths + unset XDG_DATA_HOME + + # 'test cases/unit/73 summary' expects 80 columns + export COLUMNS=80 + + # If JAVA_HOME is not set, meson looks for javac in PATH. + # If javac is in /usr/bin, meson assumes /usr/include is a valid + # JDK include path. Setting JAVA_HOME works around this broken + # autodetection. If no JDK is installed, we should end up with an empty + # value in JAVA_HOME, and the tests should get skipped. + export JAVA_HOME=$(java-config -O 2>/dev/null) + + # Call python3 instead of EPYTHON to satisfy test_meson_uninstalled. + python3 run_tests.py + ) || die "Testing failed with ${EPYTHON}" +} + +python_install_all() { + distutils-r1_python_install_all + + insinto /usr/share/vim/vimfiles + doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax} + + insinto /usr/share/zsh/site-functions + doins data/shell-completions/zsh/_meson + + dobashcomp data/shell-completions/bash/meson +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild index 85ac9b28d6..c9781cdd78 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools if [[ ${PV} = *9999* ]]; then @@ -16,7 +16,7 @@ else S=${WORKDIR}/${MY_P} if [[ ${PV} != *_rc* ]] ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi fi From 887a17ecdc393d4b75bf60dd604071902963a489 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:40 +0000 Subject: [PATCH 118/202] dev-util/meson-format-array: Sync with Gentoo It's from Gentoo commit 1a0ada1cae7ee649a0ef6cc34d332da83d81b40d. --- .../dev-util/meson-format-array/meson-format-array-0.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/meson-format-array-0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/meson-format-array-0.ebuild index a7994c74da..1800171ff9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/meson-format-array-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/meson-format-array-0.ebuild @@ -1,8 +1,8 @@ # Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) inherit python-r1 @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" LICENSE="GPL-2" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS}" From a10299df26198d8126dd96cd96b7d5ffa64cd7ff Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:40 +0000 Subject: [PATCH 119/202] dev-util/ninja: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild | 4 ++-- .../portage-stable/dev-util/ninja/ninja-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild index 0ec62c24b9..a6838532ba 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="A small build system similar to make" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild index ce997aee02..38a59d4a30 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="A small build system similar to make" From 2631ea5fa5f52d704201cf33f28cf34d7578fb69 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:41 +0000 Subject: [PATCH 120/202] dev-util/patchutils: Sync with Gentoo It's from Gentoo commit 4aebe55f8c434205f2ea3d28ffacb834a401bc1f. --- .../portage-stable/dev-util/patchutils/patchutils-0.4.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.4.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.4.2.ebuild index b141c55c7f..6b6dabe9ea 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.4.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchutils/patchutils-0.4.2.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="pcre" RDEPEND="pcre? ( dev-libs/libpcre2:= )" From 111ef0c44df6083dc81337dbfafa04b7c5b908d9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:42 +0000 Subject: [PATCH 121/202] dev-util/pkgconf: Sync with Gentoo It's from Gentoo commit 25bb3b2fb05bd2a60de2ab367be045e1f13a4814. --- .../portage-stable/dev-util/pkgconf/pkgconf-1.8.1.ebuild | 2 +- .../portage-stable/dev-util/pkgconf/pkgconf-1.9.4.ebuild | 2 +- .../portage-stable/dev-util/pkgconf/pkgconf-1.9.5.ebuild | 2 +- .../portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.1.ebuild index 45bdb62e16..17c6bb850c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" else SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-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 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.4.ebuild index 1a62309a9c..67b83ffb50 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.4.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then else SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz" # Per release notes, 1.9.x is a testing/development release. - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-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 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.5.ebuild index 1a62309a9c..67b83ffb50 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.5.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then else SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz" # Per release notes, 1.9.x is a testing/development release. - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-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 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild index 1a62309a9c..67b83ffb50 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then else SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz" # Per release notes, 1.9.x is a testing/development release. - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-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 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" From 851b674c9bbe5bd8adc1337521e9be8704a0c587 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:42 +0000 Subject: [PATCH 122/202] dev-util/re2c: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/dev-util/re2c/re2c-2.1.1-r1.ebuild | 2 +- .../third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.1.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.1.1-r1.ebuild index 9ef9ff4133..a6a57cbd40 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.1.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.1.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="debug" PATCHES=("${FILESDIR}"/${P}-sh.patch) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild index e0e45d5d87..ec3084d91c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-2.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz" LICENSE="public-domain" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="debug test" RESTRICT="!test? ( test )" From 1c609d66aaaffbdba13678056e066908163841c6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:42 +0000 Subject: [PATCH 123/202] dev-util/strace: Sync with Gentoo It's from Gentoo commit 7fea9951605c9ffe0e35ca7b90b86d77b65aa6f5. --- .../portage-stable/dev-util/strace/strace-6.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.2.ebuild index 24526a0eb2..564b05d412 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.2.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A useful diagnostic, instructional, and debugging tool" From e038a0fcf5c92e2a0aea253769ce721268764b1f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:42 +0000 Subject: [PATCH 124/202] dev-vcs/git: Sync with Gentoo It's from Gentoo commit 4510a3a7669d750fb405c71c18609ee91f076678. --- .../portage-stable/dev-vcs/git/Manifest | 3 + .../dev-vcs/git/git-2.39.2.ebuild | 2 +- .../dev-vcs/git/git-2.39.3.ebuild | 2 +- .../dev-vcs/git/git-2.40.1.ebuild | 4 +- .../dev-vcs/git/git-2.41.0.ebuild | 644 ++++++++++++++++++ .../dev-vcs/git/git-9999-r1.ebuild | 4 +- .../dev-vcs/git/git-9999-r2.ebuild | 4 +- .../dev-vcs/git/git-9999-r3.ebuild | 4 +- .../dev-vcs/git/git-9999.ebuild | 4 +- 9 files changed, 659 insertions(+), 12 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.41.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest index cb84a7820d..4fee4e6dfb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest @@ -1,9 +1,12 @@ DIST git-2.39.2.tar.xz 7163224 BLAKE2B bcd9abdaf8ce626de7aec2da666395f80212772aa17516f903459d683597184efeeb1d6aad536e0bf722a9bf63df98549fdeaab5b0a48e5500faf83ebf5d7516 SHA512 fdca70bee19401c5c7a6d2f3d70bd80b6ba99f6a9f97947de31d4366ee3a78a18d5298abb25727ec8ef67131bca673e48dff2a5a050b6e032884ab04066b20cb DIST git-2.39.3.tar.xz 7166100 BLAKE2B 862a5636df681e46797034bf22ca7712d70ead94ac0a911b81e4eeb3c83e67fdc56b839055b3b54bdab0ffceabe9fa2efb9e2870b1c0f40590ddb33e7427cd2a SHA512 ddd9f41df9d59aedaddb3a3cd551c105903b5f8c86455d4d05a8342920d67754b358b6ab0d6c10cca743b8e0e621baea16f71a9d6290f4d37297a9c45e8b3763 DIST git-2.40.1.tar.xz 7185260 BLAKE2B 50957227a572db54b931976d4c22edeaf0d5678d05d37f9478e736487d3e0755c1d70775cea9e3ce82e07f228fa809f3b461fb5b7f267117cc5aeffff915c096 SHA512 9ab41c64c6e666c314683bc4925535e037d43f947b8d327ff7d0379ac12899f4effcc2fe4e47b1ce652ad7140aa4f01f3b99f9cc0cf854cfeface1a5d3e1893e +DIST git-2.41.0.tar.xz 7273624 BLAKE2B 9119e1d1ff0ff332559a6609707846c2af7c61bea6ea728e834e4bd7f1ff6dd636a081c227b32a88fc5de1ea8987951cc56d0e94c90bbaa211ff415c5020d070 SHA512 a215bc6d89afbddd56adac901c24ea2b7f98a37bf6a6a2756893947012ffaa850e76247a3445a5ab13ab5a462f39986fec33eed086148aba5eb554dc1799fee0 DIST git-htmldocs-2.39.2.tar.xz 1505352 BLAKE2B 8b60f9bae9585aab8782f38ff64391a9c8fddeed47d84a989b4f65db87c14e927d1d975fa5239435e921dbc74a75c600d6f0485defa1a235a66355c0f8d9060d SHA512 fe0982e653784285bce7f158956892900ae9c88aa986261de4184e3349e34ee54f92d7280e143031b107872fc1729814489f6e355aa12dc415d724da65ec3716 DIST git-htmldocs-2.39.3.tar.xz 1506828 BLAKE2B 732e86ee004a44230d8f10eac16a14fbfb348d4278001011a0d22ba91240fbe65cad341b0547b649db3ce7fc67fc6fb544c896e7ba4bd7f1fa3c9b42371febf9 SHA512 7616c9c6600759f06973d36d5233b3909da72f39318410f5522b890d282a74e7585433c7195fed4792d5b7955292a466abcc2185ffdc23d0e8928ad58d7db1bf DIST git-htmldocs-2.40.1.tar.xz 1517900 BLAKE2B 864edd5b2389362dcf5d0c9f08cbf3bac6303cf6505b2d5446e73aeb591ac9212948b6f68434671e3bfba6f64d6aff02d315848d08647d22177292775411e5b3 SHA512 770c9765bab1f0773615d67f4eb817c42e1a946da205381ac0c208c4b2d4185c351aebbd7294afe66ef794b65cc9123b255a585a3df2990b5dfe779aaacb0800 +DIST git-htmldocs-2.41.0.tar.xz 1525692 BLAKE2B 4ea74130e21fed3ebbe09b849eddc48654fa7563299d8c2173856741d3c490a1672ac6b2005f716d6ae2d7759f92caafc56ccbf2408ba8ec87266b9c10530d73 SHA512 8a28f330f21e1da901ef8575509b56cede1a8f1d03e49fca802e561095c137c9ef23f3d6bd33d0e8a537bc1f93131ce7aafc92d4a9b0a80ade67249f22ff69d5 DIST git-manpages-2.39.2.tar.xz 557080 BLAKE2B 6b2dbb33f1041ba802582f529638b8b4574309efbf5af94add5c676efed7314743d5b326ec18a95ba85a4fe818e95913069717034a9863879e1d03ee32b839ba SHA512 6326ff43564fc42ca0a424edd17896434e11c09ce21f4bfd4d4975aaaf7f2c0d823da0e89b267557b0b7799c342db88d84685d24f589f53edfe486208c1f15b1 DIST git-manpages-2.39.3.tar.xz 557428 BLAKE2B 4eb85035f7056a12c3f1276d26f99b3337b97721f8f4b0b3c74d2a484171bfdf74f566a03e175ba32b389c940ed7be66ce2933442ec77089d5db3aaeb2ed2557 SHA512 06414741667b990ff3a28f7cb29b502df3d4cc757d525438994af005c71d429ca969563a74d1d2b44185e5c40107ac8838b390835a8a947e542ce3636b43f98b DIST git-manpages-2.40.1.tar.xz 562772 BLAKE2B 091c907195b37ed4152698515528d7da27f8dbf2516915ae66ba6f81a64bbd9f2042544889fe655ea7447bd6f32adaf8daec9c02743587a84b090554ad58796b SHA512 4e75f5ae3786658d284ce8eae3133c01115e357cc0bd2c4c5bf4261196411da632f51c87ff6e4c1f4bc7adf7b7b4a33c4debe52bcd9b5d735aa70dd9614ad5bd +DIST git-manpages-2.41.0.tar.xz 565060 BLAKE2B 082f2272314981b21606aef22bf18f0fe1d8a29fce0ce29e451cbad986e8f9c398906632b694de1b328accda61e85f25fd8875ee2e104cb9a7da8873d48e1495 SHA512 118afe9af79f2747c1f762b51fa2cdce7b46396ab4321f57826a351575acf30d9a486e2713e558cab6f6b353724cef3f0f1eab587b181f547324e96e3fee0b91 diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.2.ebuild index dcf4921993..cdf63279c6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.2.ebuild @@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" if [[ ${PV} != *_rc* ]] ; then - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi fi diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.3.ebuild index dcf4921993..cdf63279c6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.39.3.ebuild @@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" if [[ ${PV} != *_rc* ]] ; then - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi fi diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.40.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.40.1.ebuild index 867bbd70fc..a2c9d157f9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.40.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.40.1.ebuild @@ -6,7 +6,7 @@ EAPI=8 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd @@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" if [[ ${PV} != *_rc* ]] ; then - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi fi diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.41.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.41.0.ebuild new file mode 100644 index 0000000000..4929730cbd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.41.0.ebuild @@ -0,0 +1,644 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GENTOO_DEPEND_ON_PERL=no + +# bug #329479: git-remote-testgit is not multiple-version aware +PYTHON_COMPAT=( python3_{10..12} ) + +inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd + +PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git" + + inherit git-r3 + # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. + # See https://git-scm.com/docs/gitworkflows#_graduation + # In order of stability: + # 9999-r0: maint + # 9999-r1: master + # 9999-r2: next + # 9999-r3: seen + case ${PVR} in + 9999) EGIT_BRANCH=maint ;; + 9999-r1) EGIT_BRANCH=master ;; + 9999-r2) EGIT_BRANCH=next;; + 9999-r3) EGIT_BRANCH=seen ;; + esac +fi + +MY_PV="${PV/_rc/.rc}" +MY_P="${PN}-${MY_PV}" + +DOC_VER="${MY_PV}" + +DESCRIPTION="Stupid content tracker: distributed VCS designed for speed and efficiency" +HOMEPAGE="https://www.git-scm.com/" + +if [[ ${PV} != *9999 ]]; then + SRC_URI_SUFFIX="xz" + SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" + + [[ ${PV/rc} != ${PV} ]] && SRC_URI_KORG+='/testing' + + SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}" + SRC_URI+=" ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}" + SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + fi +fi + +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test" + +# Common to both DEPEND and RDEPEND +DEPEND=" + dev-libs/openssl:= + sys-libs/zlib + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) + iconv? ( virtual/libiconv ) + pcre? ( dev-libs/libpcre2:= ) + perl? ( dev-lang/perl:=[-build(-)] ) + tk? ( dev-lang/tk:= ) +" +RDEPEND=" + ${DEPEND} + gpg? ( app-crypt/gnupg ) + perl? ( + dev-perl/Error + dev-perl/MailTools + dev-perl/Authen-SASL + >=virtual/perl-libnet-3.110.0-r4[ssl] + cgi? ( + dev-perl/CGI + highlight? ( app-text/highlight ) + ) + cvs? ( + >=dev-vcs/cvsps-2.1:0 + dev-perl/DBI + dev-perl/DBD-SQLite + ) + mediawiki? ( + dev-perl/DateTime-Format-ISO8601 + dev-perl/HTML-Tree + dev-perl/MediaWiki-API + ) + subversion? ( + dev-vcs/subversion[-dso(-),perl] + dev-perl/libwww-perl + dev-perl/TermReadKey + ) + ) + perforce? ( ${PYTHON_DEPS} ) + selinux? ( sec-policy/selinux-git ) +" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +BDEPEND=" + doc? ( + app-text/asciidoc + app-text/docbook2X + app-text/xmlto + sys-apps/texinfo + ) + keyring? ( virtual/pkgconfig ) + nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg ) +" + +# Live ebuild builds man pages and HTML docs, additionally +if [[ ${PV} == *9999 ]]; then + BDEPEND+=" app-text/asciidoc" +fi + +SITEFILE="50${PN}-gentoo.el" + +REQUIRED_USE=" + cgi? ( perl ) + cvs? ( perl ) + mediawiki? ( perl ) + perforce? ( ${PYTHON_REQUIRED_USE} ) + subversion? ( perl ) + webdav? ( curl ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + # Avoid automagic CVS, bug #350330 + "${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch + + # Make submodule output quiet + "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch +) + +pkg_setup() { + if use subversion && has_version "dev-vcs/subversion[dso]" ; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned!" + fi + + if use perforce ; then + python-single-r1_pkg_setup + fi +} + +# This is needed because for some obscure reasons future calls to make don't +# pick up these exports if we export them in src_unpack() +exportmakeopts() { + local extlibs myopts + + myopts=( + ASCIIDOC_NO_ROFF=YesPlease + + $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) + + $(usev elibc_musl NO_REGEX=NeedsStartEnd) + $(usev !cvs NO_CVS=YesPlease) + $(usev !iconv NO_ICONV=YesPlease) + $(usev !nls NO_GETTEXT=YesPlease) + $(usev !perforce NO_PYTHON=YesPlease) + $(usev !subversion NO_SVN_TESTS=YesPlease) + $(usev !tk NO_TCLTK=YesPlease) + ) + + if use blksha1 ; then + myopts+=( BLK_SHA1=YesPlease ) + fi + + if use curl ; then + use webdav || myopts+=( NO_EXPAT=YesPlease ) + else + myopts+=( NO_CURL=YesPlease ) + fi + + # Broken assumptions because of static build system + myopts+=( + NO_FINK=YesPlease + NO_DARWIN_PORTS=YesPlease + INSTALL=install + TAR=tar + SHELL_PATH="${EPREFIX}/bin/sh" + SANE_TOOL_PATH= + OLD_ICONV= + NO_EXTERNAL_GREP= + ) + + # Can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die + + if use pcre; then + myopts+=( USE_LIBPCRE2=YesPlease ) + extlibs+=( -lpcre2-8 ) + fi + + if [[ ${CHOST} == *-solaris* ]]; then + myopts+=( + NEEDS_LIBICONV=YesPlease + HAVE_CLOCK_MONOTONIC=1 + ) + + if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then + myopts+=( HAVE_GETDELIM=1 ) + fi + fi + + myopts+=( ASCIIDOC8=YesPlease ) + + export MY_MAKEOPTS="${myopts[@]}" + export EXTLIBS="${extlibs[@]}" +} + +src_unpack() { + if [[ ${PV} != *9999 ]] ; then + unpack ${MY_P}.tar.${SRC_URI_SUFFIX} + + cd "${S}" || die + unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + + if use doc ; then + pushd "${S}"/Documentation &>/dev/null || die + unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + popd &>/dev/null || die + fi + else + git-r3_src_unpack + #cp "${FILESDIR}"/GIT-VERSION-GEN . || die + fi + +} + +src_prepare() { + if ! use safe-directory ; then + # This patch neuters the "safe directory" detection. + # bugs #838271, #838223 + PATCHES+=( + "${FILESDIR}"/git-2.37.2-unsafe-directory.patch + ) + fi + + default + + if use prefix ; then + # bug #757309 + eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch + fi + + sed -i \ + -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ + -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile || die + + # Fix docbook2texi command + sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ + Documentation/Makefile || die +} + +git_emake() { + # bug #320647: PYTHON_PATH + local PYTHON_PATH="" + use perforce && PYTHON_PATH="${PYTHON}" + + local mymakeargs=( + ${MY_MAKEOPTS} + + prefix="${EPREFIX}"/usr + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html + perllibdir="$(use perl && perl_get_raw_vendorlib)" + sysconfdir="${EPREFIX}"/etc + + CC="$(tc-getCC)" + CFLAGS="${CFLAGS}" + PKG_CONFIG="$(tc-getPKG_CONFIG)" + + # TODO: --verbose? + GIT_TEST_OPTS="--no-color" + + OPTAR="$(tc-getAR)" + OPTCC="$(tc-getCC)" + OPTCFLAGS="${CFLAGS}" + OPTLDFLAGS="${LDFLAGS}" + + PERL_PATH="${EPREFIX}/usr/bin/perl" + PERL_MM_OPT="" + + PYTHON_PATH="${PYTHON_PATH}" + + V=1 + "$@" + ) + + emake "${mymakeargs[@]}" +} + +src_configure() { + exportmakeopts +} + +src_compile() { + git_emake + + if use perl && use cgi ; then + git_emake gitweb + fi + + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then + git_emake -C contrib/credential/osxkeychain + fi + + pushd Documentation &>/dev/null || die + if [[ ${PV} == *9999 ]] ; then + git_emake man + if use doc ; then + git_emake info html + fi + else + if use doc ; then + git_emake info + fi + fi + popd &>/dev/null || die + + if use keyring ; then + git_emake -C contrib/credential/libsecret + fi + + pushd contrib/subtree &>/dev/null || die + git_emake git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake git-subtree.html git-subtree.1 + popd &>/dev/null || die + + git_emake -C contrib/diff-highlight + + if use mediawiki ; then + git_emake -C contrib/mw-to-git + fi +} + +src_test() { + local disabled=( + # We make safe-directory optional + t0033-safe-directory.sh + ) + + local tests_cvs=( + t9200-git-cvsexportcommit.sh + t9400-git-cvsserver-server.sh + t9401-git-cvsserver-crlf.sh + t9402-git-cvsserver-refs.sh + t9600-cvsimport.sh + t9601-cvsimport-vendor-branch.sh + t9602-cvsimport-branches-tags.sh + t9603-cvsimport-patchsets.sh + t9604-cvsimport-timestamps.sh + ) + + local tests_perl=( + t3701-add-interactive.sh + t5502-quickfetch.sh + t5512-ls-remote.sh + t5520-pull.sh + t7106-reset-unborn-branch.sh + t7501-commit.sh + ) + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot=( + t0001-init.sh + t0004-unwritable.sh + t0070-fundamental.sh + t1004-read-tree-m-u-wf.sh + t3700-add.sh + t7300-clean.sh + ) + # t9100 still fails with symlinks in SVN 1.7 + local test_svn=( t9100-git-svn-basic.sh ) + + # Unzip is used only for the testcase code, not by any normal parts of Git. + if ! has_version app-arch/unzip ; then + einfo "Disabling tar-tree tests" + disabled+=( t5000-tar-tree.sh ) + fi + + local cvs=0 + use cvs && let cvs=${cvs}+1 + if [[ ${EUID} -eq 0 ]] ; then + if [[ ${cvs} -eq 1 ]] ; then + ewarn "Skipping CVS tests because CVS does not work as root!" + ewarn "You should retest with FEATURES=userpriv!" + disabled+=( ${tests_cvs[@]} ) + fi + einfo "Skipping other tests that require being non-root" + disabled+=( ${tests_nonroot[@]} ) + else + if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then + let cvs=${cvs}+1 + fi + + if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then + let cvs=${cvs}+1 + fi + + if [[ ${cvs} -lt 3 ]] ; then + einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" + disabled+=( ${tests_cvs[@]} ) + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled+=( ${tests_perl[@]} ) + fi + + einfo "Disabling tests that fail with SVN 1.7" + disabled+=( ${test_svn[@]} ) + + # Reset all previously disabled tests + pushd t &>/dev/null || die + local i + for i in *.sh.DISABLED ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" + done + einfo "Disabled tests:" + for i in ${disabled[@]} ; do + if [[ -f "${i}" ]] ; then + mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + fi + done + + # Avoid the test system removing the results because we want them ourselves + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die + + # Clean old results first, must always run + nonfatal git_emake clean + popd &>/dev/null || die + + # Now run the tests, keep going if we hit an error, and don't terminate on + # failure + local rc + einfo "Start test run" + #MAKEOPTS=-j1 + nonfatal git_emake --keep-going test + rc=$? + + # Display nice results, now print the results + pushd t &>/dev/null || die + nonfatal git_emake aggregate-results + + # And bail if there was a problem + [[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!" +} + +src_install() { + git_emake DESTDIR="${D}" install + + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then + dobin contrib/credential/osxkeychain/git-credential-osxkeychain + fi + + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] + find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] + dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html + local d + for d in / /howto/ /technical/ ; do + docinto ${d} + dodoc Documentation${d}*.txt + if use doc ; then + docinto ${d}/html + dodoc Documentation${d}*.html + fi + done + docinto / + # Upstream does not ship this pre-built :-( + use doc && doinfo Documentation/{git,gitman}.info + + newbashcomp contrib/completion/git-completion.bash ${PN} + bashcomp_alias git gitk + # Not really a bash-completion file (bug #477920) + # but still needed uncompressed (bug #507480) + insinto /usr/share/${PN} + doins contrib/completion/git-prompt.sh + + #dobin contrib/fast-import/git-p4 # Moved upstream + #dodoc contrib/fast-import/git-p4.txt # Moved upstream + newbin contrib/fast-import/import-tars.perl import-tars + exeinto /usr/libexec/git-core/ + newexe contrib/git-resurrect.sh git-resurrect + + # git-subtree + pushd contrib/subtree &>/dev/null || die + git_emake DESTDIR="${D}" install + if use doc ; then + # Do not move git subtree install-man outside USE=doc! + git_emake DESTDIR="${D}" install-man install-html + fi + newdoc README README.git-subtree + dodoc git-subtree.txt + popd &>/dev/null || die + + if use mediawiki ; then + git_emake -C contrib/mw-to-git DESTDIR="${D}" install + fi + + # diff-highlight + dobin contrib/diff-highlight/diff-highlight + newdoc contrib/diff-highlight/README README.diff-highlight + + # git-jump + exeinto /usr/libexec/git-core/ + doexe contrib/git-jump/git-jump + newdoc contrib/git-jump/README git-jump.txt + + # git-contacts + exeinto /usr/libexec/git-core/ + doexe contrib/contacts/git-contacts + dodoc contrib/contacts/git-contacts.txt + + if use keyring ; then + pushd contrib/credential/libsecret &>/dev/null || die + dobin git-credential-libsecret + popd &>/dev/null || die + fi + + dodir /usr/share/${PN}/contrib + # The following are excluded: + # completion - installed above + # diff-highlight - done above + # emacs - removed upstream + # examples - these are stuff that is not used in Git anymore actually + # git-jump - done above + # gitview - installed above + # p4import - excluded because fast-import has a better one + # patches - stuff the Git guys made to go upstream to other places + # persistent-https - TODO + # mw-to-git - TODO + # subtree - build seperately + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + local contrib_objects=( + buildsystems + fast-import + hg-to-git + hooks + remotes2config.sh + rerere-train.sh + stats + workdir + ) + local i + for i in "${contrib_objects[@]}" ; do + cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}" + done + + if use perl && use cgi ; then + # We used to install in /usr/share/${PN}/gitweb + # but upstream installs in /usr/share/gitweb + # so we will install a symlink and use their location for compat with other + # distros + dosym ../gitweb /usr/share/${PN}/gitweb + + # INSTALL discusses configuration issues, not just installation + docinto / + newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb + newdoc "${S}"/gitweb/README README.gitweb + + for d in "${ED}"/usr/lib{,64}/perl5/ ; do + if [[ -d "${d}" ]] ; then + find "${d}" -name .packlist -delete || die + fi + done + else + rm -rf "${ED}"/usr/share/gitweb + fi + + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/git-daemon.xinetd git-daemon + fi + + if ! use prefix ; then + newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon + newconfd "${FILESDIR}"/git-daemon.confd git-daemon + systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service" + systemd_dounit "${FILESDIR}/git-daemon.socket" + fi + + perl_delete_localpod + + # Remove disabled linguas + # we could remove sources in src_prepare, but install does not + # handle missing locale dir well + rm_loc() { + if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then + rm -r "${ED}/usr/share/locale/${1}" || die + fi + } + plocale_for_each_disabled_locale rm_loc +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog "Please read /usr/share/bash-completion/completions/git for Git bash command" + elog "completion." + elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" + elog "Note that the prompt bash code is now in that separate script" + fi + + optfeature_header "Some scripts require additional dependencies:" + optfeature git-quiltimport dev-util/quilt + optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx +} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild index 867bbd70fc..a2c9d157f9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd @@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" if [[ ${PV} != *_rc* ]] ; then - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi fi diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild index 867bbd70fc..a2c9d157f9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild @@ -6,7 +6,7 @@ EAPI=8 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd @@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" if [[ ${PV} != *_rc* ]] ; then - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi fi diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild index 867bbd70fc..a2c9d157f9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild @@ -6,7 +6,7 @@ EAPI=8 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd @@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" if [[ ${PV} != *_rc* ]] ; then - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi fi diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild index 867bbd70fc..a2c9d157f9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd @@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" if [[ ${PV} != *_rc* ]] ; then - 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi fi From 6b0d6fedfbaadd0ae9c6687b63a6679d8ed8bce0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:42 +0000 Subject: [PATCH 125/202] eclass/acct-group: Sync with Gentoo It's from Gentoo commit 82364ba37077e3a0863cd8b21bcc50e9884ca8a9. --- .../src/third_party/portage-stable/eclass/acct-group.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/acct-group.eclass b/sdk_container/src/third_party/portage-stable/eclass/acct-group.eclass index 3c00c01a97..8d2d3adb72 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/acct-group.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/acct-group.eclass @@ -78,7 +78,7 @@ readonly ACCT_GROUP_NAME # << Boilerplate ebuild variables >> : "${DESCRIPTION:="System group: ${ACCT_GROUP_NAME}"}" : "${SLOT:=0}" -: "${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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris}" S=${WORKDIR} From c371d0abb9fef538782a9425acebd14bff091621 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:43 +0000 Subject: [PATCH 126/202] eclass/acct-user: Sync with Gentoo It's from Gentoo commit b2c213edf8283ab12b3ae5c02425185ed678d92e. --- .../src/third_party/portage-stable/eclass/acct-user.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/acct-user.eclass b/sdk_container/src/third_party/portage-stable/eclass/acct-user.eclass index 8d6657b634..f8a51ebf9c 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/acct-user.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/acct-user.eclass @@ -144,7 +144,7 @@ readonly ACCT_USER_NAME # << Boilerplate ebuild variables >> : "${DESCRIPTION:="System user: ${ACCT_USER_NAME}"}" : "${SLOT:=0}" -: "${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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris}" S=${WORKDIR} From cc2a8a76fc11cbb7e0a274392115561785b69885 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:45 +0000 Subject: [PATCH 127/202] eclass/autotools: Sync with Gentoo It's from Gentoo commit 0e74da3a3d3fd1e90fb779e7ce3a1147ce3d5300. --- .../src/third_party/portage-stable/eclass/autotools.eclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass b/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass index 91046b9f82..77124e098a 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass @@ -389,7 +389,6 @@ eautoconf() { die "No configure.{ac,in} present!" fi - if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then case ${EAPI} in 6|7) @@ -400,7 +399,7 @@ eautoconf() { *) # Move configure file to the new location only on newer EAPIs to ensure # checks are done rather than retroactively breaking ebuilds. - eqawarn "Moving configure.in to configure.ac (bug #426262)" + einfo "Moving configure.in to configure.ac (bug #426262)" mv configure.{in,ac} || die ;; esac @@ -560,7 +559,7 @@ autotools_run_tool() { shift done - if [[ ${EBUILD_PHASE_FUNC} != "src_unpack" && ${EBUILD_PHASE_FUNC} != "src_prepare" ]] ; then + if [[ ${EBUILD_PHASE_FUNC} != "src_prepare" ]] ; then eqawarn "Running '${1}' in ${EBUILD_PHASE_FUNC} phase" fi From 34df514673d9caf2d044fb91ad01242ca41e5e24 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:48 +0000 Subject: [PATCH 128/202] eclass/distutils-r1: Sync with Gentoo It's from Gentoo commit 970679b8be00a13d0fc71c2cfda6e9ecd5cd7fdf. --- .../portage-stable/eclass/distutils-r1.eclass | 137 ++++++++++-------- 1 file changed, 78 insertions(+), 59 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass index f4ef89ee79..7a7b762ef0 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/distutils-r1.eclass @@ -125,6 +125,8 @@ esac # # - pdm - pdm.pep517 backend # +# - pdm-backend - pdm.backend backend +# # - poetry - poetry-core backend # # - setuptools - distutils or setuptools (incl. legacy mode) @@ -220,7 +222,7 @@ _distutils_set_globals() { ;; hatchling) bdep+=' - >=dev-python/hatchling-1.12.2[${PYTHON_USEDEP}] + >=dev-python/hatchling-1.17.0[${PYTHON_USEDEP}] ' ;; jupyter) @@ -230,7 +232,7 @@ _distutils_set_globals() { ;; maturin) bdep+=' - >=dev-util/maturin-0.14.10[${PYTHON_USEDEP}] + >=dev-util/maturin-1.0.1[${PYTHON_USEDEP}] ' ;; no) @@ -239,7 +241,7 @@ _distutils_set_globals() { ;; meson-python) bdep+=' - >=dev-python/meson-python-0.12.0[${PYTHON_USEDEP}] + >=dev-python/meson-python-0.13.1[${PYTHON_USEDEP}] ' ;; pbr) @@ -249,23 +251,28 @@ _distutils_set_globals() { ;; pdm) bdep+=' - >=dev-python/pdm-pep517-1.0.6[${PYTHON_USEDEP}] + >=dev-python/pdm-pep517-1.1.4[${PYTHON_USEDEP}] + ' + ;; + pdm-backend) + bdep+=' + >=dev-python/pdm-backend-2.0.7[${PYTHON_USEDEP}] ' ;; poetry) bdep+=' - >=dev-python/poetry-core-1.4.0[${PYTHON_USEDEP}] + >=dev-python/poetry-core-1.5.2[${PYTHON_USEDEP}] ' ;; setuptools) bdep+=' - >=dev-python/setuptools-67.2.0[${PYTHON_USEDEP}] - >=dev-python/wheel-0.38.4[${PYTHON_USEDEP}] + >=dev-python/setuptools-67.7.2[${PYTHON_USEDEP}] + >=dev-python/wheel-0.40.0[${PYTHON_USEDEP}] ' ;; sip) bdep+=' - >=dev-python/sip-6.7.5-r1[${PYTHON_USEDEP}] + >=dev-python/sip-6.7.8[${PYTHON_USEDEP}] ' ;; standalone) @@ -600,12 +607,12 @@ distutils_enable_tests() { test_pkg=">=dev-python/nose-1.3.7_p20221026" ;; pytest) - test_pkg=">=dev-python/pytest-7.2.1" + test_pkg=">=dev-python/pytest-7.3.1" ;; setup.py) ;; unittest) - test_pkg="dev-python/unittest-or-fail" + # dep handled below ;; *) die "${FUNCNAME}: unsupported argument: ${1}" @@ -623,6 +630,13 @@ distutils_enable_tests() { ${test_pkg}[\${PYTHON_USEDEP}] ")" fi + elif [[ ${1} == unittest ]]; then + # unittest-or-fail is needed in py<3.12 + test_deps+=" + $(python_gen_cond_dep ' + dev-python/unittest-or-fail[${PYTHON_USEDEP}] + ' 3.{9..11}) + " fi if [[ -n ${test_deps} ]]; then IUSE+=" test" @@ -918,6 +932,11 @@ _distutils-r1_print_package_versions() { dev-python/gpep517 dev-python/installer ) + if [[ ${DISTUTILS_EXT} ]]; then + packages+=( + dev-python/cython + ) + fi case ${DISTUTILS_USE_PEP517} in flit) packages+=( @@ -972,6 +991,12 @@ _distutils-r1_print_package_versions() { dev-python/setuptools ) ;; + pdm-backend) + packages+=( + dev-python/pdm-backend + dev-python/setuptools + ) + ;; poetry) packages+=( dev-python/poetry-core @@ -1166,6 +1191,9 @@ _distutils-r1_backend_to_key() { pbr.build) echo pbr ;; + pdm.backend) + echo pdm-backend + ;; pdm.pep517.api) echo pdm ;; @@ -1318,44 +1346,40 @@ distutils_pep517_install() { local config_settings= case ${DISTUTILS_USE_PEP517} in + maturin) + # `maturin pep517 build-wheel --help` for options + local maturin_args=( + "${DISTUTILS_ARGS[@]}" + --jobs="$(makeopts_jobs)" + --skip-auditwheel # see bug #831171 + $(in_iuse debug && usex debug '--profile=dev' '') + ) + + config_settings=$( + "${EPYTHON}" - "${maturin_args[@]}" <<-EOF || die + import json + import sys + print(json.dumps({"build-args": sys.argv[1:]})) + EOF + ) + ;; meson-python) local -x NINJAOPTS=$(get_NINJAOPTS) - if has_version -b '>=dev-python/meson-python-0.13'; then - config_settings=$( - "${EPYTHON}" - "${DISTUTILS_ARGS[@]}" <<-EOF || die - import json - import os - import shlex - import sys + config_settings=$( + "${EPYTHON}" - "${DISTUTILS_ARGS[@]}" <<-EOF || die + import json + import os + import shlex + import sys - ninjaopts = shlex.split(os.environ["NINJAOPTS"]) - print(json.dumps({ - "builddir": "${BUILD_DIR}", - "setup-args": sys.argv[1:], - "compile-args": ["-v"] + ninjaopts, - })) - EOF - ) - else - config_settings=$( - "${EPYTHON}" - "${DISTUTILS_ARGS[@]}" <<-EOF || die - import json - import os - import shlex - import sys - - ninjaopts = shlex.split(os.environ["NINJAOPTS"]) - print(json.dumps({ - "builddir": "${BUILD_DIR}", - "setup-args": sys.argv[1:], - "compile-args": [ - "-v", - f"--ninja-args={ninjaopts!r}", - ], - })) - EOF - ) - fi + ninjaopts = shlex.split(os.environ["NINJAOPTS"]) + print(json.dumps({ + "builddir": "${BUILD_DIR}", + "setup-args": sys.argv[1:], + "compile-args": ["-v"] + ninjaopts, + })) + EOF + ) ;; setuptools) if [[ -n ${DISTUTILS_ARGS[@]} ]]; then @@ -1492,15 +1516,6 @@ distutils-r1_python_compile() { esetup.py build -j "${jobs}" "${@}" fi ;; - maturin) - # auditwheel may auto-bundle libraries (bug #831171), - # also support cargo.eclass' IUSE=debug if available - local -x MATURIN_PEP517_ARGS=" - --jobs=$(makeopts_jobs) - --skip-auditwheel - $(in_iuse debug && usex debug --profile=dev '') - " - ;; no) return ;; @@ -1780,9 +1795,11 @@ distutils-r1_run_phase() { # and _all() already localizes it local -x PATH=${PATH} - # Undo the default switch in setuptools-60+ for the time being, - # to avoid replacing .egg-info file with directory in-place. - local -x SETUPTOOLS_USE_DISTUTILS="${SETUPTOOLS_USE_DISTUTILS:-stdlib}" + if _python_impl_matches "${EPYTHON}" 3.{9..11}; then + # Undo the default switch in setuptools-60+ for the time being, + # to avoid replacing .egg-info file with directory in-place. + local -x SETUPTOOLS_USE_DISTUTILS="${SETUPTOOLS_USE_DISTUTILS:-stdlib}" + fi # Bug 559644 # using PYTHONPATH when the ${BUILD_DIR}/lib is not created yet might lead to @@ -1799,13 +1816,15 @@ distutils-r1_run_phase() { if [[ ${DISTUTILS_EXT} ]]; then local -x CPPFLAGS="${CPPFLAGS} $(usex debug '-UNDEBUG' '-DNDEBUG')" + # always generate .c files from .pyx files to ensure we get latest + # bug fixes from Cython (this works only when setup.py is using + # cythonize() but it's better than nothing) + local -x CYTHON_FORCE_REGEN=1 fi # How to build Python modules in different worlds... local ldopts case "${CHOST}" in - # provided by haubi, 2014-07-08 - *-aix*) ldopts='-shared -Wl,-berok';; # good enough # provided by grobian, 2014-06-22, bug #513664 c7 *-darwin*) ldopts='-bundle -undefined dynamic_lookup';; *) ldopts='-shared';; From e0f13b25d34558aa81db5c1287d029a220c04ec5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:13:31 +0000 Subject: [PATCH 129/202] eclass/multilib: Sync with Gentoo It's from Gentoo commit 84cb85f9df809690d40267d121662933a902d541. --- .../src/third_party/portage-stable/eclass/multilib.eclass | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass b/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass index 77340a23e3..bf9c88f7e6 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass @@ -213,7 +213,7 @@ number_abis() { # Returns: null string (almost everywhere) || .exe (mingw*) || ... get_exeext() { case ${CHOST} in - *-cygwin*|mingw*|*-mingw*) echo ".exe";; + mingw*|*-mingw*) echo ".exe";; esac } @@ -230,11 +230,8 @@ get_libname() { local libname local ver=$1 case ${CHOST} in - *-cygwin*) libname="dll.a";; # import lib mingw*|*-mingw*) libname="dll";; *-darwin*) libname="dylib";; - *-mint*) libname="irrelevant";; - hppa*-hpux*) libname="sl";; *) libname="so";; esac @@ -243,9 +240,7 @@ get_libname() { else for ver in "$@" ; do case ${CHOST} in - *-cygwin*) echo ".${ver}.${libname}";; *-darwin*) echo ".${ver}.${libname}";; - *-mint*) echo ".${libname}";; *) echo ".${libname}.${ver}";; esac done From 3be359e77f7ed7f74979cba96ac62ced10a04c54 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:13:43 +0000 Subject: [PATCH 130/202] eclass/portability: Sync with Gentoo It's from Gentoo commit 43427a0da4dfdc9f046b5c8bd7d106f6c9661b90. --- .../src/third_party/portage-stable/eclass/portability.eclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/portability.eclass b/sdk_container/src/third_party/portage-stable/eclass/portability.eclass index f31e3fee6c..98e9418343 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/portability.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/portability.eclass @@ -90,9 +90,8 @@ dlopen_lib() { # - Darwin needs nothing # - *BSD needs nothing # - Linux needs -ldl (glibc and uclibc) - # - Interix needs -ldl case "${CHOST}" in - *-linux-gnu*|*-linux-uclibc|*-interix*) + *-linux-gnu*|*-linux-uclibc) echo "-ldl" ;; esac From 7f95dbd880947f2f63ac05e6dd19949219afd5c7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:13:51 +0000 Subject: [PATCH 131/202] eclass/python-utils-r1: Sync with Gentoo It's from Gentoo commit 0b140f9228e2ed7e76124986d2911776922cd342. --- .../eclass/python-utils-r1.eclass | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass index 040d374bbf..52e9e061d6 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/python-utils-r1.eclass @@ -40,7 +40,7 @@ inherit multiprocessing toolchain-funcs # All supported Python implementations, most preferred last. _PYTHON_ALL_IMPLS=( pypy3 - python3_{10..11} + python3_{10..12} ) readonly _PYTHON_ALL_IMPLS @@ -80,7 +80,7 @@ _python_verify_patterns() { local impl pattern for pattern; do case ${pattern} in - -[23]|3.[89]|3.1[01]) + -[23]|3.[89]|3.1[012]) continue ;; esac @@ -129,7 +129,7 @@ _python_set_impls() { # please keep them in sync with _PYTHON_ALL_IMPLS # and _PYTHON_HISTORICAL_IMPLS case ${i} in - pypy3|python3_9|python3_1[01]) + pypy3|python3_9|python3_1[0-2]) ;; jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[5-7]|python3_[1-9]) obsolete+=( "${i}" ) @@ -236,7 +236,7 @@ _python_impl_matches() { [[ ${impl} == python${pattern/./_} || ${impl} == pypy3 ]] && return 0 ;; - 3.8|3.1[01]) + 3.8|3.1[0-2]) [[ ${impl} == python${pattern/./_} ]] && return 0 ;; *) @@ -441,11 +441,13 @@ _python_export() { local d case ${impl} in python3.10) - PYTHON_PKG_DEP=">=dev-lang/python-3.10.9-r1:3.10";; + PYTHON_PKG_DEP=">=dev-lang/python-3.10.11:3.10";; python3.11) - PYTHON_PKG_DEP=">=dev-lang/python-3.11.1-r1:3.11";; + PYTHON_PKG_DEP=">=dev-lang/python-3.11.3:3.11";; + python3.12) + PYTHON_PKG_DEP=">=dev-lang/python-3.12.0_beta1:3.12";; pypy3) - PYTHON_PKG_DEP='>=dev-python/pypy3-7.3.11-r1:0=';; + PYTHON_PKG_DEP='>=dev-python/pypy3-7.3.11_p1:0=';; *) die "Invalid implementation: ${impl}" esac @@ -1342,7 +1344,12 @@ eunittest() { _python_check_EPYTHON - set -- "${EPYTHON}" -m unittest_or_fail discover -v "${@}" + # unittest fails with "no tests" correctly since Python 3.12 + local runner=unittest + if _python_impl_matches "${EPYTHON}" 3.{9..11}; then + runner=unittest_or_fail + fi + set -- "${EPYTHON}" -m "${runner}" discover -v "${@}" echo "${@}" >&2 "${@}" || die -n "Tests failed with ${EPYTHON}" From a2711bc31efc04acd4b6351879792966f534d380 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:03 +0000 Subject: [PATCH 132/202] eclass/toolchain: Sync with Gentoo It's from Gentoo commit 2f8bd00507759447a513a934e440dc2fb49afceb. --- .../portage-stable/eclass/toolchain.eclass | 53 ++++--------------- 1 file changed, 11 insertions(+), 42 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass index 87da1fba73..9565cc8914 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass @@ -426,15 +426,17 @@ fi # Set the source directory depending on whether we're using # a live git tree, snapshot, or release tarball. if [[ ${TOOLCHAIN_SET_S} == yes ]] ; then - S=$( - if tc_is_live ; then - echo ${EGIT_CHECKOUT_DIR} - elif [[ -n ${SNAPSHOT} ]] ; then - echo ${WORKDIR}/gcc-${SNAPSHOT} - else - echo ${WORKDIR}/gcc-${GCC_RELEASE_VER} - fi - ) + s_path= + if tc_is_live ; then + s_path=${EGIT_CHECKOUT_DIR} + elif [[ -n ${SNAPSHOT} ]] ; then + s_path=${WORKDIR}/gcc-${SNAPSHOT} + else + s_path=${WORKDIR}/gcc-${GCC_RELEASE_VER} + fi + + S="${s_path}" + unset s_path fi gentoo_urls() { @@ -526,13 +528,6 @@ gentoo_urls() { # The resulting filename of this tarball will be: # gcc-${SPECS_GCC_VER:-${GCC_RELEASE_VER}}-specs-${SPECS_VER}.tar.xz # -# CYGWINPORTS_GITREV -# If set, this variable signals that we should apply additional patches -# maintained by upstream Cygwin developers at github/cygwinports/gcc, -# using the specified git commit id there. The list of patches to -# apply is extracted from gcc.cygport, maintained there as well. -# This is done for compilers running on Cygwin, not for cross compilers -# with a Cygwin target. get_gcc_src_uri() { export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}} export MUSL_GCC_VER=${MUSL_GCC_VER:-${PATCH_GCC_VER}} @@ -584,11 +579,6 @@ get_gcc_src_uri() { fi fi - # Cygwin patches from https://github.com/cygwinports/gcc - [[ -n ${CYGWINPORTS_GITREV} ]] && \ - GCC_SRC_URI+=" elibc_Cygwin? ( https://github.com/cygwinports/gcc/archive/${CYGWINPORTS_GITREV}.tar.gz - -> gcc-cygwinports-${CYGWINPORTS_GITREV}.tar.gz )" - echo "${GCC_SRC_URI}" } @@ -675,7 +665,6 @@ toolchain_src_prepare() { do_gcc_gentoo_patches do_gcc_PIE_patches - do_gcc_CYGWINPORTS_patches if tc_is_live ; then BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, commit ${EGIT_VERSION}" @@ -801,23 +790,6 @@ do_gcc_PIE_patches() { BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}" } -do_gcc_CYGWINPORTS_patches() { - [[ -n ${CYGWINPORTS_GITREV} ]] || return 0 - use elibc_Cygwin || return 0 - - local p d="${WORKDIR}/gcc-${CYGWINPORTS_GITREV}" - # readarray -t is available since bash-4.4 only, bug #690686 - local patches=( $( - for p in $( - sed -e '1,/PATCH_URI="/d;/"/,$d' < "${d}"/gcc.cygport - ); do - echo "${d}/${p}" - done - ) ) - einfo "Applying cygwin port patches ..." - eapply -- "${patches[@]}" -} - # configure to build with the hardened GCC specs as the default make_gcc_hard() { local gcc_hard_flags="" @@ -1197,9 +1169,6 @@ toolchain_src_configure() { *-musl*) needed_libc=musl ;; - *-cygwin) - needed_libc=cygwin - ;; x86_64-*-mingw*|*-w64-mingw*) needed_libc=mingw64-runtime ;; From 86aab1be87491f013f28dcb06fbb098d8309e398 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:18 +0000 Subject: [PATCH 133/202] media-libs/libpng: Sync with Gentoo It's from Gentoo commit 4510a3a7669d750fb405c71c18609ee91f076678. --- .../portage-stable/media-libs/libpng/libpng-1.6.39.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.39.ebuild b/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.39.ebuild index f1c9336b51..c8fece5213 100644 --- a/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.39.ebuild +++ b/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.39.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" apng? ( mirror://sourceforge/libpng-apng/${PN}$(ver_rs 1-2 '' $(ver_c LICENSE="libpng2" SLOT="0/16" -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 ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="apng cpu_flags_arm_neon cpu_flags_x86_sse static-libs" RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]" From bb677b092e253a419161af3e12dd93fcb8be0c87 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:19 +0000 Subject: [PATCH 134/202] net-dns/bind-tools: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild | 2 +- .../portage-stable/net-dns/bind-tools/bind-tools-9.16.39.ebuild | 2 +- .../portage-stable/net-dns/bind-tools/bind-tools-9.16.41.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild index a0e03ab006..c2b97cf395 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+caps doc gssapi idn libedit readline test xml" # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687 RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.39.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.39.ebuild index da4c92eb0d..7aaf1b1a1c 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.39.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.39.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+caps doc gssapi idn libedit readline test xml" # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687 RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.41.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.41.ebuild index da4c92eb0d..7aaf1b1a1c 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.41.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.41.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+caps doc gssapi idn libedit readline test xml" # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687 RESTRICT="!test? ( test )" From 8bdfa069b9809479c92ae84750613dacfbace69d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:20 +0000 Subject: [PATCH 135/202] net-dns/c-ares: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../portage-stable/net-dns/c-ares/Manifest | 2 + .../net-dns/c-ares/c-ares-1.19.0.ebuild | 2 +- .../net-dns/c-ares/c-ares-1.19.1.ebuild | 70 +++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.19.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-dns/c-ares/Manifest b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/Manifest index 799731cb27..ba56429843 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/c-ares/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/Manifest @@ -1,2 +1,4 @@ DIST c-ares-1.19.0.tar.gz 1572210 BLAKE2B d77be535dfa852bf3d91258ddf06b3c63a40123883adb83a4e5652d4b1b16801ddefefad70d83a7d6d9aa81c9c81956fef42bc778d7380d6b398ccfc9f8b82dc SHA512 a7f5988bef393afec08a225be92f6eee54a3e67170fb26cbe00dcc5c5a457b27037bbcfeccc39fb855ed72f100196958d6cbbe251bf1ccfbdd353be18f098359 DIST c-ares-1.19.0.tar.gz.asc 488 BLAKE2B 1b8dc3ad7b916cb5ea1c95ffd12315d303f78880416836d11d2fa7d8ca93fa1ca30898e6a865af79a35e5dc4d0f4fccfcc9eae6f028d456d38ede9fe8b7edd71 SHA512 814aad5dbe2bb987035b53d977e03a73a90356200f671f36949a77e978cf8311ccc8375e63ade6fe2e1380f1f9c3b34c1ba7d48365fd5689cf5c24425ab8a129 +DIST c-ares-1.19.1.tar.gz 1579100 BLAKE2B 4b6c9593edb1a91ab76d54ddacb1cd5d67006d5e628ea1f3289f54e9360be32abeb5d8fc7d23e193feab3e7928e8efde82757eb12fe217dc92ed0d9132bedf5d SHA512 466a94efda626e815a6ef7a890637056339f883d549ea6055e289fd8cd2391130e5682c905c0fb3bd7e955af7f6deb793562c170eb0ee066a4a62085a82ba470 +DIST c-ares-1.19.1.tar.gz.asc 488 BLAKE2B 9c47d7b3e67d9a2bd1e332912d21d20ca591fc34f81707c18a4615ea14ba2da00146d1998250a5f4dd2a0b1c04f9bd2013d4940ac734674c0bdff6815985e19d SHA512 1b204ab1a667af1326be4b7c62c0919aacd447a2e00efea4b8ef2ec9f2b13ffb236a836ff8953b0b3359727faf3fb8cfcd71d0b06a0e533a09f9e9ea66024f4e diff --git a/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.19.0.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.19.0.ebuild index f7520a609b..760debb0dc 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.19.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.19.0.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="MIT" # Subslot = SONAME of libcares.so.2 SLOT="0/2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs test" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.19.1.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.19.1.ebuild new file mode 100644 index 0000000000..1bbb99c28b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.19.1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc +inherit edo multilib-minimal verify-sig + +DESCRIPTION="C library that resolves names asynchronously" +HOMEPAGE="https://c-ares.org/" +SRC_URI=" + https://c-ares.org/download/${P}.tar.gz + verify-sig? ( https://c-ares.org/download/${P}.tar.gz.asc ) +" + +LICENSE="MIT" +# Subslot = SONAME of libcares.so.2 +SLOT="0/2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" + +DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/ares_build.h +) + +multilib_src_configure() { + local myeconfargs=( + --enable-nonblocking + --enable-symbol-hiding + $(use_enable static-libs static) + $(use_enable test tests) + ) + + # Needed for running unit tests only + # Violates sandbox and tests pass fine without + export ax_cv_uts_namespace=no + export ax_cv_user_namespace=no + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + cd "${BUILD_DIR}"/test || die + + # We're skipping the "real" network tests with the filter + # see https://github.com/c-ares/c-ares/tree/main/test + local network_tests=( + # Most live tests have Live in the name + *Live* + # These don't but are still in ares-test-live.cc => live + *GetTCPSock* + *TimeoutValue* + *GetSock* + *GetSock_virtualized* + ) + + # The format for disabling test1, test2, and test3 looks like: + # -test1:test2:test3 + edo ./arestest --gtest_filter=-$(echo $(IFS=:; echo "${network_tests[*]}")) +} + +multilib_src_install_all() { + einstalldocs + + find "${ED}" -name "*.la" -delete || die +} From e9413c6e3532aa8c9d9a5b179ee226d23b0cef22 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:21 +0000 Subject: [PATCH 136/202] net-libs/gnutls: Sync with Gentoo It's from Gentoo commit 57489c70e09a8259a9e6beb956d46f8326da696c. --- .../portage-stable/net-libs/gnutls/gnutls-3.7.6.ebuild | 5 +---- .../portage-stable/net-libs/gnutls/gnutls-3.7.7.ebuild | 5 +---- .../portage-stable/net-libs/gnutls/gnutls-3.7.8.ebuild | 5 +---- .../portage-stable/net-libs/gnutls/gnutls-3.7.9.ebuild | 5 +---- .../portage-stable/net-libs/gnutls/gnutls-3.8.0.ebuild | 5 +---- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.6.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.6.ebuild index e63cbcf832..b445592bd7 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.6.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig ) LICENSE="GPL-3 LGPL-2.1+" SLOT="0/30.30" # . -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" @@ -91,9 +91,6 @@ multilib_src_configure() { # complains about duplicate symbols [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) - # Cygwin as does not understand these asm files at all - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) - # -fanalyzer substantially slows down the build and isn't useful for # us. It's useful for upstream as it's static analysis, but it's not # useful when just getting something built. diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.7.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.7.ebuild index a1bc18f35d..0fb5846f25 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.7.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig ) LICENSE="GPL-3 LGPL-2.1+" SLOT="0/30.30" # . -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" @@ -91,9 +91,6 @@ multilib_src_configure() { # complains about duplicate symbols [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) - # Cygwin as does not understand these asm files at all - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) - # -fanalyzer substantially slows down the build and isn't useful for # us. It's useful for upstream as it's static analysis, but it's not # useful when just getting something built. diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.8.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.8.ebuild index dc7d2f811a..6048085af0 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.8.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig ) LICENSE="GPL-3 LGPL-2.1+" SLOT="0/30.30" # . -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" @@ -91,9 +91,6 @@ multilib_src_configure() { # complains about duplicate symbols [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) - # Cygwin as does not understand these asm files at all - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) - # -fanalyzer substantially slows down the build and isn't useful for # us. It's useful for upstream as it's static analysis, but it's not # useful when just getting something built. diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.9.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.9.ebuild index 09c958dd5c..b42972645d 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.9.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig ) LICENSE="GPL-3 LGPL-2.1+" SLOT="0/30.30" # . -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" @@ -91,9 +91,6 @@ multilib_src_configure() { # complains about duplicate symbols [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) - # Cygwin as does not understand these asm files at all - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) - # -fanalyzer substantially slows down the build and isn't useful for # us. It's useful for upstream as it's static analysis, but it's not # useful when just getting something built. diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.0.ebuild index d2e4444243..c0a448c452 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.0.ebuild @@ -17,7 +17,7 @@ LICENSE="GPL-3 LGPL-2.1+" # Subslot format: # . SLOT="0/30.30" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 seccomp tls-heartbeat tools )" RESTRICT="!test? ( test )" @@ -89,9 +89,6 @@ multilib_src_configure() { # complains about duplicate symbols [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) - # Cygwin as does not understand these asm files at all - [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) - # -fanalyzer substantially slows down the build and isn't useful for # us. It's useful for upstream as it's static analysis, but it's not # useful when just getting something built. From 52f0e21a7c3a23296d47761a1c6b233270ada222 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:23 +0000 Subject: [PATCH 137/202] net-libs/libpcap: Sync with Gentoo It's from Gentoo commit 4aebe55f8c434205f2ea3d28ffacb834a401bc1f. --- .../net-libs/libpcap/libpcap-1.10.1-r2.ebuild | 10 ++-------- .../net-libs/libpcap/libpcap-1.10.2.ebuild | 8 +------- .../net-libs/libpcap/libpcap-1.10.3.ebuild | 8 +------- .../net-libs/libpcap/libpcap-1.10.4.ebuild | 8 +------- .../net-libs/libpcap/libpcap-9999.ebuild | 8 +------- 5 files changed, 6 insertions(+), 36 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.1-r2.ebuild index bda001c291..962b68e1c4 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,7 @@ else SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz" SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi LICENSE="BSD" @@ -102,10 +102,4 @@ multilib_src_install_all() { fi find "${ED}" -name '*.la' -delete || die - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h portability.h - fi } diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.2.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.2.ebuild index 9bda8d87fb..bbda2340f5 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.2.ebuild @@ -18,7 +18,7 @@ else SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi LICENSE="BSD" @@ -88,10 +88,4 @@ multilib_src_install_all() { fi find "${ED}" -name '*.la' -delete || die - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h portability.h - fi } diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.3.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.3.ebuild index 21a46673c4..d37ecea1fc 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.3.ebuild @@ -18,7 +18,7 @@ else SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi LICENSE="BSD" @@ -88,10 +88,4 @@ multilib_src_install_all() { fi find "${ED}" -name '*.la' -delete || die - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h portability.h - fi } diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.4.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.4.ebuild index a229dbe01d..ba0c8e261d 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-1.10.4.ebuild @@ -18,7 +18,7 @@ else SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi LICENSE="BSD" @@ -88,10 +88,4 @@ multilib_src_install_all() { fi find "${ED}" -name '*.la' -delete || die - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h portability.h - fi } diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-9999.ebuild index a229dbe01d..ba0c8e261d 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/libpcap/libpcap-9999.ebuild @@ -18,7 +18,7 @@ else SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi LICENSE="BSD" @@ -88,10 +88,4 @@ multilib_src_install_all() { fi find "${ED}" -name '*.la' -delete || die - - # We need this to build pppd on G/FBSD systems - if [[ "${USERLAND}" == "BSD" ]]; then - insinto /usr/include - doins pcap-int.h portability.h - fi } From c412e107ce713f457fd8c1feb7e889755aff1c98 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:24 +0000 Subject: [PATCH 138/202] net-libs/nghttp2: Sync with Gentoo It's from Gentoo commit 5cd7f6fbe67c6ebd541feb87bff1d7e87cbbb388. --- .../portage-stable/net-libs/nghttp2/nghttp2-1.51.0-r1.ebuild | 2 +- .../portage-stable/net-libs/nghttp2/nghttp2-1.51.0.ebuild | 2 +- .../portage-stable/net-libs/nghttp2/nghttp2-1.52.0.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.51.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.51.0-r1.ebuild index 7ea2f6f988..d17fb05439 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.51.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.51.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz LICENSE="MIT" SLOT="0/1.14" # . SONAMEs -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-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 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="cxx debug hpack-tools jemalloc static-libs systemd test utils xml" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.51.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.51.0.ebuild index 42b69e1538..eaa187c5e2 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.51.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.51.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz LICENSE="MIT" SLOT="0/1.14" # . SONAMEs -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-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 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="cxx debug hpack-tools jemalloc static-libs test utils xml" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.52.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.52.0.ebuild index eff7b0dad9..c028ca91bb 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.52.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.52.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz LICENSE="MIT" SLOT="0/1.14" # 1. -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-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 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="debug hpack-tools jemalloc static-libs systemd test utils xml" RESTRICT="!test? ( test )" From f87e201a9b26ffc2cd2178e2b6cdb7b379ff2a1b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:27 +0000 Subject: [PATCH 139/202] net-misc/curl: Sync with Gentoo It's from Gentoo commit eca7a62a071f953c342f310591a6b8dc9a11cdd1. --- .../portage-stable/net-misc/curl/Manifest | 4 + .../net-misc/curl/curl-8.0.1.ebuild | 4 +- ...curl-8.1.0.ebuild => curl-8.1.0-r1.ebuild} | 7 +- .../net-misc/curl/curl-8.1.1.ebuild | 332 ++++++++++++++++++ .../net-misc/curl/curl-8.1.2.ebuild | 330 +++++++++++++++++ .../net-misc/curl/curl-9999.ebuild | 328 +++++++++++++++++ .../curl/files/curl-8.1.0-header-length.patch | 86 +++++ .../files/curl-8.1.0-numeric-hostname.patch | 227 ++++++++++++ .../files/curl-8.1.1-configure-compiler.patch | 73 ++++ .../curl/files/curl-8.1.1-hanging-http2.patch | 36 ++ ...-7.30.0-prefix.patch => curl-prefix.patch} | 0 11 files changed, 1423 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/portage-stable/net-misc/curl/{curl-8.1.0.ebuild => curl-8.1.0-r1.ebuild} (97%) create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.1.1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.1.2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/curl-9999.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.0-header-length.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.1-configure-compiler.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.1-hanging-http2.patch rename sdk_container/src/third_party/portage-stable/net-misc/curl/files/{curl-7.30.0-prefix.patch => curl-prefix.patch} (100%) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest index 23d9927115..11654edee6 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest @@ -2,3 +2,7 @@ DIST curl-8.0.1.tar.xz 2575544 BLAKE2B 67d82e9d71f0a351b5c2ed3ad5eab02e367ded872 DIST curl-8.0.1.tar.xz.asc 488 BLAKE2B 452e1bebe1028e7621bbf8829e50cf56e254cd63a8cf2a4c0332176b9f18fb2821304ae556a203996d273c986bddbd04db2218c18fd34dee66e9155861ba50ce SHA512 92c6a0570e9a8a708fe2f717b8b37a68dcb9cd4520ca50c9baafec5891bda103bce2d2dcb67f1387bf11bd7e51e0e64ccd52d196e61d58b598ad3aa1960386cf DIST curl-8.1.0.tar.xz 2612568 BLAKE2B 768a824b8f5f6ddaa073599c4106f07a8134bcbe0e0d666390be1bce16ba25386d85930853bb47bc90b2c8a499a0b2abb9c685042563801e0fe58b9c315ac6cc SHA512 b99926f372ddd715cd1d2b54d8fb96b26b085e6501715e25aa57b6c6a7f8452473506ddb284e2f280f8afdb301b7f0c3bfde7ad7ed393b12c022430a9301096d DIST curl-8.1.0.tar.xz.asc 488 BLAKE2B c1a8e50eddc7dd140af2af29736eb486e96a6d3b67a9161244daa86558f65522527380c92597a5f10e5dad187f0bda6ac5b9cadc29386bef4492bc047c77b423 SHA512 191a74c7a6b6aa78b7f36e1535fda0701bde8b333a61c90343e1f1b2d65cc5097b5febc5fa42b2f373795ef1b34078790deaaa71c8aaa45eed1c753729a45f3d +DIST curl-8.1.1.tar.xz 2613348 BLAKE2B 465a3237335e73665086ac43f5c66cfbab7e9b163e1ae0e2345da82f9c736d87fccf4d76369cc069abc29621f10db7ddbf22d0337db9ca85042bb12438d4aaed SHA512 d034b1ab9c00e8a0acf7ba6c6344734945d45666b4f38394f5456fcd9b22623146a897270861b7411412ca25c912e1bbf24eb139a6dfc1a8c00d098b3b925399 +DIST curl-8.1.1.tar.xz.asc 488 BLAKE2B c92017d0fe4933d6c27d833944c231967263607a7871a658e0cbb9de46f7df8dfbec141e269296caf17ced004fb2b237b8311ec9f7bf98f03fb405b5755950fc SHA512 6a71c18d67de8c340b5d80c7452a82c00f7ef466f690eec12edcd6123aee6866e8a0e757e1cc6c9af87a63fdeaafbc9fc1b1a4e2e0fd8a75b5952d4738fd0b27 +DIST curl-8.1.2.tar.xz 2612652 BLAKE2B 66d0828912bb9971dac99025aa8b5c1c2fac1f8b568f2a8a97bd9f66986bdb164b603b539ec3e123cd6a26ea65829e58c90fc9852be88b42074cf40c89c566d1 SHA512 532ab96eba6dea66d272f3be56f5af5c5da922480f9a10e203de98037c311f12f8145ba6bf813831e42815e068874ccfd108f84f7650743f5dbb3ebc3bc9c4f4 +DIST curl-8.1.2.tar.xz.asc 488 BLAKE2B 304dbdb51aa113c0b70b2662e29b1be3294b04f5f00264ce60703756363999cd567dcd0301e27b294d1d53f16ecc016ba429fcbea240949b372750f7e6e7375a SHA512 d120299a2d59259aeb19ae0fa3a3e181e25b6927677187037c61a0901879956177ce8dda10764073a47848f81dcbbcb94e0b6008742994042b6b8fd194e169c3 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.0.1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.0.1.ebuild index 9158a1ed7a..4f21364a91 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.0.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.0.1.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="curl" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" IUSE+=" nghttp3" @@ -106,7 +106,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( ) PATCHES=( - "${FILESDIR}"/${PN}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-prefix.patch "${FILESDIR}"/${PN}-respect-cflags-3.patch # Backports diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.1.0.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.1.0-r1.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.1.0.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.1.0-r1.ebuild index 12be62edfe..cf964b638b 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.1.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.1.0-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="curl" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" IUSE+=" nghttp3" @@ -106,8 +106,11 @@ QA_CONFIG_IMPL_DECL_SKIP=( ) PATCHES=( - "${FILESDIR}"/${PN}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-prefix.patch "${FILESDIR}"/${PN}-respect-cflags-3.patch + ### Backports + "${FILESDIR}"/${P}-numeric-hostname.patch + "${FILESDIR}"/${P}-header-length.patch ) src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.1.1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.1.1.ebuild new file mode 100644 index 0000000000..e59f768b09 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.1.1.ebuild @@ -0,0 +1,332 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc +inherit autotools multilib-minimal prefix verify-sig + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.se/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/curl/curl.git" +else + SRC_URI=" + https://curl.se/download/${P}.tar.xz + verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="curl" +SLOT="0" +IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +# These select the default SSL implementation +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" +IUSE+=" nghttp3" +RESTRICT="!test? ( test )" + +# Only one default ssl provider can be enabled +# The default ssl provider needs its USE satisfied +REQUIRED_USE=" + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_nss + curl_ssl_openssl + curl_ssl_rustls + ) + ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + curl_ssl_nss? ( nss ) + curl_ssl_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) +" + +RDEPEND=" + sys-libs/zlib[${MULTILIB_USEDEP}] + adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + nghttp3? ( + net-libs/nghttp3[${MULTILIB_USEDEP}] + net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] + ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:=[${MULTILIB_USEDEP}] + ) + mbedtls? ( + app-misc/ca-certificates + net-libs/mbedtls:=[${MULTILIB_USEDEP}] + ) + nss? ( + app-misc/ca-certificates + dev-libs/nss[${MULTILIB_USEDEP}] + dev-libs/nss-pem + ) + openssl? ( + dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + ) + rustls? ( + net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] + ) + ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + test? ( + sys-apps/diffutils + http2? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +QA_CONFIG_IMPL_DECL_SKIP=( + __builtin_available + closesocket + CloseSocket + getpass_r + ioctlsocket + IoctlSocket + mach_absolute_time + setmode +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch + + ### Backports + "${FILESDIR}"/${P}-hanging-http2.patch + "${FILESDIR}"/${P}-configure-compiler.patch +) + +src_prepare() { + default + + eprefixify curl-config.in + eautoreconf +} + +multilib_src_configure() { + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) + local myconf=() + + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + if use ssl ; then + myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls ) + + if use gnutls; then + einfo "SSL provided by gnutls" + myconf+=( --with-gnutls ) + fi + if use mbedtls; then + einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use nss; then + einfo "SSL provided by nss" + myconf+=( --with-nss --with-nss-deprecated ) + fi + if use openssl; then + einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use rustls; then + einfo "SSL provided by rustls" + myconf+=( --with-rustls ) + fi + if use curl_ssl_gnutls; then + einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_nss; then + einfo "Default SSL provided by nss" + myconf+=( --with-default-ssl-backend=nss ) + elif use curl_ssl_openssl; then + einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_rustls; then + einfo "Default SSL provided by rustls" + myconf+=( --with-default-ssl-backend=rustls ) + else + eerror "We can't be here because of REQUIRED_USE." + fi + + else + myconf+=( --without-ssl ) + einfo "SSL disabled" + fi + + # These configuration options are organized alphabetically + # within each category. This should make it easier if we + # ever decide to make any of them contingent on USE flags: + # 1) protocols first. To see them all do + # 'grep SUPPORT_PROTOCOLS configure.ac' + # 2) --enable/disable options second. + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort + # 3) --with/without options third. + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + + myconf+=( + $(use_enable alt-svc) + --enable-crypto-auth + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --enable-ntlm + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-symbol-hiding + --enable-http-auth + --enable-ipv6 + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --enable-socketpair + --disable-sspi + $(use_enable static-libs static) + --enable-pthreads + --enable-threaded-resolver + --disable-versioned-symbols + --without-amissl + --without-bearssl + $(use_with brotli) + --without-fish-functions-dir + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + --without-libpsl + --without-msh3 + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + --without-quiche + $(use_with rtmp librtmp) + --without-schannel + --without-secure-transport + --without-test-caddy + --without-test-httpd + --without-test-nghttpx + $(use_enable websockets) + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + ) + + if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + myconf+=( + --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" + ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # Avoid building the client (we just want libcurl for multilib) + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "libngtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc || die +} + +multilib_src_test() { + # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 + # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) + # -v: verbose + # -a: keep going on failure (so we see everything which breaks, not just 1st test) + # -k: keep test files after completion + # -am: automake style TAP output + # -p: print logs if test fails + # Note: if needed, we can skip specific tests. See e.g. Fedora's packaging + # or just read https://github.com/curl/curl/tree/master/tests#run. + # Note: we don't run the testsuite for cross-compilation. + # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped + # as most gentoo users don't have an 'ip6-localhost' + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p !241 !1083" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.1.2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.1.2.ebuild new file mode 100644 index 0000000000..550db16e60 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.1.2.ebuild @@ -0,0 +1,330 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc +inherit autotools multilib-minimal prefix verify-sig + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.se/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/curl/curl.git" +else + SRC_URI=" + https://curl.se/download/${P}.tar.xz + verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="curl" +SLOT="0" +IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +# These select the default SSL implementation +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" +IUSE+=" nghttp3" +RESTRICT="!test? ( test )" + +# Only one default ssl provider can be enabled +# The default ssl provider needs its USE satisfied +REQUIRED_USE=" + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_nss + curl_ssl_openssl + curl_ssl_rustls + ) + ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + curl_ssl_nss? ( nss ) + curl_ssl_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) +" + +RDEPEND=" + sys-libs/zlib[${MULTILIB_USEDEP}] + adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + nghttp3? ( + net-libs/nghttp3[${MULTILIB_USEDEP}] + net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] + ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:=[${MULTILIB_USEDEP}] + ) + mbedtls? ( + app-misc/ca-certificates + net-libs/mbedtls:=[${MULTILIB_USEDEP}] + ) + nss? ( + app-misc/ca-certificates + dev-libs/nss[${MULTILIB_USEDEP}] + dev-libs/nss-pem + ) + openssl? ( + dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + ) + rustls? ( + net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] + ) + ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + test? ( + sys-apps/diffutils + http2? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +QA_CONFIG_IMPL_DECL_SKIP=( + __builtin_available + closesocket + CloseSocket + getpass_r + ioctlsocket + IoctlSocket + mach_absolute_time + setmode +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch +) + +src_prepare() { + default + + eprefixify curl-config.in + eautoreconf +} + +multilib_src_configure() { + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) + local myconf=() + + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + if use ssl ; then + myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls ) + + if use gnutls; then + multilib_is_native_abi && einfo "SSL provided by gnutls" + myconf+=( --with-gnutls ) + fi + if use mbedtls; then + multilib_is_native_abi && einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use nss; then + multilib_is_native_abi && einfo "SSL provided by nss" + myconf+=( --with-nss --with-nss-deprecated ) + fi + if use openssl; then + multilib_is_native_abi && einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use rustls; then + multilib_is_native_abi && einfo "SSL provided by rustls" + myconf+=( --with-rustls ) + fi + if use curl_ssl_gnutls; then + multilib_is_native_abi && einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + multilib_is_native_abi && einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_nss; then + multilib_is_native_abi && einfo "Default SSL provided by nss" + myconf+=( --with-default-ssl-backend=nss ) + elif use curl_ssl_openssl; then + multilib_is_native_abi && einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_rustls; then + multilib_is_native_abi && einfo "Default SSL provided by rustls" + myconf+=( --with-default-ssl-backend=rustls ) + else + eerror "We can't be here because of REQUIRED_USE." + fi + + else + myconf+=( --without-ssl ) + einfo "SSL disabled" + fi + + # These configuration options are organized alphabetically + # within each category. This should make it easier if we + # ever decide to make any of them contingent on USE flags: + # 1) protocols first. To see them all do + # 'grep SUPPORT_PROTOCOLS configure.ac' + # 2) --enable/disable options second. + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort + # 3) --with/without options third. + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + + myconf+=( + $(use_enable alt-svc) + --enable-crypto-auth + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --enable-ntlm + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-symbol-hiding + --enable-http-auth + --enable-ipv6 + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --enable-socketpair + --disable-sspi + $(use_enable static-libs static) + --enable-pthreads + --enable-threaded-resolver + --disable-versioned-symbols + --without-amissl + --without-bearssl + $(use_with brotli) + --without-fish-functions-dir + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + --without-libpsl + --without-msh3 + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + --without-quiche + $(use_with rtmp librtmp) + --without-schannel + --without-secure-transport + --without-test-caddy + --without-test-httpd + --without-test-nghttpx + $(use_enable websockets) + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + ) + + if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + myconf+=( + --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" + ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # Avoid building the client (we just want libcurl for multilib) + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "libngtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc || die +} + +# There is also a pytest harness that tests for bugs in some very specific +# situations; we can rely on upstream for this rather than adding additional test deps. +multilib_src_test() { + # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 + # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) + # -v: verbose + # -a: keep going on failure (so we see everything which breaks, not just 1st test) + # -k: keep test files after completion + # -am: automake style TAP output + # -p: print logs if test fails + # Note: if needed, we can skip specific tests. See e.g. Fedora's packaging + # or just read https://github.com/curl/curl/tree/master/tests#run. + # Note: we don't run the testsuite for cross-compilation. + # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped + # as most gentoo users don't have an 'ip6-localhost' + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p !241 !1083" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-9999.ebuild new file mode 100644 index 0000000000..bd074d8035 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-9999.ebuild @@ -0,0 +1,328 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc +inherit autotools multilib-minimal prefix verify-sig + +DESCRIPTION="A Client that groks URLs" +HOMEPAGE="https://curl.se/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/curl/curl.git" +else + SRC_URI=" + https://curl.se/download/${P}.tar.xz + verify-sig? ( https://curl.se/download/${P}.tar.xz.asc ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="curl" +SLOT="0" +IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +# These select the default SSL implementation +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" +IUSE+=" nghttp3" +RESTRICT="!test? ( test )" + +# Only one default ssl provider can be enabled +# The default ssl provider needs its USE satisfied +REQUIRED_USE=" + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_nss + curl_ssl_openssl + curl_ssl_rustls + ) + ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + curl_ssl_nss? ( nss ) + curl_ssl_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) +" + +RDEPEND=" + sys-libs/zlib[${MULTILIB_USEDEP}] + adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + nghttp3? ( + net-libs/nghttp3[${MULTILIB_USEDEP}] + net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] + ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:=[${MULTILIB_USEDEP}] + ) + mbedtls? ( + app-misc/ca-certificates + net-libs/mbedtls:=[${MULTILIB_USEDEP}] + ) + nss? ( + app-misc/ca-certificates + dev-libs/nss[${MULTILIB_USEDEP}] + dev-libs/nss-pem + ) + openssl? ( + dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + ) + rustls? ( + net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] + ) + ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/perl + virtual/pkgconfig + test? ( + sys-apps/diffutils + http2? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] ) + ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +QA_CONFIG_IMPL_DECL_SKIP=( + __builtin_available + closesocket + CloseSocket + getpass_r + ioctlsocket + IoctlSocket + mach_absolute_time + setmode +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch +) + +src_prepare() { + default + + eprefixify curl-config.in + eautoreconf +} + +multilib_src_configure() { + # We make use of the fact that later flags override earlier ones + # So start with all ssl providers off until proven otherwise + # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) + local myconf=() + + myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + if use ssl ; then + myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls ) + + if use gnutls; then + multilib_is_native_abi && einfo "SSL provided by gnutls" + myconf+=( --with-gnutls ) + fi + if use mbedtls; then + multilib_is_native_abi && einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use nss; then + multilib_is_native_abi && einfo "SSL provided by nss" + myconf+=( --with-nss --with-nss-deprecated ) + fi + if use openssl; then + multilib_is_native_abi && einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + if use rustls; then + multilib_is_native_abi && einfo "SSL provided by rustls" + myconf+=( --with-rustls ) + fi + if use curl_ssl_gnutls; then + multilib_is_native_abi && einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_mbedtls; then + multilib_is_native_abi && einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_nss; then + multilib_is_native_abi && einfo "Default SSL provided by nss" + myconf+=( --with-default-ssl-backend=nss ) + elif use curl_ssl_openssl; then + multilib_is_native_abi && einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_rustls; then + multilib_is_native_abi && einfo "Default SSL provided by rustls" + myconf+=( --with-default-ssl-backend=rustls ) + else + eerror "We can't be here because of REQUIRED_USE." + fi + + else + myconf+=( --without-ssl ) + einfo "SSL disabled" + fi + + # These configuration options are organized alphabetically + # within each category. This should make it easier if we + # ever decide to make any of them contingent on USE flags: + # 1) protocols first. To see them all do + # 'grep SUPPORT_PROTOCOLS configure.ac' + # 2) --enable/disable options second. + # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort + # 3) --with/without options third. + # grep -- --with configure | grep Check | awk '{ print $4 }' | sort + + myconf+=( + $(use_enable alt-svc) + --enable-crypto-auth + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --enable-ntlm + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-symbol-hiding + --enable-http-auth + --enable-ipv6 + --enable-largefile + --enable-manual + --enable-mime + --enable-netrc + $(use_enable progress-meter) + --enable-proxy + --enable-socketpair + --disable-sspi + $(use_enable static-libs static) + --enable-pthreads + --enable-threaded-resolver + --disable-versioned-symbols + --without-amissl + --without-bearssl + $(use_with brotli) + --without-fish-functions-dir + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + --without-libpsl + --without-msh3 + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + --without-quiche + $(use_with rtmp librtmp) + --without-schannel + --without-secure-transport + --without-test-caddy + --without-test-httpd + --without-test-nghttpx + $(use_enable websockets) + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + ) + + if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + myconf+=( + --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" + ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + if ! multilib_is_native_abi; then + # Avoid building the client (we just want libcurl for multilib) + sed -i -e '/SUBDIRS/s:src::' Makefile || die + sed -i -e '/SUBDIRS/s:scripts::' Makefile || die + fi + + # Fix up the pkg-config file to be more robust. + # https://github.com/curl/curl/issues/864 + local priv=() libs=() + # We always enable zlib. + libs+=( "-lz" ) + priv+=( "zlib" ) + if use http2; then + libs+=( "-lnghttp2" ) + priv+=( "libnghttp2" ) + fi + if use nghttp3; then + libs+=( "-lnghttp3" "-lngtcp2" ) + priv+=( "libnghttp3" "libngtcp2" ) + fi + if use ssl && use curl_ssl_openssl; then + libs+=( "-lssl" "-lcrypto" ) + priv+=( "openssl" ) + fi + grep -q Requires.private libcurl.pc && die "need to update ebuild" + libs=$(printf '|%s' "${libs[@]}") + sed -i -r \ + -e "/^Libs.private/s:(${libs#|})( |$)::g" \ + libcurl.pc || die + echo "Requires.private: ${priv[*]}" >> libcurl.pc || die +} + +# There is also a pytest harness that tests for bugs in some very specific +# situations; we can rely on upstream for this rather than adding additional test deps. +multilib_src_test() { + # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 + # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) + # -v: verbose + # -a: keep going on failure (so we see everything which breaks, not just 1st test) + # -k: keep test files after completion + # -am: automake style TAP output + # -p: print logs if test fails + # Note: if needed, we can skip specific tests. See e.g. Fedora's packaging + # or just read https://github.com/curl/curl/tree/master/tests#run. + # Note: we don't run the testsuite for cross-compilation. + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.0-header-length.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.0-header-length.patch new file mode 100644 index 0000000000..6229fd817f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.0-header-length.patch @@ -0,0 +1,86 @@ +https://github.com/curl/curl/commit/77c9a9845bbee66f3aff158b8452dc8cd963cbd5.patch +From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= +Date: Thu, 18 May 2023 18:22:57 +0200 +Subject: [PATCH] http2: double http request parser max line length + +This works around #11138, by doubling the limit, and should be a +relatively safe fix. + +Ideally the buffer would grow as needed and there would be no need for a +limit? But that might be follow-up material. + +Fixes #11138 +Closes #11139 +--- + lib/http1.h | 2 ++ + lib/http2.c | 2 +- + lib/vquic/curl_msh3.c | 2 +- + lib/vquic/curl_ngtcp2.c | 2 +- + lib/vquic/curl_quiche.c | 2 +- + 5 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/lib/http1.h b/lib/http1.h +index c2d107587a6f8..8acb9db401a95 100644 +--- a/lib/http1.h ++++ b/lib/http1.h +@@ -33,6 +33,8 @@ + #define H1_PARSE_OPT_NONE (0) + #define H1_PARSE_OPT_STRICT (1 << 0) + ++#define H1_PARSE_DEFAULT_MAX_LINE_LEN (8 * 1024) ++ + struct h1_req_parser { + struct http_req *req; + struct bufq scratch; +diff --git a/lib/http2.c b/lib/http2.c +index 47e6f71393156..4e3b182b8d815 100644 +--- a/lib/http2.c ++++ b/lib/http2.c +@@ -1860,7 +1860,7 @@ static ssize_t h2_submit(struct stream_ctx **pstream, + nghttp2_priority_spec pri_spec; + ssize_t nwritten; + +- Curl_h1_req_parse_init(&h1, (4*1024)); ++ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN); + Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST); + + *err = http2_data_setup(cf, data, &stream); +diff --git a/lib/vquic/curl_msh3.c b/lib/vquic/curl_msh3.c +index 40e89379fc402..173886739b6dc 100644 +--- a/lib/vquic/curl_msh3.c ++++ b/lib/vquic/curl_msh3.c +@@ -575,7 +575,7 @@ static ssize_t cf_msh3_send(struct Curl_cfilter *cf, struct Curl_easy *data, + + CF_DATA_SAVE(save, cf, data); + +- Curl_h1_req_parse_init(&h1, (4*1024)); ++ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN); + Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST); + + /* Sizes must match for cast below to work" */ +diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c +index 05f960afdffa1..7794f148c6ec9 100644 +--- a/lib/vquic/curl_ngtcp2.c ++++ b/lib/vquic/curl_ngtcp2.c +@@ -1550,7 +1550,7 @@ static ssize_t h3_stream_open(struct Curl_cfilter *cf, + nghttp3_data_reader reader; + nghttp3_data_reader *preader = NULL; + +- Curl_h1_req_parse_init(&h1, (4*1024)); ++ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN); + Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST); + + *err = h3_data_setup(cf, data); +diff --git a/lib/vquic/curl_quiche.c b/lib/vquic/curl_quiche.c +index 392b9beb83c59..c63e8e10a22e0 100644 +--- a/lib/vquic/curl_quiche.c ++++ b/lib/vquic/curl_quiche.c +@@ -913,7 +913,7 @@ static ssize_t h3_open_stream(struct Curl_cfilter *cf, + DEBUGASSERT(stream); + } + +- Curl_h1_req_parse_init(&h1, (4*1024)); ++ Curl_h1_req_parse_init(&h1, H1_PARSE_DEFAULT_MAX_LINE_LEN); + Curl_dynhds_init(&h2_headers, 0, DYN_HTTP_REQUEST); + + DEBUGASSERT(stream); diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch new file mode 100644 index 0000000000..6a0dd1382d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.0-numeric-hostname.patch @@ -0,0 +1,227 @@ +https://github.com/curl/curl/commit/92772e6d395bbdda0e7822d980caf86e8c4aa51c.patch +From: Daniel Stenberg +Date: Thu, 18 May 2023 00:31:17 +0200 +Subject: [PATCH] urlapi: allow numerical parts in the host name + +It can only be an IPv4 address if all parts are all digits and no more than +four parts, otherwise it is a host name. Even slightly wrong IPv4 will now be +passed through as a host name. + +Regression from 17a15d88467 shipped in 8.1.0 + +Extended test 1560 accordingly. + +Reported-by: Pavel Kalyugin +Fixes #11129 +Closes #11131 +--- a/lib/urlapi.c ++++ b/lib/urlapi.c +@@ -34,6 +34,7 @@ + #include "inet_ntop.h" + #include "strdup.h" + #include "idn.h" ++#include "curl_memrchr.h" + + /* The last 3 #include files should be in this order */ + #include "curl_printf.h" +@@ -643,8 +644,8 @@ static CURLUcode hostname_check(struct Curl_URL *u, char *hostname, + * Handle partial IPv4 numerical addresses and different bases, like + * '16843009', '0x7f', '0x7f.1' '0177.1.1.1' etc. + * +- * If the given input string is syntactically wrong or any part for example is +- * too big, this function returns FALSE and doesn't create any output. ++ * If the given input string is syntactically wrong IPv4 or any part for ++ * example is too big, this function returns HOST_NAME. + * + * Output the "normalized" version of that input string in plain quad decimal + * integers. +@@ -675,7 +676,7 @@ static int ipv4_normalize(struct dynbuf *host) + unsigned long l; + if(!ISDIGIT(*c)) + /* most importantly this doesn't allow a leading plus or minus */ +- return n ? HOST_BAD : HOST_NAME; ++ return HOST_NAME; + l = strtoul(c, &endp, 0); + + parts[n] = l; +@@ -684,7 +685,7 @@ static int ipv4_normalize(struct dynbuf *host) + switch(*c) { + case '.': + if(n == 3) +- return HOST_BAD; ++ return HOST_NAME; + n++; + c++; + break; +@@ -694,39 +695,40 @@ static int ipv4_normalize(struct dynbuf *host) + break; + + default: +- return n ? HOST_BAD : HOST_NAME; ++ return HOST_NAME; + } + + /* overflow */ + if((l == ULONG_MAX) && (errno == ERANGE)) +- return HOST_BAD; ++ return HOST_NAME; + + #if SIZEOF_LONG > 4 + /* a value larger than 32 bits */ + if(l > UINT_MAX) +- return HOST_BAD; ++ return HOST_NAME; + #endif + } + +- /* this is a valid IPv4 numerical address */ +- Curl_dyn_reset(host); +- + switch(n) { + case 0: /* a -- 32 bits */ ++ Curl_dyn_reset(host); ++ + result = Curl_dyn_addf(host, "%u.%u.%u.%u", + parts[0] >> 24, (parts[0] >> 16) & 0xff, + (parts[0] >> 8) & 0xff, parts[0] & 0xff); + break; + case 1: /* a.b -- 8.24 bits */ + if((parts[0] > 0xff) || (parts[1] > 0xffffff)) +- return HOST_BAD; ++ return HOST_NAME; ++ Curl_dyn_reset(host); + result = Curl_dyn_addf(host, "%u.%u.%u.%u", + parts[0], (parts[1] >> 16) & 0xff, + (parts[1] >> 8) & 0xff, parts[1] & 0xff); + break; + case 2: /* a.b.c -- 8.8.16 bits */ + if((parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xffff)) +- return HOST_BAD; ++ return HOST_NAME; ++ Curl_dyn_reset(host); + result = Curl_dyn_addf(host, "%u.%u.%u.%u", + parts[0], parts[1], (parts[2] >> 8) & 0xff, + parts[2] & 0xff); +@@ -734,7 +736,8 @@ static int ipv4_normalize(struct dynbuf *host) + case 3: /* a.b.c.d -- 8.8.8.8 bits */ + if((parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xff) || + (parts[3] > 0xff)) +- return HOST_BAD; ++ return HOST_NAME; ++ Curl_dyn_reset(host); + result = Curl_dyn_addf(host, "%u.%u.%u.%u", + parts[0], parts[1], parts[2], parts[3]); + break; +@@ -796,6 +799,9 @@ static CURLUcode parse_authority(struct Curl_URL *u, + if(result) + goto out; + ++ if(!Curl_dyn_len(host)) ++ return CURLUE_NO_HOST; ++ + switch(ipv4_normalize(host)) { + case HOST_IPV4: + break; +--- a/tests/libtest/lib1560.c ++++ b/tests/libtest/lib1560.c +@@ -474,6 +474,13 @@ static const struct testcase get_parts_list[] ={ + }; + + static const struct urltestcase get_url_list[] = { ++ {"https://1.0x1000000", "https://1.0x1000000/", 0, 0, CURLUE_OK}, ++ {"https://0x7f.1", "https://127.0.0.1/", 0, 0, CURLUE_OK}, ++ {"https://1.2.3.256.com", "https://1.2.3.256.com/", 0, 0, CURLUE_OK}, ++ {"https://10.com", "https://10.com/", 0, 0, CURLUE_OK}, ++ {"https://1.2.com", "https://1.2.com/", 0, 0, CURLUE_OK}, ++ {"https://1.2.3.com", "https://1.2.3.com/", 0, 0, CURLUE_OK}, ++ {"https://1.2.com.99", "https://1.2.com.99/", 0, 0, CURLUE_OK}, + {"https://[fe80::0000:20c:29ff:fe9c:409b]:80/moo", + "https://[fe80::20c:29ff:fe9c:409b]:80/moo", + 0, 0, CURLUE_OK}, +@@ -522,22 +529,24 @@ static const struct urltestcase get_url_list[] = { + + /* IPv4 trickeries */ + {"https://16843009", "https://1.1.1.1/", 0, 0, CURLUE_OK}, +- {"https://0x7f.1", "https://127.0.0.1/", 0, 0, CURLUE_OK}, + {"https://0177.1", "https://127.0.0.1/", 0, 0, CURLUE_OK}, + {"https://0111.02.0x3", "https://73.2.0.3/", 0, 0, CURLUE_OK}, ++ {"https://0111.02.0x3.", "https://0111.02.0x3./", 0, 0, CURLUE_OK}, ++ {"https://0111.02.030", "https://73.2.0.24/", 0, 0, CURLUE_OK}, ++ {"https://0111.02.030.", "https://0111.02.030./", 0, 0, CURLUE_OK}, + {"https://0xff.0xff.0377.255", "https://255.255.255.255/", 0, 0, CURLUE_OK}, + {"https://1.0xffffff", "https://1.255.255.255/", 0, 0, CURLUE_OK}, + /* IPv4 numerical overflows or syntax errors will not normalize */ + {"https://a127.0.0.1", "https://a127.0.0.1/", 0, 0, CURLUE_OK}, + {"https://\xff.127.0.0.1", "https://%FF.127.0.0.1/", 0, CURLU_URLENCODE, + CURLUE_OK}, +- {"https://127.-0.0.1", "https://127.-0.0.1/", 0, 0, CURLUE_BAD_HOSTNAME}, ++ {"https://127.-0.0.1", "https://127.-0.0.1/", 0, 0, CURLUE_OK}, + {"https://127.0. 1", "https://127.0.0.1/", 0, 0, CURLUE_MALFORMED_INPUT}, +- {"https://1.0x1000000", "https://1.0x1000000/", 0, 0, CURLUE_BAD_HOSTNAME}, +- {"https://1.2.3.256", "https://1.2.3.256/", 0, 0, CURLUE_BAD_HOSTNAME}, +- {"https://1.2.3.4.5", "https://1.2.3.4.5/", 0, 0, CURLUE_BAD_HOSTNAME}, +- {"https://1.2.0x100.3", "https://1.2.0x100.3/", 0, 0, CURLUE_BAD_HOSTNAME}, +- {"https://4294967296", "https://4294967296/", 0, 0, CURLUE_BAD_HOSTNAME}, ++ {"https://1.2.3.256", "https://1.2.3.256/", 0, 0, CURLUE_OK}, ++ {"https://1.2.3.256.", "https://1.2.3.256./", 0, 0, CURLUE_OK}, ++ {"https://1.2.3.4.5", "https://1.2.3.4.5/", 0, 0, CURLUE_OK}, ++ {"https://1.2.0x100.3", "https://1.2.0x100.3/", 0, 0, CURLUE_OK}, ++ {"https://4294967296", "https://4294967296/", 0, 0, CURLUE_OK}, + {"https://123host", "https://123host/", 0, 0, CURLUE_OK}, + /* 40 bytes scheme is the max allowed */ + {"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA://hostname/path", +@@ -599,20 +608,11 @@ static const struct urltestcase get_url_list[] = { + 0, 0, CURLUE_OK}, + /* here the password has the semicolon */ + {"http://user:pass;word@host/file", +- "http://user:pass;word@host/file", +- 0, 0, CURLUE_OK}, +- {"file:///file.txt#moo", +- "file:///file.txt#moo", +- 0, 0, CURLUE_OK}, +- {"file:////file.txt", +- "file:////file.txt", +- 0, 0, CURLUE_OK}, +- {"file:///file.txt", +- "file:///file.txt", +- 0, 0, CURLUE_OK}, +- {"file:./", +- "file://", +- 0, 0, CURLUE_BAD_SCHEME}, ++ "http://user:pass;word@host/file", 0, 0, CURLUE_OK}, ++ {"file:///file.txt#moo", "file:///file.txt#moo", 0, 0, CURLUE_OK}, ++ {"file:////file.txt", "file:////file.txt", 0, 0, CURLUE_OK}, ++ {"file:///file.txt", "file:///file.txt", 0, 0, CURLUE_OK}, ++ {"file:./", "file://", 0, 0, CURLUE_OK}, + {"http://example.com/hello/../here", + "http://example.com/hello/../here", + CURLU_PATH_AS_IS, 0, CURLUE_OK}, +@@ -1124,7 +1124,7 @@ static int get_url(void) + } + curl_free(url); + } +- else if(rc != get_url_list[i].ucode) { ++ if(rc != get_url_list[i].ucode) { + fprintf(stderr, "Get URL\nin: %s\nreturned %d (expected %d)\n", + get_url_list[i].in, (int)rc, get_url_list[i].ucode); + error++; +@@ -1515,6 +1515,9 @@ int test(char *URL) + { + (void)URL; /* not used */ + ++ if(get_url()) ++ return 3; ++ + if(huge()) + return 9; + +@@ -1533,9 +1536,6 @@ int test(char *URL) + if(set_parts()) + return 2; + +- if(get_url()) +- return 3; +- + if(get_parts()) + return 4; + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.1-configure-compiler.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.1-configure-compiler.patch new file mode 100644 index 0000000000..f769b35880 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.1-configure-compiler.patch @@ -0,0 +1,73 @@ +The check for "basic compiler options" hangs otherwise. + +https://github.com/curl/curl/commit/471dab2da0c6b2b08ca2b96a1da0a4825e2c3c36 +https://github.com/curl/curl/commit/c4a019603b82a08c3572591a9393df0818ee02f6 + +From 471dab2da0c6b2b08ca2b96a1da0a4825e2c3c36 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Tue, 23 May 2023 09:40:18 +0200 +Subject: [PATCH] configure: quote the assignments for run-compiler + +Building for multilib failed, as the compiler command contains an +extra argument. That needs quoting. + +Regression from b78ca50cb3dda361f9c1 + +Fixes #11179 +Closes #11180 +--- a/configure.ac ++++ b/configure.ac +@@ -193,8 +193,8 @@ dnl something different but only have that affect the execution of the results + dnl of the compile, not change the libraries for the compiler itself. + dnl + compilersh="run-compiler" +-echo "CC=$CC" > $compilersh +-echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $compilersh ++echo "CC=\"$CC\"" > $compilersh ++echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh + echo 'exec $CC $@' >> $compilersh + + dnl ********************************************************************** + +From c4a019603b82a08c3572591a9393df0818ee02f6 Mon Sep 17 00:00:00 2001 +From: Emanuele Torre +Date: Tue, 23 May 2023 11:59:59 +0200 +Subject: [PATCH] configure: fix build with arbitrary CC and LD_LIBRARY_PATH + +Since ./configure and processes that inherit its environment variables +are the only callers of the run-compiler script, we can just save the +current value of the LD_LIBRARY_PATH and CC variables to another pair of +environment variables, and make run-compiler a static script that +simply restores CC and LD_LIBRARY_PATH to the saved value, and before +running the compiler. + +This avoids having to inject the values of the variables in the script, +possibly causing problems if they contains spaces, quotes, and other +special characters. + +Also add exports in the script just in case LD_LIBRARY_PATH and CC are +not already in the environment. + +follow-up from 471dab2 + +Closes #11182 +--- a/configure.ac ++++ b/configure.ac +@@ -193,9 +193,13 @@ dnl something different but only have that affect the execution of the results + dnl of the compile, not change the libraries for the compiler itself. + dnl + compilersh="run-compiler" +-echo "CC=\"$CC\"" > $compilersh +-echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh +-echo 'exec $CC $@' >> $compilersh ++export "CURL_SAVED_CC=$CC" ++export "CURL_SAVED_LD_LIBRARY_PATH=$LD_LIBRARY_PATH" ++cat <<\EOF > "$compilersh" ++export "CC=$CURL_SAVED_CC" ++export "LD_LIBRARY_PATH=$CURL_SAVED_LD_LIBRARY_PATH" ++exec $CC "$@" ++EOF + + dnl ********************************************************************** + dnl See which TLS backend(s) that are requested. Just do all the + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.1-hanging-http2.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.1-hanging-http2.patch new file mode 100644 index 0000000000..4777c4dd35 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.1.1-hanging-http2.patch @@ -0,0 +1,36 @@ +https://github.com/curl/curl/commit/5c58cb0212bcf63cce33a974906bf9905948b4bb +From: Stefan Eissing +Date: Wed, 24 May 2023 18:48:16 +0200 +Subject: [PATCH] http2: fix EOF handling on uploads with auth negotiation + +- doing a POST with `--digest` does an override on the initial request + with `Content-Length: 0`, but the http2 filter was unaware of that + and expected the originally request body. It did therefore not + send a final DATA frame with EOF flag to the server. +- The fix overrides any initial notion of post size when the `done_send` + event is triggered by the transfer loop, leading to the EOF that + is necessary. +- refs #11194. The fault did not happen in testing, as Apache httpd + never tries to read the request body of the initial request, + sends the 401 reply and closes the stream. The server used in the + reported issue however tried to read the EOF and timed out on the + request. + +Reported-by: Aleksander Mazur +Fixes #11194 +Cloes #11200 +--- a/lib/http2.c ++++ b/lib/http2.c +@@ -1527,10 +1527,8 @@ static CURLcode http2_data_done_send(struct Curl_cfilter *cf, + if(!stream->send_closed) { + stream->send_closed = TRUE; + if(stream->upload_left) { +- /* If we operated with unknown length, we now know that everything +- * that is buffered is all we have to send. */ +- if(stream->upload_left == -1) +- stream->upload_left = Curl_bufq_len(&stream->sendbuf); ++ /* we now know that everything that is buffered is all there is. */ ++ stream->upload_left = Curl_bufq_len(&stream->sendbuf); + /* resume sending here to trigger the callback to get called again so + that it can signal EOF to nghttp2 */ + (void)nghttp2_session_resume_data(ctx->h2, stream->id); diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-7.30.0-prefix.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-prefix.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-7.30.0-prefix.patch rename to sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-prefix.patch From 74b0b93018a5080319238a78ea00efa8b8f0c0d4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:31 +0000 Subject: [PATCH 140/202] net-misc/rsync: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/net-misc/rsync/rsync-3.2.4-r3.ebuild | 2 +- .../portage-stable/net-misc/rsync/rsync-3.2.7-r2.ebuild | 2 +- .../third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.4-r3.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.4-r3.ebuild index f3c5fd9a00..fe8e9693a6 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.4-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.4-r3.ebuild @@ -28,7 +28,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r2.ebuild index 9b4a39a988..c69c1e3924 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r2.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild index 75442fcd17..2273a49fe1 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-9999.ebuild @@ -27,7 +27,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz From 8000b6a857e91f4897f23b20cc5b96e2573c4613 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:31 +0000 Subject: [PATCH 141/202] net-misc/socat: Sync with Gentoo It's from Gentoo commit 720d4808a276e29d61ff552cfd090a688fe0052f. --- .../portage-stable/net-misc/socat/Manifest | 1 - .../files/socat-1.7.3.0-filan-build.patch | 30 -------- .../socat/files/socat-1.7.3.1-stddef_h.patch | 38 ---------- .../files/socat-1.7.3.4-fno-common.patch | 24 ------ .../net-misc/socat/socat-2.0.0_beta9.ebuild | 74 ------------------- 5 files changed, 167 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.7.3.0-filan-build.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.7.3.4-fno-common.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/socat/socat-2.0.0_beta9.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/socat/Manifest index cddac553ab..ae6c8cfa71 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/socat/Manifest @@ -1,3 +1,2 @@ DIST socat-1.7.4.3.tar.gz 655520 BLAKE2B d91de7ef55332001e6439f64130555b9558338fb9b6c15c91ab5efc8f86a2e7e0f5fe0b292754731a198d83be5f511c3388c65c7c7f559c55691f42703f1849b SHA512 81cb34c245052b6a0ae38a711591358460b6070957af4a9eeb11a3cadb4aff184eeaedabbc7ecdc7fdf21a6126c06f90f19b24a87ce74b30bfd60a3879181046 DIST socat-1.7.4.4.tar.bz2 522127 BLAKE2B 221b1c7c1ef0ac9c2402a6917ce7740a7ed857ceae4f4c346ed3c69c261fd0f9ca667e21cab5f97427d3947b06fdb0ac6d090852465878db968a24b8ece587ad SHA512 3eedfbf599ecf1d6fd391d03d710044bc5e18a762395bc4cb151b96fe673d405a6630da3070ecddd5ac558126b56aa65feaa74d528eeb755a04aa0ec61690651 -DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.7.3.0-filan-build.patch b/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.7.3.0-filan-build.patch deleted file mode 100644 index 861c673ad9..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.7.3.0-filan-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -From aae2ea107b543fa908956f2fdcdf6db684e4a2e6 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 24 Apr 2015 23:06:37 -0400 -Subject: [PATCH] filan: fix depend list - -The link line contains more objects than the depend line; sync them like -procan does. Otherwise, parallel builds randomly fail. ---- - Makefile.in | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index f2a6edb..0c00459 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -118,8 +118,9 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysut - procan: $(PROCAN_OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS) - --filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS) -+FILAN_OBJS=filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o -+filan: $(FILAN_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(FILAN_OBJS) $(CLIBS) - - libxio.a: $(XIOOBJS) $(UTLOBJS) - $(AR) r $@ $(XIOOBJS) $(UTLOBJS) --- -2.3.5 - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch b/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch deleted file mode 100644 index c914a817ce..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch +++ /dev/null @@ -1,38 +0,0 @@ -When disabling OpenSSL support, nestlex.c still needs stddef.h which is -magically included through the OpenSSL headers otherwise. - ---- a/configure.in -+++ b/configure.in -@@ -61,7 +61,7 @@ - AC_CHECK_HEADERS(inttypes.h) - AC_HEADER_SYS_WAIT - AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h sys/time.h syslog.h unistd.h) --AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h) -+AC_CHECK_HEADERS(pwd.h grp.h stddef.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h) - AC_CHECK_HEADERS(pty.h) - AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h) - AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT ---- a/config.h.in -+++ b/config.h.in -@@ -189,6 +189,9 @@ - /* Define if you have the header file. */ - #undef HAVE_GRP_H - -+/* Define if you have the header file. */ -+#undef HAVE_STDDEF_H -+ - /* Define if you have the header file. */ - #undef HAVE_STDINT_H - ---- a/sysincludes.h -+++ b/sysincludes.h -@@ -51,6 +51,9 @@ - #if HAVE_SYS_TIME_H - #include /* select(); OpenBSD: struct timespec */ - #endif -+#if HAVE_STDDEF_H -+#include -+#endif - #if HAVE_STDINT_H - #include /* uint8_t */ - #endif diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.7.3.4-fno-common.patch b/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.7.3.4-fno-common.patch deleted file mode 100644 index a7dcf71c37..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/files/socat-1.7.3.4-fno-common.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/filan.c -+++ b/filan.c -@@ -30,7 +30,9 @@ - - /* dirty workaround so we dont get an error on AIX when being linked with - libwrap */ -+#if _AIX - int allow_severity, deny_severity; -+#endif - - /* global variables for configuring filan */ - bool filan_followsymlinks; ---- a/procan.c -+++ b/procan.c -@@ -21,7 +21,9 @@ - - /* dirty workaround so we dont get an error on AIX when getting linked with - libwrap */ -+#if _AIX - int allow_severity, deny_severity; -+#endif - - - int procan(FILE *outfile) { diff --git a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-2.0.0_beta9.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-2.0.0_beta9.ebuild deleted file mode 100644 index 441acceaee..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/socat/socat-2.0.0_beta9.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -MY_P=${P/_beta/-b} -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git" -SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -IUSE="ipv6 readline ssl tcpd" - -DEPEND=" - ssl? ( dev-libs/openssl:0= ) - readline? ( sys-libs/readline:= ) - tcpd? ( sys-apps/tcp-wrappers ) -" -RDEPEND="${DEPEND}" - -# Tests are a large bash script -# Hard to disable individual tests needing network or privileges -RESTRICT=" - test - ssl? ( readline? ( bindist ) ) -" - -DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch - "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch - "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch -) - -pkg_setup() { - # bug #587740 - if use readline && use ssl ; then - elog "You are enabling both readline and openssl USE flags, the licenses" - elog "for these packages conflict. You may not be able to legally" - elog "redistribute the resulting binary." - fi -} - -src_prepare() { - default - - touch doc/${PN}.1 || die - - eautoreconf -} - -src_configure() { - # bug #293324 - filter-flags -Wall '-Wno-error*' - tc-export AR - - econf \ - $(use_enable ssl openssl) \ - $(use_enable readline) \ - $(use_enable ipv6 ip6) \ - $(use_enable tcpd libwrap) -} - -src_install() { - default - - docinto html - dodoc doc/*.html doc/*.css -} From b9d647c91b5e8da7cfa48ca5c7c1f91ee4fd966c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:31 +0000 Subject: [PATCH 142/202] net-misc/wget: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild | 2 +- .../third_party/portage-stable/net-misc/wget/wget-1.21.4.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild index 2d81389c69..3968474278 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.gz.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 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.4.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.4.ebuild index c0a4ad8cf6..b3a6d6f7b4 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.4.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.gz.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 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )" RESTRICT="!test? ( test )" From 31f90249ddf948f5b6f9fe4d6079376ff9a1d9e3 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:38 +0000 Subject: [PATCH 143/202] perl-core/File-Temp: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../perl-core/File-Temp/File-Temp-0.231.100.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/File-Temp-0.231.100.ebuild b/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/File-Temp-0.231.100.ebuild index 8952474804..8b986c1522 100644 --- a/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/File-Temp-0.231.100.ebuild +++ b/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/File-Temp-0.231.100.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="" # bug 390719 From 7a2570a1fcb19489687aa0d84c516b992c70ac9e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:38 +0000 Subject: [PATCH 144/202] profiles: Sync with Gentoo It's from Gentoo commit 2a469a628b295dc590852458dce72d564d0dcd04. --- .../portage-stable/profiles/arch.list | 6 - .../profiles/arch/alpha/package.use.mask | 4 + .../profiles/arch/amd64/package.use.mask | 4 +- .../profiles/arch/arm/package.use.mask | 7 +- .../profiles/arch/arm64/package.use.mask | 2 +- .../profiles/arch/base/make.defaults | 4 +- .../profiles/arch/base/package.use.mask | 5 +- .../profiles/arch/hppa/package.use.mask | 4 + .../profiles/arch/ia64/package.use.mask | 8 +- .../profiles/arch/loong/package.use.mask | 22 +- .../profiles/arch/mips/package.use.mask | 4 + .../arch/powerpc/ppc32/package.use.mask | 4 + .../powerpc/ppc32/package.use.stable.mask | 10 + .../profiles/arch/riscv/package.use.mask | 5 + .../arch/riscv/package.use.stable.mask | 6 + .../profiles/arch/s390/package.use.mask | 4 + .../profiles/arch/sparc/package.use.mask | 4 + .../profiles/arch/x86/package.use.mask | 8 +- .../portage-stable/profiles/arches.desc | 6 - .../profiles/base/make.defaults | 6 +- .../profiles/base/package.use.force | 3 +- .../profiles/base/package.use.stable.mask | 5 - .../portage-stable/profiles/base/use.mask | 1 - .../profiles/base/use.stable.mask | 8 +- .../portage-stable/profiles/categories | 1 - .../profiles/desc/curl_ssl.desc | 3 +- .../portage-stable/profiles/desc/elibc.desc | 1 - .../profiles/desc/python_single_target.desc | 1 + .../profiles/desc/python_targets.desc | 1 + .../profiles/desc/xtables_addons.desc | 3 +- .../profiles/embedded/make.defaults | 6 +- .../profiles/features/musl/package.use.mask | 4 + .../profiles/features/wd40/package.mask | 1 + .../profiles/features/wd40/package.use.mask | 2 +- .../profiles/package.deprecated | 21 +- .../portage-stable/profiles/package.mask | 167 ++++++---- .../prefix/sunos/solaris/5.11/sparc/eapi | 1 - .../sunos/solaris/5.11/sparc/make.defaults | 7 - .../sunos/solaris/5.11/sparc/package.mask | 4 - .../sunos/solaris/5.11/sparc/package.use.mask | 3 - .../prefix/sunos/solaris/5.11/sparc/parent | 2 - .../prefix/sunos/solaris/5.11/sparc64/eapi | 1 - .../sunos/solaris/5.11/sparc64/make.defaults | 7 - .../sunos/solaris/5.11/sparc64/package.mask | 4 - .../solaris/5.11/sparc64/package.use.mask | 3 - .../prefix/sunos/solaris/5.11/sparc64/parent | 2 - .../prefix/sunos/solaris/5.11/x86/eapi | 1 - .../sunos/solaris/5.11/x86/make.defaults | 7 - .../sunos/solaris/5.11/x86/package.use.mask | 3 - .../prefix/sunos/solaris/5.11/x86/parent | 2 - .../prefix/sunos/solaris/arch/sparc/eapi | 1 - .../sunos/solaris/arch/sparc/make.defaults | 8 - .../sunos/solaris/arch/sparc/package.mask | 9 - .../sunos/solaris/arch/sparc/package.use.mask | 10 - .../prefix/sunos/solaris/arch/sparc/use.force | 5 - .../prefix/sunos/solaris/arch/sparc64/eapi | 1 - .../sunos/solaris/arch/sparc64/make.defaults | 8 - .../sunos/solaris/arch/sparc64/package.mask | 9 - .../solaris/arch/sparc64/package.use.mask | 9 - .../prefix/sunos/solaris/arch/x86/eapi | 1 - .../sunos/solaris/arch/x86/make.defaults | 9 - .../sunos/solaris/arch/x86/package.mask | 6 - .../sunos/solaris/arch/x86/package.use.mask | 6 - .../prefix/sunos/solaris/arch/x86/use.force | 6 - .../prefix/sunos/solaris/arch/x86/use.mask | 6 - .../profiles/prefix/windows/cygwin/eapi | 1 - .../prefix/windows/cygwin/make.defaults | 11 - .../prefix/windows/cygwin/package.mask | 23 -- .../prefix/windows/cygwin/package.unmask | 6 - .../prefix/windows/cygwin/package.use | 14 - .../prefix/windows/cygwin/package.use.mask | 6 - .../profiles/prefix/windows/cygwin/packages | 6 - .../profiles/prefix/windows/cygwin/parent | 1 - .../prefix/windows/cygwin/profile.bashrc | 211 ------------ .../profiles/prefix/windows/cygwin/use.force | 5 - .../profiles/prefix/windows/cygwin/use.mask | 5 - .../profiles/prefix/windows/cygwin/x64/eapi | 1 - .../prefix/windows/cygwin/x64/make.defaults | 17 - .../profiles/prefix/windows/cygwin/x64/parent | 1 - .../profiles/prefix/windows/eapi | 1 - .../profiles/prefix/windows/package.mask | 6 - .../profiles/prefix/windows/package.use.mask | 7 - .../profiles/prefix/windows/parent | 3 - .../profiles/prefix/windows/use.force | 5 - .../profiles/prefix/windows/use.mask | 8 - .../profiles/prefix/windows/winnt/eapi | 1 - .../prefix/windows/winnt/make.defaults | 10 - .../prefix/windows/winnt/package.mask | 2 - .../prefix/windows/winnt/package.use.mask | 7 - .../profiles/prefix/windows/winnt/packages | 37 --- .../profiles/prefix/windows/winnt/parent | 1 - .../prefix/windows/winnt/profile.bashrc | 305 ------------------ .../profiles/prefix/windows/winnt/use.force | 5 - .../profiles/prefix/windows/winnt/use.mask | 66 ---- .../profiles/prefix/windows/winnt/x64/eapi | 1 - .../prefix/windows/winnt/x64/make.defaults | 28 -- .../profiles/prefix/windows/winnt/x64/parent | 1 - .../profiles/prefix/windows/winnt/x86/eapi | 1 - .../prefix/windows/winnt/x86/make.defaults | 28 -- .../profiles/prefix/windows/winnt/x86/parent | 1 - .../portage-stable/profiles/profiles.desc | 10 - .../profiles/targets/desktop/make.defaults | 4 +- .../portage-stable/profiles/thirdpartymirrors | 2 +- .../portage-stable/profiles/updates/2Q-2023 | 6 + .../portage-stable/profiles/use.desc | 3 + 105 files changed, 249 insertions(+), 1100 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.stable.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/eapi delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/make.defaults delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/package.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/package.use.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/eapi delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/make.defaults delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/package.use.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/eapi delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/make.defaults delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/package.use.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/eapi delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/make.defaults delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/package.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/package.use.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/eapi delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/make.defaults delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/package.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/package.use.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/eapi delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/make.defaults delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/package.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/package.use.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/use.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/eapi delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/make.defaults delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.unmask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.use delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.use.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/packages delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/profile.bashrc delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/use.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/x64/eapi delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/x64/make.defaults delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/x64/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/eapi delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/package.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/package.use.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/use.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/eapi delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/make.defaults delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/package.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/package.use.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/packages delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/profile.bashrc delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/use.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x64/eapi delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x64/make.defaults delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x64/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x86/eapi delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x86/make.defaults delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x86/parent diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch.list b/sdk_container/src/third_party/portage-stable/profiles/arch.list index ff57e39a20..2aad1ae7f4 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch.list +++ b/sdk_container/src/third_party/portage-stable/profiles/arch.list @@ -24,10 +24,4 @@ x86-linux arm64-macos ppc-macos x64-macos -sparc-solaris -sparc64-solaris x64-solaris -x86-solaris -x64-winnt -x86-winnt -x64-cygwin diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.mask index 3432f1a512..2def3ed90c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Matt Turner (2023-05-30) +# sys-apps/dbus-broker is not keyworded +app-accessibility/at-spi2-core dbus-broker + # Sam James (2023-05-01) # media-libs/libjxl is not keyworded # bug https://bugs.gentoo.org/853628 diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask index 9a0ced87db..83a2617312 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask @@ -338,8 +338,8 @@ sys-boot/grub:2 -grub_platforms_xen-32 >=dev-db/mariadb-10.1.0 -mroonga -galera # Mike Gilbert (2015-09-05) -# sys-boot/gnu-efi is not supported on all archs. -sys-apps/systemd -gnuefi +# sd-boot is not supported on all archs. +sys-apps/systemd -boot -gnuefi sys-apps/systemd-utils -boot # Ben de Groot (2015-03-15) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.mask index 3781ce232d..bde53b9837 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Matt Turner (2023-05-30) +# sys-apps/dbus-broker is not keyworded +app-accessibility/at-spi2-core dbus-broker + # Sam James (2023-05-10) # sys-cluster/ceph not keyworded here sys-block/tgt rbd @@ -117,7 +121,7 @@ net-im/prosody selinux # Sam James (2020-01-17) # gnuefi + systemd-boot works on arm # bug #729720 -sys-apps/systemd -gnuefi +sys-apps/systemd -boot -gnuefi sys-apps/systemd-utils -boot # Joonas Niilola (2021-01-15) @@ -322,6 +326,7 @@ media-gfx/xsane ocr media-video/ffmpeg -mmal media-video/ffmpeg-chromium -mmal media-video/mpv -mmal +net-misc/moonlight -mmal # Markus Meier (2015-10-10) # unkeyworded deps, bug #552330 diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask index dcbd55a09e..552515ec4e 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask @@ -136,7 +136,7 @@ media-sound/bluez-alsa man # Sam James (2020-01-17) # gnuefi + systemd-boot works on arm64 # bug #729720 -sys-apps/systemd -gnuefi +sys-apps/systemd -boot -gnuefi sys-apps/systemd-utils -boot # Joonas Niilola (2021-01-15) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/base/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/base/make.defaults index fb4ad83b8f..bb227e4ece 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/base/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/base/make.defaults @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 USE_EXPAND_UNPREFIXED="ARCH" USE_EXPAND_IMPLICIT="ARCH" -USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 arm64-macos hppa ia64 loong m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-linux x86-solaris x86-winnt" +USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 arm64-macos hppa ia64 loong m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc x64-macos x64-solaris x86 x86-linux" PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ARCH USE_EXPAND_VALUES_ARCH" diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask index 28b10b38c5..db7cae156e 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask @@ -320,14 +320,15 @@ media-video/motion mmal media-video/ffmpeg mmal media-video/ffmpeg-chromium mmal media-video/mpv mmal +net-misc/moonlight mmal # Brian Evans =dev-db/mariadb-10.1.0 mroonga galera # Mike Gilbert (2015-09-05) -# sys-boot/gnu-efi is not supported on all archs. -sys-apps/systemd gnuefi +# sd-boot is not supported on all archs. +sys-apps/systemd boot gnuefi sys-apps/systemd-utils boot # Ben de Groot (2015-03-15) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask index 80a121bcef..12b5176c07 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask @@ -4,6 +4,10 @@ # NOTE: When masking a USE flag due to missing keywords, please file a keyword # request bug for the hppa arch. +# Matt Turner (2023-05-30) +# sys-apps/dbus-broker is not keyworded +app-accessibility/at-spi2-core dbus-broker + # Michał Górny (2023-05-20) # Requires dev-python/sphinx-autodoc-types that has unkeyworded depgraph. dev-python/jupyter-core doc diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask index 1f1e961e60..fa01a4f956 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Matt Turner (2023-05-30) +# sys-apps/dbus-broker is not keyworded +app-accessibility/at-spi2-core dbus-broker + # Sam James (2023-04-17) # net-misc/pps-tools is not keyworded here net-misc/chrony pps @@ -390,8 +394,8 @@ media-sound/pulseaudio-daemon ofono-headset # Mike Gilbert (2015-09-05) # sys-boot/gnu-efi is not supported on all archs. -sys-apps/systemd -gnuefi -sys-apps/systemd-utils -boot + (2015-06-13) # Missing keywords, bug #513108 diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask index a7996f8baf..36375ecf47 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask @@ -1,6 +1,24 @@ # Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# WANG Xuerui (2023-06-03) +# sys-cluster/knem not keyworded yet +# sys-cluster/torque fails to build (seemingly because of incompatible hwloc) +sys-cluster/openmpi openmpi_fabrics_knem openmpi_rm_pbs + +# WANG Xuerui (2023-06-03) +# fails to build with 6.3.x kernel +sys-cluster/knem modules + +# Matt Turner (2023-05-30) +# sys-apps/dbus-broker is not keyworded +app-accessibility/at-spi2-core dbus-broker + +# Mike Gilbert (2023-05-27) +# Newer sd-boot does not use gnuefi. +>=sys-apps/systemd-254 -boot +>=sys-apps/systemd-utils-254 -boot + # WANG Xuerui (2023-04-16) # dev-python/pyopengl fails tests dev-python/sympy opengl @@ -52,8 +70,8 @@ sys-apps/fwupd flashrom # WANG Xuerui (2022-12-05) # sys-boot/gnu-efi upstream hasn't merged the loong port yet sys-apps/fwupd uefi -sys-apps/systemd gnuefi -sys-apps/systemd-utils boot + (2022-12-05) # The loong port of sys-boot/grub:2 isn't upstreamed yet. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask index dfaf83be4c..052fb65449 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Matt Turner (2023-05-30) +# sys-apps/dbus-broker is not keyworded +app-accessibility/at-spi2-core dbus-broker + # matoro (2023-03-03) # virtual/jdk isn't keyworded here media-libs/rubberband jni diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask index 74d7992856..5d8be8ed04 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Matt Turner (2023-05-30) +# sys-apps/dbus-broker is not keyworded +app-accessibility/at-spi2-core dbus-broker + # Sam James (2023-05-19) # kde-frameworks/kwayland:5 is not keyworded here. app-crypt/pinentry wayland diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask index c8a1978c7f..a536b34a83 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask @@ -17,6 +17,16 @@ #--- END OF EXAMPLES --- +# Arthur Zamarin (2023-06-02) +# Destabilizing ppc keywords on sci-*/* packages +dev-perl/PDL gsl +dev-python/numpy lapack +dev-python/pythran test +media-gfx/graphviz gts +media-libs/a52dec djbfft +sci-libs/gsl cblas-external +sci-libs/hdf5 szip + # Hans de Graaff (2023-03-28) # dev-ruby/stringex is not marked stable here yet dev-ruby/kramdown unicode diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask index e8befb84ff..a695a1db6a 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask @@ -1,6 +1,11 @@ # Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Mike Gilbert (2023-05-27) +# sd-boot should work here. +sys-apps/systemd -boot -gnuefi +sys-apps/systemd-utils -boot + # Sam James (2023-05-10) # sys-cluster/ceph not keyworded here sys-block/tgt rbd diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.stable.mask new file mode 100644 index 0000000000..be1d074b67 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.stable.mask @@ -0,0 +1,6 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Matt Turner (2023-05-30) +# sys-apps/dbus-broker is not stable +app-accessibility/at-spi2-core dbus-broker diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask index 41ac083218..348be7575f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Matt Turner (2023-05-30) +# sys-apps/dbus-broker is not keyworded +app-accessibility/at-spi2-core dbus-broker + # Sam James (2023-05-01) # media-libs/libjxl is not keyworded # bug https://bugs.gentoo.org/853628 diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask index 82891f1896..87f3faf38b 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Matt Turner (2023-05-30) +# sys-apps/dbus-broker is not keyworded +app-accessibility/at-spi2-core dbus-broker + # Arsen Arsenović (2023-05-17) # app-emulation/libguestfs pulls in a large amount of dependencies, most # of which aren't or can't be kw'd on SPARC. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask index 47e4da6674..5cf4081795 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Matt Turner (2023-05-30) +# sys-apps/dbus-broker is not keyworded +app-accessibility/at-spi2-core dbus-broker + # Anna Vyalkova (2023-05-20) # net-libs/libomemo-c is not keyworded for ~x86. net-libs/qxmpp omemo @@ -167,7 +171,7 @@ net-misc/asterisk -blocks # Nils Freydank (2021-01-18) # Depends on media-plugins/gst-plugins-cairo, which isn't keyworded on x86. -app-misc/pdfpc gstreamer +app-text/pdfpc gstreamer # Michał Górny (2020-12-21) # Sanitizers supported on this architecture. @@ -383,7 +387,7 @@ app-emulation/libvirt xen # Mike Gilbert (2015-09-05) # sys-boot/gnu-efi is not supported on all archs. -sys-apps/systemd -gnuefi +sys-apps/systemd -boot -gnuefi sys-apps/systemd-utils -boot # Ben de Groot (2015-03-15) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arches.desc b/sdk_container/src/third_party/portage-stable/profiles/arches.desc index 9d3955bc92..814592ed92 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arches.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/arches.desc @@ -37,13 +37,7 @@ x86-linux testing arm64-macos testing ppc-macos testing x64-macos testing -sparc-solaris testing -sparc64-solaris testing x64-solaris testing -x86-solaris testing -x64-winnt testing -x86-winnt testing -x64-cygwin testing # vim: set ts=8 noet ft=conf: diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults index f227acf07c..5c28061b2f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults @@ -7,7 +7,7 @@ # Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later) IUSE_IMPLICIT="prefix prefix-guest prefix-stack" USE_EXPAND_IMPLICIT="ELIBC KERNEL" -USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS Winnt" +USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS" USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt" # Env vars to expand into USE vars. Modifying this requires prior @@ -99,8 +99,8 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te # Manuel Rüger (2015-09-09) # Default Ruby build target(s) -# Updated to remove ruby27 on 2023-03-26 -RUBY_TARGETS="ruby30" +# Updated to add ruby31 on 2023-05-29 +RUBY_TARGETS="ruby30 ruby31" # Andreas K. Hüttel (2022-10-22) # These USE flags are what is common between the various sub-profiles. Stages 2 diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force index d02c5ebecc..56945bc220 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force +++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force @@ -27,7 +27,7 @@ dev-java/openjdk:17 system-bootstrap # to find a clean way of resolving that. Compared to the damage # potential, the increase of build time is a minor problem. Users who # really insist of building a smaller system can un-force the flags -# at their own responsibility. +# at their own responsibility. See bug #767700. >=sys-devel/clang-13.0.1_rc llvm_targets_AArch64 llvm_targets_AMDGPU >=sys-devel/clang-13.0.1_rc llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF >=sys-devel/clang-13.0.1_rc llvm_targets_Hexagon llvm_targets_Lanai @@ -209,6 +209,7 @@ app-shells/bash:0 readline # API. Please remember to keep it in sync with python_targets.desc. dev-lang/python-exec python_targets_python3_10 dev-lang/python-exec python_targets_python3_11 +dev-lang/python-exec python_targets_python3_12 dev-lang/python-exec python_targets_pypy3 # Zac Medico (2010-10-20) diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask index 1e9ae51033..641aa3d58d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask @@ -217,11 +217,6 @@ kde-apps/cantor julia # This is stable masked as g-sorcery is being not actively developed. app-portage/layman g-sorcery -# Andreas K. Hüttel (2017-01-15) -# Has no stable reverse deps requiring this useflag -# Stable-masking it so Boost 1.62 stabilization can go ahead -sci-libs/vtk mpi - # Alon Bar-Lev (2017-01-01) # Will always require unstable packages. net-libs/gnutls test-full diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/use.mask b/sdk_container/src/third_party/portage-stable/profiles/base/use.mask index f6587acbec..8cbeafe130 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/use.mask @@ -66,7 +66,6 @@ elibc_Cygwin elibc_Darwin elibc_musl elibc_SunOS -elibc_Winnt kernel_Darwin kernel_SunOS diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask index 6333d64dce..6e984e647f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask @@ -4,11 +4,15 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask -# Hans de Graaff (2023-01-15) +# Sam James (2023-05-29) # Currently in testing and not ready to go stable yet. -ruby_targets_ruby31 ruby_targets_ruby32 +# Michał Górny (2023-05-23) +# Mask until dev-lang/python:3.12 becomes stable. +python_targets_python3_12 +python_single_target_python3_12 + # Brian Evans (2022-12-09) # PHP 8.2 is in testing php_targets_php8-2 diff --git a/sdk_container/src/third_party/portage-stable/profiles/categories b/sdk_container/src/third_party/portage-stable/profiles/categories index 18601c58f9..0fabf5bef6 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/categories +++ b/sdk_container/src/third_party/portage-stable/profiles/categories @@ -81,7 +81,6 @@ gnustep-libs gui-apps gui-libs gui-wm -java-virtuals kde-apps kde-frameworks kde-misc diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/curl_ssl.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/curl_ssl.desc index 5f30da4450..2e78c7ea73 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/desc/curl_ssl.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/desc/curl_ssl.desc @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This file contains descriptions of CURL_SSL USE_EXPAND flags for net-misc/curl @@ -9,4 +9,3 @@ mbedtls - Use mbed TLS nss - Use Mozilla's Network Security Services openssl - Use OpenSSL rustls - Use Rustls -winssl - Use WinSSL (only with elibc_Winnt) diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/elibc.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/elibc.desc index 8eef69979c..b825590e52 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/desc/elibc.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/desc/elibc.desc @@ -11,4 +11,3 @@ glibc - ELIBC setting for systems that use the GNU C library mingw - ELIBC setting for systems that use the Minimalist GNU for Windows library musl - ELIBC setting for systems that use the musl C library SunOS - ELIBC setting for systems that use the Sun Solaris C library -Winnt - ELIBC setting for systems that use Winnt diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/python_single_target.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/python_single_target.desc index d931638828..8a9f6479f1 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/desc/python_single_target.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/desc/python_single_target.desc @@ -5,4 +5,5 @@ python3_10 - Build for Python 3.10 only python3_11 - Build for Python 3.11 only +python3_12 - Build for Python 3.12 only pypy3 - Build for PyPy3 only diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/python_targets.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/python_targets.desc index bb38d02367..7bde52333b 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/desc/python_targets.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/desc/python_targets.desc @@ -5,4 +5,5 @@ python3_10 - Build with Python 3.10 python3_11 - Build with Python 3.11 +python3_12 - Build with Python 3.12 pypy3 - Build with PyPy3 diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/xtables_addons.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/xtables_addons.desc index 5ee39b3b61..91a7ea0781 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/desc/xtables_addons.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/desc/xtables_addons.desc @@ -1,10 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This file contains descriptions of XTABLES_ADDONS USE-EXPANDED variables. # Keep it sorted. account - ACCOUNT target is a high performance accounting system for large local networks +asn - match a packet by its source or destination Autonomous System Number chaos - CHAOS target causes confusion on the other end by doing odd things with incoming packets condition - matches if a specific condition variable is (un)set delude - DELUDE target will reply to a SYN packet with SYN-ACK, and to all other packets with an RST diff --git a/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults index fd59da1054..e3d7f8df25 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults @@ -22,9 +22,9 @@ LINGUAS="en" IUSE_IMPLICIT="prefix prefix-guest prefix-stack" USE_EXPAND_UNPREFIXED="ARCH" USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL" -USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 hppa ia64 loong m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-linux x86-solaris x86-winnt" -USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS Winnt" -USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt" +USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-linux arm arm64 hppa ia64 loong m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc x64-macos x64-solaris x86 x86-linux" +USE_EXPAND_VALUES_ELIBC="bionic Darwin glibc mingw musl SunOS" +USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS" # Env vars to expand into USE vars. Modifying this requires prior # discussion on gentoo-dev@lists.gentoo.org. diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask index 269ec23079..793b7cb799 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Matt Turner (2023-05-30) +# sys-apps/dbus-broker is masked on musl +app-accessibility/at-spi2-core dbus-broker + # Sam James (2023-05-08) # Needs fpu_control.h, bug #891063 media-sound/lame debug diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.mask b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.mask index 99e254326a..253db05c1f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.mask @@ -71,6 +71,7 @@ dev-util/git-delta dev-util/maturin dev-util/tree-sitter-cli >=dev-vcs/stgit-2 +>=games-board/gnome-mahjongg-3.40.0 gnome-base/gdm >=gnome-base/gnome-core-apps-3.36.5 >=gnome-base/gnome-core-libs-3.36.5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask index 59fffef973..ba29aa68bb 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask @@ -65,7 +65,7 @@ net-vpn/networkmanager-vpnc gtk app-admin/salt keyring neutron dev-python/boto test dev-python/dask test -dev-python/docker-py test +dev-python/docker test dev-python/google-api-python-client test dev-python/httpx-socks test dev-python/hypercorn test diff --git a/sdk_container/src/third_party/portage-stable/profiles/package.deprecated b/sdk_container/src/third_party/portage-stable/profiles/package.deprecated index abf9de72a1..5ebebc6d8d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/package.deprecated +++ b/sdk_container/src/third_party/portage-stable/profiles/package.deprecated @@ -17,6 +17,21 @@ #--- END OF EXAMPLES --- +# Sam James (2023-05-30) +# Removed from GStreamer 1.20. +# Dropped upstream in https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/9a4651e3879270292672f08a1f6ed2bffefc5aed. +media-plugins/gst-plugins-libmms + +# Michał Górny (2023-05-29) +# Use the following snippet instead: +# +# $(python_gen_cond_dep ' +# dev-python/cffi[${PYTHON_USEDEP}] +# ' 'python*') +# +# Possibly adding version constraints if package declares them. +virtual/python-cffi + # Michał Górny (2023-04-26) # Renamed upstream to dev-python/pypdf. Since Python modules were # renamed as well, projects need to update their imports. @@ -90,12 +105,6 @@ dev-python/nose # https://projects.gentoo.org/python/guide/porting.html#replacing-the-toml-package dev-python/toml -# Petr Vaněk (2022-10-06) -# Obsolete virtual. -# Only one provider is left (net-libs/c-client), please change dependency to -# that instead. -virtual/imap-c-client - # Matt Turner (2022-10-02) # Dummy packages, now merged into app-accessibility/at-spi2-core. # When possible, replace dependencies on these packages with a dependency on diff --git a/sdk_container/src/third_party/portage-stable/profiles/package.mask b/sdk_container/src/third_party/portage-stable/profiles/package.mask index c02dfaf7d8..d56ad93c80 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/package.mask @@ -33,6 +33,111 @@ #--- END OF EXAMPLES --- +# Sam James (2023-06-05) +# Fails to boostrap, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110120. +=sys-devel/gcc-14.0.0_pre20230604 + +# Michael Orlitzky (2023-06-04) +# Obsolete and insecure SageMath (out of tree) dependency. +# Removal on 2023-07-04. +sci-mathematics/flintqs + +# Michał Górny (2023-06-03) +# Obsoleted by dev-python/pyspnego. No revdeps left. +# Removal on 2023-07-03. Bug #895004. +dev-python/ntlm-auth + +# Bernd Waibel (2023-05-31) +# Mask this version for uptime soversion issue. There will be an updated release +# shortly which fixes this. +# See https://github.com/AcademySoftwareFoundation/Imath/issues/189#issuecomment-1567077722 +# Bug: #907211 +=dev-libs/imath-3.1.7 + +# Andeas K. Hüttel (2023-06-02) +# Work in progress +=dev-lang/perl-5.38* +~virtual/perl-Attribute-Handlers-1.30.0 +~virtual/perl-autodie-2.360.0 +~virtual/perl-bignum-0.660.0 +~virtual/perl-Carp-1.540.0 +~virtual/perl-Compress-Raw-Bzip2-2.204.1_rc +~virtual/perl-Compress-Raw-Zlib-2.204.1_rc +~virtual/perl-CPAN-2.360.0 +~virtual/perl-Data-Dumper-2.188.0 +~virtual/perl-DB_File-1.858.0 +~virtual/perl-Devel-PPPort-3.710.0 +~virtual/perl-Digest-MD5-2.580.100_rc +~virtual/perl-Digest-SHA-6.40.0 +~virtual/perl-Encode-3.190.0 +~virtual/perl-ExtUtils-CBuilder-0.280.238 +~virtual/perl-ExtUtils-Install-2.220.0 +~virtual/perl-ExtUtils-MakeMaker-7.700.0 +~virtual/perl-ExtUtils-ParseXS-3.510.0 +~virtual/perl-File-Spec-3.880.0 +~virtual/perl-Getopt-Long-2.540.0 +~virtual/perl-HTTP-Tiny-0.82.0 +~virtual/perl-IO-1.520.0 +~virtual/perl-IO-Compress-2.204.0 +~virtual/perl-IO-Zlib-1.140.0 +~virtual/perl-JSON-PP-4.160.0 +~virtual/perl-libnet-3.150.0 +~virtual/perl-Locale-Maketext-1.330.0 +~virtual/perl-Math-BigInt-1.999.837 +~virtual/perl-Math-BigInt-FastCalc-0.501.300 +~virtual/perl-Math-BigRat-0.262.400 +~virtual/perl-Math-Complex-1.620.0 +~virtual/perl-Memoize-1.160.0 +~virtual/perl-MIME-Base64-3.160.100_rc +~virtual/perl-Module-CoreList-5.202.305.200 +~virtual/perl-Net-Ping-2.760.0 +~virtual/perl-parent-0.241.0 +~virtual/perl-podlators-5.10.0 +~virtual/perl-Safe-2.440.0 +~virtual/perl-Scalar-List-Utils-1.630.0 +~virtual/perl-Socket-2.36.0 +~virtual/perl-Storable-3.320.0 +~virtual/perl-Test-Simple-1.302.194 +~virtual/perl-Text-Balanced-2.60.0 +~virtual/perl-threads-2.360.0 +~virtual/perl-threads-shared-1.680.0 +~virtual/perl-Time-HiRes-1.977.500 +~virtual/perl-Time-Piece-1.340.101_rc +~virtual/perl-Unicode-Normalize-1.320.0 +~virtual/perl-XSLoader-0.320.0 + +# Michał Górny (2023-05-31) +# Unmaintained. Last commit in 2020. Does not work with Python 3.12. +# No revdeps. +# Removal on 2023-06-30. Bug #907495. +dev-python/http-parser + +# Sam James (2023-05-29) +# Masked until enough reverse dependencies are fixed, bug #901257. +=media-video/ffmpeg-6* + +# Andreas K. Hüttel (2023-05-28) +# Causes only problems, at negligible gain. Removal in 30days. +# Bugs 880573, 864157, 885471, 870454, 884571 +sys-libs/libbacktrace + +# Fabian Groffen (2023-05-26) +# Cygwin package for which keyword/profile support was dropped +# Removal on 2023-06-25. Bug #907194. +app-admin/cygwin-rebase +dev-libs/pthreads4w +sys-devel/parity +sys-libs/cygwin-crypt + +# Sam James (2023-05-24) +# Breaks building C++ consumers at least: bug #906755, bug #906879, bug #906957. +# Please upgrade to >=0.5.1. +=net-libs/libproxy-0.5.0 + +# Sam James (2023-05-23) +# Argument splitting seems broken, see bug #906892 and https://github.com/ffi/ffi-compiler/issues/23. +=dev-ruby/ffi-compiler-1.2.0 + # Sam James (2023-05-20) # Various regressions, please upgrade to the latest libxml2 (>=2.11.4). =dev-libs/libxml2-2.11.1 @@ -168,23 +273,11 @@ www-client/chromium-bin =sci-libs/metis-5.2.1-r1 =sci-libs/parmetis-4.0.3_p20230326 -# Michał Górny (2023-05-03) -# Unmaintained upstream. Fails to build without sys-apps/which, fails -# with modern autoconf. -# Removal on 2023-06-02. Bug #896896. -dev-python/thunarx-python - # Sam James (2023-05-01) # Breaks dev-python/scipy build. See bug #905396 and https://github.com/serge-sans-paille/gast/issues/74. =dev-python/pythran-0.13.0 =dev-python/gast-0.5.4 -# John Helmert III (2023-04-30) -# STARTTLS vulnerability, depends on gtk+:2, practically unmainatined -# upstream. Use mail-client/claws instead. Removal in 30 days, bugs -# #769293, #807358 -mail-client/sylpheed - # Sam James (2023-05-01) # Quite broken, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109672. =sys-devel/gcc-14.0.0_pre20230430 @@ -193,44 +286,6 @@ mail-client/sylpheed # Breaking even latest ~arch version of KDE PIM, bug #905352. =dev-libs/ktextaddons-1.3* -# Matt Turner (2023-04-26) -# Package contains only a script that runs an X application on a remote system -# with rsh (use ssh -Y instead), and two scripts that were probably used for -# converting the old BDF fonts to XLFD names back in the early 90's. None of -# these are useful today. -# Removal on 2023-05-26 -x11-apps/scripts - -# Mike Gilbert (2023-04-26) -# Merged into net-libs/ldns. Bug 828109. -# Removal on 2023-05-26. -net-dns/ldns-utils - -# Volkmar W. Pogatzki (2023-04-22) -# Unused acct-group. Removal on 2023-05-22 -# The server was removed on 2021-08-24 with commit -# 7a1e8a90fa8a09a84741dc8ef5f774d92ae8433c -acct-group/resin - -# Conrad Kostecki (2023-04-23) -# Very old package, does not build with modern compilers. -# It provides BOOTP support, predecessor of DHCP. -# Removal on 2023-05-23. Bugs #894128, #884335 -sys-boot/netboot - -# Jakov Smolić (2023-04-21) -# Does not support python 3.11, uses deprecated dev-python/future, -# inactive upstream (last commit in 2019). -# Removal on 2023-05-21. Bugs #897102, #888293 -net-irc/quasselgrep - -# Volkmar W. Pogatzki (2023-04-21) -# Unused java libraries. Removal on 2023-05-22 -dev-java/avalon-framework -dev-java/avalon-logkit -java-virtuals/servlet-api -dev-java/resin-servlet-api - # Sam James (2023-04-19) # Last-minute libstdc++ symbol versioning magic causes e.g. mold, cmake # to segfault: @@ -259,6 +314,7 @@ dev-java/resin-servlet-api # - sys-apps/openrc: https://github.com/OpenRC/openrc/issues/619 =sys-libs/ncurses-6.4_p20230424 =sys-libs/ncurses-6.4_p20230506 +=sys-libs/ncurses-6.4_p20230527 # Eray Aslan (2023-04-12) # Mask experimental software @@ -410,11 +466,6 @@ dev-qt/qtwebsockets:6 >=media-video/bino-2 >=x11-misc/albert-0.20.13 -# Fabian Groffen (2022-07-02) -# Segfaults handling SPF validations (warn on permerror), like the -# previous release, better not to trust your important mail to -~mail-mta/exim-4.96 - # Sam James (2022-05-28) # GCC 9 and older no longer receive upstream support or fixes for # bugs. Please switch to a newer GCC version using gcc-config. @@ -426,12 +477,6 @@ dev-qt/qtwebsockets:6 # should update to that. #841437 ~sci-physics/bullet-3.22b -# James Beddek (2022-01-19) -# FFmpeg 5.0 ABI/API changes break many packages. -# Masking for tracker/tinderbox. Bug #831437 ->=media-video/ffmpeg-5 ->=media-sound/spek-0.8.5 - # Brian Evans (2022-01-07) # The main consumer, phpunit, does not initiate the new timer correctly # This is likely to cause issues in tests; Unmask if using for other purposes diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/eapi deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/make.defaults deleted file mode 100644 index 3812f55e12..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/make.defaults +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -ARCH="sparc-solaris" -CHOST="sparc-sun-solaris2.11" -ACCEPT_KEYWORDS="~sparc-solaris" - diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/package.mask deleted file mode 100644 index 1a1871bef0..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/package.mask +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - - diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/package.use.mask deleted file mode 100644 index f7ac4607b3..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/package.use.mask +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/parent deleted file mode 100644 index 356d2b757b..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../arch/sparc diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/eapi deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/make.defaults deleted file mode 100644 index 8b0a6c090f..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/make.defaults +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -ARCH="sparc64-solaris" -CHOST="sparcv9-sun-solaris2.11" -ACCEPT_KEYWORDS="~sparc64-solaris" - diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask deleted file mode 100644 index 1a1871bef0..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - - diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/package.use.mask deleted file mode 100644 index f7ac4607b3..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/package.use.mask +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/parent deleted file mode 100644 index 6321d7e3ec..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/sparc64/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../arch/sparc64 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/eapi deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/make.defaults deleted file mode 100644 index e9071fa239..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/make.defaults +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -ARCH="x86-solaris" -CHOST="i386-pc-solaris2.11" -ACCEPT_KEYWORDS="~x86-solaris" - diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/package.use.mask deleted file mode 100644 index f7ac4607b3..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/package.use.mask +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/parent deleted file mode 100644 index 93220d0968..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/5.11/x86/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../arch/x86 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/eapi deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/make.defaults deleted file mode 100644 index 92d16c9bef..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/make.defaults +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# multilib build stuff, single ABI (no multilib) -MULTILIB_ABIS="sparc32" -DEFAULT_ABI="sparc32" -ABI="sparc32" -LIBDIR_sparc32="lib" diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/package.mask deleted file mode 100644 index 61c3da4d56..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/package.mask +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# All the Solaris profiles inherit from their matching arch profile here. - - -# Fabian Groffen (2011-12-30) -# Does not support Solaris/SPARC, http://mj.ucw.cz/pciutils.html -sys-apps/pciutils diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/package.use.mask deleted file mode 100644 index f54109ff2f..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/package.use.mask +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# All the Solaris profiles inherit from their matching arch profile here. - - -# Fabian Groffen (2011-11-16) -# jit not supported on sparc -dev-libs/libpcre jit - diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/use.force b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/use.force deleted file mode 100644 index 4592c02daa..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc/use.force +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Force the flag corresponding to the default ABI -sparc-solaris diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/eapi deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/make.defaults deleted file mode 100644 index 5bcd9c9e76..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/make.defaults +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# multilib build stuff, single ABI (no multilib) -MULTILIB_ABIS="sparc64" -DEFAULT_ABI="sparc64" -ABI="sparc64" -LIBDIR_sparc64="lib" diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/package.mask deleted file mode 100644 index 61c3da4d56..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/package.mask +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# All the Solaris profiles inherit from their matching arch profile here. - - -# Fabian Groffen (2011-12-30) -# Does not support Solaris/SPARC, http://mj.ucw.cz/pciutils.html -sys-apps/pciutils diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/package.use.mask deleted file mode 100644 index ed7dd10d56..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/sparc64/package.use.mask +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# All the Solaris profiles inherit from their matching arch profile here. - - -# Fabian Groffen (2011-11-16) -# jit not supported on sparc -dev-libs/libpcre jit diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/eapi deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/make.defaults deleted file mode 100644 index c1bc34823d..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/make.defaults +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# multilib build stuff, single ABI (no multilib) -MULTILIB_ABIS="x86" -DEFAULT_ABI="x86" -ABI="x86" -IUSE_IMPLICIT="abi_x86_32" -LIBDIR_x86="lib" diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/package.mask deleted file mode 100644 index 2e6559ed0a..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/package.mask +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# All the Solaris profiles inherit from their matching arch profile here. - - diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/package.use.mask deleted file mode 100644 index 2e6559ed0a..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/package.use.mask +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# All the Solaris profiles inherit from their matching arch profile here. - - diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/use.force b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/use.force deleted file mode 100644 index 969a2583d9..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Force the flag corresponding to the default ABI -x86-solaris -abi_x86_32 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/use.mask deleted file mode 100644 index 3e3c06d9db..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/sunos/solaris/arch/x86/use.mask +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Unmask the flag corresponding to the default ABI --x86-solaris --abi_x86_32 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/eapi deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/make.defaults deleted file mode 100644 index d7ba076a88..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/make.defaults +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# System-wide defaults for all Cygwin profiles -# This file should rarely need to be changed - -# 'Sane' defaults -ELIBC="Cygwin" - -# no scanelf -FEATURES="nostrip" diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.mask deleted file mode 100644 index ee0e3ad4aa..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.mask +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Michael Haubenwallner (2019-06-07) -# Breaks due to weak functions and object file order on linkline, -# see https://cygwin.com/ml/cygwin/2019-06/msg00092.html ->=app-portage/portage-utils-0.80_pre - -# Michael Haubenwallner (2019-06-07) -# Cygwin does not provide this new version yet in it's repo. ->=sys-devel/gcc-8.4 - -# Michael Haubenwallner (2019-02-13) -# see upstream report https://savannah.gnu.org/bugs/index.php?55708 -=sys-apps/groff-1.22.4 - -# Michael Haubenwallner (2019-01-30) -# Cygwin does not have updated patches yet, is not trivial ->=sys-apps/coreutils-8.30 - -# Michael Haubenwallner (2016-05-20) -# Does not work with Cygwin. -sys-apps/man-db diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.unmask b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.unmask deleted file mode 100644 index 0037a47423..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.unmask +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Michael Haubenwallner (2019-02-13) -# A little less broken on Cygwin than openssl-1.1.0j. -=dev-libs/openssl-1.1.1* diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.use b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.use deleted file mode 100644 index e42eadac89..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.use +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Michael Haubenwallner (2018-05-14) -# stack protector does not fully work on Cygwin yet -sys-devel/gcc -ssp - -# Michael Haubenwallner (2017-03-23) -# Using nettle hides a conflict between wincrypt and openssl. -app-arch/libarchive nettle - -# Michael Haubenwallner (2016-04-18) -# Cygwin coreutils provide kill as gkill -sys-apps/coreutils kill diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.use.mask deleted file mode 100644 index a964e7ff0c..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/package.use.mask +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Fabian Groffen (2020-08-04) -# missing keywords on deps -dev-util/ninja doc test diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/packages b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/packages deleted file mode 100644 index f3e9e76142..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/packages +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -*app-admin/cygwin-rebase -*sys-devel/binutils -*sys-libs/cygwin-crypt diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/parent deleted file mode 100644 index f3229c5b98..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/profile.bashrc b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/profile.bashrc deleted file mode 100644 index 4b14786827..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/profile.bashrc +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -if [[ ${CATEGORY}/${PN} == app-arch/xz-utils - && ${EBUILD_PHASE} == setup - && ${CPPFLAGS} == *-isystem* -]]; then - # During bootstrap-prefix.sh we set CPPFLAGS="-isystem $EPREFIX/usr/include", - # but on Cygwin xz-utils eventually does use the windres compiler, - # which fails to understand -isystem. - # As xz-utils has no need for -isystem here, we can use -I instead. - CPPFLAGS=${CPPFLAGS//-isystem /-I} -fi - -post_pkg_preinst() { - cygwin-post_pkg_preinst -} - -pre_pkg_postinst() { - cygwin-pre_pkg_postinst -} - -post_pkg_prerm() { - cygwin-post_pkg_prerm -} - -cygwin-post_pkg_preinst() { - cygwin-rebase-post_pkg_preinst -} - -cygwin-pre_pkg_postinst() { - cygwin-rebase-pre_pkg_postinst -} - -cygwin-post_pkg_prerm() { - cygwin-rebase-post_pkg_prerm -} - -############################################################################### -# To allow a Windows DLL to reside in memory just once for multiple processes, -# each process needs to be able to map that DLL at the same base address, -# without the need for a dynamic rebase. However, this requires the DLL's -# base address to be unique across all DLLs potentially loaded into a single -# process. Hence the PE/COFF binary format allows to define a preferred base -# address for DLLs, but leaves it up to the package manager to maintain that -# base address to be unique across all DLLs related together. -# (Not sure how exactly ASLR plays in here, though.) -# -# Furthermore, for the Cygwin fork, it is crucial that the child process is -# able to reload a DLL at the very same address as in the parent process. -# Having unique preferred base addresses across all related DLLs does help -# here as well. -# -# The Cygwin rebase utility does maintain some database holding the size and -# preferred base address for each DLL, and allows to update a DLL's preferred -# base address to not conflict with already installed DLLs. -# -# As updating the preferred base address for a DLL in use is a bad idea, we -# need to update the base address while the DLL is in staging directory, and -# update the rebase database after merging the DLL to the live file system. -# -# This allows to define a new preferred base address for a DLL that would -# replace an existing one, because during fork we really want to use the -# old version in the child process, which is verified using the preferred -# base address value to be identical in parent and child process. -# -# Otherwise, the new DLL may have identical size and preferred base address -# as the old DLL, and we may not detect a different DLL in the fork child. -# -# For unmerging a DLL: The Cygwin rebase utility does check if a DLL found -# in the database does still exist, removing that database entry otherwise. -############################################################################### - -cygwin-rebase-get_pendingdir() { - echo "var/db/rebase/pending" -} - -cygwin-rebase-get_mergeddir() { - echo "var/db/rebase/merged" -} - -cygwin-rebase-get_listname() { - echo "dlls_${CATEGORY}_${P}${PR:+-}${PR}" -} - -cygwin-rebase-get_rebase_program() { - [[ ${CHOST} == "${CBUILD}" ]] || return 1 - local pfx - for pfx in "${EPREFIX}" "${BROOT:-${PORTAGE_OVERRIDE_EPREFIX}}" - do - [[ -x ${pfx}/usr/bin/rebase ]] || continue - echo "${pfx}/usr/bin/rebase" - return 0 - done - return 1 -} - -cygwin-rebase-post_pkg_preinst() { - # Ensure database is up to date for when dlls were merged but - # subsequent cygwin-rebase-merge-pending was not executed. - einfo "Cygwin: Merging pending files into rebase database..." - cygwin-rebase-merge pending - eend $? - - local listname=$(cygwin-rebase-get_listname) - local pendingdir=$(cygwin-rebase-get_pendingdir) - local rebase_program=$(cygwin-rebase-get_rebase_program) - - if [[ ${CATEGORY}/${PN} == 'app-admin/cygwin-rebase' ]] - then - local mergeddir=$(cygwin-rebase-get_mergeddir) - keepdir "/${pendingdir}" - keepdir "/${mergeddir}" - fi - - einfo "Cygwin: Rebasing new files..." - ( - set -e - cd "${ED}" - - # The list of suffixes is found in the rebaseall script. - find . -type f \ - '(' -name '*.dll' \ - -o -name '*.so' \ - -o -name '*.oct' \ - ')' \ - | sed -e "s|^\.|${EPREFIX}|" > "${T}/rebase-filelist" - [[ "${PIPESTATUS[*]}" == '0 0' ]] - - # Nothing found to rebase in this package. - [[ -s ${T}/rebase-filelist ]] || exit 0 - - mkdir -p "./${pendingdir}" - cp -f "${T}/rebase-filelist" "./${pendingdir}/${listname}" - - # Without the rebase program, do not perform a rebase. - [[ ${rebase_program} ]] || exit 0 - - sed -ne "/^${EPREFIX//\//\\/}\\//{s|^${EPREFIX}/||;p}" "./${pendingdir}/${listname}" \ - | "${rebase_program}" --verbose --oblivious --database --filelist=- - [[ "${PIPESTATUS[*]}" == '0 0' ]] - ) - eend $? -} - -cygwin-rebase-pre_pkg_postinst() { - if [[ ${CATEGORY}/${PN} == 'app-admin/cygwin-rebase' ]] - then - einfo "Cygwin: Updating rebase database with installed files..." - cygwin-rebase-merge merged - eend $? - fi - einfo "Cygwin: Merging updated files into rebase database..." - cygwin-rebase-merge pending - eend $? -} - -cygwin-rebase-merge() { - local mode=${1} - - local rebase_program=$(cygwin-rebase-get_rebase_program) - [[ ${rebase_program} ]] || return 0 - - local pendingdir='' - local mergeddir='' - case ${mode} in - pending) - pendingdir=$(cygwin-rebase-get_pendingdir) - mergeddir=$(cygwin-rebase-get_mergeddir) - ;; - merged) - pendingdir=$(cygwin-rebase-get_mergeddir) - mergeddir='' - ;; - *) - die "Invalid mode '${mode}'." - ;; - esac - - ( - set -e - cd "${EROOT}" - - [[ -r ./${pendingdir}/. ]] - [[ -r ./${mergeddir}/. ]] - - find ./"${pendingdir}" -mindepth 1 -maxdepth 1 -type f -name 'dlls_*' \ - -exec sed -ne "/^${EPREFIX//\//\\/}\\//{s|^${EPREFIX}/||;p}" {} + \ - | "${rebase_program}" --verbose --merge-files --database --filelist=- - [[ "${PIPESTATUS[*]}" == '0 0' ]] - - [[ ${mode} == 'pending' ]] || exit 0 - - find "./${pendingdir}" -mindepth 1 -maxdepth 1 -type f -name 'dlls_*' \ - -exec mv -f -t "./${mergeddir}/" {} + - ) - [[ $? == 0 ]] || die "Merging ${mode} files into rebase database failed." -} - -cygwin-rebase-post_pkg_prerm() { - # The pending list is registered as being installed with the package, but - # the merged list is not. Just remove the unregistered one. - local mergeddir=$(cygwin-rebase-get_mergeddir) - local listname=$(cygwin-rebase-get_listname) - ( - set -e - cd "${EROOT}" - [[ -w ./${mergeddir}/. ]] - rm -f "./${mergeddir}/${listname}" - ) -} diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/use.force b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/use.force deleted file mode 100644 index e5b3845e4e..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/use.force +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Re-add Cygwin's libc -elibc_Cygwin diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/use.mask deleted file mode 100644 index 12139b1f51..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/use.mask +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Re-add Cygwin's libc --elibc_Cygwin diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/x64/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/x64/eapi deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/x64/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/x64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/x64/make.defaults deleted file mode 100644 index 118f797c4e..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/x64/make.defaults +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -ARCH="x64-cygwin" -CHOST="x86_64-pc-cygwin" -ACCEPT_KEYWORDS="~x64-cygwin" - -# We don't have lib64 in prefix so, remove it here. -SYMLINK_LIB="" -LIBDIR_amd64="lib" - -# multilib build stuff, single ABI (no multilib) -MULTILIB_ABIS="amd64" -DEFAULT_ABI="amd64" -ABI="amd64" -IUSE_IMPLICIT="abi_x86_64" -LIBDIR_amd64="lib" diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/x64/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/x64/parent deleted file mode 100644 index f3229c5b98..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/cygwin/x64/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/eapi deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/package.mask deleted file mode 100644 index ddb46a9cba..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/package.mask +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Michael Haubenwallner (2016-05-19) -# No point for util-linux on Windows -sys-apps/util-linux diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/package.use.mask deleted file mode 100644 index a7308f8b5f..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/package.use.mask +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Michael Haubenwallner (2019-07-31) -# KERNEL=Winnt needs term-driver, which conflicts with termlib -sys-libs/ncurses tinfo -sys-libs/ncurses-compat tinfo diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/parent deleted file mode 100644 index 8f6bb2022d..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/parent +++ /dev/null @@ -1,3 +0,0 @@ -../../base -../../arch/base -.. diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/use.force b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/use.force deleted file mode 100644 index 6dfa270423..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/use.force +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Re-add Windows kernel -kernel_Winnt diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/use.mask deleted file mode 100644 index 2d725b48a3..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/use.mask +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Re-add Windows kernel --kernel_Winnt - -# linux-exclusive feature -inotify diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/eapi deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/make.defaults deleted file mode 100644 index bd1924d2c0..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/make.defaults +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# System-wide defaults for all Windows profiles -# This file should rarely need to be changed - -# 'Sane' defaults -ELIBC="Winnt" - -FEATURES="nostrip" diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/package.mask deleted file mode 100644 index 0b9c2c9338..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/package.mask +++ /dev/null @@ -1,2 +0,0 @@ - -# Distributed under the terms of the GNU General Public License v2 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/package.use.mask deleted file mode 100644 index 9a3ad8f5b8..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/package.use.mask +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Michael Haubenwallner (2017-10-02) -# requires nasm, which is hard to use via parity atm -dev-libs/openssl asm -dev-libs/openssl-compat asm diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/packages b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/packages deleted file mode 100644 index 4e74d78804..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/packages +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# those are packages not available/required on winnt, since -# winnt can be a child EPREFIX only, which tears it's DEPENDS -# from a parent (e.g. x64-cygwin) prefix. - --*sys-apps/grep --*app-arch/gzip --*sys-devel/libtool --*virtual/man --*sys-devel/patch --*sys-devel/flex --*sys-apps/gawk --*app-arch/tar --*sys-apps/sed --*sys-devel/bison --*sys-apps/file --*app-arch/bzip2 --*net-misc/rsync --*sys-devel/automake --*virtual/editor --*sys-apps/coreutils --*sys-devel/make --*sys-apps/findutils --*sys-devel/m4 --*net-misc/wget --*sys-apps/which --*virtual/pager --*sys-apps/diffutils --*sys-apps/baselayout-prefix --*app-shells/bash:0 --*virtual/package-manager --*virtual/ssh --*sys-devel/autoconf --*sys-devel/gnuconfig --*sys-devel/gcc diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/parent deleted file mode 100644 index f3229c5b98..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/profile.bashrc b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/profile.bashrc deleted file mode 100644 index 3b61ad73d6..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/profile.bashrc +++ /dev/null @@ -1,305 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# On windows, binary files (executables, shared libraries) in use -# cannot be replaced during merge. -# But it is possible to rename them and remove lateron when they are -# not used any more by any running program. -# -# This is a workaround for portage bug#199868, -# and should be dropped once portage does sth. like this itself. -# - -####################################################################### -# -# Unix aware build tools may provide (e.g. pkg-config) and accept -# (e.g. gcc) the -lNAME linker option. While they create libNAME.so -# as the import library, they may be unaware of the additional dll. -# The dllhelper wrappers take care of copying the real dll when -# copying the libNAME.so. -# -# Cygwin and MinGW aware build tools may create the import library -# as libNAME.dll.a or libNAME.dll.lib, and are aware of the dll, -# while a subsequent linker step still receives the -lNAME option. -# -# MSVC aware build tools may provide (e.g. icu-config) and accept -# (e.g. cl.exe) the NAME.lib linker option, maybe with full path, -# and are aware of the dll. -# -# Libtool does accept both the Unix and MSVC variants now, but does -# search for the libNAME(.la|.dll|.so|.a) file upon -lNAME, in order. -# -# As Gentoo ebuilds may remove libNAME.la, we need the libNAME.so -# because we don't want to have libNAME.dll as an import library. -# -# The static library may be created as libNAME.a, libNAME.lib or even -# NAME.lib - the latter we need to check for static or import library. -# -# For whatever import library file we find, make sure there is both the -# NAME.lib and the libNAME.so for dynamic linkability via all the -# -lNAME, the NAME.lib and the libNAME.so linker option. -# -# For whatever static library file we find, make sure there is both the -# libNAME.lib and the libNAME.a for static linkability via all the -# -lNAME, the libNAME.lib and the libNAME.a linker option. -# -####################################################################### - -winnt_setup_dllhelper() { - case ${CATEGORY}/${PN} in - sys-libs/zlib |\ - '') - # When a package build system does not know about Windows at all, - # still it can be built for Windows using Gentoo Parity. - # But as there is another file to install (the real dll), - # and installation is done using cp, we override cp to - # additionally copy the dll when the library is copied. - ebegin "Setting up wrapper to copy the DLL along the LIB" - winnt_setup_dllhelper_cp - eend $? - ;; - esac -} - -post_src_install() { - winnt_post_src_install -} - -winnt_post_src_install() { - cd "${ED}" || return 0 - # - # File names being treated as import library: - # libNAME.so - # NAME.lib if CHOST-dumpbin yields 'DLL name' - # libNAME.dll.lib - # libNAME.dll.a - # - # File names being treated as static library: - # libNAME.lib - # NAME.lib if CHOST-dumpbin lacks 'DLL name' - # libNAME.a - # - # File names being warned about as suspect: - # NAME.so - # NAME.a - # NAME.dll.lib - # NAME.dll.a - # - find . -name '*.so' -o -name '*.lib' -o -name '*.a' | - while read f - do - f=${f#./} - libdir=$(dirname "${f}") - libfile=${f##*/} - libname= - NAMElib= # import lib to create - libNAMEso= # import lib to create - libNAMElib= # static lib to create - libNAMEa= # static lib to create - case ${libfile} in - lib*.so) # found import library - libname=${libfile%.so} - libname=${libname#lib} - NAMElib=${libname}.lib - libNAMEso=lib${libname}.so - ;; - *.so) ;; # warn - lib*.dll.lib) # found import library - libname=${libfile%.dll.lib} - libname=${libname#lib} - NAMElib=${libname}.lib - libNAMEso=lib${libname}.so - ;; - *.dll.lib) ;; # warn - *.lib) # found static or import library - ${CHOST}-dumpbin.exe /headers "./${libdir}/${libfile}" | grep -q 'DLL name' - case "${PIPESTATUS[*]}" in - '0 0') # found import library - libname=${libfile%.lib} - libname=${libname#lib} - NAMElib=${libname}.lib - libNAMEso=lib${libname}.so - ;; - '0 1') # found static library - libname=${libfile%.lib} - libname=${libname#lib} - libNAMEa=lib${libname}.a - libNAMElib=lib${libname}.lib - ;; - *) - die "Cannot run ${CHOST}-dumpbin on ${libdir}/${libfile}" - ;; - esac - ;; - lib*.dll.a) # found import library - libname=${libfile%.dll.a} - libname=${libname#lib} - NAMElib=${libname}.lib - libNAMEso=lib${libname}.so - ;; - *.dll.a) ;; # warn - lib*.a) # found static library - libname=${libfile%.a} - libname=${libname#lib} - libNAMEa=lib${libname}.a - libNAMElib=lib${libname}.lib - ;; - *.a) ;; # warn - esac - if [[ -z ${libname} ]]; then - ewarn "Ignoring suspect file with library extension: ${f}" - continue - fi - - if [[ ${NAMElib} && ! -e ./${libdir}/${NAMElib} ]]; then - ebegin "creating ${NAMElib} from ${libfile} for MSVC linkability" - cp -pf "./${libdir}/${libfile}" "./${libdir}/${NAMElib}" || die - eend $? - fi - if [[ ${libNAMElib} && ! -e ./${libdir}/${libNAMElib} ]]; then - ebegin "creating ${libNAMElib} from ${libfile} for MSVC linkability" - cp -pf "./${libdir}/${libfile}" "./${libdir}/${libNAMElib}" || die - eend $? - fi - if [[ ${libNAMEso} && ! -e ./${libdir}/${libNAMEso} ]]; then - ebegin "creating ${libNAMEso} from ${f##*/} for POSIX linkability" - cp -pf "./${libdir}/${libfile}" "./${libdir}/${libNAMEso}" || die - eend $? - fi - if [[ ${libNAMEa} && ! -e ./${libdir}/${libNAMEa} ]]; then - ebegin "creating ${libNAMEa} from ${f##*/} for POSIX linkability" - cp -pf "./${libdir}/${libfile}" "./${libdir}/${libNAMEa}" || die - eend $? - fi - done - if [[ -d usr/$(get_libdir) ]] - then - # The native loader does not understand symlinks to dlls, - # seen to be created by dev-libs/icu eventually. For any - # dll we find in usr/lib we need to perform a real copy to - # usr/bin, to resolve potential symlinks (seen from icu), - # and perform the remove from usr/lib afterwards, to not - # break symlinks later on discovered by find. - local toremove=() - local f - while read f - do - [[ -f usr/bin/${f##*/} ]] && continue - ebegin "moving ${f} to usr/bin for the native loader" - dodir usr/bin || die - cp -f "${f}" usr/bin/ || die - eend $? - toremove=( "${toremove[@]}" "${f}" ) - done < <(find usr/$(get_libdir) -maxdepth 1 -name '*.dll') - if [[ ${#toremove[@]} -gt 0 ]] - then - rm -f "${toremove[@]}" || die "removing dlls from usr/$(get_libdir) failed" - fi - fi -} - -winnt_setup_dllhelper_cp() { - if ! [[ $(type -P cp) -ef ${T}/dllhelper/cp ]] - then - mkdir -p "${T}/dllhelper" - cat > "${T}/dllhelper/cp" <<'EOCP' -#!/usr/bin/env bash - -mysrcs=() -myopts=() -mydest= -force_dest_file_opt= - -nextargs=( "$@" ) - -while [[ $# -gt 0 ]] -do - arg=${1} - shift - case ${arg} in - --) - mysrcs+=( "${@}" ) - break - ;; - -S) - myopts+=( "${arg}" ${1+"$1"} ) - ${1:+shift} - ;; - -t) - mydest="${1-}" - ${1:+shift} - ;; - -T) - force_dest_file_opt=${arg} - ;; - -*) - myopts+=( "${arg}" ) - ;; - *) - mysrcs+=( "${arg}" ) - ;; - esac -done - -me=${0##*/} -nextPATH= -oIFS=$IFS -IFS=: -for p in ${PATH} -do - [[ ${p}/${me} -ef ${0} ]] && continue - nextPATH+=${nextPATH:+:}${p} -done -IFS=${oIFS} - -PATH=${nextPATH} - -${me} "${nextargs[@]}" -ret=$? -[[ ${ret} == 0 ]] || exit ${ret} - -if [[ -z ${mydest} ]] -then - [[ ${#mysrcs[@]} -lt 2 ]] && exit 0 - : "${mysrcs[@]}" "${#mysrcs[@]}" - mydest=${mysrcs[${#mysrcs[@]}-1]} - unset mysrcs[${#mysrcs[@]}-1] -elif [[ ${#mysrcs[@]} == 0 ]] -then - exit 0 -fi - -for src in ${mysrcs[@]} -do - ret=0 - [[ ${src##*/} != lib*.so* ]] && continue - for ext in dll pdb - do - [[ ${src##*/} == *.${ext} ]] && continue - [[ -f ${src} && -f ${src}.${ext} ]] || continue - if [[ -d ${mydest} && ! -n ${force_dest_file_opt} ]] - then - # When copying to directory we keep the basename. - ${me} -T "${myopts[@]}" "${src}.${ext}" "${mydest}/${src##*/}.${ext}" - ret=$? - elif [[ ${mydest##*/} == ${src##*/} ]] - then - # Copy the dll only when we keep the basename. - ${me} -T "${myopts[@]}" "${src}.${ext}" "${mydest}.${ext}" - ret=$? - fi - [[ ${ret} == 0 ]] || exit ${ret} - done -done - -exit 0 -EOCP - chmod +x "${T}/dllhelper/cp" - PATH="${T}/dllhelper:${PATH}" - fi -} - -if [[ ${EBUILD_PHASE} == 'setup' ]] -then - winnt_setup_dllhelper -fi diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/use.force b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/use.force deleted file mode 100644 index 4dbfdde651..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/use.force +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Re-add Winnt libc -elibc_Winnt diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/use.mask deleted file mode 100644 index 5466fd4b5e..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/use.mask +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Re-add Winnt libc --elibc_Winnt - -# CURL_SSL=winssl is allowd on Winnt libc --curl_ssl_winssl - -# these will more than likely never work on Windows -3dfx -acpi -alsa -apm -bluetooth -caps -cdr -coreaudio -dga -djbfft -dri -dvdr -# emacs USE flag is masked because of missing implementation for unexec() -emacs -fbcon -ggi -glut -gpm -gps -hardened -hddtemp -ibm -ieee1394 -ipod -ipv6 -lm-sensors -ncurses -opengl -oss -pcmcia -pda -rtc -selinux -scanner -smartcard -svga -unicode -usb -v4l -wifi - -# these are USE flags that don't _currently_ work, but may will in the future. -ffmpeg -fftw -flac -jack -joystick -ladspa -# opennmp is not working yet on interix -openmp -portaudio -pulseaudio -readline -# libtiff only static, so avoid the tiff USE flag! -tiff -timidity diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x64/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x64/eapi deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x64/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x64/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x64/make.defaults deleted file mode 100644 index 1200225e10..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x64/make.defaults +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# This profile is designed for use as Stacked Prefix, set up using -# prefix-stack-setup (app-portage/prefix-toolkit) from with a Cygwin -# Prefix (Guest only), having sys-devel/parity installed (wraps MSVC). -# -# CHOST is left unset on purpose. It is set by prefix-stack-setup -# using some --chost=x86_64-msvc16-winnt argument, selecting the -# Visual Studio version and runtime variant (static|debug) to use. -# -# Sample CHOST values for the runtime variant using x64 Visual Studio 2019, -# as provided by parity-2.0.0 (multithreaded only): -# x86_64-msvc16-winnt dynamic runtime (cl.exe /MD for MSVCRT.DLL) -# x86_64-msvcd16-winnt dynamic debug runtime (cl.exe /MDd for MSVCRTD.DLL) -# x86_64-libcmt16-winnt static runtime (cl.exe /MT for LIBCMT.LIB) -# x86_64-libcmtd16-winnt static debug runtime (cl.exe /MTd for LIBCMTD.LIB) -# - -ARCH="x64-winnt" -ACCEPT_KEYWORDS="~x64-winnt" - -# multilib build stuff, single ABI (no multilib) -MULTILIB_ABIS="amd64" -DEFAULT_ABI="amd64" -ABI="amd64" -IUSE_IMPLICIT="abi_x86_64" -LIBDIR_amd64="lib" diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x64/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x64/parent deleted file mode 100644 index f3229c5b98..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x64/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x86/eapi b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x86/eapi deleted file mode 100644 index 7ed6ff82de..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x86/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x86/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x86/make.defaults deleted file mode 100644 index 223c275acc..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x86/make.defaults +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# This profile is designed for use as Stacked Prefix, set up using -# prefix-stack-setup (app-portage/prefix-toolkit) from with a Cygwin -# Prefix (Guest only), having sys-devel/parity installed (wraps MSVC). -# -# CHOST is left unset on purpose. It is set by prefix-stack-setup -# using some --chost=i686-msvc16-winnt argument, selecting the -# Visual Studio version and runtime variant (static|debug) to use. -# -# Sample CHOST values for the runtime variant using x86 Visual Studio 2019, -# as provided by parity-2.0.0 (multithreaded only): -# i686-msvc16-winnt dynamic runtime (cl.exe /MD for MSVCRT.DLL) -# i686-msvcd16-winnt dynamic debug runtime (cl.exe /MDd for MSVCRTD.DLL) -# i686-libcmt16-winnt static runtime (cl.exe /MT for LIBCMT.LIB) -# i686-libcmtd16-winnt static debug runtime (cl.exe /MTd for LIBCMTD.LIB) -# - -ARCH="x86-winnt" -ACCEPT_KEYWORDS="~x86-winnt" - -# multilib build stuff, single ABI (no multilib) -MULTILIB_ABIS="x86" -DEFAULT_ABI="x86" -ABI="x86" -IUSE_IMPLICIT="abi_x86_32" -LIBDIR_x86="lib" diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x86/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x86/parent deleted file mode 100644 index f3229c5b98..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/windows/winnt/x86/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc index c4fc059796..8b0d598560 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc @@ -406,18 +406,8 @@ arm64-macos prefix/darwin/macos/12.0/arm64/gcc exp arm64-macos prefix/darwin/macos/13.0/arm64/gcc exp # Solaris Profiles -sparc-solaris prefix/sunos/solaris/5.11/sparc exp -sparc64-solaris prefix/sunos/solaris/5.11/sparc64 exp -x86-solaris prefix/sunos/solaris/5.11/x86 exp x64-solaris prefix/sunos/solaris/5.11/x64 exp -# Windows Profiles -x86-winnt prefix/windows/winnt/x86 exp -x64-winnt prefix/windows/winnt/x64 exp - -# Cygwin Profiles -x64-cygwin prefix/windows/cygwin/x64 exp - # vim: set ts=8 noet ft=conf: # Local Variables: diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/make.defaults index 46a8c5d391..caccdbdd22 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr cups dbus dri dts dvd dvdr elogind encode exif flac gif gpm gtk gui icu jpeg lcms libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl sound spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb xft x264 xml xv xvid" +USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr cups dbus dri dts dvd dvdr elogind encode exif flac gif gpm gtk gui icu jpeg lcms libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl sound spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb vulkan wxwidgets X xcb xft x264 xml xv xvid" diff --git a/sdk_container/src/third_party/portage-stable/profiles/thirdpartymirrors b/sdk_container/src/third_party/portage-stable/profiles/thirdpartymirrors index 668cf3a528..c8881b5e8c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/thirdpartymirrors +++ b/sdk_container/src/third_party/portage-stable/profiles/thirdpartymirrors @@ -1,4 +1,4 @@ -apache https://dlcdn.apache.org/ https://apache.lauf-forum.at/ https://apache.mirror.iphh.net/ https://artfiles.org/apache.org/ https://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ https://ftp.fau.de/apache/ https://apache.mirrors.hoobly.com/ https://apache.osuosl.org/ +apache https://dlcdn.apache.org/ https://apache.lauf-forum.at/ https://apache.mirror.iphh.net/ https://artfiles.org/apache.org/ https://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ https://ftp.fau.de/apache/ https://apache.osuosl.org/ cpan https://cpan.metacpan.org https://www.cpan.org cran https://cran.r-project.org https://cran.us.r-project.org debian https://deb.debian.org/debian/ http://ftp.au.debian.org/debian/ http://ftp.at.debian.org/debian/ http://ftp.by.debian.org/debian/ http://ftp.be.debian.org/debian/ http://ftp.br.debian.org/debian/ http://ftp.bg.debian.org/debian/ http://ftp.ca.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://ftp.cn.debian.org/debian/ http://ftp.hr.debian.org/debian/ http://ftp.cz.debian.org/debian/ http://ftp.dk.debian.org/debian/ http://ftp.sv.debian.org/debian/ http://ftp.ee.debian.org/debian/ http://ftp.fi.debian.org/debian/ http://ftp.fr.debian.org/debian/ http://ftp2.de.debian.org/debian/ http://ftp.de.debian.org/debian/ http://ftp.gr.debian.org/debian/ http://ftp.hu.debian.org/debian/ http://ftp.is.debian.org/debian/ http://ftp.ie.debian.org/debian/ http://ftp.it.debian.org/debian/ http://ftp.jp.debian.org/debian/ http://ftp.lt.debian.org/debian/ http://ftp.mx.debian.org/debian/ http://ftp.md.debian.org/debian/ http://ftp.nl.debian.org/debian/ http://ftp.nc.debian.org/debian/ http://ftp.nz.debian.org/debian/ http://ftp.no.debian.org/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pt.debian.org/debian/ http://ftp.ro.debian.org/debian/ http://ftp.ru.debian.org/debian/ http://ftp.sg.debian.org/debian/ http://ftp.sk.debian.org/debian/ http://ftp.si.debian.org/debian/ http://ftp.es.debian.org/debian/ http://ftp.se.debian.org/debian/ http://ftp.ch.debian.org/debian/ http://ftp.tw.debian.org/debian/ http://ftp.tr.debian.org/debian/ http://ftp.ua.debian.org/debian/ http://ftp.uk.debian.org/debian/ http://ftp.us.debian.org/debian/ diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2023 b/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2023 index 43b489e494..cb8eb0e4a9 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2023 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2023 @@ -19,3 +19,9 @@ move dev-python/jupyter_server_mathjax dev-python/jupyter-server-mathjax move dev-python/jupyter_packaging dev-python/jupyter-packaging move dev-python/jupyterlab_pygments dev-python/jupyterlab-pygments move dev-python/sphinxcontrib-log_cabinet dev-python/sphinxcontrib-log-cabinet +move app-misc/pdfpc app-text/pdfpc +move dev-python/python-email-validator dev-python/email-validator +move dev-python/semantic_version dev-python/semantic-version +move dev-python/prometheus_client dev-python/prometheus-client +move dev-python/docker-py dev-python/docker +move dev-python/python-ctags dev-python/python-ctags3 diff --git a/sdk_container/src/third_party/portage-stable/profiles/use.desc b/sdk_container/src/third_party/portage-stable/profiles/use.desc index 2d5489acc5..bd8cb7031a 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/use.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/use.desc @@ -192,6 +192,7 @@ mms - Support for Microsoft Media Server (MMS) streams mng - Add support for libmng (MNG images) modplug - Add libmodplug support for playing SoundTracker-style music files modules - Build the kernel modules +modules-sign - Cryptographically sign installed kernel modules (requires CONFIG_MODULE_SIG=y in the kernel) mono - Build Mono bindings to support dotnet type stuff motif - Add support for the Motif toolkit mp3 - Add support for reading mp3 files @@ -301,6 +302,7 @@ ssl - Add support for SSL/TLS connections (Secure Socket Layer / Transport Layer startup-notification - Enable application startup event feedback mechanism static - !!do not set this during bootstrap!! Causes binaries to be statically linked instead of dynamically static-libs - Build static versions of dynamic libraries as well +strip - Allow symbol stripping to be performed by the ebuild for special files subversion - Enable subversion (version control system) support suid - Enable setuid root program(s) svg - Add support for SVG (Scalable Vector Graphics) @@ -344,6 +346,7 @@ videos - Install optional video files (used in some games) vim-syntax - Pulls in related vim syntax scripts vnc - Enable VNC (remote desktop viewer) support vorbis - Add support for the OggVorbis audio codec +vulkan - Add support for 3D graphics and computing via the Vulkan cross-platform API wavpack - Add support for wavpack audio compression tools wayland - Enable dev-libs/wayland backend webkit - Add support for the WebKit HTML rendering/layout engine From 405056e0156a3a37776e2fb639b72917cd4d9cc8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:40 +0000 Subject: [PATCH 145/202] sys-apps/diffutils: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/sys-apps/diffutils/diffutils-3.10.ebuild | 2 +- .../portage-stable/sys-apps/diffutils/diffutils-3.8.ebuild | 2 +- .../portage-stable/sys-apps/diffutils/diffutils-3.9-r1.ebuild | 2 +- .../portage-stable/sys-apps/diffutils/diffutils-3.9.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.10.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.10.ebuild index afcdb4c15e..7dc0044edd 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.10.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.10.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.8.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.8.ebuild index 5d894b8165..e09deb927c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.8.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls static" BDEPEND="nls? ( sys-devel/gettext ) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9-r1.ebuild index c7ed3f50d2..d9af45cc4c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9-r1.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9.ebuild index ec1ec5612f..38ff62f585 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" From 551efbf1516718ee85e8383febb9ec6b9df9d8c1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:43 +0000 Subject: [PATCH 146/202] sys-apps/file: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/sys-apps/file/file-5.44-r3.ebuild | 2 +- .../third_party/portage-stable/sys-apps/file/file-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.44-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.44-r3.ebuild index dc9376f5c8..0514af6509 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.44-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-5.44-r3.ebuild @@ -18,7 +18,7 @@ else SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )" fi diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild index fdcca649e2..9ad85783b1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/file/file-9999.ebuild @@ -18,7 +18,7 @@ else SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )" fi From 76cbc1710b2e263afe43d23a6e8f17d05207ed1d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:44 +0000 Subject: [PATCH 147/202] sys-apps/findutils: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/sys-apps/findutils/findutils-4.9.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.9.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.9.0-r2.ebuild index c8fef6739a..8bf357fa6a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.9.0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/findutils/findutils-4.9.0-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${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 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls selinux static test" RESTRICT="!test? ( test )" From 24190ee0ad20193848ced9b7c36dc95a9f0902cc Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:44 +0000 Subject: [PATCH 148/202] sys-apps/gawk: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../third_party/portage-stable/sys-apps/gawk/gawk-5.2.1.ebuild | 2 +- .../third_party/portage-stable/sys-apps/gawk/gawk-5.2.2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.2.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.2.1.ebuild index cea5fa83b9..379131cf7b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.2.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.2.1.ebuild @@ -29,7 +29,7 @@ else SRC_URI="mirror://gnu/gawk/${P}.tar.xz" SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-3+" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.2.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.2.2.ebuild index 02d5d9510a..8b74b93b67 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.2.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.2.2.ebuild @@ -29,7 +29,7 @@ else SRC_URI="mirror://gnu/gawk/${P}.tar.xz" SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-3+" From 3f3df3e13e6bdbbcffbbb0ab1f714d8a1ac39f91 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:44 +0000 Subject: [PATCH 149/202] sys-apps/gentoo-functions: Sync with Gentoo It's from Gentoo commit 56f08b41df23eceb172abef1a4fd174f8a3d78f6. --- .../sys-apps/gentoo-functions/gentoo-functions-0.17.ebuild | 2 +- .../sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild | 2 +- .../sys-apps/gentoo-functions/gentoo-functions-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-0.17.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-0.17.ebuild index 663036da59..f22e4423d3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-0.17.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-0.17.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git" else SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2" - 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 ~x86-winnt" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi inherit toolchain-funcs flag-o-matic diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild index 112f069c26..39769eaa91 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git" else SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2" - 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 ~x86-winnt" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi inherit toolchain-funcs flag-o-matic diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild index 112f069c26..d704dea166 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git" else SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2" - 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 ~x86-winnt" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi inherit toolchain-funcs flag-o-matic From 913bf27c3b2747e1664a6a52da4a919c1fe63a11 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:46 +0000 Subject: [PATCH 150/202] sys-apps/help2man: Sync with Gentoo It's from Gentoo commit ff5e0fac0e01ec20daeb44f547863dfadd1fba3b. --- .../portage-stable/sys-apps/help2man/help2man-1.48.5.ebuild | 2 +- .../portage-stable/sys-apps/help2man/help2man-1.49.3.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/help2man/help2man-1.48.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/help2man/help2man-1.48.5.ebuild index 4691eb994b..4d1d1d2e63 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/help2man/help2man-1.48.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/help2man/help2man-1.48.5.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" # nls/FSFAP for bindtextdomain.c LICENSE="GPL-3+ nls? ( FSFAP )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls" RDEPEND="dev-lang/perl diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/help2man/help2man-1.49.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/help2man/help2man-1.49.3.ebuild index bed909f22d..c5dc38f131 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/help2man/help2man-1.49.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/help2man/help2man-1.49.3.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" # nls/FSFAP for bindtextdomain.c LICENSE="GPL-3+ nls? ( FSFAP )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls" RDEPEND="dev-lang/perl From 601bbb3fc467f15f31abb6feeb118673c41f5b0b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:50 +0000 Subject: [PATCH 151/202] sys-apps/less: Sync with Gentoo It's from Gentoo commit 6adacd28aa2148adc25b9d62778f88db86b323f0. --- .../third_party/portage-stable/sys-apps/less/less-608-r1.ebuild | 2 +- .../third_party/portage-stable/sys-apps/less/less-608-r2.ebuild | 2 +- .../third_party/portage-stable/sys-apps/less/less-632.ebuild | 2 +- .../third_party/portage-stable/sys-apps/less/less-633.ebuild | 2 +- .../third_party/portage-stable/sys-apps/less/less-9999.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-608-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-608-r1.ebuild index 027deaf9c7..fe6b8416fb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-608-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-608-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" LICENSE="|| ( GPL-3 BSD-2 )" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="pcre unicode" DEPEND=">=app-misc/editor-wrapper-3 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-608-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-608-r2.ebuild index 511bf7d52e..c0cd1e3691 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-608-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-608-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" LICENSE="|| ( GPL-3 BSD-2 )" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="pcre unicode" DEPEND=">=app-misc/editor-wrapper-3 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-632.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-632.ebuild index e621da4d1e..84b0670e4f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-632.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-632.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}"/${MY_P/?beta} LICENSE="|| ( GPL-3 BSD-2 )" SLOT="0" if [[ ${PV} != 9999 && ${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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="pcre" # As of 623_beta, lesstest is not included in dist tarballs diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-633.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-633.ebuild index e621da4d1e..40f8315102 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-633.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-633.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}"/${MY_P/?beta} LICENSE="|| ( GPL-3 BSD-2 )" SLOT="0" if [[ ${PV} != 9999 && ${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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="pcre" # As of 623_beta, lesstest is not included in dist tarballs diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-9999.ebuild index e621da4d1e..40f8315102 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-9999.ebuild @@ -28,7 +28,7 @@ S="${WORKDIR}"/${MY_P/?beta} LICENSE="|| ( GPL-3 BSD-2 )" SLOT="0" if [[ ${PV} != 9999 && ${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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="pcre" # As of 623_beta, lesstest is not included in dist tarballs From b9558db507b11e7fef3a247a1fd7e3e166e79be5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:50 +0000 Subject: [PATCH 152/202] sys-apps/portage: Sync with Gentoo It's from Gentoo commit 6b2890df8da337c0135f49e1ac23a6c644e0e6b1. --- .../portage-stable/sys-apps/portage/Manifest | 1 + .../sys-apps/portage/portage-3.0.44-r1.ebuild | 3 +- .../portage/portage-3.0.45.3-r2.ebuild | 5 +- .../sys-apps/portage/portage-3.0.46.ebuild | 3 +- .../sys-apps/portage/portage-3.0.47-r1.ebuild | 296 ++++++++++++++++++ .../sys-apps/portage/portage-3.0.47.ebuild | 40 ++- .../sys-apps/portage/portage-3.0.48.ebuild | 296 ++++++++++++++++++ .../sys-apps/portage/portage-9999.ebuild | 58 +++- 8 files changed, 667 insertions(+), 35 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.47-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.48.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest index a2fd80a3bf..ee7937ec4b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest @@ -2,3 +2,4 @@ DIST portage-3.0.44.tar.bz2 1140911 BLAKE2B 06f584e6e37bbb309b9bb0e29ba4381eadd4 DIST portage-3.0.45.3.tar.bz2 1146552 BLAKE2B 0506124bf47d71df699c2ecb2846b19f68b39813409e141fe292e237093eeb4f3d6fb771f6328624e0182322f71f42e629c2c58a2c590efb8697fa61b03d73a4 SHA512 89757efb71127249356c7d4ea1a05de7409285abaf045b2c6b5ddd463bef997db497df6ea3a05085656eced49bee625732bfb2d0771b7592f883f8712e547415 DIST portage-3.0.46.tar.bz2 1148375 BLAKE2B d97698eb3341a8d04980e021e5be8650193baf60c1ba34c11ccc79c147a256f152cb5c3a455798f38ee93164666dba31d3f510837c2924c1190f657fe1019b77 SHA512 0aa43d58cb23ff5931d31b2ebf724b0f9cb163d7e452c120f2917b9a1fac1cad7930c28dd40e6482a3f4e66ff05e1340e7135aa9d0eca60182c04f573c094afb DIST portage-3.0.47.tar.bz2 1148789 BLAKE2B 268589c37a6bdc36377f3e407b16bebfb9876adc1d89ee7576f3ebbee42bc0799f5a225dfd53ffedeeded91ca4403383d4811b4f104448c1b2fc6c277ca94ef1 SHA512 abbd2446d0da0b5d298a235c2cc7d2d4e001e9f012b6e22149fed4514b52dc938b0377b2551f45e3505b9dddeedd7170951ff967310708ec3b93610b775a7c02 +DIST portage-3.0.48.tar.bz2 1150955 BLAKE2B ca61adcfa66c96f702f5f05436d100102adbd6b2d5028b100dc2793dba8e0f8d8a17520bc6a4165254e2bcebd1fb798d67f7e0e1f46abc776adc351a42ba93c9 SHA512 46dcfbb833838a16a6c8f8dc4062bd2b9a37d0f34e1f884a74abf74846e7236381c2dfa06cf36c50a978d930834784c3ecd44208ff64f4cc289b7df1522d7fae diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.44-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.44-r1.ebuild index f6c5de541b..103f4824d4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.44-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.44-r1.ebuild @@ -3,7 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +DISTUTILS_EXT=1 +PYTHON_COMPAT=( pypy3 python3_{10..11} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.3-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.3-r2.ebuild index 77fa14500b..3b09052f10 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.3-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.45.3-r2.ebuild @@ -3,7 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +DISTUTILS_EXT=1 +PYTHON_COMPAT=( pypy3 python3_{10..11} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 @@ -14,7 +15,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" SLOT="0" IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.46.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.46.ebuild index 77fa14500b..77a95c1762 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.46.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.46.ebuild @@ -3,7 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +DISTUTILS_EXT=1 +PYTHON_COMPAT=( pypy3 python3_{10..11} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.47-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.47-r1.ebuild new file mode 100644 index 0000000000..b4825b36e3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.47-r1.ebuild @@ -0,0 +1,296 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_EXT=1 +PYTHON_COMPAT=( pypy3 python3_{10..12} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' +SETUPTOOLS_USE_DISTUTILS=local +TMPFILES_OPTIONAL=1 + +inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix + +DESCRIPTION="The package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/portage.git + https://github.com/gentoo/portage.git + " + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-vcs/git ) +" +DEPEND=" + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + !build? ( $(python_gen_impl_dep 'ssl(+)') ) + apidoc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-epytext[${PYTHON_USEDEP}] + ) + doc? ( + app-text/xmlto + ~app-text/docbook-xml-dtd-4.4 + ) +" +# Require sandbox-2.2 for bug #288863. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +# app-portage/gemato goes without PYTHON_USEDEP since we're calling +# the executable. +RDEPEND=" + acct-user/portage + app-arch/zstd + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/baselayout-2.9 + >=sys-apps/findutils-4.4 + !build? ( + >=sys-apps/sed-4.0.5 + >=app-shells/bash-5.0:0[readline] + >=app-admin/eselect-1.2 + rsync-verify? ( + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] + >=sec-keys/openpgp-keys-gentoo-release-20220101 + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + ) + ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + kernel_linux? ( sys-apps/util-linux ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + ) ) + !> cnf/make.globals || die + fi + + if use native-extensions && ! tc-is-cross-compiler; then + printf "[build_ext]\nportage_ext_modules=true\n" >> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i lib/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if use build || ! use rsync-verify; then + sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ + -e '/^sync-webrsync-verify-signature/s|yes|no|' \ + -i cnf/repos.conf || die "sed failed" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ + -w "/_BINARY/" lib/portage/const.py + + einfo "Prefixing shebangs ..." + > "${T}/shebangs" || die + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + echo "${REPLY}" >> "${T}/shebangs" || die + fi + done < <(find . -type f -executable ! -name etc-update -print0) + + if [[ -s ${T}/shebangs ]]; then + xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" + fi + + einfo "Adjusting make.globals, repos.conf and etc-update ..." + hprefixify cnf/{make.globals,repos.conf} bin/etc-update + + if use prefix-guest ; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + fi + + cd "${S}/cnf" || die + if [[ -f "make.conf.example.${ARCH}".diff ]] ; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use apidoc && targets+=( apidoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use apidoc && targets+=( + install_apidoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + if ! use build; then + python_setup + local sitedir=$(python_get_sitedir) + [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" + env -u DISTDIR \ + -u PORTAGE_OVERRIDE_EPREFIX \ + -u PORTAGE_REPOSITORIES \ + -u PORTDIR \ + -u PORTDIR_OVERLAY \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || die + + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + + env -u FEATURES -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die + fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.3.77"; then + elog "The emerge --autounmask option is now disabled by default, except for" + elog "portions of behavior which are controlled by the --autounmask-use and" + elog "--autounmask-license options. For backward compatibility, previous" + elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." + elog "Users can get the old behavior simply by adding --autounmask to the" + elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" + elog "change, see https://bugs.gentoo.org/658648." + fi +} + +pkg_postinst() { + # Warn about obsolete "enotice" script, bug #867010 + local bashrc=${EROOT}/etc/portage/profile/profile.bashrc + if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then + eerror "Obsolete 'enotice' script detected!" + eerror "Please remove this from ${bashrc} to avoid problems." + eerror "See bug 867010 for more details." + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.47.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.47.ebuild index 0ffe05fb58..351719796c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.47.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.47.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_EXT=1 -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +PYTHON_COMPAT=( pypy3 python3_{10..11} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 @@ -12,28 +12,39 @@ inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix DESCRIPTION="The package management and distribution system for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" -SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/portage.git + https://github.com/gentoo/portage.git + " + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" SLOT="0" IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" RESTRICT="!test? ( test )" BDEPEND=" - app-arch/xz-utils test? ( dev-vcs/git ) " DEPEND=" - !build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + !build? ( $(python_gen_impl_dep 'ssl(+)') ) apidoc? ( dev-python/sphinx[${PYTHON_USEDEP}] dev-python/sphinx-epytext[${PYTHON_USEDEP}] ) + doc? ( + app-text/xmlto + ~app-text/docbook-xml-dtd-4.4 + ) " # Require sandbox-2.2 for bug #288863. # For whirlpool hash, require python[ssl] (bug #425046). @@ -70,6 +81,8 @@ RDEPEND=" !=sys-apps/file-5.44-r3 ) " -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# NOTE: FEATURES=installsources requires debugedit and rsync + +distutils_enable_tests setup.py pkg_pretend() { local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" @@ -91,12 +104,11 @@ pkg_pretend() { } python_prepare_all() { - local PATCHES=( - ) - distutils-r1_python_prepare_all - sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die + if [[ ${PV} != 9999 ]] ; then + sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die + fi if use gentoo-dev; then einfo "Disabling --dynamic-deps by default for gentoo-dev..." @@ -184,10 +196,6 @@ python_compile_all() { fi } -python_test() { - esetup.py test -} - python_install() { # Install sbin scripts to bindir for python-exec linking # they will be relocated in pkg_preinst() diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.48.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.48.ebuild new file mode 100644 index 0000000000..07b36de0ea --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.48.ebuild @@ -0,0 +1,296 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_EXT=1 +PYTHON_COMPAT=( pypy3 python3_{10..12} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' +SETUPTOOLS_USE_DISTUTILS=local +TMPFILES_OPTIONAL=1 + +inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix + +DESCRIPTION="The package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/portage.git + https://github.com/gentoo/portage.git + " + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-vcs/git ) +" +DEPEND=" + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + !build? ( $(python_gen_impl_dep 'ssl(+)') ) + apidoc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-epytext[${PYTHON_USEDEP}] + ) + doc? ( + app-text/xmlto + ~app-text/docbook-xml-dtd-4.4 + ) +" +# Require sandbox-2.2 for bug #288863. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +# app-portage/gemato goes without PYTHON_USEDEP since we're calling +# the executable. +RDEPEND=" + acct-user/portage + app-arch/zstd + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/baselayout-2.9 + >=sys-apps/findutils-4.4 + !build? ( + >=sys-apps/sed-4.0.5 + >=app-shells/bash-5.0:0[readline] + >=app-admin/eselect-1.2 + rsync-verify? ( + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] + >=sec-keys/openpgp-keys-gentoo-release-20220101 + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + ) + ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + kernel_linux? ( sys-apps/util-linux ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + ) ) + !> cnf/make.globals || die + fi + + if use native-extensions && ! tc-is-cross-compiler; then + printf "[build_ext]\nportage_ext_modules=true\n" >> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i lib/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if use build || ! use rsync-verify; then + sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ + -e '/^sync-webrsync-verify-signature/s|yes|no|' \ + -i cnf/repos.conf || die "sed failed" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ + -w "/_BINARY/" lib/portage/const.py + + einfo "Prefixing shebangs ..." + > "${T}/shebangs" || die + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + echo "${REPLY}" >> "${T}/shebangs" || die + fi + done < <(find . -type f -executable ! -name etc-update -print0) + + if [[ -s ${T}/shebangs ]]; then + xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" + fi + + einfo "Adjusting make.globals, repos.conf and etc-update ..." + hprefixify cnf/{make.globals,repos.conf} bin/etc-update + + if use prefix-guest ; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + fi + + cd "${S}/cnf" || die + if [[ -f "make.conf.example.${ARCH}".diff ]] ; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use apidoc && targets+=( apidoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use apidoc && targets+=( + install_apidoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + if ! use build; then + python_setup + local sitedir=$(python_get_sitedir) + [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" + env -u DISTDIR \ + -u PORTAGE_OVERRIDE_EPREFIX \ + -u PORTAGE_REPOSITORIES \ + -u PORTDIR \ + -u PORTDIR_OVERLAY \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || die + + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + + env -u FEATURES -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die + fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.3.77"; then + elog "The emerge --autounmask option is now disabled by default, except for" + elog "portions of behavior which are controlled by the --autounmask-use and" + elog "--autounmask-license options. For backward compatibility, previous" + elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." + elog "Users can get the old behavior simply by adding --autounmask to the" + elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" + elog "change, see https://bugs.gentoo.org/658648." + fi +} + +pkg_postinst() { + # Warn about obsolete "enotice" script, bug #867010 + local bashrc=${EROOT}/etc/portage/profile/profile.bashrc + if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then + eerror "Obsolete 'enotice' script detected!" + eerror "Please remove this from ${bashrc} to avoid problems." + eerror "See bug 867010 for more details." + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild index d25ac103a8..07b36de0ea 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-9999.ebuild @@ -3,36 +3,51 @@ EAPI=7 -PYTHON_COMPAT=( pypy3 python3_{9..11} ) +DISTUTILS_EXT=1 +PYTHON_COMPAT=( pypy3 python3_{10..12} ) PYTHON_REQ_USE='bzip2(+),threads(+)' +SETUPTOOLS_USE_DISTUTILS=local TMPFILES_OPTIONAL=1 -inherit distutils-r1 git-r3 linux-info toolchain-funcs tmpfiles prefix +inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix DESCRIPTION="The package management and distribution system for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" -EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git - https://github.com/gentoo/portage.git" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/portage.git + https://github.com/gentoo/portage.git + " + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi LICENSE="GPL-2" -KEYWORDS="" SLOT="0" IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" RESTRICT="!test? ( test )" BDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-vcs/git ) " DEPEND=" - !build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + !build? ( $(python_gen_impl_dep 'ssl(+)') ) apidoc? ( dev-python/sphinx[${PYTHON_USEDEP}] dev-python/sphinx-epytext[${PYTHON_USEDEP}] - )" + ) + doc? ( + app-text/xmlto + ~app-text/docbook-xml-dtd-4.4 + ) +" # Require sandbox-2.2 for bug #288863. # For whirlpool hash, require python[ssl] (bug #425046). # For compgen, require bash[readline] (bug #445576). @@ -66,7 +81,10 @@ RDEPEND=" !=sys-apps/file-5.44-r3 ) " -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# NOTE: FEATURES=installsources requires debugedit and rsync + +distutils_enable_tests pytest pkg_pretend() { local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" @@ -90,6 +108,10 @@ pkg_pretend() { python_prepare_all() { distutils-r1_python_prepare_all + if [[ ${PV} != 9999 ]] ; then + sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die + fi + if use gentoo-dev; then einfo "Disabling --dynamic-deps by default for gentoo-dev..." sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ @@ -176,10 +198,6 @@ python_compile_all() { fi } -python_test() { - esetup.py test -} - python_install() { # Install sbin scripts to bindir for python-exec linking # they will be relocated in pkg_preinst() @@ -255,6 +273,16 @@ pkg_preinst() { if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} fi + + if has_version "<${CATEGORY}/${PN}-2.3.77"; then + elog "The emerge --autounmask option is now disabled by default, except for" + elog "portions of behavior which are controlled by the --autounmask-use and" + elog "--autounmask-license options. For backward compatibility, previous" + elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." + elog "Users can get the old behavior simply by adding --autounmask to the" + elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" + elog "change, see https://bugs.gentoo.org/658648." + fi } pkg_postinst() { From 301703b2d02797e70220730f44f9c29b25949ff8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:51 +0000 Subject: [PATCH 153/202] sys-apps/texinfo: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/sys-apps/texinfo/texinfo-6.8.ebuild | 2 +- .../portage-stable/sys-apps/texinfo/texinfo-7.0.2.ebuild | 2 +- .../portage-stable/sys-apps/texinfo/texinfo-7.0.3.ebuild | 2 +- .../portage-stable/sys-apps/texinfo/texinfo-9999.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-6.8.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-6.8.ebuild index d59c5ec09d..06b1d77879 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-6.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-6.8.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.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 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls +standalone static" RDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.2.ebuild index 06b2df7c35..fcb9ea093d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.2.ebuild @@ -25,7 +25,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then REGEN_BDEPEND="" else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" REGEN_BDEPEND="" fi diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.3.ebuild index 06b2df7c35..fcb9ea093d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.3.ebuild @@ -25,7 +25,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then REGEN_BDEPEND="" else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" REGEN_BDEPEND="" fi diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-9999.ebuild index d7dc966352..6f76f5ea1a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-9999.ebuild @@ -25,7 +25,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then REGEN_BDEPEND="" else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" REGEN_BDEPEND="" fi From bbe7819e2c426563952418c050bd5a302dfffb40 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:51 +0000 Subject: [PATCH 154/202] sys-devel/autoconf: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/sys-devel/autoconf/autoconf-2.13-r2.ebuild | 2 +- .../portage-stable/sys-devel/autoconf/autoconf-2.13-r7.ebuild | 2 +- .../portage-stable/sys-devel/autoconf/autoconf-2.13-r8.ebuild | 2 +- .../portage-stable/sys-devel/autoconf/autoconf-2.69-r5.ebuild | 2 +- .../portage-stable/sys-devel/autoconf/autoconf-2.69-r8.ebuild | 2 +- .../portage-stable/sys-devel/autoconf/autoconf-2.69-r9.ebuild | 2 +- .../portage-stable/sys-devel/autoconf/autoconf-2.71-r1.ebuild | 2 +- .../portage-stable/sys-devel/autoconf/autoconf-2.71-r5.ebuild | 2 +- .../portage-stable/sys-devel/autoconf/autoconf-2.71-r6.ebuild | 2 +- .../portage-stable/sys-devel/autoconf/autoconf-2.72c-r2.ebuild | 2 +- .../portage-stable/sys-devel/autoconf/autoconf-9999.ebuild | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r2.ebuild index 13d40bfc3b..f71a4f702f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="${PV:0:3}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r7.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r7.ebuild index 329c1c8f21..0c634973f3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r7.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r7.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="${PV:0:3}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r8.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r8.ebuild index 62ed54ebb3..5abbe2fc96 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r8.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r8.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="${PV:0:3}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r5.ebuild index e02fb6d1a4..7928a63bb5 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r5.ebuild @@ -10,7 +10,7 @@ else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi inherit toolchain-autoconf diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r8.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r8.ebuild index 9e5ec38c9e..f222672bb8 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r8.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r8.ebuild @@ -10,7 +10,7 @@ else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi inherit toolchain-autoconf diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r9.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r9.ebuild index 28d9f0aeb7..b6d9cc4763 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r9.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r9.ebuild @@ -10,7 +10,7 @@ else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi inherit toolchain-autoconf diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r1.ebuild index 52bd67aaf1..fa90d993df 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r1.ebuild @@ -16,7 +16,7 @@ else #SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz" if ! [[ ${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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}"/${MY_P} fi diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r5.ebuild index 2928d09530..0f44081849 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r5.ebuild @@ -16,7 +16,7 @@ else #SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz" if ! [[ ${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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}"/${MY_P} fi diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r6.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r6.ebuild index 9b4834ded4..ded609d7ef 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r6.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r6.ebuild @@ -16,7 +16,7 @@ else #SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz" if ! [[ ${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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi S="${WORKDIR}"/${MY_P} fi diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.72c-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.72c-r2.ebuild index 6e0f2d9782..b4a4e1ccac 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.72c-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.72c-r2.ebuild @@ -20,7 +20,7 @@ else S="${WORKDIR}"/${MY_P} if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi fi diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-9999.ebuild index 6e0f2d9782..b4a4e1ccac 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-9999.ebuild @@ -20,7 +20,7 @@ else S="${WORKDIR}"/${MY_P} if [[ ${PV} != *_beta* ]] && ! [[ $(ver_cut 3) =~ [a-z] ]] ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi fi From 582abff9d9ef1815a6c14307dabc371b4ce438ec Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:51 +0000 Subject: [PATCH 155/202] sys-devel/autoconf-archive: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../autoconf-archive/autoconf-archive-2022.09.03.ebuild | 2 +- .../autoconf-archive/autoconf-archive-2023.02.20.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/autoconf-archive-2022.09.03.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/autoconf-archive-2022.09.03.ebuild index 0dde6e5071..332c779840 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/autoconf-archive-2022.09.03.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/autoconf-archive-2022.09.03.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.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 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # File collisions, bug #540246 RDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/autoconf-archive-2023.02.20.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/autoconf-archive-2023.02.20.ebuild index 0dde6e5071..332c779840 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/autoconf-archive-2023.02.20.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/autoconf-archive-2023.02.20.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.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 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" # File collisions, bug #540246 RDEPEND=" From d3f084394ff47b6a6015508c1194a0a03abd83f9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:52 +0000 Subject: [PATCH 156/202] sys-devel/autoconf-wrapper: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild | 2 +- .../sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild | 2 +- .../sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild index 13083e61b2..91dc592846 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild @@ -18,7 +18,7 @@ else SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild index 05e0aa1e33..b5b2431a9c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild @@ -18,7 +18,7 @@ else SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild index 13083e61b2..91dc592846 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild @@ -18,7 +18,7 @@ else SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" From e5cc55c22f28ae154514091522cb0aef1c9c646d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:52 +0000 Subject: [PATCH 157/202] sys-devel/automake: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/sys-devel/automake/automake-1.16.5-r1.ebuild | 2 +- .../portage-stable/sys-devel/automake/automake-1.16.5.ebuild | 2 +- .../portage-stable/sys-devel/automake/automake-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5-r1.ebuild index 83b0895104..23a2236bae 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5-r1.ebuild @@ -15,7 +15,7 @@ else MY_P="${P}" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" MY_P="${PN}-${MY_PV}" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild index a34de1b10e..779a853293 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5.ebuild @@ -15,7 +15,7 @@ else MY_P="${P}" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" MY_P="${PN}-${MY_PV}" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild index 6f862323cd..571985fea6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild @@ -15,7 +15,7 @@ else MY_P="${P}" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" MY_P="${PN}-${MY_PV}" From 8bde2ebf0f12d4458dc23b3d90afdcbb2667b277 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:52 +0000 Subject: [PATCH 158/202] sys-devel/automake-wrapper: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild | 2 +- .../sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild index 96ca449620..3d3779ad5b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild @@ -18,7 +18,7 @@ else SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild index 773a983125..aa02b4b706 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild @@ -18,7 +18,7 @@ else SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" From 985457a9ab00315310c251c26e20a95c1f4d8f41 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:52 +0000 Subject: [PATCH 159/202] sys-devel/bc: Sync with Gentoo It's from Gentoo commit 42f6d680607e22decef310862393774569c65044. --- .../third_party/portage-stable/sys-devel/bc/bc-1.07.1-r6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r6.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r6.ebuild index 0d884fd7d2..b3c954931a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r6.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/bc/bc-1.07.1-r6.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/bc/${P}.tar.gz" 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="libedit readline static" RDEPEND=" From d82d112d3847554549d1c424f3473feadb4bfc68 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:53 +0000 Subject: [PATCH 160/202] sys-devel/bison: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/sys-devel/bison/bison-3.8.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/bison/bison-3.8.2-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/bison/bison-3.8.2-r2.ebuild index 85df0c845d..63065fc320 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/bison/bison-3.8.2-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/bison/bison-3.8.2-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${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 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="examples nls static test" RESTRICT="!test? ( test )" From d94a57e9b7e0dba365aa59d1328d6a980677f576 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:54 +0000 Subject: [PATCH 161/202] sys-devel/crossdev: Sync with Gentoo It's from Gentoo commit e5eda33c1fe41d7dc6ed09e058fe5633d8b3c1fb. --- .../portage-stable/sys-devel/crossdev/crossdev-20230321.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230321.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230321.ebuild index d15bf1ee50..5ed47e49cf 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230321.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230321.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="Gentoo Cross-toolchain generator" From e6bbc4472dddac55acdd4f91011809de64ced208 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:54 +0000 Subject: [PATCH 162/202] sys-devel/flex: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/sys-devel/flex/flex-2.6.4-r5.ebuild | 2 +- .../portage-stable/sys-devel/flex/flex-2.6.4-r6.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/flex/flex-2.6.4-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/flex/flex-2.6.4-r5.ebuild index 23c53fb10d..8ddca7e3c8 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/flex/flex-2.6.4-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/flex/flex-2.6.4-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool LICENSE="FLEX" SLOT="0" -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 ~amd64-linux ~x86-linux -arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls static test" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/flex/flex-2.6.4-r6.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/flex/flex-2.6.4-r6.ebuild index 13439fb486..fd91a0206e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/flex/flex-2.6.4-r6.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/flex/flex-2.6.4-r6.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool LICENSE="FLEX" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls static test" RESTRICT="!test? ( test )" From b263747910c1405ae4b06a332d735d690bd44e25 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:54 +0000 Subject: [PATCH 163/202] sys-devel/gcc: Sync with Gentoo It's from Gentoo commit 88b98060a1b9033d899b31ef8e2a19224daa040d. --- .../portage-stable/sys-devel/gcc/Manifest | 25 +++---- .../gcc/files/gcc-12.3-ccache-ICE.patch | 67 ------------------- .../sys-devel/gcc/gcc-10.4.1_p20230510.ebuild | 58 ---------------- ...503.ebuild => gcc-10.4.1_p20230531.ebuild} | 2 +- .../sys-devel/gcc/gcc-10.5.9999.ebuild | 27 +++++--- .../sys-devel/gcc/gcc-11.3.1_p20230511.ebuild | 54 --------------- ...3.1_p20230518.ebuild => gcc-11.4.0.ebuild} | 0 ...504.ebuild => gcc-11.4.1_p20230601.ebuild} | 0 .../sys-devel/gcc/gcc-11.4.9999.ebuild | 52 -------------- ...re20230521.ebuild => gcc-11.5.9999.ebuild} | 26 ++++--- .../gcc/gcc-12.3.1_p20230512-r1.ebuild | 57 ---------------- ...519.ebuild => gcc-12.3.1_p20230526.ebuild} | 0 ...512.ebuild => gcc-12.3.1_p20230602.ebuild} | 0 .../sys-devel/gcc/gcc-12.4.9999.ebuild | 22 +++--- .../sys-devel/gcc/gcc-13.1.0-r1.ebuild | 62 ----------------- .../sys-devel/gcc/gcc-13.1.1_p20230520.ebuild | 2 +- ...513.ebuild => gcc-13.1.1_p20230527.ebuild} | 2 +- ...506.ebuild => gcc-13.1.1_p20230603.ebuild} | 2 +- .../sys-devel/gcc/gcc-13.2.9999.ebuild | 22 +++--- .../sys-devel/gcc/gcc-14.0.0.9999.ebuild | 19 +++--- ...4.ebuild => gcc-14.0.0_pre20230529.ebuild} | 21 +++--- ...7.ebuild => gcc-14.0.0_pre20230604.ebuild} | 21 +++--- 22 files changed, 100 insertions(+), 441 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/files/gcc-12.3-ccache-ICE.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230510.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-10.4.1_p20230503.ebuild => gcc-10.4.1_p20230531.ebuild} (93%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230511.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-11.3.1_p20230518.ebuild => gcc-11.4.0.ebuild} (100%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-11.3.1_p20230504.ebuild => gcc-11.4.1_p20230601.ebuild} (100%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.9999.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-14.0.0_pre20230521.ebuild => gcc-11.5.9999.ebuild} (72%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20230512-r1.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-12.3.1_p20230519.ebuild => gcc-12.3.1_p20230526.ebuild} (100%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-12.3.1_p20230512.ebuild => gcc-12.3.1_p20230602.ebuild} (100%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.0-r1.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-13.1.1_p20230513.ebuild => gcc-13.1.1_p20230527.ebuild} (99%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-13.1.1_p20230506.ebuild => gcc-13.1.1_p20230603.ebuild} (99%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-14.0.0_pre20230514.ebuild => gcc-14.0.0_pre20230529.ebuild} (76%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-14.0.0_pre20230507.ebuild => gcc-14.0.0_pre20230604.ebuild} (76%) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest index 9a933fea44..9a80ba7be7 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest @@ -1,32 +1,27 @@ DIST gcc-10-20230426.tar.xz 72118868 BLAKE2B d87cfd78d96585877abc20ed213e4d2fba36556279a5bce5d185de34a59f8cde1250d7322543533922ef224ac8508c1d3fe597c652a648e6e7f08bc19cb2f11c SHA512 805fbb840e6bd8cdd53f954b13c768c0ea0635c099094f6f0b0b04f00120dcde7cf3950a01e199d674b39ff764e9119a548b2f7a156ab2b5d598bd68ed56ce24 -DIST gcc-10-20230503.tar.xz 72130916 BLAKE2B f0dd2c3afd7c59061672f2d0a6291a8c4ba97060199e3a590a2077af69daf269610008e3ce85a00231a8392fd8f53b4c75ec4ec0e0feb360600705b8e88e41fc SHA512 ed3dbadc6445b5db699309a9f5bd047454d863135a1a3c2e379a7f51bfbf0f49dd176239ccb312e9dd0f7e93be35862867b85d761db2ca6943ae08cd2b0503ed -DIST gcc-10-20230510.tar.xz 72137544 BLAKE2B 8f0c4cf89e03e7c7589ae67875c35933837f71da5526b2f38c71d557dbb113849d3e66e8f6d03cfc51ab0d047b4e7cf066301ad8805a8c0797a379feefc4f6dd SHA512 b83cc9a8939a5d4d5cf44ff49d082bd66d8f0e4059a25279fa9fe8e458d0c8fc17a9718188821d64e7afcc47000310f8578e00f18d86079abd6b551a8b75fe42 DIST gcc-10-20230517.tar.xz 72135000 BLAKE2B 8ec87088ace2bf7cc355357b8c9b12e61646366ee1204a360f3be0dcc8b7d426ba5fbb7eb46b4da4c937f5b63d2181a3935f2894f40556f1472dd2a91197b38e SHA512 ae685e1e3fc3460ea49bd86b2b583ef97c71ed279cce6f06b293bd9c7f7ac5ae477b2f2057c4ed927114249e41f6f7978f13db678cd92935dc1250bdd11c94c5 +DIST gcc-10-20230531.tar.xz 72141512 BLAKE2B 266073f3d5baa50aad8dc9dacb859a355ddcbe0295e0fd1f99d7ae3847b495bb96e5eb06b5dac9d4ba1a16325fc90724720992d7f5e90e4081fff754a3f8219e SHA512 19d81824624da4555e567ab8f5a1f1a3f9eac0a8360d27a402b45554cd9b1a644f37e0354df8ba4f8dcc2ac493e149f0fda3de4249457158db267afcfc81a87c DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d SHA512 86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5 DIST gcc-10.5.0-patches-6.tar.xz 18208 BLAKE2B 4cac3340108fb378c76ad62b728429f3c97f348d178744e7536575f3576ca8aa682b878b7df3b1c162dccae64a3cb56c66d8d60eae323e1ece2de4278084fdbd SHA512 9d6c84325fbc118cee01347468ce729c278e5b026b16da945fe54050726e26f86a46ee7b71a01a47cf927b70bfcce459c49a6bc4fb93dcfaa047c76d4c5bc5bc DIST gcc-11-20230427.tar.xz 76165128 BLAKE2B dd896b418c1fce35a61005d5b5c90cfd1246d37d23c2a8fc08bacd7d7ca84c353f3ccf5de2370ae5e5ca95c7ae3deab3565b3f65eb78b611dbe5ad4a256516f0 SHA512 fada917a832be5d2e15ee32f24e19fc87b851dc8e6fc75d1be6d25d3510dba408ae3ef3b245ff239c51aa3d243c95f12269695611e5c8965ba55f5aa4730778d -DIST gcc-11-20230504.tar.xz 76185732 BLAKE2B d8bc17e7a38078e2ffe918ba70ba7ec53aada1c604b6cefc54c577f965d46634de1a94b985cb3fd8417f12217b29a67e1ff2c10c342eca85a3185ad2a4e0373c SHA512 e5c423a6049b11b8f1de776b861bd2eb86d1ce939a14c7bbe6244ee74ace2b3cf079135a846f71706f5996172d0e1e0695420938e18d990140d19bcc28dd10b5 -DIST gcc-11-20230511.tar.xz 76188960 BLAKE2B 9241ea149cfd7ebabed4e255fd60924a4759c2e4c13edf2e84e7f2c129af6740eb9a22a353e14a05c4302b3e75df2a165a6ec23adc40247aa47f483173d36e64 SHA512 c265ad11858138c63eb7379abd625b126b6d21fe69c64429b4401dbc8ed625a5e5ba0ecf96da36b497121e0d613b11abee0a97b90a8a56bf240bf142f749852e -DIST gcc-11-20230518.tar.xz 76192980 BLAKE2B 8397a32e6f5800b3ed7be3d7f4afd03511ecd39e93b210a73d59a9a6bf9a7daf8e20524842a661597727df16548fba1a650884d7a4518d647387cd48825116de SHA512 5259726703a8769e0a170dffdb84ce605ac43289b13a9b2cbb95fa19a9abc37859176e5184ca8958e209991ebe4eb9e3ce2fe22f66c7cec1d434a630a68d50c3 +DIST gcc-11-20230601.tar.xz 76183336 BLAKE2B 90fc8d803463a3c34a27aaa05c6ab28ce2478d8e10929b61a18e3055778d65f22ac8a53f8d6c5632ef6aabaabec9aefb95a10157f51f85b3afd6f401bbad4edc SHA512 715f226178182c9c28703b26378784dd38f7a90aee74d0b01fcc24d867a39e36765178a7c08d6ffa4ff8fa45952092002441ddd7426bbdd306b4af11cf25e3e7 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c DIST gcc-11.4.0-patches-10.tar.xz 13852 BLAKE2B 54937d13e30e2a5303c7e197fae09eeed35ca0b9783625e02578fcee829b5503fb22d664366322b304df7d01ae807d00af7c93db3e3ceebe4851e15647724f87 SHA512 31b4d7a2e7cc589e92e12c3583d13d41c523cafbd309bc0532df9b68ea2473c89daef4c0edd3ce2917b5823d81a7792f145b9449f16277d0d64c22ceff50bbb9 DIST gcc-11.4.0-patches-9.tar.xz 14704 BLAKE2B 9aa2ecbac493d3040694e9930738e57d59a764b90ab92b91709c319b883f28ad108767e5d11e8b62af40bf1e583d5ff83a03e8c895f904bc6f41315ce9ab4f0a SHA512 ac8b7c6c382ffacc4e9d08299440fc237fa366ec36fb8eb7a8d426b64a4186384a262e6380dc83ed7f7240125ce26a8435c8a4e0e13976ef2652067a7129bd17 +DIST gcc-11.4.0.tar.xz 79837032 BLAKE2B 6e3b095a5837d4b5512719f848f4b9c4b4a6d7dc40ba96b269023ea5ea84f632c42a13855c030e255f3265445a45e6d2648dfe0e2cc0ea47da87c4660b052e24 SHA512 a5018bf1f1fa25ddf33f46e720675d261987763db48e7a5fdf4c26d3150a8abcb82fdc413402df1c32f2e6b057d9bae6bdfa026defc4030e10144a8532e60f14 DIST gcc-12-20230428.tar.xz 79744932 BLAKE2B f9d0000cdd2f1b0af79f281851b3b0fe0ac50f14468844e1ee596f8ed1ccf33f55c7617464d88df7e4b3435d58fedecf640592e0661fd1be9ba163acd26dae68 SHA512 992f9cd71f9910efea401048540ba2b43360170f76ce992cf356b1ab383240f481e29c5b0ad32fa4efb2bdbb397477506cb83a825268cfbdd2cde7044d43c758 -DIST gcc-12-20230512.tar.xz 79749352 BLAKE2B a2dd7c780d2adf1915cb01f6835d6f95242376d9d7c14ec0fea8e905858f0ce20b90dd3f47fef983b9d1a6f519f0c3d4cfa41d887f477454378a12407e9aaeb8 SHA512 3bf04b2489b0b0d062f8e8e66c31622fe7aa6ef6c9ba7d51f387eae714a813a089594cebdb046fa04e53da24a9788879711eedb054c3a37721035386b94ff0f0 -DIST gcc-12-20230519.tar.xz 79757700 BLAKE2B 81c18adedc9f0eae729a72814a47ae496c9ae78f13e9cf2f442b3ea09c577e84e3261a6004d1634125bbc77c39298328a0879eea1dab26966b85f9f10887f114 SHA512 cd24ad69a6c47a95384d8fd4fcb7e895f8fb4d8e0c4b74d1300943fa8198624e3c40b0bd7702cb78f40849a09b5069e50e36bc191bd206b36c956ca25126ee02 +DIST gcc-12-20230526.tar.xz 79780444 BLAKE2B 6f6eca272ab506e16a231003c399e28572595c82fbaaec9deb14b78ff9fc493fb24afe1c375d4f2fd75e9813805934857ef2ceb6c05b7977dbfe2e50abdc3ec9 SHA512 fb190ce5bf3d38a1899016475c1551550d44c6f71f1f1a71ced545cbb2aff0446bd2765230b0920379579a13103a507ffc1e197ac69afb0a4f08efe11b50918d +DIST gcc-12-20230602.tar.xz 79776104 BLAKE2B dfb484937f71c9b10e6674968db67f131c8009b04f5bdce215776d061989924fca2bebd8193a507a714fa204aac7b02f111ee303446bb8fd08f06c8226d206df SHA512 b7fa625657c911f56a617aeccdb161b319b3d515704d16795fd577c9fe1e9b915039fe542681be9b733d21908cd57553317a0d6ecdbdf42964191b3ce11286c2 DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B c7bf65f7c9ea8023ddaac821ee2b778622fa310ac72a72b2f7032494a8f304eac86217f9204622e6c21aaef9952bece0d09bc126facd4f42b602927909815ab5 SHA512 babc279fea2c1fd4c018815f2f5630214fd46015ce9f365c28af242681d51818eaca30ce298eddcab1eed5ac5f2759e2b47b2335afab9d722b4469a6d4fec326 DIST gcc-12.3.0-patches-2.tar.xz 14236 BLAKE2B 06c43662c9abb0fa3cf90d5e2273c69aecb9158e6cf6f23c04754ed5d686be2616e81e2502eb16f4298ddd50518ca7677e13249da9e9b091162d3931ff65e4fe SHA512 b0d4b85dbf1a54aaaa1997203b872e3106906b4ad49cde57e1428bc22b2f8e2d73b8cb10ae0d0b792aebaf664594da4d1dea04c44ddc34e59047410766db04d1 DIST gcc-12.3.0.tar.xz 85491976 BLAKE2B a239749089e284887435b9fabc360a36764be1095f4c78eeac6f056f91dd23c49dab2ebec5da32a81bcc08fe8277dd3c714ad114ad725d24317faac03354d595 SHA512 8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204 -DIST gcc-13-20230506.tar.xz 83939392 BLAKE2B 439a139f6ef4b4c3afb5d3e4db69f2a4aa24a410c7b9c6689e58b2eec6383388ebbbd8a6f7be1d5cba2aac770ec7758a8b4b6bae80c63475a3b72372d1bef283 SHA512 5255500c92a72fe066b110efb20c73da217ddaf38d726b1a8f051dd27b6a613f3b4379762cdf4310823113e9bc75a31d6d72c060b20216a2a6bcd34800a2e1e1 -DIST gcc-13-20230513.tar.xz 83957000 BLAKE2B c1d17c383b5735744952ef61fa34f0129b304cae78dbeb0e780a81ec4dbfbbc438f8546770da973155ec5f9250d36be587a8491c88d4424b1123f47ba24d52eb SHA512 a82e38d273a668e4a8ad33282cb74661d125babcc6165eb0ada5da471154b2ed2894bf1fa462f0345f9d817e733b155c09a971885f3b7c04398ebcdd3b5551f5 DIST gcc-13-20230520.tar.xz 83959400 BLAKE2B 7be5d333a2447923c547ed76bab86fb9a1206dde1ffeb8be0a2cb95f8e99910aa40479f221374aaf5bdea5dd7514b3d69347512d9cebb91dd23f585541efa43a SHA512 d6c8626822855f71cc58b6b36ebb38092aaf12fa9aa40b8d70fb3edc9f4c614fbf47626ea5cc1ec631bc47b5d64911bfdb7cfc6924f27a54016b1f8c9c7588d7 -DIST gcc-13.1.0.tar.xz 87451196 BLAKE2B b956a773cffe8b43bd6c9a99fe614f53f665438925a6b320975d301f547923e45d4d6fa577a143467fb03e0a9c1bab2b6719a1011d672367f3e644433a2d7606 SHA512 6cf06dfc48f57f5e67f7efe3248019329a14d690c728d9f2f7ef5fa0d58f1816f309586ba7ea2eac20d0b60a2d1b701f68392e9067dd46f827ba0efd7192db33 +DIST gcc-13-20230527.tar.xz 83956360 BLAKE2B 86a2131b88144817673a6300c73b29c2dbb8559a7057609601029aaf60aeb4c4926fa4b99c4e1768726cde09f994159685768b62b3ca73d7b606847788301e82 SHA512 87566c74258f9981742eae77f552361c220f79fa6f17c36d5b5a9e73f41c50d8a2cab16b9ffb17f07829005f0d42b4b1d524150d3dcba9710091532cbfad7152 +DIST gcc-13-20230603.tar.xz 83954444 BLAKE2B 4be067c2159ae2a8ef3d699acab981cb911668bb0af84693b0226f58688146b0f93324296c584c6dca6df839ba344cff927cc82d20fce8c6b2282b256d745141 SHA512 ca1b41df7bf18c65189116099afcb43f65e13b17e57bf52049e739af223d51c3b825e2f80e239a3ddceec07693c991a85ec58ab6855255802d8bd413ff4324cf DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69 -DIST gcc-13.2.0-patches-1.tar.xz 15792 BLAKE2B 2ffa9ac013c0f9a91eb93e87e3bc6c378d02cca32ad3f8a84d1249e257eb02b206ec10fa425738a4bae2ffb7db8506afcee2a8dd855357e4b48636608aa24e50 SHA512 917ea178f3696724f9ec08aebb6976f03c5edf8ee21bb4bad7e2d820507452f6dace6e847c4f342a52870642550f34da0346ee635a60ba0c1bff667e0e31d195 -DIST gcc-13.2.0-patches-2.tar.xz 12392 BLAKE2B 40ca4c230166e39d237e4b939669e51b991f58d0e1787c43f2bf468447de478604d28b6e9b20f5991bd01b9efad4860b30567c8df5d823cf6fc47678f9e6b672 SHA512 d00f559b2d6ad98f97a9328d2ce1593553fff727033690dfc13f520775e977b674fe14cc1ec7ab52b246e091a055812eaf4f93306145a4d2ad87a55707a3717b -DIST gcc-14-20230507.tar.xz 84069364 BLAKE2B 579df5cf4b0d16aa29248259e235dd7c05454c8c5b999928cbf200d52997e0615391e06308e9e0a72f7a1f1903cb86305137eceb97cd8ddd0cf40b4a21a05a86 SHA512 1598b9565bc9554e91d5be2b58d8c0861b72e97b79aa952c084ae4731c0cd1ca37d107a70b6a26235bf59322c1f4de435389906b4fe6f29b6e65e1b566aff5ea -DIST gcc-14-20230514.tar.xz 84081088 BLAKE2B e385298bac832374a4773bb4a30fa42f66262378417ce3850c62d69300c76e7a9feae8fb51285edabd9ffed423ac4b688c52bc18d76aa700f255e951ca60f237 SHA512 839a7fbe1210f54b0bcb26e10f9ac26d262924f8d19eef62e33a8bc066c00a549a0b49cff088f5e23656c66f26a28c0721e376cfdd97a54f6a9b2ba3680f5e01 -DIST gcc-14-20230521.tar.xz 84139108 BLAKE2B 5db3844cfa92f2462871581e8d33b3f70d94fa9ddf203055e83c03fdeb60145dcedd1e8d6d2040bc56cdf6213b530a835da3c7b0766fbd538d2f690f5a74ff70 SHA512 8cc629c3f847c34ed35ca84d020a3d7a98ca5e29d15a3073cbfe303ec6c47ef938581283826773fa41268fda77fe723ce1669c4e31e5b2b0f5569d5782c0ebb2 +DIST gcc-13.2.0-patches-3.tar.xz 30956 BLAKE2B 29ce043b46645640ca1e983397af3e158588ad87575f0bc59451ea4a7dd5e3bb5b190ed031de6a22cd790d423ba111e95d222187dd09985dceb12db9f0a2d907 SHA512 4ffecae7be320124ad0c4e71e39e142b7aa8db0e70b5f486f491d7a33ea31efc6464c6abeea77df02a8bd5cf81f08225d625c8af5c27f9afa32c0d7d989f7a3c +DIST gcc-14-20230529.tar.xz 84197648 BLAKE2B 1b8b812866294bafd7bf53c823b3d55288d5a30c54e921495d19286b9d04a1bf7c5228b052941200ecc61a516355d977229fc9e60cfe4353154811c1261054ab SHA512 bba930dc4b6b6a45bb5f33e4b46dc16d1d581b266078c5492833e2b4e64a93d2d19389a436c64dc2159240b07134f4f7242bef3cf35f303d34e10bf493fe70ba +DIST gcc-14-20230604.tar.xz 84243704 BLAKE2B 72be938f47fb4e2a4e9553f0a5190caaaccafedae6054634d1bfeb14a39e809d678578358d5a0b7c024b9b07b564eb4139fc0bcf1740d87e4954250c97cd3959 SHA512 75a48f751bff9a74a7eca85070423d69e9ddcc23306e7fa107c0b90fb86e720c952422ff48ac81dfa66df5a08f428b8087c6e20c58cc04d24d3300f1dcd9a140 DIST gcc-14.0.0-musl-patches-1.tar.xz 3576 BLAKE2B 692baee8a7709905d53aeb150d73a3721c4ba47ee5f397cfb1b5be905cf003ca02b60c94ee294d90ac39645cd5cdf186c7a3aa950c47d8cf680c128ed705b807 SHA512 0592ab98a7142e404623a6511c67dff61e9ade32c3fb2c0e75b456306e0af3799ad13252b50b3d2fdd31e5815d7f0b16b0ad63ab8386fe4d78729fc9c182d617 DIST gcc-14.0.0-patches-1.tar.xz 11612 BLAKE2B a3b0f3952cf7a6fb095817f4727ccb5cff24607a5c2bb67d280da4651177132ddcf398243998271c509ccaf3445d4843ff691a12d5c394dad8d9c70fc4a8120d SHA512 66701c2e4fd1a031ffcb353a3a9cd1fe25d3d62167065523097e41a3e48adf4218ecf08e382e3ea22014c561ba3a15681650c5538cda91d38c69cbbf04503a74 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/files/gcc-12.3-ccache-ICE.patch b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/files/gcc-12.3-ccache-ICE.patch deleted file mode 100644 index 9a170f5db7..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/files/gcc-12.3-ccache-ICE.patch +++ /dev/null @@ -1,67 +0,0 @@ -https://bugs.gentoo.org/906310 -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109850 -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109241 - -https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=396a4e76afec30d2461638f569cae18955eb4ad2 - -From 396a4e76afec30d2461638f569cae18955eb4ad2 Mon Sep 17 00:00:00 2001 -From: Jason Merrill -Date: Wed, 22 Mar 2023 16:11:47 -0400 -Subject: [PATCH] c++: local class in nested generic lambda [PR109241] - -In this testcase, the tree walk to look for bare parameter packs was -confused by finding a type with no TREE_BINFO. But it should be fine that -it's unset; we already checked for unexpanded packs at parse time. - -I also tried doing the partial instantiation of the local class, which is -probably the long-term direction we want to go, but for stage 4 let's go -with this safer change. - - PR c++/109241 - -gcc/cp/ChangeLog: - - * pt.cc (find_parameter_packs_r): Handle null TREE_BINFO. - -gcc/testsuite/ChangeLog: - - * g++.dg/cpp1y/lambda-generic-local-class2.C: New test. ---- a/gcc/cp/pt.cc -+++ b/gcc/cp/pt.cc -@@ -4106,10 +4106,14 @@ find_parameter_packs_r (tree *tp, int *walk_subtrees, void* data) - case TAG_DEFN: - t = TREE_TYPE (t); - if (CLASS_TYPE_P (t)) -- /* Local class, need to look through the whole definition. */ -- for (tree bb : BINFO_BASE_BINFOS (TYPE_BINFO (t))) -- cp_walk_tree (&BINFO_TYPE (bb), &find_parameter_packs_r, -- ppd, ppd->visited); -+ { -+ /* Local class, need to look through the whole definition. -+ TYPE_BINFO might be unset for a partial instantiation. */ -+ if (TYPE_BINFO (t)) -+ for (tree bb : BINFO_BASE_BINFOS (TYPE_BINFO (t))) -+ cp_walk_tree (&BINFO_TYPE (bb), &find_parameter_packs_r, -+ ppd, ppd->visited); -+ } - else - /* Enum, look at the values. */ - for (tree l = TYPE_VALUES (t); l; l = TREE_CHAIN (l)) ---- /dev/null -+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-local-class2.C -@@ -0,0 +1,13 @@ -+// PR c++/109241 -+// { dg-do compile { target c++14 } } -+// { dg-options "" } no pedantic -+ -+void g() { -+ [](auto) { -+ [](auto) { -+ ({ -+ struct A {}; -+ }); -+ }; -+ }(1); -+} --- -2.31.1 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230510.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230510.ebuild deleted file mode 100644 index 878de0807e..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230510.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_SUFFIX="xz" -TOOLCHAIN_PATCH_DEV="sam" -#TOOLCHAIN_GCC_RC=1 -PATCH_GCC_VER="10.5.0" -PATCH_VER="6" -MUSL_VER="2" -MUSL_GCC_VER="10.5.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) -elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then - # Cheesy hack for RCs - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" - TOOLCHAIN_SET_S=no - S="${WORKDIR}"/${MY_P} -fi - -inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -#fi - -RDEPEND="" -BDEPEND="${CATEGORY}/binutils" - -src_prepare() { - local p upstreamed_patches=( - # add them here - ) - for p in "${upstreamed_patches[@]}"; do - rm -v "${WORKDIR}/patch/${p}" || die - done - - if has_version '>=sys-libs/glibc-2.32-r1'; then - rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die - fi - - toolchain_src_prepare -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230503.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230531.ebuild similarity index 93% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230503.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230531.ebuild index 878de0807e..b3e373b6fb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230503.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230531.ebuild @@ -36,7 +36,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds #if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" #fi RDEPEND="" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.5.9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.5.9999.ebuild index 6cba90ba4e..d0bbc411ef 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.5.9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.5.9999.ebuild @@ -1,31 +1,40 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -TOOLCHAIN_PATCH_SUFFIX="xz" TOOLCHAIN_PATCH_DEV="sam" PATCH_GCC_VER="10.5.0" MUSL_GCC_VER="10.5.0" -if [[ $(ver_cut 3) == 9999 ]] ; then +if [[ ${PV} == *.9999 ]] ; then MY_PV_2=$(ver_cut 2) + MY_PV_3=1 if [[ ${MY_PV_2} == 0 ]] ; then MY_PV_2=0 + MY_PV_3=0 else - MY_PV_2=$(($(ver_cut 2) - 1)) + MY_PV_2=$((${MY_PV_2} - 1)) fi # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} +elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then + # Cheesy hack for RCs + MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) + MY_P=${PN}-${MY_PV} + GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" + TOOLCHAIN_SET_S=no + S="${WORKDIR}"/${MY_P} fi inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +if tc_is_live ; then + # Needs to be after inherit (for now?), bug #830908 + EGIT_BRANCH=releases/gcc-$(ver_cut 1) +elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + # Don't keyword live ebuilds KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230511.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230511.ebuild deleted file mode 100644 index 9b57b16f07..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230511.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_SUFFIX="xz" -TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="10" -PATCH_GCC_VER="11.4.0" -MUSL_VER="2" -MUSL_GCC_VER="11.4.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) -fi - -inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi - -if [[ ${CATEGORY} != cross-* ]] ; then - # Technically only if USE=hardened *too* right now, but no point in complicating it further. - # If GCC is enabling CET by default, we need glibc to be built with support for it. - # bug #830454 - RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" - DEPEND="${RDEPEND}" - BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" -fi - -src_prepare() { - local p upstreamed_patches=( - # add them here - ) - for p in "${upstreamed_patches[@]}"; do - rm -v "${WORKDIR}/patch/${p}" || die - done - - toolchain_src_prepare - - eapply_user -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230518.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.0.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230518.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230504.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20230601.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230504.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20230601.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.9999.ebuild deleted file mode 100644 index f693ec8158..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.9999.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -TOOLCHAIN_PATCH_SUFFIX="xz" -TOOLCHAIN_PATCH_DEV="sam" -PATCH_GCC_VER="11.4.0" -MUSL_GCC_VER="11.4.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) -fi - -inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -if [[ ${CATEGORY} != cross-* ]] ; then - # Technically only if USE=hardened *too* right now, but no point in complicating it further. - # If GCC is enabling CET by default, we need glibc to be built with support for it. - # bug #830454 - RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" - DEPEND="${RDEPEND}" - BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" -fi - -src_prepare() { - local p upstreamed_patches=( - # add them here - ) - for p in "${upstreamed_patches[@]}"; do - rm -v "${WORKDIR}/patch/${p}" || die - done - - toolchain_src_prepare - - eapply_user -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230521.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.5.9999.ebuild similarity index 72% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230521.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.5.9999.ebuild index 1b25d3519a..076e4cbefe 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230521.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.5.9999.ebuild @@ -4,19 +4,17 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="1" -PATCH_GCC_VER="14.0.0" -MUSL_VER="1" -MUSL_GCC_VER="14.0.0" +PATCH_GCC_VER="11.4.0" +MUSL_GCC_VER="11.4.0" -if [[ $(ver_cut 3) == 9999 ]] ; then +if [[ ${PV} == *.9999 ]] ; then MY_PV_2=$(ver_cut 2) - MY_PV_3=$(($(ver_cut 3) - 9998)) + MY_PV_3=1 if [[ ${MY_PV_2} == 0 ]] ; then MY_PV_2=0 MY_PV_3=0 else - MY_PV_2=$(($(ver_cut 2) - 1)) + MY_PV_2=$((${MY_PV_2} - 1)) fi # e.g. 12.2.9999 -> 12.1.1 @@ -32,13 +30,13 @@ fi inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -#EGIT_BRANCH=master - -# Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi +if tc_is_live ; then + # Needs to be after inherit (for now?), bug #830908 + EGIT_BRANCH=releases/gcc-$(ver_cut 1) +elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + # Don't keyword live ebuilds + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi if [[ ${CATEGORY} != cross-* ]] ; then # Technically only if USE=hardened *too* right now, but no point in complicating it further. diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20230512-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20230512-r1.ebuild deleted file mode 100644 index 922e86050a..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20230512-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="2" -PATCH_GCC_VER="12.3.0" -MUSL_VER="1" -MUSL_GCC_VER="12.3.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) -elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then - # Cheesy hack for RCs - # Sometimes the RCs are e.g. 12.3 and not 12.3.0... - #MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1)))-RC-$(ver_cut 5) - MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" - TOOLCHAIN_SET_S=no - S="${WORKDIR}"/${MY_P} -fi - -inherit toolchain - -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi - -if [[ ${CATEGORY} != cross-* ]] ; then - # Technically only if USE=hardened *too* right now, but no point in complicating it further. - # If GCC is enabling CET by default, we need glibc to be built with support for it. - # bug #830454 - RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" - DEPEND="${RDEPEND}" - BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" -fi - -src_prepare() { - toolchain_src_prepare - - eapply "${FILESDIR}"/${PN}-12.3-ccache-ICE.patch - eapply_user -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20230519.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20230526.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20230519.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20230526.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20230512.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20230602.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20230512.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20230602.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.4.9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.4.9999.ebuild index c46b53fc8c..9d222770d0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.4.9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.4.9999.ebuild @@ -7,33 +7,35 @@ TOOLCHAIN_PATCH_DEV="sam" PATCH_GCC_VER="12.3.0" MUSL_GCC_VER="12.3.0" -if [[ $(ver_cut 3) == 9999 ]] ; then +if [[ ${PV} == *.9999 ]] ; then MY_PV_2=$(ver_cut 2) + MY_PV_3=1 if [[ ${MY_PV_2} == 0 ]] ; then MY_PV_2=0 + MY_PV_3=0 else - MY_PV_2=$(($(ver_cut 2) - 1)) + MY_PV_2=$((${MY_PV_2} - 1)) fi # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then # Cheesy hack for RCs MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" + GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" TOOLCHAIN_SET_S=no S="${WORKDIR}"/${MY_P} fi inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +if tc_is_live ; then + # Needs to be after inherit (for now?), bug #830908 + EGIT_BRANCH=releases/gcc-$(ver_cut 1) +elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + # Don't keyword live ebuilds + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi if [[ ${CATEGORY} != cross-* ]] ; then diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.0-r1.ebuild deleted file mode 100644 index 6dc4f3880e..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.0-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="1" -PATCH_GCC_VER="13.2.0" -MUSL_VER="2" -MUSL_GCC_VER="13.2.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) -elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then - # Cheesy hack for RCs - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" - TOOLCHAIN_SET_S=no - S="${WORKDIR}"/${MY_P} -fi - -inherit toolchain - -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -if [[ ${CATEGORY} != cross-* ]] ; then - # Technically only if USE=hardened *too* right now, but no point in complicating it further. - # If GCC is enabling CET by default, we need glibc to be built with support for it. - # bug #830454 - RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" - DEPEND="${RDEPEND}" - BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" -fi - -src_prepare() { - local p upstreamed_patches=( - # add them here - ) - for p in "${upstreamed_patches[@]}"; do - rm -v "${WORKDIR}/patch/${p}" || die - done - - toolchain_src_prepare - - eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch - eapply_user -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230520.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230520.ebuild index 880709fcab..27d1004429 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230520.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230520.ebuild @@ -4,7 +4,7 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="2" +PATCH_VER="3" PATCH_GCC_VER="13.2.0" MUSL_VER="2" MUSL_GCC_VER="13.2.0" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230513.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230527.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230513.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230527.ebuild index 880709fcab..27d1004429 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230513.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230527.ebuild @@ -4,7 +4,7 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="2" +PATCH_VER="3" PATCH_GCC_VER="13.2.0" MUSL_VER="2" MUSL_GCC_VER="13.2.0" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230506.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230603.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230506.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230603.ebuild index 10a0c8381b..8ad60ea967 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230506.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.1.1_p20230603.ebuild @@ -4,7 +4,7 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="2" +PATCH_VER="3" PATCH_GCC_VER="13.2.0" MUSL_VER="2" MUSL_GCC_VER="13.2.0" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.9999.ebuild index 94cabe9d1d..3af2b951e7 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.9999.ebuild @@ -7,33 +7,35 @@ TOOLCHAIN_PATCH_DEV="sam" PATCH_GCC_VER="13.2.0" MUSL_GCC_VER="13.2.0" -if [[ $(ver_cut 3) == 9999 ]] ; then +if [[ ${PV} == *.9999 ]] ; then MY_PV_2=$(ver_cut 2) + MY_PV_3=1 if [[ ${MY_PV_2} == 0 ]] ; then MY_PV_2=0 + MY_PV_3=0 else - MY_PV_2=$(($(ver_cut 2) - 1)) + MY_PV_2=$((${MY_PV_2} - 1)) fi # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then # Cheesy hack for RCs MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" + GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" TOOLCHAIN_SET_S=no S="${WORKDIR}"/${MY_P} fi inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +if tc_is_live ; then + # Needs to be after inherit (for now?), bug #830908 + EGIT_BRANCH=releases/gcc-$(ver_cut 1) +elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + # Don't keyword live ebuilds + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi if [[ ${CATEGORY} != cross-* ]] ; then diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0.9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0.9999.ebuild index 5886aa3624..1d6aff0d52 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0.9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0.9999.ebuild @@ -7,14 +7,14 @@ TOOLCHAIN_PATCH_DEV="sam" PATCH_GCC_VER="14.0.0" MUSL_GCC_VER="14.0.0" -if [[ $(ver_cut 3) == 9999 ]] ; then +if [[ ${PV} == *.9999 ]] ; then MY_PV_2=$(ver_cut 2) - MY_PV_3=$(($(ver_cut 3) - 9998)) + MY_PV_3=1 if [[ ${MY_PV_2} == 0 ]] ; then MY_PV_2=0 MY_PV_3=0 else - MY_PV_2=$(($(ver_cut 2) - 1)) + MY_PV_2=$((${MY_PV_2} - 1)) fi # e.g. 12.2.9999 -> 12.1.1 @@ -30,12 +30,13 @@ fi inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=master - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +if tc_is_live ; then + # Needs to be after inherit (for now?), bug #830908 + EGIT_BRANCH=master +elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + # Don't keyword live ebuilds + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + :; fi if [[ ${CATEGORY} != cross-* ]] ; then diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230514.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230529.ebuild similarity index 76% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230514.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230529.ebuild index 1b25d3519a..a5db0d5f2f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230514.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230529.ebuild @@ -9,14 +9,14 @@ PATCH_GCC_VER="14.0.0" MUSL_VER="1" MUSL_GCC_VER="14.0.0" -if [[ $(ver_cut 3) == 9999 ]] ; then +if [[ ${PV} == *.9999 ]] ; then MY_PV_2=$(ver_cut 2) - MY_PV_3=$(($(ver_cut 3) - 9998)) + MY_PV_3=1 if [[ ${MY_PV_2} == 0 ]] ; then MY_PV_2=0 MY_PV_3=0 else - MY_PV_2=$(($(ver_cut 2) - 1)) + MY_PV_2=$((${MY_PV_2} - 1)) fi # e.g. 12.2.9999 -> 12.1.1 @@ -32,13 +32,14 @@ fi inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -#EGIT_BRANCH=master - -# Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi +if tc_is_live ; then + # Needs to be after inherit (for now?), bug #830908 + EGIT_BRANCH=master +elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + # Don't keyword live ebuilds + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + :; +fi if [[ ${CATEGORY} != cross-* ]] ; then # Technically only if USE=hardened *too* right now, but no point in complicating it further. diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230507.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230604.ebuild similarity index 76% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230507.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230604.ebuild index 1b25d3519a..a5db0d5f2f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230507.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20230604.ebuild @@ -9,14 +9,14 @@ PATCH_GCC_VER="14.0.0" MUSL_VER="1" MUSL_GCC_VER="14.0.0" -if [[ $(ver_cut 3) == 9999 ]] ; then +if [[ ${PV} == *.9999 ]] ; then MY_PV_2=$(ver_cut 2) - MY_PV_3=$(($(ver_cut 3) - 9998)) + MY_PV_3=1 if [[ ${MY_PV_2} == 0 ]] ; then MY_PV_2=0 MY_PV_3=0 else - MY_PV_2=$(($(ver_cut 2) - 1)) + MY_PV_2=$((${MY_PV_2} - 1)) fi # e.g. 12.2.9999 -> 12.1.1 @@ -32,13 +32,14 @@ fi inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -#EGIT_BRANCH=master - -# Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi +if tc_is_live ; then + # Needs to be after inherit (for now?), bug #830908 + EGIT_BRANCH=master +elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + # Don't keyword live ebuilds + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + :; +fi if [[ ${CATEGORY} != cross-* ]] ; then # Technically only if USE=hardened *too* right now, but no point in complicating it further. From c9807e6e8b83fb6e5db368b1a4d7da830b6a513e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:54 +0000 Subject: [PATCH 164/202] sys-devel/gdb: Sync with Gentoo It's from Gentoo commit d5c023667410d5407c7b82dfc77a6f515d3db9cd. --- .../portage-stable/sys-devel/gdb/Manifest | 1 + .../sys-devel/gdb/gdb-12.1-r4.ebuild | 8 +- .../sys-devel/gdb/gdb-13.1-r1.ebuild | 8 +- .../gdb/gdb-13.1.90_p20230325.ebuild | 8 +- .../gdb/gdb-13.1.90_p20230429.ebuild | 8 +- .../sys-devel/gdb/gdb-13.2.ebuild | 312 ++++++++++++++++++ .../sys-devel/gdb/gdb-9999.ebuild | 10 +- 7 files changed, 319 insertions(+), 36 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/gdb/Manifest index b4c626642c..6e40c2f8a8 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gdb/Manifest @@ -1,5 +1,6 @@ DIST gdb-12.1-patches-1.tar.xz 12340 BLAKE2B 071ff492f6cf7b0969d76db6f7414eeec564daf773c3334fb0d3f669e328bb4ae403ba8c709f3e33a56caa92273f762a5597a34dd7e7a1056f473b7ede2d8e59 SHA512 dc4a1a8d501dd1adfdcd6dcbd2559f1e2cc6aadeb18eacb2e9152f6858510e7392253db9568fe782da6d160221412e3e13dfd42a47a2a4a1addba2c1804a45b5 DIST gdb-12.1.tar.xz 22470332 BLAKE2B 7f6f853d1640908cf2c79932cdc1ba02549a07721c005d9c7ce2946a715761719cc164a4e68235a18664ec8a029afe3a2a0cfb57e1635f280076d6bed91317fd SHA512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d DIST gdb-13.1.tar.xz 23665472 BLAKE2B ab3a77ef35d21597dd1299787eebc422c3ca9764d0866223752c3036c0f9e198bf25ab4730bf6e7025bc2db148c66e98b191e15abc2d69c3088aed146728beef SHA512 e65054ffbc0357eeed4b17e1edc5ef45aa73c9ddf3b1210651e3d859576e27c1d27b266800fe26328eda58857455ccd8632f4000cfc5f63f90854096290187ca +DIST gdb-13.2.tar.xz 23664644 BLAKE2B bf5216ba2286448a46f9e0a405367c5a678e6d7540204722d355b618018b7b75a2ebc5b51353304c5ded02a3979223a81781d305f5afa5be82516cdc2863d49f SHA512 8185d3e11ab60dafff5860a5016577bfe7dd7547ef01ebc867bc247603d82b74ff74c4f29492c7d2aee57076f52be33e289f4c6b414a4b870d4b3004909f4c34 DIST gdb-weekly-13.1.90.20230325.tar.xz 24816144 BLAKE2B 2273ca1e6b3b563721c1497b30ae9c1c1d6fa88d1a50745a528163d54b45cc0582d3a053f279339dcc5d86b17dabe16c2be63488ac72ed7636af5988919c4b5e SHA512 19a1f1e0d4fc6f7a87c421e487990e3bc6c5ad5fae933be0e4f0ba8eec06b6bc3b0fc814d55e6059dfc2b7414ef0e7191967503dd0eda9021ccabc6d55030f49 DIST gdb-weekly-13.1.90.20230429.tar.xz 24806568 BLAKE2B 537faf7f354ac8adae879899d1a871a303d6ef8faa5ffa66970b2ab95d82750829de5f1cc9b7fb0aab12bb9f10219b3d255a52127e50dd28fef25b47ce2d9364 SHA512 1f0bad14a0862a5c119971025add895b8814421c95ab9095159382805ee8592f1695e84aad2bf5f711c807400eae50a9a6fa6ff45f329c885003f0209c44e493 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-12.1-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-12.1-r4.ebuild index 89c8c8ae28..4126e99a43 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-12.1-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-12.1-r4.ebuild @@ -49,7 +49,7 @@ LICENSE="GPL-3+ LGPL-2.1+" SLOT="0" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" fi IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash" @@ -202,12 +202,6 @@ src_configure() { $(use_with guile) ) - if use sparc-solaris || use x86-solaris ; then - # Disable largefile support - # https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html - myconf+=( --disable-largefile ) - fi - # source-highlight is detected with pkg-config: bug #716558 export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.1-r1.ebuild index 60adac1868..a19b1dd0ee 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.1-r1.ebuild @@ -50,7 +50,7 @@ case ${PV} in https://sourceware.org/pub/gdb/releases/${P}.tar.xz " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac @@ -213,12 +213,6 @@ src_configure() { --without-lib{babeltrace,expat,gmp,iconv,ipt,lzma,mpfr,xxhash}-prefix ) - if use sparc-solaris || use x86-solaris ; then - # Disable largefile support - # https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html - myconf+=( --disable-largefile ) - fi - # source-highlight is detected with pkg-config: bug #716558 export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.1.90_p20230325.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.1.90_p20230325.ebuild index b646e6c92e..7f50bf3914 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.1.90_p20230325.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.1.90_p20230325.ebuild @@ -74,7 +74,7 @@ LICENSE="GPL-3+ LGPL-2.1+" SLOT="0" IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd" if [[ -n ${REGULAR_RELEASE} ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" @@ -222,12 +222,6 @@ src_configure() { --without-lib{babeltrace,expat,gmp,iconv,ipt,lzma,mpfr,xxhash}-prefix ) - if use sparc-solaris || use x86-solaris ; then - # Disable largefile support - # https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html - myconf+=( --disable-largefile ) - fi - # source-highlight is detected with pkg-config: bug #716558 export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.1.90_p20230429.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.1.90_p20230429.ebuild index e6030f4783..1593ff2811 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.1.90_p20230429.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.1.90_p20230429.ebuild @@ -74,7 +74,7 @@ LICENSE="GPL-3+ LGPL-2.1+" SLOT="0" IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd" if [[ -n ${REGULAR_RELEASE} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" @@ -223,12 +223,6 @@ src_configure() { --without-lib{babeltrace,expat,gmp,iconv,ipt,lzma,mpfr,xxhash}-prefix ) - if use sparc-solaris || use x86-solaris ; then - # Disable largefile support - # https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html - myconf+=( --disable-largefile ) - fi - # source-highlight is detected with pkg-config: bug #716558 export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.2.ebuild new file mode 100644 index 0000000000..f234645144 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.2.ebuild @@ -0,0 +1,312 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# See https://sourceware.org/gdb/wiki/DistroAdvice for general packaging +# tips & notes. + +PYTHON_COMPAT=( python3_{10..11} ) +inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs + +export CTARGET=${CTARGET:-${CHOST}} + +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +case ${PV} in + 9999*) + # live git tree + EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" + inherit git-r3 + SRC_URI="" + ;; + *.*.50_p2???????|*.*.90_p2???????) + # Weekly snapshots + MY_PV="${PV/_p/.}" + SRC_URI=" + https://sourceware.org/pub/gdb/snapshots/branch/gdb-weekly-${MY_PV}.tar.xz + https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${MY_PV}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/gdb-weekly-${MY_PV}.tar.xz + " + S="${WORKDIR}/${PN}-${MY_PV}" + + # e.g. 13.1.90_p20230325 is a snapshot on the stable branch, so it's fine + if [[ ${PV} == *.[123456789].9?_p2??????? ]] ; then + REGULAR_RELEASE=1 + fi + ;; + *.*.9?) + # Prereleases + MY_PV="${PV/_p/.}" + SRC_URI=" + https://sourceware.org/pub/gdb/snapshots/branch/gdb-${MY_PV}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/gdb-${MY_PV}.tar.xz + " + S="${WORKDIR}/${PN}-${MY_PV}" + ;; + *) + # Normal upstream release + SRC_URI=" + mirror://gnu/gdb/${P}.tar.xz + https://sourceware.org/pub/gdb/releases/${P}.tar.xz + " + + REGULAR_RELEASE=1 +esac + +PATCH_DEV="" +PATCH_VER="" +DESCRIPTION="GNU debugger" +HOMEPAGE="https://sourceware.org/gdb/" +SRC_URI=" + ${SRC_URI} + ${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCH_VER}.tar.xz} + ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz} +" + +LICENSE="GPL-3+ LGPL-2.1+" +SLOT="0" +IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd" +if [[ -n ${REGULAR_RELEASE} ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +fi +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/mpfr:= + dev-libs/gmp:= + >=sys-libs/ncurses-5.2-r2:= + >=sys-libs/readline-7:= + sys-libs/zlib + elibc_glibc? ( net-libs/libnsl:= ) + lzma? ( app-arch/xz-utils ) + python? ( ${PYTHON_DEPS} ) + guile? ( >=dev-scheme/guile-2.0 ) + xml? ( dev-libs/expat ) + source-highlight? ( + dev-util/source-highlight + ) + xxhash? ( + dev-libs/xxhash + ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + sys-apps/texinfo + app-alternatives/yacc + nls? ( sys-devel/gettext ) + source-highlight? ( virtual/pkgconfig ) + test? ( dev-util/dejagnu ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-8.3.1-verbose-build.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + strip-linguas -u bfd/po opcodes/po + + # Avoid using ancient termcap from host on Prefix systems + sed -i -e 's/termcap tinfow/tinfow/g' \ + gdb/configure{.ac,} || die +} + +gdb_branding() { + printf "Gentoo ${PV} " + + if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then + printf "p${PATCH_VER}" + else + printf "vanilla" + fi + + [[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}" +} + +src_configure() { + strip-unsupported-flags + + # See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html + # Avoid really confusing logs from subconfigure spam, makes logs far + # more legible. + MAKEOPTS="--output-sync=line ${MAKEOPTS}" + + local myconf=( + # portage's econf() does not detect presence of --d-d-t + # because it greps only top-level ./configure. But not + # gnulib's or gdb's configure. + --disable-dependency-tracking + + --with-pkgversion="$(gdb_branding)" + --with-bugurl='https://bugs.gentoo.org/' + --disable-werror + # Disable modules that are in a combined binutils/gdb tree. bug #490566 + --disable-{binutils,etc,gas,gold,gprof,gprofng,ld} + + # avoid automagic dependency on (currently prefix) systems + # systems with debuginfod library, bug #754753 + --without-debuginfod + + $(use_enable test unit-tests) + + # Allow user to opt into CET for host libraries. + # Ideally we would like automagic-or-disabled here. + # But the check does not quite work on i686: bug #760926. + $(use_enable cet) + + # Helps when cross-compiling. Not to be confused with --with-sysroot. + --with-build-sysroot="${ESYSROOT}" + ) + + is_cross && myconf+=( + --with-sysroot="\${prefix}/${CTARGET}" + --includedir="\${prefix}/include/${CTARGET}" + --with-gdb-datadir="\${datadir}/gdb/${CTARGET}" + ) + + # gdbserver only works for native targets (CHOST==CTARGET). + # it also doesn't support all targets, so rather than duplicate + # the target list (which changes between versions), use the + # "auto" value when things are turned on, which is triggered + # whenever no --enable or --disable is given + if is_cross || use !server ; then + myconf+=( --disable-gdbserver ) + fi + + myconf+=( + --enable-64-bit-bfd + --disable-install-libbfd + --disable-install-libiberty + --enable-obsolete + # This only disables building in the readline subdir. + # For gdb itself, it'll use the system version. + --disable-readline + --with-system-readline + # This only disables building in the zlib subdir. + # For gdb itself, it'll use the system version. + --without-zlib + --with-system-zlib + --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug + $(use_with xml expat) + $(use_with lzma) + $(use_enable nls) + $(use_enable sim) + $(use_enable source-highlight) + $(use multitarget && echo --enable-targets=all) + $(use_with python python "${EPYTHON}") + $(use_with xxhash) + $(use_with guile) + $(use_with zstd) + + # Find libraries using the toolchain sysroot rather than the configured + # prefix. Needed when cross-compiling. + # + # Check which libraries to apply this to with: + # "${S}"/gdb/configure --help | grep without-lib | sort + --without-lib{babeltrace,expat,gmp,iconv,ipt,lzma,mpfr,xxhash}-prefix + ) + + # source-highlight is detected with pkg-config: bug #716558 + export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)" + + export CC_FOR_BUILD="$(tc-getBUILD_CC)" + + # ensure proper compiler is detected for Clang builds: bug #831202 + export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}" + + econf "${myconf[@]}" +} + +src_compile() { + emake V=1 +} + +src_test() { + # Run the unittests (nabbed invocation from Fedora's spec file) at least + emake -k -C gdb run GDBFLAGS='-batch -ex "maintenance selftest"' + + # Too many failures + # In fact, gdb's test suite needs some work to get passing. + # See e.g. https://sourceware.org/gdb/wiki/TestingGDB. + # As of 11.2, on amd64: "# of unexpected failures 8600" + # Also, ia64 kernel crashes when gdb testsuite is running. + #emake -k check +} + +src_install() { + emake V=1 DESTDIR="${D}" install + + find "${ED}"/usr -name libiberty.a -delete || die + + # Delete translations that conflict with binutils-libs. bug #528088 + # Note: Should figure out how to store these in an internal gdb dir. + if use nls ; then + find "${ED}" \ + -regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \ + -delete || die + fi + + # Don't install docs when building a cross-gdb + if [[ ${CTARGET} != ${CHOST} ]] ; then + rm -rf "${ED}"/usr/share/{doc,info,locale} || die + local f + for f in "${ED}"/usr/share/man/*/* ; do + if [[ ${f##*/} != ${CTARGET}-* ]] ; then + mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die + fi + done + return 0 + fi + + # Install it by hand for now: + # https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html + # Only install if it exists due to the twisted behavior (see + # notes in src_configure above). + [[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay + + docinto gdb + dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ + gdb/NEWS gdb/PROBLEMS + docinto sim + dodoc sim/{MAINTAINERS,README-HACKING} + + if use server ; then + docinto gdbserver + dodoc gdbserver/README + fi + + # Remove shared info pages + rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info* + + if use python ; then + python_optimize "${ED}"/usr/share/gdb/python/gdb + fi +} + +pkg_postinst() { + # Portage doesn't unmerge files in /etc + rm -vf "${EROOT}"/etc/skel/.gdbinit + + if use prefix && [[ ${CHOST} == *-darwin* ]] ; then + ewarn "gdb is unable to get a mach task port when installed by Prefix" + ewarn "Portage, unprivileged. To make gdb fully functional you'll" + ewarn "have to perform the following steps:" + ewarn " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb" + ewarn " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb" + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-9999.ebuild index 704c75812b..f234645144 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 # See https://sourceware.org/gdb/wiki/DistroAdvice for general packaging # tips & notes. -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs export CTARGET=${CTARGET:-${CHOST}} @@ -74,7 +74,7 @@ LICENSE="GPL-3+ LGPL-2.1+" SLOT="0" IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd" if [[ -n ${REGULAR_RELEASE} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" @@ -221,12 +221,6 @@ src_configure() { --without-lib{babeltrace,expat,gmp,iconv,ipt,lzma,mpfr,xxhash}-prefix ) - if use sparc-solaris || use x86-solaris ; then - # Disable largefile support - # https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html - myconf+=( --disable-largefile ) - fi - # source-highlight is detected with pkg-config: bug #716558 export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)" From 85f042d76eeec6964be7ea0e22f937194d0d8483 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:55 +0000 Subject: [PATCH 165/202] sys-devel/gettext: Sync with Gentoo It's from Gentoo commit b76b6d3eeb85be1dbc96c1a7b0c638a2766789d6. --- .../portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild index 9bbd3f8454..826f50a837 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == *_rc* ]] ; then else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" - 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 ~x86-winnt" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi # Only libasprintf is under the LGPL (and libintl is in a sep package), # so put that license behind USE=cxx. From 44a8b2368e72205c2f3f44d5d7f5879808efa797 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:55 +0000 Subject: [PATCH 166/202] sys-devel/gnuconfig: Sync with Gentoo It's from Gentoo commit b76b6d3eeb85be1dbc96c1a7b0c638a2766789d6. --- .../sys-devel/gnuconfig/gnuconfig-20221007.ebuild | 2 +- .../sys-devel/gnuconfig/gnuconfig-20230121.ebuild | 2 +- .../sys-devel/gnuconfig/gnuconfig-99999999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20221007.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20221007.ebuild index 2768957ae2..344e27cd9f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20221007.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20221007.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == 99999999 ]] ; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" - 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 ~x86-winnt" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" S="${WORKDIR}" fi diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20230121.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20230121.ebuild index f0b59ba79f..bbfd2430e7 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20230121.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20230121.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == 99999999 ]] ; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" - 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 ~x86-winnt" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" S="${WORKDIR}" fi diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-99999999.ebuild index f0b59ba79f..bbfd2430e7 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-99999999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-99999999.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == 99999999 ]] ; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" - 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 ~x86-winnt" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" S="${WORKDIR}" fi From cf9d2334e6cbe68a9346777928a47cc915de77fb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:55 +0000 Subject: [PATCH 167/202] sys-devel/libtool: Sync with Gentoo It's from Gentoo commit 79b33c73e995c90c6c74c753b4bc37452ab32c2e. --- .../libtool/files/libtool-2.4.6-mint.patch | 46 ------------------- .../sys-devel/libtool/libtool-2.4.7-r1.ebuild | 3 +- .../sys-devel/libtool/libtool-2.4.7.ebuild | 3 +- .../sys-devel/libtool/libtool-9999.ebuild | 3 +- 4 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-mint.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-mint.patch b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-mint.patch deleted file mode 100644 index 4fe5bcede5..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-mint.patch +++ /dev/null @@ -1,46 +0,0 @@ -Patch by Alan Hourihane - -http://bugs.gentoo.org/show_bug.cgi?id=266984 - ---- a/configure -+++ b/configure -@@ -5897,6 +5897,11 @@ - lt_cv_sys_max_cmd_len=8192; - ;; - -+ mint*) -+ # On MiNT this can take a long time and run out of memory. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. ---- a/libltdl/configure -+++ b/libltdl/configure -@@ -4782,6 +4782,11 @@ - lt_cv_sys_max_cmd_len=8192; - ;; - -+ mint*) -+ # On MiNT this can take a long time and run out of memory. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -1708,6 +1708,11 @@ - lt_cv_sys_max_cmd_len=8192; - ;; - -+ mint*) -+ # On MiNT this can take a long time and run out of memory. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild index b76f67194a..a098f7ae0b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - 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 ~x86-winnt" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="A shared library tool for developers" @@ -41,7 +41,6 @@ PATCHES=( # bug #581314 "${FILESDIR}"/${PN}-2.4.6-ppc64le.patch - "${FILESDIR}"/${PN}-2.4.6-mint.patch "${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch "${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch "${FILESDIR}"/${PN}-2.4.7-werror-lto.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7.ebuild index cabd1f48a4..8f3e8b1e33 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - 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 ~x86-winnt" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="A shared library tool for developers" @@ -40,7 +40,6 @@ PATCHES=( # bug #581314 "${FILESDIR}"/${PN}-2.4.6-ppc64le.patch - "${FILESDIR}"/${PN}-2.4.6-mint.patch "${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch "${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch ) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-9999.ebuild index b912aa5461..a27b9abcb0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-9999.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - 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 ~x86-winnt" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="A shared library tool for developers" @@ -41,7 +41,6 @@ PATCHES=( # bug #581314 "${FILESDIR}"/${PN}-2.4.6-ppc64le.patch - "${FILESDIR}"/${PN}-2.4.6-mint.patch "${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch "${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch "${FILESDIR}"/${PN}-2.4.7-grep-3.8.patch From f12758560350c9624f375a7a237705cc5abb9995 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:55 +0000 Subject: [PATCH 168/202] sys-devel/m4: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- ...4-1.4.19-r1.ebuild => m4-1.4.19-r2.ebuild} | 4 +- .../sys-devel/m4/m4-1.4.19.ebuild | 100 ------------------ 2 files changed, 1 insertion(+), 103 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-devel/m4/{m4-1.4.19-r1.ebuild => m4-1.4.19-r2.ebuild} (91%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19-r2.ebuild similarity index 91% rename from sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19-r2.ebuild index e4e29d3159..f30969b49e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19-r2.ebuild @@ -17,7 +17,7 @@ else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-test-198-sysval-r1.patch.gz" SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" - 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-3" @@ -77,8 +77,6 @@ src_configure() { ac_cv_libsigsegv=no ) - [[ ${USERLAND} != GNU ]] && myeconfargs+=( --program-prefix=g ) - econf "${myeconfargs[@]}" } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19.ebuild deleted file mode 100644 index aac415f799..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/m4/m4-1.4.19.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2023 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/m4.asc -inherit verify-sig - -DESCRIPTION="GNU macro processor" -HOMEPAGE="https://www.gnu.org/software/m4/m4.html" -if [[ ${PV} == *_beta* ]] ; then - MY_P="${PN}-1.4.18d" - SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz" - SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig )" - S="${WORKDIR}/${MY_P}" -else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-test-198-sysval-r1.patch.gz" - SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" - 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 - -LICENSE="GPL-3" -SLOT="0" -IUSE="examples nls" - -RDEPEND=" - virtual/libiconv - nls? ( - sys-devel/gettext - virtual/libintl - )" -DEPEND="${RDEPEND}" -# Remember: cannot dep on autoconf since it needs us -BDEPEND="app-arch/xz-utils - nls? ( sys-devel/gettext ) - verify-sig? ( sec-keys/openpgp-keys-m4 )" - -PATCHES=( - "${FILESDIR}"/ppc-musl.patch - "${FILESDIR}"/loong-fix-build.patch - "${FILESDIR}"/${PN}-1.4.19-make-4.4-tests.patch - "${WORKDIR}"/${P}-test-198-sysval-r1.patch -) - -src_unpack() { - if use verify-sig ; then - # Needed for downloaded patch (which is unsigned, which is fine) - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} - fi - - default -} - -src_prepare() { - default - - # touch generated files after patching m4, to avoid activating maintainer - # mode - # remove when loong-fix-build.patch is no longer necessary - touch ./aclocal.m4 ./lib/config.hin ./configure ./doc/stamp-vti || die - find . -name Makefile.in -exec touch {} + || die -} - -src_configure() { - local -a myeconfargs=( - --enable-changeword - - --with-packager="Gentoo Linux" - --with-packager-version="${PVR}" - --with-packager-bug-reports="https://bugs.gentoo.org/" - - $(usex nls '' '--disable-nls') - - # Disable automagic dependency over libsigsegv; see bug #278026 - ac_cv_libsigsegv=no - ) - - [[ ${USERLAND} != GNU ]] && myeconfargs+=( --program-prefix=g ) - - econf "${myeconfargs[@]}" -} - -src_test() { - [[ -d /none ]] && die "m4 tests will fail with /none/" #244396 - emake check -} - -src_install() { - default - - # autoconf-2.60 for instance, first checks gm4, then m4. If we don't have - # gm4, it might find gm4 from outside the prefix on for instance Darwin - use prefix && dosym m4 /usr/bin/gm4 - - if use examples ; then - dodoc -r examples - rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile* - fi -} From 2dcb867101b63a19ed90b756553b5257243d3a62 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:14:56 +0000 Subject: [PATCH 169/202] sys-devel/patch: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- .../portage-stable/sys-devel/patch/patch-2.7.6-r5.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r4.ebuild index 154e5382e7..7db9726636 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${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 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static test xattr" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r5.ebuild index 8ab2c52c0d..79b9204860 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r5.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${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 ~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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static test xattr" RESTRICT="!test? ( test )" From 328ddd60bcfb8268d93f5bd30ea3a21b6ca240fd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:05 +0000 Subject: [PATCH 170/202] sys-fs/e2fsprogs: Sync with Gentoo It's from Gentoo commit 224a5359b006b74a2e1fb948adb931e89e25e59d. --- .../e2fsprogs/e2fsprogs-1.46.5-r3.ebuild | 166 ----------------- .../sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild | 169 ------------------ .../sys-fs/e2fsprogs/metadata.xml | 1 - 3 files changed, 336 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild deleted file mode 100644 index 09e9ee8488..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript multilib-minimal - -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="cron fuse lto nls static-libs test +threads +tools" -RESTRICT="!test? ( test )" - -RDEPEND=" - !sys-libs/${PN}-libs - cron? ( sys-fs/lvm2[lvm] ) - fuse? ( sys-fs/fuse:0 ) - nls? ( virtual/libintl ) - tools? ( sys-apps/util-linux )" -# For testing lib/ext2fs, lib/support/libsupport.a is required, which -# unconditionally includes '' from sys-apps/util-linux. -DEPEND=" - ${RDEPEND} - test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )" -BDEPEND=" - virtual/pkgconfig - sys-apps/texinfo - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 - - # Upstream patches (can usually removed with next version bump) - "${FILESDIR}"/${P}-parallel-make.patch -) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/ext2fs/ext2_types.h -) - -src_prepare() { - default - - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" - - # Get rid of doc -- we don't use them. This also prevents a sandbox - # violation due to mktexfmt invocation - rm -r doc || die "Failed to remove doc dir" - - # prevent included intl cruft from building #81096 - sed -i -r \ - -e 's:@LIBINTL@:@LTLIBINTL@:' \ - MCONFIG.in || die 'intl cruft' -} - -multilib_src_configure() { - # Keep the package from doing silly things #261411 - export VARTEXFONTS="${T}/fonts" - - # needs open64() prototypes and friends - append-cppflags -D_GNU_SOURCE - - local myeconfargs=( - --with-root-prefix="${EPREFIX}" - $(use_with cron crond-dir "${EPREFIX}/etc/cron.d") - --with-systemd-unit-dir="$(systemd_get_systemunitdir)" - --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d" - --enable-symlink-install - --enable-elf-shlibs - $(tc-has-tls || echo --disable-tls) - $(multilib_native_use_enable fuse fuse2fs) - $(use_enable nls) - $(multilib_native_use_enable tools e2initrd-helper) - --disable-fsck - --disable-uuidd - $(use_enable lto) - $(use_with threads pthread) - ) - - # we use blkid/uuid from util-linux now - if use kernel_linux ; then - export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes - myeconfargs+=( --disable-lib{blkid,uuid} ) - fi - - ac_cv_path_LDCONFIG=: \ - ECONF_SOURCE="${S}" \ - CC="$(tc-getCC)" \ - BUILD_CC="$(tc-getBUILD_CC)" \ - BUILD_LD="$(tc-getBUILD_LD)" \ - econf "${myeconfargs[@]}" - - if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then - eerror "INTL sanity check failed, aborting build." - eerror "Please post your ${S}/config.log file as an" - eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" - die "Preventing included intl cruft from building" - fi -} - -multilib_src_compile() { - if multilib_is_native_abi && use tools ; then - emake V=1 - else - emake -C lib/et V=1 - emake -C lib/ss V=1 - emake -C lib/ext2fs V=1 - emake -C lib/e2p V=1 - fi -} - -multilib_src_test() { - if multilib_is_native_abi && use tools ; then - emake V=1 check - else - # required by lib/ext2fs's check target - emake -C lib/support V=1 - - # For non-native, there's no binaries to test. Just libraries. - emake -C lib/et V=1 check - emake -C lib/ss V=1 check - emake -C lib/ext2fs V=1 check - emake -C lib/e2p V=1 check - fi -} - -multilib_src_install() { - if multilib_is_native_abi && use tools ; then - emake STRIP=':' V=1 DESTDIR="${D}" install - else - emake -C lib/et V=1 DESTDIR="${D}" install - emake -C lib/ss V=1 DESTDIR="${D}" install - emake -C lib/ext2fs V=1 DESTDIR="${D}" install - emake -C lib/e2p V=1 DESTDIR="${D}" install - fi - - # Move shared libraries to /lib/, install static libraries to - # /usr/lib/, and install linker scripts to /usr/lib/. - gen_usr_ldscript -a com_err ss ext2fs e2p - - # configure doesn't have an option to disable static libs :/ - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} - -multilib_src_install_all() { - einstalldocs - - if use tools ; then - insinto /etc - doins "${FILESDIR}"/e2fsck.conf - fi -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild deleted file mode 100644 index 07ab6fecf1..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.47.0.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev usr-ldscript - -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="cron fuse nls static-libs test +tools" -RESTRICT="!test? ( test )" - -RDEPEND=" - !sys-libs/${PN}-libs - cron? ( sys-fs/lvm2[lvm] ) - fuse? ( sys-fs/fuse:0 ) - nls? ( virtual/libintl ) - tools? ( sys-apps/util-linux ) -" -# For testing lib/ext2fs, lib/support/libsupport.a is required, which -# unconditionally includes '' from sys-apps/util-linux. -DEPEND=" - ${RDEPEND} - test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) -" -BDEPEND=" - sys-apps/texinfo - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/ext2fs/ext2_types.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch # bug #516854 - - # Upstream patches (can usually removed with next version bump) -) - -src_prepare() { - default - - cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" - - # Get rid of doc -- we don't use them. This also prevents a sandbox - # violation due to mktexfmt invocation - rm -r doc || die "Failed to remove doc dir" - - # Prevent included intl cruft from building, bug #81096 - sed -i -r \ - -e 's:@LIBINTL@:@LTLIBINTL@:' \ - MCONFIG.in || die 'intl cruft' -} - -multilib_src_configure() { - # Keep the package from doing silly things, bug #261411 - export VARTEXFONTS="${T}/fonts" - - # Needs open64() prototypes and friends - append-cppflags -D_GNU_SOURCE - - local myeconfargs=( - --with-root-prefix="${EPREFIX}" - $(use_with cron crond-dir "${EPREFIX}/etc/cron.d") - --with-systemd-unit-dir="$(systemd_get_systemunitdir)" - --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d" - --enable-symlink-install - --enable-elf-shlibs - $(tc-has-tls || echo --disable-tls) - $(multilib_native_use_enable fuse fuse2fs) - $(use_enable nls) - $(multilib_native_use_enable tools e2initrd-helper) - --disable-fsck - --disable-uuidd - --disable-lto - --disable-largefile # need to check effect on ABI - --with-pthread - ) - - # We use blkid/uuid from util-linux now - if use kernel_linux ; then - export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes - myeconfargs+=( --disable-lib{blkid,uuid} ) - fi - - ac_cv_path_LDCONFIG=: \ - ECONF_SOURCE="${S}" \ - CC="$(tc-getCC)" \ - BUILD_CC="$(tc-getBUILD_CC)" \ - BUILD_LD="$(tc-getBUILD_LD)" \ - econf "${myeconfargs[@]}" - - if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then - eerror "INTL sanity check failed, aborting build." - eerror "Please post your ${S}/config.log file as an" - eerror "attachment to https://bugs.gentoo.org/81096" - die "Preventing included intl cruft from building" - fi -} - -multilib_src_compile() { - if multilib_is_native_abi && use tools ; then - emake V=1 - else - emake -C lib/et V=1 - emake -C lib/ss V=1 - emake -C lib/ext2fs V=1 - emake -C lib/e2p V=1 - fi -} - -multilib_src_test() { - if multilib_is_native_abi && use tools ; then - emake V=1 check - else - # Required by lib/ext2fs's check target - emake -C lib/support V=1 - - # For non-native, there's no binaries to test. Just libraries. - emake -C lib/et V=1 check - emake -C lib/ss V=1 check - emake -C lib/ext2fs V=1 check - emake -C lib/e2p V=1 check - fi -} - -multilib_src_install() { - if multilib_is_native_abi && use tools ; then - emake STRIP=':' V=1 DESTDIR="${D}" install - else - emake -C lib/et V=1 DESTDIR="${D}" install - emake -C lib/ss V=1 DESTDIR="${D}" install - emake -C lib/ext2fs V=1 DESTDIR="${D}" install - emake -C lib/e2p V=1 DESTDIR="${D}" install - fi - - # Move shared libraries to /lib/, install static libraries to - # /usr/lib/, and install linker scripts to /usr/lib/. - gen_usr_ldscript -a com_err ss ext2fs e2p - - # configure doesn't have an option to disable static libs - if ! use static-libs ; then - find "${ED}" -name '*.a' -delete || die - fi -} - -multilib_src_install_all() { - einstalldocs - - if use tools ; then - insinto /etc - doins "${FILESDIR}"/e2fsck.conf - fi -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/metadata.xml index a7ce0f49f4..3030299059 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/metadata.xml @@ -8,7 +8,6 @@ Install e2scrub_all cron script Build fuse2fs, a FUSE file system client for ext2/ext3/ext4 file systems - Build with link time optimization (LTO) Build extfs tools (mke2fs, e2fsck, tune2fs, etc.) From 2e6853dec16d9e251cc844a941d54e32c729a3e1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:06 +0000 Subject: [PATCH 171/202] sys-libs/binutils-libs: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild | 2 +- .../sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild | 2 +- .../sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild | 2 +- .../sys-libs/binutils-libs/binutils-libs-2.37_p1-r2.ebuild | 2 +- .../sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild | 2 +- .../sys-libs/binutils-libs/binutils-libs-2.39-r5.ebuild | 2 +- .../sys-libs/binutils-libs/binutils-libs-2.40-r3.ebuild | 2 +- .../sys-libs/binutils-libs/binutils-libs-2.40-r4.ebuild | 2 +- .../sys-libs/binutils-libs/binutils-libs-2.40-r5.ebuild | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild index 7e32691cab..635d56ca3f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild @@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz LICENSE="|| ( GPL-3 LGPL-3 )" SLOT="0/${PV}" IUSE="64-bit-bfd multitarget nls static-libs" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris" BDEPEND="nls? ( sys-devel/gettext )" DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild index 49b5b73255..1a104d393c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild @@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz LICENSE="|| ( GPL-3 LGPL-3 )" SLOT="0/${PV}" IUSE="64-bit-bfd cet multitarget nls static-libs" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris" BDEPEND="nls? ( sys-devel/gettext )" DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild index 14ef733b10..11338104c3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild @@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz LICENSE="|| ( GPL-3 LGPL-3 )" SLOT="0/${PV}" IUSE="64-bit-bfd cet multitarget nls static-libs" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris" BDEPEND="nls? ( sys-devel/gettext )" DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.37_p1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.37_p1-r2.ebuild index bb7895a3dc..50498e6349 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.37_p1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.37_p1-r2.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz LICENSE="|| ( GPL-3 LGPL-3 )" SLOT="0/${PV%_p?}" IUSE="64-bit-bfd cet multitarget nls static-libs" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris" BDEPEND="nls? ( sys-devel/gettext )" DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild index 7c6e31e4af..c0930868f1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz LICENSE="|| ( GPL-3 LGPL-3 )" SLOT="0/${PV%_p?}" IUSE="64-bit-bfd cet multitarget nls static-libs" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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-macos ~x64-solaris" BDEPEND="nls? ( sys-devel/gettext )" DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r5.ebuild index b3ac3b4bd8..12358fdda9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r5.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz LICENSE="|| ( GPL-3 LGPL-3 )" SLOT="0/${PV%_p?}" IUSE="64-bit-bfd cet multitarget nls static-libs" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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-macos ~x64-solaris" BDEPEND="nls? ( sys-devel/gettext )" DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r3.ebuild index 0164f50c6a..4570add014 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r3.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz LICENSE="|| ( GPL-3 LGPL-3 )" SLOT="0/${PV%_p?}" IUSE="64-bit-bfd cet multitarget nls static-libs" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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-macos ~x64-solaris" BDEPEND="nls? ( sys-devel/gettext )" DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r4.ebuild index fa23899f2b..132b52c7df 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r4.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz LICENSE="|| ( GPL-3 LGPL-3 )" SLOT="0/${PV%_p?}" IUSE="64-bit-bfd cet multitarget nls static-libs test" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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-macos ~x64-solaris" RESTRICT="!test? ( test )" BDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r5.ebuild index 6ba858674d..9a2b00375c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r5.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz LICENSE="|| ( GPL-3 LGPL-3 )" SLOT="0/${PV%_p?}" IUSE="64-bit-bfd cet multitarget nls static-libs test" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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-macos ~x64-solaris" RESTRICT="!test? ( test )" BDEPEND=" From 14b9d9edfdb62624551096c37bab0f02bcd21021 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:06 +0000 Subject: [PATCH 172/202] sys-libs/libcap: Sync with Gentoo It's from Gentoo commit fcc57a6ade0e9c2e370d54b211bcce848153ea2b. --- .../portage-stable/sys-libs/libcap/libcap-2.69.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.69.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.69.ebuild index a3341be749..f1d3b050aa 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.69.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.69.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="POSIX 1003.1e capabilities" From da04ed4c7a4d265ca6aba68629d9f257a1e701d7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:08 +0000 Subject: [PATCH 173/202] sys-libs/readline: Sync with Gentoo It's from Gentoo commit 3a5856cbd1379c26f1af82ebeea52252d194487a. --- .../readline/readline-8.1_p2-r1.ebuild | 25 ++++++++++++------- .../sys-libs/readline/readline-8.2_p1.ebuild | 25 ++++++++++++------- .../sys-libs/readline/readline-9999.ebuild | 25 ++++++++++++------- 3 files changed, 48 insertions(+), 27 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.1_p2-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.1_p2-r1.ebuild index 051b82ae22..8e926747c3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.1_p2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.1_p2-r1.ebuild @@ -36,17 +36,24 @@ case ${PV} in patch_url= my_patch_index= - for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do - for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do - patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index}) - SRC_URI+=" ${patch_url}" - SRC_URI+=" verify-sig? ( ${patch_url}.sig )" - done + upstream_url_base="mirror://gnu/bash" + mirror_url_base="ftp://ftp.cwru.edu/pub/bash" - MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) ) + for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do + printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} + patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}" + + SRC_URI+=" ${patch_url}" + SRC_URI+=" verify-sig? ( ${patch_url}.sig )" + + # Add in the mirror URL too. + SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + + MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_pn patch_url my_patch_index + unset my_p patch_url my_patch_index upstream_url_base mirror_url_base fi ;; esac @@ -54,7 +61,7 @@ esac LICENSE="GPL-3" SLOT="0/8" # subslot matches SONAME major [[ ${PV} == *_rc* ]] || \ -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs +unicode utils" RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.2_p1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.2_p1.ebuild index b20dee17fe..29aa8e80be 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.2_p1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.2_p1.ebuild @@ -49,17 +49,24 @@ elif is_release ; then patch_url= my_patch_index= - for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do - for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do - patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index}) - SRC_URI+=" ${patch_url}" - SRC_URI+=" verify-sig? ( ${patch_url}.sig )" - done + upstream_url_base="mirror://gnu/bash" + mirror_url_base="ftp://ftp.cwru.edu/pub/bash" - MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) ) + for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do + printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} + patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}" + + SRC_URI+=" ${patch_url}" + SRC_URI+=" verify-sig? ( ${patch_url}.sig )" + + # Add in the mirror URL too. + SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + + MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_pn patch_url my_patch_index + unset my_p patch_url my_patch_index upstream_url_base mirror_url_base fi else SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" @@ -73,7 +80,7 @@ fi LICENSE="GPL-3" SLOT="0/8" # subslot matches SONAME major if is_release ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="static-libs +unicode utils" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-9999.ebuild index b20dee17fe..29aa8e80be 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-9999.ebuild @@ -49,17 +49,24 @@ elif is_release ; then patch_url= my_patch_index= - for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do - for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do - patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index}) - SRC_URI+=" ${patch_url}" - SRC_URI+=" verify-sig? ( ${patch_url}.sig )" - done + upstream_url_base="mirror://gnu/bash" + mirror_url_base="ftp://ftp.cwru.edu/pub/bash" - MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) ) + for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do + printf -v mangled_patch_ver ${my_p}-%03d ${my_patch_index} + patch_url="${upstream_url_base}/${MY_P}-patches/${mangled_patch_ver}" + + SRC_URI+=" ${patch_url}" + SRC_URI+=" verify-sig? ( ${patch_url}.sig )" + + # Add in the mirror URL too. + SRC_URI+=" ${patch_url/${upstream_url_base}/${mirror_url_base}}" + SRC_URI+=" verify-sig? ( ${patch_url/${upstream_url_base}/${mirror_url_base}} )" + + MY_PATCHES+=( "${DISTDIR}"/${mangled_patch_ver} ) done - unset my_pn patch_url my_patch_index + unset my_p patch_url my_patch_index upstream_url_base mirror_url_base fi else SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" @@ -73,7 +80,7 @@ fi LICENSE="GPL-3" SLOT="0/8" # subslot matches SONAME major if is_release ; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi IUSE="static-libs +unicode utils" From fef0dc835c694fc405615cdc4149a2592c1271e3 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:08 +0000 Subject: [PATCH 174/202] sys-libs/zlib: Sync with Gentoo It's from Gentoo commit 44adc9b74598ec176148cf3f620f45ca86c7c172. --- .../portage-stable/sys-libs/zlib/Manifest | 2 - .../sys-libs/zlib/zlib-1.2.13-r1.ebuild | 38 +++---------------- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/Manifest index 53fdd7466a..f3962cb4da 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/Manifest @@ -1,4 +1,2 @@ -DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274 SHA512 14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a DIST zlib-1.2.13.tar.xz 1296496 BLAKE2B cefcd25989ce27e7d339af2a88455fcf64f6f5e647bedb0f05a45e4370a885fe45a60c023aa63e79b8ecf20ed3254d0052245f33f5769aca2838b42242be14a8 SHA512 9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725 DIST zlib-1.2.13.tar.xz.asc 235 BLAKE2B 29206175f06b4e36960fc6b9403101f55c1f5b768e1921ce1402217bc85978b9fba1a4130db2df5c148b6a1c947148372be20ff8c4ce337c6f2541b42fef7274 SHA512 ca5decebe9572e77e88bac5c5119bfda7e222ed3944e4692510ae70fb5f01d8694b59a6878472b84e6b61d2d1682d94473b6312832afa520a2a23293572ea621 -DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild index 30cd9ce81f..7f8b0bc677 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild @@ -8,22 +8,16 @@ AUTOTOOLS_AUTO_DEPEND="no" VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc inherit autotools multilib-minimal flag-o-matic toolchain-funcs usr-ldscript verify-sig -CYGWINPATCHES=( - "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch" - "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> ${PN}-1.2.7-cygwin-minizip.patch" -) - DESCRIPTION="Standard (de)compression library" HOMEPAGE="https://zlib.net/" SRC_URI="https://zlib.net/${P}.tar.xz https://zlib.net/fossils/${P}.tar.xz https://zlib.net/current/beta/${P}.tar.xz - verify-sig? ( https://zlib.net/${P}.tar.xz.asc ) - elibc_Cygwin? ( ${CYGWINPATCHES[*]} )" + verify-sig? ( https://zlib.net/${P}.tar.xz.asc )" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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 ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]" @@ -51,33 +45,13 @@ PATCHES=( src_prepare() { default - if use elibc_Cygwin ; then - local p - for p in "${CYGWINPATCHES[@]}" ; do - # Strip out the "... -> " from the array - eapply -p2 "${DISTDIR}/${p#*> }" - done - fi - if use minizip ; then cd contrib/minizip || die eautoreconf fi case ${CHOST} in - *-cygwin*) - # Do not use _wopen, it's a mingw-only symbol - sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die - - # zlib1.dll is the mingw name, need cygz.dll - # cygz.dll is loaded by toolchain, put into subdir - sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die - - ;; - esac - - case ${CHOST} in - *-mingw*|mingw*|*-cygwin*) + *-mingw*|mingw*) # Uses preconfigured Makefile rather than configure script multilib_copy_sources @@ -100,7 +74,7 @@ multilib_src_configure() { fi case ${CHOST} in - *-mingw*|mingw*|*-cygwin*) + *-mingw*|mingw*) ;; *) @@ -131,7 +105,7 @@ multilib_src_configure() { multilib_src_compile() { case ${CHOST} in - *-mingw*|mingw*|*-cygwin*) + *-mingw*|mingw*) emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- sed \ -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \ @@ -160,7 +134,7 @@ sed_macros() { multilib_src_install() { case ${CHOST} in - *-mingw*|mingw*|*-cygwin*) + *-mingw*|mingw*) emake -f win32/Makefile.gcc install \ BINARY_PATH="${ED}/usr/bin" \ LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ From c0ecf671395c8dcbfd0c855792b531a54cce0e5c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:10 +0000 Subject: [PATCH 175/202] virtual/libcrypt: Sync with Gentoo It's from Gentoo commit cb9517f2046423441d65e58fedf0aa7172176202. --- .../portage-stable/virtual/libcrypt/libcrypt-1-r1.ebuild | 3 +-- .../portage-stable/virtual/libcrypt/libcrypt-2-r1.ebuild | 3 +-- .../portage-stable/virtual/libcrypt/libcrypt-2.ebuild | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1-r1.ebuild index a5c887feeb..65fd54f200 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1-r1.ebuild @@ -8,7 +8,7 @@ inherit multilib-build DESCRIPTION="Virtual for libcrypt.so" SLOT="0/1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs" RDEPEND=" @@ -16,5 +16,4 @@ RDEPEND=" elibc_glibc? ( sys-libs/glibc[crypt(+),static-libs(+)?] ) elibc_musl? ( sys-libs/musl ) ) - elibc_Cygwin? ( sys-libs/cygwin-crypt ) " diff --git a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2-r1.ebuild index 9965e1ffff..ffb273b292 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2-r1.ebuild @@ -8,7 +8,7 @@ inherit multilib-build DESCRIPTION="Virtual for libcrypt.so" SLOT="0/2" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs" RDEPEND=" @@ -16,5 +16,4 @@ RDEPEND=" elibc_glibc? ( sys-libs/libxcrypt[system(-),static-libs(-)?,${MULTILIB_USEDEP}] ) elibc_musl? ( sys-libs/libxcrypt[system(-),static-libs(-)?] ) ) - elibc_Cygwin? ( sys-libs/cygwin-crypt ) " diff --git a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2.ebuild index ed43dba446..8998d7eea9 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-2.ebuild @@ -8,7 +8,7 @@ inherit multilib-build DESCRIPTION="Virtual for libcrypt.so" SLOT="0/2" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs" RDEPEND=" @@ -16,5 +16,4 @@ RDEPEND=" elibc_glibc? ( sys-libs/libxcrypt[system(-),static-libs(-)?,${MULTILIB_USEDEP}] ) elibc_musl? ( sys-libs/musl ) ) - elibc_Cygwin? ( sys-libs/cygwin-crypt ) " From ccf6b6bab7b16e1f75e6540be2787e13d457b9d3 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:10 +0000 Subject: [PATCH 176/202] virtual/libelf: Sync with Gentoo It's from Gentoo commit 6d2df6f4b71756f49d6afeb99ef76b693bd39742. --- .../portage-stable/virtual/libelf/libelf-2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/virtual/libelf/libelf-2-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libelf/libelf-2-r1.ebuild index 644892ce4f..7c83cbd659 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libelf/libelf-2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libelf/libelf-2-r1.ebuild @@ -7,6 +7,6 @@ inherit multilib-build DESCRIPTION="Virtual for libelf.so.0 provider dev-libs/libelf" SLOT="0/0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~x64-solaris" RDEPEND=">=dev-libs/libelf-0.8.13-r2:0/0[${MULTILIB_USEDEP}]" From 0832cd609f1596b7e7fa108493cf9a33ec96c8bd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:11 +0000 Subject: [PATCH 177/202] virtual/perl-Carp: Sync with Gentoo It's from Gentoo commit f7c90b96ce5780e8c8b84326b28da2607ecc6eb5. --- .../virtual/perl-Carp/perl-Carp-1.520.0-r2.ebuild | 2 +- .../virtual/perl-Carp/perl-Carp-1.540.0.ebuild | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-Carp/perl-Carp-1.540.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-Carp/perl-Carp-1.520.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-Carp/perl-Carp-1.520.0-r2.ebuild index d763eb07e2..71342afe2a 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-Carp/perl-Carp-1.520.0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-Carp/perl-Carp-1.520.0-r2.ebuild @@ -5,7 +5,7 @@ EAPI=8 DESCRIPTION="Virtual for ${PN#perl-}" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" || ( =dev-lang/perl-5.36* =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} ) diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-Carp/perl-Carp-1.540.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-Carp/perl-Carp-1.540.0.ebuild new file mode 100644 index 0000000000..6f04cf8ad5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-Carp/perl-Carp-1.540.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Virtual for ${PN#perl-}" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + || ( =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} ) + dev-lang/perl:= + !perl-core/${PN#perl-}-${PV}-r999 +" From 1bfdd10b9fa41bf0e98b7fc5b8dfaeb0fc6d41a5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:11 +0000 Subject: [PATCH 178/202] virtual/perl-Exporter: Sync with Gentoo It's from Gentoo commit b1dc4abca3ee0d1763d83501c9c032172a27ec96. --- .../virtual/perl-Exporter/perl-Exporter-5.760.0.ebuild | 2 +- ...xporter-5.770.0.ebuild => perl-Exporter-5.770.0-r1.ebuild} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/{perl-Exporter-5.770.0.ebuild => perl-Exporter-5.770.0-r1.ebuild} (59%) diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/perl-Exporter-5.760.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/perl-Exporter-5.760.0.ebuild index a076a298bf..4acb2b86f0 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/perl-Exporter-5.760.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/perl-Exporter-5.760.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 DESCRIPTION="Virtual for ${PN#perl-}" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" || ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} ) diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/perl-Exporter-5.770.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/perl-Exporter-5.770.0-r1.ebuild similarity index 59% rename from sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/perl-Exporter-5.770.0.ebuild rename to sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/perl-Exporter-5.770.0-r1.ebuild index ac44e5be67..9bb3f61db9 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/perl-Exporter-5.770.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/perl-Exporter-5.770.0-r1.ebuild @@ -5,10 +5,10 @@ EAPI=8 DESCRIPTION="Virtual for ${PN#perl-}" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" - || ( =dev-lang/perl-5.36* ~perl-core/${PN#perl-}-${PV} ) + || ( =dev-lang/perl-5.38* =dev-lang/perl-5.36* ~perl-core/${PN#perl-}-${PV} ) dev-lang/perl:= !perl-core/${PN#perl-}-${PV}-r999 From c58f5c4b34aa97bf08809193f59b54178b31ea2a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:11 +0000 Subject: [PATCH 179/202] virtual/perl-ExtUtils-MakeMaker: Sync with Gentoo It's from Gentoo commit 777491bcdae46d1764c73dfb0e0c471943bddd6c. --- .../perl-ExtUtils-MakeMaker-7.620.0.ebuild | 2 +- .../perl-ExtUtils-MakeMaker-7.640.0.ebuild | 2 +- .../perl-ExtUtils-MakeMaker-7.700.0.ebuild | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.700.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.620.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.620.0.ebuild index a076a298bf..4acb2b86f0 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.620.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.620.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 DESCRIPTION="Virtual for ${PN#perl-}" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" || ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} ) diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.640.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.640.0.ebuild index ac44e5be67..f70f852433 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.640.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.640.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DESCRIPTION="Virtual for ${PN#perl-}" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" || ( =dev-lang/perl-5.36* ~perl-core/${PN#perl-}-${PV} ) diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.700.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.700.0.ebuild new file mode 100644 index 0000000000..6f04cf8ad5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-ExtUtils-MakeMaker/perl-ExtUtils-MakeMaker-7.700.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Virtual for ${PN#perl-}" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + || ( =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} ) + dev-lang/perl:= + !perl-core/${PN#perl-}-${PV}-r999 +" From 4e0874dc04174289c299fd5b071dbc425477005d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:11 +0000 Subject: [PATCH 180/202] virtual/perl-File-Spec: Sync with Gentoo It's from Gentoo commit cec5ade314dd8b18f93ffd502087dae86ef4e24b. --- .../perl-File-Spec/perl-File-Spec-3.800.0.ebuild | 2 +- .../perl-File-Spec/perl-File-Spec-3.840.0.ebuild | 2 +- .../perl-File-Spec/perl-File-Spec-3.880.0.ebuild | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.880.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.800.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.800.0.ebuild index a076a298bf..4acb2b86f0 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.800.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.800.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 DESCRIPTION="Virtual for ${PN#perl-}" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" || ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} ) diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.840.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.840.0.ebuild index ac44e5be67..f70f852433 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.840.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.840.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DESCRIPTION="Virtual for ${PN#perl-}" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" || ( =dev-lang/perl-5.36* ~perl-core/${PN#perl-}-${PV} ) diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.880.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.880.0.ebuild new file mode 100644 index 0000000000..6f04cf8ad5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.880.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Virtual for ${PN#perl-}" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + || ( =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} ) + dev-lang/perl:= + !perl-core/${PN#perl-}-${PV}-r999 +" From 4ea2a82e540e998651824b31d932d905b8fd7cbd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:11 +0000 Subject: [PATCH 181/202] virtual/perl-File-Temp: Sync with Gentoo It's from Gentoo commit fd131e723acb067b3890473fe9680756e6c177c8. --- .../virtual/perl-File-Temp/perl-File-Temp-0.231.100.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Temp/perl-File-Temp-0.231.100.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-File-Temp/perl-File-Temp-0.231.100.ebuild index 5683ca61aa..0bea9f18f2 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Temp/perl-File-Temp-0.231.100.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-File-Temp/perl-File-Temp-0.231.100.ebuild @@ -5,11 +5,11 @@ EAPI=7 DESCRIPTION="Virtual for ${PN#perl-}" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" ~perl-core/${PN#perl-}-${PV} dev-lang/perl:= " -# this is the dev-lang/perl-5.34 and dev-lang/perl-5.36 version but we need the security patch +# this is the dev-lang/perl-5.34 and dev-lang/perl-5.36 and dev-lang/perl-5.38 version but we need the security patch From 87ac50ab3b6a7228d5bd91d3903583a103a37908 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:11 +0000 Subject: [PATCH 182/202] virtual/perl-Getopt-Long: Sync with Gentoo It's from Gentoo commit 99ac4e26864ad8f65846c4cea67bc4b0292031e7. --- .../perl-Getopt-Long-2.520.0-r1.ebuild | 2 +- .../perl-Getopt-Long-2.540.0.ebuild | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.540.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.520.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.520.0-r1.ebuild index d763eb07e2..71342afe2a 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.520.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.520.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 DESCRIPTION="Virtual for ${PN#perl-}" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" || ( =dev-lang/perl-5.36* =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} ) diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.540.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.540.0.ebuild new file mode 100644 index 0000000000..6f04cf8ad5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-Getopt-Long/perl-Getopt-Long-2.540.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Virtual for ${PN#perl-}" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + || ( =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} ) + dev-lang/perl:= + !perl-core/${PN#perl-}-${PV}-r999 +" From 89cf4065f1e2ca6b707de2dd4d1a2ce9981fe7e8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:11 +0000 Subject: [PATCH 183/202] virtual/perl-IO: Sync with Gentoo It's from Gentoo commit c17e0f86c679d5ec6b877804af4906803e7b231b. --- .../virtual/perl-IO/perl-IO-1.460.0.ebuild | 2 +- .../virtual/perl-IO/perl-IO-1.500.0.ebuild | 2 +- .../virtual/perl-IO/perl-IO-1.520.0.ebuild | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.520.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.460.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.460.0.ebuild index a076a298bf..4acb2b86f0 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.460.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.460.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 DESCRIPTION="Virtual for ${PN#perl-}" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" || ( =dev-lang/perl-5.34* ~perl-core/${PN#perl-}-${PV} ) diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.500.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.500.0.ebuild index ac44e5be67..f70f852433 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.500.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.500.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DESCRIPTION="Virtual for ${PN#perl-}" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=" || ( =dev-lang/perl-5.36* ~perl-core/${PN#perl-}-${PV} ) diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.520.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.520.0.ebuild new file mode 100644 index 0000000000..6f04cf8ad5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.520.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Virtual for ${PN#perl-}" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + || ( =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} ) + dev-lang/perl:= + !perl-core/${PN#perl-}-${PV}-r999 +" From 083d9668f13425e6daacf3e69f0cdfa2cd545feb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:12 +0000 Subject: [PATCH 184/202] virtual/pkgconfig: Sync with Gentoo It's from Gentoo commit 77f67752cd0fa1d306b5d82723954ac8dbc6cd6c. --- .../portage-stable/virtual/pkgconfig/pkgconfig-2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/pkgconfig-2-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/pkgconfig-2-r1.ebuild index 089e01b769..7582e53ba7 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/pkgconfig-2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/pkgconfig-2-r1.ebuild @@ -5,6 +5,6 @@ EAPI=7 DESCRIPTION="Virtual for the pkg-config implementation" SLOT="0" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" RDEPEND=">=dev-util/pkgconf-1.3.7[pkg-config(+)]" From 260954ffe79cfd18acde4ae5a5cc70587c900981 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:15:12 +0000 Subject: [PATCH 185/202] x11-libs/pixman: Sync with Gentoo It's from Gentoo commit bd7cb186c573e4c26d83a4fd62b06e201182c847. --- .../portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild | 2 +- .../portage-stable/x11-libs/pixman/pixman-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild index 2e5fa64a85..e80504458b 100644 --- a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.42.2.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" if [[ ${PV} = 9999* ]]; then SRC_URI="" else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz" fi diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-9999.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-9999.ebuild index e4c0e9e9a0..fa237942c4 100644 --- a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-9999.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" if [[ ${PV} = 9999* ]]; then SRC_URI="" else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz" fi From dfbf82098c529c78bd3e21a5d92e1d8f962d3134 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 6 Jun 2023 16:16:08 +0200 Subject: [PATCH 186/202] overlay profiles: Drop accept keywords for sys-libs/libcap It became stable for both amd64 and arm64. --- .../profiles/coreos/base/package.accept_keywords | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index ec10ee586c..6b0aea50a6 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -67,11 +67,6 @@ # Keep versions on both arches in sync. =sys-fs/multipath-tools-0.9.4-r1 ~amd64 - -# Needed to address CVE-2023-2602 and CVE-2023-2603. -=sys-libs/libcap-2.69 ~amd64 ~arm64 - -# Keep versions on both arches in sync. =sys-libs/libselinux-3.1-r2 ~arm64 =sys-libs/libsemanage-3.1-r1 ~arm64 =sys-libs/libsepol-3.1 ~arm64 From eca45840ca678fe844e19fa011a417b1692aabc4 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 6 Jun 2023 17:51:57 +0200 Subject: [PATCH 187/202] sys-apps/config-site: Add from Gentoo It's from Gentoo commit 940fa400354017ec9cc840f3e2cb897f73bce9c6. --- .../sys-apps/config-site/config-site-0.ebuild | 24 +++++++++++++++++++ .../sys-apps/config-site/files/config.site.in | 10 ++++++++ .../sys-apps/config-site/metadata.xml | 7 ++++++ 3 files changed, 41 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/config-site/config-site-0.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/config-site/files/config.site.in create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/config-site/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/config-site/config-site-0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/config-site/config-site-0.ebuild new file mode 100644 index 0000000000..ba0ded685c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/config-site/config-site-0.ebuild @@ -0,0 +1,24 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="config.site to load dropins from config.site.d" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base" +S=${WORKDIR} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + +RDEPEND="! config.site || die +} + +src_install() { + insinto /usr/share + doins config.site +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/config-site/files/config.site.in b/sdk_container/src/third_party/portage-stable/sys-apps/config-site/files/config.site.in new file mode 100644 index 0000000000..1e732cf28a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/config-site/files/config.site.in @@ -0,0 +1,10 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +for script in "@datarootdir@/config.site.d"/*.conf; do + test -f "${script}" || continue + test -r "${script}" || continue + echo "${0##*/}: loading site script ${script}" + . "${script}" || break +done +unset script diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/config-site/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/config-site/metadata.xml new file mode 100644 index 0000000000..65e1fc82d8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/config-site/metadata.xml @@ -0,0 +1,7 @@ + + + + + base-system@gentoo.org + + From 65a5a764e45c045f0355010050e8f42390f85d31 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 6 Jun 2023 17:53:12 +0200 Subject: [PATCH 188/202] .github: Add sys-apps/config-site to automation list --- .github/workflows/portage-stable-packages-list | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index b9ab1eb8c1..227b192702 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -350,6 +350,7 @@ profiles sys-apps/acl sys-apps/attr +sys-apps/config-site sys-apps/coreutils sys-apps/debianutils sys-apps/diffutils From 317b9c43642ee35a2d5feec6a82f18a3c43394b3 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 7 Jun 2023 11:03:02 +0200 Subject: [PATCH 189/202] overlay profiles: Update accept keywords for net-misc/curl --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 6b0aea50a6..4993705c0e 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -42,7 +42,7 @@ =net-libs/libnetfilter_cttimeout-1.0.0-r1 ~arm64 # Required for addressing CVE-2023-28319, CVE-2023-28320, CVE-2023-28321 and CVE-2023-28322. -=net-misc/curl-8.1.0 ~amd64 ~arm64 +=net-misc/curl-8.1.0-r1 ~amd64 ~arm64 # Keep versions on both arches in sync. =sec-policy/selinux-base-2.20200818-r2 ~arm64 From dc3f09b90f439942d67c8997187f8c5f63544298 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 7 Jun 2023 11:17:06 +0200 Subject: [PATCH 190/202] overlay profiles: Add accept keywords for net-dns/c-ares --- .../profiles/coreos/base/package.accept_keywords | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 4993705c0e..63f033e485 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -32,6 +32,12 @@ =dev-libs/ding-libs-0.6.1-r1 ~arm64 =dev-libs/libgcrypt-1.10.1-r3 ~arm64 =dev-util/bpftool-6.2.1 ~arm64 + +# Required for addressing CVE-2023-31124, CVE-2023-31130, +# CVE-2023-31147 and CVE-2023-32067. +=net-dns/c-ares-1.19.1 ~amd64 ~arm64 + +# Keep versions on both arches in sync. =net-firewall/conntrack-tools-1.4.6-r1 ~arm64 # Required for addressing CVE-2023-0361. From 60e0e9390cc9422b5d95321af49bd55ce7b0abda Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 7 Jun 2023 12:53:19 +0200 Subject: [PATCH 191/202] dev-perl/Unicode-EastAsianWidth: Drop unused package --- .../dev-perl/Unicode-EastAsianWidth/Manifest | 1 - .../Unicode-EastAsianWidth-12.0.0.ebuild | 21 ------------------- .../Unicode-EastAsianWidth/metadata.xml | 12 ----------- 3 files changed, 34 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/Manifest b/sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/Manifest deleted file mode 100644 index 20f6d9ace2..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST Unicode-EastAsianWidth-12.0.tar.gz 52302 BLAKE2B 0754158580de0a442e5ff6a9f3e0cf9d3765e1e5a7cd73a2c748ad003951b571bb71b38c8d92e6badb438e0eea377df9dd2e22ac9e14f9ea8c61672d0679481c SHA512 ec11d12b86d9e3676cf612c40f8e75ce1efdd302b5a6fe5d594306cffcf94f91855b5ee979f7646762605453d08d4b6b47f556e56f01b47d8ca1da8455dc138d diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild deleted file mode 100644 index 46c694d0ae..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-12.0.0.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DIST_AUTHOR=AUDREYT -DIST_VERSION=12.0 -inherit perl-module - -DESCRIPTION="East Asian Width properties" - -LICENSE="CC0-1.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=" - virtual/perl-File-Spec -" -BDEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker -" diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/metadata.xml deleted file mode 100644 index 52fecb51ff..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Unicode-EastAsianWidth/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - perl@gentoo.org - Gentoo Perl Project - - - Unicode-EastAsianWidth - Unicode::EastAsianWidth - - From e3cfdc2cfa546129d171a882e69d36ff6b45bdea Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 7 Jun 2023 12:54:20 +0200 Subject: [PATCH 192/202] .github: Drop dev-perl/Unicode-EastAsianWidth from automation --- .github/workflows/portage-stable-packages-list | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 227b192702..fed78e23b2 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -163,7 +163,6 @@ dev-perl/File-Slurp dev-perl/Locale-gettext dev-perl/Parse-Yapp dev-perl/Text-Unidecode -dev-perl/Unicode-EastAsianWidth dev-python/autocommand dev-python/boto From 0fc46c9328d0f2dae66c80b89bba134210e52860 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 7 Jun 2023 12:55:26 +0200 Subject: [PATCH 193/202] dev-perl/Text-Unidecode: Drop unused package --- .../portage-stable/dev-perl/Text-Unidecode/Manifest | 1 - .../Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild | 13 ------------- .../dev-perl/Text-Unidecode/metadata.xml | 12 ------------ 3 files changed, 26 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/Manifest b/sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/Manifest deleted file mode 100644 index 040702db8e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST Text-Unidecode-1.30.tar.gz 137977 BLAKE2B 0deb00376f5bf458c71c6ab1aa96d6ef43c404bf75b886b2c57050d71c4c7e2f3de2ef12b784459346c73717dc8852bb4127992bec71dbcf0f5398a066418f08 SHA512 194f8aba0dcdc7a53338b86370b7cfb6c60d4a8982ada6084f0eb0ccd66ce461b831b6daf04932f039ff1b983dc3cd0c0ced1e8b455955d2699c36120b41a526 diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild deleted file mode 100644 index cdb76ac3c9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/Text-Unidecode-1.300.0-r1.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DIST_AUTHOR=SBURKE -DIST_VERSION=1.30 -inherit perl-module - -DESCRIPTION="Plain ASCII transliterations of Unicode text" - -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/metadata.xml deleted file mode 100644 index 9a7ef3fe02..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-perl/Text-Unidecode/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - perl@gentoo.org - Gentoo Perl Project - - - Text-Unidecode - Text::Unidecode - - From 5b3f36ae42954d08cef5ad390df19e0bb3cb0709 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 7 Jun 2023 12:55:48 +0200 Subject: [PATCH 194/202] .github: Drop dev-perl/Text-Unidecode from automation --- .github/workflows/portage-stable-packages-list | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index fed78e23b2..7b86ddcbc1 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -162,7 +162,6 @@ dev-libs/userspace-rcu dev-perl/File-Slurp dev-perl/Locale-gettext dev-perl/Parse-Yapp -dev-perl/Text-Unidecode dev-python/autocommand dev-python/boto From e99ec838243fbf6de35c1f6fe5f5dbda487ec9b6 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 7 Jun 2023 15:50:31 +0200 Subject: [PATCH 195/202] overlay dev-lang/go-bootstrap: Remove package leftovers --- .../dev-lang/go-bootstrap/ChangeLog | 17 ----------------- .../dev-lang/go-bootstrap/metadata.xml | 13 ------------- 2 files changed, 30 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/go-bootstrap/ChangeLog delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/go-bootstrap/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go-bootstrap/ChangeLog b/sdk_container/src/third_party/coreos-overlay/dev-lang/go-bootstrap/ChangeLog deleted file mode 100644 index 6e69f814a4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go-bootstrap/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ -# ChangeLog for dev-lang/go-bootstrap -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go-bootstrap/ChangeLog,v 1.2 2015/03/18 00:51:29 williamh Exp $ - -*go-bootstrap-1.4.2 (18 Mar 2015) - - 18 Mar 2015; William Hubbs +go-bootstrap-1.4.2.ebuild: - version bump - -*go-bootstrap-1.4.1 (20 Jan 2015) - - 20 Jan 2015; William Hubbs +go-bootstrap-1.4.1.ebuild, - +metadata.xml: - Initial commit of go-bootstrap for bug #536960. - go-bootstrap is intended only as a build time dependency used to build - newer versions of go. - See https://golang.org/s/go15bootstrap for how this works. diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go-bootstrap/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-lang/go-bootstrap/metadata.xml deleted file mode 100644 index afdfdb9907..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go-bootstrap/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - williamh@gentoo.org - William Hubbs - - - This package is only necessary until gccgo supports go-1.4. It - will be removed as soon as stable gcc supports this. - It is here so that >=dev-lang/go 1.5 can use it to bootstrap. - - From ed44190b189838848d0e4f45e4b09d2cca9da8c1 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 7 Jun 2023 16:11:53 +0200 Subject: [PATCH 196/202] overlay profiles: Update accept keywords for app-shells/bash --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 63f033e485..c645217e3c 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -13,7 +13,7 @@ =app-emulation/open-vmdk-1.0 * # Required for addressing CVE-2022-3715. -=app-shells/bash-5.2_p15-r2 ~amd64 ~arm64 +=app-shells/bash-5.2_p15-r3 ~amd64 ~arm64 # No keyword for arm64 yet. =coreos-devel/fero-client-0.1.1 ** From c0c80fb5d8a8a51f9c2691fc7b9e2db0a5efb105 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 7 Jun 2023 16:12:14 +0200 Subject: [PATCH 197/202] overlay profiles: Drop obsolete USE flags for app-shells/bash It was obsolete since 2016. --- .../profiles/coreos/targets/generic/package.use | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use index 269d4bdc21..c7cfe784d4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use @@ -27,8 +27,8 @@ net-libs/libmicrohttpd epoll sys-boot/syslinux -custom-cflags -# minimize risk removing unneeded patches and networking support -app-shells/bash -net vanilla +# minimize risk removing networking support +app-shells/bash -net # needed by docker sys-libs/libseccomp static-libs From a60a79df1f140c3cbc18d2f1f66bc3d1cd2677b0 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 7 Jun 2023 16:35:48 +0200 Subject: [PATCH 198/202] app-eselect/eselect-lua: Drop unused package We marked it as provided, so it is never built. --- .../eselect-lua/eselect-lua-4-r1.ebuild | 22 --- .../eselect-lua/files/lua.eselect-4 | 133 ------------------ .../app-eselect/eselect-lua/metadata.xml | 13 -- 3 files changed, 168 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/files/lua.eselect-4 delete mode 100644 sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild deleted file mode 100644 index 3b082835f9..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Lua eselect module" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="" - -RDEPEND="app-admin/eselect - !dev-lang/lua:0" - -S="${WORKDIR}" - -src_install() { - insinto /usr/share/eselect/modules/ - newins "${FILESDIR}"/lua.eselect-${PV} lua.eselect -} diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/files/lua.eselect-4 b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/files/lua.eselect-4 deleted file mode 100644 index 86c19460a1..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/files/lua.eselect-4 +++ /dev/null @@ -1,133 +0,0 @@ -# -*-eselect-*- vim: ft=eselect -# Copyright 2014-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -inherit config multilib - -DESCRIPTION="Manage lua symlinks" -MAINTAINER="mva@gentoo.org" - -HEADER_FILES="lauxlib.h luaconf.h lua.h lua.hpp lualib.h" - -remove_symlinks() { - rm -f "${EROOT}"/usr/bin/{lua,luac} &>/dev/null - rm -f "${EROOT}"/usr/share/man/man1/lua{,c}.1{,.*} &>/dev/null - # Possible leftovers from earlier versions - for dir in $(get_libdirs) ; do - rm -f "${EROOT}"${dir}/liblua.so &>/dev/null && \ - rm -f "${EROOT}"${dir}/pkgconfig/lua.pc &>/dev/null - done - for f in $HEADER_FILES ; do - rm -f "${EROOT}"/usr/include/${f} - done -} - -_dup() { - dirname ${1}/. -} - -set_symlinks() { - local ver=${1#lua} - local bin_prefix="${EROOT}/usr/bin" - ln -s lua${ver} $(_dup "${bin_prefix}"/lua) - if [[ -f "${bin_prefix}"/luac${ver} ]]; then - ln -s luac${ver} $(_dup "${bin_prefix}"/luac) - fi - for manpage in "${EROOT}"/usr/share/man/man1/lua{,c}${ver}.1.* ; do - test -f ${manpage} && - ln -s $(basename "${manpage}") $(_dup "${manpage//${ver}}") - done -} - -get_libdirs() { - local dir libdirs - for dir in $(list_libdirs); do - [[ -L ${EROOT}/usr/${dir} ]] && continue - ls "${EROOT}"/usr/${dir}/liblua*.* > /dev/null 2>&1 || continue - - libdirs+=' '/usr/${dir} - done - echo ${libdirs:-/usr/lib} -} - -find_targets() { - local dirs - local prefix="${EROOT}/usr/bin/" - for f in ${prefix}lua{5,jit-2}.* ; do - [[ -f "${f}" ]] && dirs="${dirs} ${f##$prefix}" - done - echo $dirs -} - -resolve_target() { - local targets=( $(find_targets) ) - if is_number $1; then - [[ $1 -le ${#targets[@]} && $1 -gt 0 ]] && echo "${targets[ $(( $1 - 1 )) ]}" - elif has $1 ${targets[@]}; then - echo $1 - fi -} - -get_active_version() { - readlink -e "${EROOT}"/usr/bin/lua | sed -ne "s:.*/usr/bin/\([\w.-]*\):\1:p" -} - -## Actual actions - -## set action - -describe_set() { - echo "Sets the current version of lua" -} - -describe_set_parameters() { - echo '[--if-unset] ' -} - -describe_set_options() { - echo '--if-unset: Do not replace currently selected implementation' - echo 'target: Target name or number (from "list" action)' -} - -do_set() { - if [ "${1}" == "--if-unset" ]; then - if [[ -n "$(get_active_version)" ]]; then - return - fi - shift - fi - - local target=$(resolve_target $1) - if [[ -z "${target}" ]]; then - die -q "You need to specify a version" - fi - remove_symlinks - set_symlinks $target -} - -## List action - -describe_list() { - echo 'Lists available lua versions' -} - -do_list() { - local targets - local a - targets=( $(find_targets) ) - a=$(get_active_version) - for (( i = 0; i < ${#targets[@]}; i++ )) ; do - [[ $a == ${targets[i]} ]] && targets[i]=$(highlight_marker "${targets[i]}") - done - write_numbered_list -m '(none found)' "${targets[@]}" -} - -## Show action - -describe_show() { - echo 'Show the active lua version' -} - -do_show() { - get_active_version -} diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/metadata.xml b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/metadata.xml deleted file mode 100644 index 7e0efa3dd0..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-lua/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - williamh@gentoo.org - William Hubbs - - - mva@gentoo.org - Vadim Misbakh-Soloviov - - - From 4d6e0efa45cf9eeeb5ea41d57725166a418b619e Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 7 Jun 2023 16:36:43 +0200 Subject: [PATCH 199/202] .github: Drop app-eselect/eselect-lua from package automation --- .github/workflows/portage-stable-packages-list | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 7b86ddcbc1..ccea78996d 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -97,7 +97,6 @@ app-emulation/qemu app-emulation/qemu-guest-agent app-eselect/eselect-iptables -app-eselect/eselect-lua app-misc/c_rehash app-misc/editor-wrapper From 2396a9bdd15837afa8e54d8fd2998328d094370b Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 8 Jun 2023 07:51:57 +0200 Subject: [PATCH 200/202] eclass/xorg-3: Sync with Gentoo It's from Gentoo commit 3db70e9c014e415ae38a713b47cf7b299fd11945. --- .../portage-stable/eclass/xorg-3.eclass | 135 +++++++++--------- 1 file changed, 69 insertions(+), 66 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass b/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass index d5dadbad3f..c3ece64ae4 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xorg-3.eclass @@ -8,7 +8,7 @@ # Author: Tomáš Chvátal # Author: Donnie Berkholz # Author: Matt Turner -# @SUPPORTED_EAPIS: 7 +# @SUPPORTED_EAPIS: 7 8 # @PROVIDES: multilib-minimal # @BLURB: Reduces code duplication in the modularized X11 ebuilds. # @DESCRIPTION: @@ -22,10 +22,18 @@ # with the other X packages, you don't need to set SRC_URI. Pretty much # everything else should be automatic. +case ${EAPI} in + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac + +if [[ -z ${_XORG_3_ECLASS} ]]; then +_XORG_3_ECLASS=1 + GIT_ECLASS="" if [[ ${PV} == *9999* ]]; then GIT_ECLASS="git-r3" - : ${XORG_EAUTORECONF:="yes"} + : "${XORG_EAUTORECONF:="yes"}" fi # If we're a font package, but not the font.alias one @@ -42,53 +50,41 @@ if [[ ${CATEGORY} = media-fonts ]]; then esac fi -# @ECLASS-VARIABLE: XORG_MULTILIB +# @ECLASS_VARIABLE: XORG_MULTILIB # @PRE_INHERIT # @DESCRIPTION: # If set to 'yes', the multilib support for package will be enabled. Set # before inheriting this eclass. -: ${XORG_MULTILIB:="no"} +: "${XORG_MULTILIB:="no"}" # we need to inherit autotools first to get the deps inherit autotools libtool multilib toolchain-funcs flag-o-matic \ ${FONT_ECLASS} ${GIT_ECLASS} +unset FONT_ECLASS GIT_ECLASS -if [[ ${XORG_MULTILIB} == yes ]]; then - inherit multilib-minimal -fi +[[ ${XORG_MULTILIB} == yes ]] && inherit multilib-minimal -EXPORTED_FUNCTIONS="src_prepare src_configure src_unpack src_compile src_install pkg_postinst pkg_postrm" -case "${EAPI:-0}" in - 7) ;; - *) die "EAPI=${EAPI} is not supported" ;; -esac - -# exports must be ALWAYS after inherit -EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} - -IUSE="" - -# @ECLASS-VARIABLE: XORG_EAUTORECONF +# @ECLASS_VARIABLE: XORG_EAUTORECONF # @PRE_INHERIT # @DESCRIPTION: # If set to 'yes' and configure.ac exists, eautoreconf will run. Set # before inheriting this eclass. -: ${XORG_EAUTORECONF:="no"} +: "${XORG_EAUTORECONF:="no"}" -# @ECLASS-VARIABLE: XORG_BASE_INDIVIDUAL_URI +# @ECLASS_VARIABLE: XORG_BASE_INDIVIDUAL_URI # @PRE_INHERIT # @DESCRIPTION: # Set up SRC_URI for individual modular releases. If set to an empty # string, no SRC_URI will be provided by the eclass. -: ${XORG_BASE_INDIVIDUAL_URI="https://www.x.org/releases/individual"} +: "${XORG_BASE_INDIVIDUAL_URI="https://www.x.org/releases/individual"}" -# @ECLASS-VARIABLE: XORG_MODULE +# @ECLASS_VARIABLE: XORG_MODULE # @PRE_INHERIT # @DESCRIPTION: # The subdirectory to download source from. Possible settings are app, # doc, data, util, driver, font, lib, proto, xserver. Set above the # inherit to override the default autoconfigured module. -: ${XORG_MODULE:="auto"} +: "${XORG_MODULE:="auto"}" if [[ ${XORG_MODULE} == auto ]]; then case "${CATEGORY}/${P}" in app-doc/*) XORG_MODULE=doc/ ;; @@ -103,38 +99,37 @@ if [[ ${XORG_MODULE} == auto ]]; then esac fi -# @ECLASS-VARIABLE: XORG_PACKAGE_NAME +# @ECLASS_VARIABLE: XORG_PACKAGE_NAME # @PRE_INHERIT # @DESCRIPTION: # For git checkout the git repository might differ from package name. # This variable can be used for proper directory specification -: ${XORG_PACKAGE_NAME:=${PN}} +: "${XORG_PACKAGE_NAME:=${PN}}" HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}" -# @ECLASS-VARIABLE: XORG_TARBALL_SUFFIX +# @ECLASS_VARIABLE: XORG_TARBALL_SUFFIX # @PRE_INHERIT # @DESCRIPTION: # Most X11 projects provide tarballs as tar.bz2 or tar.xz. This eclass defaults # to bz2. -: ${XORG_TARBALL_SUFFIX:="bz2"} +: "${XORG_TARBALL_SUFFIX:="bz2"}" -if [[ -n ${GIT_ECLASS} ]]; then - : ${EGIT_REPO_URI:="https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}.git"} +if [[ ${PV} == *9999* ]]; then + : "${EGIT_REPO_URI:="https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}.git"}" elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.${XORG_TARBALL_SUFFIX}" fi -: ${SLOT:=0} +: "${SLOT:=0}" # Set the license for the package. This can be overridden by setting # LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages # are under the MIT license. (This is what Red Hat does in their rpms) -: ${LICENSE:=MIT} +: "${LICENSE:=MIT}" # Set up autotools shared dependencies # Remember that all versions here MUST be stable -XORG_EAUTORECONF_ARCHES="x86-winnt" EAUTORECONF_DEPEND+=" >=sys-devel/libtool-2.2.6a sys-devel/m4" @@ -143,17 +138,19 @@ if [[ ${PN} != util-macros ]] ; then # Required even by xorg-server [[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0" fi -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" -for arch in ${XORG_EAUTORECONF_ARCHES}; do - EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )" -done -unset arch BDEPEND+=" ${EAUTORECONF_DEPENDS}" [[ ${XORG_EAUTORECONF} != no ]] && BDEPEND+=" ${EAUTORECONF_DEPEND}" unset EAUTORECONF_DEPENDS unset EAUTORECONF_DEPEND +# @ECLASS_VARIABLE: FONT_DIR +# @PRE_INHERIT +# @DESCRIPTION: +# If you're creating a font package and the suffix of PN is not equal to +# the subdirectory of /usr/share/fonts/ it should install into, set +# FONT_DIR to that directory or directories. Set before inheriting this +# eclass. + if [[ ${FONT} == yes ]]; then RDEPEND+=" media-fonts/encodings >=x11-apps/mkfontscale-1.2.0" @@ -162,13 +159,6 @@ if [[ ${FONT} == yes ]]; then >=x11-apps/mkfontscale-1.2.0" BDEPEND+=" x11-apps/bdftopcf" - # @ECLASS-VARIABLE: FONT_DIR - # @PRE_INHERIT - # @DESCRIPTION: - # If you're creating a font package and the suffix of PN is not equal to - # the subdirectory of /usr/share/fonts/ it should install into, set - # FONT_DIR to that directory or directories. Set before inheriting this - # eclass. [[ -z ${FONT_DIR} ]] && FONT_DIR=${PN##*-} # Fix case of font directories @@ -179,14 +169,14 @@ if [[ ${FONT} == yes ]]; then fi BDEPEND+=" virtual/pkgconfig" -# @ECLASS-VARIABLE: XORG_DRI +# @ECLASS_VARIABLE: XORG_DRI # @PRE_INHERIT # @DESCRIPTION: # Possible values are "always" or the value of the useflag DRI capabilities # are required for. Default value is "no" # # Eg. XORG_DRI="opengl" will pull all dri dependent deps for opengl useflag -: ${XORG_DRI:="no"} +: "${XORG_DRI:="no"}" DRI_COMMON_DEPEND=" x11-base/xorg-server[-minimal] @@ -213,20 +203,19 @@ if [[ ${PN} == xf86-video-* || ${PN} == xf86-input-* ]]; then fi -# @ECLASS-VARIABLE: XORG_DOC +# @ECLASS_VARIABLE: XORG_DOC # @PRE_INHERIT # @DESCRIPTION: # Possible values are "always" or the value of the useflag doc packages # are required for. Default value is "no" # # Eg. XORG_DOC="manual" will pull all doc dependent deps for manual useflag -: ${XORG_DOC:="no"} +: "${XORG_DOC:="no"}" DOC_DEPEND=" doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto - app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 @@ -269,7 +258,7 @@ xorg-3_pkg_setup() { xorg-3_src_unpack() { debug-print-function ${FUNCNAME} "$@" - if [[ -n ${GIT_ECLASS} ]]; then + if [[ ${PV} == *9999* ]]; then git-r3_src_unpack else unpack ${A} @@ -339,9 +328,12 @@ xorg-3_flags_setup() { # Win32 require special define [[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__ - # hardened ldflags - [[ ${PN} == xorg-server || ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] \ - && append-ldflags -Wl,-z,lazy + + # Hardened flags break module autoloading et al (also fixes #778494) + if [[ ${PN} == xorg-server || ${PN} == xf86-video-* || ${PN} == xf86-input-* ]]; then + filter-flags -fno-plt + append-ldflags -Wl,-z,lazy + fi # Quite few libraries fail on runtime without these: if has static-libs ${IUSE//+}; then @@ -355,6 +347,11 @@ multilib_src_configure() { ECONF_SOURCE="${S}" econf "${econfargs[@]}" } +# @VARIABLE: XORG_CONFIGURE_OPTIONS +# @DESCRIPTION: +# Array of an additional options to pass to configure. +# @DEFAULT_UNSET + # @FUNCTION: xorg-3_src_configure # @DESCRIPTION: # Perform any necessary pre-configuration steps, then run configure @@ -363,10 +360,6 @@ xorg-3_src_configure() { xorg-3_flags_setup - # @VARIABLE: XORG_CONFIGURE_OPTIONS - # @DESCRIPTION: - # Array of an additional options to pass to configure. - # @DEFAULT_UNSET local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}") local FONT_OPTIONS=() @@ -375,7 +368,7 @@ xorg-3_src_configure() { # Check if package supports disabling of dep tracking # Fixes warnings like: # WARNING: unrecognized options: --disable-dependency-tracking - if grep -q -s "disable-depencency-tracking" ${ECONF_SOURCE:-.}/configure; then + if grep -q -s "disable-dependency-tracking" ${ECONF_SOURCE:-.}/configure; then local dep_track="--disable-dependency-tracking" fi @@ -413,7 +406,7 @@ xorg-3_src_configure() { } multilib_src_compile() { - emake "$@" || die 'emake failed' + emake "$@" } # @FUNCTION: xorg-3_src_compile @@ -425,12 +418,12 @@ xorg-3_src_compile() { if [[ ${XORG_MULTILIB} == yes ]]; then multilib-minimal_src_compile "$@" else - emake "$@" || die 'emake failed' + emake "$@" fi } multilib_src_install() { - emake DESTDIR="${D}" "${install_args[@]}" "$@" install || die "emake install failed" + emake DESTDIR="${D}" "${install_args[@]}" "$@" install } # @FUNCTION: xorg-3_src_install @@ -444,7 +437,7 @@ xorg-3_src_install() { if [[ ${XORG_MULTILIB} == yes ]]; then multilib-minimal_src_install "$@" else - emake DESTDIR="${D}" "${install_args[@]}" "$@" install || die "emake install failed" + emake DESTDIR="${D}" "${install_args[@]}" "$@" install einstalldocs fi @@ -461,7 +454,13 @@ xorg-3_src_install() { # Don't install libtool archives (even for modules) find "${D}" -type f -name '*.la' -delete || die - [[ -n ${FONT} ]] && remove_font_metadata + if [[ -n ${FONT} ]] ; then + if [[ -n ${FONT_OPENTYPE_COMPAT} ]] && in_iuse opentype-compat && use opentype-compat ; then + font_wrap_opentype_compat + fi + + remove_font_metadata + fi } # @FUNCTION: xorg-3_pkg_postinst @@ -538,3 +537,7 @@ create_fonts_dir() { -- "${EROOT}/usr/share/fonts/${FONT_DIR}" eend $? } + +fi + +EXPORT_FUNCTIONS src_prepare src_configure src_unpack src_compile src_install pkg_postinst pkg_postrm From 88b8dce55d6a49e668a542b9899a45fc3ebadde4 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 8 Jun 2023 07:54:22 +0200 Subject: [PATCH 201/202] .github: Add xorg-3.eclass to package automation --- .github/workflows/portage-stable-packages-list | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index ccea78996d..1b29c3db32 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -300,6 +300,7 @@ eclass/virtualx.eclass eclass/waf-utils.eclass eclass/wrapper.eclass eclass/xdg-utils.eclass +eclass/xorg-3.eclass licenses From 9263952f95735ae0ee469c6ac70434b602cc1484 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 13 Jun 2023 13:38:32 +0200 Subject: [PATCH 202/202] changelog: Add entries --- changelog/security/2023-06-13-weekly-updates.md | 1 + changelog/updates/2023-06-13-weekly-updates.md | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 changelog/security/2023-06-13-weekly-updates.md create mode 100644 changelog/updates/2023-06-13-weekly-updates.md diff --git a/changelog/security/2023-06-13-weekly-updates.md b/changelog/security/2023-06-13-weekly-updates.md new file mode 100644 index 0000000000..46efac2d6b --- /dev/null +++ b/changelog/security/2023-06-13-weekly-updates.md @@ -0,0 +1 @@ +- c-ares ([CVE-2023-31124](https://nvd.nist.gov/vuln/detail/CVE-2023-31124), [CVE-2023-31130](https://nvd.nist.gov/vuln/detail/CVE-2023-31130), [CVE-2023-31147](https://nvd.nist.gov/vuln/detail/CVE-2023-31147), [CVE-2023-32067](https://nvd.nist.gov/vuln/detail/CVE-2023-32067)) diff --git a/changelog/updates/2023-06-13-weekly-updates.md b/changelog/updates/2023-06-13-weekly-updates.md new file mode 100644 index 0000000000..0e9889311b --- /dev/null +++ b/changelog/updates/2023-06-13-weekly-updates.md @@ -0,0 +1,3 @@ +- strace ([6.2](https://github.com/strace/strace/releases/tag/v6.2)) +- c-ares ([1.19.1](https://github.com/c-ares/c-ares/releases/tag/cares-1_19_1)) +- less ([632](http://www.greenwoodsoftware.com/less/news.632.html))