From e5e40b8c582389dc95f2924ed469259e3f448542 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:03 +0000 Subject: [PATCH 001/130] app-alternatives/ninja: Sync with Gentoo It's from Gentoo commit 0bc26d0779f0c933a5c1b5a93cde15a0a9e051bc. --- .../portage-stable/app-alternatives/ninja/metadata.xml | 4 ++-- .../portage-stable/app-alternatives/ninja/ninja-1.ebuild | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/ninja/metadata.xml b/sdk_container/src/third_party/portage-stable/app-alternatives/ninja/metadata.xml index 20bceb3089..c55e088975 100644 --- a/sdk_container/src/third_party/portage-stable/app-alternatives/ninja/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-alternatives/ninja/metadata.xml @@ -10,7 +10,7 @@ Violet Purcell - Symlink to dev-util/ninja. - Symlink to dev-util/samurai. + Symlink to dev-build/ninja. + Symlink to dev-build/samurai. diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/ninja/ninja-1.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/ninja/ninja-1.ebuild index 419eabab35..4107b5569b 100644 --- a/sdk_container/src/third_party/portage-stable/app-alternatives/ninja/ninja-1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-alternatives/ninja/ninja-1.ebuild @@ -1,11 +1,11 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ALTERNATIVES=( - "reference:>=dev-util/ninja-1.11.1-r3" - samurai:dev-util/samurai + "reference:>=dev-build/ninja-1.11.1-r3" + samurai:dev-build/samurai ) inherit app-alternatives @@ -13,7 +13,7 @@ inherit app-alternatives DESCRIPTION="ninja symlinks" 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, 15 Jan 2024 07:10:05 +0000 Subject: [PATCH 002/130] app-alternatives/yacc: Sync with Gentoo It's from Gentoo commit 1a763262ad22cd7d7b82092588e2d0f321cf35c8. --- .../portage-stable/app-alternatives/yacc/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/yacc/metadata.xml b/sdk_container/src/third_party/portage-stable/app-alternatives/yacc/metadata.xml index 0672d9fe1a..814bdd49cc 100644 --- a/sdk_container/src/third_party/portage-stable/app-alternatives/yacc/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-alternatives/yacc/metadata.xml @@ -11,7 +11,7 @@ - Symlink to sys-devel/bison. + Symlink to app-alternatives/yacc. Symlink to dev-util/byacc. From 07255e8a0a84159ae3596adbbcf986e0303b9d98 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:06 +0000 Subject: [PATCH 003/130] app-arch/cpio: Sync with Gentoo It's from Gentoo commit 0654ccd5b3fadcb33ea6edf2ffb898b55fda2021. --- .../portage-stable/app-arch/cpio/Manifest | 1 + .../app-arch/cpio/cpio-2.15.ebuild | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.15.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/cpio/Manifest index dfe669870d..fd953b128e 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/cpio/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-arch/cpio/Manifest @@ -1,3 +1,4 @@ DIST cpio-2.13-CVE-2021-38185.patch.xz 7844 BLAKE2B e338950e03c3eed3b4288435c9c75af8f0c3497b43680be4ee347e628db7cfac616b437a848094bf82cfc2c7f29d59b388bf0f6368b3b99770022e3f9533be11 SHA512 4d2cafefcd1ae9d86cb5171de2896799713490dfd9ed27d3dce0886fa4588c8df2b16ad8508a5dbb9155c9de6e40b6d1083bdb4774d967193a270a1dcbe37a33 DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3 DIST cpio-2.14.tar.bz2 1521004 BLAKE2B f2fa9f5bc39cd91f4755fdf27f43cff4d1c1f098639502689a01314762ad686bf357a1eda7f92e4c802e6e8335548ca31fc789cea056ef685c558892ddcbebd1 SHA512 2dc93a81e31b6fb7ff9976243d22ca7a84bb396c7ad09e0abfb5d5efae1164ebb319fb89be45045797f8c604b3e3d2ea0746e3cfe559aa86282ea4ec9a17da28 +DIST cpio-2.15.tar.bz2 1651320 BLAKE2B ca2aae6a00239be7aff5558a2e62b4fb4b43c2ed7f4d7a23699c958ae10b348c4ebf39233f0dd0242cba895fdac4d0ff3b4e56fefa0b1afe3db41eb6916e0b23 SHA512 e3c3d0344d13d540887198ee5d6209a9254ed34b87c3b3cabe6dc3ce22ef94d3f380bb60d3395eee44e4b0ec8460b957032c6251f101b4a9fbc5951a701aadff diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.15.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.15.ebuild new file mode 100644 index 0000000000..e9733b098c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.15.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="File archival tool which can also read and write tar files" +HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html" +SRC_URI="mirror://gnu/cpio/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="nls" + +PDEPEND=" + app-alternatives/cpio +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch # bug #275295 +) + +QA_CONFIG_IMPL_DECL_SKIP=( + unreachable + MIN + alignof + static_assert +) + +src_configure() { + local myeconfargs=( + $(use_enable nls) + --bindir="${EPREFIX}"/bin + --with-rmt="${EPREFIX}"/usr/sbin/rmt + # install as gcpio for better compatibility with non-GNU userland + --program-prefix=g + ) + + econf "${myeconfargs[@]}" +} + +pkg_postinst() { + # Ensure to preserve the symlink before app-alternatives/cpio + # is installed + if [[ ! -h ${EROOT}/bin/cpio ]]; then + ln -s gcpio "${EROOT}/bin/cpio" || die + fi +} From 2a1e44a37f920493cda10229668dd6f41588f9cf Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:06 +0000 Subject: [PATCH 004/130] app-arch/gzip: Sync with Gentoo It's from Gentoo commit 932d17d6445879914a6c6f0c192a715cbc19e94a. --- .../third_party/portage-stable/app-arch/gzip/gzip-1.13.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.13.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.13.ebuild index 7c02214e8b..da682903df 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.13.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 3e92176b4c7a0563051dfa3941e0034509fa12d4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:12 +0000 Subject: [PATCH 005/130] app-arch/rpm2targz: Sync with Gentoo It's from Gentoo commit 9a12f01be4fe3926d57d0c55f846ee5891d74389. --- .../app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 fc91e8e307..d602205ff2 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -16,7 +16,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv IUSE="" DEPEND="" -RDEPEND="app-arch/cpio" +RDEPEND="app-alternatives/cpio" src_configure() { tc-export CC From 5c5d51d90df1d58864131f5e452eab920e92908b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:26 +0000 Subject: [PATCH 006/130] app-crypt/mhash: Sync with Gentoo It's from Gentoo commit 2da114edf6cb70c8e2a05a1e337330144abd21ad. --- .../mhash/files/mhash-0.9.9.9-cast-temp-64bit.patch | 13 +++++++++++++ .../app-crypt/mhash/mhash-0.9.9.9-r3.ebuild | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-cast-temp-64bit.patch diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-cast-temp-64bit.patch b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-cast-temp-64bit.patch new file mode 100644 index 0000000000..3b173f8072 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-cast-temp-64bit.patch @@ -0,0 +1,13 @@ +diff --git a/lib/tiger.c b/lib/tiger.c +index 8f15df4..8d28f27 100644 +--- a/lib/tiger.c ++++ b/lib/tiger.c +@@ -254,7 +254,7 @@ void tiger_final(struct tiger_ctx *ctx) + register mutils_word64 i, j; + /* Force 64-bit alignment */ + mutils_word64 temp_64bit[TIGER_DATASIZE/8]; +- mutils_word8 *temp = temp_64bit; ++ mutils_word8 *temp = (mutils_word8 *) temp_64bit; + i = ctx->index; + + #if defined(WORDS_BIGENDIAN) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild index 59e8dcb901..092842a0b7 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,6 +27,7 @@ PATCHES=( "${FILESDIR}"/${P}-alignment.patch "${FILESDIR}"/${P}-no-malloc-check.patch "${FILESDIR}"/${P}-hmac-uaf-test.patch + "${FILESDIR}"/${P}-cast-temp-64bit.patch ) DOCS=( doc/example.c doc/skid2-authentication ) From d905446bf9f3f49d50c7b93dbe1c5c4a143cccce Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:27 +0000 Subject: [PATCH 007/130] app-crypt/pinentry: Sync with Gentoo It's from Gentoo commit fa981fccdd7b895742eaa9c59dc1888fc55ca5cb. --- .../pinentry/pinentry-1.2.1-r3.ebuild | 107 ------------------ .../pinentry/pinentry-1.2.1-r4.ebuild | 4 +- 2 files changed, 2 insertions(+), 109 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.1-r3.ebuild 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 deleted file mode 100644 index b86cc8d3ea..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.1-r3.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc -inherit autotools qmake-utils verify-sig - -DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="https://gnupg.org/aegypten2" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="caps efl emacs gtk keyring ncurses qt5 wayland X" - -DEPEND=" - >=dev-libs/libassuan-2.1 - >=dev-libs/libgcrypt-1.6.3 - >=dev-libs/libgpg-error-1.17 - efl? ( dev-libs/efl[X] ) - keyring? ( app-crypt/libsecret ) - ncurses? ( sys-libs/ncurses:= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - wayland? ( kde-plasma/kwayland:5 ) - X? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - ) - ) -" -RDEPEND=" - ${DEPEND} - gtk? ( app-crypt/gcr:0[gtk] ) -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig - verify-sig? ( sec-keys/openpgp-keys-gnupg ) -" -IDEPEND=">=app-eselect/eselect-pinentry-0.7.2" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-AR.patch" - "${FILESDIR}/${PN}-1.2.1-automagic-capslock.patch" # bug #819939, bug #837719 -) - -src_prepare() { - default - - unset FLTK_CONFIG - - eautoreconf -} - -src_configure() { - export PATH="$(qt5_get_bindir):${PATH}" - export QTLIB="$(qt5_get_libdir)" - - local myeconfargs=( - $(use_enable efl pinentry-efl) - $(use_enable emacs pinentry-emacs) - $(use_enable keyring libsecret) - $(use_enable gtk pinentry-gnome3) - $(use_enable ncurses fallback-curses) - $(use_enable ncurses pinentry-curses) - $(use_enable qt5 pinentry-qt) - $(use_enable wayland kf5-wayland) - $(use_enable X qtx11extras) - $(use_with X x) - - --enable-pinentry-tty - --disable-pinentry-fltk - --disable-pinentry-gtk2 - - MOC="$(qt5_get_bindir)"/moc - GPG_ERROR_CONFIG="${ESYSROOT}"/usr/bin/${CHOST}-gpg-error-config - LIBASSUAN_CONFIG="${ESYSROOT}"/usr/bin/libassuan-config - - $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - rm "${ED}"/usr/bin/pinentry || die - - use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5 -} - -pkg_postinst() { - eselect pinentry update ifunset -} - -pkg_postrm() { - eselect pinentry update ifunset -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.1-r4.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.1-r4.ebuild index bf204e97fb..2efd0de3f7 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.1-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/pinentry/pinentry-1.2.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 66b2c37c8c77ce4a6ceaaba06cedc547900eb7c7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:27 +0000 Subject: [PATCH 008/130] app-crypt/rhash: Sync with Gentoo It's from Gentoo commit 560acc8a7a2754e5baad60529af2c76f1fea8b13. --- .../app-crypt/rhash/rhash-1.4.4-r1.ebuild | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.4-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.4-r1.ebuild new file mode 100644 index 0000000000..02a4f11e44 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.4-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs multilib-minimal + +DESCRIPTION="Console utility and library for computing and verifying file hash sums" +HOMEPAGE="https://rhash.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" + +LICENSE="0BSD" +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 ~x64-solaris" +IUSE="debug nls ssl static-libs" + +RDEPEND=" + ssl? ( + dev-libs/openssl:0=[${MULTILIB_USEDEP}] +)" + +DEPEND=" + ${RDEPEND} +" + +BDEPEND=" + nls? ( sys-devel/gettext ) +" + +S="${WORKDIR}/RHash-${PV}" + +PATCHES=( + "${FILESDIR}"/${P}-prefix.patch +) + +src_prepare() { + default + + if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then + # we lack posix_memalign + sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \ + librhash/util.h || die + fi + + # upstream fix for BSD and others, but was only applied for BSD + # we need support for Solaris, where we use a GNU toolchain, so use + # the original hack, hopefully next release has this fixed + # https://github.com/rhash/RHash/issues/238 + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e 's/^elif linux; then/else/' configure || die + fi + + multilib_copy_sources +} + +multilib_src_configure() { + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + set -- \ + ./configure \ + --target="${CHOST}" \ + --cc="$(tc-getCC)" \ + --ar="$(tc-getAR)" \ + --extra-cflags="${CFLAGS}" \ + --extra-ldflags="${LDFLAGS}" \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --sysconfdir="${EPREFIX}"/etc \ + --disable-openssl-runtime \ + --disable-static \ + --enable-lib-shared \ + $(use_enable debug) \ + $(use_enable nls gettext) \ + $(use_enable ssl openssl) \ + $(use_enable static-libs lib-static) + + echo "${@}" + "${@}" || die "configure failed" +} + +multilib_src_compile() { + emake all \ + $(multilib_is_native_abi && use nls && echo compile-gmo) +} + +multilib_src_install() { + # -j1 needed due to race condition. + emake DESTDIR="${D}" -j1 \ + install{,-lib-headers,-pkg-config} \ + $(multilib_is_native_abi && use nls && echo install-gmo) \ + install-lib-so-link +} + +multilib_src_test() { + emake test +} From 114be0a7ff8351752ee5b23ed7beba3b86a3897f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:31 +0000 Subject: [PATCH 009/130] app-emulation/qemu: Sync with Gentoo It's from Gentoo commit 21b3f9ceef131258a721b1b29e52d0f9c4fd2ea4. --- .../portage-stable/app-emulation/qemu/qemu-7.2.4.ebuild | 8 ++++---- .../portage-stable/app-emulation/qemu/qemu-7.2.6.ebuild | 8 ++++---- .../portage-stable/app-emulation/qemu/qemu-7.2.7.ebuild | 8 ++++---- .../portage-stable/app-emulation/qemu/qemu-7.2.8.ebuild | 8 ++++---- .../portage-stable/app-emulation/qemu/qemu-8.0.4.ebuild | 6 +++--- .../portage-stable/app-emulation/qemu/qemu-8.0.5.ebuild | 6 +++--- .../portage-stable/app-emulation/qemu/qemu-8.1.2.ebuild | 6 +++--- .../portage-stable/app-emulation/qemu/qemu-8.1.3.ebuild | 6 +++--- .../portage-stable/app-emulation/qemu/qemu-8.1.4.ebuild | 6 +++--- .../portage-stable/app-emulation/qemu/qemu-8.2.0.ebuild | 6 +++--- .../portage-stable/app-emulation/qemu/qemu-9999.ebuild | 6 +++--- 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.4.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.4.ebuild index f7d70d6891..c8c13d8938 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ QEMU_DOCS_VERSION="7.2.0" # bug #830088 QEMU_DOC_USEFLAG="+doc" -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{10,11} ) PYTHON_REQ_USE="ncurses,readline" FIRMWARE_ABI_VERSION="7.2.0" @@ -272,7 +272,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - dev-util/meson + dev-build/meson sys-apps/texinfo virtual/pkgconfig doc? ( @@ -282,7 +282,7 @@ BDEPEND=" gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] - sys-devel/bc + app-alternatives/bc ) " CDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.6.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.6.ebuild index 2218435d4f..09c62e4b71 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ QEMU_DOCS_VERSION="7.2.0" # bug #830088 QEMU_DOC_USEFLAG="+doc" -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{10,11} ) PYTHON_REQ_USE="ncurses,readline" FIRMWARE_ABI_VERSION="7.2.0" @@ -272,7 +272,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - dev-util/meson + dev-build/meson sys-apps/texinfo virtual/pkgconfig doc? ( @@ -282,7 +282,7 @@ BDEPEND=" gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] - sys-devel/bc + app-alternatives/bc ) " CDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.7.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.7.ebuild index dd5799797d..7b45ca3fd8 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ QEMU_DOCS_VERSION="7.2.0" # bug #830088 QEMU_DOC_USEFLAG="+doc" -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{10,11} ) PYTHON_REQ_USE="ncurses,readline" FIRMWARE_ABI_VERSION="7.2.0" @@ -272,7 +272,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - dev-util/meson + dev-build/meson sys-apps/texinfo virtual/pkgconfig doc? ( @@ -282,7 +282,7 @@ BDEPEND=" gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] - sys-devel/bc + app-alternatives/bc ) " CDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.8.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.8.ebuild index dd5799797d..7b45ca3fd8 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ QEMU_DOCS_VERSION="7.2.0" # bug #830088 QEMU_DOC_USEFLAG="+doc" -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{10,11} ) PYTHON_REQ_USE="ncurses,readline" FIRMWARE_ABI_VERSION="7.2.0" @@ -272,7 +272,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - dev-util/meson + dev-build/meson sys-apps/texinfo virtual/pkgconfig doc? ( @@ -282,7 +282,7 @@ BDEPEND=" gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] - sys-devel/bc + app-alternatives/bc ) " CDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.4.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.4.ebuild index 96f174d6b4..c061e81282 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -273,7 +273,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - dev-util/meson + dev-build/meson sys-apps/texinfo virtual/pkgconfig doc? ( @@ -283,7 +283,7 @@ BDEPEND=" gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] - sys-devel/bc + app-alternatives/bc ) " CDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.5.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.5.ebuild index ec208b855e..bd9bb2ea23 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -273,7 +273,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - dev-util/meson + dev-build/meson sys-apps/texinfo virtual/pkgconfig doc? ( @@ -283,7 +283,7 @@ BDEPEND=" gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] - sys-devel/bc + app-alternatives/bc ) " CDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.2.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.2.ebuild index 9557c4eff1..19515604bc 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -274,7 +274,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - >=dev-util/meson-0.63.0 + >=dev-build/meson-0.63.0 dev-python/pip[${PYTHON_USEDEP}] virtual/pkgconfig doc? ( @@ -284,7 +284,7 @@ BDEPEND=" gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] - sys-devel/bc + app-alternatives/bc ) " CDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.3.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.3.ebuild index 9557c4eff1..19515604bc 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -274,7 +274,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - >=dev-util/meson-0.63.0 + >=dev-build/meson-0.63.0 dev-python/pip[${PYTHON_USEDEP}] virtual/pkgconfig doc? ( @@ -284,7 +284,7 @@ BDEPEND=" gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] - sys-devel/bc + app-alternatives/bc ) " CDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.4.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.4.ebuild index 9557c4eff1..19515604bc 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -274,7 +274,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - >=dev-util/meson-0.63.0 + >=dev-build/meson-0.63.0 dev-python/pip[${PYTHON_USEDEP}] virtual/pkgconfig doc? ( @@ -284,7 +284,7 @@ BDEPEND=" gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] - sys-devel/bc + app-alternatives/bc ) " CDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.0.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.0.ebuild index 518d7a5b6b..5b9071fc36 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -279,7 +279,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - >=dev-util/meson-0.63.0 + >=dev-build/meson-0.63.0 dev-python/pip[${PYTHON_USEDEP}] virtual/pkgconfig doc? ( @@ -289,7 +289,7 @@ BDEPEND=" gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] - sys-devel/bc + app-alternatives/bc ) " CDEPEND=" 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 41fbe471c0..5cd95eee6b 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -279,7 +279,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - >=dev-util/meson-0.63.0 + >=dev-build/meson-0.63.0 dev-python/pip[${PYTHON_USEDEP}] virtual/pkgconfig doc? ( @@ -289,7 +289,7 @@ BDEPEND=" gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] - sys-devel/bc + app-alternatives/bc ) " CDEPEND=" From 208c799b552794ab895fa3dbb0fa9a4c84cb4bae Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:31 +0000 Subject: [PATCH 010/130] app-emulation/qemu-guest-agent: Sync with Gentoo It's from Gentoo commit dad0c19d1cd8e79e73586ab43db4dac9281676b5. --- .../qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild | 4 ++-- .../qemu-guest-agent/qemu-guest-agent-8.0.0.ebuild | 4 ++-- .../qemu-guest-agent/qemu-guest-agent-8.0.2.ebuild | 4 ++-- .../qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild index d2ba045367..89b3517bad 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,7 @@ RDEPEND="dev-libs/glib" DEPEND="${RDEPEND}" BDEPEND="${PYTHON_DEPS} dev-lang/perl - dev-util/ninja" + app-alternatives/ninja" S="${WORKDIR}/${MY_P}" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.0.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.0.ebuild index 52a9e45d3b..4b64963e34 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,7 @@ RDEPEND="dev-libs/glib" DEPEND="${RDEPEND}" BDEPEND="${PYTHON_DEPS} dev-lang/perl - dev-util/ninja" + app-alternatives/ninja" S="${WORKDIR}/${MY_P}" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.2.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.2.ebuild index 7fe0fb4888..cbca89288f 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,7 @@ RDEPEND="dev-libs/glib" DEPEND="${RDEPEND}" BDEPEND="${PYTHON_DEPS} dev-lang/perl - dev-util/ninja" + app-alternatives/ninja" S="${WORKDIR}/${MY_P}" diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild index 3100762057..86f9742a3e 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,7 @@ RDEPEND="dev-libs/glib" DEPEND="${RDEPEND}" BDEPEND="${PYTHON_DEPS} dev-lang/perl - dev-util/ninja" + app-alternatives/ninja" S="${WORKDIR}/${MY_P}" From 51b15d145bd8da22d0409a57e2bd84b235ced58e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:33 +0000 Subject: [PATCH 011/130] app-eselect/eselect-pinentry: Sync with Gentoo It's from Gentoo commit faa4e2901cb020decd195544b15ed6c2a2cc3669. --- .../eselect-pinentry-0.7.2-r1.ebuild | 21 ------------------- .../files/pinentry.eselect-0.7.2 | 12 ----------- 2 files changed, 33 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/eselect-pinentry-0.7.2-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7.2 diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/eselect-pinentry-0.7.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/eselect-pinentry-0.7.2-r1.ebuild deleted file mode 100644 index b876949630..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/eselect-pinentry-0.7.2-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Manage /usr/bin/pinentry symlink" -HOMEPAGE="https://www.gentoo.org/proj/en/eselect/" - -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 ~x64-solaris" - -RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1" - -S="${FILESDIR}" - -src_install() { - default - insinto /usr/share/eselect/modules - newins pinentry.eselect-${PV} pinentry.eselect -} diff --git a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7.2 b/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7.2 deleted file mode 100644 index 7734fe870b..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7.2 +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -DESCRIPTION="Manage /usr/bin/pinentry implementation" -MAINTAINER="maintainer-needed@gentoo.org" -VERSION="0.7.2" - -SYMLINK_PATH=/usr/bin/pinentry -SYMLINK_TARGETS=( pinentry-efl pinentry-gnome3 pinentry-qt5 pinentry-curses pinentry-tty ) -SYMLINK_DESCRIPTION='pinentry binary' - -inherit bin-symlink From 1e0b7e81ae610a59568f87afe312be061197f46a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:38 +0000 Subject: [PATCH 012/130] app-misc/jq: Sync with Gentoo It's from Gentoo commit ebb86bc407e11e816fe8d67518bebd7b0f9581e4. --- .../third_party/portage-stable/app-misc/jq/jq-1.7.1.ebuild | 4 ++-- .../src/third_party/portage-stable/app-misc/jq/jq-1.7.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.7.1.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.7.1.ebuild index 99985e23fc..a85a3e2aa7 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.7.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ IUSE="+oniguruma static-libs test" ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/ DEPEND=" >=sys-devel/bison-3.0 - sys-devel/flex + app-alternatives/lex oniguruma? ( ${ONIGURUMA_MINPV}:=[static-libs?] ) " RDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.7.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.7.ebuild index e2afba51c2..81be3fadd8 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ IUSE="+oniguruma static-libs test" ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/ DEPEND=" >=sys-devel/bison-3.0 - sys-devel/flex + app-alternatives/lex oniguruma? ( ${ONIGURUMA_MINPV}:=[static-libs?] ) " RDEPEND=" From 2e456b8d85c9e19f1c9e87f204b9e9cf888a7606 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:39 +0000 Subject: [PATCH 013/130] app-misc/pax-utils: Sync with Gentoo It's from Gentoo commit 05b8c0a69ded1a5f16e59127513e070153974ca3. --- .../portage-stable/app-misc/pax-utils/pax-utils-1.3.7.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.7.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.7.ebuild index b665197776..d4c54eef65 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,7 @@ else 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 cfe79cee99703e92cd3653d6825ac70966ecb3dc Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:41 +0000 Subject: [PATCH 014/130] app-portage/elt-patches: Sync with Gentoo It's from Gentoo commit db58ef07d6548d99eb854b5804bcc6de762af326. --- .../app-portage/elt-patches/Manifest | 1 + .../elt-patches/elt-patches-20231228.ebuild | 22 ++++++++--- .../elt-patches/elt-patches-20240109.ebuild | 37 ++++++++++++++++++ .../elt-patches/elt-patches-99999999.ebuild | 39 +++++++++++++++++++ 4 files changed, 94 insertions(+), 5 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20240109.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-99999999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/Manifest b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/Manifest index 1be11ef204..1807e6f3ba 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/Manifest @@ -1,2 +1,3 @@ DIST elt-patches-20221210.tar.xz 42080 BLAKE2B abcdae6dedac89bd913d6809d335c13cd59b675c4b68198925bf758013e988a9bf82e9f6ccc3a70ac1c49775bb7579addda6c0bb7ea4ceea3c4b8e4acf0d65ea SHA512 3dad3c0be8d69de731bb10d5a6007539c2966f8a370a3dee27faf9655a38e39f272a9059cd98c8b6f32c2495143667f8b28a6a3425f22c0c5421f3969b417cf7 DIST elt-patches-20231228.tar.xz 42512 BLAKE2B 00d9e9ee06da0c6d218c3af79aeb171e78aee75a2e2d586746ecc10c1e0083b317e3c5f27c923f982557e075e39210775203d25c162e34b1698542a6c1d8c1c1 SHA512 e0278fe7776dfcb6e7e869da95dbb9a65b78efc08298a7c03c16953c0f1fcff34e0ef6533dbb7fd3c60297ed85c20eb0ca89a01d74d2f1e9c6f723341c867108 +DIST elt-patches-20240109.tar.xz 42944 BLAKE2B 41df6a1c4f7a8f84986dcb5d31118173907ac9a5373aa663b3a7f40e3143063be0658bd9184086f04a5b81dea455e1a2f5fe6d39d02186891242b6cb9c2fcb8d SHA512 9f8ceb6da0b3bc741fc255ced2f48cef6f088d115ce667930897c2bd81c9491acbb30fd23348701e06467f09fa628e1a166c9df3d7331f3201ff3f2305529750 diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20231228.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20231228.ebuild index b1667bd39c..76e331af75 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20231228.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20231228.ebuild @@ -1,17 +1,29 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Collection of patches for libtool.eclass" HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/" -SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz - https://dev.gentoo.org/~vapier/dist/${P}.tar.xz - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/elt-patches.git + https://github.com/gentoo/elt-patches + " + inherit git-r3 +else + SRC_URI=" + https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz + 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 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi LICENSE="GPL-2" SLOT="0" -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-20240109.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20240109.ebuild new file mode 100644 index 0000000000..76e331af75 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20240109.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Collection of patches for libtool.eclass" +HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/elt-patches.git + https://github.com/gentoo/elt-patches + " + inherit git-r3 +else + SRC_URI=" + https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz + 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 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" + +RDEPEND="sys-apps/gentoo-functions" +BDEPEND="app-arch/xz-utils" + +src_compile() { + emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)" +} + +src_install() { + emake DESTDIR="${D}" rootprefix="${EPREFIX}" install +} diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-99999999.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-99999999.ebuild new file mode 100644 index 0000000000..29410c13f9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-99999999.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Collection of patches for libtool.eclass" +HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/elt-patches.git + https://github.com/gentoo/elt-patches + " + inherit git-r3 +else + SRC_URI=" + https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz + 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 ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +# The 'check' target currently wants network access to fetch libtool tarballs. +RESTRICT="test" + +RDEPEND="sys-apps/gentoo-functions" +BDEPEND="app-arch/xz-utils" + +src_compile() { + emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)" +} + +src_install() { + emake DESTDIR="${D}" rootprefix="${EPREFIX}" install +} From c66673984ab8c6d64f503b4e478d2aeec97ba699 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:41 +0000 Subject: [PATCH 015/130] app-portage/gentoolkit: Sync with Gentoo It's from Gentoo commit 21b3f9ceef131258a721b1b29e52d0f9c4fd2ea4. --- .../app-portage/gentoolkit/gentoolkit-0.6.3-r1.ebuild | 4 ++-- .../app-portage/gentoolkit/gentoolkit-9999.ebuild | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.3-r1.ebuild index ef31ef884f..36bae9f8da 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.3-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -40,7 +40,7 @@ RDEPEND=" # >=meson-1.2.1-r1 for bug #912051 BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 + >=dev-build/meson-1.2.1-r1 $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] ' python3_12) diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild index 82c6182f64..a4e22666a5 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -40,7 +40,7 @@ RDEPEND=" # >=meson-1.2.1-r1 for bug #912051 BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 + >=dev-build/meson-1.2.1-r1 $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] ' python3_12) @@ -95,8 +95,8 @@ my_src_install() { ) meson_src_install - python_optimize "${pydirs[@]}" python_fix_shebang "${pydirs[@]}" + python_optimize "${pydirs[@]}" } pkg_postinst() { From beb8e436be04d39ad13c92354dc90191913cb30d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:41 +0000 Subject: [PATCH 016/130] app-portage/getuto: Sync with Gentoo It's from Gentoo commit 137a0aa58fbdd6dd75dda457748715578192d8f0. --- .../app-portage/getuto/Manifest | 1 - .../app-portage/getuto/getuto-1.9.ebuild | 50 ------------------- 2 files changed, 51 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-portage/getuto/getuto-1.9.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-portage/getuto/Manifest b/sdk_container/src/third_party/portage-stable/app-portage/getuto/Manifest index 53b7c9b2be..149ef3ac40 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/getuto/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-portage/getuto/Manifest @@ -1,3 +1,2 @@ DIST getuto-1.9.1.tar.gz 10220 BLAKE2B 4c756f36e9d1272ab194c65e75b6c4d47c248190029ce2b5fe6edb1253998aaa311dd1ae59f893200d1588a52d1bcb53376a32f279c841ae6b5cf5e5b0eeb163 SHA512 3f8e5359940fa5582bea8dc11f2a0846c3f6bdc555974f2f049d5c6ff282029b6393a8c6ae221d327376b4df05de492f44720de90f76f5e3deb436171507f0cb -DIST getuto-1.9.tar.gz 10222 BLAKE2B a2a2ad64097166c86a299e32242edef88c8213b479d8a83399eece29c5f204f3362c48d29638347dde624913ceea4a3ec2bb7bf0936e3065c715ad13dd85caf9 SHA512 fc0e74f90d52dbf637e55d79f70397a71d20ece9f23d11989c152d140d2d08135eee9268bc726bf6504a6a45cf8572803471deb5d192378e6cb76d8f8c00499b DIST libc-1-r1-1.gpkg.tar 20480 BLAKE2B b2c184e20c1a29ff66240e992f9f81219285f525eb63cea081372685cf03a2e231a2edb528259617e74c655fbe61b6e0d8fc0bbdbd8452b6098de58432f019d7 SHA512 ce52f398ea8979ec16161381803740d49a4294c77303880f54090c379ba5eb8e545a3d3550f229cacc18c7763dc3adf7936561ba1c64b43c87692ec66084e4e6 diff --git a/sdk_container/src/third_party/portage-stable/app-portage/getuto/getuto-1.9.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/getuto/getuto-1.9.ebuild deleted file mode 100644 index 3524062515..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-portage/getuto/getuto-1.9.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Stand-alone gentoo install trust anchor generation tool" -HOMEPAGE="https://github.com/projg2/getuto" - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/projg2/getuto" - inherit git-r3 -else - SRC_URI=" - https://github.com/projg2/getuto/archive/refs/tags/${P}.tar.gz - " - S=${WORKDIR}/${PN}-${P} - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -fi - -SRC_URI+=" test? ( https://mirror.bytemark.co.uk/gentoo/releases/amd64/binpackages/17.1/x86-64/virtual/libc/libc-1-r1-1.gpkg.tar )" - -LICENSE="GPL-2" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-crypt/gnupg - dev-libs/openssl - sec-keys/openpgp-keys-gentoo-release - sys-apps/gentoo-functions -" - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - else - # Don't mangle test data - unpack ${P}.tar.gz - fi - - if use test ; then - cp "${DISTDIR}"/libc-1-r1-1.gpkg.tar "${S}" || die - fi -} - -src_install() { - dobin getuto -} From d8d605208faf3efac778df4386906c7251d57364 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:42 +0000 Subject: [PATCH 017/130] app-shells/bash: Sync with Gentoo It's from Gentoo commit 45393b3f565745cf2a002ca96b36d94759c55c9e. --- .../portage-stable/app-shells/bash/Manifest | 10 + .../app-shells/bash/bash-5.2_p21-r2.ebuild | 375 ++++++++++++++++++ .../app-shells/bash/bash-5.2_p26.ebuild | 375 ++++++++++++++++++ .../bash/files/bash-5.2_p21-memory-leak.patch | 18 + .../files/bash-5.2_p26-memory-leaks.patch | 136 +++++++ 5 files changed, 914 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p21-r2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p26.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-shells/bash/files/bash-5.2_p21-memory-leak.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-shells/bash/files/bash-5.2_p26-memory-leaks.patch diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/Manifest b/sdk_container/src/third_party/portage-stable/app-shells/bash/Manifest index c4530d8443..639407e735 100644 --- a/sdk_container/src/third_party/portage-stable/app-shells/bash/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/Manifest @@ -415,3 +415,13 @@ DIST bash52-020 1459 BLAKE2B de3e38dbb2395c765767aed516ae3d143e3187a44964f90c587 DIST bash52-020.sig 95 BLAKE2B 8fd778b381cc14d17de8f2b7e215fa0d35c569a90d46fac77c0a94bea525bd62428663f0a908e64ff773bd4caf0aab7f92c2dda1f4158aacbd53f053be91d16d SHA512 0ae6d9189329e560a89af9f42f0f98126faeb15d29bd327e6bd7694870a9bcfae3d3d545e42baf4223dcc732a50d46e4c22477c41b98be85736bb05a359eeeec DIST bash52-021 1890 BLAKE2B cc2d886da8c51eb7bdbed694423eae29dc05dc2c7bd0cd41b9ee3acbc56ef135043bb48275c4162d33d2d4051a0a8b27f3aec097335b9d15e38fd841a6793f71 SHA512 c3a61e975819919d7ba120f322fc5e9a420b21f03d7bf989a5e7b6a99bfe35372744277040e88361ee383ab53b05d607d52ff2000b401de038af67c91728b48f DIST bash52-021.sig 95 BLAKE2B 79572b14f423f0a96e89d106c5ed448c2b447760e99c743354bd6315132325c19312cfcad98f94c42d3094bb4283c1f7753ac4d3c600d46c63e49d0f7cc3befd SHA512 4063559edade78d1510c12b825aa29925e515807b447e50fe564770ee26ddf34e18b47132e5154a4c883043cc80b3d6415e4ba370bad308a17dc0f6b53fc61c5 +DIST bash52-022 1305 BLAKE2B 2e0cc2255c0313ab85547363d7dd060d460db44131b698235275413c51e79cdc33b77064f84d56e75a0951fc62f947482c2f317a0d4f732822a4ffaed943a9cd SHA512 12a669f3b6ba936be31a85c50bfe52689f3deea02eedb31100ab113b1e74d8104934e615965b4bf7f3b1cf5ad71870211b0bd910bf0862e8ce603505b4b1db3f +DIST bash52-022.sig 95 BLAKE2B 423bcd005987dae027e29c873edecda0cf51cdcb4bb652b1577c28258602e2a34cfecbc38383068fc95f6e1e0e558bc6de64a225a9e7392f05518a9190237d3f SHA512 f3af8e4ea507b53dd979f597cfde69bd59bf4b7229fd0058c299a2c1abb36182b3a38b8630a81e0654f8da8bc47725459ddf32031ab1a5615105651c14640167 +DIST bash52-023 1817 BLAKE2B 9727ad8cf219ba906021f833cacbbccf6c5b9c94decf861a5f40627680ac3d19d65eaeafecd575545dc7eb538f27b0ecc55a7462b49d226751ad14fb2f40e825 SHA512 59a2e9e4ee4938ba868552eecdbed5f5d797e143bf6f69fde5c50a4e478c19ce36d562b9f51f65d7da5fe216050276bfe1eb430c151c845cffa77d3fdc9ce771 +DIST bash52-023.sig 95 BLAKE2B 84621d203ab68da6a6e5a36fe31160e463fda864620a94fec99f0be3c18df6c465adf2179f3bc99cae2627058d174e3b3d35d473836609252ae41527857e6464 SHA512 b17a8718467e1aee6d47d01b8bcad0892b3c7369f17794604481b655b3404b6f0970aabf5d29b6898e598530946ccdf3e2bddbfb02a7e033927a9be2686aa246 +DIST bash52-024 2298 BLAKE2B f9113fcb1b8ee8d96744e45f020fd8ec49546d6a29883544f4d4a4ef1087b764de6e7c37c760ac709370cdace9619aec84f03713be5e6bc9a9e90d97dd35caa0 SHA512 ff77920ba4c8df7cb8841d94f483a5678a65ff2aab3f03b02b21eba7daaea15d05af26d2fc7f468509c2047f682908d78cd94254e0688496280e345d010aac24 +DIST bash52-024.sig 95 BLAKE2B 412b7f3aad7f6eeb49abfafd428bd9dbc72c5b80be0b8908d8284befa29c62c6460f883142145a2eefb157fc53030ea391d6ff50706f387a2ef933b3c89a9895 SHA512 d56fc42b92a9c0d2de32a0365c3f83913e0fe37d60a57254ac773d5ee12793694d078ee8de207718a2166631f8269bdb91fb5d386fec09fd19e7f4e6d2008b97 +DIST bash52-025 1454 BLAKE2B 5d18e00cc44710f078037f25c61741a078bb0fc906d6d5555e581e093d9e99be71f7f06fc0d139f4f25d40f5f854378031aff6e63d26ead55fe6cca626df50bd SHA512 20e708ff483ae2ba655c069fbaccdef59d81f52ba787d97fd1b997522248e9e7e1d7773a35f3a6e44c4521a7a5be273ffa25c580533e6d1d1bfb5e49040530c3 +DIST bash52-025.sig 95 BLAKE2B aff63f1a0a753b632f0d2ce4cf8f4117689469150d41dd0e0d7f76fca973d52fb16f3957b12709826e50705f921fe141108b1046de05d17b40216ed5d4a00893 SHA512 079888adce1cb8583b547d67005f179614f1c42756de20acdb9e24763dec145a421c68e7ceb48d42b853ae7fcb07e051cc1ca56f9dfd337c9a1b001618df2828 +DIST bash52-026 1372 BLAKE2B ebe3bc47dadf5d689258c5ccf9883838d3383dc43bec68d2a6767b6348cf1515a98ec9e445c3110e8eb0d87e742c20a0d4ddb70649ec94217f55aad7d18552af SHA512 571993da2b8067ef5b7b705aee65dd414ee70b216ffbcb9fab7c08807b87a72465594c3f1576c795ae86bf951911cdde70ad1037e851b88ee379c4237ccff6fe +DIST bash52-026.sig 95 BLAKE2B 175df0703ee5374094d41761ebc2827d34cb97328ea8e486cc9e5c946e482a7d0a16a7ac45e11296500cff8ac4c013e60b07d34abf8b3478527a80f742fbe85e SHA512 6db725ffcf429e04551b2fde329067696b20bef9418b57cff56a62f31c262d0b800061284469eb9f809ca49516516735213dc05defab52ff864ac3b214336559 diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p21-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p21-r2.ebuild new file mode 100644 index 0000000000..6a1506f3ea --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p21-r2.ebuild @@ -0,0 +1,375 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc +inherit flag-o-matic toolchain-funcs prefix verify-sig + +# Uncomment if we have a patchset +#GENTOO_PATCH_DEV="sam" +#GENTOO_PATCH_VER="${PV}" + +# Official patchlevel +# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/ +PLEVEL="${PV##*_p}" +MY_PV="${PV/_p*}" +MY_PV="${MY_PV/_/-}" +MY_P="${PN}-${MY_PV}" +MY_PATCHES=() + +is_release() { + case ${PV} in + 9999|*_alpha*|*_beta*|*_rc*) + return 1 + ;; + *) + return 0 + ;; + esac +} + +[[ ${PV} != *_p* ]] && PLEVEL=0 + +# 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_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" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git" + EGIT_BRANCH=devel + inherit git-r3 +elif is_release ; then + SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )" + + if [[ ${PLEVEL} -gt 0 ]] ; then + # bash-5.1 -> bash51 + my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2)) + + 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 + 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_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" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )" +fi + +if [[ -n ${GENTOO_PATCH_VER} ]] ; then + SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz" +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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi +IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline" + +DEPEND=" + >=sys-libs/ncurses-5.2-r2:= + nls? ( virtual/libintl ) +" +if is_release ; then + DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )" +fi +RDEPEND=" + ${DEPEND} +" +# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011) +BDEPEND=" + pgo? ( dev-util/gperf ) + verify-sig? ( sec-keys/openpgp-keys-chetramey ) +" + +S="${WORKDIR}/${MY_P}" + +# EAPI 8 tries to append it but it doesn't exist here +QA_CONFIGURE_OPTIONS="--disable-static" + +PATCHES=( + #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/ + + # Patches from Chet sent to bash-bug ml + "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch + "${FILESDIR}"/${PN}-5.2_p15-random-ub.patch + "${FILESDIR}"/${PN}-5.2_p15-configure-clang16.patch + "${FILESDIR}"/${PN}-5.2_p21-wpointer-to-int.patch + "${FILESDIR}"/${PN}-5.2_p21-configure-strtold.patch + "${FILESDIR}"/${PN}-5.2_p21-memory-leak.patch +) + +pkg_setup() { + # bug #7332 + if is-flag -malign-double ; then + eerror "Detected bad CFLAGS '-malign-double'. Do not use this" + eerror "as it breaks LFS (struct stat64) on x86." + die "remove -malign-double from your CFLAGS mr ricer" + fi + + if use bashlogger ; then + ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs." + ewarn "This will log ALL output you enter into the shell, you have been warned." + fi +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + else + if use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig} + + local patch + for patch in "${MY_PATCHES[@]}" ; do + verify-sig_verify_detached ${patch}{,.sig} + done + fi + + unpack ${MY_P}.tar.gz + + if [[ -n ${GENTOO_PATCH_VER} ]] ; then + unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz + fi + fi +} + +src_prepare() { + # Include official patches + [[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}" + + # Clean out local libs so we know we use system ones w/releases. + if is_release ; then + rm -rf lib/{readline,termcap}/* || die + touch lib/{readline,termcap}/Makefile.in || die # for config.status + sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die + fi + + # Prefixify hardcoded path names. No-op for non-prefix. + hprefixify pathnames.h.in + + # Avoid regenerating docs after patches, bug #407985 + 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 +} + +src_configure() { + # Upstream only test with Bison and require GNUisms like YYEOF and + # YYERRCODE. The former at least may be in POSIX soon: + # https://www.austingroupbugs.net/view.php?id=1269. + # configure warns on use of non-Bison but doesn't abort. The result + # may misbehave at runtime. + unset YACC + + local myconf=( + --disable-profiling + + # Force linking with system curses ... the bundled termcap lib + # sucks bad compared to ncurses. For the most part, ncurses + # is here because readline needs it. But bash itself calls + # ncurses in one or two small places :(. + --with-curses + + $(use_enable mem-scramble) + $(use_enable net net-redirections) + $(use_enable readline) + $(use_enable readline bang-history) + $(use_enable readline history) + $(use_with afs) + $(use_with mem-scramble bash-malloc) + ) + + # For descriptions of these, see config-top.h + # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426 + append-cppflags \ + -DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \ + -DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \ + -DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \ + -DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \ + -DNON_INTERACTIVE_LOGIN_SHELLS \ + -DSSH_SOURCE_BASHRC \ + $(use bashlogger && echo -DSYSLOG_HISTORY) + + # Don't even think about building this statically without + # reading bug #7714 first. If you still build it statically, + # don't come crying to us with bugs ;). + #use static && export LDFLAGS="${LDFLAGS} -static" + use nls || myconf+=( --disable-nls ) + + if is_release ; then + # Historically, we always used the builtin readline, but since + # our handling of SONAME upgrades has gotten much more stable + # in the PM (and the readline ebuild itself preserves the old + # libs during upgrades), linking against the system copy should + # be safe. + # Exact cached version here doesn't really matter as long as it + # is at least what's in the DEPEND up above. + export ac_cv_rl_version=${READLINE_VER%%_*} + + # Use system readline only with released versions. + myconf+=( --with-installed-readline=. ) + fi + + if use plugins ; then + append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash + else + # Disable the plugins logic by hand since bash doesn't + # provide a way of doing it. + export ac_cv_func_dl{close,open,sym}=no \ + ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no + + sed -i \ + -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \ + configure || die + fi + + # bug #444070 + tc-export AR + + econf "${myconf[@]}" +} + +src_compile() { + # -fprofile-partial-training because upstream note the test suite isn't super comprehensive + # See https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo + local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/pgo -fprofile-generate=${T}/pgo $(test-flags-CC -fprofile-partial-training)") + local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo $(test-flags-CC -fprofile-partial-training)") + + emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" + use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags}" all others + + # Build Bash and run its tests to generate profiles. + if use pgo ; then + # Used in test suite. + unset A + + emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check + + if tc-is-clang; then + llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die + fi + + # Rebuild Bash using the profiling data we just generated. + emake clean + emake CFLAGS="${CFLAGS} ${pgo_use_flags}" + use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags}" all others + fi +} + +src_test() { + # Used in test suite. + unset A + + default +} + +src_install() { + local d f + + default + + dodir /bin + mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die + dosym bash /bin/rbash + + insinto /etc/bash + doins "${FILESDIR}"/bash_logout + doins "$(prefixify_ro "${FILESDIR}"/bashrc)" + + keepdir /etc/bash/bashrc.d + + insinto /etc/skel + for f in bash{_logout,_profile,rc} ; do + newins "${FILESDIR}"/dot-${f} .${f} + done + + local sed_args=( + -e 's:#GNU#@::' + -e '/#@/d' + ) + + if ! use readline ; then + # bug #432338 + sed_args+=( + -e '/^shopt -s histappend/s:^:#:' + -e 's:use_color=true:use_color=false:' + ) + fi + + sed -i \ + "${sed_args[@]}" \ + "${ED}"/etc/skel/.bashrc \ + "${ED}"/etc/bash/bashrc || die + + if use plugins ; then + exeinto /usr/$(get_libdir)/bash + doexe $(echo examples/loadables/*.o | sed 's:\.o::g') + + insinto /usr/include/bash-plugins + doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h} + fi + + if use examples ; then + for d in examples/{functions,misc,scripts,startup-files} ; do + exeinto /usr/share/doc/${PF}/${d} + docinto ${d} + for f in ${d}/* ; do + if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then + doexe ${f} + else + dodoc ${f} + fi + done + done + fi + + # Install bash_builtins.1 and rbash.1 + emake -C doc DESTDIR="${D}" install_builtins + sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die + doman "${T}"/rbash.1 + + newdoc CWRU/changelog ChangeLog + dosym bash.info /usr/share/info/bashref.info +} + +pkg_preinst() { + if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then + mkdir -p "${EROOT}"/etc/bash + mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ + fi +} + +pkg_postinst() { + # If /bin/sh does not exist, provide it + if [[ ! -e ${EROOT}/bin/sh ]] ; then + ln -sf bash "${EROOT}"/bin/sh + fi +} diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p26.ebuild b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p26.ebuild new file mode 100644 index 0000000000..1bee48a4a9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/bash-5.2_p26.ebuild @@ -0,0 +1,375 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc +inherit flag-o-matic toolchain-funcs prefix verify-sig + +# Uncomment if we have a patchset +#GENTOO_PATCH_DEV="sam" +#GENTOO_PATCH_VER="${PV}" + +# Official patchlevel +# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/ +PLEVEL="${PV##*_p}" +MY_PV="${PV/_p*}" +MY_PV="${MY_PV/_/-}" +MY_P="${PN}-${MY_PV}" +MY_PATCHES=() + +is_release() { + case ${PV} in + 9999|*_alpha*|*_beta*|*_rc*) + return 1 + ;; + *) + return 0 + ;; + esac +} + +[[ ${PV} != *_p* ]] && PLEVEL=0 + +# 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_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" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git" + EGIT_BRANCH=devel + inherit git-r3 +elif is_release ; then + SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )" + + if [[ ${PLEVEL} -gt 0 ]] ; then + # bash-5.1 -> bash51 + my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2)) + + 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 + 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_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" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )" +fi + +if [[ -n ${GENTOO_PATCH_VER} ]] ; then + SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz" +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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi +IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline" + +DEPEND=" + >=sys-libs/ncurses-5.2-r2:= + nls? ( virtual/libintl ) +" +if is_release ; then + DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )" +fi +RDEPEND=" + ${DEPEND} +" +# We only need bison (yacc) when the .y files get patched (bash42-005, bash51-011) +BDEPEND=" + pgo? ( dev-util/gperf ) + verify-sig? ( sec-keys/openpgp-keys-chetramey ) +" + +S="${WORKDIR}/${MY_P}" + +# EAPI 8 tries to append it but it doesn't exist here +QA_CONFIGURE_OPTIONS="--disable-static" + +PATCHES=( + #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/ + + # Patches from Chet sent to bash-bug ml + "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch + "${FILESDIR}"/${PN}-5.2_p15-random-ub.patch + "${FILESDIR}"/${PN}-5.2_p15-configure-clang16.patch + "${FILESDIR}"/${PN}-5.2_p21-wpointer-to-int.patch + "${FILESDIR}"/${PN}-5.2_p21-configure-strtold.patch + "${FILESDIR}"/${PN}-5.2_p26-memory-leaks.patch +) + +pkg_setup() { + # bug #7332 + if is-flag -malign-double ; then + eerror "Detected bad CFLAGS '-malign-double'. Do not use this" + eerror "as it breaks LFS (struct stat64) on x86." + die "remove -malign-double from your CFLAGS mr ricer" + fi + + if use bashlogger ; then + ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs." + ewarn "This will log ALL output you enter into the shell, you have been warned." + fi +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + else + if use verify-sig ; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig} + + local patch + for patch in "${MY_PATCHES[@]}" ; do + verify-sig_verify_detached ${patch}{,.sig} + done + fi + + unpack ${MY_P}.tar.gz + + if [[ -n ${GENTOO_PATCH_VER} ]] ; then + unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz + fi + fi +} + +src_prepare() { + # Include official patches + [[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}" + + # Clean out local libs so we know we use system ones w/releases. + if is_release ; then + rm -rf lib/{readline,termcap}/* || die + touch lib/{readline,termcap}/Makefile.in || die # for config.status + sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die + fi + + # Prefixify hardcoded path names. No-op for non-prefix. + hprefixify pathnames.h.in + + # Avoid regenerating docs after patches, bug #407985 + 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 +} + +src_configure() { + # Upstream only test with Bison and require GNUisms like YYEOF and + # YYERRCODE. The former at least may be in POSIX soon: + # https://www.austingroupbugs.net/view.php?id=1269. + # configure warns on use of non-Bison but doesn't abort. The result + # may misbehave at runtime. + unset YACC + + local myconf=( + --disable-profiling + + # Force linking with system curses ... the bundled termcap lib + # sucks bad compared to ncurses. For the most part, ncurses + # is here because readline needs it. But bash itself calls + # ncurses in one or two small places :(. + --with-curses + + $(use_enable mem-scramble) + $(use_enable net net-redirections) + $(use_enable readline) + $(use_enable readline bang-history) + $(use_enable readline history) + $(use_with afs) + $(use_with mem-scramble bash-malloc) + ) + + # For descriptions of these, see config-top.h + # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426 + append-cppflags \ + -DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \ + -DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \ + -DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \ + -DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \ + -DNON_INTERACTIVE_LOGIN_SHELLS \ + -DSSH_SOURCE_BASHRC \ + $(use bashlogger && echo -DSYSLOG_HISTORY) + + # Don't even think about building this statically without + # reading bug #7714 first. If you still build it statically, + # don't come crying to us with bugs ;). + #use static && export LDFLAGS="${LDFLAGS} -static" + use nls || myconf+=( --disable-nls ) + + if is_release ; then + # Historically, we always used the builtin readline, but since + # our handling of SONAME upgrades has gotten much more stable + # in the PM (and the readline ebuild itself preserves the old + # libs during upgrades), linking against the system copy should + # be safe. + # Exact cached version here doesn't really matter as long as it + # is at least what's in the DEPEND up above. + export ac_cv_rl_version=${READLINE_VER%%_*} + + # Use system readline only with released versions. + myconf+=( --with-installed-readline=. ) + fi + + if use plugins ; then + append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash + else + # Disable the plugins logic by hand since bash doesn't + # provide a way of doing it. + export ac_cv_func_dl{close,open,sym}=no \ + ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no + + sed -i \ + -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \ + configure || die + fi + + # bug #444070 + tc-export AR + + econf "${myconf[@]}" +} + +src_compile() { + # -fprofile-partial-training because upstream note the test suite isn't super comprehensive + # See https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo + local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/pgo -fprofile-generate=${T}/pgo $(test-flags-CC -fprofile-partial-training)") + local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo $(test-flags-CC -fprofile-partial-training)") + + emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" + use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_generate_flags}" all others + + # Build Bash and run its tests to generate profiles. + if use pgo ; then + # Used in test suite. + unset A + + emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check + + if tc-is-clang; then + llvm-profdata merge "${T}"/pgo --output="${T}"/pgo/default.profdata || die + fi + + # Rebuild Bash using the profiling data we just generated. + emake clean + emake CFLAGS="${CFLAGS} ${pgo_use_flags}" + use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} ${pgo_use_flags}" all others + fi +} + +src_test() { + # Used in test suite. + unset A + + default +} + +src_install() { + local d f + + default + + dodir /bin + mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die + dosym bash /bin/rbash + + insinto /etc/bash + doins "${FILESDIR}"/bash_logout + doins "$(prefixify_ro "${FILESDIR}"/bashrc)" + + keepdir /etc/bash/bashrc.d + + insinto /etc/skel + for f in bash{_logout,_profile,rc} ; do + newins "${FILESDIR}"/dot-${f} .${f} + done + + local sed_args=( + -e 's:#GNU#@::' + -e '/#@/d' + ) + + if ! use readline ; then + # bug #432338 + sed_args+=( + -e '/^shopt -s histappend/s:^:#:' + -e 's:use_color=true:use_color=false:' + ) + fi + + sed -i \ + "${sed_args[@]}" \ + "${ED}"/etc/skel/.bashrc \ + "${ED}"/etc/bash/bashrc || die + + if use plugins ; then + exeinto /usr/$(get_libdir)/bash + doexe $(echo examples/loadables/*.o | sed 's:\.o::g') + + insinto /usr/include/bash-plugins + doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h} + fi + + if use examples ; then + for d in examples/{functions,misc,scripts,startup-files} ; do + exeinto /usr/share/doc/${PF}/${d} + docinto ${d} + for f in ${d}/* ; do + if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then + doexe ${f} + else + dodoc ${f} + fi + done + done + fi + + # Install bash_builtins.1 and rbash.1 + emake -C doc DESTDIR="${D}" install_builtins + sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die + doman "${T}"/rbash.1 + + newdoc CWRU/changelog ChangeLog + dosym bash.info /usr/share/info/bashref.info +} + +pkg_preinst() { + if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then + mkdir -p "${EROOT}"/etc/bash + mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ + fi +} + +pkg_postinst() { + # If /bin/sh does not exist, provide it + if [[ ! -e ${EROOT}/bin/sh ]] ; then + ln -sf bash "${EROOT}"/bin/sh + fi +} diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/files/bash-5.2_p21-memory-leak.patch b/sdk_container/src/third_party/portage-stable/app-shells/bash/files/bash-5.2_p21-memory-leak.patch new file mode 100644 index 0000000000..19c25e95ea --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/files/bash-5.2_p21-memory-leak.patch @@ -0,0 +1,18 @@ +https://lists.gnu.org/archive/html/bug-bash/2024-01/msg00011.html +https://git.savannah.gnu.org/cgit/bash.git/diff/builtins/evalstring.c?h=devel&id=81f7b44564cd1510788035cea7c59631865a7db2&dt=1#n766 + +*** builtins/evalstring.c Tue Dec 13 12:53:21 2022 +--- builtins/evalstring.c Tue Nov 28 17:25:39 2023 +*************** +*** 763,766 **** +--- 773,779 ---- + if (fnp) + *fnp = fn; ++ else ++ free (fn); ++ + return fd; + } + + + diff --git a/sdk_container/src/third_party/portage-stable/app-shells/bash/files/bash-5.2_p26-memory-leaks.patch b/sdk_container/src/third_party/portage-stable/app-shells/bash/files/bash-5.2_p26-memory-leaks.patch new file mode 100644 index 0000000000..10a5deb181 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-shells/bash/files/bash-5.2_p26-memory-leaks.patch @@ -0,0 +1,136 @@ +https://lists.gnu.org/archive/html/bug-bash/2024-01/msg00036.html +https://lists.gnu.org/archive/html/bug-bash/2024-01/txtm8yNNPR9RQ.txt + +For evalstring.c: +* https://lists.gnu.org/archive/html/bug-bash/2024-01/msg00011.html +* https://git.savannah.gnu.org/cgit/bash.git/diff/builtins/evalstring.c?h=devel&id=81f7b44564cd1510788035cea7c59631865a7db2&dt=1#n766 + +From 711ab85262884f2b91f09eceb9aefd0e2426ce67 Mon Sep 17 00:00:00 2001 +From: Grisha Levit +Date: Sat, 3 Jun 2023 16:51:26 -0400 +Subject: [PATCH] various leaks + +Found mostly by normal usage running a no-bash-malloc build with clang's +LeakSanitizer enabled. So far seems to provide very accurate results. + +* arrayfunc.c +- quote_compound_array_word: make sure to free VALUE +- bind_assoc_var_internal: if assigning to a dynamic variable, make sure + to free the key (usually assoc_insert would do it) + +* bashline.c +- bash_command_name_stat_hook: free original *NAME if we are going to + change what it points to (what the callers seem to expect) + +* builtins/evalstring.c +- parse_and_execute: make sure to dispose of the parsed command + resulting from a failed function import attempt +- open_redir_file: if we did not get a pointer to pass back the expanded + filename, make sure to free the name + +* examples/loadables/stat.c +- loadstat: bind_assoc_variable does not free its VALUE argument so make + sure to do it + +* subst.c +- param_expand: free temp1 value for codepaths that don't do it +--- + arrayfunc.c | 6 +++++- + bashline.c | 1 + + builtins/evalstring.c | 4 ++++ + examples/loadables/stat.c | 1 + + subst.c | 2 ++ + 5 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/arrayfunc.c b/arrayfunc.c +index 2c05d15b..8ba64084 100644 +--- arrayfunc.c ++++ arrayfunc.c +@@ -208,7 +208,10 @@ bind_assoc_var_internal (entry, hash, key, value, flags) + newval = make_array_variable_value (entry, 0, key, value, flags); + + if (entry->assign_func) +- (*entry->assign_func) (entry, newval, 0, key); ++ { ++ (*entry->assign_func) (entry, newval, 0, key); ++ FREE (key); ++ } + else + assoc_insert (hash, key, newval); + +@@ -985,6 +988,7 @@ quote_compound_array_word (w, type) + if (t != w+ind) + free (t); + strcpy (nword + i, value); ++ free (value); + + return nword; + } +diff --git a/bashline.c b/bashline.c +index c85b05b6..bd7548cc 100644 +--- bashline.c ++++ bashline.c +@@ -1928,6 +1928,7 @@ bash_command_name_stat_hook (name) + result = search_for_command (cname, 0); + if (result) + { ++ FREE (*name); + *name = result; + return 1; + } +diff --git a/builtins/evalstring.c b/builtins/evalstring.c +index df3dd68e..20c6a4a7 100644 +--- builtins/evalstring.c ++++ builtins/evalstring.c +@@ -461,6 +461,8 @@ parse_and_execute (string, from_file, flags) + should_jump_to_top_level = 0; + last_result = last_command_exit_value = EX_BADUSAGE; + set_pipestatus_from_exit (last_command_exit_value); ++ dispose_command(command); ++ global_command = (COMMAND *)NULL; + reset_parser (); + break; + } +@@ -762,6 +764,8 @@ open_redir_file (r, fnp) + + if (fnp) + *fnp = fn; ++ else ++ free (fn); + return fd; + } + +diff --git a/examples/loadables/stat.c b/examples/loadables/stat.c +index 1e60e7b6..ed5c9764 100644 +--- examples/loadables/stat.c ++++ examples/loadables/stat.c +@@ -349,6 +349,7 @@ loadstat (vname, var, fname, flags, fmt, sp) + key = savestring (arraysubs[i]); + value = statval (i, fname, flags, fmt, sp); + v = bind_assoc_variable (var, vname, key, value, ASS_FORCE); ++ free (value); + } + return 0; + } +diff --git a/subst.c b/subst.c +index 1ac6eb2d..ff0602da 100644 +--- subst.c ++++ subst.c +@@ -10727,6 +10727,7 @@ comsub: + { + chk_atstar (temp, quoted, pflags, quoted_dollar_at_p, contains_dollar_at); + tdesc = parameter_brace_expand_word (temp, SPECIAL_VAR (temp, 0), quoted, pflags, 0); ++ free (temp1); + if (tdesc == &expand_wdesc_error || tdesc == &expand_wdesc_fatal) + return (tdesc); + ret = tdesc; +@@ -10739,6 +10740,7 @@ comsub: + { + set_exit_status (EXECUTION_FAILURE); + report_error (_("%s: invalid variable name for name reference"), temp); ++ free (temp1); + return (&expand_wdesc_error); /* XXX */ + } + else +-- +2.43.0 From 88810e481dede90a0b2746780bee2e8022add17f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:54 +0000 Subject: [PATCH 018/130] dev-db/sqlite: Sync with Gentoo It's from Gentoo commit b28a551a4511cb0861ed6204556cb507822fbedb. --- .../files/sqlite-3.44.2-fts-regression.patch | 125 +++++ .../dev-db/sqlite/sqlite-3.44.2-r2.ebuild | 434 ++++++++++++++++++ 2 files changed, 559 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.44.2-fts-regression.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.44.2-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.44.2-fts-regression.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.44.2-fts-regression.patch new file mode 100644 index 0000000000..369732f81b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.44.2-fts-regression.patch @@ -0,0 +1,125 @@ +https://bugs.gentoo.org/921490 +https://www.sqlite.org/forum/forumpost/d16aeb397d + +https://github.com/kovidgoyal/calibre/commit/0a23fabd5b4bff152047ba0cffbc2b67592645d1 +https://github.com/kovidgoyal/calibre/commit/3349979551db05ec0c8754d7ea5a4e57a97f8a0a +https://github.com/kovidgoyal/calibre/commit/da82b673f09efbe9cdcc1e0900f0a9f04d8de052 +--- a/ext/fts5/fts5_aux.c ++++ b/ext/fts5/fts5_aux.c +@@ -209,10 +209,18 @@ + rc = fts5CInstIterNext(&p->iter); + } + } + + if( iPos==p->iRangeEnd ){ ++ if( p->bOpen ){ ++ if( p->iter.iStart>=0 && iPos>=p->iter.iStart ){ ++ fts5HighlightAppend(&rc, p, &p->zIn[p->iOff], iEndOff - p->iOff); ++ p->iOff = iEndOff; ++ } ++ fts5HighlightAppend(&rc, p, p->zClose, -1); ++ p->bOpen = 0; ++ } + fts5HighlightAppend(&rc, p, &p->zIn[p->iOff], iEndOff - p->iOff); + p->iOff = iEndOff; + } + + return rc; + +ADDED ext/fts5/test/fts5tokenizer2.test +Index: ext/fts5/test/fts5tokenizer2.test +================================================================== +--- /dev/null ++++ b/ext/fts5/test/fts5tokenizer2.test +@@ -0,0 +1,89 @@ ++# 2023 Nov 03 ++# ++# The author disclaims copyright to this source code. In place of ++# a legal notice, here is a blessing: ++# ++# May you do good and not evil. ++# May you find forgiveness for yourself and forgive others. ++# May you share freely, never taking more than you give. ++# ++#*********************************************************************** ++# ++# Tests focusing on the built-in fts5 tokenizers. ++# ++ ++source [file join [file dirname [info script]] fts5_common.tcl] ++set testprefix fts5tokenizer2 ++ ++# If SQLITE_ENABLE_FTS5 is defined, omit this file. ++ifcapable !fts5 { ++ finish_test ++ return ++} ++ ++sqlite3_fts5_create_tokenizer db tst get_tst_tokenizer ++proc get_tst_tokenizer {args} { ++ return "tst_tokenizer" ++} ++proc tst_tokenizer {flags txt} { ++ set token "" ++ set lTok [list] ++ ++ foreach c [split $txt {}] { ++ if {$token==""} { ++ append token $c ++ } else { ++ set t1 [string is upper $token] ++ set t2 [string is upper $c] ++ ++ if {$t1!=$t2} { ++ lappend lTok $token ++ set token "" ++ } ++ append token $c ++ } ++ } ++ if {$token!=""} { lappend lTok $token } ++ ++ set iOff 0 ++ foreach t $lTok { ++ set n [string length $t] ++ sqlite3_fts5_token $t $iOff [expr $iOff+$n] ++ incr iOff $n ++ } ++} ++ ++do_execsql_test 1.0 { ++ CREATE VIRTUAL TABLE t1 USING fts5(t, tokenize=tst); ++} ++ ++do_execsql_test 1.1 { ++ INSERT INTO t1 VALUES('AAdontBBmess'); ++} ++ ++do_execsql_test 1.2 { ++ SELECT snippet(t1, 0, '>', '<', '...', 4) FROM t1('BB'); ++} {AAdont>BB', '<') FROM t1('BB'); ++} {AAdont>BB', '<') FROM t1('AA'); ++} {>AA', '<') FROM t1('dont'); ++} {AA>dont', '<') FROM t1('mess'); ++} {AAdontBB>mess<} ++ ++do_execsql_test 1.7 { ++ SELECT highlight(t1, 0, '>', '<') FROM t1('BB mess'); ++} {AAdont>BBmess<} ++ ++ ++finish_test + + diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.44.2-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.44.2-r2.ebuild new file mode 100644 index 0000000000..90699bab48 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.44.2-r2.ebuild @@ -0,0 +1,434 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic multilib-minimal toolchain-funcs + +DESCRIPTION="SQL database engine" +HOMEPAGE="https://sqlite.org/" + +# On version updates, make sure to read the forum (https://sqlite.org/forum/forum) +# for hints regarding test failures, backports, etc. +if [[ ${PV} == 9999 ]]; then + S="${WORKDIR}"/${PN} + PROPERTIES="live" +else + printf -v SRC_PV "%u%02u%02u%02u" $(ver_rs 1- " ") + DOC_PV="${SRC_PV}" + #printf -v DOC_PV "%u%02u%02u00" $(ver_rs 1-3 " ") + + SRC_URI=" + https://sqlite.org/2023/${PN}-src-${SRC_PV}.zip + doc? ( https://sqlite.org/2023/${PN}-doc-${DOC_PV}.zip ) + " + S="${WORKDIR}/${PN}-src-${SRC_PV}" + + 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" +SLOT="3" +IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" +RESTRICT="!test? ( test )" + +RDEPEND=" + sys-libs/zlib:=[${MULTILIB_USEDEP}] + icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) + readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] ) + tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] ) + tools? ( dev-lang/tcl:= ) +" +DEPEND=" + ${RDEPEND} + test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] ) +" +BDEPEND=">=dev-lang/tcl-8.6:0" +if [[ ${PV} == 9999 ]]; then + BDEPEND+=" dev-vcs/fossil" +else + BDEPEND+=" app-arch/unzip" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-3.44.2-tracker-regression.patch + "${FILESDIR}"/${PN}-3.44.2-fts-regression.patch +) + +_fossil_fetch() { + local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" + local repo_id="${1}" + local repo_uri="${2}" + + local -x FOSSIL_HOME="${HOME}" + + mkdir -p "${T}/fossil/${repo_id}" || die + pushd "${T}/fossil/${repo_id}" > /dev/null || die + + if [[ -n "${EVCS_OFFLINE}" ]]; then + if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then + die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\"" + fi + else + if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then + einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" + fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die + echo + else + cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die + einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" + fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die + echo + fi + + ( + addwrite "${distdir}" + mkdir -p "${distdir}/fossil-src/${repo_id}" || die + cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die + ) + fi + + popd > /dev/null || die +} + +_fossil_checkout() { + local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" + local repo_id="${1}" + local branch_or_commit="${2}" + local target_directory="${3}" + + local -x FOSSIL_HOME="${HOME}" + + if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then + die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\"" + fi + + if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then + mkdir -p "${T}/fossil/${repo_id}" || die + cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die + fi + + mkdir "${target_directory}" || die + pushd "${target_directory}" > /dev/null || die + + einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" + fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die + echo + + popd > /dev/null || die +} + +fossil_fetch() { + local repo_id="${1}" + local repo_uri="${2}" + local target_directory="${3}" + + local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}" + + _fossil_fetch "${repo_id}" "${repo_uri}" + _fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}" +} + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}" + if use doc; then + fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc" + fi + else + default + fi +} + +src_prepare() { + default + + eautoreconf + multilib_copy_sources +} + +multilib_src_configure() { + local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" + local options=() + + options+=( + --enable-load-extension + --enable-threadsafe + ) + + # Support detection of misuse of SQLite API. + # https://sqlite.org/compile.html#enable_api_armor + append-cppflags -DSQLITE_ENABLE_API_ARMOR + + # Support bytecode and tables_used virtual tables. + # https://sqlite.org/compile.html#enable_bytecode_vtab + # https://sqlite.org/bytecodevtab.html + append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB + + # Support column metadata functions. + # https://sqlite.org/compile.html#enable_column_metadata + # https://sqlite.org/c3ref/column_database_name.html + append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA + + # Support sqlite_dbpage virtual table. + # https://sqlite.org/compile.html#enable_dbpage_vtab + # https://sqlite.org/dbpage.html + append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB + + # Support dbstat virtual table. + # https://sqlite.org/compile.html#enable_dbstat_vtab + # https://sqlite.org/dbstat.html + append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB + + # Support sqlite3_serialize() and sqlite3_deserialize() functions. + # https://sqlite.org/compile.html#enable_deserialize + # https://sqlite.org/c3ref/serialize.html + # https://sqlite.org/c3ref/deserialize.html + append-cppflags -DSQLITE_ENABLE_DESERIALIZE + + # Support comments in output of EXPLAIN. + # https://sqlite.org/compile.html#enable_explain_comments + append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS + + # Support Full-Text Search versions 3, 4 and 5. + # https://sqlite.org/compile.html#enable_fts3 + # https://sqlite.org/compile.html#enable_fts3_parenthesis + # https://sqlite.org/compile.html#enable_fts4 + # https://sqlite.org/compile.html#enable_fts5 + # https://sqlite.org/fts3.html + # https://sqlite.org/fts5.html + append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 + options+=( --enable-fts5 ) + + # Support hidden columns. + append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS + + # Support memsys5 memory allocator. + # https://sqlite.org/compile.html#enable_memsys5 + # https://sqlite.org/malloc.html#memsys5 + append-cppflags -DSQLITE_ENABLE_MEMSYS5 + + # Support sqlite3_normalized_sql() function. + # https://sqlite.org/c3ref/expanded_sql.html + append-cppflags -DSQLITE_ENABLE_NORMALIZE + + # Support sqlite_offset() function. + # https://sqlite.org/compile.html#enable_offset_sql_func + # https://sqlite.org/lang_corefunc.html#sqlite_offset + append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC + + # Support pre-update hook functions. + # https://sqlite.org/compile.html#enable_preupdate_hook + # https://sqlite.org/c3ref/preupdate_count.html + append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK + + # Support Resumable Bulk Update extension. + # https://sqlite.org/compile.html#enable_rbu + # https://sqlite.org/rbu.html + append-cppflags -DSQLITE_ENABLE_RBU + + # Support R*Trees. + # https://sqlite.org/compile.html#enable_rtree + # https://sqlite.org/compile.html#enable_geopoly + # https://sqlite.org/rtree.html + # https://sqlite.org/geopoly.html + append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY + + # Support Session extension. + # https://sqlite.org/compile.html#enable_session + # https://sqlite.org/sessionintro.html + append-cppflags -DSQLITE_ENABLE_SESSION + + # Support scan status functions. + # https://sqlite.org/compile.html#enable_stmt_scanstatus + # https://sqlite.org/c3ref/stmt_scanstatus.html + # https://sqlite.org/c3ref/stmt_scanstatus_reset.html + append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS + + # Support sqlite_stmt virtual table. + # https://sqlite.org/compile.html#enable_stmtvtab + # https://sqlite.org/stmt.html + append-cppflags -DSQLITE_ENABLE_STMTVTAB + + # Support unknown() function. + # https://sqlite.org/compile.html#enable_unknown_sql_function + append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION + + # Support unlock notification. + # https://sqlite.org/compile.html#enable_unlock_notify + # https://sqlite.org/c3ref/unlock_notify.html + # https://sqlite.org/unlock_notify.html + append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY + + # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. + # https://sqlite.org/compile.html#enable_update_delete_limit + # https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses + # https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses + append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT + + # Support soundex() function. + # https://sqlite.org/compile.html#soundex + # https://sqlite.org/lang_corefunc.html#soundex + append-cppflags -DSQLITE_SOUNDEX + + # Support URI filenames. + # https://sqlite.org/compile.html#use_uri + # https://sqlite.org/uri.html + append-cppflags -DSQLITE_USE_URI + + options+=( $(use_enable debug) ) + + if use icu; then + # Support ICU extension. + # https://sqlite.org/compile.html#enable_icu + append-cppflags -DSQLITE_ENABLE_ICU + sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" + fi + + options+=( + --disable-editline + $(use_enable readline) + ) + + if use readline; then + options+=( --with-readline-inc="-I${ESYSROOT}/usr/include/readline" ) + fi + + if use secure-delete; then + # Enable secure_delete pragma by default. + # https://sqlite.org/compile.html#secure_delete + # https://sqlite.org/pragma.html#pragma_secure_delete + append-cppflags -DSQLITE_SECURE_DELETE + fi + + options+=( $(use_enable static-libs static) ) + + # tcl, test, tools USE flags. + if use tcl || use test || { use tools && multilib_is_native_abi; }; then + options+=( + --enable-tcl + --with-tcl="${ESYSROOT}/usr/$(get_libdir)" + ) + else + options+=( --disable-tcl ) + fi + + if [[ "${ABI}" == "x86" ]]; then + if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then + append-cflags -mfpmath=sse + else + append-cflags -ffloat-store + fi + + # Skip known-broken test for now + # https://sqlite.org/forum/forumpost/d97caf168f + # https://sqlite.org/forum/forumpost/50f136d91d + if use test ; then + rm test/atof1.test || die + fi + fi + + econf "${options[@]}" +} + +multilib_src_compile() { + emake HAVE_TCL="$(usev tcl 1)" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" + + if use tools && multilib_is_native_abi; then + emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh + fi + + if [[ ${PV} == 9999 ]] && use doc && multilib_is_native_abi; then + emake tclsqlite3.c + + local build_directory="$(pwd)" + build_directory="${build_directory##*/}" + + mkdir "${WORKDIR}/${PN}-doc-build" || die + pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die + + emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc + rmdir doc/matrix{/*,} || die + + popd > /dev/null || die + fi +} + +multilib_src_test() { + if [[ "${EUID}" -eq 0 ]]; then + ewarn "Skipping tests due to root permissions" + return + fi + + local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}" + + # e_uri.test tries to open files in /. + # bug #839798 + local SANDBOX_PREDICT=${SANDBOX_PREDICT} + addpredict "/test.db" + addpredict "/ÿ.db" + + emake -Onone HAVE_TCL="$(usex tcl 1 "")" $(usex debug 'fulltest' 'test') +} + +multilib_src_install() { + emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install + + if use tools && multilib_is_native_abi; then + install_tool() { + if [[ -f ".libs/${1}" ]]; then + newbin ".libs/${1}" "${2}" + else + newbin "${1}" "${2}" + fi + } + + install_tool changeset sqlite3-changeset + install_tool dbdump sqlite3-db-dump + install_tool dbhash sqlite3-db-hash + install_tool dbtotxt sqlite3-db-to-txt + install_tool index_usage sqlite3-index-usage + install_tool rbu sqlite3-rbu + install_tool scrub sqlite3-scrub + install_tool showdb sqlite3-show-db + install_tool showjournal sqlite3-show-journal + install_tool showshm sqlite3-show-shm + install_tool showstat4 sqlite3-show-stat4 + install_tool showwal sqlite3-show-wal + install_tool sqldiff sqlite3-diff + install_tool sqlite3_analyzer sqlite3-analyzer + install_tool sqlite3_checker sqlite3-checker + install_tool sqlite3_expert sqlite3-expert + install_tool sqltclsh sqlite3-tclsh + + unset -f install_tool + fi +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -delete || die + + doman sqlite3.1 + + if use doc; then + if [[ ${PV} == 9999 ]]; then + pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die + else + pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die + fi + + find "(" -name "*.db" -o -name "*.txt" ")" -delete || die + if [[ ${PV} != 9999 ]]; then + rm search search.d/admin || die + rmdir search.d || die + find -name "*~" -delete || die + fi + + ( + docinto html + dodoc -r * + ) + + popd > /dev/null || die + fi +} From 4910bde63d1357c1904250bc37bd6b615ab17235 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:10:57 +0000 Subject: [PATCH 019/130] dev-lang/python: Sync with Gentoo It's from Gentoo commit 5e3d413c90ed50a6f9582ee1e3817398d4a82319. --- .../portage-stable/dev-lang/python/Manifest | 12 ++++++------ .../portage-stable/dev-lang/python/metadata.xml | 2 +- .../dev-lang/python/python-2.7.18_p16-r1.ebuild | 4 ++-- .../dev-lang/python/python-3.10.13.ebuild | 8 ++++---- .../dev-lang/python/python-3.11.7.ebuild | 8 ++++---- .../dev-lang/python/python-3.12.1.ebuild | 4 ++-- .../dev-lang/python/python-3.12.1_p1.ebuild | 10 +++++----- .../dev-lang/python/python-3.13.0_alpha2.ebuild | 8 ++++---- .../dev-lang/python/python-3.8.18.ebuild | 8 ++++---- .../dev-lang/python/python-3.9.18.ebuild | 8 ++++---- 10 files changed, 36 insertions(+), 36 deletions(-) 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 aff7c6498f..8c583adb2a 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 @@ -13,10 +13,10 @@ DIST Python-3.8.18.tar.xz.asc 833 BLAKE2B bc4e989748d53c6be7040e78d9f1852227c6a7 DIST Python-3.9.18.tar.xz 19673928 BLAKE2B 97da9bedaf29101e5df82199ac3ee12f1da74d5cc89de21ff1510c3f6d34d7f9194489e79855f1ab3c6f26768738e784cb7231c1a692fa746edd21d35558bc4e SHA512 aab155aca757d298394eddb91ff9a8f239665bd46feb495c6b6f735bbcb7489c05c858cc4cd08f1575c24f293b33492d763e9a140d92f0b2b0cc81a165a677c7 DIST Python-3.9.18.tar.xz.asc 833 BLAKE2B b2160eedf7a7529c379ede5cd626f2d1e36db65bad8c8968adbc2940e597bf0e66f4872078c6543c69aed9b7f38b41d922fdc1cb8046738c1d8566a3f48da7d3 SHA512 dff9a86df2b0774b68e7c762bacf05e2482dbb218301acfdc9128fc600bbc51c97a3a44f6b7cee87bd4e153bcb4a0af3c98109560d0c7861b7508edc9ae05ea1 DIST python-gentoo-patches-2.7.18_p16.tar.xz 35448 BLAKE2B 0139c0944f62f9cdd236f6a8557e0ed19704c7d72869af1cb7d8bd3e646a746cd4a0201e1b44232a5e78ef49f254db20b0d0271bf744fbfd4fe0f1e99b8f3e6c SHA512 810be590d0e06fab4b2165e6852ca49662f09dcd7e20b47a29f613ad7653252c8dfac3f0eb228d77c8a914efa7c08788b2fbd552a4b47504f5fd0ec17450c48f -DIST python-gentoo-patches-3.10.13.tar.xz 13996 BLAKE2B 0123a18c8c39397ac03b1be1d243d8ae4da9f62888f409157bc1781285c9c6cd3d9ec23f1ae7ff0e0591b3dd2934ee366b3eb235e7cc6663afc9d617c4fd42f2 SHA512 ddfc830d2ced508a64e202a6082930f53edb48411c19cc9f364b29977ecd5a4f052d0ce953bbfb7fdf26072acb2836e0b7d5ce55f941955f2039551fa1f48edd -DIST python-gentoo-patches-3.11.7.tar.xz 7560 BLAKE2B fa836508cc85c3fd5e9bfb61d4d214b0d23923e4d29b87d30afa7a5a4d8fa23d5abb8ae8e1d571e301318ce14707a5538228bf1f2bcc8dfdfd5788e4676c0c0c SHA512 e3f94281689f500b41cd707b2881613c0c6a1be3dad2fbe1fc64330b249bce173d50cdc6e2f656daa7920b06795b7a555c1b08982b889b48955356e66416836c +DIST python-gentoo-patches-3.10.13_p2.tar.xz 15236 BLAKE2B 1b60a9ec0973de0f5fc7454e016b01c2a03e55a4515345ec86bf20e129018809908493847f55346d0c07ed6878ee2ead32f2b7dcbc25a6902d1494f718480acf SHA512 1db65a001fc307b48d034ad58c7d9aa4561a0e01b46fa1027ee730b2db1652eb6f02c73df6a9e2b8545e76d3b0541706ea32d423787f99ed83f86463951e9e81 +DIST python-gentoo-patches-3.11.7_p1.tar.xz 8364 BLAKE2B 246da406e6d58d85ab2ef79dd3a018a134e473f90d42f8dd9274629f998a6129f3b03da228aa5e65c1b4508a71979ceb1f752a28066c356f813be21c30a40f70 SHA512 c5c1448a2e9b15b8084125e07cee288b667267779d89da8aab9df4b1d014739ba9af4d09e51b3cdc37e8942821d7aee0d1998e55820b67b83ef654d0a442767e DIST python-gentoo-patches-3.12.1.tar.xz 5152 BLAKE2B bd1470dbdb4a3336f499534131d9f67329d6a1f6378b61592f6168d9a2500d9d9d65a77167065f80c38745fa1464a2073eac3e4bc0e5c096eefbbc8971a077b6 SHA512 2e608940f2f8c3a4be2699365acd1967d887c7895e71b173327dfe91ea41b6fb10a83d0845b2caa8b59884aa73ea73e49535d7805dc8b50f63b7fcdda67b438a -DIST python-gentoo-patches-3.12.1_p1.tar.xz 6064 BLAKE2B 8238f10c1ebdd82fec4ca70cdc9ea59711dab06c687315044580c853502189eb8c00f14213eea507921659c9c6a6c14b4f432b6762fef5e10a62b866c27ac943 SHA512 44e6859a312cb5cc080ac5a2bc9c649fa5cd9a137b85c3e8dc312e0a0027cdc917e150c5c3ab4b4bd9836b6918b3e53a12e0d4406bdca124ede10d63e69e8ca2 -DIST python-gentoo-patches-3.13.0a2.tar.xz 4360 BLAKE2B 1c55b3ae512a2c04bab00fb3a47faabd2726b6cd7a082d27b4c354ff334c22cb7296d9bf4ca531fc91e2d31be8b1f385de82081980272bca9163bc208b54fea4 SHA512 c7bd4dc3f8f698d65ffe54f46432903e3591687d997b1f6b7429bead461652d9de9dea3515cb0063a662d14ddcf7916199779d61edf888cc24c01d89f1fafbee -DIST python-gentoo-patches-3.8.18.tar.xz 32424 BLAKE2B 2e0b6e1c8e3df666934ba283214ca1577b01140dea00513f6420b0255650002e4bc4cb142076620227cd430bc2547123fd392883285886e543ef72ca466f8ea6 SHA512 b005f1054b726fc8c82a50b006309de64fb7858fe5c22cc7b160687d059a7859ec9388706b74a0e6c1f42301bed071dc639eb8cfae0d7c5eef2f565c63cc2d29 -DIST python-gentoo-patches-3.9.18.tar.xz 25044 BLAKE2B 1d9ace5c5a0f1c15bc23595cc51d64b4c2b416552cdaaa960c3e34360aba3e7029a06e2a077212c68fa7aee4fd20f649a3b0926bd4ebb10e529e8350ab051e63 SHA512 bc180c3346dfae60a7db221d114146ee83409bc42092171eb05c83de528bf5f0e5654d1441f40ba839d0a98e866a5b43452fb7a72047c837497620a12097b8f5 +DIST python-gentoo-patches-3.12.1_p2.tar.xz 6880 BLAKE2B 20f0ba78295cc64743f6842bccc7fc684389b8800c3884572be64b61516ba38c873104612467ffaa2a84653fc35184a7d7cd77d1f6ca6e19faca0b05bce1417e SHA512 653104144c864a0c0a27972f849988833540641d24f02bf14096e99e5a9c2d41df31f5dd0d1ecbbfe36419588eefae8f2e0a4b49bff3e6d96bd8b3cf0e3b5425 +DIST python-gentoo-patches-3.13.0a2_p1.tar.xz 5176 BLAKE2B 87e278c11fafc69df918b4c105dfbc3d9ca9ff805d3862b0101ccbb0fd7614fda3460ba4e6304a0f62d0c96756a82ff046ca4a5b02d75daa3325c8e84edc99d5 SHA512 5a2692f8d113a67502b60450f6fdb0635f4f350877766e800e897aa943222a58991580dd8e1f71c9f2dfd3c381bb13fc30add9289cd7ade6fe184f3a5ca3d587 +DIST python-gentoo-patches-3.8.18_p1.tar.xz 33160 BLAKE2B 53c7d71f2cdcc21e991a9d61c8cb8833212d144d145d5949c5b28b62080121250d7633f477453743426d6e0ebdc9f6bd6648d4ccac8dfb2d559126455d8b1da3 SHA512 7fbadb2468711b5ecb8a9fefcf4dfe567df7f9b038ec87f37095d02589e7debbf5a8ad3f759d95b69ca60ce9fcd3ccf4aecde6592ed69c030cf51250935db052 +DIST python-gentoo-patches-3.9.18_p1.tar.xz 25792 BLAKE2B f24ab6d3443c2b39a2fdca5810790eed51d2d42c93a3b41d75cad6b6c99ebf709f598eaa9881858e13ad102867d97a159f3a6d97a42569d5183de6118fb953c6 SHA512 be0c60c65d4c982cd8b934d14b69f5f41ca9f0d6c51d6bf195d64d0a5ffff3d359edc29a6a2f2808450c896d2795cc773c9f31680970205a37955134be50ee79 diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-lang/python/metadata.xml index 1d85e227b8..31350aebeb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/metadata.xml @@ -25,7 +25,7 @@ Disable pymalloc when running under - dev-util/valgrind is detected (may incur minor + dev-debug/valgrind is detected (may incur minor performance penalty even when valgrind is not used) diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p16-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p16-r1.ebuild index e38ab82e1b..539f7addcb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p16-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p16-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -66,7 +66,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} bluetooth? ( net-wireless/bluez ) - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " BDEPEND=" app-alternatives/awk diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.13.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.13.ebuild index be5cdcb2af..b71238d52f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.13.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -10,7 +10,7 @@ inherit prefix python-utils-r1 toolchain-funcs verify-sig MY_PV=${PV/_rc/rc} MY_P="Python-${MY_PV%_p*}" PYVER=$(ver_cut 1-2) -PATCHSET="python-gentoo-patches-${MY_PV}" +PATCHSET="python-gentoo-patches-${MY_PV}_p2" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE=" @@ -71,8 +71,8 @@ RDEPEND=" DEPEND=" ${RDEPEND} bluetooth? ( net-wireless/bluez ) - valgrind? ( dev-util/valgrind ) - test? ( app-arch/xz-utils[extra-filters(+)] ) + valgrind? ( dev-debug/valgrind ) + test? ( app-arch/xz-utils ) " # autoconf-archive needed to eautoreconf BDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.7.ebuild index 5bfd3472f5..d7e61dca5f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.11.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -10,7 +10,7 @@ inherit prefix python-utils-r1 toolchain-funcs verify-sig MY_PV=${PV/_rc/rc} MY_P="Python-${MY_PV%_p*}" PYVER=$(ver_cut 1-2) -PATCHSET="python-gentoo-patches-${MY_PV}" +PATCHSET="python-gentoo-patches-${MY_PV}_p1" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE=" @@ -71,8 +71,8 @@ RDEPEND=" DEPEND=" ${RDEPEND} bluetooth? ( net-wireless/bluez ) - test? ( app-arch/xz-utils[extra-filters(+)] ) - valgrind? ( dev-util/valgrind ) + test? ( app-arch/xz-utils ) + valgrind? ( dev-debug/valgrind ) " # autoconf-archive needed to eautoreconf BDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.1.ebuild index aa40080aa7..1ba026283c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -77,7 +77,7 @@ DEPEND=" dev-python/ensurepip-setuptools dev-python/ensurepip-wheel ) - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " # autoconf-archive needed to eautoreconf BDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.1_p1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.1_p1.ebuild index 56041a87d6..8b1d4b1a48 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.1_p1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.12.1_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -10,7 +10,7 @@ inherit python-utils-r1 toolchain-funcs verify-sig MY_PV=${PV/_rc/rc} MY_P="Python-${MY_PV%_p*}" PYVER=$(ver_cut 1-2) -PATCHSET="python-gentoo-patches-${MY_PV}" +PATCHSET="python-gentoo-patches-${MY_PV%_p*}_p2" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE=" @@ -28,7 +28,7 @@ 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" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" IUSE=" bluetooth build debug +ensurepip examples gdbm libedit +ncurses pgo +readline +sqlite +ssl test tk valgrind @@ -72,12 +72,12 @@ DEPEND=" ${RDEPEND} bluetooth? ( net-wireless/bluez ) test? ( - app-arch/xz-utils[extra-filters(+)] + app-arch/xz-utils dev-python/ensurepip-pip dev-python/ensurepip-setuptools dev-python/ensurepip-wheel ) - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " # autoconf-archive needed to eautoreconf BDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.13.0_alpha2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.13.0_alpha2.ebuild index d3d5ea4fb3..35ae0c00ce 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.13.0_alpha2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.13.0_alpha2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -10,7 +10,7 @@ inherit python-utils-r1 toolchain-funcs verify-sig MY_PV=${PV/_alpha/a} MY_P="Python-${MY_PV%_p*}" PYVER=$(ver_cut 1-2) -PATCHSET="python-gentoo-patches-${MY_PV}" +PATCHSET="python-gentoo-patches-${MY_PV}_p1" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE=" @@ -71,12 +71,12 @@ DEPEND=" ${RDEPEND} bluetooth? ( net-wireless/bluez ) test? ( - app-arch/xz-utils[extra-filters(+)] + app-arch/xz-utils dev-python/ensurepip-pip dev-python/ensurepip-setuptools dev-python/ensurepip-wheel ) - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " # autoconf-archive needed to eautoreconf BDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.18.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.18.ebuild index 80d2c90ecc..6fdddf7f55 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.18.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -10,7 +10,7 @@ inherit prefix python-utils-r1 toolchain-funcs verify-sig MY_PV=${PV/_rc/rc} MY_P="Python-${MY_PV%_p*}" PYVER=$(ver_cut 1-2) -PATCHSET="python-gentoo-patches-${MY_PV}" +PATCHSET="python-gentoo-patches-${MY_PV}_p1" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE=" @@ -66,8 +66,8 @@ RDEPEND=" DEPEND=" ${RDEPEND} bluetooth? ( net-wireless/bluez ) - test? ( app-arch/xz-utils[extra-filters(+)] ) - valgrind? ( dev-util/valgrind ) + test? ( app-arch/xz-utils ) + valgrind? ( dev-debug/valgrind ) " # autoconf-archive needed to eautoreconf BDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.18.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.18.ebuild index 9edf94c8ea..38032a975c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.18.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.9.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -10,7 +10,7 @@ inherit prefix python-utils-r1 toolchain-funcs verify-sig MY_PV=${PV/_rc/rc} MY_P="Python-${MY_PV%_p*}" PYVER=$(ver_cut 1-2) -PATCHSET="python-gentoo-patches-${MY_PV}" +PATCHSET="python-gentoo-patches-${MY_PV}_p1" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE=" @@ -67,8 +67,8 @@ RDEPEND=" DEPEND=" ${RDEPEND} bluetooth? ( net-wireless/bluez ) - test? ( app-arch/xz-utils[extra-filters(+)] ) - valgrind? ( dev-util/valgrind ) + test? ( app-arch/xz-utils ) + valgrind? ( dev-debug/valgrind ) " # autoconf-archive needed to eautoreconf BDEPEND=" From 8ae14948d0bb4d465b2e907217d306017cfae836 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:00 +0000 Subject: [PATCH 020/130] dev-libs/cJSON: Sync with Gentoo It's from Gentoo commit 817835857e8dd0971687acec26230b83ed508b1d. --- .../portage-stable/dev-libs/cJSON/cJSON-1.7.17.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/cJSON/cJSON-1.7.17.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/cJSON/cJSON-1.7.17.ebuild index 8eab77565c..5e6acb49ca 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/cJSON/cJSON-1.7.17.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/cJSON/cJSON-1.7.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/DaveGamble/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" From 6c2e1b1c5293d83f6a01122845acd0dc23c29fc6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:04 +0000 Subject: [PATCH 021/130] dev-libs/elfutils: Sync with Gentoo It's from Gentoo commit 8199fa809b6de306f2a1e5f888cca3319fa197f5. --- .../portage-stable/dev-libs/elfutils/elfutils-0.189-r4.ebuild | 4 ++-- .../portage-stable/dev-libs/elfutils/elfutils-0.190.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.189-r4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.189-r4.ebuild index 4fbcbbab5b..c4cfa3f340 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.189-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.189-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2003-2023 Gentoo Authors +# Copyright 2003-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -41,7 +41,7 @@ DEPEND=" ${RDEPEND} " BDEPEND=" - >=sys-devel/flex-2.5.4a + app-alternatives/lex sys-devel/m4 virtual/pkgconfig nls? ( sys-devel/gettext ) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.190.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.190.ebuild index 014e5402a1..412b5ea58b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.190.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.190.ebuild @@ -1,4 +1,4 @@ -# Copyright 2003-2023 Gentoo Authors +# Copyright 2003-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -41,7 +41,7 @@ DEPEND=" ${RDEPEND} " BDEPEND=" - >=sys-devel/flex-2.5.4a + app-alternatives/lex sys-devel/m4 virtual/pkgconfig nls? ( sys-devel/gettext ) From 9ded4a36503b008f9e58da87b2da3de2ae4172f6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:05 +0000 Subject: [PATCH 022/130] dev-libs/glib: Sync with Gentoo It's from Gentoo commit c028c39fc794cca8828fe7e066ba9fecc5fd896e. --- .../portage-stable/dev-libs/glib/glib-2.78.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.3.ebuild index 0b50d21369..5ebdb5ce08 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 ~x64-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 From 7cc14a65d67db3309555a879f0ecd8aa695c3739 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:05 +0000 Subject: [PATCH 023/130] dev-libs/gobject-introspection: Sync with Gentoo It's from Gentoo commit a317ada94471686df0a352f16406d965eaac4306. --- .../gobject-introspection-1.76.1.ebuild | 4 ++-- .../gobject-introspection-1.78.1.ebuild | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 256ebb39ff..dd5dc146ec 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -40,7 +40,7 @@ BDEPEND=" app-text/docbook-xml-dtd:4.5 ) sys-devel/bison - sys-devel/flex + app-alternatives/lex test? ( x11-libs/cairo[glib] $(python_gen_cond_dep ' diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild index 802add92d3..9975bc0d72 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.78.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 ~x64-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=" @@ -40,7 +40,7 @@ BDEPEND=" app-text/docbook-xml-dtd:4.5 ) sys-devel/bison - sys-devel/flex + app-alternatives/lex test? ( x11-libs/cairo[glib] $(python_gen_cond_dep ' From 66b0389594421429e22f7b8e046d2ca92c756a3f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:05 +0000 Subject: [PATCH 024/130] dev-libs/gobject-introspection-common: Sync with Gentoo It's from Gentoo commit 9cebff2c2636035af1181d5e068f71048f7f1fff. --- .../gobject-introspection-common-1.78.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.78.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.78.1.ebuild index 1e892d8c38..23fe3010b2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.78.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.78.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-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="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" # Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like: From 5bc3a3350547d699aeb9e995d215f87a4c3d9c41 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:06 +0000 Subject: [PATCH 025/130] dev-libs/inih: Sync with Gentoo It's from Gentoo commit 96b2df11f9e7e47c0a66a0c11c0a55fdb7f7a846. --- .../dev-libs/inih/inih-57-r1.ebuild | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/inih/inih-57-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/inih/inih-57-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/inih/inih-57-r1.ebuild new file mode 100644 index 0000000000..5e06140e5a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/inih/inih-57-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Tests not wired up to meson and don't seem to be intended for downstream use yet +# e.g. hardcoding gcc, just a shell script + +inherit meson-multilib + +DESCRIPTION="inih (INI not invented here) simple .INI file parser" +HOMEPAGE="https://github.com/benhoyt/inih" +SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/inih-r${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" + +DOCS=( README.md ) + +src_configure() { + local emesonargs=( + -Ddefault_library=shared + -Ddistro_install=true + -Dwith_INIReader=true + ) + + meson-multilib_src_configure +} From ae3d0c197d8a4210ff2c0974d22329047371e17d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:06 +0000 Subject: [PATCH 026/130] dev-libs/json-c: Sync with Gentoo It's from Gentoo commit f7fdfdaeec3764929686064a6054c38a6b2d7788. --- .../portage-stable/dev-libs/json-c/json-c-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/json-c/json-c-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/json-c/json-c-9999.ebuild index 57cba100cf..29dc876b22 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/json-c/json-c-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/json-c/json-c-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ LICENSE="MIT" SLOT="0/5" IUSE="cpu_flags_x86_rdrand doc static-libs threads" -BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )" +BDEPEND="doc? ( >=app-text/doxygen-1.8.13 )" MULTILIB_WRAPPED_HEADERS=( /usr/include/json-c/config.h From 401e7283358a33cd849b779c7c7f5adf4d0357a4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:06 +0000 Subject: [PATCH 027/130] dev-libs/jsoncpp: Sync with Gentoo It's from Gentoo commit f7fdfdaeec3764929686064a6054c38a6b2d7788. --- .../portage-stable/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7ad6417570..308182dcfc 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,7 @@ RESTRICT="!test? ( test )" BDEPEND=" ${PYTHON_DEPS} - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " src_configure() { From d92eaa26cfdc0f1f43b8dbf920967a2d5b0c0331 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:10 +0000 Subject: [PATCH 028/130] dev-libs/libbsd: Sync with Gentoo It's from Gentoo commit 32f6b6137ac36f8bd2d6aaf30e31a6ae64fc2e27. --- .../portage-stable/dev-libs/libbsd/Manifest | 2 + .../dev-libs/libbsd/libbsd-0.11.8.ebuild | 44 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libbsd/libbsd-0.11.8.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libbsd/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libbsd/Manifest index 82a7043fed..0a58f706b5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libbsd/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libbsd/Manifest @@ -1,2 +1,4 @@ DIST libbsd-0.11.7.tar.xz 418508 BLAKE2B 2ff0aa951c5b37a58ab101aade52d077d52f3695bb8535c99dec89659775501d93af16f164fef946776f445ee88a276d00870f64cb3fef58942ce26af6d2eaa9 SHA512 51fda4724f41dd8a4628afd58c21236a7588d9045e337e06eeabf83805a9aaaa53705441ca901ad11f1c65f18e881523bdc97721a7d3d6a5cced27f2450d09a2 DIST libbsd-0.11.7.tar.xz.asc 833 BLAKE2B 925cd4f5b68c0dccceb476cb188bb5a8185ad77895b9b458ff6819ae241dbd8cbf1c18dd12d10b90b3a9ea3f9e065b44566d1a908d0c111ecbd435434b922a66 SHA512 bdcce69ee261039900896c5be48659f1b6b809f3a6e8a5220aac30a6687926ac29e478a3ea737727d077d6575ee11b86eed896932568fdd261a9aaeb46d695b6 +DIST libbsd-0.11.8.tar.xz 432376 BLAKE2B b2b9496423f177af7cba3c55c071b58a314ad987bd04fee5c93dc1885a501a923048f676d00dcb70c8cfa37de775c6ec64224dfecce1d0eaed50b8c27ec0c001 SHA512 0173fc20e2471f96bc6677500a02fbccef7463e023445f47681843c9a94b1fa9970c5af7d2f87f1a1e7f8a7bb60112988defc073828fd2a0dcd0e66e44e67295 +DIST libbsd-0.11.8.tar.xz.asc 931 BLAKE2B 3841b81fa8bcdf0e27a41c769691dbefbb82073a18e3a30580794e0242c903bd0b512d31d6e897f8fa98ef3a3cf0dc08a413040ead00caa63f0b993396e1f2fe SHA512 a24355f9151f1da62e1f4f37280eec57ee7a32205b493d973d59231382c878e4373d4cf83ec41612536ef9361fe43e68331217c96c59b6741e7827272369ff2c diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libbsd/libbsd-0.11.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libbsd/libbsd-0.11.8.ebuild new file mode 100644 index 0000000000..b86e247102 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libbsd/libbsd-0.11.8.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/guillemjover.asc +inherit multilib multilib-minimal verify-sig + +DESCRIPTION="Library to provide useful functions commonly found on BSD systems" +HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd" +SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz" +SRC_URI+=" verify-sig? ( https://${PN}.freedesktop.org/releases/${P}.tar.xz.asc )" + +LICENSE="BEER-WARE BSD BSD-2 BSD-4 ISC MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="static-libs" + +RDEPEND="app-crypt/libmd[${MULTILIB_USEDEP}]" +DEPEND=" + ${RDEPEND} + >=sys-kernel/linux-headers-3.17 +" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-guillemjover )" + +multilib_src_configure() { + # The build system will install libbsd-ctor.a despite USE="-static-libs" + # which is correct, see: + # https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8 + ECONF_SOURCE="${S}" econf $(use_enable static-libs static) +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + find "${ED}" -type f -name "*.la" -delete || die + + # ld scripts on standalone prefix (RAP) systems should have the prefix + # stripped from any paths, as the sysroot is automatically prepended. + local ldscript=${ED}/usr/$(get_libdir)/${PN}$(get_libname) + if use prefix && ! use prefix-guest && grep -qIF "ld script" "${ldscript}" 2>/dev/null; then + sed -i "s|${EPREFIX}/|/|g" "${ldscript}" || die + fi +} From fb5e019e4148f3c4fcec3df38727d7c3b7b28d37 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:14 +0000 Subject: [PATCH 029/130] dev-libs/libffi: Sync with Gentoo It's from Gentoo commit 7edad73b87f266741af3de82a08e84397cdc2c41. --- .../files/libffi-3.4.4-trampoline-c99.patch | 39 +++++++++++ ...3.4.4-r1.ebuild => libffi-3.4.4-r4.ebuild} | 15 ++-- .../dev-libs/libffi/libffi-3.4.4.ebuild | 70 ------------------- 3 files changed, 50 insertions(+), 74 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libffi/files/libffi-3.4.4-trampoline-c99.patch rename sdk_container/src/third_party/portage-stable/dev-libs/libffi/{libffi-3.4.4-r1.ebuild => libffi-3.4.4-r4.ebuild} (81%) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libffi/files/libffi-3.4.4-trampoline-c99.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libffi/files/libffi-3.4.4-trampoline-c99.patch new file mode 100644 index 0000000000..a772833113 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libffi/files/libffi-3.4.4-trampoline-c99.patch @@ -0,0 +1,39 @@ +https://github.com/libffi/libffi/issues/760 +https://github.com/libffi/libffi/commit/ce077e5565366171aa1b4438749b0922fce887a4 + +From ce077e5565366171aa1b4438749b0922fce887a4 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille +Date: Thu, 2 Feb 2023 14:46:29 +0000 +Subject: [PATCH] Forward declare open_temp_exec_file (#764) + +It's defined in closures.c and used in tramp.c. +Also declare it as an hidden symbol, as it should be. + +Co-authored-by: serge-sans-paille +--- a/include/ffi_common.h ++++ b/include/ffi_common.h +@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN; + static trampoline. */ + int ffi_tramp_is_present (void *closure) FFI_HIDDEN; + ++/* Return a file descriptor of a temporary zero-sized file in a ++ writable and executable filesystem. */ ++int open_temp_exec_file(void) FFI_HIDDEN; ++ + /* Extended cif, used in callback from assembly routine */ + typedef struct + { +--- a/src/tramp.c ++++ b/src/tramp.c +@@ -39,6 +39,10 @@ + #ifdef __linux__ + #define _GNU_SOURCE 1 + #endif ++ ++#include ++#include ++ + #include + #include + #include + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.4-r4.ebuild similarity index 81% rename from sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.4-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.4-r4.ebuild index cf7d47ca43..5304ecb54f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.4-r4.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit multilib-minimal preserve-libs MY_PV=${PV/_rc/-rc} MY_P=${PN}-${MY_PV} -DESCRIPTION="a portable, high level programming interface to various calling conventions" +DESCRIPTION="Portable, high level programming interface to various calling conventions" HOMEPAGE="https://sourceware.org/libffi/" SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} @@ -19,7 +19,7 @@ LICENSE="MIT" # with FEATURES="-preserved-libs" or another package manager if SONAME # changes. SLOT="0/8" # SONAME=libffi.so.8 -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" +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 exec-static-trampoline pax-kernel static-libs test" RESTRICT="!test? ( test )" @@ -29,6 +29,9 @@ PATCHES=( "${FILESDIR}"/${P}-hppa-large-struct.patch "${FILESDIR}"/${P}-hppa-closure-function-ptrs.patch "${FILESDIR}"/${P}-hppa-jump-table.patch + "${FILESDIR}"/${P}-sparc-float-typo.patch + "${FILESDIR}"/${P}-lld-17.patch + "${FILESDIR}"/${P}-trampoline-c99.patch ) src_prepare() { @@ -62,6 +65,10 @@ multilib_src_configure() { $(use_enable debug) } +multilib_src_test() { + emake -Onone check +} + multilib_src_install_all() { einstalldocs find "${ED}" -name "*.la" -delete || die diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.4.ebuild deleted file mode 100644 index 5401d0f8a9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libffi/libffi-3.4.4.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal preserve-libs - -MY_PV=${PV/_rc/-rc} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="a portable, high level programming interface to various calling conventions" -HOMEPAGE="https://sourceware.org/libffi/" -SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz" -S="${WORKDIR}"/${MY_P} - -LICENSE="MIT" -# This is a core package which is depended on by e.g. Python -# Please use preserve-libs.eclass in pkg_{pre,post}inst to cover users -# with FEATURES="-preserved-libs" or another package manager if SONAME -# changes. -SLOT="0/8" # SONAME=libffi.so.8 -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 exec-static-trampoline pax-kernel static-libs test" - -RESTRICT="!test? ( test )" -BDEPEND="test? ( dev-util/dejagnu )" - -src_prepare() { - default - - if [[ ${CHOST} == arm64-*-darwin* ]] ; then - # ensure we use aarch64 asm, not x86 on arm64 - sed -i -e 's/aarch64\*-\*-\*/arm64*-*-*|&/' \ - configure configure.host || die - fi -} - -multilib_src_configure() { - # --includedir= path maintains a few properties: - # 1. have stable name across libffi versions: some packages like - # dev-lang/ghc or kde-frameworks/networkmanager-qt embed - # ${includedir} at build-time. Don't require those to be - # rebuilt unless SONAME changes. bug #695788 - # - # We use /usr/.../${PN} (instead of former /usr/.../${P}). - # - # 2. have ${ABI}-specific location as ffi.h is target-dependent. - # - # We use /usr/$(get_libdir)/... to have ABI identifier. - ECONF_SOURCE="${S}" econf \ - --includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \ - --disable-multi-os-directory \ - $(use_enable static-libs static) \ - $(use_enable exec-static-trampoline exec-static-tramp) \ - $(use_enable pax-kernel pax_emutramp) \ - $(use_enable debug) -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name "*.la" -delete || die -} - -pkg_preinst() { - preserve_old_lib /usr/$(get_libdir)/libffi.so.7 -} - -pkg_postinst() { - preserve_old_lib_notify /usr/$(get_libdir)/libffi.so.7 -} From 10b9c4ab2ceb6594c6e5173331631fe5968c3565 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:14 +0000 Subject: [PATCH 030/130] dev-libs/libgcrypt: Sync with Gentoo It's from Gentoo commit 691d5651392af419777406bc746f411ca714013e. --- .../libgcrypt/libgcrypt-1.10.1-r2.ebuild | 4 +- .../libgcrypt/libgcrypt-1.10.1-r3.ebuild | 4 +- .../libgcrypt/libgcrypt-1.10.2.ebuild | 6 +- .../libgcrypt/libgcrypt-1.10.3-r1.ebuild | 175 ++++++++++++++++++ .../libgcrypt/libgcrypt-1.10.3.ebuild | 4 +- .../libgcrypt/libgcrypt-1.9.4-r2.ebuild | 4 +- 6 files changed, 186 insertions(+), 11 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.3-r1.ebuild 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 8e315d592a..3a7388fc7e 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnupg.org/" SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" -LICENSE="LGPL-2.1 MIT" +LICENSE="LGPL-2.1+ GPL-2+ 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 ~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" 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 d2dccd75ae..f1b329ab79 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnupg.org/" SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" -LICENSE="LGPL-2.1 MIT" +LICENSE="LGPL-2.1+ GPL-2+ 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 ~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" 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 df10e518d7..06b52ad4dd 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,9 +11,9 @@ HOMEPAGE="https://www.gnupg.org/" SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" -LICENSE="LGPL-2.1 MIT" +LICENSE="LGPL-2.1+ GPL-2+ 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 ~x64-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 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.3-r1.ebuild new file mode 100644 index 0000000000..86e47a3ab4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.3-r1.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc +inherit autotools flag-o-matic linux-info multilib-minimal toolchain-funcs verify-sig + +DESCRIPTION="General purpose crypto library based on the code used in GnuPG" +HOMEPAGE="https://www.gnupg.org/" +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" +SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" + +LICENSE="LGPL-2.1+ GPL-2+ 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 ~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 +# If changing this, update src_configure logic too. +# ARM CPUs seem to, right now, support all-or-nothing for crypto extensions, +# but this looks like it might change in future. This is just a safety check +# in case people somehow do have a CPU which only supports some. They must +# for now disable them all if that's the case. +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 ) + cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 ) + cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec ) +" + +RDEPEND=" + >=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}] + getentropy? ( + kernel_linux? ( + elibc_glibc? ( >=sys-libs/glibc-2.25 ) + elibc_musl? ( >=sys-libs/musl-1.1.20 ) + ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( virtual/texi2dvi ) + verify-sig? ( sec-keys/openpgp-keys-gnupg ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-multilib-syspath.patch + "${FILESDIR}"/${PN}-powerpc-darwin.patch + "${FILESDIR}"/${PN}-1.9.4-no-fgrep-libgcrypt-config.patch +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/libgcrypt-config +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} == buildonly ]]; then + return + fi + if use kernel_linux && use getentropy; then + unset KV_FULL + get_running_version + if [[ -n ${KV_FULL} ]] && kernel_is -lt 3 17; then + eerror "The getentropy function requires the getrandom syscall." + eerror "This was introduced in Linux 3.17." + eerror "Your system is currently running Linux ${KV_FULL}." + eerror "Disable the 'getentropy' USE flag or upgrade your kernel." + die "Kernel is too old for getentropy" + fi + fi +} + +pkg_setup() { + : +} + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + if [[ ${CHOST} == *86*-solaris* ]] ; then + # ASM code uses GNU ELF syntax, divide in particular, we need to + # allow this via ASFLAGS, since we don't have a flag-o-matic + # function for that, we'll have to abuse cflags for this + append-cflags -Wa,--divide + fi + + if [[ ${CHOST} == powerpc* ]] ; then + # ./configure does a lot of automagic, prevent that + # generic ppc32+ppc64 altivec + use cpu_flags_ppc_altivec || local -x gcry_cv_cc_ppc_altivec=no + use cpu_flags_ppc_altivec || local -x gcry_cv_cc_ppc_altivec_cflags=no + # power8 vector extension, aka arch 2.07 ISA, also checked below via ppc-crypto-support + use cpu_flags_ppc_vsx2 || local -x gcry_cv_gcc_inline_asm_ppc_altivec=no + # power9 vector extension, aka arch 3.00 ISA + use cpu_flags_ppc_vsx3 || local -x gcry_cv_gcc_inline_asm_ppc_arch_3_00=no + fi + + # Workaround for GCC < 11.3 bug + # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=0b399721ce9709ae25f9d2050360c5ab2115ae29 + # https://dev.gnupg.org/T5581 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102124 + if use arm64 && tc-is-gcc && (($(gcc-major-version) == 11)) && + (($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then + append-flags -fno-tree-loop-vectorize + fi + + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + local myeconfargs=( + CC_FOR_BUILD="$(tc-getBUILD_CC)" + + --enable-noexecstack + $(use_enable cpu_flags_arm_neon neon-support) + # See REQUIRED_USE comment above + $(use_enable cpu_flags_arm_aes arm-crypto-support) + $(use_enable cpu_flags_ppc_vsx2 ppc-crypto-support) + $(use_enable cpu_flags_x86_aes aesni-support) + $(use_enable cpu_flags_x86_avx avx-support) + $(use_enable cpu_flags_x86_avx2 avx2-support) + $(use_enable cpu_flags_x86_padlock padlock-support) + $(use_enable cpu_flags_x86_sha shaext-support) + $(use_enable cpu_flags_x86_sse4_1 sse41-support) + # required for sys-power/suspend[crypt], bug 751568 + $(use_enable static-libs static) + + # disabled due to various applications requiring privileges + # after libgcrypt drops them (bug #468616) + --without-capabilities + + # http://trac.videolan.org/vlc/ticket/620 + $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") + + $(use asm || echo "--disable-asm") + + GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" + ) + + if use kernel_linux; then + # --enable-random=getentropy requires getentropy/getrandom. + # --enable-random=linux enables legacy code that tries getrandom + # and falls back to reading /dev/random. + myeconfargs+=( --enable-random=$(usex getentropy getentropy linux) ) + fi + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \ + $("${S}/configure" --help | grep -o -- '--without-.*-prefix') +} + +multilib_src_compile() { + default + multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf +} + +multilib_src_test() { + # t-secmem and t-sexp need mlock which requires extra privileges; nspawn + # at least disallows that by default. + local -x GCRYPT_IN_ASAN_TEST=1 + + default +} + +multilib_src_install() { + emake DESTDIR="${D}" install + multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf +} + +multilib_src_install_all() { + default + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.3.ebuild index 2761d93ca6..38219a2d1a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgcrypt/libgcrypt-1.10.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnupg.org/" SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" -LICENSE="LGPL-2.1 MIT" +LICENSE="LGPL-2.1+ GPL-2+ 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 ~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" 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 040fad866c..18c1f9495d 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnupg.org/" SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" -LICENSE="LGPL-2.1 MIT" +LICENSE="LGPL-2.1+ GPL-2+ 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 ~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" From 5d97149197edbce92ba527f6766bbbc13559dcfe Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:14 +0000 Subject: [PATCH 031/130] dev-libs/libksba: Sync with Gentoo It's from Gentoo commit 8fe733c7182537e28e4454a4a7ed70734ff17ba8. --- .../portage-stable/dev-libs/libksba/libksba-1.6.3.ebuild | 4 ++-- .../portage-stable/dev-libs/libksba/libksba-1.6.4-r1.ebuild | 4 ++-- .../portage-stable/dev-libs/libksba/libksba-1.6.4.ebuild | 4 ++-- .../portage-stable/dev-libs/libksba/libksba-1.6.5.ebuild | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) 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 0f9d54de35..4090339ced 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,7 @@ IUSE="static-libs" RDEPEND=">=dev-libs/libgpg-error-1.8" DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/bison + app-alternatives/yacc verify-sig? ( sec-keys/openpgp-keys-gnupg ) " diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.4-r1.ebuild index a48064d35f..59e606b3c1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,7 +26,7 @@ IUSE="static-libs" RDEPEND=">=dev-libs/libgpg-error-1.33" DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/bison + app-alternatives/yacc verify-sig? ( sec-keys/openpgp-keys-gnupg ) " diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.4.ebuild index 5433aee217..74595b66dc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,7 @@ IUSE="static-libs" RDEPEND=">=dev-libs/libgpg-error-1.33" DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/bison + app-alternatives/yacc verify-sig? ( sec-keys/openpgp-keys-gnupg ) " diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.5.ebuild index 8ab1be7ccf..59e606b3c1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,13 +20,13 @@ 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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.33" DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/bison + app-alternatives/yacc verify-sig? ( sec-keys/openpgp-keys-gnupg ) " From 82d153ac3a7eee81022348a4c81051bbf04060ee Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:18 +0000 Subject: [PATCH 032/130] dev-libs/libpcre: Sync with Gentoo It's from Gentoo commit 5e3d413c90ed50a6f9582ee1e3817398d4a82319. --- .../portage-stable/dev-libs/libpcre/libpcre-8.45-r1.ebuild | 4 ++-- .../portage-stable/dev-libs/libpcre/libpcre-8.45-r2.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 aacb5dc0ed..486937c58c 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,7 +36,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " BDEPEND="virtual/pkgconfig" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r2.ebuild index 2064f9bd66..c87877646d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre/libpcre-8.45-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -38,7 +38,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " BDEPEND="virtual/pkgconfig" From a5b568c6315b8fedbdd2bbda77c2539738cb02db Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:18 +0000 Subject: [PATCH 033/130] dev-libs/libpcre2: Sync with Gentoo It's from Gentoo commit 5e3d413c90ed50a6f9582ee1e3817398d4a82319. --- .../portage-stable/dev-libs/libpcre2/Manifest | 2 + .../libpcre2-10.43-fix-loong-sljit.patch | 30 ++++++ .../libpcre2/libpcre2-10.42-r1.ebuild | 4 +- .../libpcre2/libpcre2-10.43_rc1.ebuild | 93 +++++++++++++++++++ 4 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.43-fix-loong-sljit.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/Manifest index f7ea84a487..0148bb3f04 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/Manifest @@ -1,2 +1,4 @@ DIST pcre2-10.42.tar.bz2 1799866 BLAKE2B 40aa096745548c489a00ead87a191a4d24ecd924a5b8f00401c1273176de15ccb23510882467c8e2b5c1256b97db46fba5fcdfbd9f0d61d86a29d74bb4bca7a0 SHA512 72fbde87fecec3aa4b47225dd919ea1d55e97f2cbcf02aba26e5a0d3b1ffb58c25a80a9ef069eb99f9cf4e41ba9604ad06a7ec159870e1e875d86820e12256d3 DIST pcre2-10.42.tar.bz2.sig 310 BLAKE2B 2125d7e23f7e75847573e3caeb8d55da5d8e0df3d166bf8b638b998aebacaefb4e88df7e813d6977af2dc7d82c93b7179ad0043c4f46fc4e06d99d214b0b7fcf SHA512 22ce3c7903835b1cf835ac6cfa725badecc982f1504382e62525c88307b2e3bd8951f2221fdd3d73920843e69f714b6df99fe741069e610f1f809087512a31f7 +DIST pcre2-10.43-RC1.tar.bz2 1901289 BLAKE2B 94ba878ed7a02d359d094daa22517c645b5d660dfab4ce65e9f56c1750abb56280dc0be05b6f675d12891bf9fa857ba7339d9e703b0360d72ee746afcecc6dba SHA512 2b33a50fbff0f7832d40682e7a43bef301016d8a8d74d838f1ab473f09a19c5ea98dcf73cdfa4cda4a01968e50930bb2fc40948c0e4e9c43d9762ee3dd0b1fc7 +DIST pcre2-10.43-RC1.tar.bz2.sig 310 BLAKE2B 4bfaf5209fbeb89fbc0f134921d18d15b35ef24503b910de7d0a420fbfc84831ddd79f8f61fe8a12776eb154e264ac7ff4f55d548a1e1c0ae8f53c32a4ba90e1 SHA512 09b9166f4edc6fc0d4cab66bcc572d9b081ceda3398c510348fab7746c520c4b607c26e13937e45cf3d27e0a94eefca2dddaf4210d2a754c277f1837b9a7f96d diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.43-fix-loong-sljit.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.43-fix-loong-sljit.patch new file mode 100644 index 0000000000..30fe49410b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/files/libpcre2-10.43-fix-loong-sljit.patch @@ -0,0 +1,30 @@ +https://github.com/zherczeg/sljit/commit/7a821cd714d132e46e748275a80d402beea24764 +with file path adjusted to libpcre2 layout + +From: lrzlin <54242813+lrzlin@users.noreply.github.com> +Date: Wed, 10 Jan 2024 07:13:55 +0800 +Subject: [PATCH] Add LoongArch float to integer conversion special cases + (#226) + +--- a/src/sljit/sljitConfigInternal.h ++++ b/src/sljit/sljitConfigInternal.h +@@ -198,7 +198,7 @@ extern "C" { + /* Type of public API functions. */ + /*********************************/ + +-#ifndef SLJIT_API_FUNC_ATTRIBUTE ++#ifndef SLJIT_API_FUNC_ATTRIBUTE + #if (defined SLJIT_CONFIG_STATIC && SLJIT_CONFIG_STATIC) + /* Static ABI functions. For all-in-one programs. */ + +@@ -399,6 +399,10 @@ typedef double sljit_f64; + #define SLJIT_CONV_MAX_FLOAT SLJIT_CONV_RESULT_MAX_INT + #define SLJIT_CONV_MIN_FLOAT SLJIT_CONV_RESULT_MIN_INT + #define SLJIT_CONV_NAN_FLOAT SLJIT_CONV_RESULT_MIN_INT ++#elif (defined SLJIT_CONFIG_LOONGARCH && SLJIT_CONFIG_LOONGARCH) ++#define SLJIT_CONV_MAX_FLOAT SLJIT_CONV_RESULT_MAX_INT ++#define SLJIT_CONV_MIN_FLOAT SLJIT_CONV_RESULT_MIN_INT ++#define SLJIT_CONV_NAN_FLOAT SLJIT_CONV_RESULT_ZERO + #else + #error "Result for float to integer conversion is not defined" + #endif 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 9d03f3ad45..759b7d9870 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,7 +35,7 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " BDEPEND=" virtual/pkgconfig diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild new file mode 100644 index 0000000000..f12355bd6b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.43_rc1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/philiphazel.asc +inherit libtool multilib-minimal usr-ldscript verify-sig + +MY_P="pcre2-${PV/_rc/-RC}" + +DESCRIPTION="Perl-compatible regular expression library" +HOMEPAGE="https://www.pcre.org/" +SRC_URI="https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2 + https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2 + verify-sig? ( https://github.com/PCRE2Project/pcre2/releases/download/${MY_P}/${MY_P}.tar.bz2.sig )" + +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 ~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 )" + +RDEPEND=" + bzip2? ( app-arch/bzip2 ) + libedit? ( dev-libs/libedit ) + readline? ( sys-libs/readline:= ) + zlib? ( sys-libs/zlib ) +" +DEPEND=" + ${RDEPEND} + valgrind? ( dev-debug/valgrind ) +" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-philiphazel ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/pcre2-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-10.10-000-Fix-multilib.patch + "${FILESDIR}"/${PN}-10.43-fix-loong-sljit.patch +) + +src_prepare() { + default + + elibtoolize +} + +multilib_src_configure() { + local myeconfargs=( + --enable-pcre2-8 + --enable-shared + $(multilib_native_use_enable bzip2 pcre2grep-libbz2) + $(multilib_native_use_enable libedit pcre2test-libedit) + $(multilib_native_use_enable readline pcre2test-libreadline) + $(multilib_native_use_enable valgrind) + $(multilib_native_use_enable zlib pcre2grep-libz) + $(use_enable jit) + $(use_enable jit pcre2grep-jit) + $(use_enable pcre16 pcre2-16) + $(use_enable pcre32 pcre2-32) + $(use_enable static-libs static) + $(use_enable unicode) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=") +} + +multilib_src_test() { + emake check VERBOSE=yes +} + +multilib_src_install() { + emake \ + DESTDIR="${D}" \ + $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ + install + multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix pcre2-8 +} + +multilib_src_install_all() { + find "${ED}" -type f -name "*.la" -delete || die +} From e918ada0f42fdb6b69b30be6ab6875f6fe714d4b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:20 +0000 Subject: [PATCH 034/130] dev-libs/libunistring: Sync with Gentoo It's from Gentoo commit e8d323965acb16e1614153fef8a6c052025fccc5. --- .../dev-libs/libunistring/libunistring-1.1-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/libunistring-1.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/libunistring-1.1-r1.ebuild index 70aecb4e8b..25e593e719 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/libunistring-1.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libunistring/libunistring-1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" LICENSE="|| ( LGPL-3+ GPL-2+ ) || ( FDL-1.2 GPL-3+ )" # Check regularly even on "minor" bumps SLOT="0/5" -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" +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="doc static-libs" PATCHES=( From 0311ee32c42b9dc1f0b6bf5b6871125fd6c84c20 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:21 +0000 Subject: [PATCH 035/130] dev-libs/libusb: Sync with Gentoo It's from Gentoo commit f7fdfdaeec3764929686064a6054c38a6b2d7788. --- .../portage-stable/dev-libs/libusb/libusb-1.0.26.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libusb/libusb-1.0.26.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libusb/libusb-1.0.26.ebuild index 7fdc7c6601..69e7764599 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libusb/libusb-1.0.26.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libusb/libusb-1.0.26.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ REQUIRED_USE="static-libs? ( !udev )" RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} !udev? ( virtual/os-headers )" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" multilib_src_configure() { local myeconfargs=( From 1e0a1893c979dcd6449250f9445484f1a07a0b06 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:21 +0000 Subject: [PATCH 036/130] dev-libs/libuv: Sync with Gentoo It's from Gentoo commit e2500536d4b0d8ddee8823cfb3cd47e0163df8a2. --- .../libuv/files/libuv-1.47.0-darwin17.patch | 26 +++++++++++++++++++ .../dev-libs/libuv/libuv-1.47.0-r1.ebuild | 5 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libuv/files/libuv-1.47.0-darwin17.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/files/libuv-1.47.0-darwin17.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/files/libuv-1.47.0-darwin17.patch new file mode 100644 index 0000000000..3fa90de832 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/files/libuv-1.47.0-darwin17.patch @@ -0,0 +1,26 @@ +From 4785ad6337aac8b78224291f0848f25fc8cb41c9 Mon Sep 17 00:00:00 2001 +From: Sergey Fedorov +Date: Sat, 18 Nov 2023 16:57:40 +0800 +Subject: [PATCH] unix: unbreak macOS < 10.14 (#4230) + +From fc70430b09c49032d41ae97db26da10e20941e75 Mon Sep 17 00:00:00 2001 +From: Bo Anderson +Date: Fri, 24 Nov 2023 10:17:52 +0000 +Subject: [PATCH] unix: correct pwritev conditional (#4233) + + +diff --git a/src/unix/fs.c b/src/unix/fs.c +index 891306daedc..4de0643a6c3 100644 +--- a/src/unix/fs.c ++++ b/src/unix/fs.c +@@ -84,7 +84,9 @@ + + #if defined(__CYGWIN__) || \ + (defined(__HAIKU__) && B_HAIKU_VERSION < B_HAIKU_VERSION_1_PRE_BETA_5) || \ +- (defined(__sun) && !defined(__illumos__)) ++ (defined(__sun) && !defined(__illumos__)) || \ ++ (defined(__APPLE__) && !TARGET_OS_IPHONE && \ ++ MAC_OS_X_VERSION_MIN_REQUIRED < 110000) + #define preadv(fd, bufs, nbufs, off) \ + pread(fd, (bufs)->iov_base, (bufs)->iov_len, off) + #define pwritev(fd, bufs, nbufs, off) \ diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.47.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.47.0-r1.ebuild index 879df48c15..465058e597 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.47.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.47.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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="BSD BSD-2 ISC MIT" @@ -27,6 +27,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-ipv6-tests.patch "${FILESDIR}"/${P}-hppa-kernel.patch + "${FILESDIR}"/${P}-darwin17.patch # upstream ) src_prepare() { From 8da001aa4e88cd7a7326bb1540ff29c81adccbd8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:24 +0000 Subject: [PATCH 037/130] dev-libs/libxml2: Sync with Gentoo It's from Gentoo commit 51cd9e2f6af0f78f2e1c3c56979ab3ffeb61e314. --- .../portage-stable/dev-libs/libxml2/libxml2-2.11.5-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.5-r1.ebuild index d82cc9459f..f61205d27d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.5-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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+=" From 6a8dd4b8c2f536ea177a542f02c6909e56825cac Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:25 +0000 Subject: [PATCH 038/130] dev-libs/libyaml: Sync with Gentoo It's from Gentoo commit f7fdfdaeec3764929686064a6054c38a6b2d7788. --- .../portage-stable/dev-libs/libyaml/libyaml-0.2.2.ebuild | 4 ++-- .../portage-stable/dev-libs/libyaml/libyaml-0.2.5.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libyaml/libyaml-0.2.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libyaml/libyaml-0.2.2.ebuild index 931407e826..a60bfc546f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libyaml/libyaml-0.2.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libyaml/libyaml-0.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s IUSE="doc static-libs test" RESTRICT="!test? ( test )" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" src_prepare() { default diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libyaml/libyaml-0.2.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libyaml/libyaml-0.2.5.ebuild index 966371f62b..9f1a136fea 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libyaml/libyaml-0.2.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libyaml/libyaml-0.2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv IUSE="doc static-libs test" RESTRICT="!test? ( test )" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" src_prepare() { default From 2b7afca4bc85149225cd842a7eebcb16e576623f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:28 +0000 Subject: [PATCH 039/130] dev-libs/npth: Sync with Gentoo It's from Gentoo commit 3ff614480f07749fd8f7be78f7f8bd75c02c2a53. --- .../dev-libs/npth/npth-1.6-r2.ebuild | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/npth/npth-1.6-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/npth/npth-1.6-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/npth/npth-1.6-r2.ebuild new file mode 100644 index 0000000000..71d952cdae --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/npth/npth-1.6-r2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="New GNU Portable Threads Library" +HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git" +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" + +LICENSE="LGPL-2.1+" +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="test" +RESTRICT="!test? ( test )" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + econf $(use_enable test tests) +} + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die +} From eb435b80d537925844793b9f7cc55e1cefa3a977 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:29 +0000 Subject: [PATCH 040/130] dev-libs/popt: Sync with Gentoo It's from Gentoo commit 58e7aa028862014e5f92ef48339b3cab59565c39. --- .../dev-libs/popt/popt-1.19-r1.ebuild | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.19-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.19-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.19-r1.ebuild new file mode 100644 index 0000000000..58a87653a6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.19-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic multilib-minimal libtool + +DESCRIPTION="Parse Options - Command line parser" +HOMEPAGE="https://github.com/rpm-software-management/popt" +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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="nls static-libs" + +RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( >=sys-devel/gettext-0.19.8 )" + +src_prepare() { + default + + # Unclear what the background to this is, perhaps + # https://gitlab.exherbo.org/exherbo/arbor/-/commit/5545d22d3493279acf7a55246179f818ef22f5fa + sed -i -e 's:lt-test1:test1:' tests/testit.sh || die + + elibtoolize +} + +multilib_src_configure() { + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + local myeconfargs=( + --disable-werror + $(use_enable static-libs static) + $(use_enable nls) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + + find "${ED}" -type f -name "*.la" -delete || die +} From 7b24bbc36ddf08a9363b192a35736958726d1efc Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:31 +0000 Subject: [PATCH 041/130] dev-libs/xmlsec: Sync with Gentoo It's from Gentoo commit 3f5afb3168d9ae5d68dbc32233d2e56c4995ae33. --- .../portage-stable/dev-libs/xmlsec/Manifest | 1 + .../dev-libs/xmlsec/xmlsec-1.3.2.ebuild | 4 +- .../dev-libs/xmlsec/xmlsec-1.3.3.ebuild | 93 +++++++++++++++++++ 3 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/xmlsec-1.3.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/Manifest index c1fd752187..a6d9777047 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/Manifest @@ -2,3 +2,4 @@ DIST xmlsec1-1.2.37.tar.gz 2009175 BLAKE2B 19f43ba6bf6eb49428b9c5563baecbab21476 DIST xmlsec1-1.2.38.tar.gz 2036578 BLAKE2B 03f7e1b5e659793bf1984c5a59582d9459089ce913620d5cc1e5a5d0eb65557580cd23fa190db277298fd7cc55bd41563b93cf61a37c8b7521a4690cd2ca3489 SHA512 724089777caae95db27e67f24381c066eaae23a9d64819a18bb04837c1ab1b380d19be2c7ee25659ca481d9eab96fcbe8027a430a0ac1630ad3b073cddd20fac DIST xmlsec1-1.3.1.tar.gz 2432943 BLAKE2B 1dafdffd959579add5c579e3fa9c9f9ddc73ce4aadc6fc2139506e6e64ffcd1bbe7298786e414900eb9f33f93b0a47da64e686c499e48d4c80d81b256db6692e SHA512 7f30c15c3edcafe70fa5febaa0ba39f73f8d30525ee102b5961a658dd2842fbc58e63f7595f15b150d71bf735bfa7688c3694a191b0d475776ca26902d90d25f DIST xmlsec1-1.3.2.tar.gz 2437263 BLAKE2B d11953c6e2a263a6742ef62309c2f29e2ba5761d58bee5f8cc761965d0e16fea148811ac3d8036d271400840a62ff2a7fff947bb5331170d3bcc598c558b2a95 SHA512 328f3d27cc1dadee27e5ee4649f6c5a094203cc27f42f1fe98fd429f7dd5630eaadff0e8bf14616016fc3530482ed8bcee4870289a41a083f6dd9bd603782a92 +DIST xmlsec1-1.3.3.tar.gz 2435741 BLAKE2B 1b0e44a8a5185d67b8f97ec72cd8e215fe79a988eb7ade0d2890be662b693d511857b24670ec692f9452bf95ad8c53ff80c250ecbcd167742477a83e0b72fda0 SHA512 1535b6f878259914ab9574892d05c927fbcd548986cf7bcf91e435acb2cb74eb11e58163f797038ee13a11444882814b2b4318cd677053fbe52557a2e4acf68a diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/xmlsec-1.3.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/xmlsec-1.3.2.ebuild index ed6ed391fd..a64cafb919 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/xmlsec-1.3.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/xmlsec-1.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}1-${PV}" LICENSE="MIT" # Upstream consider major version bumps to be changes in either X or Y in X.Y.Z SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86" IUSE="doc gcrypt gnutls http nss +openssl static-libs test" RESTRICT="!test? ( test )" REQUIRED_USE=" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/xmlsec-1.3.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/xmlsec-1.3.3.ebuild new file mode 100644 index 0000000000..f0324bc086 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/xmlsec-1.3.3.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML" +HOMEPAGE="https://www.aleksey.com/xmlsec" +SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz" +S="${WORKDIR}/${PN}1-${PV}" + +LICENSE="MIT" +# Upstream consider major version bumps to be changes in either X or Y in X.Y.Z +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="doc gcrypt gnutls http nss +openssl static-libs test" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + || ( gnutls nss openssl ) +" + +RDEPEND=" + >=dev-libs/libxml2-2.7.4 + >=dev-libs/libxslt-1.0.20 + dev-libs/libltdl + gcrypt? ( >=dev-libs/libgcrypt-1.4.0:= ) + gnutls? ( >=net-libs/gnutls-3.6.13:= ) + nss? ( + >=dev-libs/nspr-4.4.1 + >=dev-libs/nss-3.9 + ) + openssl? ( dev-libs/openssl:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( + nss? ( + >=dev-libs/nss-3.9[utils] + ) + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.0-optimisation.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable doc docs) + $(use_enable static-libs static) + $(use_with gcrypt) + $(use_with gnutls) + $(use_with nss nspr) + $(use_with nss) + $(use_with openssl) + + --disable-werror + --enable-mans + --enable-pkgconfig + + --enable-concatkdf + --enable-pbkdf2 + --enable-ec + --enable-dh + --enable-sha3 + + --enable-files + $(use_enable http) + --disable-ftp + ) + + # Bash because of bug #721128 + CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" +} + +src_test() { + # See https://github.com/lsh123/xmlsec/issues/280 for TZ=UTC + TZ=UTC SHELL="${BROOT}"/bin/bash emake TMPFOLDER="${T}" check +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} From 9d0a9fa3c0ba98d9e442bbe1f8d6f30988a2ee77 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:39 +0000 Subject: [PATCH 042/130] dev-python/cython: Sync with Gentoo It's from Gentoo commit b4530f08f40c667f9f31fda038878732cc814370. --- .../portage-stable/dev-python/cython/Manifest | 4 +- .../dev-python/cython/cython-3.0.3.ebuild | 84 ------------------- .../dev-python/cython/cython-3.0.4.ebuild | 84 ------------------- .../dev-python/cython/cython-3.0.6.ebuild | 4 +- ...ython-3.0.7.ebuild => cython-3.0.8.ebuild} | 2 +- 5 files changed, 4 insertions(+), 174 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.4.ebuild rename sdk_container/src/third_party/portage-stable/dev-python/cython/{cython-3.0.7.ebuild => cython-3.0.8.ebuild} (98%) 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 3ce740b269..25463b1185 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,8 +1,6 @@ DIST cython-0.29.36.gh.tar.gz 2115333 BLAKE2B 6d43779c7222ff65d7de3a35ec18ef636480807d53480a8f94cc8c92d462fcc2f4d201a3bbf6e840a11fd33025e32c53f85626b05c131d10eed2859cdca7eb2d SHA512 a086fe1a11290cd3c870b891e61a0a0e2595bab9c26888024a758b6950c07059346d682fa9349e46c0af89805abbdd750059b3189960b8ce18007dfb5eb4391a DIST cython-0.29.37.1.gh.tar.gz 2115631 BLAKE2B b81e527ee1da7d16d074102378b531e4b0c161a3d66e47df46b624b02464cbd5c3d08d0e32f8175d56807ed8c6603108b85953db9f51892cfdf8952b4d287399 SHA512 6038499f13914b8a1957eee4d04e0499f448c89c3d519320e5218bf518aacb7d345f3c48614839222eaee016edf549b719520500b0088d28163635a74d35f3c6 DIST cython-3.0.2.gh.tar.gz 2744583 BLAKE2B f631891870a6ce24acf2bcde75ebcb9775cf0df7840fe9d7b138cfdea64d54e9253a53d35d892a9086f251c1294d9414eec8521218d031840a3cd06903fefb86 SHA512 f55be138efdca6ca61bd39c6f2fab736244328a170a6f6c9bda87036e022c846930b209e9e9101fad889cb179d6e60034ba6f299f14b3056536d46235b438eb7 -DIST cython-3.0.3.gh.tar.gz 2753188 BLAKE2B 0e6d40533f1cebf3c4217dc19aeebc2f873a8bacb94e68810e81d1c6d4cd75176de88516f2d82f43b36107656b6cd5e6990547e93bd8436b1aa93c73ccda6eaf SHA512 c27c16abaf0122ad61e0eeb92aa80a33fc491332b8ebec209cd1810d2b0e3bf14fe1e81838803b86f407520a6d6f7ab8b84d97e495e7d91fd6f7702a46980caa -DIST cython-3.0.4.gh.tar.gz 2754689 BLAKE2B 5418b8c374565894deb07e7a3f2fe242e1ef43eed5d716cbd9c6b9fd3d62088d9982eb156c981fa9f6edcf42592f2249f9eb450d16ef908be464e357ee9bbea7 SHA512 bc87e38f9c188a5311f75f49ba4b9ec1ee0af00ff9ed655ca69972891f8b0801025265f8cad4521670088275c7da3d6136aeda7ebb6a33554f64cc7aef362c73 DIST cython-3.0.5.gh.tar.gz 2756583 BLAKE2B d9b5af97933030fc1ac49677a5f3fd8194ba6e685dccd257f4ef4af206565ae2fa6f72c1268d8d0604b6fd6f2d8147c542501e8e319588bfdc4a7f40622976ff SHA512 585d3fe810ace55278fcc6ea4508b3b5259320f92998cd688da787cd5f88ac5fc2467025f20da6d968969eb3296ae9c517136d24a4dbb475441271227968f6be DIST cython-3.0.6.gh.tar.gz 2759853 BLAKE2B fdcbb870418eebfb2e55e28f7223699fee4fb06d52f9f41db55b30fbe6ba6ee3de42af9bbdd8930d418ec790dec195546486ea45c370e2df122d6fada08d38cf SHA512 f1d33775166d0b6541ea98bee5d4186fc6128aad788323224397c1f3ba0a058141ac84a8b3baa4885204dcbf0979141bc4b5316342003e96208952f040f31753 -DIST cython-3.0.7.gh.tar.gz 2761333 BLAKE2B f19f920726ee9001ecacd3f9a104ecb44ea2a26f40897e1a8856bc7fdc47b4c9b9386d72f4dabeba02a05412dab0d5ddc5de8167e08489ca31587240d6fcd135 SHA512 6d93cfb76265ffe11d4ba6ae2d4e88ce040c64a12b4acc8b236b4b282a82d2f0cc09abdd6149d6b4d0b6c86f182e1185e14ddd4241ebdda899f07524e9833f8e +DIST cython-3.0.8.gh.tar.gz 2764668 BLAKE2B 03202ea480fa398d2b0893cc96185467009c783cf4451fc5d1c09ec229398bc084276680ed2b64acf63253744f827427e03674be3e5985d5a2912d9f338c786a SHA512 1070fc278401990595d177b0e6396bc1eba2ea8234a7c5bb26399b6b7284de7791ee5fa60ef74d06d0f4120b9c877bfd7703a7d701838f1634737526c614b860 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.3.ebuild deleted file mode 100644 index 4223753eab..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.3.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# 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_TESTED=( python3_{10..11} ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 multiprocessing toolchain-funcs - -MY_P=${P/_rc/rc} -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/_rc/rc}.tar.gz - -> ${MY_P}.gh.tar.gz -" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ' "${PYTHON_TESTED[@]}") - ) -" - -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" -) - -distutils_enable_sphinx docs \ - dev-python/jinja \ - dev-python/sphinx-issues \ - dev-python/sphinx-tabs - -python_compile() { - # Python gets confused when it is in sys.path before build. - local -x PYTHONPATH= - - distutils-r1_python_compile -} - -python_test() { - if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then - einfo "Skipping tests on ${EPYTHON} (xfail)" - return - fi - - # Needed to avoid confusing cache tests - unset CYTHON_FORCE_REGEN - - tc-export CC - # https://github.com/cython/cython/issues/1911 - local -x CFLAGS="${CFLAGS} -fno-strict-overflow" - "${PYTHON}" runtests.py \ - -vv \ - -j "$(makeopts_jobs)" \ - --work-dir "${BUILD_DIR}"/tests \ - --no-examples \ - --no-code-style \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.4.ebuild deleted file mode 100644 index 4223753eab..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.4.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# 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_TESTED=( python3_{10..11} ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_12 pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 multiprocessing toolchain-funcs - -MY_P=${P/_rc/rc} -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/_rc/rc}.tar.gz - -> ${MY_P}.gh.tar.gz -" -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ' "${PYTHON_TESTED[@]}") - ) -" - -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" -) - -distutils_enable_sphinx docs \ - dev-python/jinja \ - dev-python/sphinx-issues \ - dev-python/sphinx-tabs - -python_compile() { - # Python gets confused when it is in sys.path before build. - local -x PYTHONPATH= - - distutils-r1_python_compile -} - -python_test() { - if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then - einfo "Skipping tests on ${EPYTHON} (xfail)" - return - fi - - # Needed to avoid confusing cache tests - unset CYTHON_FORCE_REGEN - - tc-export CC - # https://github.com/cython/cython/issues/1911 - local -x CFLAGS="${CFLAGS} -fno-strict-overflow" - "${PYTHON}" runtests.py \ - -vv \ - -j "$(makeopts_jobs)" \ - --work-dir "${BUILD_DIR}"/tests \ - --no-examples \ - --no-code-style \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) - distutils-r1_python_install_all -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.6.ebuild index 3364d566f1..00912e983a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -26,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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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/dev-python/cython/cython-3.0.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.8.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.7.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.8.ebuild index 001a1bda56..32016adffc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/cython/cython-3.0.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 From f495bb8e27c81242fa5b75327ec1e4f2edf50aff Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:40 +0000 Subject: [PATCH 043/130] dev-python/distro: Sync with Gentoo It's from Gentoo commit 64a12a762b8749d8cc2a5936f997ff5532bd45a5. --- .../portage-stable/dev-python/distro/Manifest | 1 - .../dev-python/distro/distro-1.8.0.ebuild | 22 ------------------- .../dev-python/distro/distro-1.9.0.ebuild | 4 ++-- 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/distro/distro-1.8.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/distro/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/distro/Manifest index f87fd5b65e..25a2e788f5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/distro/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/distro/Manifest @@ -1,2 +1 @@ -DIST distro-1.8.0.tar.gz 59428 BLAKE2B d1b47dd801c4414a6bb21c544c62c306a1cf49b43f70974f7a0b4bcba64620047c7d06b6507ba262eba44d2f192f654646bb69241ed5bf6b761dc9d42e049e18 SHA512 027fe8bc50e263dc49451932774f32cea7900820b6e30cc80afcdc84374777ba733137fdd8d27fec76f66ce9c579bc172721e7ae0f43e72dffbc092126b26af2 DIST distro-1.9.0.tar.gz 60722 BLAKE2B 1713bbc10b74122e47e9d491a7559a871c81941f35fde74714872723d3fa3435fb15bb29197eb6b6f09e5192fb7e3162e63d5b628ab813befeca3872c49dc53d SHA512 dc66cb7e968e7a651c7a84681e2a0539d196073f71cf0ae1e49c5a6cd6deec345523259a8810ffdc7b6e9763a536eb388a2886ba2bbd1cb62165b57fbefb82ae 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 deleted file mode 100644 index d61ebc17c4..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/distro/distro-1.8.0.ebuild +++ /dev/null @@ -1,22 +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_{10..12} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="Reliable machine-readable Linux distribution information for Python" -HOMEPAGE=" - https://distro.readthedocs.io/en/latest/ - https://github.com/python-distro/distro/ - https://pypi.org/project/distro/ -" - -SLOT="0" -LICENSE="Apache-2.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" - -distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/distro/distro-1.9.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/distro/distro-1.9.0.ebuild index e2d93ec9c3..bea87a4b1e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/distro/distro-1.9.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/distro/distro-1.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,6 +17,6 @@ HOMEPAGE=" SLOT="0" LICENSE="Apache-2.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" distutils_enable_tests pytest From cf810370aaa3fb07e857ee437de83e3118b940b1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:40 +0000 Subject: [PATCH 044/130] dev-python/docutils: Sync with Gentoo It's from Gentoo commit 2ece8d0a250f374f58c679b194c599e2f558b4b4. --- .../dev-python/docutils/docutils-0.20.1-r1.ebuild | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.20.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.20.1-r1.ebuild index b6e73efa09..cca31d549b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.20.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/docutils/docutils-0.20.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..12} pypy3 ) -inherit distutils-r1 pypi +inherit distutils-r1 optfeature pypi DESCRIPTION="Python Documentation Utilities (reference reStructuredText impl.)" HOMEPAGE=" @@ -71,3 +71,9 @@ python_install_all() { install_txt_doc "${doc}" done < <(find docs tools -name '*.txt' -print0) } + +pkg_postinst() { + optfeature \ + "auto-detecting the image dimensions when using the 'scale' option" \ + dev-python/pillow +} From 0fed23d8d8a1f0dc2f5fd2341449d535e9755853 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:46 +0000 Subject: [PATCH 045/130] dev-python/hatchling: Sync with Gentoo It's from Gentoo commit 72eb282bfb8bc1b438754effb1ad6c6a628bdf07. --- .../dev-python/hatchling/Manifest | 1 - .../hatchling/hatchling-1.20.0.ebuild | 86 ------------------- .../hatchling/hatchling-1.21.0.ebuild | 4 +- 3 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/hatchling/hatchling-1.20.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/hatchling/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/hatchling/Manifest index 847d3b446e..a46099e807 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/hatchling/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/hatchling/Manifest @@ -1,2 +1 @@ -DIST hatch-hatchling-v1.20.0.gh.tar.gz 761937 BLAKE2B 7e413a98d21fde46676ecb4264875f6addcd18efcf73d208cfb2ce36bc07ff7889c5a0884ac9f0c1537801f7ac6ec73f0fc74f18ca202b2b4d8ee13328ee912a SHA512 5b4c31825238fa21002fb72fea726a4bd2f16d39f1b4026506ab662df20a03e49eff912d39c34091335aeea448bf2a1b07e6a1d723a26a16794792ed0b17f2b1 DIST hatch-hatchling-v1.21.0.gh.tar.gz 764748 BLAKE2B 3b048ed34df4da9ed5ec8d1c0121e21aabada559e981e9fd36a7188aceedf79594b165ed705edfbc5d210a09ee9a022c8c6e433e930338f2053e4c48feef0d44 SHA512 5ee8151929d6bdbb67e7f4e3e0298c730ff7fef5a7d7b764192eb2e16327d80a2935eee8831c168d19ed41c7184ca5b5eef7a67c9d5756cea25a7bd79945d344 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/hatchling/hatchling-1.20.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/hatchling/hatchling-1.20.0.ebuild deleted file mode 100644 index c6d980c4d5..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/hatchling/hatchling-1.20.0.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=standalone -PYTHON_TESTED=( pypy3 python3_{10..12} ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) - -inherit distutils-r1 - -TAG=${P/-/-v} -MY_P=hatch-${TAG} -DESCRIPTION="Modern, extensible Python build backend" -HOMEPAGE=" - https://pypi.org/project/hatchling/ - https://github.com/pypa/hatch/ -" -SRC_URI=" - https://github.com/pypa/hatch/archive/${TAG}.tar.gz - -> ${MY_P}.gh.tar.gz -" -S=${WORKDIR}/${MY_P}/backend - -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" - -# deps are listed in backend/src/hatchling/ouroboros.py -RDEPEND=" - >=dev-python/editables-0.3[${PYTHON_USEDEP}] - >=dev-python/packaging-21.3[${PYTHON_USEDEP}] - >=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}] - >=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/tomli-1.2.2[${PYTHON_USEDEP}] - ' 3.10) - dev-python/trove-classifiers[${PYTHON_USEDEP}] -" -BDEPEND=" - ${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/atomicwrites[${PYTHON_USEDEP}] - dev-python/click[${PYTHON_USEDEP}] - dev-python/httpx[${PYTHON_USEDEP}] - dev-python/platformdirs[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - dev-python/rich[${PYTHON_USEDEP}] - dev-python/tomli-w[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - ' "${PYTHON_TESTED[@]}") - ) -" - -distutils_enable_tests pytest - -python_test() { - if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then - einfo "Skipping tests on ${EPYTHON}" - return - fi - - local -x EPYTEST_DESELECT=( - # these run pip to install stuff - tests/backend/dep/test_core.py::test_dependency_found - tests/backend/dep/test_core.py::test_extra_met - tests/backend/dep/test_core.py::test_extra_no_dependencies - tests/backend/dep/test_core.py::test_extra_unmet - tests/backend/dep/test_core.py::test_unknown_extra - tests/backend/dep/test_core.py::test_version_unmet - # broken if CARGO is set - tests/backend/builders/test_app.py::TestBuildBootstrap::test_no_cargo - ) - - # top-level "tests" directory contains tests both for hatch - # and hatchling - cd "${WORKDIR}/${MY_P}" || die - local -x PYTHONPATH="src:${PYTHONPATH}" - # sigh; standalone test suites are overrated, right? - echo "__version__ = '${PV}'" > src/hatch/_version.py || die - # tests mock cargo subprocess call but the backend raises if CARGO - # is not set and shutil.which() can't find it - local -x CARGO=cargo - epytest tests/backend -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/hatchling/hatchling-1.21.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/hatchling/hatchling-1.21.0.ebuild index f041834d08..9233bcc880 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/hatchling/hatchling-1.21.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/hatchling/hatchling-1.21.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}/backend 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" +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" # deps are listed in backend/src/hatchling/ouroboros.py RDEPEND=" From e37d5219250182e321d924c4a38a8f90dea31388 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:46 +0000 Subject: [PATCH 046/130] dev-python/inflect: Sync with Gentoo It's from Gentoo commit cf38b34bd509337a583210f00199cb85c91df72d. --- .../dev-python/inflect/inflect-7.0.0.ebuild | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-7.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-7.0.0.ebuild index 24d03c1056..2081c97362 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-7.0.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/inflect/inflect-7.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,3 +27,9 @@ BDEPEND=" " distutils_enable_tests pytest + +EPYTEST_DESELECT=( + # broken upstream + # https://github.com/jaraco/inflect/issues/204 + inflect/__init__.py::inflect.engine.compare +) From 0b03a1564db61bd14cfef68ac26cb5620e1903fb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:51 +0000 Subject: [PATCH 047/130] dev-python/jinja: Sync with Gentoo It's from Gentoo commit 9303e8cc7e5058e4a191f48db0c4d3ddbdf2f38a. --- .../src/third_party/portage-stable/dev-python/jinja/Manifest | 2 +- .../jinja/{jinja-3.1.2.ebuild => jinja-3.1.3.ebuild} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-python/jinja/{jinja-3.1.2.ebuild => jinja-3.1.3.ebuild} (94%) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/jinja/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/jinja/Manifest index e6fcb661ff..4bbe2f1c38 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/jinja/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/jinja/Manifest @@ -1 +1 @@ -DIST jinja-3.1.2.gh.tar.gz 272546 BLAKE2B dc4bc81900c07e7816ff63259073409650f1f679e00d76b9574aaba301b36a7037aaf77a87cc1c160ea2aa2272ceb67e2fd20fbd74bb9850880fb909babded8e SHA512 50feebc7eed4c8b5bb0c2951784c1c115e3ee1c0e0c91bbf1884551b1312ef8fce24804a2ca1dfd8c543406529afe4817567c39e7cfd15028b54049853623144 +DIST jinja-3.1.3.gh.tar.gz 274692 BLAKE2B 0c66600104db89ed17c0a0c58180e8a348f9d505504f4ae1bee01c8c09053994140f87a4d336255e292258f15adc3e535deef494e8fda980ef76547268ddc4fa SHA512 1f4384b3a1cd0f8e128608aa11d00c41f93b6be41459d9e5d8f50e6f879d2427aaea5d04681c85a1577651b9dc434c11c5e7c7caecef6f5fe26518a3d2fdc77e 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.3.ebuild similarity index 94% rename from sdk_container/src/third_party/portage-stable/dev-python/jinja/jinja-3.1.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/jinja/jinja-3.1.3.ebuild index 4098122747..5c0fbaaf25 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.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..12} pypy3 ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) PYTHON_REQ_USE="threads(+)" inherit distutils-r1 From 59a50d12b29991713a4ae65328bf3e8229350628 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:52 +0000 Subject: [PATCH 048/130] dev-python/lxml: Sync with Gentoo It's from Gentoo commit f2286a8c1805e2f52bcbadec5125cd77e70cff33. --- .../portage-stable/dev-python/lxml/Manifest | 2 + .../lxml/files/lxml-5.1.0-pypy.patch | 175 ++++++++++++++++++ .../dev-python/lxml/lxml-4.9.4.ebuild | 4 +- .../dev-python/lxml/lxml-5.0.1.ebuild | 118 ++++++++++++ .../dev-python/lxml/lxml-5.1.0.ebuild | 117 ++++++++++++ 5 files changed, 414 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-5.1.0-pypy.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.0.1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.1.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/lxml/Manifest index d59bb456c2..01eaf3ac74 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/lxml/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/Manifest @@ -2,3 +2,5 @@ DIST lxml-4.9.3-patches-2.tar.xz 24288 BLAKE2B 47b7c486a1c1616c875111bd53b14d421 DIST lxml-4.9.3.gh.tar.gz 958628 BLAKE2B ffdf3fe781a03815f7c026229d313721c93375ebafad9b4a20c5d8a380a631401e546d8701a94d8c49615fb6a71e84940d8ca0299b47a37c1c9596db36659113 SHA512 903bd4935c7708b459aee9befcf3f6e3e3aaa9adc122591ea923b6e3d8fd288f07cab3f5f0edb08e3bf9db80414324f0a1a8e5a5089f9cda82f6c50f5df59423 DIST lxml-4.9.4.gh.tar.gz 960009 BLAKE2B 7d31095dcf1f73c1026e7378e6adb19a053edc116b119ae415c3324134d3700822bf4611dc3cbf7c216d396e1404b143c8ebfdfb7e5a71b9ef6ec187898cc699 SHA512 528ef4ae057a7ee54d3193a042a6db500ada883d1d506829b6824d91ec979feb69ec79239420112eae0e08a437b2e5da8efc35feb5d04d119bfae2679e918d29 DIST lxml-5.0.0.gh.tar.gz 964278 BLAKE2B 9c3f026b03bd671545cb039632af9bf1e8b94b8f8d4a20d0e4110f2b2d63cf0a46f983d0fa8eb71867ba9ac8cd46c949714dc7486faf01ecedae858e39799031 SHA512 6562bb68ea677fd9726adff1940034e364be0626dd1c086971cf0b271ca5caf98c96a3c465b98ede76f72248a40cf190fdc4f54c04c7e9c93e6408fde63fbfd3 +DIST lxml-5.0.1.gh.tar.gz 965422 BLAKE2B 4dfc17a0d3920a6785765f7bf5a35b578c8e62419ce6b5288a2899fcbf8b809a235a9b3b23abbcfa84ba5fcabb9ce7a838ff02f3f74e4ae5cb60850b951e3c23 SHA512 09ed4d9fd1396a0fbc2d7b14119545817497a85e632fde6239f6e66921926476e468a9ced227b6575519a2d1a5d03c858319386a5d739ff7aa3f68282d027b63 +DIST lxml-5.1.0.gh.tar.gz 962111 BLAKE2B 31c82eb198911d82fd9f7882bf94547b2367f3b3d1183eb8e8f97297b96faa69230d27b3367160b1f732a5d0878296b2d11787c3b220416c81a920e62ebec4f2 SHA512 1fadfeac1fb8b1e4fb1f7f2acb056865eb2567300a6c728eaede380d846ac75a6e33ebebcbbc6d60f54102152afd5dddf970058c4e27af396e9fa58e83c407a7 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-5.1.0-pypy.patch b/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-5.1.0-pypy.patch new file mode 100644 index 0000000000..7b50b9d306 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/files/lxml-5.1.0-pypy.patch @@ -0,0 +1,175 @@ +diff --git a/src/lxml/tests/test_errors.py b/src/lxml/tests/test_errors.py +index fa735c28..9337bc04 100644 +--- a/src/lxml/tests/test_errors.py ++++ b/src/lxml/tests/test_errors.py +@@ -10,3 +10,3 @@ from lxml import etree + +-from .common_imports import HelperTestCase ++from .common_imports import HelperTestCase, IS_PYPY + +@@ -24,2 +24,3 @@ class ErrorTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_element_cyclic_gc_none(self): +diff --git a/src/lxml/tests/test_http_io.py b/src/lxml/tests/test_http_io.py +index 8385e393..0b259299 100644 +--- a/src/lxml/tests/test_http_io.py ++++ b/src/lxml/tests/test_http_io.py +@@ -10,3 +10,3 @@ import gzip + +-from .common_imports import etree, HelperTestCase, BytesIO, _bytes ++from .common_imports import etree, HelperTestCase, BytesIO, _bytes, IS_PYPY + from .dummy_http_server import webserver, HTTPRequestCollector +@@ -14,2 +14,3 @@ from .dummy_http_server import webserver, HTTPRequestCollector + ++@unittest.skipIf(IS_PYPY, "broken on pypy") + class HttpIOTestCase(HelperTestCase): +diff --git a/src/lxml/tests/test_nsclasses.py b/src/lxml/tests/test_nsclasses.py +index 750dc1ed..adbec11c 100644 +--- a/src/lxml/tests/test_nsclasses.py ++++ b/src/lxml/tests/test_nsclasses.py +@@ -8,3 +8,3 @@ import unittest + +-from .common_imports import etree, HelperTestCase, _bytes, make_doctest ++from .common_imports import etree, HelperTestCase, _bytes, make_doctest, IS_PYPY + +@@ -45,2 +45,3 @@ class ETreeNamespaceClassesTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_ns_classes(self): +diff --git a/src/lxml/tests/test_objectify.py b/src/lxml/tests/test_objectify.py +index 1c8ff47c..326c5316 100644 +--- a/src/lxml/tests/test_objectify.py ++++ b/src/lxml/tests/test_objectify.py +@@ -10,3 +10,4 @@ import unittest + from .common_imports import ( +- etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO ++ etree, HelperTestCase, fileInTestDir, doctest, make_doctest, _bytes, _str, BytesIO, ++ IS_PYPY + ) +@@ -383,2 +384,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_setattr(self): +@@ -818,2 +820,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_build_tree(self): +@@ -847,2 +850,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_bool(self): +@@ -884,2 +888,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str(self): +@@ -891,2 +896,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_intliteral(self): +@@ -898,2 +904,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_floatliteral(self): +@@ -905,2 +912,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_mul(self): +@@ -917,2 +925,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_add(self): +@@ -992,2 +1001,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr(self): +@@ -999,2 +1009,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_intliteral(self): +@@ -1006,2 +1017,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_floatliteral(self): +@@ -1013,2 +1025,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_mul(self): +@@ -1025,2 +1038,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_ustr_add(self): +@@ -1050,2 +1064,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_int(self): +@@ -1066,2 +1081,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_float(self): +@@ -1082,2 +1098,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_float_precision(self): +@@ -1101,2 +1118,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_float_precision_consistency(self): +@@ -1187,2 +1205,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_unregistered(self): +@@ -1349,2 +1368,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_str_cmp(self): +@@ -1376,2 +1396,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_int_cmp(self): +@@ -1398,2 +1419,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_type_bool_cmp(self): +@@ -2067,2 +2089,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_registered_type_stringify(self): +@@ -2537,2 +2560,3 @@ class ObjectifyTestCase(HelperTestCase): + # type-looked-up as ObjectifiedElement (no annotations) ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_int(self): +@@ -2542,2 +2566,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_float(self): +@@ -2547,2 +2572,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_str(self): +@@ -2552,2 +2578,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_unicode(self): +@@ -2557,2 +2584,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_bool(self): +@@ -2562,2 +2590,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_none(self): +@@ -2567,2 +2596,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_value_concatenation(self): +@@ -2577,2 +2607,3 @@ class ObjectifyTestCase(HelperTestCase): + ++ @unittest.skipIf(IS_PYPY, "broken on pypy") + def test_efactory_nested(self): +@@ -2745,3 +2776,4 @@ def test_suite(): + suite.addTests(doctest.DocTestSuite(objectify)) +- suite.addTests([make_doctest('../../../doc/objectify.txt')]) ++ if not IS_PYPY: ++ suite.addTests([make_doctest('../../../doc/objectify.txt')]) + return suite diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-4.9.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-4.9.4.ebuild index 2219b76e7d..9408a9a143 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-4.9.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-4.9.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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="doc examples +threads test" RESTRICT="!test? ( test )" diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.0.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.0.1.ebuild new file mode 100644 index 0000000000..3dfddf8a40 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.0.1.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + +inherit distutils-r1 optfeature toolchain-funcs + +DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries" +HOMEPAGE=" + https://lxml.de/ + https://pypi.org/project/lxml/ + https://github.com/lxml/lxml/ +" +SRC_URI=" + https://github.com/lxml/lxml/archive/${P}.tar.gz + -> ${P}.gh.tar.gz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-4.9.3-patches-2.tar.xz +" +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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc examples +threads test" +RESTRICT="!test? ( test )" + +# Note: lib{xml2,xslt} are used as C libraries, not Python modules. +DEPEND=" + >=dev-libs/libxml2-2.10.3 + >=dev-libs/libxslt-1.1.38 +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + virtual/pkgconfig + >=dev-python/cython-3.0.7[${PYTHON_USEDEP}] + doc? ( + $(python_gen_any_dep ' + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ') + ) + test? ( + dev-python/cssselect[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${WORKDIR}"/${PN}-4.9.3-patches-2/0001-Skip-tests-failing-on-PyPy.patch +) + +python_check_deps() { + use doc || return 0 + python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" +} + +python_prepare_all() { + # avoid replacing PYTHONPATH in tests. + sed -i -e '/sys\.path/d' test.py || die + + # don't use some random SDK on Darwin + sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \ + setupinfo.py || die + + distutils-r1_python_prepare_all +} + +python_compile() { + local DISTUTILS_ARGS=( + # by default it adds -w to CFLAGS + --warnings + ) + tc-export PKG_CONFIG + distutils-r1_python_compile +} + +python_compile_all() { + use doc && emake html +} + +python_test() { + local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml + local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH} + + cp -al "${BUILD_DIR}"/{install,test} || die + cp -al src/lxml/tests "${dir}/" || die + cp -al src/lxml/html/tests "${dir}/html/" || die + ln -rs "${S}"/doc "${dir}"/../../ || die + + "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}" +} + +python_install_all() { + if use doc; then + local DOCS=( README.rst *.txt doc/*.txt ) + local HTML_DOCS=( doc/html/. ) + fi + if use examples; then + dodoc -r samples + fi + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4 + optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.1.0.ebuild new file mode 100644 index 0000000000..4fdfa9ff57 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/lxml/lxml-5.1.0.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + +inherit distutils-r1 optfeature toolchain-funcs + +DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries" +HOMEPAGE=" + https://lxml.de/ + https://pypi.org/project/lxml/ + https://github.com/lxml/lxml/ +" +SRC_URI=" + https://github.com/lxml/lxml/archive/${P}.tar.gz + -> ${P}.gh.tar.gz +" +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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="doc examples +threads test" +RESTRICT="!test? ( test )" + +# Note: lib{xml2,xslt} are used as C libraries, not Python modules. +DEPEND=" + >=dev-libs/libxml2-2.10.3 + >=dev-libs/libxslt-1.1.38 +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + virtual/pkgconfig + >=dev-python/cython-3.0.7[${PYTHON_USEDEP}] + doc? ( + $(python_gen_any_dep ' + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ') + ) + test? ( + dev-python/cssselect[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/${P}-pypy.patch" +) + +python_check_deps() { + use doc || return 0 + python_has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" +} + +python_prepare_all() { + # avoid replacing PYTHONPATH in tests. + sed -i -e '/sys\.path/d' test.py || die + + # don't use some random SDK on Darwin + sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \ + setupinfo.py || die + + distutils-r1_python_prepare_all +} + +python_compile() { + local DISTUTILS_ARGS=( + # by default it adds -w to CFLAGS + --warnings + ) + tc-export PKG_CONFIG + distutils-r1_python_compile +} + +python_compile_all() { + use doc && emake html +} + +python_test() { + local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml + local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH} + + cp -al "${BUILD_DIR}"/{install,test} || die + cp -al src/lxml/tests "${dir}/" || die + cp -al src/lxml/html/tests "${dir}/html/" || die + ln -rs "${S}"/doc "${dir}"/../../ || die + + "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}" +} + +python_install_all() { + if use doc; then + local DOCS=( README.rst *.txt doc/*.txt ) + local HTML_DOCS=( doc/html/. ) + fi + if use examples; then + dodoc -r samples + fi + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4 + optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect +} From f3f7ca1a181670d80ceddf1b885ce90ee67d266b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:11:53 +0000 Subject: [PATCH 049/130] dev-python/more-itertools: Sync with Gentoo It's from Gentoo commit fa2d3e6c7c164d431be27a388da6c36b8513e2ec. --- .../dev-python/more-itertools/Manifest | 1 + .../more-itertools-10.2.0.ebuild | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/more-itertools/more-itertools-10.2.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/more-itertools/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/more-itertools/Manifest index e221a1919e..936fe76f17 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/more-itertools/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/more-itertools/Manifest @@ -1 +1,2 @@ DIST more-itertools-10.1.0.tar.gz 111235 BLAKE2B 457eb62d735ac0d0f4a93a6a79c747ac965c1af394a1d894c4f80abfa0a94de76d804c7e68d4122fabf09b7c8e2f1d59bb1c43ff54c7cd5c2d52b5a1280b0290 SHA512 520cf4a5cfce314bb43a052962b478be27f0459735902c45384ad785cd678b493bab87f5736aa6be8d742911c4e8b02c597859428b1f459550b27f7751a53494 +DIST more-itertools-10.2.0.tar.gz 114449 BLAKE2B 2bac2f69c65e3536b98a7a54857ef1e5b078cf244c2eb988c7fb31de7e0eb3efd496e8d0778a02a29b2e696499dbd33b84cfa7f442ee881e5785ec2dd4118de5 SHA512 4357de86ca4e76d840825111cd6e19296af6394a6095c0cc28650f8e2abfe2cb45a24c34382532753652c506e5b261cf0d05d37c799434f5f7cfc8fa387d06f2 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/more-itertools/more-itertools-10.2.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/more-itertools/more-itertools-10.2.0.ebuild new file mode 100644 index 0000000000..ea815ad1b6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/more-itertools/more-itertools-10.2.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=flit +PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + +inherit distutils-r1 pypi + +DESCRIPTION="More routines for operating on iterables, beyond itertools" +HOMEPAGE=" + https://github.com/more-itertools/more-itertools/ + https://pypi.org/project/more-itertools/ +" + +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" + +distutils_enable_sphinx docs \ + dev-python/sphinx-rtd-theme +distutils_enable_tests unittest From 6a05e3357154b78c6c3b5d22aebf3c0b839f4495 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:04 +0000 Subject: [PATCH 050/130] dev-python/setuptools: Sync with Gentoo It's from Gentoo commit 120f357239899502e969549bdbcae87b554bc84f. --- .../dev-python/setuptools/Manifest | 1 - .../setuptools/setuptools-69.0.2-r1.ebuild | 115 ------------------ .../setuptools/setuptools-69.0.3.ebuild | 8 +- 3 files changed, 3 insertions(+), 121 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-69.0.2-r1.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 387161d16a..534fff7d1b 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,2 +1 @@ -DIST setuptools-69.0.2.tar.gz 2219248 BLAKE2B 8873ce1eb0a04a8f561eaa9ea8332eb37ca8646e9ed2bb2f4723df0351b01d60ab94172ea34963b0084839b713b9a47e09ee00f82ec46297c7646565e4189ee4 SHA512 1a2955c8ff5955cb028f60ca538472c3a24dbda27984ef51ab59f6969e100b183456af82bc978a02f771b952908985eb85312065849f1afc64530d6461c7c6f6 DIST setuptools-69.0.3.tar.gz 2219609 BLAKE2B 1a5e7896c7ea82d51b0aa4794435b9899cef871f6ae43d22ae5e08c57d87b70641f3f2abfcc29956a3de515f90b112fd61d3daf793474b4cf33f8567e3a38f4a SHA512 11df934931f4b73f7e07ea5713479593c6baa134d423556b2ae7aff0f1e5bdbdee1f5b516131adb169c838231ceb0293441fbf275ef7030dabecf74122565b6d diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-69.0.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-69.0.2-r1.ebuild deleted file mode 100644 index 43ba207f4e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-69.0.2-r1.ebuild +++ /dev/null @@ -1,115 +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_{10..12} pypy3 ) -PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 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}] - >=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}] -" -BDEPEND=" - ${RDEPEND} - 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}] - ' "${PYTHON_TESTED[@]}") - ) -" -# setuptools-scm is here because installing plugins apparently breaks stuff at -# runtime, so let's pull it early. See bug #663324. -PDEPEND=" - dev-python/setuptools-scm[${PYTHON_USEDEP}] -" - -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 - 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() { - 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 - # fails if python-xlib is installed - setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts - # TODO, probably some random package - setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass - ) - - local EPYTEST_XDIST=1 - epytest setuptools -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-69.0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-69.0.3.ebuild index a7a1efc765..5f2718832e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-69.0.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/setuptools/setuptools-69.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # please keep this ebuild at EAPI 8 -- sys-apps/portage dep @@ -21,7 +21,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" IUSE="test" RESTRICT="!test? ( test )" @@ -47,9 +47,7 @@ BDEPEND=" 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}] @@ -111,5 +109,5 @@ python_test() { ) local EPYTEST_XDIST=1 - epytest setuptools + epytest -o tmp_path_retention_policy=all setuptools } From 58a5c0f1582539a95cfb962b97b59e052a0afa3d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:10 +0000 Subject: [PATCH 051/130] dev-python/trove-classifiers: Sync with Gentoo It's from Gentoo commit 5ae3d771d3ae7dbdff5c8025cb1a0238257106dd. --- .../dev-python/trove-classifiers/Manifest | 1 + .../trove-classifiers-2024.1.8.ebuild | 43 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2024.1.8.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/Manifest index 39dc4dfe12..3de77b9391 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/Manifest @@ -1 +1,2 @@ DIST trove-classifiers-2023.11.29.tar.gz 15918 BLAKE2B 3e216aa24a458f5c65a20b2589dff34c382c3e1ccba5274377b09bcc254fafb077dfd3f82b0f1c998a9c34b20f35eca27bd7d8103b631a03eb87a9c1525c057e SHA512 fdeb6bbddbb3ad640112827b55f4b0a2201c79e2a4013d2d621bf0a6168d87861ad1802b0805747fc7d9e8be7e1954d58b83fd4fde6f3394cec2fa3aa88f0dca +DIST trove-classifiers-2024.1.8.tar.gz 15943 BLAKE2B f0a4ec5439415d53d81297001aac2b4ffc3da0e2c5492acb9a3ed23fba9e7c7ea1407cfa2f8291ab0b8ea7f1dd985cdd86a1b82e71b0223c88ae73bcc7ce63cd SHA512 3a86f54fd432b7d176cc7740a6a171eb9cdef339633b023ab81f5f8e68a7bae5ebb2d49c82aaec53f0f865c84234ac9506de45f76c3b9be18d57f5fcfe3afe73 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2024.1.8.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2024.1.8.ebuild new file mode 100644 index 0000000000..3172a692bd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2024.1.8.ebuild @@ -0,0 +1,43 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=flit +PYPI_NO_NORMALIZE=1 +PYTHON_COMPAT=( pypy3 python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)" +HOMEPAGE=" + https://github.com/pypa/trove-classifiers/ + https://pypi.org/project/trove-classifiers/ +" + +LICENSE="Apache-2.0" +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 pytest + +src_configure() { + grep -q 'build-backend = "setuptools' pyproject.toml || + die "Upstream changed build-backend, recheck" + # write a custom pyproject.toml to ease hatchling bootstrap + cat > pyproject.toml <<-EOF || die + [build-system] + requires = ["flit_core >=3.2,<4"] + build-backend = "flit_core.buildapi" + + [project] + name = "trove-classifiers" + version = "${PV}" + description = "Canonical source for classifiers on PyPI (pypi.org)." + EOF +} + +python_test() { + epytest + "${EPYTHON}" -m tests.lib || die +} From b1dfd5965cd1a8e77c3a1f494797d44016c3fee5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:13 +0000 Subject: [PATCH 052/130] dev-util/cmocka: Sync with Gentoo It's from Gentoo commit f7fdfdaeec3764929686064a6054c38a6b2d7788. --- .../portage-stable/dev-util/cmocka/cmocka-1.1.5-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmocka/cmocka-1.1.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmocka/cmocka-1.1.5-r1.ebuild index 15f0abdd31..5ceea42d02 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmocka/cmocka-1.1.5-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmocka/cmocka-1.1.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv IUSE="doc examples static-libs test" RESTRICT="!test? ( test )" -BDEPEND="doc? ( app-doc/doxygen[dot] )" +BDEPEND="doc? ( app-text/doxygen[dot] )" multilib_src_configure() { append-lfs-flags From 0ecfb6a8e1af17e8c1bfd998d58655683a0700dd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:13 +0000 Subject: [PATCH 053/130] dev-util/desktop-file-utils: Sync with Gentoo It's from Gentoo commit bd413a3ceed2df65c01624b7f25a872883521b75. --- .../dev-util/desktop-file-utils/Manifest | 1 - .../desktop-file-utils-0.26-r1.ebuild | 47 ---------- .../desktop-file-utils-0.26-r2.ebuild | 50 ----------- .../desktop-file-utils-0.27-r1.ebuild | 23 +++++ ...-file-utils-0.26-support-version-1.5.patch | 88 ------------------- 5 files changed, 23 insertions(+), 186 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/Manifest index 21bf2c1846..0bc54c3128 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/Manifest @@ -1,2 +1 @@ -DIST desktop-file-utils-0.26.tar.xz 83132 BLAKE2B fdbe5427a0278ebe4a9b1bc15a148ecdc3f54b54058b355ae4f9a962fb1c4ec309d24a075973caf8f187a1c74b013e9bed0a7c3668bf888274e77fac9e077ec8 SHA512 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831 DIST desktop-file-utils-0.27.tar.xz 80808 BLAKE2B 66708cd11d5f81824cad814846cdeac6c339e8e93a7f1dceaeed545d9dc1940523fd64ae890e54632b3d32cc91b258aabd41d6d467081539f978ae2993fdfb22 SHA512 81356239a92fb17885aa85a5192c84c2757ebb2e540920d0d41d07035795f08f4162f41b1a87bb2bfcf70ec61f19f1f158e4395a359f46b46f68cb9e24f259a8 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 deleted file mode 100644 index 33328074b1..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit elisp-common meson - -DESCRIPTION="Command line utilities to work with desktop menu entries" -HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils" -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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" -IUSE="emacs" - -RDEPEND=">=dev-libs/glib-2.12:2" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig - emacs? ( >=app-editors/emacs-23.1:* ) -" - -SITEFILE="50${PN}-gentoo.el" - -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) - -src_compile() { - meson_src_compile - use emacs && elisp-compile misc/desktop-entry-mode.el -} - -src_install() { - meson_src_install - if use emacs; then - elisp-install ${PN} misc/*.el misc/*.elc || die - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - 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-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 deleted file mode 100644 index 4bbe6a30ef..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit elisp-common meson - -DESCRIPTION="Command line utilities to work with desktop menu entries" -HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils/" -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 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" -IUSE="emacs" - -RDEPEND=">=dev-libs/glib-2.12:2" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig - emacs? ( >=app-editors/emacs-23.1:* ) -" - -SITEFILE="50${PN}-gentoo.el" - -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) - -# Will be in next release -PATCHES=( "${FILESDIR}/${P}-support-version-1.5.patch" ) - -src_compile() { - meson_src_compile - use emacs && elisp-compile misc/desktop-entry-mode.el -} - -src_install() { - meson_src_install - if use emacs; then - elisp-install ${PN} misc/*.el misc/*.elc || die - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - 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-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild new file mode 100644 index 0000000000..4e192a93a3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="Command line utilities to work with desktop menu entries" +HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils/" +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 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" + +RDEPEND=">=dev-libs/glib-2.12:2" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig +" + +DOCS=( AUTHORS ChangeLog HACKING NEWS README ) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch deleted file mode 100644 index f4b57d8f25..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/files/desktop-file-utils-0.26-support-version-1.5.patch +++ /dev/null @@ -1,88 +0,0 @@ -# Adds support for Desktop Entry Specification 1.5. Gentoo bug 795570. -# Upstream commit URLs: -# https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/425177a28b6215e0745f95100160a08e810fd47c -# https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/56d220dd679c7c3a8f995a41a27a7d6f3df49dea - -From 425177a28b6215e0745f95100160a08e810fd47c Mon Sep 17 00:00:00 2001 -From: David King -Date: Tue, 15 Feb 2022 10:54:40 +0000 -Subject: [PATCH 1/2] validate: support SingleMainWindow key from 1.5 - -Fixes https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/issues/59 ---- - src/validate.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/validate.c b/src/validate.c -index 62406ab..ebb03b5 100644 ---- a/src/validate.c -+++ b/src/validate.c -@@ -326,6 +326,9 @@ static DesktopKeyDefinition registered_desktop_keys[] = { - /* Since 1.4 */ - { DESKTOP_BOOLEAN_TYPE, "PrefersNonDefaultGPU", FALSE, FALSE, FALSE, NULL }, - -+ /* Since 1.5 */ -+ { DESKTOP_BOOLEAN_TYPE, "SingleMainWindow", FALSE, FALSE, FALSE, NULL }, -+ - /* Keys reserved for KDE */ - - /* since 0.9.4 */ --- -GitLab - - -From 56d220dd679c7c3a8f995a41a27a7d6f3df49dea Mon Sep 17 00:00:00 2001 -From: David King -Date: Tue, 15 Feb 2022 10:56:04 +0000 -Subject: [PATCH 2/2] validate: Support version 1.5 - -Bump CURRENT_SPEC_VERSION to 1.5. ---- - man/desktop-file-validate.1 | 2 +- - src/validate.c | 3 +++ - src/validate.h | 2 +- - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/man/desktop-file-validate.1 b/man/desktop-file-validate.1 -index 8e17411..ce87c47 100644 ---- a/man/desktop-file-validate.1 -+++ b/man/desktop-file-validate.1 -@@ -9,7 +9,7 @@ desktop-file-validate \- Validate desktop entry files - .B desktop-file-validate [\-\-no-hints] [\-\-no-warn-deprecated] [\-\-warn-kde] FILE... - .SH DESCRIPTION - The \fIdesktop-file-validate\fP program is a tool to validate desktop --entry files according to the Desktop Entry specification 1.4. -+entry files according to the Desktop Entry specification 1.5. - .PP - The specification describes a file format to provide information such as - name, icon and description for an application. Such a file can then be -diff --git a/src/validate.c b/src/validate.c -index ebb03b5..f9eedee 100644 ---- a/src/validate.c -+++ b/src/validate.c -@@ -961,6 +961,9 @@ handle_version_key (kf_validator *kf, - const char *locale_key, - const char *value) - { -+ if (!strcmp (value, "1.5")) -+ return TRUE; -+ - if (!strcmp (value, "1.4")) - return TRUE; - -diff --git a/src/validate.h b/src/validate.h -index e6efd93..a7952cd 100644 ---- a/src/validate.h -+++ b/src/validate.h -@@ -30,7 +30,7 @@ - - #include - --#define CURRENT_SPEC_VERSION "1.4" -+#define CURRENT_SPEC_VERSION "1.5" - - #define GROUP_KDE_DESKTOP_ENTRY "KDE Desktop Entry" - #define GROUP_DESKTOP_ACTION "Desktop Action " --- -GitLab - From d542a89188e67d092a32352781a6f2840fbd893f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:14 +0000 Subject: [PATCH 054/130] dev-util/gdbus-codegen: Sync with Gentoo It's from Gentoo commit ffc597e4e0e12b001880638125fa38cdb92a7831. --- .../dev-util/gdbus-codegen/gdbus-codegen-2.78.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.78.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.78.3.ebuild index 13fc879492..f24142b74c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.78.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.78.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ 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" +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}" From bb2fc037737f68d1bc9819ff0bc28a5aee12690a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:14 +0000 Subject: [PATCH 055/130] dev-util/glib-utils: Sync with Gentoo It's from Gentoo commit 2d8dd958c7fd50b4dd74647276aa998c0b1fe4c3. --- .../dev-util/glib-utils/glib-utils-2.78.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.78.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.78.3.ebuild index 4f4566cb16..67217b70d7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.78.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.78.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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="${PYTHON_DEPS}" DEPEND="${RDEPEND}" From f1c423854f1a5dcc9998a9fcb8b401ee7f5ee389 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:14 +0000 Subject: [PATCH 056/130] dev-util/gperf: Sync with Gentoo It's from Gentoo commit c552aae1e4c2dc88ad964fd4134505c2cdf0d26e. --- .../dev-util/gperf/gperf-3.1-r2.ebuild | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r2.ebuild new file mode 100644 index 0000000000..f5fd37924a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +PATCHES=( + "${FILESDIR}"/${P}-strncmp-decl-mismatch.patch + "${FILESDIR}"/${P}-clang-16-wregister.patch + "${FILESDIR}"/${P}-parallel-tests.patch +) + +src_prepare() { + sed -i \ + -e "/^CPPFLAGS /s:=:+=:" \ + */Makefile.in || die #444078 + + default +} + +src_configure() { + # Aliasing violation (bug #858377) + append-flags -fno-strict-aliasing + filter-lto + + econf --cache-file="${S}"/config.cache +} From 5f8db77d5243918cfd9e5f4439b9b98bf7db03cf Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:18 +0000 Subject: [PATCH 057/130] dev-util/perf: Sync with Gentoo It's from Gentoo commit 6ef4a840b76f607d38196344e9d2fd19d3142dd4. --- .../dev-util/perf/perf-6.3.ebuild | 6 ++-- .../dev-util/perf/perf-6.5.ebuild | 6 ++-- .../dev-util/perf/perf-6.6.ebuild | 28 +++++++++++++++---- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.3.ebuild index e3f009470d..58d7202c0f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -41,8 +41,8 @@ BDEPEND=" ${PYTHON_DEPS} >=app-arch/tar-1.34-r2 dev-python/setuptools[${PYTHON_USEDEP}] - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex virtual/pkgconfig doc? ( app-text/asciidoc diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.5.ebuild index 128f4fd8b6..006893a110 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -44,8 +44,8 @@ BDEPEND=" ${PYTHON_DEPS} >=app-arch/tar-1.34-r2 dev-python/setuptools[${PYTHON_USEDEP}] - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex virtual/pkgconfig doc? ( app-text/asciidoc diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.6.ebuild index 5f93ba5de3..b5b413be9a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-6.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,7 +31,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="audit babeltrace bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd" +IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -43,8 +43,8 @@ BDEPEND=" ${PYTHON_DEPS} >=app-arch/tar-1.34-r2 dev-python/setuptools[${PYTHON_USEDEP}] - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex virtual/pkgconfig doc? ( app-text/asciidoc @@ -223,11 +223,29 @@ perf_make() { disable_libdw=1 fi + # perf directly invokes LD for linking without going through CC, on mips + # it is required to specify the emulation. port of below buildroot patch + # https://patchwork.ozlabs.org/project/buildroot/patch/20170217105905.32151-1-Vincent.Riera@imgtec.com/ + local linker="$(tc-getLD)" + if use mips + then + if use big-endian + then + use abi_mips_n64 && linker+=" -m elf64btsmip" + use abi_mips_n32 && linker+=" -m elf32btsmipn32" + use abi_mips_o32 && linker+=" -m elf32btsmip" + else + use abi_mips_n64 && linker+=" -m elf64ltsmip" + use abi_mips_n32 && linker+=" -m elf32ltsmipn32" + use abi_mips_o32 && linker+=" -m elf32ltsmip" + fi + fi + # FIXME: NO_CORESIGHT local emakeargs=( V=1 VF=1 HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" - CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" + CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)" PKG_CONFIG="$(tc-getPKG_CONFIG)" prefix="${EPREFIX}/usr" bindir_relative="bin" tipdir="share/doc/${PF}" From bf6935377bb680707e53a591af8e9919409525a4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:20 +0000 Subject: [PATCH 058/130] dev-vcs/git: Sync with Gentoo It's from Gentoo commit 51f86fbbc0ee45ec87db4af06f740832ef770642. --- .../third_party/portage-stable/dev-vcs/git/git-2.43.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.43.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.43.0.ebuild index 4929730cbd..46dd09f6c3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.43.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.43.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 8c02df13bb8f754e5f7f3bb9108430670d3d9ced Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:26 +0000 Subject: [PATCH 059/130] eclass/cargo: Sync with Gentoo It's from Gentoo commit c7f6ebbe26db3f2c9dd656438664109ec1329ab1. --- .../src/third_party/portage-stable/eclass/cargo.eclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass index 1e1a6e3ddf..3bdbb5e3ec 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/cargo.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: cargo.eclass @@ -331,6 +331,9 @@ cargo_src_unpack() { for archive in ${A}; do case "${archive}" in *.crate) + # when called by pkgdiff-mg, do not unpack crates + [[ ${PKGBUMPING} == ${PVR} ]] && continue + ebegin "Loading ${archive} into Cargo registry" tar -xf "${DISTDIR}"/${archive} -C "${ECARGO_VENDOR}/" || die # generate sha256sum of the crate itself as cargo needs this From 1a967f103968109512fcfff663944cbc143178ba Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:28 +0000 Subject: [PATCH 060/130] eclass/cmake: Sync with Gentoo It's from Gentoo commit 2f9c42cb12b476a78214e2f7d5bb3f984ce05de6. --- .../src/third_party/portage-stable/eclass/cmake.eclass | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass b/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass index 10749e9a2f..908e2356ea 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/cmake.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: cmake.eclass @@ -130,7 +130,7 @@ fi # @DESCRIPTION: # Array of tests that should be skipped when running CTest. -[[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION is banned; if necessary, set BDEPEND=\">=dev-util/cmake-${CMAKE_MIN_VERSION}\" directly" +[[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION is banned; if necessary, set BDEPEND=\">=dev-build/cmake-${CMAKE_MIN_VERSION}\" directly" [[ ${CMAKE_BUILD_DIR} ]] && die "The ebuild must be migrated to BUILD_DIR" [[ ${CMAKE_REMOVE_MODULES} ]] && die "CMAKE_REMOVE_MODULES is banned, set CMAKE_REMOVE_MODULES_LIST array instead" [[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} ]] && die "Use CMAKE_QA_SRC_DIR_READONLY instead" @@ -139,7 +139,7 @@ fi case ${CMAKE_MAKEFILE_GENERATOR} in emake) - BDEPEND="sys-devel/make" + BDEPEND="dev-build/make" ;; ninja) BDEPEND="${NINJA_DEPEND}" @@ -151,7 +151,7 @@ case ${CMAKE_MAKEFILE_GENERATOR} in esac if [[ ${PN} != cmake ]]; then - BDEPEND+=" >=dev-util/cmake-3.20.5" + BDEPEND+=" >=dev-build/cmake-3.20.5" fi # @FUNCTION: cmake_run_in @@ -541,6 +541,8 @@ cmake_src_configure() { set(CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "") set(BUILD_SHARED_LIBS ON CACHE BOOL "") set(Python3_FIND_UNVERSIONED_NAMES FIRST CACHE STRING "") + set(FETCHCONTENT_FULLY_DISCONNECTED ON CACHE BOOL "") + set(CMAKE_DISABLE_PRECOMPILE_HEADERS ON CACHE BOOL "") _EOF_ if [[ -n ${_ECM_ECLASS} ]]; then From 41aa58489979d9dc496fc6aad4d63e1e915ea23c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:30 +0000 Subject: [PATCH 061/130] eclass/distutils-r1: Sync with Gentoo It's from Gentoo commit 635892e8f096afd7d1f3ea2f91a6906122b2e5ca. --- .../third_party/portage-stable/eclass/distutils-r1.eclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 5a99ba88ed..c0d1992ccc 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: distutils-r1.eclass @@ -618,6 +618,9 @@ distutils_enable_tests() { ;; pytest) test_pkgs='>=dev-python/pytest-7.3.1[${PYTHON_USEDEP}]' + if [[ -n ${EPYTEST_TIMEOUT} ]]; then + test_pkgs+=' dev-python/pytest-timeout[${PYTHON_USEDEP}]' + fi if [[ ${EPYTEST_XDIST} ]]; then test_pkgs+=' dev-python/pytest-xdist[${PYTHON_USEDEP}]' fi @@ -1401,6 +1404,9 @@ distutils_pep517_install() { ) ;; setuptools) + if in_iuse debug && use debug; then + local -x SETUPTOOLS_RUST_CARGO_PROFILE=dev + fi if [[ -n ${DISTUTILS_ARGS[@]} ]]; then config_settings=$( "${EPYTHON}" - "${DISTUTILS_ARGS[@]}" <<-EOF || die From 46061050513ebbce64739eafa85cb0f122fd5909 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:57 +0000 Subject: [PATCH 062/130] eclass/java-utils-2: Sync with Gentoo It's from Gentoo commit cb202546d81ed4e591c366d192e7b15d4c184ffa. --- .../portage-stable/eclass/java-utils-2.eclass | 64 ++++++++++++++++++- 1 file changed, 61 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass index 31b8ab8df6..31f7932a16 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass @@ -218,6 +218,46 @@ JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/com # ebuild foo.ebuild compile # @CODE +# @ECLASS_VARIABLE: JAVADOC_CLASSPATH +# @DEFAULT_UNSET +# @DESCRIPTION: +# Comma or space separated list of java packages that are needed for generating +# javadocs. Can be used to avoid overloading the compile classpath in multi-jar +# packages if there are jar files which have different dependencies. +# +# @CODE +# Example: +# JAVADOC_CLASSPATH=" +# jna-4 +# jsch +# " +# @CODE + +# @ECLASS_VARIABLE: JAVADOC_SRC_DIRS +# @DEFAULT_UNSET +# @DESCRIPTION: +# An array of directories relative to ${S} which contain the sources of +# the application. It needs to sit in global scope; if put in src_compile() +# it would not work. +# It is needed by the java-pkg-simple.eclass to decide whether to call ejavadoc +# or not. If this variable is defined then java-pkg-simple_src_compile will not +# call ejavadoc automatically. ejavadoc has then to be called explicitly from +# the ebuild. It is meant for usage in multi-jar packages in order to avoid an +# extra compilation run only for producing the javadocs. +# +# @CODE +# Example: +# JAVADOC_SRC_DIRS=( +# "${PN}-core" +# "${PN}-jsch" +# "${PN}-pageant" +# "${PN}-sshagent" +# "${PN}-usocket-jna" +# "${PN}-usocket-nc" +# "${PN}-connector-factory" +# ) +# @CODE + # TODO document me JAVA_PKG_QA_VIOLATIONS=0 @@ -2152,9 +2192,27 @@ ejavadoc() { einfo "javadoc ${javadoc_args} ${@}" fi - local args=( javadoc ${javadoc_args} "${@}" ) - echo "${args[@]}" >&2 - "${args[@]}" || die "ejavadoc failed" + if [[ "${JAVADOC_SRC_DIRS[@]}" ]]; then + mkdir -p target/api || die "cannot create target/api" + local dependency + for dependency in ${JAVADOC_CLASSPATH}; do + classpath="${classpath}:$(java-pkg_getjars \ + --build-only \ + --with-dependencies \ + ${dependency})" + done + find "${JAVADOC_SRC_DIRS[@]}" -name '*.java' > sources + javadoc \ + "${javadoc_args}" \ + -d target/api \ + -cp "${classpath}" \ + -quiet \ + @sources || die "ejavadoc failed" + else + local args=( javadoc ${javadoc_args} "${@}" ) + echo "${args[@]}" >&2 + "${args[@]}" || die "ejavadoc failed" + fi } # @FUNCTION: java-pkg_filter-compiler From 64c31e1b802eba07c01cb38579d35123ee84d819 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:12:57 +0000 Subject: [PATCH 063/130] eclass/kernel-2: Sync with Gentoo It's from Gentoo commit 7ef71dd2f0e15a353a958b2572de2f2c353c6afb. --- .../portage-stable/eclass/kernel-2.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass index 5ecd97c173..a0574e0767 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: kernel-2.eclass @@ -653,12 +653,12 @@ kernel_is() { # Capture the sources type and set DEPENDs if [[ ${ETYPE} == sources ]]; then RDEPEND="!build? ( - app-arch/cpio + app-alternatives/cpio dev-lang/perl - sys-devel/bc - sys-devel/bison - sys-devel/flex - sys-devel/make + app-alternatives/bc + app-alternatives/yacc + app-alternatives/lex + dev-build/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig From 7912c161cfb3e56c512b4d3267c779cbad458daa Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:13:06 +0000 Subject: [PATCH 064/130] eclass/meson: Sync with Gentoo It's from Gentoo commit 21b3f9ceef131258a721b1b29e52d0f9c4fd2ea4. --- .../src/third_party/portage-stable/eclass/meson.eclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/meson.eclass b/sdk_container/src/third_party/portage-stable/eclass/meson.eclass index f7cf8a0722..d8bd93082e 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/meson.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/meson.eclass @@ -1,4 +1,4 @@ -# Copyright 2017-2023 Gentoo Authors +# Copyright 2017-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: meson.eclass @@ -43,9 +43,9 @@ _MESON_ECLASS=1 inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs -BDEPEND=">=dev-util/meson-1.2.1 +BDEPEND=">=dev-build/meson-1.2.1 ${NINJA_DEPEND} - dev-util/meson-format-array + dev-build/meson-format-array " # @ECLASS_VARIABLE: BUILD_DIR @@ -334,6 +334,10 @@ meson_src_configure() { # It's Gentoo policy to not have builds die on blanket -Werror, as it's # an upstream development matter. bug #754279. -Dwerror=false + + # Prevent projects from enabling LTO by default. In Gentoo, LTO is + # enabled via setting *FLAGS appropriately. + -Db_lto=false ) if [[ -n ${EMESON_BUILDTYPE} ]]; then From 5adabb431f3d19a36144929156cab207002f3c71 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:13:16 +0000 Subject: [PATCH 065/130] eclass/ninja-utils: Sync with Gentoo It's from Gentoo commit c1c5f21930b684aec3db78ec4c1856553a04afb0. --- .../third_party/portage-stable/eclass/ninja-utils.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/ninja-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/ninja-utils.eclass index 8b42c58495..f07c7d4109 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/ninja-utils.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/ninja-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ninja-utils.eclass @@ -8,11 +8,11 @@ # Michał Górny # Mike Gilbert # @SUPPORTED_EAPIS: 7 8 -# @BLURB: common bits to run dev-util/ninja builder +# @BLURB: common bits to run app-alternatives/ninja builder # @DESCRIPTION: # This eclass provides a single function -- eninja -- that can be used # to run the ninja builder alike emake. It does not define any -# dependencies, you need to depend on dev-util/ninja yourself. Since +# dependencies, you need to depend on app-alternatives/ninja yourself. Since # ninja is rarely used stand-alone, most of the time this eclass will # be used indirectly by the eclasses for other build systems (CMake, # Meson). From afb9a4e498d8999d8201fb12dadc72dbccc26e4e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:13:29 +0000 Subject: [PATCH 066/130] eclass/portability: Sync with Gentoo It's from Gentoo commit 3fe65af75b1e6e70fbf11ed2224832ffc4ee4087. --- .../src/third_party/portage-stable/eclass/portability.eclass | 4 ++-- 1 file changed, 2 insertions(+), 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 98e9418343..78da440e22 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/portability.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/portability.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: portability.eclass @@ -105,7 +105,7 @@ dlopen_lib() { # # This will return make (provided by system packages) for BSD userlands, # or bsdmake for Darwin userlands and pmake for the rest of userlands, -# both of which are provided by sys-devel/pmake package. +# both of which are provided by dev-build/pmake package. # # Note: the bsdmake for Darwin userland is with compatibility with MacOSX # default name. From ef7470dc4d185ab6e7274b2a938a2c12d2374f4c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:13:39 +0000 Subject: [PATCH 067/130] eclass/python-utils-r1: Sync with Gentoo It's from Gentoo commit 635892e8f096afd7d1f3ea2f91a6906122b2e5ca. --- .../eclass/python-utils-r1.eclass | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) 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 abb55bd2e9..3af3cbdb07 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: python-utils-r1.eclass @@ -1296,6 +1296,16 @@ _python_check_occluded_packages() { # parameter, when calling epytest. The listed files will be entirely # skipped from test collection. +# @ECLASS_VARIABLE: EPYTEST_TIMEOUT +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set to a non-empty value, enables pytest-timeout plugin and sets +# test timeout to the specified value. This variable can be either set +# in ebuilds that are known to hang, or by user to prevent hangs +# in automated test environments. If this variable is set prior +# to calling distutils_enable_tests in distutils-r1, a test dependency +# on dev-python/pytest-timeout is added automatically. + # @ECLASS_VARIABLE: EPYTEST_XDIST # @DEFAULT_UNSET # @DESCRIPTION: @@ -1344,6 +1354,11 @@ epytest() { # count is more precise when we're dealing with a large number # of tests -o console_output_style=count + # minimize the temporary directory retention, the test suites + # of some packages can grow them pretty large and normally + # we don't need to preserve them + -o tmp_path_retention_count=0 + -o tmp_path_retention_policy=failed ) if [[ ! ${PYTEST_DISABLE_PLUGIN_AUTOLOAD} ]]; then @@ -1376,6 +1391,18 @@ epytest() { ) fi + if [[ -n ${EPYTEST_TIMEOUT} ]]; then + if [[ ${PYTEST_PLUGINS} != *pytest_timeout* ]]; then + args+=( + -p timeout + ) + fi + + args+=( + "--timeout=${EPYTEST_TIMEOUT}" + ) + fi + if [[ ${EPYTEST_XDIST} ]]; then local jobs=${EPYTEST_JOBS:-$(makeopts_jobs)} if [[ ${jobs} -gt 1 ]]; then From 5337553a6d8a4debee720d8d2005736dc22f93e8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:13:53 +0000 Subject: [PATCH 068/130] eclass/toolchain: Sync with Gentoo It's from Gentoo commit 5e3d413c90ed50a6f9582ee1e3817398d4a82319. --- .../portage-stable/eclass/toolchain.eclass | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 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 60769c9387..ebe427e441 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: toolchain.eclass @@ -231,7 +231,7 @@ tc_has_feature() { } if [[ ${PN} != kgcc64 && ${PN} != gcc-* ]] ; then - IUSE+=" debug +cxx +nptl" TC_FEATURES+=( nptl ) + IUSE+=" debug +cxx" IUSE+=" +fortran" TC_FEATURES+=( fortran ) IUSE+=" doc hardened multilib objc" IUSE+=" pgo" @@ -253,8 +253,7 @@ if [[ ${PN} != kgcc64 && ${PN} != gcc-* ]] ; then IUSE+=" ada" IUSE+=" vtv" IUSE+=" jit" - tc_version_is_between 5.0 9 && IUSE+=" mpx" - IUSE+=" +pie +ssp +pch" + IUSE+=" +pie +ssp pch" IUSE+=" systemtap" TC_FEATURES+=( systemtap ) @@ -303,7 +302,7 @@ if tc_has_feature graphite ; then fi BDEPEND=" - >=sys-devel/bison-1.875 + app-alternatives/yacc >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( @@ -338,7 +337,7 @@ if tc_has_feature zstd ; then fi if tc_has_feature valgrind ; then - BDEPEND+=" valgrind? ( dev-util/valgrind )" + BDEPEND+=" valgrind? ( dev-debug/valgrind )" fi # TODO: Add a pkg_setup & pkg_pretend check for whether the active compiler @@ -1239,14 +1238,6 @@ toolchain_src_configure() { confgcc+=( $(use_enable cet) ) fi - if in_iuse cilk ; then - confgcc+=( $(use_enable cilk libcilkrts) ) - fi - - if in_iuse mpx ; then - confgcc+=( $(use_enable mpx libmpx) ) - fi - if in_iuse systemtap ; then confgcc+=( $(use_enable systemtap) ) fi @@ -2002,8 +1993,6 @@ toolchain_src_install() { # libgfortran.la: gfortran itself handles linkage correctly in the # dynamic & static case (libgfortran.spec). bug #573302 # libgfortranbegin.la: Same as above, and it's an internal lib. - # libmpx.la: gcc itself handles linkage correctly (libmpx.spec). - # libmpxwrappers.la: See above. # libitm.la: gcc itself handles linkage correctly (libitm.spec). # libvtv.la: gcc itself handles linkage correctly. # lib*san.la: Sanitizer linkage is handled internally by gcc, and they @@ -2020,8 +2009,6 @@ toolchain_src_install() { -name 'libgomp-plugin-*.la' -o \ -name libgfortran.la -o \ -name libgfortranbegin.la -o \ - -name libmpx.la -o \ - -name libmpxwrappers.la -o \ -name libitm.la -o \ -name libvtv.la -o \ -name 'lib*san.la' \ From 3333e6892be4b96f526e5b7c134238aab3d5033a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:01 +0000 Subject: [PATCH 069/130] eclass/verify-sig: Sync with Gentoo It's from Gentoo commit 0611129171a7f43be5e554c3ace3880c981aea92. --- .../portage-stable/eclass/verify-sig.eclass | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/verify-sig.eclass b/sdk_container/src/third_party/portage-stable/eclass/verify-sig.eclass index d5f7166953..b74ed78290 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/verify-sig.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/verify-sig.eclass @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: verify-sig.eclass @@ -68,7 +68,7 @@ case ${VERIFY_SIG_METHOD} in BDEPEND=" verify-sig? ( app-crypt/gnupg - >=app-portage/gemato-16 + >=app-portage/gemato-20 ) " ;; @@ -159,16 +159,10 @@ verify-sig_verify_detached() { # gpg can't handle very long TMPDIR # https://bugs.gentoo.org/854492 local -x TMPDIR=/tmp - if has_version ">=app-portage/gemato-20"; then - gemato openpgp-verify-detached -K "${key}" \ - "${extra_args[@]}" \ - "${sig}" "${file}" || - die "PGP signature verification failed" - else - gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \ - gpg --verify "${sig}" "${file}" || - die "PGP signature verification failed" - fi + gemato openpgp-verify-detached -K "${key}" \ + "${extra_args[@]}" --no-require-all-good \ + "${sig}" "${file}" || + die "PGP signature verification failed" ;; signify) signify -V -p "${key}" -m "${file}" -x "${sig}" || From 4981fd27be7837a058cfe139d97d9b2b30d1d15b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:18 +0000 Subject: [PATCH 070/130] licenses: Sync with Gentoo It's from Gentoo commit 94d2ae67403ced107799c1b93922bfb9c9a5f4ae. --- .../portage-stable/licenses/Albert-1.0 | 21 ++++++++++++++ .../portage-stable/licenses/BSD-2-with-views | 28 +++++++++++++++++++ .../portage-stable/licenses/NVIDIA-NVLM | 28 +++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/licenses/Albert-1.0 create mode 100644 sdk_container/src/third_party/portage-stable/licenses/BSD-2-with-views create mode 100644 sdk_container/src/third_party/portage-stable/licenses/NVIDIA-NVLM diff --git a/sdk_container/src/third_party/portage-stable/licenses/Albert-1.0 b/sdk_container/src/third_party/portage-stable/licenses/Albert-1.0 new file mode 100644 index 0000000000..3b71f45815 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/licenses/Albert-1.0 @@ -0,0 +1,21 @@ +Copyright 2021 Manuel Schneider +Albert license v1.0 + +Albert is freeware, i.e. proprietary and source available. You may redistribute compiled packages with an explicit written permission. You are permitted to use the code or prebuilt packages for your personal usage, provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Binary distribution is explicitly permitted for the following distributions/platforms: + +- Arch and its derivates +- Debian and its derivates +- Fedora and its derivates +- FreeBSD and its derivates +- Gentoo and its derivates +- Mandriva and its derivates +- Slackware and its derivates +- openSUSE and its derivates diff --git a/sdk_container/src/third_party/portage-stable/licenses/BSD-2-with-views b/sdk_container/src/third_party/portage-stable/licenses/BSD-2-with-views new file mode 100644 index 0000000000..ffb303569e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/licenses/BSD-2-with-views @@ -0,0 +1,28 @@ +Copyright (c) , +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation are +those of the authors and should not be interpreted as representing official +policies, either expressed or implied, of the copyright holders or +contributors. diff --git a/sdk_container/src/third_party/portage-stable/licenses/NVIDIA-NVLM b/sdk_container/src/third_party/portage-stable/licenses/NVIDIA-NVLM new file mode 100644 index 0000000000..6dba958675 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/licenses/NVIDIA-NVLM @@ -0,0 +1,28 @@ + * This source code is subject to NVIDIA ownership rights under U.S. and + * international Copyright laws. Users and possessors of this source code + * are hereby granted a nonexclusive, royalty-free license to use this code + * in individual and commercial software. + * + * NVIDIA MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE + * CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR + * IMPLIED WARRANTY OF ANY KIND. NVIDIA DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE. + * IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL, + * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE + * OR PERFORMANCE OF THIS SOURCE CODE. + * + * U.S. Government End Users. This source code is a "commercial item" as + * that term is defined at 48 C.F.R. 2.101 (OCT 1995), consisting of + * "commercial computer software" and "commercial computer software + * documentation" as such terms are used in 48 C.F.R. 12.212 (SEPT 1995) + * and is provided to the U.S. Government only as a commercial end item. + * Consistent with 48 C.F.R.12.212 and 48 C.F.R. 227.7202-1 through + * 227.7202-4 (JUNE 1995), all U.S. Government End Users acquire the + * source code with only those rights set forth herein. + * + * Any use of this source code in individual and commercial software must + * include, in the user documentation and internal comments to the code, + * the above Disclaimer and U.S. Government End Users Notice. From 75b43bd66eb2db86929ef62b9957cba10a4ba9fe Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:19 +0000 Subject: [PATCH 071/130] net-analyzer/nmap: Sync with Gentoo It's from Gentoo commit 1dca374f26b6217b45669668952489049c7a42c3. --- .../net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch index 7a17ce11bb..bf6affb516 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch @@ -1,3 +1,5 @@ +https://github.com/nmap/nmap/pull/2763 +https://bugs.gentoo.org/920712 --- a/libdnet-stripped/config/acinclude.m4 +++ b/libdnet-stripped/config/acinclude.m4 @@ -201,6 +201,8 @@ From 8973529cfa08dc7811fdf74b422fc4800eec711f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:19 +0000 Subject: [PATCH 072/130] net-dns/c-ares: Sync with Gentoo It's from Gentoo commit 8838f30df50cbd5d3cd3da2eb9f39a9a399b4cdd. --- .../portage-stable/net-dns/c-ares/Manifest | 2 + .../net-dns/c-ares/c-ares-1.25.0.ebuild | 92 +++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.25.0.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 9fc3d7ba84..fe03ef58ef 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 @@ -4,3 +4,5 @@ DIST c-ares-1.21.0.tar.gz 1623742 BLAKE2B 708933603dfc6c0286e798b3244eb9d8bce500 DIST c-ares-1.21.0.tar.gz.asc 488 BLAKE2B b1985393dfc147abe729b5622c4c92585072173a169947caf1a9521d341dac2119e34691b96e31716df66a251dbba3a5284cddd4c47af0d0bd91e20576d5671e SHA512 0e75e51ebf97ec4ed0880811ddb60f741ea190c2e63011aad9a4233fe4e2481d0c660d401a5cf596fe257930365a366082c2b5faa34bb7b346d147cfc51392ff DIST c-ares-1.24.0.tar.gz 1368749 BLAKE2B aae99e1b5715ae4c68b84e3ceedf3e9758cf0f961bb85bfe870def2bd0342ac26d71a3a784708050c7a339360962567031e83c6b9a61a163ecaba0def6ceb24d SHA512 3701853e263de94daf19734185ad913848c19b825e0738926b418a54b0628ee1ac95a49ebfaa2ddf3eed74a7ef209e1a0a8f573df3e507ef1f11fcc53fc5eb68 DIST c-ares-1.24.0.tar.gz.asc 488 BLAKE2B 965dc1ec04aae5ec4fb5e3cee6dfe99c102112d12498f841377d901e87d8b13e17a48ba8393054849206a21333173bd3ab1d7c61cf76b6c7415f5bf99a7ada1c SHA512 dda1b8d3e715b5ba117542cab31826faf821061ea6ceefa77c0452f1d17d0c84a0cc5891722eb8e7f54da087c352409197d1e1a06420035a62c391e8e93cb8dd +DIST c-ares-1.25.0.tar.gz 1264129 BLAKE2B a4f4b493e1331ade27504238c3e520e1ffaa525baf99442c88de3aeda1eb06a12ec804a5f0f699fb8acd469ccd2b3d08f5c32b4d01d50cfdc31097665087fce9 SHA512 f73ffc45c17f1e952ea5fae8a1d9e1508427f21c821ff470ff0b728cc4a1e21d1274f95d9192c22f704bc7e0f58a633608cfdc1704dfe8950902fdfc3dfa2e1c +DIST c-ares-1.25.0.tar.gz.asc 488 BLAKE2B 45b07fc1ef14452b8a4fda63f134e389b66c120ccd8de3d48ccc5659c481db1796339a1968db406cf9b3da1a9c5aa81ccf538bc0546bb6c4babbe7de9c14f576 SHA512 9cf2dcd80807b54cd7fa6871283863384a4b6b10e0ef9c287bb4969a9169b7f12180a15c5fa756770c5ba01558ef48615aaaaefa546d19b3496e3cbe0454346b diff --git a/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.25.0.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.25.0.ebuild new file mode 100644 index 0000000000..905fa532a8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.25.0.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/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 ) +" + +# ISC for lib/{bitncmp.c,inet_ntop.c,inet_net_pton.c} (bug #912405) +LICENSE="MIT ISC" +# 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=" + test? ( dev-cpp/gtest ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/ares_build.h +) + +A__QA_CONFIG_IMPL_DECL_SKIP=( + # Checking for obsolete headers + malloc + calloc + free + + # Non-existent on Linux + closesocket + CloseSocket + ioctlsocket + bitncmp + ConvertInterfaceIndexToLuid + ConvertInterfaceLuidToNameA +) + +multilib_src_configure() { + local myeconfargs=( + --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* + *VerifySocketFunctionCallback* + # Seems flaky, even run manually + # https://github.com/c-ares/c-ares/commit/9e542a8839f81c990bb0dff14beeaf9aa6bcc18d + *MockUDPMaxQueriesTest.GetHostByNameParallelLookups* + ) + + # 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 88ee15823071b831bfe4d7447cfbca1892d388b7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:20 +0000 Subject: [PATCH 073/130] net-firewall/ipset: Sync with Gentoo It's from Gentoo commit cc19d7a44d285d65018e7e397cb4bdef6f5d17f8. --- .../net-firewall/ipset/files/ipset.confd | 16 --- .../net-firewall/ipset/files/ipset.initd-r4 | 94 -------------- .../net-firewall/ipset/files/ipset.systemd | 15 --- .../net-firewall/ipset/ipset-7.17.ebuild | 119 ------------------ 4 files changed, 244 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.confd delete mode 100644 sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.initd-r4 delete mode 100644 sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.systemd delete mode 100644 sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.17.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.confd b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.confd deleted file mode 100644 index 9fe42e9c75..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.confd +++ /dev/null @@ -1,16 +0,0 @@ -# /etc/conf.d/ipset - -# Location in which ipset initscript will save set rules on -# service shutdown -IPSET_SAVE="/var/lib/ipset/rules-save" - -# Save state on stopping ipset -SAVE_ON_STOP="yes" - -# If you need to log iptables messages as soon as iptables starts, -# AND your logger does NOT depend on the network, then you may wish -# to uncomment the next line. -# If your logger depends on the network, and you uncomment this line -# you will create an unresolvable circular dependency during startup. -# After commenting or uncommenting this line, you must run 'rc-update -u'. -#rc_use="logger" diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.initd-r4 b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.initd-r4 deleted file mode 100644 index 32ab581d8c..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.initd-r4 +++ /dev/null @@ -1,94 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="save" -extra_started_commands="reload" - -IPSET_SAVE=${IPSET_SAVE:-/var/lib/ipset/rules-save} - -depend() { - before iptables ip6tables -} - -checkconfig() { - if [ ! -f "${IPSET_SAVE}" ] ; then - eerror "Not starting ${SVCNAME}. First create some rules then run:" - eerror "/etc/init.d/${SVCNAME} save" - return 1 - fi - return 0 -} - -start() { - checkconfig || return 1 - ebegin "Loading ipset session" - ipset restore < "${IPSET_SAVE}" - eend $? -} - -stop() { - # check if there are any references to current sets - - if ! ipset list | gawk ' - ($1 == "References:") { refcnt += $2 } - ($1 == "Type:" && $2 == "list:set") { set = 1 } - (scan) { if ($0 != "") setcnt++; else { scan = 0; set = 0 } } - (set && $1 == "Members:") {scan = 1} - END { if ((refcnt - setcnt) > 0) exit 1 } - '; then - eerror "ipset is in use, can't stop" - return 1 - fi - - if [ "${SAVE_ON_STOP}" = "yes" ] ; then - save || return 1 - fi - - ebegin "Removing kernel IP sets" - ipset flush - ipset destroy - eend $? -} - -reload() { - ebegin "Reloading ipsets" - - # Loading sets from a save file is only additive (there is no - # automatic flushing or replacing). And, we can not remove sets - # that are currently used in existing iptables rules. - # - # Instead, we create new temp sets for any set that is already - # in use, and then atomically swap them into place. - # - # XXX: This does not clean out previously used ipsets that are - # not in the new saved policy--it can't, because they may still - # be referenced in the current iptables rules. - - # Build a list of all currently used sets (if any). - running_ipset_list=$(ipset save | gawk '/^create/{printf "%s ",$2}') - running_ipset_list="${running_ipset_list% }" - # Build a regular expression that matches those set names. - running_ipset_list_regex="$(echo "$running_ipset_list" | tr -s ' ' '|' )" - - # Load up sets from the save file, but rename any set that already - # exists to a temporary name that we will swap later. - if ! cat ${IPSET_SAVE} | sed -r "s/^(create|add) (${running_ipset_list_regex}) /\1 \2_atomic_temp /" | ipset restore ; then - eend $? "Failed to load new ipsets" - fi - - # Now for every set name that currently exists, atomically swap it - # with the temporary new one we created, and then destroy the old set. - for ipset_name in ${running_ipset_list} ; do - ipset swap ${ipset_name} ${ipset_name}_atomic_temp || eend $? "Failed to swap in new ipset $ipset_name" - ipset destroy ${ipset_name}_atomic_temp || eend $? "Failed to delete obsolete ipset ${ipset_name}_atomic_temp" - done - eend 0 -} - -save() { - ebegin "Saving ipset session" - checkpath --file --mode 0600 "${IPSET_SAVE}" - ipset save > "${IPSET_SAVE}" - eend $? -} diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.systemd b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.systemd deleted file mode 100644 index f7a5eb510a..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset.systemd +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=ipset service -Before=network-pre.target iptables.service ip6tables.service firewalld.service -Wants=network-pre.target -ConditionFileNotEmpty=/var/lib/ipset/rules-save - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/sbin/ipset -exist -file /var/lib/ipset/rules-save restore -ExecReload=/usr/sbin/ipset -exist -file /var/lib/ipset/rules-save restore -ExecStop=/usr/sbin/ipset -file /var/lib/ipset/rules-save save - -[Install] -WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.17.ebuild b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.17.ebuild deleted file mode 100644 index acb6795887..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.17.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MODULES_OPTIONAL_USE=modules -inherit autotools bash-completion-r1 linux-info linux-mod systemd - -DESCRIPTION="IPset tool for iptables, successor to ippool" -HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/" -SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - -RDEPEND=" - >=net-firewall/iptables-1.4.7 - net-libs/libmnl:= -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( ChangeLog INSTALL README UPGRADE ) - -PATCHES=( - "${FILESDIR}"/${PN}-7.16-bashism.patch -) - -# configurable from outside, e.g. /etc/portage/make.conf -IP_NF_SET_MAX=${IP_NF_SET_MAX:-256} - -BUILD_TARGETS="modules" -MODULE_NAMES_ARG="kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/ipset" -MODULE_NAMES="xt_set(kernel/net/netfilter/ipset/:${S}/kernel/net/netfilter/)" -MODULE_NAMES+=" em_ipset(kernel/net/sched/:${S}/kernel/net/sched/)" -for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set}; do - MODULE_NAMES+=" ${i}(${MODULE_NAMES_ARG})" -done - -pkg_setup() { - get_version - CONFIG_CHECK="NETFILTER" - ERROR_NETFILTER="ipset requires NETFILTER support in your kernel." - CONFIG_CHECK+=" NETFILTER_NETLINK" - ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK support in your kernel." - # It does still build without NET_NS, but it may be needed in future. - #CONFIG_CHECK="${CONFIG_CHECK} NET_NS" - #ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel." - CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN" - ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)" - - build_modules=0 - if use modules; then - if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then - if linux_chkconfig_present "IP_NF_SET" || \ - linux_chkconfig_present "IP_SET"; then #274577 - eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel." - eerror "Please either build ipset with modules USE flag disabled" - eerror "or rebuild kernel without IP_SET support and make sure" - eerror "there is NO kernel ip_set* modules in /lib/modules//... ." - die "USE=modules and in-kernel ipset support detected." - else - einfo "Modular kernel detected. Gonna build kernel modules..." - build_modules=1 - fi - else - eerror "Nonmodular kernel detected, but USE=modules. Either build" - eerror "modular kernel (without IP_SET) or disable USE=modules" - die "Nonmodular kernel detected, will not build kernel modules" - fi - fi - [[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - export bashcompdir="$(get_bashcompdir)" - - econf \ - --enable-bashcompl \ - $(use_with modules kmod) \ - --with-maxsets=${IP_NF_SET_MAX} \ - --with-ksource="${KV_DIR}" \ - --with-kbuild="${KV_OUT_DIR}" -} - -src_compile() { - einfo "Building userspace" - emake - - if [[ ${build_modules} -eq 1 ]]; then - einfo "Building kernel modules" - set_arch_to_kernel - emake modules - fi -} - -src_install() { - einfo "Installing userspace" - default - - find "${ED}" -name '*.la' -delete || die - - newinitd "${FILESDIR}"/ipset.initd-r4 ${PN} - newconfd "${FILESDIR}"/ipset.confd ${PN} - systemd_newunit "${FILESDIR}"/ipset.systemd-r1 ${PN}.service - keepdir /var/lib/ipset - - if [[ ${build_modules} -eq 1 ]]; then - einfo "Installing kernel modules" - linux-mod_src_install - fi -} From b9deb58635c9ace76882458dfc6f3eb8963b7772 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:27 +0000 Subject: [PATCH 074/130] net-libs/libnetfilter_queue: Sync with Gentoo It's from Gentoo commit f7fdfdaeec3764929686064a6054c38a6b2d7788. --- .../libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild index 9da571fff5..3ac276b1b9 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,7 +23,7 @@ DEPEND=" ${RDEPEND} " BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-netfilter ) " From 1f1a92a986ed1e3c924b6f78b7e515cf3840b3a3 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:28 +0000 Subject: [PATCH 075/130] net-libs/libslirp: Sync with Gentoo It's from Gentoo commit 5e3d413c90ed50a6f9582ee1e3817398d4a82319. --- .../portage-stable/net-libs/libslirp/libslirp-4.7.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libslirp/libslirp-4.7.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libslirp/libslirp-4.7.0.ebuild index 0810b697f5..d17d7b4770 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/libslirp/libslirp-4.7.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/libslirp/libslirp-4.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ RDEPEND="dev-libs/glib:=" # Valgrind usage is automagic but it's not so bad given it's a header-only dep. DEPEND=" ${RDEPEND} - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " S=${WORKDIR}/${MY_P} From a4559af07543355c8518896fe1d58aa97ad0cea7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:31 +0000 Subject: [PATCH 076/130] net-misc/curl: Sync with Gentoo It's from Gentoo commit c2acfc873a430b3d5faa5d266667743416a49939. --- .../portage-stable/net-misc/curl/Manifest | 2 - ...l-8.3.0-r2.ebuild => curl-8.5.0-r1.ebuild} | 34 +- .../net-misc/curl/curl-8.5.0-r2.ebuild | 367 ++++++++++++++++++ .../net-misc/curl/curl-9999.ebuild | 3 +- .../files/curl-8.3.0-CVE-2023-38545.patch | 136 ------- .../files/curl-8.3.0-CVE-2023-38546.patch | 131 ------- .../files/curl-8.3.0-tests-arm-musl.patch | 115 ------ .../files/curl-8.5.0-ipv6-configure-c99.patch | 31 ++ ...8.5.0-mpd-stream-http-adjust_pollset.patch | 69 ++++ 9 files changed, 487 insertions(+), 401 deletions(-) rename sdk_container/src/third_party/portage-stable/net-misc/curl/{curl-8.3.0-r2.ebuild => curl-8.5.0-r1.ebuild} (89%) create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.3.0-CVE-2023-38545.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.3.0-CVE-2023-38546.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.3.0-tests-arm-musl.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.5.0-ipv6-configure-c99.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.5.0-mpd-stream-http-adjust_pollset.patch 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 cf734b415f..7a6c28ff0f 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 @@ -1,5 +1,3 @@ -DIST curl-8.3.0.tar.xz 2641764 BLAKE2B 6875b20e27ed86f9b6ab256210d85e9fb3b39645e8be710b2e6fe29fba40220f870e06bc21e8a92244670fed0a08c7716e4806a267ede49c4ed6d66e03f5fcd4 SHA512 6404b4c74fe1185cb482631ca3a143996cb7298d0d8a76bfafd7696e7729c00559999a069bdba782dee3f3eb273fb678a4438cb27d3deca54022878cdff83a51 -DIST curl-8.3.0.tar.xz.asc 488 BLAKE2B ef5a749e579710d45db9f73da0cbcb58d77a9dfe73be622536496997fa792fe5cbd0331a31f01e21cbdb36c6384dca44baa647c9f3d20effabb5bfc275b1b491 SHA512 b7d45722640ac50181b20a6d663168ec6eec6691c5604ddfe9c7177f07da598cb2de688c631043dc428c311774d781ccd16bd1e2fb4f038be651e3bee383aec4 DIST curl-8.4.0.tar.xz 2658376 BLAKE2B ea5ebecc3c1aeac3ae8fd0cf7d8ff3298149b9c4c556fb85ed8d9310e3613228eb6fca133b0dfb9268988f93d694779fab8d53510cfa5710c1320bb6638f05eb SHA512 7027dbf3b759b39d6ec9c4da58fadd254e84bb93bff599541b3bc3135bad4c2955c6237d7ddd60973f9f1a6948bc32d7e312985fb50658bc958b9f22fee74f2b DIST curl-8.4.0.tar.xz.asc 488 BLAKE2B 0fd4ea46a0942b9bc440e91e8f9323bba6d0eb02fbc87c227004c90e5be14cc644446bc235ab67f857b617975cdeada6ce38a647da9e0bd783e57d58f354cdb4 SHA512 b8b7a5b76be816e7b1552354f267f335fdc608cdadbd2c40ab44faf6450c6bbd2853b6de5c2746a1292aad33a8ee1c367380d32bb1a8282540b38c3b985a320e DIST curl-8.5.0.tar.xz 2658520 BLAKE2B cfd591f9703b9c63712dbe74494b05a80ce5a4fc4f8fc0fbf57058578eed5f33d71277f688d5d9f409bcd82e3a4cacaa5615a44f2a7c554559c6be7dd5188893 SHA512 acffa2cf61d9b8e4188575a1b40227da8d722df2e5fe8bb82a222b4eb2fd64bf8aebd90852ce050c79fb5e517d5cee2546bf7de92ede1dd394263e231cb741a3 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.3.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0-r1.ebuild similarity index 89% rename from sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.3.0-r2.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0-r1.ebuild index 350d4acf5b..8c9e7ec34d 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.3.0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,15 +17,15 @@ else 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" + 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 curl ISC test? ( BSD-4 )" SLOT="0" -IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" +IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3" +IUSE+=" +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_openssl curl_ssl_rustls" -IUSE+=" nghttp3" RESTRICT="!test? ( test )" # Only one default ssl provider can be enabled @@ -44,34 +44,37 @@ REQUIRED_USE=" curl_ssl_mbedtls? ( mbedtls ) curl_ssl_openssl? ( openssl ) curl_ssl_rustls? ( rustls ) - nghttp3? ( !openssl ) + nghttp3? ( + !openssl + alt-svc ) " # cURL's docs and CI/CD are great resources for confirming supported versions # particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.: -# - https://github.com/curl/curl/blob/master/docs/HTTP3.md -# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml +# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions) +# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly) +# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2) # However 'supported' vs 'works' are two entirely different things; be sane but # don't be afraid to require a later version. RDEPEND=" - sys-libs/zlib[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] ) idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] ) + ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) nghttp3? ( >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}] >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] ) rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) ssl? ( gnutls? ( app-misc/ca-certificates - net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}] + >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}] dev-libs/nettle:=[${MULTILIB_USEDEP}] ) mbedtls? ( @@ -79,7 +82,7 @@ RDEPEND=" net-libs/mbedtls:=[${MULTILIB_USEDEP}] ) openssl? ( - dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] ) rustls? ( net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] @@ -125,9 +128,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}"/${PN}-prefix.patch "${FILESDIR}"/${PN}-respect-cflags-3.patch - "${FILESDIR}"/${P}-tests-arm-musl.patch - "${FILESDIR}"/${P}-CVE-2023-38545.patch - "${FILESDIR}"/${P}-CVE-2023-38546.patch + "${FILESDIR}"/${P}-ipv6-configure-c99.patch ) src_prepare() { @@ -344,7 +345,8 @@ multilib_src_test() { # this ends up breaking when nproc is huge (like -j80). # 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 -j$((2*$(makeopts_jobs))) !241 !1083" + # Required deps for 1477 are not included in the release tarball for 8.5.0 + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083 !1477" } multilib_src_install() { diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0-r2.ebuild new file mode 100644 index 0000000000..03cc7f61eb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0-r2.ebuild @@ -0,0 +1,367 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc +inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs 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="BSD curl ISC test? ( BSD-4 )" +SLOT="0" +IUSE="+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3" +IUSE+=" +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_openssl curl_ssl_rustls" +RESTRICT="!test? ( test )" + +# Only one default ssl provider can be enabled +# The default ssl provider needs its USE satisfied +# nghttp3 = https://bugs.gentoo.org/912029 +REQUIRED_USE=" + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_openssl + curl_ssl_rustls + ) + ) + curl_ssl_gnutls? ( gnutls ) + curl_ssl_mbedtls? ( mbedtls ) + curl_ssl_openssl? ( openssl ) + curl_ssl_rustls? ( rustls ) + nghttp3? ( + !openssl + alt-svc ) +" + +# cURL's docs and CI/CD are great resources for confirming supported versions +# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.: +# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions) +# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly) +# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml (CI/CD for TCP/2) +# However 'supported' vs 'works' are two entirely different things; be sane but +# don't be afraid to require a later version. + +RDEPEND=" + >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] + adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] ) + idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] ) + nghttp3? ( + >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}] + >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] + ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + app-misc/ca-certificates + >=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:=[${MULTILIB_USEDEP}] + ) + mbedtls? ( + app-misc/ca-certificates + net-libs/mbedtls:=[${MULTILIB_USEDEP}] + ) + openssl? ( + >=dev-libs/openssl-0.9.7:=[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-1.15.0:=[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 + _fseeki64 +) + +PATCHES=( + "${FILESDIR}"/${PN}-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch + "${FILESDIR}"/${P}-ipv6-configure-c99.patch + "${FILESDIR}"/${P}-mpd-stream-http-adjust_pollset.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-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 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_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." + die "Please file a bug, hit impossible condition w/ USE=ssl handling." + 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-basic-auth + --enable-bearer-auth + --enable-digest-auth + --enable-kerberos-auth + --enable-negotiate-auth + --enable-aws + --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) + --with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d + $(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) + --with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions + ) + + if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then + myconf+=( + --with-test-nghttpx="${BROOT}/usr/bin/nghttpx" + ) + fi + + if [[ ${CHOST} == *mingw* ]] ; then + myconf+=( + --disable-pthreads + ) + 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_compile() { + default + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts + fi +} + +# 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. + # Upstream recommend 7*nproc as a starting point for parallel tests, but + # this ends up breaking when nproc is huge (like -j80). + # The network sandbox causes tests 241 and 1083 to fail; these are typically skipped + # as most gentoo users don't have an 'ip6-localhost' + # Required deps for 1477 are not included in the release tarball for 8.5.0 + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083 !1477" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi; then + # Shell completions + ! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install + fi +} + +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 index 7d87477bc1..5127f29241 100644 --- 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -123,6 +123,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( IoctlSocket mach_absolute_time setmode + _fseeki64 ) PATCHES=( diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.3.0-CVE-2023-38545.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.3.0-CVE-2023-38545.patch deleted file mode 100644 index 04603a8c01..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.3.0-CVE-2023-38545.patch +++ /dev/null @@ -1,136 +0,0 @@ -https://bugs.gentoo.org/915195 - -From 1e1f915b73ab0895a68348ad1f96a5283a44ffd7 Mon Sep 17 00:00:00 2001 -From: Jay Satiro -Date: Mon, 9 Oct 2023 17:45:07 -0400 -Subject: [PATCH] socks: return error if hostname too long for remote resolve - -Prior to this change the state machine attempted to change the remote -resolve to a local resolve if the hostname was longer than 255 -characters. Unfortunately that did not work as intended and caused a -security issue. - -This patch applies to curl versions 8.2.0 - 8.3.0. Other versions -that are affected take a different patch. Refer to the CVE advisory -for more information. - -Bug: https://curl.se/docs/CVE-2023-38545.html ---- - lib/socks.c | 8 +++---- - tests/data/Makefile.inc | 2 +- - tests/data/test728 | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 69 insertions(+), 5 deletions(-) - create mode 100644 tests/data/test728 - -diff --git a/lib/socks.c b/lib/socks.c -index 25a3578..3d41c93 100644 ---- a/lib/socks.c -+++ b/lib/socks.c -@@ -588,9 +588,9 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf, - - /* RFC1928 chapter 5 specifies max 255 chars for domain name in packet */ - if(!socks5_resolve_local && hostname_len > 255) { -- infof(data, "SOCKS5: server resolving disabled for hostnames of " -- "length > 255 [actual len=%zu]", hostname_len); -- socks5_resolve_local = TRUE; -+ failf(data, "SOCKS5: the destination hostname is too long to be " -+ "resolved remotely by the proxy."); -+ return CURLPX_LONG_HOSTNAME; - } - - if(auth & ~(CURLAUTH_BASIC | CURLAUTH_GSSAPI)) -@@ -904,7 +904,7 @@ CONNECT_RESOLVE_REMOTE: - } - else { - socksreq[len++] = 3; -- socksreq[len++] = (char) hostname_len; /* one byte address length */ -+ socksreq[len++] = (unsigned char) hostname_len; /* one byte length */ - memcpy(&socksreq[len], sx->hostname, hostname_len); /* w/o NULL */ - len += hostname_len; - } -diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc -index 8ee1394..3e2094e 100644 ---- a/tests/data/Makefile.inc -+++ b/tests/data/Makefile.inc -@@ -100,7 +100,7 @@ test679 test680 test681 test682 test683 test684 test685 test686 \ - \ - test700 test701 test702 test703 test704 test705 test706 test707 test708 \ - test709 test710 test711 test712 test713 test714 test715 test716 test717 \ --test718 test719 test720 test721 \ -+test718 test719 test720 test721 test728 \ - \ - test799 test800 test801 test802 test803 test804 test805 test806 test807 \ - test808 test809 test810 test811 test812 test813 test814 test815 test816 \ -diff --git a/tests/data/test728 b/tests/data/test728 -new file mode 100644 -index 0000000..05bcf28 ---- /dev/null -+++ b/tests/data/test728 -@@ -0,0 +1,64 @@ -+ -+ -+ -+HTTP -+HTTP GET -+SOCKS5 -+SOCKS5h -+followlocation -+ -+ -+ -+# -+# Server-side -+ -+# The hostname in this redirect is 256 characters and too long (> 255) for -+# SOCKS5 remote resolve. curl must return error CURLE_PROXY in this case. -+ -+HTTP/1.1 301 Moved Permanently -+Location: http://AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/ -+Content-Length: 0 -+Connection: close -+ -+ -+ -+ -+# -+# Client-side -+ -+ -+proxy -+ -+ -+http -+socks5 -+ -+ -+SOCKS5h with HTTP redirect to hostname too long -+ -+ -+--no-progress-meter --location --proxy socks5h://%HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER -+ -+ -+ -+# -+# Verify data after the test has been "shot" -+ -+ -+GET /%TESTNUMBER HTTP/1.1 -+Host: %HOSTIP:%HTTPPORT -+User-Agent: curl/%VERSION -+Accept: */* -+ -+ -+ -+97 -+ -+# the error message is verified because error code CURLE_PROXY (97) may be -+# returned for any number of reasons and we need to make sure it is -+# specifically for the reason below so that we know the check is working. -+ -+curl: (97) SOCKS5: the destination hostname is too long to be resolved remotely by the proxy. -+ -+ -+ --- -2.7.4 - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.3.0-CVE-2023-38546.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.3.0-CVE-2023-38546.patch deleted file mode 100644 index 615ab26cb2..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.3.0-CVE-2023-38546.patch +++ /dev/null @@ -1,131 +0,0 @@ -https://bugs.gentoo.org/915195 -https://github.com/curl/curl/commit/61275672b46d9abb3285740467b882e22ed75da8 - -From 61275672b46d9abb3285740467b882e22ed75da8 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Thu, 14 Sep 2023 23:28:32 +0200 -Subject: [PATCH] cookie: remove unnecessary struct fields - -Plus: reduce the hash table size from 256 to 63. It seems unlikely to -make much of a speed difference for most use cases but saves 1.5KB of -data per instance. - -Closes #11862 ---- - lib/cookie.c | 13 +------------ - lib/cookie.h | 13 ++++--------- - lib/easy.c | 4 +--- - 3 files changed, 6 insertions(+), 24 deletions(-) - -diff --git a/lib/cookie.c b/lib/cookie.c -index 4345a84c6fd9d..e39c89a94a960 100644 ---- a/lib/cookie.c -+++ b/lib/cookie.c -@@ -119,7 +119,6 @@ static void freecookie(struct Cookie *co) - free(co->name); - free(co->value); - free(co->maxage); -- free(co->version); - free(co); - } - -@@ -718,11 +717,7 @@ Curl_cookie_add(struct Curl_easy *data, - } - } - else if((nlen == 7) && strncasecompare("version", namep, 7)) { -- strstore(&co->version, valuep, vlen); -- if(!co->version) { -- badcookie = TRUE; -- break; -- } -+ /* just ignore */ - } - else if((nlen == 7) && strncasecompare("max-age", namep, 7)) { - /* -@@ -1160,7 +1155,6 @@ Curl_cookie_add(struct Curl_easy *data, - free(clist->path); - free(clist->spath); - free(clist->expirestr); -- free(clist->version); - free(clist->maxage); - - *clist = *co; /* then store all the new data */ -@@ -1224,9 +1218,6 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data, - c = calloc(1, sizeof(struct CookieInfo)); - if(!c) - return NULL; /* failed to get memory */ -- c->filename = strdup(file?file:"none"); /* copy the name just in case */ -- if(!c->filename) -- goto fail; /* failed to get memory */ - /* - * Initialize the next_expiration time to signal that we don't have enough - * information yet. -@@ -1378,7 +1369,6 @@ static struct Cookie *dup_cookie(struct Cookie *src) - CLONE(name); - CLONE(value); - CLONE(maxage); -- CLONE(version); - d->expires = src->expires; - d->tailmatch = src->tailmatch; - d->secure = src->secure; -@@ -1595,7 +1585,6 @@ void Curl_cookie_cleanup(struct CookieInfo *c) - { - if(c) { - unsigned int i; -- free(c->filename); - for(i = 0; i < COOKIE_HASH_SIZE; i++) - Curl_cookie_freelist(c->cookies[i]); - free(c); /* free the base struct as well */ -diff --git a/lib/cookie.h b/lib/cookie.h -index b3c0063b2cfb2..41e9e7a6914e0 100644 ---- a/lib/cookie.h -+++ b/lib/cookie.h -@@ -36,11 +36,7 @@ struct Cookie { - char *domain; /* domain = */ - curl_off_t expires; /* expires = */ - char *expirestr; /* the plain text version */ -- -- /* RFC 2109 keywords. Version=1 means 2109-compliant cookie sending */ -- char *version; /* Version = */ - char *maxage; /* Max-Age = */ -- - bool tailmatch; /* whether we do tail-matching of the domain name */ - bool secure; /* whether the 'secure' keyword was used */ - bool livecookie; /* updated from a server, not a stored file */ -@@ -56,17 +52,16 @@ struct Cookie { - #define COOKIE_PREFIX__SECURE (1<<0) - #define COOKIE_PREFIX__HOST (1<<1) - --#define COOKIE_HASH_SIZE 256 -+#define COOKIE_HASH_SIZE 63 - - struct CookieInfo { - /* linked list of cookies we know of */ - struct Cookie *cookies[COOKIE_HASH_SIZE]; -- char *filename; /* file we read from/write to */ -- long numcookies; /* number of cookies in the "jar" */ -+ curl_off_t next_expiration; /* the next time at which expiration happens */ -+ int numcookies; /* number of cookies in the "jar" */ -+ int lastct; /* last creation-time used in the jar */ - bool running; /* state info, for cookie adding information */ - bool newsession; /* new session, discard session cookies on load */ -- int lastct; /* last creation-time used in the jar */ -- curl_off_t next_expiration; /* the next time at which expiration happens */ - }; - - /* The maximum sizes we accept for cookies. RFC 6265 section 6.1 says -diff --git a/lib/easy.c b/lib/easy.c -index 16bbd35251d40..03195481f9780 100644 ---- a/lib/easy.c -+++ b/lib/easy.c -@@ -925,9 +925,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data) - if(data->cookies) { - /* If cookies are enabled in the parent handle, we enable them - in the clone as well! */ -- outcurl->cookies = Curl_cookie_init(data, -- data->cookies->filename, -- outcurl->cookies, -+ outcurl->cookies = Curl_cookie_init(data, NULL, outcurl->cookies, - data->set.cookiesession); - if(!outcurl->cookies) - goto fail; diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.3.0-tests-arm-musl.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.3.0-tests-arm-musl.patch deleted file mode 100644 index e07c13a047..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.3.0-tests-arm-musl.patch +++ /dev/null @@ -1,115 +0,0 @@ -https://github.com/curl/curl/issues/11900 -https://github.com/curl/curl/commit/b226bd679a68b8bf94cbb6d58837f00251560e63 -https://github.com/curl/curl/commit/9c7165e96a3a9a2d0b7059c87c699b5ca8cdae93 - -From b226bd679a68b8bf94cbb6d58837f00251560e63 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Mon, 25 Sep 2023 13:03:26 +0200 -Subject: [PATCH] configure: sort AC_CHECK_FUNCS - -No functional changes. ---- - configure.ac | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2fc9f2f01783c..a6f9066a133a4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3583,8 +3583,10 @@ AC_CHECK_DECLS([getpwuid_r], [], [AC_DEFINE(HAVE_DECL_GETPWUID_R_MISSING, 1, "Se - #include ]]) - - --AC_CHECK_FUNCS([fnmatch \ -+AC_CHECK_FUNCS([\ -+ arc4random \ - fchmod \ -+ fnmatch \ - fork \ - geteuid \ - getpass_r \ -@@ -3604,7 +3606,6 @@ AC_CHECK_FUNCS([fnmatch \ - snprintf \ - utime \ - utimes \ -- arc4random - ],[ - ],[ - func="$ac_func" - -From 9c7165e96a3a9a2d0b7059c87c699b5ca8cdae93 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Fri, 22 Sep 2023 13:58:49 +0000 -Subject: [PATCH] lib: use wrapper for curl_mime_data fseek callback - -fseek uses long offset which does not match with curl_off_t. This leads -to undefined behavior when calling the callback and caused failure on -arm 32 bit. - -Use a wrapper to solve this and use fseeko which uses off_t instead of -long. - -Thanks to the nice people at Libera IRC #musl for helping finding this -out. - -Fixes #11882 -Fixes #11900 -Closes #11918 ---- - configure.ac | 2 ++ - lib/formdata.c | 17 +++++++++++++++-- - 3 files changed, 20 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a6f9066a133a4..5fa7c45c47430 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3584,10 +3584,12 @@ AC_CHECK_DECLS([getpwuid_r], [], [AC_DEFINE(HAVE_DECL_GETPWUID_R_MISSING, 1, "Se - - - AC_CHECK_FUNCS([\ -+ _fseeki64 \ - arc4random \ - fchmod \ - fnmatch \ - fork \ -+ fseeko \ - geteuid \ - getpass_r \ - getppid \ -diff --git a/lib/formdata.c b/lib/formdata.c -index 8984b63223cc0..f370ce6854b5f 100644 ---- a/lib/formdata.c -+++ b/lib/formdata.c -@@ -789,6 +789,20 @@ static CURLcode setname(curl_mimepart *part, const char *name, size_t len) - return res; - } - -+/* wrap call to fseeko so it matches the calling convetion of callback */ -+static int fseeko_wrapper(void *stream, curl_off_t offset, int whence) -+{ -+#if defined(HAVE_FSEEKO) -+ return fseeko(stream, (off_t)offset, whence); -+#elif defined(HAVE__FSEEKI64) -+ return _fseeki64(stream, (__int64)offset, whence); -+#else -+ if(offset > LONG_MAX) -+ return -1; -+ return fseek(stream, (long)offset, whence); -+#endif -+} -+ - /* - * Curl_getformdata() converts a linked list of "meta data" into a mime - * structure. The input list is in 'post', while the output is stored in -@@ -874,8 +888,7 @@ CURLcode Curl_getformdata(struct Curl_easy *data, - compatibility: use of "-" pseudo file name should be avoided. */ - result = curl_mime_data_cb(part, (curl_off_t) -1, - (curl_read_callback) fread, -- CURLX_FUNCTION_CAST(curl_seek_callback, -- fseek), -+ fseeko_wrapper, - NULL, (void *) stdin); - } - else - diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.5.0-ipv6-configure-c99.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.5.0-ipv6-configure-c99.patch new file mode 100644 index 0000000000..68830f8f47 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.5.0-ipv6-configure-c99.patch @@ -0,0 +1,31 @@ +https://github.com/curl/curl/commit/ae75db3527461248b0a7b1686df52200d28d83b9 + +From ae75db3527461248b0a7b1686df52200d28d83b9 Mon Sep 17 00:00:00 2001 +From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> +Date: Fri, 29 Dec 2023 05:43:33 +0000 +Subject: [PATCH] configure: fix no default int compile error in ipv6 detection + +Closes #12607 +--- a/configure.ac ++++ b/configure.ac +@@ -1655,15 +1655,12 @@ AS_HELP_STRING([--disable-ipv6],[Disable IPv6 support]), + # include + #endif + #endif +-#include /* for exit() */ +-main() ++ ++int main(void) + { + struct sockaddr_in6 s; + (void)s; +- if (socket(AF_INET6, SOCK_STREAM, 0) < 0) +- exit(1); +- else +- exit(0); ++ return socket(AF_INET6, SOCK_STREAM, 0) < 0; + } + ]]) + ], + + diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.5.0-mpd-stream-http-adjust_pollset.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.5.0-mpd-stream-http-adjust_pollset.patch new file mode 100644 index 0000000000..79a16a2cc7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-8.5.0-mpd-stream-http-adjust_pollset.patch @@ -0,0 +1,69 @@ +https://github.com/MusicPlayerDaemon/MPD/issues/1952 +https://github.com/curl/curl/issues/12632 +https://github.com/curl/curl/commit/8e2d7b9fa4264b94bd1d9838c84d16e4cd33fbea + +From 8e2d7b9fa4264b94bd1d9838c84d16e4cd33fbea Mon Sep 17 00:00:00 2001 +From: Stefan Eissing +Date: Thu, 4 Jan 2024 10:06:17 +0100 +Subject: [PATCH] http: adjust_pollset fix + +do not add a socket for POLLIN when the transfer does not want to send +(for example is paused). + +Follow-up to 47f5b1a + +Reported-by: bubbleguuum on github +Fixes #12632 +Closes #12633 +--- a/lib/cf-socket.c ++++ b/lib/cf-socket.c +@@ -1243,7 +1243,7 @@ static void cf_socket_adjust_pollset(struct Curl_cfilter *cf, + if(ctx->sock != CURL_SOCKET_BAD) { + if(!cf->connected) + Curl_pollset_set_out_only(data, ps, ctx->sock); +- else ++ else if(CURL_WANT_RECV(data)) + Curl_pollset_add_in(data, ps, ctx->sock); + CURL_TRC_CF(data, cf, "adjust_pollset -> %d socks", ps->num); + } +--- a/lib/http2.c ++++ b/lib/http2.c +@@ -2341,8 +2341,8 @@ static void cf_h2_adjust_pollset(struct Curl_cfilter *cf, + bool c_exhaust, s_exhaust; + + CF_DATA_SAVE(save, cf, data); +- c_exhaust = !nghttp2_session_get_remote_window_size(ctx->h2); +- s_exhaust = stream && stream->id >= 0 && ++ c_exhaust = want_send && !nghttp2_session_get_remote_window_size(ctx->h2); ++ s_exhaust = want_send && stream && stream->id >= 0 && + !nghttp2_session_get_stream_remote_window_size(ctx->h2, + stream->id); + want_recv = (want_recv || c_exhaust || s_exhaust); +--- a/lib/vquic/curl_ngtcp2.c ++++ b/lib/vquic/curl_ngtcp2.c +@@ -1166,9 +1166,10 @@ static void cf_ngtcp2_adjust_pollset(struct Curl_cfilter *cf, + bool c_exhaust, s_exhaust; + + CF_DATA_SAVE(save, cf, data); +- c_exhaust = !ngtcp2_conn_get_cwnd_left(ctx->qconn) || +- !ngtcp2_conn_get_max_data_left(ctx->qconn); +- s_exhaust = stream && stream->id >= 0 && stream->quic_flow_blocked; ++ c_exhaust = want_send && (!ngtcp2_conn_get_cwnd_left(ctx->qconn) || ++ !ngtcp2_conn_get_max_data_left(ctx->qconn)); ++ s_exhaust = want_send && stream && stream->id >= 0 && ++ stream->quic_flow_blocked; + want_recv = (want_recv || c_exhaust || s_exhaust); + want_send = (!s_exhaust && want_send) || + !Curl_bufq_is_empty(&ctx->q.sendbuf); +--- a/lib/vquic/curl_quiche.c ++++ b/lib/vquic/curl_quiche.c +@@ -1189,7 +1189,7 @@ static void cf_quiche_adjust_pollset(struct Curl_cfilter *cf, + + c_exhaust = FALSE; /* Have not found any call in quiche that tells + us if the connection itself is blocked */ +- s_exhaust = stream && stream->id >= 0 && ++ s_exhaust = want_send && stream && stream->id >= 0 && + (stream->quic_flow_blocked || !stream_is_writeable(cf, data)); + want_recv = (want_recv || c_exhaust || s_exhaust); + want_send = (!s_exhaust && want_send) || + From 24c865fb0fd973a05a7da700f746447b138c2b9a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:34 +0000 Subject: [PATCH 077/130] net-misc/iperf: Sync with Gentoo It's from Gentoo commit d38641adfda9ccbe85ff12c4fc28f6f0813297dd. --- .../portage-stable/net-misc/iperf/iperf-3.16.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iperf/iperf-3.16.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/iperf/iperf-3.16.ebuild index e9a1b344d9..4324d7bbd6 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/iperf/iperf-3.16.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/iperf/iperf-3.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_/} LICENSE="BSD" SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="sctp" DEPEND=" From 073ee8c240ffcb6d76549806fca4e8deaaf1da2f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:35 +0000 Subject: [PATCH 078/130] net-misc/rsync: Sync with Gentoo It's from Gentoo commit 89b65644ee5c1a71065c72c0d63efbdf97a90b9c. --- .../rsync-3.2.7-ipv6-configure-c99.patch | 32 +++ .../net-misc/rsync/rsync-3.2.7-r4.ebuild | 205 ++++++++++++++++++ 2 files changed, 237 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch b/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch new file mode 100644 index 0000000000..1b99dc6108 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/files/rsync-3.2.7-ipv6-configure-c99.patch @@ -0,0 +1,32 @@ +https://github.com/WayneD/rsync/pull/558 + +From d869bcd3850b9a80f27f5aee4d41725f39d84ea7 Mon Sep 17 00:00:00 2001 +From: Ivan Babrou +Date: Mon, 1 Jan 2024 19:31:01 -0800 +Subject: [PATCH] configure.ac: fix failing IPv6 check due to missing return + type + +Fixing this warning escalated to an error, resuting in no IPv6 support: + +``` +configure.sh:7679: checking whether to enable ipv6 +configure.sh:7718: clang -o conftest -g -O2 -DHAVE_CONFIG_H -Wall -W conftest.c >&5 +conftest.c:73:1: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] +main() +^ +int +1 error generated. +configure.sh:7718: $? = 1 +configure.sh: program exited with status 1 +``` +--- a/configure.ac ++++ b/configure.ac +@@ -392,7 +392,7 @@ AS_HELP_STRING([--disable-ipv6],[disable to omit ipv6 support]), + #include + #include + #include +-main() ++int main() + { + if (socket(AF_INET6, SOCK_STREAM, 0) < 0) + exit(1); diff --git a/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r4.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r4.ebuild new file mode 100644 index 0000000000..b3788a1dce --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/rsync/rsync-3.2.7-r4.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Uncomment when introducing a patch which touches configure +RSYNC_NEEDS_AUTOCONF=1 +PYTHON_COMPAT=( python3_{9..11} ) +inherit flag-o-matic prefix python-single-r1 systemd + +DESCRIPTION="File transfer program to keep remote files into sync" +HOMEPAGE="https://rsync.samba.org/" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/WayneD/rsync.git" + inherit autotools git-r3 + + REQUIRED_USE="${PYTHON_REQUIRED_USE}" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc + inherit verify-sig + + if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + inherit autotools + fi + + if [[ ${PV} == *_pre* ]] ; then + SRC_DIR="src-previews" + else + SRC_DIR="src" + 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 + verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )" + S="${WORKDIR}"/${P/_/} +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/popt-1.5 + acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) + lz4? ( app-arch/lz4:= ) + rrsync? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/bracex[${PYTHON_USEDEP}] + ') + ) + ssl? ( dev-libs/openssl:= ) + system-zlib? ( sys-libs/zlib ) + xattr? ( kernel_linux? ( sys-apps/attr ) ) + xxhash? ( >=dev-libs/xxhash-0.8 ) + zstd? ( >=app-arch/zstd-1.4:= ) + iconv? ( virtual/libiconv )" +DEPEND="${RDEPEND}" +BDEPEND=" + examples? ( ${PYTHON_DEPS} ) + rrsync? ( ${PYTHON_DEPS} ) +" + +if [[ ${PV} == *9999 ]] ; then + BDEPEND+=" ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + ')" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" +fi + +PATCHES=( + "${FILESDIR}"/${P}-flist-memcmp-ub.patch + "${FILESDIR}"/${P}-fortify-source-3.patch + "${FILESDIR}"/${PN}-3.2.7-ipv6-configure-c99.patch +) + +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - 9999 needs commonmark at build time + if [[ ${PV} == *9999 ]] || use examples || use rrsync; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + default + + if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then + eaclocal -I m4 + eautoconf -o configure.sh + eautoheader && touch config.h.in + fi + + if use examples || use rrsync; then + python_fix_shebang support/ + fi + + if [[ -f rrsync.1 ]]; then + # If the pre-build rrsync.1 man page exists, then link to it + # from support/rrsync.1 to avoid rsync's build system attempting + # re-creating the man page (bug #883049). + ln -s ../rrsync.1 support/rrsync.1 || die + fi +} + +src_configure() { + local myeconfargs=( + --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf + --without-included-popt + --enable-ipv6 + $(use_enable acl acl-support) + $(use_enable iconv) + $(use_enable lz4) + $(use_with rrsync) + $(use_enable ssl openssl) + $(use_with !system-zlib included-zlib) + $(use_enable xattr xattr-support) + $(use_enable xxhash) + $(use_enable zstd) + ) + + # https://github.com/WayneD/rsync/pull/428 + if is-flagq -fsanitize=undefined ; then + sed -E -i \ + -e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \ + byteorder.h || die + append-flags -DCAREFUL_ALIGNMENT + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd + newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd + + dodoc NEWS.md README.md TODO tech_report.tex + + insinto /etc + newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}"/rsyncd.logrotate rsyncd + + insinto /etc/xinetd.d + newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd + + # Install stunnel helpers + if use stunnel ; then + emake DESTDIR="${D}" install-ssl-daemon + fi + + # Install the useful contrib scripts + if use examples ; then + # The 'rrsync' script is installed conditionally via the 'rrysnc' + # USE flag, and not via the 'examples' USE flag. + rm support/rrsync* || die + + exeinto /usr/share/rsync + doexe support/* + + rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} + fi + + eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* + + systemd_newunit packaging/systemd/rsync.service rsyncd.service +} + +pkg_postinst() { + if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ + "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then + ewarn "You have disabled chroot support in your rsyncd.conf. This" + ewarn "is a security risk which you should fix. Please check your" + ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." + fi + + if use stunnel ; then + einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." + einfo + einfo "You maybe have to update the certificates configured in" + einfo "${EROOT}/etc/stunnel/rsync.conf" + fi + + if use system-zlib ; then + ewarn "Using system-zlib is incompatible with =rsync-3.1.1 built with bundled zlib," + ewarn "and the --compress option, add --new-compress (-zz)." + ewarn + ewarn "For syncing the portage tree, add:" + ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" + fi +} From e167381e67743a55209fbfe5a9fd2229c1ad4b51 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:35 +0000 Subject: [PATCH 079/130] net-nds/openldap: Sync with Gentoo It's from Gentoo commit b750b158ab8ce00579901ef253c8a2594cee1886. --- .../portage-stable/net-nds/openldap/openldap-2.6.4-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.4-r1.ebuild index 4b72e0c288..2f6ab17860 100644 --- a/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-nds/openldap/openldap-2.6.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,7 +25,7 @@ S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV} LICENSE="OPENLDAP GPL-2" # Subslot added for bug #835654 SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd" IUSE_OVERLAY="overlays perl autoca" From 5e51419c81a0784a4383886af1a6d84cde9fca32 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:45 +0000 Subject: [PATCH 080/130] profiles: Sync with Gentoo It's from Gentoo commit b64a017266bfab910244cde449975d0b62faf6e6. --- .../profiles/arch/alpha/package.use.mask | 14 +- .../arch/amd64/no-multilib/package.mask | 3 +- .../arch/amd64/no-multilib/package.use.mask | 2 +- .../profiles/arch/amd64/package.use | 2 +- .../profiles/arch/amd64/package.use.mask | 12 +- .../arch/amd64/package.use.stable.mask | 6 +- .../profiles/arch/amd64/use.mask | 3 +- .../profiles/arch/amd64/x32/package.mask | 4 +- .../arch/arm/23.0-armv7a_hf/package.mask | 4 +- .../arch/arm/23.0-armv7a_sf/package.mask | 4 +- .../profiles/arch/arm/armv7a/package.mask | 4 +- .../profiles/arch/arm/package.mask | 6 +- .../profiles/arch/arm/package.use.mask | 12 +- .../profiles/arch/arm/package.use.stable.mask | 9 +- .../profiles/arch/arm64/package.use.mask | 7 +- .../profiles/arch/base/package.use.mask | 10 +- .../profiles/arch/base/use.mask | 3 +- .../profiles/arch/hppa/package.use.mask | 14 +- .../arch/hppa/package.use.stable.mask | 8 +- .../profiles/arch/hppa/use.mask | 4 +- .../profiles/arch/hppa/use.stable.mask | 5 +- .../profiles/arch/ia64/package.mask | 6 +- .../profiles/arch/ia64/package.use.mask | 16 +- .../profiles/arch/loong/package.use | 6 +- .../profiles/arch/loong/package.use.mask | 24 +- .../profiles/arch/m68k/package.use.mask | 6 +- .../profiles/arch/mips/package.use.mask | 10 +- .../profiles/arch/mips/use.mask | 4 +- .../profiles/arch/powerpc/package.use.mask | 10 +- .../arch/powerpc/package.use.stable.mask | 6 +- .../profiles/arch/powerpc/ppc32/package.use | 4 + .../arch/powerpc/ppc32/package.use.mask | 14 +- .../powerpc/ppc32/package.use.stable.mask | 3 +- .../arch/powerpc/ppc64/package.use.mask | 4 +- .../profiles/arch/riscv/package.use.mask | 26 +- .../profiles/arch/s390/package.use.mask | 16 +- .../profiles/arch/sparc/package.use.mask | 31 +- .../arch/sparc/package.use.stable.mask | 4 +- .../profiles/arch/x86/package.mask | 12 +- .../profiles/arch/x86/package.use.mask | 13 +- .../portage-stable/profiles/arch/x86/use.mask | 3 +- .../profiles/base/make.defaults | 4 +- .../profiles/base/package.use.mask | 21 +- .../portage-stable/profiles/base/packages | 4 +- .../portage-stable/profiles/categories | 2 + .../profiles/default/linux/packages.build | 4 +- .../profiles/desc/cpu_flags_arm.desc | 6 +- .../profiles/features/big-endian/package.mask | 10 +- .../features/hardened/amd64/package.use.mask | 4 +- .../profiles/features/musl/make.defaults | 6 +- .../profiles/features/musl/package.mask | 16 +- .../profiles/features/musl/package.use.mask | 17 +- .../profiles/features/prefix/package.use.mask | 4 + .../standalone/kernel-2.6.16+/profile.bashrc | 4 +- .../features/prefix/standalone/profile.bashrc | 4 +- .../profiles/features/wd40/package.mask | 3 +- .../portage-stable/profiles/info_pkgs | 8 +- .../portage-stable/profiles/package.mask | 448 +++++++++--------- .../darwin/macos/10.13/x64/package.mask | 7 +- .../darwin/macos/arch/ppc/package.use.mask | 2 +- .../darwin/macos/arch/x64/package.use.mask | 2 +- .../profiles/prefix/darwin/package.use.mask | 4 +- .../profiles/prefix/package.use.mask | 8 +- .../profiles/targets/desktop/package.use | 4 +- .../portage-stable/profiles/updates/1Q-2024 | 26 + .../portage-stable/profiles/use.desc | 6 +- 66 files changed, 576 insertions(+), 402 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2024 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 3f81f69355..17d95fde6a 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 +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2024-01-02) +# dev-libs/capstone not keyworded here +dev-lang/php capstone + # matoro (2023-11-24) # dev-util/glslang not keyworded here. media-video/ffmpeg glslang @@ -15,11 +19,11 @@ dev-perl/DBD-mysql mysql # matoro (2023-11-01) # Qt 6 not keyworded here. -app-doc/doxygen gui -dev-util/cmake gui +app-text/doxygen gui +dev-build/cmake gui # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # matoro (2023-06-29) @@ -91,7 +95,7 @@ net-misc/openvswitch unwind net-misc/openntpd constraints # Matthew Smith (2022-07-10) -# Needs unkeyworded app-doc/halibut +# Needs unkeyworded app-text/halibut >=net-misc/putty-0.77 doc # Sam James (2022-04-29) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.mask index b4340ad1e1..e94ce63b34 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # James Le Cuirot (2021-09-04) @@ -67,7 +67,6 @@ games-fps/etqw-demo games-fps/glxquake-bin games-fps/legends games-fps/sauerbraten -games-fps/serious-sam-tse games-fps/soldieroffortune games-fps/ut2003 games-fps/ut2003-demo diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.use.mask index ec5ba0d852..5a3b1d629b 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.use.mask @@ -18,7 +18,7 @@ sys-libs/ncurses stack-realign # Ben Kohler (2022-06-07) # Disable 32bit builds on no-multilib -sys-apps/memtest86+ bios32 efi32 iso32 +sys-apps/memtest86+ bios32 uefi32 iso32 # Sam James (2020-12-27) # dev-embedded/libftd2xx unavailable here diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use index 31d17baca4..40a242b365 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use @@ -9,7 +9,7 @@ sys-libs/ncurses stack-realign # Ben Kohler (2022-06-07) # Enable BIOS & UEFI targets by default -sys-apps/memtest86+ bios64 efi64 +sys-apps/memtest86+ bios64 uefi64 # Theo Anderson (2021-03-06) # Enable 32-bit clang runtime to ease -m32 builds with non-GCC runtime 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 1a2f77a099..cde94fbd99 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # When you add an entry to the top of this file, add your name, the date, and @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Andrew Ammerlaan (2024-01-13) +# Unmask only where grub is keyworded +sys-kernel/installkernel -grub + # Michał Górny (2023-12-31) # Requires dev-libs/level-zero. dev-lang/ispc -gpu @@ -83,7 +87,7 @@ net-misc/curl -nghttp3 # Sam James (2023-07-18) # dev-cpp/cppdap is not keyworded in most places -dev-util/cmake -dap +dev-build/cmake -dap # Marek Szuba (2023-06-29) # Now that we globally unmask USE=qt6 for amd64, the mask set @@ -142,7 +146,6 @@ media-libs/gst-plugins-bad -qsv # WANG Xuerui (2022-10-07) # sys-libs/libsmbios is available here. app-laptop/pbbuttonsd -macbook -sys-apps/fwupd -dell # Alfredo Tupone (2022-08-30) # ada bootstrap currently only available on amd64/x86 @@ -399,6 +402,7 @@ sys-boot/grub:2 -grub_platforms_xen-32 # sd-boot is not supported on all archs. sys-apps/systemd -boot -gnuefi -ukify sys-apps/systemd-utils -boot -ukify +sys-kernel/installkernel -ukify # Ben de Groot (2015-03-15) # media-libs/libbdplus is keyworded on amd64, so unmask the useflag @@ -508,7 +512,7 @@ media-libs/smpeg cpu_flags_x86_mmx # x86_64 opts are enabled with USE sse. so masking the rest media-sound/mpg123 cpu_flags_x86_mmx cpu_flags_x86_3dnow cpu_flags_x86_3dnowext -media-libs/libmpg123 cpu_flags_x86_mmx cpu_flags_x86_3dnow cpu_flags_x86_3dnowext +media-sound/mpg123-base cpu_flags_x86_mmx cpu_flags_x86_3dnow cpu_flags_x86_3dnowext # Alexis Ballier (2008-08-08) # x86 asm only, it won't be built on amd64 if mmx useflag is enabled but that diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask index c23f44cf5f..78e11ff93f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # When you add an entry to the top of this file, add your name, the date, and @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Joonas Niilola (2024-01-08) +# Pulls in pandoc with all of its glory (haskell). #921501 +www-apps/hugo test + # Andrew Ammerlaan (2023-12-18) # This is still experimental, prebuilt images may not boot on all systems. sys-kernel/gentoo-kernel generic-uki diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.mask index 2fbe7660a1..a2dda70023 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Unmask the flag which corresponds to ARCH. @@ -141,7 +141,6 @@ # Simon Stelling (2007-02-16) # Since this profile forces >=portage-2.1.2, we can unmask all # SIMD assembler flags --mpx -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_aes diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask index b093459c09..d418fadc58 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Eli Schwartz (2023-10-19) @@ -59,7 +59,7 @@ dev-qt/qtwebview dev-python/PyQt6-WebEngine dev-python/PyQtWebEngine app-admin/calamares -app-doc/zeal +app-text/zeal app-editors/ghostwriter app-editors/retext app-misc/anki diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/23.0-armv7a_hf/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/23.0-armv7a_hf/package.mask index 5e7abc375a..30e86d72cc 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/23.0-armv7a_hf/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/23.0-armv7a_hf/package.mask @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Sam James (2020-06-24) # Valgrind works on ARMv7 --dev-util/valgrind +-dev-debug/valgrind # James Le Cuirot (2015-05-24) # This is built for armv7a so unmask against the wider arm mask. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/23.0-armv7a_sf/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/23.0-armv7a_sf/package.mask index 5e7abc375a..30e86d72cc 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/23.0-armv7a_sf/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/23.0-armv7a_sf/package.mask @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Sam James (2020-06-24) # Valgrind works on ARMv7 --dev-util/valgrind +-dev-debug/valgrind # James Le Cuirot (2015-05-24) # This is built for armv7a so unmask against the wider arm mask. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/armv7a/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/armv7a/package.mask index 5e7abc375a..30e86d72cc 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/armv7a/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/armv7a/package.mask @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Sam James (2020-06-24) # Valgrind works on ARMv7 --dev-util/valgrind +-dev-debug/valgrind # James Le Cuirot (2015-05-24) # This is built for armv7a so unmask against the wider arm mask. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.mask index 7ed8c817b9..efb8d89801 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Andreas Sturmlechner (2023-02-06) @@ -9,7 +9,7 @@ dev-qt/qtwebview dev-python/PyQt6-WebEngine dev-python/PyQtWebEngine app-admin/calamares -app-doc/zeal +app-text/zeal app-editors/ghostwriter app-editors/retext app-misc/anki @@ -96,7 +96,7 @@ media-video/jellyfin-media-player # Sam James (2020-06-24) # Valgrind lacks support for < ARMv7 # https://valgrind.org/info/platforms.html -dev-util/valgrind +dev-debug/valgrind # James Le Cuirot (2015-05-24) # This is built for armv7a and will not work on earlier generations. 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 4abada0048..4cfb967983 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 +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andrew Ammerlaan (2024-01-13) +# Unmask only where grub is keyworded +sys-kernel/installkernel -grub + # Marek Szuba (2023-12-05) # Needs USE=video_cards_amdgpu, currently masked on this arch >=sys-apps/fwupd-1.9.10 amdgpu @@ -139,6 +143,7 @@ net-im/prosody selinux # bug #729720 sys-apps/systemd -boot -gnuefi -ukify sys-apps/systemd-utils -boot -ukify +sys-kernel/installkernel -ukify # Joonas Niilola (2021-01-15) # Dependency not keyworded on this arch. @@ -218,10 +223,6 @@ sys-cluster/ceph babeltrace lttng net-analyzer/rrdtool rados www-servers/uwsgi uwsgi_plugins_rados -# Andreas Sturmlechner (2019-02-25) -# (SM)BIOS outside of amd64/x86? - citation needed -sys-apps/fwupd dell - # Thomas Deutschmann (2018-10-12) # Requires www-client/firefox which isn't available on ARM yet dev-ruby/capybara test @@ -330,7 +331,6 @@ media-sound/moc timidity # Markus Meier (2015-11-22) # unmask scanner for net-print/hplip, bug #518456 net-print/hplip -scanner kde -media-gfx/xsane ocr # Pacho Ramos (2015-11-15) # Missing keywords diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask index 4e8d46372c..67d95e0884 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask @@ -1,6 +1,13 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Petr Vaněk (2024-01-10) +# Destabilize dev-db/redis for ~arm due to a lack of security stabilization +# almost one year to this this date. bug 915548#c6 +dev-libs/hiredis test +dev-python/redis test +dev-python/sentry-sdk test + # Matt Turner (2023-10-30) # libei not stable yet x11-base/xwayland libei 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 11f13e8431..edb30fee4c 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 @@ -1,6 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andrew Ammerlaan (2024-01-13) +# Unmask only where grub is keyworded +sys-kernel/installkernel -grub + # Andrew Ammerlaan (2023-12-18) # Experimental and only available on a subset of architectures sys-kernel/gentoo-kernel -generic-uki @@ -167,6 +171,7 @@ media-sound/bluez-alsa man # bug #729720 sys-apps/systemd -boot -gnuefi -ukify sys-apps/systemd-utils -boot -ukify +sys-kernel/installkernel -ukify # Joonas Niilola (2021-01-15) # Dependency not keyworded on this 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 65c07619a4..ed56926241 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 @@ -1,6 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andrew Ammerlaan (2024-01-13) +# Unmask only where grub is keyworded +sys-kernel/installkernel grub + # Michał Górny (2023-12-31) # Requires dev-libs/level-zero. dev-lang/ispc gpu @@ -49,7 +53,7 @@ media-video/pipewire roc # Sam James (2023-07-18) # dev-cpp/cppdap is not keyworded in most places -dev-util/cmake dap +dev-build/cmake dap # Sam James (2023-07-09) # sys-libs/libhugetlbfs is broken w/ newer glibc, bug #806079 @@ -107,7 +111,6 @@ sys-devel/gcc fixed-point # only unmask on relevant arches. # bug #875830 app-laptop/pbbuttonsd macbook -sys-apps/fwupd dell # Conrad Kostecki (2022-07-19) # www-servers/nginx requires keywording @@ -370,6 +373,7 @@ net-misc/moonlight mmal # sd-boot and ukify are not supported on all archs. sys-apps/systemd boot gnuefi ukify sys-apps/systemd-utils boot ukify +sys-kernel/installkernel ukify # Ben de Groot (2015-03-15) # Mask bdplus support and unmask on arches where libbdplus is keyworded. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.mask index 8e1119a0b4..2fc87978ee 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Andrew Ammerlaan (2023-07-11) @@ -61,7 +61,6 @@ sane_backends_qcam # amd64/x86 arch specific USE flags lilo -mpx svga cpu_flags_x86_3dnow cpu_flags_x86_3dnowext 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 1ce7e1b277..4b607081a6 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 @@ -1,9 +1,13 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # NOTE: When masking a USE flag due to missing keywords, please file a keyword # request bug for the hppa arch. +# Sam James (2024-01-02) +# dev-libs/capstone not keyworded here +dev-lang/php capstone + # Mart Raudsepp (2023-12-25) # sys-apps/xdg-desktop-portal not keyworded here yet x11-base/xwayland libei @@ -17,7 +21,7 @@ media-libs/libv4l bpf media-video/ffmpeg glslang shaderc vulkan # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Ionen Wolkens (2023-10-09) @@ -36,11 +40,11 @@ sys-apps/openrc s6 # Sam James (2023-09-24) # Qt not keyworded here. -app-doc/doxygen gui +app-text/doxygen gui # Sam James (2023-09-22) # Qt 6 not keyworded here. -dev-util/cmake gui +dev-build/cmake gui # Sam James (2023-09-18) # x11-libs/gtksourceview:4 not keyworded here @@ -292,7 +296,7 @@ net-analyzer/wireshark ilbc # Sergei Trofimovich (2019-07-19) # gdbserver is not implemented yet for hppa target. -sys-devel/gdb server +dev-debug/gdb server # Sergei Trofimovich (2019-07-07) # Test dependencies are no longer keyworded due to dropped Rails diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.stable.mask index a6c4130798..ccbecff2e4 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.stable.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # When you add an entry to the top of this file, add your name, the date, and @@ -64,7 +64,7 @@ sys-process/htop hwloc # Sam James (2021-11-03) # dev-util/source-highlight is not marked stable on HPPA -sys-devel/gdb source-highlight +dev-debug/gdb source-highlight # Matt Turner (2021-09-22) # Non-stable deps. @@ -153,7 +153,7 @@ dev-libs/check subunit # Matt Turner (2020-12-23) # dev-libs/xapian is not stable on hppa -app-doc/doxygen doxysearch +app-text/doxygen doxysearch # Matt Turner (2020-12-23) # x11-base/xorg-server not stable. @@ -168,7 +168,7 @@ dev-python/twisted test dev-tcltk/bwidget test dev-tcltk/snack test dev-tcltk/tcllib test -dev-util/cmake test +dev-build/cmake test sys-apps/dbus test # Rolf Eike Beer (2020-12-14) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask index ad317b071e..429687a52b 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Unmask the flag which corresponds to ARCH. @@ -174,7 +174,7 @@ kwallet flite # Jeroen Roovers (2008-06-07) -# dev-util/valgrind has not been ported to HPPA. +# dev-debug/valgrind has not been ported to HPPA. valgrind # Jeroen Roovers (2008-01-04) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask index 30b5b2df44..a2a9aae1dd 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # # This file requires eapi 5 or later. New entries go on top. @@ -96,8 +96,7 @@ rpm vim-syntax # Rolf Eike Beer (2020-04-05) -# app-editors/{,x}emacs has no stable keywords -emacs +# app-editors/xemacs has no stable keywords xemacs # Sergei Trofimovich (2020-03-23) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.mask index 9561824f89..47b2b567a4 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.mask @@ -1,6 +1,10 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2024-01-09) +# glibc-2.39 dropped support for ia64. +>=sys-libs/glibc-2.39 + # Sergei Trofimovich (2020-05-02) # greenlet needs arch-specific stack switching code. There is no ia64 port. dev-python/greenlet 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 680f6b55d8..c18de78a33 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,14 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andrew Ammerlaan (2024-01-13) +# Unmask only where grub is keyworded +sys-kernel/installkernel -grub + +# Sam James (2024-01-02) +# dev-libs/capstone not keyworded here +dev-lang/php capstone + # David Seifert (2023-12-30) # sys-auth/sssd not keyworded here anymore app-admin/sudo sssd @@ -18,7 +26,7 @@ media-libs/libv4l bpf media-video/ffmpeg glslang shaderc vulkan # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Patrick McLean (2023-10-03) @@ -27,11 +35,11 @@ sys-apps/openrc s6 # Sam James (2023-09-24) # Qt not keyworded here. -app-doc/doxygen gui +app-text/doxygen gui # Sam James (2023-09-22) # Qt 6 not keyworded here. -dev-util/cmake gui +dev-build/cmake gui # Rich Freeman (2023-09-13) # Tests require shellcheck which is not currently available diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use index 6890598363..319345dc04 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use @@ -1,10 +1,6 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Ionen Wolkens (2023-10-09) -# media-libs/shaderc is not keyworded here, so enable glslang fallback. -media-libs/libplacebo glslang -shaderc - # Sam James (2023-10-08) # dev-db/mysql not keyworded here dev-perl/DBD-mysql -mysql mariadb 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 e2a9900788..a80faf224e 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,8 +1,24 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 - + +# Andrew Ammerlaan (2024-01-13) +# Unmask only where grub is keyworded +sys-kernel/installkernel -grub + +# WANG Xuerui (2024-01-09) +# PCRE2 upstream has gained JIT support on loong since 10.43. + (2024-01-08) +# media-libs/shaderc is keyworded here. +media-libs/libplacebo -shaderc + +# WANG Xuerui (2024-01-03) +# app-crypt/rpm-sequoia is keyworded here. +app-arch/rpm -sequoia + # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Sam James (2023-10-08) @@ -99,6 +115,7 @@ app-accessibility/at-spi2-core dbus-broker # Newer sd-boot does not use gnuefi. >=sys-apps/systemd-254 -boot -ukify >=sys-apps/systemd-utils-254 -boot -ukify +sys-kernel/installkernel -ukify # WANG Xuerui (2023-04-16) # dev-python/pyopengl fails tests @@ -267,7 +284,6 @@ dev-util/catalyst -system-bootloader sys-devel/binutils gold # These aren't ported to LoongArch yet -dev-libs/libpcre2 jit dev-libs/libpcre jit www-servers/nginx pcre-jit diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask index b52d2fc7d8..84c7e1c236 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # James Le Cuirot (2023-12-12) @@ -6,7 +6,7 @@ media-libs/libv4l bpf # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Sam James (2023-06-18) @@ -63,7 +63,7 @@ sys-block/thin-provisioning-tools test # James Le Cuirot (2021-09-19) # Requires texlive and friends to be keyworded. -app-doc/doxygen doc +app-text/doxygen doc app-text/po4a test dev-libs/libcbor doc media-libs/libcaca doc 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 e993f73c2b..08776de3d6 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 +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2024-01-02) +# dev-libs/capstone not keyworded here +dev-lang/php capstone + # matoro (2023-12-22) # Overflows R_MIPS_TLS_GOTTPREL with LTO # https://github.com/rust-lang/rust/issues/118794 @@ -52,7 +56,7 @@ x11-misc/xscreensaver new-login app-i18n/ibus gtk4 # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # matoro (2023-06-18) @@ -212,7 +216,7 @@ dev-python/numpydoc test # Matthias Maier (2014-12-24) # sys-devel/clang is not keyworded -app-doc/doxygen clang +app-text/doxygen clang # Ryan Hill (2014-01-07) # req net-libs/webkit-gtk:2 diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/use.mask index 1476d8f8c0..751e44f5b8 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Unmask the flag which corresponds to ARCH. @@ -30,7 +30,7 @@ tpm rdma # Mart Raudsepp (2018-02-11) -# dev-util/valgrind is not keyworded here yet, +# dev-debug/valgrind is not keyworded here yet, # though the MIPS platform is supported upstream valgrind diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask index 17d41c1963..9b2232a1a0 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask @@ -1,6 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andrew Ammerlaan (2024-01-13) +# Unmask only where grub is keyworded +sys-kernel/installkernel -grub + # matoro (2023-12-19) # JIT not supported here (#909826) dev-scheme/racket chez futures jit @@ -112,7 +116,7 @@ dev-embedded/urjtag ftd2xx # Georgy Yakovlev (2020-11-05) # makes no sense on power -sys-apps/fwupd amt dell uefi +sys-apps/fwupd amt uefi # Joonas Niilola (2020-10-08) # Dependency not keyworded on this arch. @@ -265,7 +269,7 @@ dev-db/percona-server -numa # Michael Palimaka (2016-07-07) # Requires unkeyworded dependencies dev-vcs/subversion kwallet -net-irc/quassel kde snorenotify +net-irc/quassel kde net-libs/libproxy kde sys-auth/polkit kde sys-block/gparted kde diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.stable.mask index 779a136c1b..b7d60aceea 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.stable.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # When you add an entry to the top of this file, add your name, the date, and @@ -58,10 +58,6 @@ media-sound/easytag nautilus # Non-stable dependency. Used to be masked completely. media-sound/abcde replaygain -# Ulrich Müller (2018-08-09) -# Needs net-libs/webkit-gtk which is not stable, bug #663248 -app-editors/emacs xwidgets - # Andreas Sturmlechner (2018-06-20) # dev-python/PyQt5 is not stable. dev-python/matplotlib qt5 test diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use index 70f5caa811..65ce352e9a 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2024-01-05) +# keyutils is masked here +net-fs/cifs-utils -ads -acl + # Ionen Wolkens (2023-10-09) # media-libs/shaderc is not keyworded here, so enable glslang fallback. media-libs/libplacebo glslang -shaderc 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 85a30a60ea..e78219c307 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,16 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2024-01-05) +# sys-apps/keyutils not stable here, because of test failures. bug #636252 +app-benchmarks/stress-ng keyutils +app-crypt/mit-krb5 keyutils +app-emulation/qemu keyutils +net-fs/cifs-utils ads creds pam +net-fs/samba ads +sys-auth/sssd keyutils +sys-libs/libnvme keyutils + # Michał Górny (2023-10-15) # Need dev-python/notebook (that indirectly requires net-libs/nodejs). dev-python/ipython notebook @@ -13,7 +23,7 @@ dev-perl/DBD-mysql mysql # Sam James (2023-09-22) # Qt 6 not keyworded here. -dev-util/cmake gui +dev-build/cmake gui # Sam James (2023-09-22) # sys-apps/flatpak is not keyworded here 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 d3328ba5fa..ecd238cce8 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 @@ -57,8 +57,7 @@ mail-mta/postfix ldap-bind # Sam James (2022-03-03) # No kerberos provider is marked stable here -net-fs/samba ads system-heimdal system-mitkrb5 -net-fs/cifs-utils ads +net-fs/samba system-heimdal system-mitkrb5 sys-auth/pambase pam_krb5 # Sam James (2022-03-03) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.mask index 705cdeb436..c1d907fe1c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Ionen Wolkens (2023-10-09) @@ -7,7 +7,7 @@ media-libs/libplacebo -shaderc # Sam James (2023-09-22) # Qt 6 not keyworded here. -dev-util/cmake gui +dev-build/cmake gui # Joonas Niilola (2023-08-24) # media-video/libva-utils is masked on ppc64, so hwaccel on Firefox 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 861cbc631d..742b8eae39 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,15 +1,15 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andrew Ammerlaan (2024-01-13) +# Unmask only where grub is keyworded +sys-kernel/installkernel -grub + # Leonardo Hernández Hernández (2023-11-22) # media-libs/libdisplay-info (drm) and dev-libs/libliftoff (liftoff) # are only available for amd64 and riscv >=gui-libs/wlroots-0.17.0 -drm -liftoff -# Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. -app-alternatives/ninja samurai - # Ionen Wolkens (2023-10-09) # media-libs/shaderc is keyworded here. media-libs/libplacebo -shaderc @@ -18,14 +18,6 @@ media-libs/libplacebo -shaderc # sys-apps/s6-linux-init has not been tested on this arch sys-apps/openrc s6 -# Sam James (2023-09-22) -# Qt 6 not keyworded here. -dev-util/cmake gui - -# Jon Janzen (2023-09-11) -# librttopo has not been tested on this arch -dev-db/spatialite rttopo - # Andrew Ammerlaan (2023-08-30) # Avoid keywording more Qt stuff dev-python/pyside2 datavis webengine @@ -44,8 +36,9 @@ media-video/mpv lua_single_target_luajit -lua_single_target_lua5-1 # Mike Gilbert (2023-05-27) # sd-boot should work here. -sys-apps/systemd -boot -gnuefi -ukify +sys-apps/systemd -boot -boot -ukify sys-apps/systemd-utils -boot -ukify +sys-kernel/installkernel -ukify # Sam James (2023-05-10) # sys-cluster/ceph not keyworded here @@ -67,10 +60,6 @@ app-editors/neovim lua_single_target_luajit # depend on dev-libs/libpcre2[jit] which not supported yet, bug #879511 www-servers/varnish jit -# Sam James (2022-10-29) -# pandoc not keyworded here, bug #878355 -app-admin/conky doc - # Xin Yang (2022-10-18) # requires qtwebengine, bug #876301 app-i18n/fcitx-libpinyin dictionary-manager @@ -158,7 +147,6 @@ dev-python/wcmatch doc # These depend on Haskell: # - app-text/pandoc sys-cluster/ceph pmdk -app-text/nuspell doc # Alex Fan (2021-09-15) # Marek Szuba (2021-09-07) 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 3cebaa1e8f..ed4e9afb40 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,14 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andrew Ammerlaan (2024-01-12) +# dracut is not keyworded here +sys-kernel/installkernel dracut + +# Sam James (2024-01-02) +# dev-libs/capstone not keyworded here +dev-lang/php capstone + # Mart Raudsepp (2023-12-25) # sys-apps/xdg-desktop-portal not keyworded here yet x11-base/xwayland libei @@ -16,7 +24,7 @@ dev-python/nbclient test dev-python/nbconvert test # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Patrick McLean (2023-10-03) @@ -25,11 +33,11 @@ sys-apps/openrc s6 # Sam James (2023-09-24) # Qt not keyworded here. -app-doc/doxygen gui +app-text/doxygen gui # Sam James (2023-09-22) # Qt 6 not keyworded here. -dev-util/cmake gui +dev-build/cmake gui # Sam James (2023-06-18) # Qt 5 not keyworded here 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 94e90a480a..9fd8b2de82 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,30 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andrew Ammerlaan (2024-01-13) +# Unmask only where grub is keyworded +sys-kernel/installkernel -grub + +# Jaco Kroon (2024-01-09) +# net-libs/pjproject[srtp] and net-misc/asterisk[srtp] depends on +# net-libs/libsrtp which is -sparc. +net-libs/pjproject srtp +net-misc/asterisk srtp + +# Sam James (2024-01-05) +# sys-apps/keyutils not stable here, because of test failures. bug #636252 +app-benchmarks/stress-ng keyutils +app-crypt/mit-krb5 keyutils +app-emulation/qemu keyutils +net-fs/samba ads +net-fs/cifs-utils ads creds pam +sys-auth/sssd keyutils +sys-libs/libnvme keyutils + +# Sam James (2024-01-02) +# dev-libs/capstone not keyworded here +dev-lang/php capstone + # Mart Raudsepp (2023-12-25) # sys-apps/xdg-desktop-portal not keyworded here yet x11-base/xwayland libei @@ -24,7 +48,7 @@ dev-python/nbclient test dev-python/nbconvert test # Violet Purcell (2023-10-12) -# dev-util/samurai is not keyworded here. +# dev-build/samurai is not keyworded here. app-alternatives/ninja samurai # Andreas Sturmlechner (2023-10-08) @@ -40,7 +64,7 @@ sys-apps/openrc s6 # Sam James (2023-09-22) # Qt 6 not keyworded here. -dev-util/cmake gui +dev-build/cmake gui # Rich Freeman (2023-09-13) # Tests require shellcheck which is not currently available @@ -212,7 +236,6 @@ dev-cpp/eigen test # Sam James (2021-04-27) # Deps not yet tested/keyworded. -sys-devel/clang default-compiler-rt default-lld sys-devel/clang-common default-compiler-rt default-lld sys-devel/clang-runtime compiler-rt sys-devel/llvm z3 diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.stable.mask index e5e59371a7..fe1888ca9b 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.stable.mask @@ -1,9 +1,9 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Sam James (2023-12-30) # Qt not marked stable here. -app-doc/doxygen gui +app-text/doxygen gui # Rolf Eike Beer (2023-12-22) # media-libs/libavif isn't stable here diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask index 93882ec598..10f699892e 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask @@ -1,6 +1,14 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# matoro (2024-01-06) +# (2023-02-06) # Successful build of dev-qt/qtwebengine depends on 64-bit host # Bug #893234 @@ -9,7 +17,7 @@ dev-qt/qtwebview dev-python/PyQt6-WebEngine dev-python/PyQtWebEngine app-admin/calamares -app-doc/zeal +app-text/zeal app-editors/ghostwriter app-editors/retext app-misc/anki 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 44aa702f1c..4abd90fec0 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,10 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Andrew Ammerlaan (2023-12-18) -# Experimental and only available on a subset of architectures -sys-kernel/gentoo-kernel -generic-uki -sys-kernel/gentoo-kernel-bin -generic-uki +# Andrew Ammerlaan (2024-01-13) +# Unmask only where grub is keyworded +sys-kernel/installkernel -grub # Ionen Wolkens (2023-10-09) # media-libs/shaderc is keyworded here. @@ -85,7 +84,6 @@ media-video/mpv -libplacebo -vulkan # WANG Xuerui (2022-10-07) # sys-libs/libsmbios is available here. app-laptop/pbbuttonsd -macbook -sys-apps/fwupd -dell # Alexey Shvetsov (2022-09-15) # Mask nvml use flag for slurm @@ -114,7 +112,7 @@ app-vim/jedi test # Ben Kohler (2022-06-07) # Disable 64bit builds on x86 -sys-apps/memtest86+ bios64 efi64 iso64 +sys-apps/memtest86+ bios64 uefi64 iso64 # Jimi Huotari (2022-05-08) # Not keyworded here yet. @@ -388,6 +386,7 @@ app-emulation/libvirt xen # sys-boot/gnu-efi is not supported on all archs. sys-apps/systemd -boot -gnuefi -ukify sys-apps/systemd-utils -boot -ukify +sys-kernel/installkernel -ukify # Ben de Groot (2015-03-15) # media-libs/libbdplus is keyworded on x86, so unmask the useflag diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.mask index de250d270d..73283453ca 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Unmask the flag which corresponds to ARCH. @@ -107,7 +107,6 @@ webengine # Unmask x86 instruction sets -lilo --mpx -svga -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext 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 f968c2cccd..cb203399fa 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # # System-wide defaults for the Portage system @@ -102,7 +102,7 @@ RUBY_TARGETS="ruby31" # These USE flags are what is common between the various sub-profiles. Stages 2 # and 3 are built against these, so be careful what you add. # Moved here from releases/ -USE="acl bzip2 gdbm nptl unicode" +USE="acl bzip2 gdbm unicode" # Enable extended filesystem attribute support by default. # https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0 diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask index e03b7a1fa3..10099ae25c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # New entries go on top. @@ -21,10 +21,6 @@ sys-devel/sparse llvm # https://gcc.gnu.org/PR113056 >=sys-devel/gcc-14.0.0_pre20231217 rust -# John Helmert III (2023-11-25) -# app-text/gocr has been masked for removal, bug #824290 -media-gfx/xsane ocr - # Takuya Wakazono (2023-11-21) # app-crypt/rpm-sequoia is not keyworded on most architectures. app-arch/rpm sequoia @@ -210,7 +206,7 @@ sys-libs/libomp llvm_targets_AMDGPU # Sam James (2023-01-21) # Fails to compile: https://github.com/libffi/libffi/issues/760 -dev-libs/libffi exec-static-trampoline + (2023-01-08) # Doesn't compile currently, bug #853094. @@ -461,13 +457,6 @@ media-sound/puddletag quodlibet # Upstream issue: https://phab.enlightenment.org/T8924 dev-libs/efl mono -# Sam James (2021-04-09) -# Crashes at runtime. -# Mask LTO for now until issue with Qt -# (to be resolved in Wireshark?) is resolved -# bug #754021 -net-analyzer/wireshark lto - # Sam James (2021-04-09) # Fails to build right now # bug #651740 @@ -606,7 +595,7 @@ net-fs/samba test # Mike Gilbert (2020-04-23) # Tests are very sensitive to the host environment. -dev-util/meson test +dev-build/meson test # Alfredo Tupone (2020-04-04) # Ada support is not yet ready for sys-devel/gcc @@ -716,7 +705,7 @@ dev-python/paramiko server # and compiler/binutils combinations.) sys-devel/binutils cet sys-devel/binutils-hppa64 cet -sys-devel/gdb cet +dev-debug/gdb cet sys-libs/binutils-libs cet sys-libs/glibc cet sys-devel/gcc cet @@ -868,7 +857,7 @@ media-libs/libsdl2 custom-cflags # Kacper Kowalik (2013-05-19) # Fails to build, haven't had time to debug -app-doc/doxygen sqlite +app-text/doxygen sqlite # Bernard Cafarelli (2013-04-04) # Broken for now (segmentation fault on play) diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/packages b/sdk_container/src/third_party/portage-stable/profiles/base/packages index a3d4c1b920..fbd30a2b03 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/packages +++ b/sdk_container/src/third_party/portage-stable/profiles/base/packages @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License, v2 # Gentoo Base Profile @@ -35,6 +35,7 @@ *app-arch/tar *app-arch/xz-utils *app-shells/bash:0 +*dev-build/make *net-misc/iputils *net-misc/rsync *net-misc/wget @@ -59,7 +60,6 @@ *sys-devel/binutils *sys-devel/gcc *sys-devel/gnuconfig -*sys-devel/make *>=sys-devel/patch-2.7 *sys-fs/e2fsprogs *virtual/dev-manager diff --git a/sdk_container/src/third_party/portage-stable/profiles/categories b/sdk_container/src/third_party/portage-stable/profiles/categories index 0fabf5bef6..691304863f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/categories +++ b/sdk_container/src/third_party/portage-stable/profiles/categories @@ -31,8 +31,10 @@ app-text app-vim app-xemacs dev-ada +dev-build dev-cpp dev-db +dev-debug dev-dotnet dev-embedded dev-erlang diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/packages.build b/sdk_container/src/third_party/portage-stable/profiles/default/linux/packages.build index 234eafa6d0..40f3d8e84f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/packages.build +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/packages.build @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This file describes the packages needed to build a stage1 based on this @@ -10,6 +10,7 @@ app-arch/gzip app-arch/xz-utils app-arch/tar app-shells/bash:0 +dev-build/make net-misc/rsync net-misc/wget sys-devel/autoconf @@ -33,7 +34,6 @@ sys-devel/flex sys-devel/gcc sys-devel/gettext sys-devel/gnuconfig -sys-devel/make sys-devel/patch virtual/editor virtual/libc diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/cpu_flags_arm.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/cpu_flags_arm.desc index da1b4ffd34..029f3aa89a 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/desc/cpu_flags_arm.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/desc/cpu_flags_arm.desc @@ -1,14 +1,18 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 aes - Use the AES cryptography instruction set +asimddp - Use the Advanced SIMD dot product instructions crc32 - Use the CRC32 instruction set edsp - Use the enhanced DSP instructions (ARMv*E and ARMv6+) +i8mm - Use the AArch64 Int8 matrix multiplication instructions iwmmxt - Use the iwMMXt instruction set iwmmxt2 - Use the iwMMXt2 instruction set neon - Use the NEON (ASIMD) instruction set sha1 - Use the SHA-1 cryptography instruction set sha2 - Use the SHA-2 cryptography instruction set +sm4 - Use the SM4 cryptography instruction set +sve - Use the Scalable Vector Extension instruction set thumb - Enable Thumb instruction set (ARMv*T and ARMv6+) thumb2 - Enable Thumb-2 instruction set (ARMv*T2 and ARMv7+) v4 - Use instructions added in ARMv4 diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/big-endian/package.mask b/sdk_container/src/third_party/portage-stable/profiles/features/big-endian/package.mask index 0a54498456..407bf030c9 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/big-endian/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/big-endian/package.mask @@ -1,6 +1,14 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# matoro (2024-01-09) +# Test failures on BE (#920353, #902191) +net-misc/nextcloud-client + +# matoro (2024-01-01) +# Known broken on BE (#906100) +games-simulation/openrct2 + # matoro (2023-12-18) # Using boringssl which is explicit no-support for BE (#733080) net-libs/quiche diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/hardened/amd64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/amd64/package.use.mask index c1152ea1c6..4a02dcd759 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/hardened/amd64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/hardened/amd64/package.use.mask @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Sam James (2021-11-27) # Unmask CET here. It works on amd64 and this is the hardened profile. sys-devel/binutils -cet sys-devel/binutils-hppa64 -cet -sys-devel/gdb -cet +dev-debug/gdb -cet sys-libs/binutils-libs -cet sys-libs/glibc -cet sys-devel/gcc -cet diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/musl/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/features/musl/make.defaults index 4c680a7340..3078bdd61b 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 PORTAGE_LIBC="musl" @@ -6,8 +6,8 @@ ELIBC="musl" FEATURES="sandbox sfperms strict" -USE="nptl pic unicode -berkdb -gdbm" -BOOTSTRAP_USE="${BOOTSTRAP_USE} nptl -berkdb -gdbm" +USE="pic unicode -berkdb -gdbm" +BOOTSTRAP_USE="${BOOTSTRAP_USE} -berkdb -gdbm" # All libraries are in /lib or /usr/lib SYMLINK_LIB="no" diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask index 12725fefed..3e116910a4 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask @@ -1,6 +1,20 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Fabian Groffen (2024-01-11) +# Fails to compile: https://bugs.gentoo.org/908961 +=app-editors/vim-core-9.0.2092 +=app-editors/vim-9.0.2092 +=app-editors/gvim-9.0.2092 + +# Maciej Barć (2024-01-06) +# Binary package, which is compiled against glibc +app-office/joplin-desktop + +# Maciej Barć (2024-01-06) +# Binary package, which is compiled against glibc +dev-util/azuredatastudio + # Florian Schmaus (2023-11-22) # Requires systemd which is not supported on musl. sys-power/sandmann-bin 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 3fa72fa2ea..e37fc86b08 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,17 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andrew Ammerlaan (2024-01-12) +# The systemd flag is globally masked on musl. But we need +# systemd's kernel-install to use systemd-boot which is still +# possible on musl via systemd-utils[boot]. +sys-kernel/installkernel -systemd + +# Alfredo Tupone (2024-01-09) +# linked against glibc +sci-libs/caffe2 mkl +dev-libs/oneDNN mkl + # Michał Górny (2023-12-31) # Requires dev-libs/level-zero. dev-lang/ispc gpu @@ -45,7 +56,6 @@ app-admin/sudo sssd # Sam James (2022-10-04) # sys-libs/libsmbios is masked on musl app-laptop/pbbuttonsd macbook -sys-apps/fwupd dell # Sam James (2022-10-04) # Needs masked net-misc/netkit-telnetd @@ -142,6 +152,3 @@ app-shells/bash mem-scramble # static linking works with musl app-shells/mksh -static - -# linked against glibc -sci-libs/caffe2 mkl diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/package.use.mask index 12bba1c5f9..9d5a82e0d8 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/package.use.mask @@ -14,6 +14,10 @@ x11-base/xorg-server elogind # depends on systemd sys-apps/ipmitool openbmc +# Fabian Groffen (2020-06-07) +# installing kernels has no business in Prefix +sys-apps/debianutils installkernel + # Benda Xu (2019-08-20) # avoid gnome-extra/gnome-user-share, which depends on systemd. gnome-base/gnome-extra-apps share diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc index daf95e9715..caee13cd8c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc +++ b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc @@ -1,9 +1,9 @@ -# Copyright 2018-2020 Gentoo Authors +# Copyright 2018-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # tricks to circumvent false positive checks of old kernel -if [[ ${CATEGORY}/${PN} == dev-util/cmake && ${EBUILD_PHASE} == configure ]]; then +if [[ ${CATEGORY}/${PN} == dev-build/cmake && ${EBUILD_PHASE} == configure ]]; then einfo "Removing utimensat outputs..." sed -e '/UTIMENSAT=/d' -i "${S}"/Source/kwsys/CMakeLists.txt || die elif [[ ${CATEGORY}/${PN} == dev-libs/libuv && ${EBUILD_PHASE} == prepare ]]; then diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/profile.bashrc b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/profile.bashrc index 87a6dacd79..6dba1b9ff7 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/profile.bashrc +++ b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/profile.bashrc @@ -43,7 +43,7 @@ elif [[ ${CATEGORY}/${PN} == dev-lang/perl && ${EBUILD_PHASE} == configure ]]; t ebegin "Removing Android detection" sed "/libandroid.so/d" -i "${S}"/Configure eend $? -elif [[ ${CATEGORY}/${PN} == sys-devel/make && ${EBUILD_PHASE} == prepare ]]; then +elif [[ ${CATEGORY}/${PN} == dev-build/make && ${EBUILD_PHASE} == prepare ]]; then ebegin "Prefixifying default shell" sed -i -r "/default_shell/s,\"(/bin/sh),\"${EPREFIX}\1," "${S}"/job.c eend $? @@ -57,7 +57,7 @@ elif [[ ${CATEGORY}/${PN} == dev-lang/php && ${EBUILD_PHASE} == prepare ]]; then ebegin "Prefixifying ext/iconv/config.m4 paths" sed -i -r "/for i in/s,(/usr(/local|)),${EPREFIX}\1,g" "${S}"/ext/iconv/config.m4 eend $? -elif [[ ${CATEGORY}/${PN} == dev-util/cmake && ${EBUILD_PHASE} == prepare ]]; then +elif [[ ${CATEGORY}/${PN} == dev-build/cmake && ${EBUILD_PHASE} == prepare ]]; then einfo "Removing Debian magic..." for f in Modules/{CMakeFindPackageMode,FindPkgConfig,GNUInstallDirs,Platform/{GNU,Linux}}.cmake; do ebegin " Updating $f" 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 0b500c972b..2a74df78bd 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Various packages requiring Rust. @@ -134,6 +134,7 @@ gnome-extra/sushi >=media-libs/libopenraw-0.3.2 media-video/rav1e net-analyzer/wtfis +net-dns/pdns-recursor net-im/gajim >=net-irc/polari-3.37 net-libs/quiche diff --git a/sdk_container/src/third_party/portage-stable/profiles/info_pkgs b/sdk_container/src/third_party/portage-stable/profiles/info_pkgs index bb782b2678..d73d46d824 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/info_pkgs +++ b/sdk_container/src/third_party/portage-stable/profiles/info_pkgs @@ -1,4 +1,4 @@ -# Copyright 2004-2022 Gentoo Authors +# Copyright 2004-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 ## @@ -14,7 +14,7 @@ sys-libs/musl sys-devel/binutils sys-devel/binutils-config sys-devel/libtool -sys-devel/make +dev-build/make dev-lang/python dev-lang/perl dev-lang/rust @@ -28,8 +28,8 @@ sys-devel/lld sys-devel/gcc sys-devel/gcc-config dev-java/java-config -dev-util/cmake -dev-util/meson +dev-build/cmake +dev-build/meson # NOTE: portage no longer list /etc/gentoo-release, # so this is not redundant sys-apps/baselayout 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 18fbd4beae..29638fbe33 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/package.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 #################################################################### @@ -33,6 +33,86 @@ #--- END OF EXAMPLES --- +# Volkmar W. Pogatzki (2024-01-15) +# Old version of a Java library, presently without consumer. +# Blocks removal of dev-java/osgi-core-api +# Version bump to be done later when junit5 can be used for testing. +dev-java/bnd-junit + +# Volkmar W. Pogatzki (2024-01-15) +# Unused Java libraries. Removal on 2024-02-15 +dev-java/glassfish-persistence +dev-java/osgi-core-api +dev-java/osgi-enterprise-api +dev-java/osgi-compendium +dev-java/osgi-foundation + +# Michał Górny (2024-01-12) +# Breaks data collection for a lot of packages, by attempting to import +# all modules (not just test files), and therefore failing if they have +# optional runtime dependencies. +=dev-python/pytest-asyncio-0.23.3 + +# Michał Górny (2024-01-11) +# These plugins are no longer maintained. At least +# dev-python/pytest-virtualenv is broken. They have no revdeps left. +# Removal on 2024-02-10. Bug #921836. +dev-python/pytest-fixture-config +dev-python/pytest-shutil +dev-python/pytest-verbose-parametrize +dev-python/pytest-virtualenv + +# Michał Górny (2024-01-11) +# Breaks random test suites using pytest-xdist. +=dev-python/pytest-asyncio-0.23.4_alpha1 + +# Viorel Munteanu (2024-01-08) +# Masked for removal due to licensing issues and possible GPL infringement. +# Removal: 2024-02-07. Bug #766129. +x11-misc/albert + +# Michał Górny (2024-01-07) +# A Gentoo fork of an abandoned library that was historically used +# by app-office/libreoffice. No revdeps left. +# Removal on 2024-02-06. Bug #921576. +sys-devel/ucpp + +# John Helmert III (2024-01-06) +# Unmaintained in Gentoo, outdated, and vulnerable +# Removal on 2024-02-06. Bugs #856466, #865253 +net-dns/totd + +# John Helmert III (2024-01-06) +# Unmaintained in Gentoo, outdated, vulnerable +# Removal on 2024-02-06. Bug #918536 +net-nds/tac_plus + +# Andreas Sturmlechner (2024-01-03) +# Unmaintained upstream, no more revdeps. +# Removal on 2024-02-03. Bug #877311 +x11-libs/snorenotify + +# Alfredo Tupone (2024-02-02) +# No more used by any package (bug #921167) +# remove in 30 days +net-mail/courier-makedat + +# Michał Górny (2024-01-01) +# The version seems to introduce an ABI breakage that causes +# incompatibility with extensions built using the previous version +# https://github.com/pypy/pypy/issues/4816 +=dev-python/pypy3-7.3.14 +=dev-python/pypy3_10-7.3.14-r1 +=dev-python/pypy3_10-exe-7.3.14 +=dev-python/pypy3_10-exe-bin-7.3.14 + +# Petr Vaněk (2024-01-01) +# Mirror restricted package, but the source code is no longer available. +# Homepage gone. Moreover, there is multiple issues reported with modern +# compilers. +# Removal: 2024-01-31. Bug #906645. +net-mail/courierpassd + # Michał Górny (2023-12-31) # Unmaintained. A number of serious bugs reported. Homepage gone. # No release since at least 2010. @@ -45,25 +125,12 @@ app-misc/utimer # Removal on 2024-01-30. Bug #849077. sys-block/noflushd -# Michał Górny (2023-12-31) -# Buggy code that carries local patches already. Last release in 2011. -# Removal on 2024-01-30. Bug #878629. -net-proxy/tayga - # Michał Górny (2023-12-31) # Buggy code that carries local patches already. The ebuild installs # junk files. No upstream activity since 2009. # Removal on 2024-01-30. Bug #874087. app-admin/newsyslog -# Michał Górny (2023-12-31) -# Unresolved vulnerability. The current version is from 2022-03, -# and the bump is non-trivial. -# Removal on 2024-01-30. Bug #879181. -acct-group/fluentd -acct-user/fluentd -app-admin/fluentd - # Michał Górny (2023-12-31) # Buggy code with a number of local patches already. Last release # in 2003. media-sound/jack2 should be a good alternative. @@ -108,13 +175,6 @@ dev-python/pychroot # newer slot instead. Masked for removal on 2024-01-27. dev-ruby/rubyzip:1 -# Ulrich Müller (2023-12-26) -# Program errors out with a segmentation fault. -# Use games-fps/serioussam along with games-fps/serioussam-tfe-data -# and games-fps/serioussam-tse-data as replacement. -# Removal on 2024-01-09, bug #854567. -games-fps/serious-sam-tse - # Andreas Sturmlechner (2023-12-25) # Masked until KF6 is unmasked. ~media-libs/mpvqt-1.0.0 @@ -156,7 +216,7 @@ media-sound/guayadeque # Michał Górny (2023-12-22) # Abandoned and archived upstream. Known broken. No revdeps. -# dev-go/lichen::guru is the recommended replacement. +# dev-go/lichen is the recommended replacement. # Removal on 2024-01-21. Bug #913755. dev-go/golicense @@ -189,8 +249,8 @@ app-containers/go-secbench # Removal on 2024-01-17. Bug #920271. dev-python/ruamel-std-pathlib -# Andreas Sturmlechner (2023-12-20) -# KDE Plasma 6 Beta 2 (5.91) and Frameworks 6 Beta 2 (5.247) mask +# Andreas Sturmlechner (2024-01-10) +# KDE Plasma 6 RC1 (5.92) and Frameworks 6 RC1 (5.248) mask # *** PRE-RELEASE *** NO BUGS WILL BE FIXED *** OVERLAY PRs WELCOME *** # Do *not* attempt to mix with live ebuilds from kde overlay. # To install alongside KDE Frameworks 5: @@ -208,155 +268,163 @@ dev-python/ruamel-std-pathlib # - file a bug after making sure none exists yet for your issue # - runtime bugs: https://community.kde.org/Plasma/Plasma_6#How_to_use/test_it # - work with upstream and help test patches using /etc/portage/patches -# - trying to reproduce issues on master branch currently requires to go fully -# live. Plasma 5.91.0 will not build with Frameworks >=5.248. -~kde-plasma/bluedevil-5.91.0 -~kde-plasma/breeze-5.91.0 -~kde-plasma/breeze-grub-5.91.0 -~kde-plasma/breeze-gtk-5.91.0 -~kde-plasma/breeze-plymouth-5.91.0 -~kde-plasma/discover-5.91.0 -~kde-plasma/drkonqi-5.91.0 -~kde-plasma/flatpak-kcm-5.91.0 -~kde-plasma/kactivitymanagerd-5.91.0 -~kde-plasma/kde-cli-tools-5.91.0 -~kde-plasma/kde-gtk-config-5.91.0 -~kde-plasma/kdecoration-5.91.0 -~kde-plasma/kdeplasma-addons-5.91.0 -~kde-plasma/kgamma-5.91.0 -~kde-plasma/kglobalacceld-5.91.0 -~kde-plasma/kinfocenter-5.91.0 -~kde-plasma/kmenuedit-5.91.0 -~kde-plasma/kpipewire-5.91.0 -~kde-plasma/kscreen-5.91.0 -~kde-plasma/kscreenlocker-5.91.0 -~kde-plasma/ksshaskpass-5.91.0 -~kde-plasma/ksystemstats-5.91.0 -~kde-plasma/kwallet-pam-5.91.0 -~kde-plasma/kwayland-5.91.0 -~kde-plasma/kwayland-integration-5.91.0 -~kde-plasma/kwin-5.91.0 -~kde-plasma/kwrited-5.91.0 -~kde-plasma/layer-shell-qt-5.91.0 -~kde-plasma/libkscreen-5.91.0 -~kde-plasma/libksysguard-5.91.0 -~kde-plasma/libplasma-5.91.0 -~kde-plasma/milou-5.91.0 -~kde-plasma/ocean-sound-theme-5.91.0 -~kde-plasma/oxygen-5.91.0 -~kde-plasma/oxygen-sounds-5.91.0 -~kde-plasma/plasma-activities-5.91.0 -~kde-plasma/plasma-activities-stats-5.91.0 -~kde-plasma/plasma-browser-integration-5.91.0 -~kde-plasma/plasma-desktop-5.91.0 -~kde-plasma/plasma-disks-5.91.0 -~kde-plasma/plasma-firewall-5.91.0 -~kde-plasma/plasma-integration-5.91.0 -~kde-plasma/plasma-meta-5.91.0 -~kde-plasma/plasma-nm-5.91.0 -~kde-plasma/plasma-pa-5.91.0 -~kde-plasma/plasma-sdk-5.91.0 -~kde-plasma/plasma-systemmonitor-5.91.0 -~kde-plasma/plasma-thunderbolt-5.91.0 -~kde-plasma/plasma-vault-5.91.0 -~kde-plasma/plasma-welcome-5.91.0 -~kde-plasma/plasma-workspace-5.91.0 -~kde-plasma/plasma-workspace-wallpapers-5.91.0 -~kde-plasma/plasma5support-5.91.0 -~kde-plasma/plymouth-kcm-5.91.0 -~kde-plasma/polkit-kde-agent-5.91.0 -~kde-plasma/powerdevil-5.91.0 -~kde-plasma/print-manager-5.91.0 +~kde-plasma/bluedevil-5.92.0 +~kde-plasma/breeze-5.92.0 +~kde-plasma/breeze-grub-5.92.0 +~kde-plasma/breeze-gtk-5.92.0 +~kde-plasma/breeze-plymouth-5.92.0 +~kde-plasma/discover-5.92.0 +~kde-plasma/drkonqi-5.92.0 +~kde-plasma/flatpak-kcm-5.92.0 +~kde-plasma/kactivitymanagerd-5.92.0 +~kde-plasma/kde-cli-tools-5.92.0 +~kde-plasma/kde-gtk-config-5.92.0 +~kde-plasma/kdecoration-5.92.0 +~kde-plasma/kdeplasma-addons-5.92.0 +~kde-plasma/kgamma-5.92.0 +~kde-plasma/kglobalacceld-5.92.0 +~kde-plasma/kinfocenter-5.92.0 +~kde-plasma/kmenuedit-5.92.0 +~kde-plasma/kpipewire-5.92.0 +~kde-plasma/kscreen-5.92.0 +~kde-plasma/kscreenlocker-5.92.0 +~kde-plasma/ksshaskpass-5.92.0 +~kde-plasma/ksystemstats-5.92.0 +~kde-plasma/kwallet-pam-5.92.0 +~kde-plasma/kwayland-5.92.0 +~kde-plasma/kwayland-integration-5.92.0 +~kde-plasma/kwin-5.92.0 +~kde-plasma/kwrited-5.92.0 +~kde-plasma/layer-shell-qt-5.92.0 +~kde-plasma/libkscreen-5.92.0 +~kde-plasma/libksysguard-5.92.0 +~kde-plasma/libplasma-5.92.0 +~kde-plasma/milou-5.92.0 +~kde-plasma/ocean-sound-theme-5.92.0 +~kde-plasma/oxygen-5.92.0 +~kde-plasma/oxygen-sounds-5.92.0 +~kde-plasma/plasma-activities-5.92.0 +~kde-plasma/plasma-activities-stats-5.92.0 +~kde-plasma/plasma-browser-integration-5.92.0 +~kde-plasma/plasma-desktop-5.92.0 +~kde-plasma/plasma-disks-5.92.0 +~kde-plasma/plasma-firewall-5.92.0 +~kde-plasma/plasma-integration-5.92.0 +~kde-plasma/plasma-meta-5.92.0 +~kde-plasma/plasma-nm-5.92.0 +~kde-plasma/plasma-pa-5.92.0 +~kde-plasma/plasma-sdk-5.92.0 +~kde-plasma/plasma-systemmonitor-5.92.0 +~kde-plasma/plasma-thunderbolt-5.92.0 +~kde-plasma/plasma-vault-5.92.0 +~kde-plasma/plasma-welcome-5.92.0 +~kde-plasma/plasma-workspace-5.92.0 +~kde-plasma/plasma-workspace-wallpapers-5.92.0 +~kde-plasma/plasma5support-5.92.0 +~kde-plasma/plymouth-kcm-5.92.0 +~kde-plasma/polkit-kde-agent-5.92.0 +~kde-plasma/powerdevil-5.92.0 +~kde-plasma/print-manager-5.92.0 =kde-plasma/print-manager-23.08.5-r100 -~kde-plasma/sddm-kcm-5.91.0 -~kde-plasma/systemsettings-5.91.0 -~kde-plasma/wacomtablet-5.91.0 -~kde-plasma/xdg-desktop-portal-kde-5.91.0 -~kde-frameworks/frameworkintegration-5.247.0 -~kde-frameworks/attica-5.247.0 -~kde-frameworks/bluez-qt-5.247.0 -~kde-frameworks/breeze-icons-5.247.0 -~kde-frameworks/breeze-icons-rcc-5.247.0 -~kde-frameworks/extra-cmake-modules-5.247.0 -~kde-frameworks/karchive-5.247.0 -~kde-frameworks/kcalendarcore-5.247.0 -~kde-frameworks/kcodecs-5.247.0 -~kde-frameworks/kconfig-5.247.0 -~kde-frameworks/kcoreaddons-5.247.0 -~kde-frameworks/kdbusaddons-5.247.0 -~kde-frameworks/kdnssd-5.247.0 -~kde-frameworks/kguiaddons-5.247.0 -~kde-frameworks/kholidays-5.247.0 -~kde-frameworks/ki18n-5.247.0 -~kde-frameworks/kidletime-5.247.0 -~kde-frameworks/kirigami-5.247.0 -~kde-frameworks/kitemmodels-5.247.0 -~kde-frameworks/kitemviews-5.247.0 -~kde-frameworks/kplotting-5.247.0 -~kde-frameworks/kquickcharts-5.247.0 -~kde-frameworks/ktexttemplate-5.247.0 -~kde-frameworks/kwidgetsaddons-5.247.0 -~kde-frameworks/kwindowsystem-5.247.0 -~kde-frameworks/modemmanager-qt-5.247.0 -~kde-frameworks/networkmanager-qt-5.247.0 -~kde-frameworks/prison-5.247.0 -~kde-frameworks/solid-5.247.0 -~kde-frameworks/sonnet-5.247.0 -~kde-frameworks/syntax-highlighting-5.247.0 -~kde-frameworks/threadweaver-5.247.0 -~kde-frameworks/kauth-5.247.0 -~kde-frameworks/kcolorscheme-5.247.0 -~kde-frameworks/kcompletion-5.247.0 -~kde-frameworks/kcontacts-5.247.0 -~kde-frameworks/kcrash-5.247.0 -~kde-frameworks/kdoctools-5.247.0 -~kde-frameworks/kfilemetadata-5.247.0 -~kde-frameworks/kimageformats-5.247.0 -~kde-frameworks/kjobwidgets-5.247.0 -~kde-frameworks/knotifications-5.247.0 -~kde-frameworks/kpackage-5.247.0 -~kde-frameworks/kpeople-5.247.0 -~kde-frameworks/kpty-5.247.0 -~kde-frameworks/kstatusnotifieritem-5.247.0 -~kde-frameworks/ksvg-5.247.0 -~kde-frameworks/kunitconversion-5.247.0 -~kde-frameworks/syndication-5.247.0 -~kde-frameworks/baloo-5.247.0 -~kde-frameworks/kbookmarks-5.247.0 -~kde-frameworks/kcmutils-5.247.0 -~kde-frameworks/kconfigwidgets-5.247.0 -~kde-frameworks/kdav-5.247.0 -~kde-frameworks/kdeclarative-5.247.0 -~kde-frameworks/kded-5.247.0 -~kde-frameworks/kdesu-5.247.0 -~kde-frameworks/kglobalaccel-5.247.0 -~kde-frameworks/kiconthemes-5.247.0 -~kde-frameworks/kio-5.247.0 -~kde-frameworks/knewstuff-5.247.0 -~kde-frameworks/knotifyconfig-5.247.0 -~kde-frameworks/kparts-5.247.0 -~kde-frameworks/krunner-5.247.0 -~kde-frameworks/kservice-5.247.0 -~kde-frameworks/ktexteditor-5.247.0 -~kde-frameworks/ktextwidgets-5.247.0 -~kde-frameworks/kuserfeedback-5.247.0 -~kde-frameworks/kwallet-5.247.0 -~kde-frameworks/kxmlgui-5.247.0 -~kde-frameworks/purpose-5.247.0 -~kde-frameworks/qqc2-desktop-style-5.247.0 -~kde-apps/kdegraphics-mobipocket-24.01.85 +~kde-plasma/sddm-kcm-5.92.0 +~kde-plasma/systemsettings-5.92.0 +~kde-plasma/wacomtablet-5.92.0 +~kde-plasma/xdg-desktop-portal-kde-5.92.0 +~kde-frameworks/frameworkintegration-5.248.0 +~kde-frameworks/attica-5.248.0 +~kde-frameworks/bluez-qt-5.248.0 +~kde-frameworks/breeze-icons-5.248.0 +~kde-frameworks/extra-cmake-modules-5.248.0 +~kde-frameworks/karchive-5.248.0 +~kde-frameworks/kcalendarcore-5.248.0 +~kde-frameworks/kcodecs-5.248.0 +~kde-frameworks/kconfig-5.248.0 +~kde-frameworks/kcoreaddons-5.248.0 +~kde-frameworks/kdbusaddons-5.248.0 +~kde-frameworks/kdnssd-5.248.0 +~kde-frameworks/kguiaddons-5.248.0 +~kde-frameworks/kholidays-5.248.0 +~kde-frameworks/ki18n-5.248.0 +~kde-frameworks/kidletime-5.248.0 +~kde-frameworks/kirigami-5.248.0 +~kde-frameworks/kitemmodels-5.248.0 +~kde-frameworks/kitemviews-5.248.0 +~kde-frameworks/kplotting-5.248.0 +~kde-frameworks/kquickcharts-5.248.0 +~kde-frameworks/ktexttemplate-5.248.0 +~kde-frameworks/kuserfeedback-5.248.0 +~kde-frameworks/kwidgetsaddons-5.248.0 +~kde-frameworks/kwindowsystem-5.248.0 +~kde-frameworks/modemmanager-qt-5.248.0 +~kde-frameworks/networkmanager-qt-5.248.0 +~kde-frameworks/prison-5.248.0 +~kde-frameworks/solid-5.248.0 +~kde-frameworks/sonnet-5.248.0 +~kde-frameworks/syntax-highlighting-5.248.0 +~kde-frameworks/threadweaver-5.248.0 +~kde-frameworks/kauth-5.248.0 +~kde-frameworks/kcolorscheme-5.248.0 +~kde-frameworks/kcompletion-5.248.0 +~kde-frameworks/kcontacts-5.248.0 +~kde-frameworks/kcrash-5.248.0 +~kde-frameworks/kdoctools-5.248.0 +~kde-frameworks/kfilemetadata-5.248.0 +~kde-frameworks/kimageformats-5.248.0 +~kde-frameworks/kjobwidgets-5.248.0 +~kde-frameworks/knotifications-5.248.0 +~kde-frameworks/kpackage-5.248.0 +~kde-frameworks/kpeople-5.248.0 +~kde-frameworks/kpty-5.248.0 +~kde-frameworks/kstatusnotifieritem-5.248.0 +~kde-frameworks/ksvg-5.248.0 +~kde-frameworks/kunitconversion-5.248.0 +~kde-frameworks/syndication-5.248.0 +~kde-frameworks/baloo-5.248.0 +~kde-frameworks/kbookmarks-5.248.0 +~kde-frameworks/kcmutils-5.248.0 +~kde-frameworks/kconfigwidgets-5.248.0 +~kde-frameworks/kdav-5.248.0 +~kde-frameworks/kdeclarative-5.248.0 +~kde-frameworks/kded-5.248.0 +~kde-frameworks/kdesu-5.248.0 +~kde-frameworks/kglobalaccel-5.248.0 +~kde-frameworks/kiconthemes-5.248.0 +~kde-frameworks/kio-5.248.0 +~kde-frameworks/knewstuff-5.248.0 +~kde-frameworks/knotifyconfig-5.248.0 +~kde-frameworks/kparts-5.248.0 +~kde-frameworks/krunner-5.248.0 +~kde-frameworks/kservice-5.248.0 +~kde-frameworks/ktexteditor-5.248.0 +~kde-frameworks/ktextwidgets-5.248.0 +~kde-frameworks/kwallet-5.248.0 +~kde-frameworks/kxmlgui-5.248.0 +~kde-frameworks/purpose-5.248.0 +~kde-frameworks/qqc2-desktop-style-5.248.0 +~kde-apps/kaccounts-integration-24.01.90 +~kde-apps/kdegraphics-mobipocket-24.01.90 =kde-apps/kio-extras-23.08.5-r100 -~kde-apps/kio-extras-24.01.85 -~kde-apps/kio-extras-kf5-24.01.85 -~kde-apps/libkexiv2-24.01.85 -~kde-apps/spectacle-24.01.85 +~kde-apps/kio-extras-24.01.90 +~kde-apps/kio-extras-kf5-24.01.90 +~kde-apps/libkexiv2-24.01.90 +~kde-apps/spectacle-24.01.90 ~kde-misc/kio-fuse-5.1.0 ~dev-libs/appstream-1.0.1 -~dev-libs/kdiagram-3.0.0 -~dev-libs/kirigami-addons-0.11.76_p20231222 +~dev-libs/kdiagram-3.0.1 +~dev-libs/kirigami-addons-0.11.90 +~dev-libs/ktextaddons-1.5.3 +~dev-libs/kweathercore-0.8.0 ~media-libs/libqaccessibilityclient-0.6.0 ~media-libs/phonon-4.12.0 ~media-libs/phonon-vlc-0.12.0 +~media-libs/pulseaudio-qt-1.4.0 +~net-libs/kdsoap-2.2.0 +~net-libs/kdsoap-ws-discovery-client-0.3.0 +~net-libs/signon-ui-0.15_p20231016 +~net-libs/accounts-qt-1.16_p20220803 +~net-libs/accounts-qml-0.7_p20231028 +~net-libs/signon-oauth2-0.25_p20210102 +=net-libs/signond-8.61-r100 ~sys-auth/polkit-qt-0.175.0 # Hans de Graaff (2023-12-17) @@ -405,17 +473,6 @@ dev-ruby/http:4 (2023-12-12) -# Merged into dev-python/blake3[-rust]. Please use that instead. -# Removal on 2024-01-11. Bug #919771. -dev-python/blake3-py-c - -# Hans de Graaff (2023-12-10) -# Test failures that seem to indicate this package no longer works -# correctly. Last release 6 years ago. No reverse dependencies. -# Masked for removal on 2024-01-10. -dev-ruby/sinatra-partial - # Sam James (2023-12-09) # ext4 corruption bug: https://lore.kernel.org/stable/20231205122122.dfhhoaswsfscuhc3@quack3/ (bug #919675) # Please update immediately to the latest versions in each series. @@ -430,13 +487,6 @@ dev-ruby/sinatra-partial =sys-kernel/vanilla-kernel-6.1.64 =sys-kernel/vanilla-kernel-6.1.65 -# Hans de Graaff (2023-12-09) -# Old slots that are not ruby32-compatible. No reverse dependencies -# left. Please use the newer slot instead. Masked for removal on -# 2024-01-09. -dev-ruby/gettext-setup:0 -dev-ruby/fast_gettext:0 - # Michał Górny (2023-12-08) # The both remaining virtuals are deprecated in favor of using # python_gen_cond_dep directly, and no longer used in any packages @@ -451,21 +501,10 @@ virtual/python-greenlet # https://github.com/iovisor/bcc/issues/4830 =dev-util/bcc-0.29.0 -# Hans de Graaff (2023-12-06) -# Copy of dev-ruby/listen spefically for dev-ruby/sass. That package now -# uses dev-ruby/listen directly so there is no longer a need for -# sass-listen. Masked for removal on 2024-01-06. -dev-ruby/sass-listen - -# Hans de Graaff (2023-12-06) -# Last release in 2015, not compatible with Ruby 3.2. No reverse -# dependencies. Masked for removal on 2024-01-06. -dev-ruby/semver2 - # Eli Schwartz (2023-12-02) # Has a bug that breaks sys-apps/portage. Upgrade to 1.3.0-r1 instead. # Bug #919072. -=dev-util/meson-1.3.0 +=dev-build/meson-1.3.0 # Michał Górny (2023-11-30) # Last commit in 2020. It was used exclusively by dev-python/ipython, @@ -473,14 +512,6 @@ dev-ruby/semver2 # Removal on 2023-12-30. Bug #916535. dev-python/backcall -# John Helmert III (2023-11-25) -# Multiple vulnerabilities, unmaintained upstream and in Gentoo. -# subtitleripper included as sole reverse dependency, similarly -# unmaintained, and with no other reverse dependencies. -# Removal on 2023-12-24, bug #824290. -app-text/gocr -media-video/subtitleripper - # Sam James (2023-11-25) # Breaks desktop icon rendering, see bug #904468. # Upstream bug: https://gitlab.xfce.org/xfce/xfdesktop/-/issues/242 @@ -536,6 +567,7 @@ media-video/subtitleripper # downstream. Has no active maintainer in Gentoo. If you use DAHDI and have # some ideas how to help, please see bug #914477. # Removal on 2024-03-01. +net-libs/libpri net-misc/dahdi net-misc/dahdi-tools net-misc/openr2 @@ -588,10 +620,6 @@ net-misc/openr2 # reverse dependencies are fixed. Tracker bug is bug #906077. =dev-libs/libfmt-10* -# Andreas Sturmlechner (2023-04-30) -# Breaking even latest ~arch version of KDE PIM, bug #905352. -=dev-libs/ktextaddons-1.3* - # Sam James (2023-04-13) # Leads to broken terminal output in e.g. vim and openrc and other applications # like joe crashing. @@ -638,10 +666,6 @@ x11-drivers/nvidia-drivers:0/390 # migrate to a newer branch. (2022-09-18) -# Unfixed root privilege escalation, bug #631552 -sys-cluster/slurm - # Joonas Niilola (2022-04-29) # Apparently the "b" in version means "beta". 3.24 is available, we # should update to that. #841437 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.13/x64/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.13/x64/package.mask index 320a6bbb1a..b1624df9f4 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.13/x64/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.13/x64/package.mask @@ -1,2 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 + +# Fabian Groffen (2024-01-11) +# Fails to compile: +# https://github.com/c-ares/c-ares/issues/682 +=net-dns/c-ares-1.25.0 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/ppc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/ppc/package.use.mask index c31b5144ba..9c83518aa2 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/ppc/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/ppc/package.use.mask @@ -12,4 +12,4 @@ media-libs/imlib2 cpu_flags_x86_mmx # Elias Pipping (2007-09-01) # mpg123 does not compile with USE=mmx media-sound/mpg123 cpu_flags_x86_mmx -media-libs/libmpg123 cpu_flags_x86_mmx +media-sound/mpg123-base cpu_flags_x86_mmx diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x64/package.use.mask index 02a3e77938..e646fbe43b 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/arch/x64/package.use.mask @@ -8,7 +8,7 @@ media-libs/xvid -pic # Jeremy Olexa (2010-07-29) # Relocation issues on 32-bit OSX only, bug #329859 media-sound/mpg123 -cpu_flags_x86_mmx -cpu_flags_x86_sse -media-libs/libmpg123 -cpu_flags_x86_mmx -cpu_flags_x86_sse +media-sound/mpg123-base -cpu_flags_x86_mmx -cpu_flags_x86_sse # Fabian Groffen (2009-02-01) # Doesn't compile on 32-bits OSX only, bug #257225 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/package.use.mask index 40dcb8932b..4b5ae83616 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Fabian Groffen (2023-05-03) @@ -23,7 +23,7 @@ media-gfx/tachyon mpi # Fabian Groffen (2012-01-01) # gdb server is not supported on this platform -sys-devel/gdb server +dev-debug/gdb server # Fabian Groffen (2011-01-08) # Darwin has libuuid from util-linux diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/package.use.mask index fcace26423..366025a398 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Fabian Groffen (2022-02-13) @@ -11,10 +11,6 @@ mail-client/mutt gsasl # Not yet tested so we may be able to drop this later. dev-lang/ruby systemtap -# Fabian Groffen (2020-06-07) -# installing kernels has no business in Prefix -sys-apps/debianutils installkernel - # Michael Haubenwallner (2019-05-02) # gold is linux only, and is required by cxx sys-devel/binutils gold default-gold @@ -26,7 +22,7 @@ net-libs/libsoup gssapi samba vala net-libs/glib-networking gnome libproxy net-misc/wget metalink uuid sys-apps/dbus selinux elogind systemd -app-doc/doxygen clang doxysearch qt5 gui +app-text/doxygen clang doxysearch qt5 gui app-text/ghostscript-gpl cups app-text/texlive-core cjk diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use index e55d347ecc..64368f304e 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Andreas Sturmlechner (2023-11-12) @@ -16,7 +16,7 @@ dev-qt/qtgui:5 accessibility egl libinput # on desktop profiles and CMake is unavoidable, it feels a shame to drag in # Qt 6 just for something people are unlikely to want. Plus, it avoids a # circular dependency out of the box. -dev-util/cmake -gui -qt5 +dev-build/cmake -gui -qt5 -qt6 # Andreas Sturmlechner (2023-07-29) # Required by dev-python/PyQt5[multimedia] diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2024 b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2024 new file mode 100644 index 0000000000..61c3e0552e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2024 @@ -0,0 +1,26 @@ +move dev-python/pysol_cards dev-python/pysol-cards +move sys-kernel/installkernel-gentoo sys-kernel/installkernel +move app-doc/NaturalDocs app-text/NaturalDocs +move app-doc/doxygen app-text/doxygen +move app-doc/halibut app-text/halibut +move app-doc/psmark app-text/psmark +move app-doc/xmltoman app-text/xmltoman +move app-doc/zeal app-text/zeal +move sys-devel/gdb dev-debug/gdb +move sys-devel/gdb-apple dev-debug/gdb-apple +move dev-util/lldb dev-debug/lldb +move dev-util/cgdb dev-debug/cgdb +move dev-util/ninja dev-build/ninja +move dev-util/samurai dev-build/samurai +move sys-devel/make dev-build/make +move sys-devel/bmake dev-build/bmake +move sys-devel/pmake dev-build/pmake +move sys-devel/remake dev-build/remake +move dev-util/valgrind dev-debug/valgrind +move dev-util/meson-format-array dev-build/meson-format-array +move dev-util/meson dev-build/meson +move dev-util/cmake-fedora dev-build/cmake-fedora +move dev-util/ignition-cmake dev-build/ignition-cmake +move dev-util/rocm-cmake dev-build/rocm-cmake +move dev-util/tinycmmc dev-build/tinycmmc +move dev-util/cmake dev-build/cmake 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 aa773eeb74..311978a68d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/use.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/use.desc @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Keep them sorted @@ -250,7 +250,7 @@ osc - Enable support for Open Sound Control oss - Add support for OSS (Open Sound System) otf - Install OpenType font versions pam - Add support for PAM (Pluggable Authentication Modules) - DANGEROUS to arbitrarily flip -pch - Enable precompiled header support for faster compilation at the expense of disk space and memory (>=sys-devel/gcc-3.4 only) +pch - Enable precompiled header support for faster compilation at the expense of disk space and memory pcmcia - Add support for PCMCIA slots/devices found on laptop computers pcre - Add support for Perl Compatible Regular Expressions pda - Add support for portable devices @@ -354,7 +354,7 @@ usb - Add USB support to applications that have optional USB support (e.g. cups) v4l - Enable support for video4linux (using linux-headers or userspace libv4l libraries) vaapi - Enable Video Acceleration API for hardware decoding vala - Enable bindings for dev-lang/vala -valgrind - Enable annotations for accuracy. May slow down runtime slightly. Safe to use even if not currently using dev-util/valgrind +valgrind - Enable annotations for accuracy. May slow down runtime slightly. Safe to use even if not currently using dev-debug/valgrind vanilla - Do not add extra patches which change default behaviour; DO NOT USE THIS ON A GLOBAL SCALE as the severity of the meaning changes drastically vcd - Video CD support vdpau - Enable the Video Decode and Presentation API for Unix acceleration interface From 38fe9817fc7da3a132a1ad6bcd3f70d4f84eef91 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:49 +0000 Subject: [PATCH 081/130] sys-apps/attr: Sync with Gentoo It's from Gentoo commit 40039c6c1315d94987b4c3740efe22c929b6aa05. --- .../portage-stable/sys-apps/attr/Manifest | 1 + .../sys-apps/attr/attr-2.5.1-r2.ebuild | 4 +- .../sys-apps/attr/attr-2.5.2.ebuild | 73 +++++++++++++++++++ .../sys-apps/attr/attr-9999.ebuild | 32 +------- 4 files changed, 80 insertions(+), 30 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/attr/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/attr/Manifest index e7ed8d74a0..0e025eaf23 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/attr/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/attr/Manifest @@ -1 +1,2 @@ DIST attr-2.5.1.tar.xz 318188 BLAKE2B 876dcbd802ea79b7851640f208820ffdfb73dc46065af673037c6dd50ad2af158f9f74b34cf45728baf9d0cc5572b40c3f102aa2907245a877db0d3879e38f04 SHA512 9e5555260189bb6ef2440c76700ebb813ff70582eb63d446823874977307d13dfa3a347dfae619f8866943dfa4b24ccf67dadd7e3ea2637239fdb219be5d2932 +DIST attr-2.5.2.tar.xz 334180 BLAKE2B cf26348c3a96622e4f62493ac7655e14b6580d36a5784ef4c3750178856eceabd33192fd58516be21c8aa1ad41d56c024ad440ef4bc922bed8f7a4984ea16c63 SHA512 f587ea544effb7cfed63b3027bf14baba2c2dbe3a9b6c0c45fc559f7e8cb477b3e9a4a826eae30f929409468c50d11f3e7dc6d2500f41e1af8662a7e96a30ef3 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.1-r2.ebuild index fd70c8e82c..93dc3a3632 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ fi DESCRIPTION="Extended attributes tools" HOMEPAGE="https://savannah.nongnu.org/projects/attr" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" IUSE="debug nls static-libs" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.2.ebuild new file mode 100644 index 0000000000..0c5a2dce34 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal usr-ldscript + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git" + inherit autotools git-r3 +else + inherit libtool + + SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="Extended attributes tools" +HOMEPAGE="https://savannah.nongnu.org/projects/attr" + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="debug nls static-libs" + +BDEPEND="nls? ( sys-devel/gettext )" + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + po/update-potfiles || die + eautopoint + eautoreconf + else + # bug #580792 + elibtoolize + fi +} + +multilib_src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}"/bin + --libexecdir="${EPREFIX}"/usr/$(get_libdir) + --enable-shared + $(use_enable static-libs static) + $(use_enable nls) + $(use_enable debug) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi; then + # We install attr into /bin, so we need the shared lib with it + gen_usr_ldscript -a attr + fi + + # Add a wrapper until people upgrade. + # TODO: figure out when this was added & when we can drop it! + insinto /usr/include/attr + newins "${FILESDIR}"/xattr-shim.h xattr.h +} + +multilib_src_install_all() { + if ! use static-libs; then + find "${ED}" -name '*.la' -delete || die + fi + + einstalldocs +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-9999.ebuild index f5ee0bed08..0c5a2dce34 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit toolchain-funcs multilib-minimal usr-ldscript +inherit multilib-minimal usr-ldscript if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git" @@ -11,23 +11,19 @@ if [[ ${PV} == 9999 ]] ; then else inherit libtool - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Extended attributes tools" HOMEPAGE="https://savannah.nongnu.org/projects/attr" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" IUSE="debug nls static-libs" BDEPEND="nls? ( sys-devel/gettext )" -PATCHES=( - "${FILESDIR}"/${PN}-2.5.1-r2-fix-symver.patch -) - src_prepare() { default @@ -57,26 +53,6 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install - # Sanity check until we track down why this is happening. bug #644048 - local lib="${ED}/usr/$(get_libdir)/libattr.so.1" - if [[ -e ${lib} ]] ; then - local versions=$($(tc-getREADELF) -V "${lib}") - local symbols=$($(tc-getREADELF) -sW "${lib}") - if [[ "${versions}" != *"ATTR_1.0"* || \ - "${versions}" != *"ATTR_1.1"* || \ - "${versions}" != *"ATTR_1.2"* || \ - "${versions}" != *"ATTR_1.3"* || \ - "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then - echo "# readelf -V ${lib}" - echo "${versions}" - echo "# readelf -sW ${lib}" - echo "${symbols}" - die "Symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048" - else - einfo "${lib} passed symbol checks" - fi - fi - if multilib_is_native_abi; then # We install attr into /bin, so we need the shared lib with it gen_usr_ldscript -a attr From cf176bec351b93bbadd24410af3aa96b6d51762a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:54 +0000 Subject: [PATCH 082/130] sys-apps/debianutils: Sync with Gentoo It's from Gentoo commit 1548f149879fca4915d49d3a1991d9d2ebd03e57. --- .../sys-apps/debianutils/debianutils-5.14.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/debianutils/debianutils-5.14.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/debianutils/debianutils-5.14.ebuild index 614f9cdff5..a8d4fd2bc6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/debianutils/debianutils-5.14.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/debianutils/debianutils-5.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ IUSE="+installkernel static" PDEPEND=" installkernel? ( || ( - sys-kernel/installkernel-gentoo + sys-kernel/installkernel sys-kernel/installkernel-systemd ) ) From 100803577537d2ac8eed6f6f14fa4477552a0a76 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:14:55 +0000 Subject: [PATCH 083/130] sys-apps/dtc: Sync with Gentoo It's from Gentoo commit e55f1858bbe008cf3d98e46e81b1880a781c622c. --- .../portage-stable/sys-apps/dtc/dtc-1.6.0.ebuild | 6 +++--- .../portage-stable/sys-apps/dtc/dtc-1.7.0.ebuild | 6 +++--- .../third_party/portage-stable/sys-apps/dtc/dtc-9999.ebuild | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-1.6.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-1.6.0.ebuild index 64c82691f8..6e285f4459 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-1.6.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-1.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,8 +21,8 @@ SLOT="0" IUSE="static-libs yaml" BDEPEND=" - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex virtual/pkgconfig " RDEPEND="yaml? ( dev-libs/libyaml )" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-1.7.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-1.7.0.ebuild index 2cc4e96840..f674774c83 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-1.7.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-1.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,8 +24,8 @@ RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" BDEPEND=" - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex virtual/pkgconfig python? ( dev-lang/swig ) " diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-9999.ebuild index c962e61576..dd2aadfad2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/dtc/dtc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,8 +24,8 @@ RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" BDEPEND=" - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex virtual/pkgconfig python? ( dev-lang/swig ) " From 0ac50656f0b21a778eebc5e0a9c4e0c4441c6e77 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:15:00 +0000 Subject: [PATCH 084/130] sys-apps/iproute2: Sync with Gentoo It's from Gentoo commit a980d969681a801efe0050bcb233a137d7204793. --- .../portage-stable/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild | 4 ++-- .../portage-stable/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild | 4 ++-- .../portage-stable/sys-apps/iproute2/iproute2-6.6.0.ebuild | 4 ++-- .../portage-stable/sys-apps/iproute2/iproute2-9999.ebuild | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild index e097dc2834..f56e79070a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.6.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -43,7 +43,7 @@ DEPEND=" BDEPEND=" app-arch/xz-utils >=sys-devel/bison-2.4 - sys-devel/flex + app-alternatives/lex virtual/pkgconfig " diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild index 5254f12bbe..74cbbc79dd 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.6.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -43,7 +43,7 @@ DEPEND=" BDEPEND=" app-arch/xz-utils >=sys-devel/bison-2.4 - sys-devel/flex + app-alternatives/lex virtual/pkgconfig " diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.6.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.6.0.ebuild index eaa31b09ac..97cae73173 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.6.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-6.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -43,7 +43,7 @@ DEPEND=" BDEPEND=" app-arch/xz-utils >=sys-devel/bison-2.4 - sys-devel/flex + app-alternatives/lex virtual/pkgconfig " diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-9999.ebuild index c57d9bd65c..0d61a15abb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/iproute2/iproute2-9999.ebuild @@ -43,7 +43,7 @@ DEPEND=" BDEPEND=" app-arch/xz-utils >=sys-devel/bison-2.4 - sys-devel/flex + app-alternatives/lex virtual/pkgconfig " From ebef0d2e8b3ec924ffeb768ba9db1e168f31c297 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:15:09 +0000 Subject: [PATCH 085/130] sys-apps/man-pages: Sync with Gentoo It's from Gentoo commit 2ae9ef7cf0050ae77eb8b61b04e78c177d0035ea. --- .../portage-stable/sys-apps/man-pages/man-pages-6.04.ebuild | 4 ++-- .../sys-apps/man-pages/man-pages-6.05.01.ebuild | 4 ++-- .../portage-stable/sys-apps/man-pages/man-pages-9999.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.04.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.04.ebuild index ac3c9f3aa8..7af943a8a9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.04.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.04.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -56,7 +56,7 @@ IUSE="l10n_ja l10n_ru l10n_zh-CN ${MY_L10N[@]/#/l10n_}" RESTRICT="binchecks" BDEPEND=" - sys-devel/bc + app-alternatives/bc " # Block packages that used to install colliding man pages: # bug #341953, bug #548900, bug #612640, bug #617462 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.05.01.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.05.01.ebuild index ac3c9f3aa8..7af943a8a9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.05.01.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-6.05.01.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -56,7 +56,7 @@ IUSE="l10n_ja l10n_ru l10n_zh-CN ${MY_L10N[@]/#/l10n_}" RESTRICT="binchecks" BDEPEND=" - sys-devel/bc + app-alternatives/bc " # Block packages that used to install colliding man pages: # bug #341953, bug #548900, bug #612640, bug #617462 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-9999.ebuild index 19396bc206..4afe72595a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/man-pages/man-pages-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -56,7 +56,7 @@ IUSE="l10n_ja l10n_ru l10n_zh-CN ${MY_L10N[@]/#/l10n_}" RESTRICT="binchecks" BDEPEND=" - sys-devel/bc + app-alternatives/bc " # Block packages that used to install colliding man pages: # bug #341953, bug #548900, bug #612640, bug #617462 From 31a3eab075db447a78943fae751fac36b26fcc4a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:15:12 +0000 Subject: [PATCH 086/130] sys-apps/portage: Sync with Gentoo It's from Gentoo commit 21b3f9ceef131258a721b1b29e52d0f9c4fd2ea4. --- .../portage-stable/sys-apps/portage/Manifest | 2 + ...3.0.57.ebuild => portage-3.0.57-r1.ebuild} | 10 +- ...3.0.59.ebuild => portage-3.0.59-r1.ebuild} | 10 +- .../sys-apps/portage/portage-3.0.60-r1.ebuild | 246 ++++++++++++++++++ .../sys-apps/portage/portage-3.0.61-r1.ebuild | 246 ++++++++++++++++++ .../sys-apps/portage/portage-9999.ebuild | 10 +- 6 files changed, 509 insertions(+), 15 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-apps/portage/{portage-3.0.57.ebuild => portage-3.0.57-r1.ebuild} (98%) rename sdk_container/src/third_party/portage-stable/sys-apps/portage/{portage-3.0.59.ebuild => portage-3.0.59-r1.ebuild} (98%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.60-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.61-r1.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 040bae1254..368258c4f9 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 @@ -1,3 +1,5 @@ DIST portage-3.0.49.tar.bz2 1152449 BLAKE2B a47f951a35828ba9c8fc88c2eab5222c98ed20240c736c366d8f2e4f4aef773a140bf0e150448cc3796a7adb7471ce006aae4de1816bbbaae6dd83dcf28f52b0 SHA512 f07950d10c01bda0915aa30c5c0b6ce2864754fe7dea38b5341336cd7665dcabfdc219969f1a3d2803db59bc23fc4284bc96b4087a596cb27a5d9eb075735469 DIST portage-3.0.57.tar.bz2 1173286 BLAKE2B 793a150c94c939672783d7556e5fce80f7ff8895a616726d7adf92d6f8da99768c55db8a685f2dd548ab0bb09c29fd7548ee6fc1dfc51b55c530119690b92265 SHA512 4c5348e0dfc966db5ca1c08cc3fafc72dd2b3b402972b99b411f61f7a288190ecd9e5ac597dc62ee96eacc378818a4cac65b0fd040c9ff557e7cbe057a934829 DIST portage-3.0.59.tar.bz2 1175098 BLAKE2B dbb8a22fd9417a74e60aa24ff064e9da5b4c54bd4936a0a1a4fdb0cd30d8568ca2424ef2a484883b538685a291a85009d942defdbb5cfa4e0072e9d977f238cd SHA512 8c86e0663327125e7cb36150d4aca1d7fcd2bf7ae25634ed916c2ee444809404aafb094adacacc0408509600f447d62d9c53e7bc25dd8c71c61e8758ac674638 +DIST portage-3.0.60.tar.bz2 1177524 BLAKE2B 1928e448e8f319e4f000e795587fa043155cf54871a14631f06cf96d0ff2372049d54da2196c878bd9c09b7db0578eaba72b15d85edc9c7b1514cc58f6ab24c3 SHA512 20b6af1778aff8ab7db64861393290ce57ef5ee4c9c1659d31ecd45374f10e230e6e9029d883c0647ab8f9e0d9b9fb0a22ddf70cb2281e4bcac949b7e4751428 +DIST portage-3.0.61.tar.bz2 1178151 BLAKE2B bad3140735b12a18a3108e91cc88146fc5c64ad3e3e056707eec7629927f718483a3e1ccf09f74de510ee7733b4d856c3c53692a6cc0f5fc1a7babf88fd7f06b SHA512 1401392a7bd2bf18e698e82af25a39db2aa9d8d9e8d9c07dea11ba5d5c866d2d3f8a3eccc8568b081aeaf6f668466921c61f58adbdd9dd5ffd9cf632bff2bdbd diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.57.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.57-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.57.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.57-r1.ebuild index f52331d841..e4c9e2d9db 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.57.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.57-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,10 +35,10 @@ RESTRICT="!test? ( test )" # >=meson-1.2.1-r1 for bug #912051 BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 + >=dev-build/meson-1.2.1-r1 || ( - >=dev-util/meson-1.3.0-r1 - =dev-build/meson-1.3.0-r1 + =meson-1.2.1-r1 for bug #912051 BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 + >=dev-build/meson-1.2.1-r1 || ( - >=dev-util/meson-1.3.0-r1 - =dev-build/meson-1.3.0-r1 + =meson-1.2.1-r1 for bug #912051 +BDEPEND=" + ${PYTHON_DEPS} + >=dev-build/meson-1.2.1-r1 + || ( + >=dev-build/meson-1.3.0-r1 + /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.61-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.61-r1.ebuild new file mode 100644 index 0000000000..5007fdd1dd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.61-r1.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{10..12} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' +TMPFILES_OPTIONAL=1 + +inherit meson linux-info multiprocessing python-r1 tmpfiles + +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" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +# setuptools is still needed as a workaround for Python 3.12+ for now. +# https://github.com/mesonbuild/meson/issues/7702 +# +# >=meson-1.2.1-r1 for bug #912051 +BDEPEND=" + ${PYTHON_DEPS} + >=dev-build/meson-1.2.1-r1 + || ( + >=dev-build/meson-1.3.0-r1 + /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 0fa6790375..834b9af7a5 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,10 +35,10 @@ RESTRICT="!test? ( test )" # >=meson-1.2.1-r1 for bug #912051 BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 + >=dev-build/meson-1.2.1-r1 || ( - >=dev-util/meson-1.3.0-r1 - =dev-build/meson-1.3.0-r1 + Date: Mon, 15 Jan 2024 07:15:16 +0000 Subject: [PATCH 087/130] sys-apps/smartmontools: Sync with Gentoo It's from Gentoo commit f7ac6d49a10a2c94231e0cdd0e069ceca1e6c46e. --- .../sys-apps/smartmontools/smartmontools-7.4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.4.ebuild index 6eda646090..29894f7c67 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/smartmontools/smartmontools-7.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then inherit autotools subversion else SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" fi DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" From 53c933e45539b7fd974155ab0a3c3056d82414b8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:15:17 +0000 Subject: [PATCH 088/130] sys-apps/util-linux: Sync with Gentoo It's from Gentoo commit a64ba8b93d012270a92208b1871934feb1d5d45a. --- .../sys-apps/util-linux/util-linux-2.38.1-r3.ebuild | 4 ++-- .../sys-apps/util-linux/util-linux-2.39.2-r1.ebuild | 4 ++-- .../sys-apps/util-linux/util-linux-2.39.3-r1.ebuild | 4 ++-- .../portage-stable/sys-apps/util-linux/util-linux-9999.ebuild | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild index dd3d6ec432..68439d236b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.38.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -62,7 +62,7 @@ RDEPEND=" BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) - test? ( sys-devel/bc ) + test? ( app-alternatives/bc ) " DEPEND=" ${RDEPEND} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild index b5fc889bbf..facafaf1a6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.39.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -66,7 +66,7 @@ BDEPEND=" app-text/po4a sys-devel/gettext ) - test? ( sys-devel/bc ) + test? ( app-alternatives/bc ) " DEPEND=" ${RDEPEND} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild index 6ba55f0e06..6d2aa61d43 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -66,7 +66,7 @@ BDEPEND=" app-text/po4a sys-devel/gettext ) - test? ( sys-devel/bc ) + test? ( app-alternatives/bc ) " DEPEND=" ${RDEPEND} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild index 64c79cdbe9..d7b81f31df 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -64,7 +64,7 @@ BDEPEND=" app-text/po4a sys-devel/gettext ) - test? ( sys-devel/bc ) + test? ( app-alternatives/bc ) " DEPEND=" ${RDEPEND} From 4449320e770463c46ff36aa711393f5577f8f690 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:15:21 +0000 Subject: [PATCH 089/130] sys-block/thin-provisioning-tools: Sync with Gentoo It's from Gentoo commit 23b8a8dd547b9b8067a34966fc730798a5694a9e. --- .../thin-provisioning-tools/Manifest | 59 ++++ .../thin-provisioning-tools-1.0.9.ebuild | 203 +++++++++++++ .../thin-provisioning-tools-9999.ebuild | 267 +++++++++--------- 3 files changed, 402 insertions(+), 127 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.9.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/Manifest b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/Manifest index 0caa0b6eb5..f08d5c4739 100644 --- a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/Manifest @@ -1,24 +1,35 @@ DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 DIST aho-corasick-1.0.2.crate 167694 BLAKE2B fa5323cbe6cb73594dfa4c327c64676bc1e006dadc0b9def325974c83b9a769beba02d59a4657ec7a2d0cc511a7b7cc6f72cf57b8f9e639206d1c2bf13107a52 SHA512 5c75451f96fbbd670e6af0e1f54df2bdb57259dfe6898495ac46a5b2fc04f316a4698fd5cfd4ec31a94c298661937a8de08ce97cab3890fb3c015e4a2a67bb7b +DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c DIST anstyle-1.0.1.crate 13977 BLAKE2B 35be03a7de78737592528967e8ad4851436a74c7863cae9cf5cf7366d3cce9bbbd255b1a89401051f82fe8569a0ff029dcfe427c14a2e0677890453c6119d241 SHA512 2bf9b83ad9772c6a3ef28239cbb98bd667dc631fd1ef76ec5029825c128f6cb22756bb1548dd991e482f86eb9fd94fae5c648f91de2c0d71754b6dca4ec2362c +DIST anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3 DIST anyhow-1.0.72.crate 43837 BLAKE2B 1547c158882e50579a568a14e6e5cd162feb6cf291835266c9dae0c1c4df05a7872bceb02bbc8a13ab5bb84d299a94892057f54eeade7fa095ff8f897f6fe9d8 SHA512 25d8d4cfcc9679c9125fe03c7ce5a46462ca66e7457d45cd7838b7867f3461a899f75b22d76dfb04caa09c013c3b702313ffb6373f92b2798119a30199c38a98 +DIST anyhow-1.0.75.crate 43901 BLAKE2B 6353557d7ec2cbfdd001c039fad62c95fea9e02b113149f726fd14bb36b31e637e8609dd5ee20a900e9c11bb783d9958d664b31ba7c467382fa7f51d477ad3aa SHA512 190d6be8ede0af9808210db53e4dc31ce69b126a26b0357220c4705a11e83cab2c2c09c59964a35794f3c434f717eaa6bb669e9e8f16012535c14246b17e8d40 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f DIST base64-0.21.2.crate 76389 BLAKE2B 6da080dfc31c5b2ebdbfd336be6e71373918f9388c85649133363a60ee1647b6ad67c7dfd461b6ee842c3633e40593b6ac2f313585b3e8e07dbd690739f433f9 SHA512 3f85bdf846e2f8a2e0f2335749bab58c904479a29311143580f1de42455799d04606dedbf64d355af580d77867d7b895e1078463c7cc5a5fbd9ded9d7cbf3559 +DIST base64-0.21.5.crate 77134 BLAKE2B 901cf92d7dd8af2bbb789ffbe60972c1fd295b16690ecebbcb500e4613afa057ab2b294bbafdcaa4007f46412825260a0711d89e55664418a503dde02c8afd1a SHA512 40b1d8470a932c8b7f31717e33bf26742c1bf920caae639b8a992f77e64d5e6d287569742c1348daa25b7325f8ca8d8a312754a743dab3932181f37149d91b16 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 DIST bitflags-2.3.3.crate 34320 BLAKE2B da9f42fc888e31d50d0b2f0d0cc1bddfa97e0c2d3eac60fd2cc451670f000b5148e58c3c40c348ef1bd516c7a568bcc3a97742ac5bdb9ef4772048eb922171af SHA512 8f063ba2bc3f638ca9200722e1c4370102589fb07aef25efcf63993fbf283cc86d554d11d24719f728ecabe540a47a90ce4113d8719f8e773f2344a66d21ff78 +DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b DIST bytemuck-1.13.1.crate 42309 BLAKE2B 055e031a677823c110e44446e1e371632a0a5a8227ef7053e964bd3f9967705bdedf96b14178818021ffc09182ead805a68813a8a2b9cf7a70b6e8daf733eac4 SHA512 eb0a7e423a3f903fb831369e0c6d1e5fbffd7eff1b56bb7d1ffe4e5e18850cdfb9a7f9bdcfd53ce10b1c659dff11c59190b7b85ad89ca60485878548621f01c0 +DIST bytemuck-1.14.0.crate 44933 BLAKE2B afd34f2becc41484e7bf71fb4a9f0925870a4f2d9d59daff9e91bada000462baeced4314e469a508d4413a8f2442d83a5f3082193653403fbee1340ab5c3f6c5 SHA512 f072a97e5de93228435bb362363ac1af0738b7927832b02a837f44eb21b0b089589b61e73004a06c5e4d4601e66bb42e67b9f707bbf13429a40b6250a0f05ae5 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa +DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f DIST cassowary-0.3.0.crate 22876 BLAKE2B 7e74a08e02050548ade7dd1ebba7ce4e4360d258ea6acf126453889dbf16df433bed7b68789736881c957f4c09eead1f763a0c02f2474157b1650a1e77e6eca9 SHA512 0838c0b79ed31f0c514fe4ac82633976e34b0d6cb08616313cda0e00623514fc6498c6c308cfef54ea029f1fdbaafe2991ca8ac3c38437a113ac62e37f9397f8 DIST cc-1.0.81.crate 66857 BLAKE2B 1f20aa7fe1e41b7d043242ed2e6b840ef7e764fcd844d82441d20dede2bac7386c8089e7dffee5bc22a49bfab2cf9f2c82757bb5068fdfc82610eae7cb2b188e SHA512 00878fcc5e344571cd8756fcd7e0a8e11325cf504eed09ea2ac890368c4d69978fc0de9ef99757cbacdadbf50faadc486d20640b529ac9a4963b3afd71caca6a DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff DIST clap-4.3.19.crate 55022 BLAKE2B 90a674c96aa83d2472a8c67ab66eadf7110c497009349cce8f5b1043d14cc21dd89c23ab1316d26f48c40126ec8bc967b73663dd1efd78191dae005187f0a268 SHA512 00e9013a0af4013ea491f3556f53d8f861f9280db87fb4518e666ecfd4009cd731c67948e4fbe458eec22078e518a07336cc33a9346f0439d6e114856b7f16fe +DIST clap-4.4.11.crate 54782 BLAKE2B 293721f850d5a5ddce6b26610ef47316d5914e9281312068c26e45d23cb568c1ce2da7e0546accdd0cd4cc703ddb9fad98b0c772907f52dcdc31e6ec463d2b27 SHA512 9da3f445523183e16f4c104a2f4029ee9f3fa70e6c8e579aadad0607293ff5963417d8534aa1f3cef6ef8f8a7529a898c01630d3eff42330ec369cf0f760929b DIST clap_builder-4.3.19.crate 161122 BLAKE2B df66e68d3280ceea30c96cf8f1db7e42a634b2b0cfc3b335a9200cb8b742cb386f928d6e0d429286b433ebc4812ce1c41a64c1335d52596e106c8dccc47c9ef5 SHA512 717cf74f419a0d62afdbd67a805aa2317bf296a0d8cbffff26605fc3b42fba4c223819368fdc43fede310843c698171dead4a552d3485ebcc6fd6e523368570d +DIST clap_builder-4.4.11.crate 163317 BLAKE2B d2d998c4eff422436f36f71d681132b2545b561433ee733a8a64a640b97ebe8e35e97abc91d820189918d5fe9fa9496c89b02959aada1d55692957a86c8e14a0 SHA512 b601fd313e65dbf2b723f3ae5d2d3bfdfa1ec184962883503df9b31a7d43f4967ad5f81b0bc2fc8614e06d67ce52d399221df6f4fc9da311cca1c9134784d7c4 DIST clap_lex-0.5.0.crate 11792 BLAKE2B 0409c9d957ea6a566eb8b50f4212702df038d04c4c38f7440d91cb4c58ec887940f0cf500c4c3949c2191399aac3f5cb1ce44868eac587cde90211d3e467b9a2 SHA512 0149ed7c2438a19b4857f895767550d783711078f07bfa9ac8ca531e06f51c7388110f4d558e30bf503536367cc370cb581e8deb6fe51f9b5460a334963daacd +DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e DIST console-0.15.7.crate 35409 BLAKE2B b5e34b03a1c7d5fbffe5ae07182e28f6638e026a1dc2bd87bf47f67230ead612b37ce0c79b50d84619009753bb98dab661279b77c68760a0b75ce8303733abc7 SHA512 f37213812527bcad23baa8648cd949d8ec955e1be7589ecd36fee46637e77420c2561fc301f2562dd95bb66802b92ec1da5b85367bf16b793849913698a80576 DIST crc32c-0.6.4.crate 9661 BLAKE2B 96eb9b418833dd398e880e81a7afbf2670939b1ea6599bc03e8893e7b5a6b26ef6fcd15a2314e5a4dc50003bc5a7b239f7b4f9670859f4fbb720640d87a4b623 SHA512 5f537463596a57c081f1e28e68c22f1839607b676ed763b2edecaf8b780d234a4fa52d7432262231150ca3f48bc5b6ce5ad2af6f84d8c51e8cb4d10538c2531b DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357 DIST data-encoding-2.4.0.crate 19165 BLAKE2B fa870d377fe74c40e5739e6c063bd39ba5d824c4e452e1c490f911b2fd90cc0748aabe731b41eb2a9fc41eb061ac4144ccccee5586e99d556a0e4ab0171650c6 SHA512 b16c4bd5999a4f1281d6691ce05f8bc2a109cf422dd4fa4e7b26b573b2a4b7e33e2fb246681846bbf85fcb6361c115f509898724eb6526f1f49f55acb4f9ad7a +DIST data-encoding-2.5.0.crate 20632 BLAKE2B 16ea08dd12f09f2e6f8ba2910b3db07d4e7c9916e6a70d41420ef1a0e5393284b49787c47af0868bceb7f5d3f1fadf203f5a547dc8cb97713d5225dc9181fdef SHA512 b1de8bcfd7cfbfb988091fdb550eb98dfa5739ff58c4b789663e5db0d539c9acf145ccd72d87f7e1cdefd09d5771772d131d2b2e2589ac8f0bc6972c801ee0ae DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9 DIST downcast-0.11.0.crate 5976 BLAKE2B 4ca0e66dbd8dbc86920d4184de8b37ab41954cb1560c7727334c990b97ad9544b098f7ce50759d10cac8b9cb955893805aed3bac5849c8b44a965e24d2ac7653 SHA512 11b037a09829e3e93eabff69f02b608725e6e348a191b1b6c8bb044b8d820a6ebf46eaea2f8bf5eb1c156f20d3e97be9b581e1b5fccebbfe76d94157d6bccd53 DIST duct-0.13.6.crate 29320 BLAKE2B 11a7502f89ed7e2cbe787b131275b135c36273d074aa689c6a1d6184248d6a9667518b75c4884e1504b925e62a1e589c3822bf0ab316a21d5320a9c73471962a SHA512 bf6a69fc2eda5dbf79dd785eea131d5c9ee38ffa3c99e7ffb9fcd47ef0beae8b3e5e75ef78172e54ef076531a38c4598880694a7b93573ffeffd3861e7776369 @@ -26,25 +37,35 @@ DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77 DIST env_logger-0.8.4.crate 33342 BLAKE2B b1bb359be2f34ca6f93f72154c86920b8254f574b48f693b2ae7296cd1ff25d34dea61e95fb2954569fdebb6c522c851ef7499c107005528aa2226df13b0de33 SHA512 9e4478ff609a2e1e1a902a55b221af43a52622fdb5668dc33fb0be354b964708b7b6d13b7f1ef11982f45fa7e71f0712a2ab3fd4ea98155a5115e5a7c3d33049 DIST errno-0.3.2.crate 10424 BLAKE2B 3061d5a5abee015bf41c11ef31dd0f38a738c51992e3bf9f9ec98f67a87b88341c97901211718a5f103b8cf021c875f8fc799fb217ad69fd27371326b5aa40e7 SHA512 b728704f11cfb2bffd421ad39e7bab79b11e548e336e9dd1cfb902bdfbb78a8afb102ae5684fbd6ac4b01b12603a1011a1faa21cfd0702bb25a300364b17ff84 +DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916 DIST exitcode-1.1.2.crate 6538 BLAKE2B 3015eb8bf6658336cfe43b4cc59ca95d8fff5380dfa2bb2a3086005b0dde5e6a704c6b62e027bb5c0d6e6103bb5dec4ab4c869ef454361f224d013c267bf4a78 SHA512 fa31817e2bfdafe64faaaa6b32573e01e2ca0db24c6c88c81f43d84a9db66d19db842b61cbd89b8f6e199aad531a1dc0053b2d4166e0f9196f275fe715f28fc3 DIST fastrand-2.0.0.crate 14402 BLAKE2B 8bf830151ec616dbc25f216265722e39f8a2cd9ae036b0904b73775a30497368aaf9bb7f49890c330024c3d9b8084749c91f601b60b53bc8cef2da8b0aa71322 SHA512 9449dd52e4b722d5747f68f127843c0d1a402765c2b6186b9526f8ae23293cb1f6b50adcbf18a8ea768292642184cb0eb42b1801d20f6815397903f9977f3cbc +DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9 DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040eb936034ab8da3cda72a830e45fcb977b3fe3c2b94e870c1fbc366ee8602357bb77e8b9a40cc41a04afad1b266b SHA512 57c5d756b0a202b2506270f0d5e890f7617a1e0c015b6059ea23fab49cf7af47fd06927eb56feb03b37cb2b6c467e326b3f0da1e32cfcb6339cf11a130a3ccab DIST flate2-1.0.26.crate 70832 BLAKE2B acbfad138abf2175822153867413dc89bafa9254494b4f13d958dcc6008a26fca6f934e8010b8c090367b8e25272a4ba3b26a31e59cec69c1359f83ca859d186 SHA512 a9f7b9e4adfd0a22fbf66e1cbcfe377cc03ec248c7fb7113097b839922b569cc96bf080089b8c800b35ec6f81b3f602a5860de55963b85f27ee6d75a9df88f3d +DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284 DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8 DIST fragile-2.0.0.crate 14668 BLAKE2B 2e589b312d7409a1a550a676303b9b2adf2e28b0d4cd02c7fb22b48a88d1f88a04e55c4405078e2c43b13ccada890a33bcacfe179abd12236c23f219d275c4df SHA512 a48fee7c13ad800142a9ef1f355b2200b904ad9bf97b3601e310bad2b6ad90ea235b9704964c54be1d9c415c9c95fbc5f49e8ba5d7c6ee3488573f3404912608 DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b +DIST getrandom-0.2.11.crate 35391 BLAKE2B cc3af20769f8effebcd6fe4f48bb762211f78cfad016b796ce4b6b83a25d0a758ecee4352af18ef97e84c17fb4efb0c7bf113b53d2dd30eaa32067fed97978fa SHA512 2230c219e1080b4b13f207bdfd54b1acff37d9e5fec5263ec9952df9c0279939b231c722b54524deab85002caf1047a471f3fba8090428d918e99d53edf82345 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a DIST hermit-abi-0.3.2.crate 13783 BLAKE2B 43089507a5ca0731a9e9a54fdc8f4dd5f807244797eba5bdcc072c2c2b3761481df65b8cc65900769777d9d21f8345b502cb1915ec36747160e87f179469a661 SHA512 22901ec8976a7c96e93c9e07a2c5d3db49d7af60ce60c7ee6f61c3cbe93190d1f285e737c1c8b2236d540ab14e5d92e42828ec05f1b212332a862baf2b1b57f6 +DIST hermit-abi-0.3.3.crate 14253 BLAKE2B 9ed8b40a1cc894addcba2a45562d74359ba55156e2c3a547afce139324b1345df2f158f58978ccd7d343fac5e5d2cda86e2e0a9dafc77af36d4cd8aa0a6d4c03 SHA512 eb162d085e8e0db72571aca925fdb6094d1e5d091766dd62d6a116957459bfadc8d51f1acc67f4da3cf6a8802c0ff445f3ad2516c1df8fcdca0b751632e150a1 DIST indicatif-0.17.6.crate 62817 BLAKE2B d8943117c6a7ce5c439657849a6ae2c25acf4a53ffbf70859878f5b4d27f2e7a6d9f591cd66af7f1241cefcd9e044e678ac1dd56bc4b6bbc100a42cc84267b44 SHA512 d7d191c25840e0c8bf583e1ff5620384b6512a570de3d00ee995898206777b6864336d2bcee431f2ec560f820290b967df376dc06e401ec63f5a922a9e94e945 +DIST indicatif-0.17.7.crate 63108 BLAKE2B 665bc2077207cac6ca2071d9e6ead76abb30d5f7c209d7b4a2ff5a1fcba566b331467239bd9168082839c961acf5a0522ae4c899aec141ccc649025b2eeeacc3 SHA512 412955eec523e961a20bb48f9921128004e723b405c8f1bb73abfaeb4f532ac6f883794fe6c8738a40c2e0a400a6ebf94ee17d89f7cdc98d9d0f8611d84a369e DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e +DIST libc-0.2.150.crate 719359 BLAKE2B d08e17fb29992c76337bb5862cbc1cdaf7b9d7749cd65021f145fcf49fa7954d6251c8c2f3c9a796b46283c3bc014bccfd259ea52824459841911ad847fd7f5a SHA512 7ae8fe6a1db38ac6d951c0b4880d25a02f064f5e61d6057c20f7208dec8395d58efd085e41857bcf5f4da2b014d2952dc4ddaf18ac4acd3a23675bb659e70385 +DIST linux-raw-sys-0.4.12.crate 1465800 BLAKE2B 2f70a344c427093fd55732b68239f771cf6563edfe2db4b2f50cdbc904dfc7565b30bf06454b91482eaeea787b9cd4214979665bfa32f3c1c586551333cf4d2e SHA512 d9564d02d5f41356478066592e438629adb3275df0e5a1a44030cc99bf8856b8af64f18f27371f84122a828b34712aae16495a1a16050fbdbece6d95e9cdace9 DIST linux-raw-sys-0.4.5.crate 1274380 BLAKE2B e15ca5b63cb994e86a8161e3b6e4bd20da8f574d1a470128f9a209a729ff22c86470f4c2b2a8ccbc1e37d6284b026e0805902645ea4b742425fe34491e519638 SHA512 13c36e03cb5bdb2e9f17622e21eda608057fc9d908bc55a829fdeeb77785094769d4f4b4daf376c5509ceb3abfdb3936f668bd6d5b2fd48e21c5c28b6e597e78 DIST log-0.4.19.crate 38073 BLAKE2B bbc8ce51ad4a01562ecd204a531ec7d82101a342ec26405dfadd1761372f7039297dc97f4899889ebdf4eccbd56345e015d4ec6d2788851e523db56eb541aab3 SHA512 8f11ca6f5a99b61a5f3baeb7a23b7a879b3a5bed666337936bd1d8794864d14a6c4f0747d03505831783f15d8c14ebcf507267915481dfb1b32188b8ab36a038 +DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa +DIST memchr-2.6.4.crate 94439 BLAKE2B d1136f7105a33565214fdeecdc5a95e74d7fc7cf45997f81bf3cf389f3015fa561ab326433ddcff2db0b7259246eb6d26fc7b4e3c90c3af8b9b7ed7e8ec56ba0 SHA512 1065a67e04ec9210c70e430288e0a8d39f36ce6414722099553e99112ea2f8f710eae44bf39f8775b9850e6c8a50e634a1b1b084a8eb4f6b2eae6697dcf5b5f4 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c DIST mockall-0.11.4.crate 22374 BLAKE2B b300d9d74e6877f461539bb29afadd73b9439b81db4656f2a89bace2bb1ea0e15761aadf9cb3c0b3f8723e266e27dceac37477e2a54ed9b9d273a6bd896d32fd SHA512 71534e5c106cdb45da678370d81748831be6792a83f7b7a1082249cb6936eecf097ec88ca99d0c5029e15bb8b3923801e8779253b3e7e526e2d760a5fb01782c @@ -52,74 +73,112 @@ DIST mockall_derive-0.11.4.crate 44096 BLAKE2B 336fdf8ff3d6e8218bb77c20e7fa6fc63 DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea DIST num-derive-0.4.0.crate 14008 BLAKE2B 34fa2cd518514c32a023135f010d332817e922d4fbe6468bd51f6df726df54c6d4e9be9dd68ec66116c318998ebc3d9944c79ec9a1ae8a71ca49a6efcbf4e311 SHA512 3c36c0bb3bb3ca7bd4cc109bd86f93f1ab7e7cb3e3182f9e6e21c36afcbfe381c9c911964fde360110fb4ad5b9f5b496d3ff8bc3867cb6c0d9406afd10666dcf +DIST num-derive-0.4.1.crate 14840 BLAKE2B 9dbacc6cf946aed6f765fd70ad52e7b6ef036a30cdf7df39afbd8dc8657cb4cfc8954727fff04dd053d46c4f3ed513217d24914f3611c96abcf2eae83992be2d SHA512 ea7bcb94e83698609d055981ac5f112e9b18edc87a767c0ad77d31bfb6fdd0d552f5a23934e2956bff56777e9460c08ea05a5ac636bcc6d45512e4c330260d30 DIST num-traits-0.2.16.crate 50130 BLAKE2B 1101d28cb4dce477657684a068792b94c7008a965e655edbabfeff51cbe6f008450dc6d7e4fc5dc4fe9c3ee8623ed77a7bde83ce2f68e75d618295fe6cebe0a8 SHA512 2ef65e2f6275b1000f611cc4d019b2f4846a8964b54d9b96462da10e3ac9edbf3d1de82e40094c76f7f5205740361b0eb0ced414bcddbaba5955144f728c6f94 +DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5a526042963d52cd582ff23c2f8c9f32b4c445ef0397fc402b6d047e031d8e2c67ac97e191bde22e17662eec3a554 SHA512 a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354 DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 +DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c DIST os_pipe-1.1.4.crate 11436 BLAKE2B 215f548a5b16854e156f785a1cc57ff16c241b50223c75159081017889cfe718d6dbdc6567dfc751d71eebda7476c95701c8ae88b1320a0cbba66a694b471d08 SHA512 8568008e30fdc47c1c89f7368654d26407fb6594cd89e2b85786c875d9dd99e77ed2bb84d281351072670e2dfe7a952d6251c6fb4d111ebe6a63cb34942b6aa3 DIST portable-atomic-1.4.2.crate 124375 BLAKE2B 49db30ce356e48eeae517663d174dade38d5029a5256f293b23807a77ea159c0293bd789e232ce2a9bef76e1f80df5cfa4738980a9455c35dbcc43e856847a3d SHA512 f1415288b612f734f4e4839b2a70ba57db17900d517e611e3bc8d3ca9165ee6c03dc3c7f69d10b700feed581e074298f52c48fd5ad188b59bfcb78f6dbd34f85 +DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a DIST predicates-2.1.5.crate 24165 BLAKE2B a0eb1aa0f26d51140155b8b5e7141a253e298ac2197e59c7023ecc693d68cba01d645792c57467741ee074891438fba2f1439c79a4cef27f3d02eaec8f1d0b10 SHA512 d4b555d7f57ccec5788a957d4a3e130f5549a9333a47654baaef098bb284c64bd5c662677ba7e659b4563b3d0146914f1235e0caa2274af8787d9777141f4dd4 DIST predicates-core-1.0.6.crate 8084 BLAKE2B 337cbb155bc2859c5a8b891c21d352e998cd1eaaf606cf46c003c9c499a42f12268b071e7a4cca65d50cdfdfd4267f023076e078a0a3eb401ad836755d65298e SHA512 afeb1de4275c76bb1c5950f42bce2f83a21ab217ec60130336286cb48b15f36bf2a1ca346bd652c10a65a1f9e3310d16b23b8333a3e0f7e20fe874c3f728e702 DIST predicates-tree-1.0.9.crate 7960 BLAKE2B b758c52dcdd0ea237ce25f0a092200604765bc83c5edcaea646c6b1db49431296b61aebddea3b325e62f0ba9bbd5edba7ec92fd031cb597e7e8d642b966b401a SHA512 1fd5d9a84ca8fdd1b3c4759d5e6fb16e3d8fe8b0dfe5afbd16bb509c8558b0750705fff47701c95f7a8df1a222f639116a1b9ba4d89775bf03b06daf34f249a3 DIST proc-macro2-1.0.66.crate 43575 BLAKE2B 9eb3e816b00fcf625c280ba14ad269f5893d0523473a24de07c21945f6f932fbd08efb3c339b35d903245510e3f065e1478439b024a325f2bb9f97bc7bcbb18d SHA512 85f5a762f9411142e5ac28144bd380f07f0633ed2e44d8a2545be9fb8f42abaca6b5d45631b4be83b8e8b9beca7438bc52f25615c3a410a3a1249474b1aca407 +DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f DIST quick-xml-0.29.0.crate 160308 BLAKE2B 7b409153a597edd855752e00f50f5b1fea70570a07932cf2dd78ea31cdf5e1bea4732cfa632615ede79e551b7a35ef535def2c3112a3d07a363337e9b807d277 SHA512 1a6d61e2161e3701e2d4e4b243d1a20072d546a3a0e3389c185f1c9a53bd6af172ed1b791f9a329cec67a2dd9babae44048bebb7293dfdc0efacfce0aba820fb DIST quickcheck-1.0.3.crate 28069 BLAKE2B 5f0ddc8e22fec55e879745a95024abaa03d7bcfc6453286eec072663b36a5d6ae247b3c1622c4743e1ca9b7c4bb21da0d095aa5247f32b0bedc393f92cda6bc0 SHA512 07dd707c9d3fd0b9cedbba545bc8b4fc1ca2770d169e444f8c96f8306d3161a6a3e9189cc5d0d6b3dc4221f7dbc05887dfe2dedc914f88d5e69ab2b94179185a DIST quickcheck_macros-1.0.0.crate 5275 BLAKE2B 1681fbc5a476c627da442d601d9f24dfeaa147dbad7c8d6989ad73cf5a204963c29b2b5bf68513ba74c322f74ef5ceea92594953e9034921a2c8132150252779 SHA512 f7de86f76a53fc36063f10f5405979677a2e48a96d13c439a4aa98e89ec7f3c3cae324b8dd789a5236630110ac9a1763f28361442cca08d1a1ef458c7bfadd55 DIST quote-1.0.32.crate 28037 BLAKE2B 7b243ac7929f3b2e1d91a51a2dc2b11dd29bc017be9db588c83bd137609e2f991a4f3ff8682c7c11c177153e517c4f818285cce3237f435aa43ad0126c4bab6d SHA512 13cae36920dcbd0ad1978be63f20b35b8424d02b4d9992032fa78c7770d61d1fa7ec1532a48793cab48e703236b7bee7843041253b9e83700903228078b4c025 +DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 DIST rangemap-1.3.0.crate 45509 BLAKE2B 632e47a6b045575ad1456c4df104dfa32fb4e0770b55faba92085463fe4e733cc4881a1fae8bab27b4717e6f96b1bd3d98bc9bc78ca83988f7fd3a2bb81645b2 SHA512 feb1e504f905d0bc1701191394dfd68a5dd36cd7963f478d9d5835a50ef1fbe49085b828872909fde89e22ec7938aea997513d8daf7f5acdf1704ad406a664a2 +DIST rangemap-1.4.0.crate 45931 BLAKE2B 64e6c9baa55ab2a4c68cacb7d33a060c582ab3e7f9ecc433bee5c3ca4e76b8f86bf9fbdaedaa0c5ec2af600d234d2f949d764799439eb494aa6163e36bd0caf7 SHA512 15faa3f26c38f395388f596cf3a655669cd09a84ae1a17e61c40dd62e5331c6bede2bec09ec6961f870d2f46e8cad7fea70635546721cac3015482fc264974ee DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde +DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d DIST redox_termios-0.1.2.crate 3268 BLAKE2B 5f3f4e2b7e7a8172f92e8161eb1dcd208b86320868ec351e2f7b47d8ed170b3f44ad8180e44ea7a554de0e53fc268365e683244ad59e4afabd11a09ae378d2b0 SHA512 d8624b2c78d02c5d3afcbecea9ad8d218bff508703cb50684d6ae05614a9f41bf2aa8c47440fbb7d964f01eb9085364222833fbf9c45984508e9d755dac563c1 +DIST redox_termios-0.1.3.crate 3240 BLAKE2B 3aa7360c9e982faf433b527605fab4cc01f74eac5f1f4698b5c7f43e5a7645fcddb39bd639c8f6935fb82db5a065630ee788fd8b111cca80be15db1a08d0b3fe SHA512 a221afea8eb1c7efe848e270a6ad5b65a97af945b4f64d3aa5346f5a61a9daaac1993446ddd78c1923b798e1659518856d7260d9d30651d91897850b0a1950d8 +DIST regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3 DIST regex-1.9.1.crate 251978 BLAKE2B c5a049a485bb78cf27501b1c150d922ad56fa26fcc4594f111786cda8879b21573cd0b629dc4dee81e579a98d3ad2620a08ab97c5d0bd5abb1fbd1f8eadeb3e1 SHA512 cbee57ecf620795eb2625cb2a6a3d6eb2b46de91ade021111f8960e31d8d0098b786ddc1e97734cfa16f7e68d77ebb8a9b7362542d91f2345bf2e4f64778a454 DIST regex-automata-0.3.4.crate 604400 BLAKE2B 53d248be92d36097b01996d5ee53a32e8b0cd9cb89ec62d5ea3aff284f7f03e7c3fd6014f2b1e89220b00de885238e83904a06f79857387364b9f2d2452ba250 SHA512 b8eb9a5c868cb713274f55f467615b4e8e3bae83b9738aee87a465ef44a8dcafa80a700600544d02c17ab0068302ac3546952d97596fe0458470809f57629fa8 +DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8 DIST regex-syntax-0.7.4.crate 343365 BLAKE2B b50c01f02e08729496e8bcf023949d088463bf62348b4a1043fe5205650da37863b2ca51f683662a4df33bd56085e0501e50410106c9c471a0daec4c71dfe945 SHA512 b33713c71f6f753820ca6405e8415e5eeed457efd01e81b0b720e48c135b9bb0973962269587ddca31350233aec6d3f598596cb48310db0633bf67f8970f0e18 +DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 DIST retain_mut-0.1.7.crate 3945 BLAKE2B 475a46e0e3df8a55305b0d14d6da595874a3c3bceefc4a4d4feabb5ae245d48190bbc7ec325499d2aafb4ddfcc0906789bee89689fdbac261a92b66bf33cd493 SHA512 c90538becfbac41952a0d5ea1ba0dfda4ef6fc8988ae60080c0ac32e3abfcb0cd674be7e7c221debd916060c6447ac59ef8b3cd93fd9d558228e70d0dacfbcb9 DIST rio-2979a720f671e836302c01546f9cc9f7988610c8.gh.tar.gz 27249 BLAKE2B 5a2206986662979875c6f8ed5c9cd19465bd22bef1ba55bc92d67bc539271a3af29993333951377953de2f4f8c8f5343c2def3350f1e94ead572a7b9b09159e8 SHA512 40d5b942737e099735bcacdaedb101e44c39dc1f8e1488550d3a039562b5b2bd78edaff42b0ba9731f038f0555a0480152ad1c33bf31693892ba5733a39bd946 DIST roaring-0.10.2.crate 91257 BLAKE2B 1c24f76bb038451f8239065ffe278625a4bfc5e46580e91a2c2c02b584d73f34c5aa5905ca3ddaa99b040fb2e679d93c3c21962d814af1a6d76d33920c1d282f SHA512 a13b84d9a2dfd05f0410f247abab816980c8b83504f40ec1e043335445ef7115a0d7bb00e3dfd22fbe8616e71187649bf27123388e6fc812451cd64c1c6cead2 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db +DIST rustix-0.38.27.crate 365308 BLAKE2B 7756c4c9690b39006dbb4057eb103c7f0bf64cea00c200c90eafb7f8703e6069a924e7e080f75efa066748e1c693cea4175fed0eca1265eacb9d3e9f73f559db SHA512 48483a844ecab27f29620379573af8f7ea3e20073e3f118b00eb344c7f8ba17dc02d786fbd9ef6f1396ff5ebe94198dec95834cc8c177b72835a52fc17c7cfbe DIST rustix-0.38.6.crate 331959 BLAKE2B 9f0de9db61b02e597260970fa3e440c36c42057c18281121a6d0177ae15f4f1d7b0dc22d316a82f02b6c1d9da6c94c94a0d1cd59cabb3349d93824cd06cc4530 SHA512 c1d2d14df23cf371c16a202563f7bbf50770a64aa0238f6dc73b6fc72f2c6baf413b9e63ab8f80159cfde2a1866c6c1d5876a56206851851a370578f446b851f DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72 DIST semver-1.0.18.crate 29703 BLAKE2B b1867f552ac87968d895c5e49123bcce0f8aa0ad384e421e5ac88bd04ae203ed6b731d5c77fb8488ec6601f1f02a8f2a207a9d21f1cc66d433032628f5d7beda SHA512 698dcd37b354cfd6ee452dce02d16051f23088ce53f0b4d099e1e4ad0f9350996f0b9b2e1c3ac7d5ed258accd92773266892e945fcae28055d4671c7ae5aac02 +DIST semver-1.0.20.crate 30451 BLAKE2B 7a08bd65749e99d0a881ef315f611f9f02215991aafb317294925e0b88b125acf33e713a45113d229646401520fba22c6f6527015c12b9859d7a65d126de647b SHA512 35a55f1d1e4dc8674d48053da36b7152b5e3bfeb72eebf7d307c491b02d77e6bd4552212551be29e2a2c3951afde292c2614829e668d9382fec0f258dc6484fe DIST shared_child-1.0.0.crate 8939 BLAKE2B dd7aa5bc4f87cab26cd0cd382fa00f42ae45ab6944e3367e355d19fd1007ded068642a35941e0cecc100120bcb1ea7d07d91bc36227261e8207b87c53de87a17 SHA512 d0e16cc7253271e6468659db0d7344c2d75772dd3428f686c49ce34bfea6ba8fa010b1ba83375241bf019e77c842001c6e1ab5096af54af03586e05c3f8fc476 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d DIST syn-2.0.28.crate 241635 BLAKE2B 5784468a0dd04eb298821ae5a3facf72c5fe5907cc469919b0a0b636bb55bd15e9e3a31c9ceb05b7b0f88e7a53e5891e6874641b61e5fde247a91361ae37047f SHA512 96e83979e70e2e1e46ca2af45d10fb259847d61e327809a51351a988282be9688a8c4942a284504674c8684970082dc15cd9ab9b3584bbfa68ac9716e071f9c5 +DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 DIST tempfile-3.7.0.crate 31754 BLAKE2B 50df09733ac358ccaa92be5e2284ce4df7f256285f2e9575637888b995af7a2e09d80cc7d228041143a36e08472d9c9f896e419d8208281fd5c768972dd6aa43 SHA512 cfa8fc57b8605edc6f4fecc167df17e484b24ab01f7f1a6cf19ed6f6161b77f124e55c8359a93d0a07970e25ca6aece4509338a66a3c683c4c473fa5ac9532df +DIST tempfile-3.8.1.crate 32164 BLAKE2B abccff7939df8cd223a5a8ee61e5af7c35335f1cd61b3e72fed9a8565465c293e99938d57b50743141aace3cd20422ad5d3090507ed66561cb0155771fe0a5ec SHA512 b257bfb70793575d59ec4cf4b7492aff83dafb68b367a48594211f476a3b1d4800b69bddc405d8749d8b320c30cbe71be1261a60b4bbc862663b37a6c7d97a3a DIST termion-1.5.6.crate 22677 BLAKE2B b918dc82bfa370bb9662bace34211bc7afa03a042dbd25f4456a7e3859521d4f32ab755780e58070f29eb7903f3b4f8129eb9447cda953b9190f9df3b7eb3aea SHA512 228b6fa7e2f280d6bfc7cef77e7a1d0d8f597178e66af0bde1b1fb6553857b511ba8a6786165815aac6d8a082fd37191f4ea35a47f1e1182f7f2c6086eb34a8c DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062 DIST thin-provisioning-tools-0.9.0.tar.gz 500998 BLAKE2B ac269fb6dfd1baf1572da27582ac2cd763b07aaac130a9467d05581e7a0ba1309d7dbf4c6095407111667e57af2e8183318d558ed23853f9c84b9c151c0878d9 SHA512 e1796fb3948847d72ca8247cae58017507c0a847a00201b93668eeb8fbfea4107c4c2affa5c211c149798a89b10474e83d2bd61a5545a668299be97aed591e0f DIST thin-provisioning-tools-1.0.6.tar.gz 393187 BLAKE2B ab0eab7097820e27fad8acd22fb83390c9d1f7b4acfbc2bed634acd159a23421e6ad5b34caae83af6aa1a8898884c86a1a1904e7a4dd99d46992bb24950252fe SHA512 b6a778048315fa83b8ffae797a406facd2be1552516f96abd0da5d02892be73f27c54e4e0a674b2f0253aa6fcdac187fc40d7a455eddfb25bc30f55a5e435b00 +DIST thin-provisioning-tools-1.0.9.tar.gz 396920 BLAKE2B becc8abf524e2e58a92b2fa5c768249670000537b11295b6c66874bab0b4819f46b41612d30e1598e96ed15966f2d5d98cb00ff3c6a0ca739524237c38e796d1 SHA512 c7d137b82cce4286d43f49af039f8026d7d7746e96affebc82e8243173ba9a014e3b462fc4b55850067ecfbcc6113c49f009c1285e272a4d64455715d11a9da1 DIST thiserror-1.0.44.crate 18760 BLAKE2B 4afb9d1cae98afff52c2e9cb67b8bd75815092f87d51ab5afcbf3366ee6ae8fde33c0bfab9458c9c452aee3b324894fddce327475ee754afb9b27794fcd9d279 SHA512 3a8e9346e69216510337e2c27e91e08e7a42a8b6b2abaa776df3937ad4dbfd857fcaff26e97d89965dcfb2003df1f1d1ff88eb239d334e62c806e8d637eb149e +DIST thiserror-1.0.50.crate 19414 BLAKE2B a093f66ad191a8c4b15356f8d29578273b36f9f11b5843195eaa15b70bd4c8eaf6dffb631564386acf35a9ddf856e05055b419af52d4e008f582ae444f3dd5d2 SHA512 65605a9cfbc43447a50980739259a45d933f1eb315926dce909892f7162c79bd04bfcee7b38b5a9fa71b24fbe4416d050ae8e2443932577541513a23ebeeac46 DIST thiserror-impl-1.0.44.crate 15086 BLAKE2B 664be3bca31bbcdd2bd8170e5e769d25e0a27c135067c84404d94bb51b5ef02daac76538898969281b0b0309c26b5ac4198e7bc819dec457dcec09e65530f75c SHA512 fe9211f50dc922b957ec3b9b5f132f812fc51fc68d23ad39837dfc174220dafb2b29d66822f34b05f1cd27cd473598d43e17979ccd9c70b056d509cd5c5c9ad7 +DIST thiserror-impl-1.0.50.crate 15357 BLAKE2B 41309507014a2c628b7e91d250335070e4cca6c6c452c90ee7e6173bed049df83ca197b37c16537cf15415550919c248e0f6c798aead760e7bbcd25eab701d50 SHA512 8555e010f94390e93ba757bce9ef25d066ed542f23b843db431a66fbab722584ea0ce6c9d4b6f4d92cea3d91c190336abd567c4a0aa4a27893db25720c5b89c9 DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0 DIST tui-0.19.0.crate 141279 BLAKE2B 55eb71dc524f45c3154f8af4024ccce33816d0c30aa28b3708a4991602892e5980df7f59b47d6c2cfe39fc90d07d7a0409693c37564b5d0d2f2f3a48e9e17c91 SHA512 b90497d06181ca74ad0a976ed57bfd6e6495e6fc96651ee96fe9e326ebf773b6627d87cae07aec26d17800a4274624ad3e835a86c37258c51077c86e667078a8 DIST unicode-ident-1.0.11.crate 42067 BLAKE2B 3c7cac3d2bf1cbf1cf04716a482f130123e8e6940f7a90a17bc62fca44ac0069688165538f5329b95a72f735b594cfb85e3250738393ffd1b53cb0cd95077d89 SHA512 9682bbee339fb987c9d0bb6a54406d37b28b5c3587372d406402e4341900fec97e3234cd03b5c98b90b6378fd533dc452cac3de90d3ade19c4b09657e4abf6df +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b +DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47 DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed +DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 DIST windows-targets-0.42.2.crate 5492 BLAKE2B 42fc4a7d3e287fe2a70637e890304b49737776596f4a94a6d216668247092135e84322bd04caddd19c83b7700b0f27278e600ce8ed326957fabc21bffcae89b0 SHA512 84fbaffcad9a80beca77506aac26d0c5cb75aa0f21a5a70bcd3f6a16e71e8753ae00d3b89da9262c99756624163dcc0d6074fa9f99dfaae0dc098018209025f9 DIST windows-targets-0.48.1.crate 6902 BLAKE2B 8e6cd47dea52131c66983cbf4982e88f7bd30416dfae4e380f7afb39f67ee0ac88d40769668dd5aba40d4415f9f00cbc2ac98d598506fed26029f5ec4df3a2c5 SHA512 e48179620cce528292167f1d5ee2deea0659569c996dc90eb4ab62b9ea8baee6c0bea3ab739e06d8793c9690bfc895545ed0039cb633ca39293de79c42ea9de2 +DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 +DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e DIST windows_aarch64_gnullvm-0.42.2.crate 364071 BLAKE2B 97c4e3b2a2dd3f936f9bfcdad23639c9c4c499eed220aec361d26d6013d798efa118e6b298f9cf841ac149d2ae5d58ca653731718450fcf2910bb5f6fa39159f SHA512 75cd7eb1def8ce9d0ff3d7468d2b1cc31cc76c08f981a2460c3d1eb09cff7100d7442863a3591621c1f5f3b3f4badf0b5c95285b6ed583e37283a8403f1095f1 DIST windows_aarch64_gnullvm-0.48.0.crate 366543 BLAKE2B 9b10f65089fe6da3ff38a1061783f635644ae84f567f891eaced280af68f7ff3919b34289e8850aa34554bb0346903273ff0a7fa743ca8794c2d23a9f1b0185f SHA512 80c5aa74c5669f7acff3882a8e7575f15e8d7cc58c11a1cb731ff423eb9cc9ba43cc6b80e52803c0d44e6a9001655ba87de6f43a9fe858da6d6e3a5c983a2711 +DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 +DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f DIST windows_aarch64_msvc-0.42.2.crate 666981 BLAKE2B 9f3cc5592cdede08bcdc1e7c455325279e3b763d96942695e10dccf1dfc37a81c749b69a7d6de883d4c0fa6e8a0d2f578fe2a8d6c42ad8ef6282590bf8fc87b7 SHA512 d2dafa8c94d01c1b65ca1bd631d31f2ef842f1db7accb132ff78c3f8483221b991afd3391563e03dcec42bbc9cbdc0ebdab47b991d25af85b5ba2ac1bbf8db63 DIST windows_aarch64_msvc-0.48.0.crate 671479 BLAKE2B 0c80f210437628e1d878d1d14e884fea532c7539b3030aa76d46f27d02372c715c6e33d7efdbbd770666472b44a66c30711a33d819ede9cdcd51c96355802d45 SHA512 617e47a7202f1db4dbd3ecea509682135ccd85e3a458c0331b9bc7aa1d84e5756b59c881cb098d5c6d4c951248d13c8253a8e8a50938e1997bd19ceba77262df +DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff +DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1 DIST windows_i686_gnu-0.42.2.crate 736236 BLAKE2B 4ef0496462afc73d9d72af7e5da1e6d3506a92f8172930e88ae64ab97596ffd31c4f97fb969e9b677e30159c27f00a8e756deb006b630fb98ce83f03c8b762e2 SHA512 ad09d650a05cb91cb6b40f59025c023a4c286bc1194586697c506016df2b9b0d5b02606b81687bc634795a0d9a9b8a73e486599328ae09c853e8e5ba662fc59c DIST windows_i686_gnu-0.48.0.crate 741490 BLAKE2B 5a4a584f8d8ee5bbd2d4c5b6749a66f2d43fc9e4ef90faab2227709b270f0d46fc26578c029edd96877c71309316ddb32d91c39f46d88f9a484c614f866e3dbe SHA512 15149fdd48b61b6d993acd392dbd353d0280d984ea88745217e4207937174bb90cdd9701f69ff0fe06a842f03607cbb57937d20d79ab577181e605a8a8fadc68 +DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a +DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e DIST windows_i686_msvc-0.42.2.crate 724951 BLAKE2B b084286cd4927efd2889b149abf8a9fe9d3d777130db9e592982660dbf9a96a0f5e723ca121465787aa11877d2d29a5a7d7cf066cdc8fa7e90d7ca7dcb7677f1 SHA512 c1706fc36d4b157c020744a11b3eb5d7dfbf05a0b56775bc717e94b7fd725816b20154fdbcd69ac08dbfb8b8bbfa74fab72d7a9c10399aad6a1cc54cf597e804 DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65e4af08455a0fd058bb0f763d481f30b029f99a2b8dbac087b29e762500a19270f6683baf62ba99d141eb002a5b0b5c8ea05 SHA512 11a50800e709712dbea907275bc0faa46d2eb2969118445ed5b932d9c5957a09592a5b26a40e554c1f5fd56c6d074a07637e6f88eedd2224e1001e62df7b469b +DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e +DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671 DIST windows_x86_64_gnu-0.42.2.crate 699373 BLAKE2B 01c70809d564b16b268656e47295e99c992d8f9839fac8a51338a0e7c3b9cdcd0429c456ca8c1c139a8c687ed7ed6c43a82250889d881aadaa65bd037223e0a6 SHA512 5767af3c86e717f93137a89d442230e6b60a649057edb3ab104b1f82c0bcd64fe089dcdf2f4fd486a799bece1ddb5f0449641536b678211945e749ae24f35c1f DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602 +DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 +DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7 DIST windows_x86_64_gnullvm-0.42.2.crate 364068 BLAKE2B 64bc53e98eb3fc649c9b43a6e734de4e65088e41edacabd49f7afcc5dc6e1065c563ecfc682747dda05978dea2dba4f45c16fcc18c3b00684c3d93681e5a7deb SHA512 d39a8bc948110fe612d3f8d6628b3f0d56620df11d8a49e0fabb6c90389ad407582b3af10e4eab46c79b3d11d2e10753d73d9e55963fbeac085f41e9749bdba3 DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396 +DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa +DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795 +DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 +DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7 diff --git a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.9.ebuild b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.9.ebuild new file mode 100644 index 0000000000..a8f60077bd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.9.ebuild @@ -0,0 +1,203 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999 ]]; then +CRATES=" + adler@1.0.2 + aho-corasick@1.1.2 + anstyle@1.0.4 + anyhow@1.0.75 + atty@0.2.14 + autocfg@1.1.0 + base64@0.21.5 + bitflags@1.3.2 + bitflags@2.4.1 + bytemuck@1.14.0 + byteorder@1.5.0 + cassowary@0.3.0 + cfg-if@1.0.0 + clap@4.4.11 + clap_builder@4.4.11 + clap_lex@0.6.0 + console@0.15.7 + crc32c@0.6.4 + crc32fast@1.3.2 + data-encoding@2.5.0 + difflib@0.4.0 + downcast@0.11.0 + duct@0.13.6 + either@1.9.0 + encode_unicode@0.3.6 + env_logger@0.8.4 + errno@0.3.8 + exitcode@1.1.2 + fastrand@2.0.1 + fixedbitset@0.4.2 + flate2@1.0.28 + float-cmp@0.9.0 + fragile@2.0.0 + getrandom@0.2.11 + hermit-abi@0.1.19 + hermit-abi@0.3.3 + indicatif@0.17.7 + instant@0.1.12 + iovec@0.1.4 + itertools@0.10.5 + lazy_static@1.4.0 + libc@0.2.150 + linux-raw-sys@0.4.12 + log@0.4.20 + memchr@2.6.4 + minimal-lexical@0.2.1 + miniz_oxide@0.7.1 + mockall@0.11.4 + mockall_derive@0.11.4 + nom@7.1.3 + normalize-line-endings@0.3.0 + num-derive@0.4.1 + num-traits@0.2.17 + num_cpus@1.16.0 + number_prefix@0.4.0 + numtoa@0.1.0 + once_cell@1.19.0 + os_pipe@1.1.4 + portable-atomic@1.6.0 + ppv-lite86@0.2.17 + predicates-core@1.0.6 + predicates-tree@1.0.9 + predicates@2.1.5 + proc-macro2@1.0.70 + quick-xml@0.29.0 + quickcheck@1.0.3 + quickcheck_macros@1.0.0 + quote@1.0.33 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + rangemap@1.4.0 + redox_syscall@0.2.16 + redox_syscall@0.4.1 + redox_termios@0.1.3 + regex-automata@0.4.3 + regex-syntax@0.8.2 + regex@1.10.2 + retain_mut@0.1.7 + roaring@0.10.2 + rustc_version@0.4.0 + rustix@0.38.27 + safemem@0.3.3 + semver@1.0.20 + shared_child@1.0.0 + strsim@0.10.0 + syn@1.0.109 + syn@2.0.39 + tempfile@3.8.1 + termion@1.5.6 + termtree@0.4.1 + thiserror-impl@1.0.50 + thiserror@1.0.50 + threadpool@1.8.1 + tui@0.19.0 + unicode-ident@1.0.12 + unicode-segmentation@1.10.1 + unicode-width@0.1.11 + wasi@0.11.0+wasi-snapshot-preview1 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.45.0 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.42.2 + windows-targets@0.48.5 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.42.2 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.42.2 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.42.2 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.42.2 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.42.2 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.42.2 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.42.2 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.0 +" + +declare -A GIT_CRATES=( + [rio]='https://github.com/jthornber/rio;2979a720f671e836302c01546f9cc9f7988610c8;rio-%commit%' +) + declare -A GIT_CRATES=( + [rio]="https://github.com/jthornber/rio;2979a720f671e836302c01546f9cc9f7988610c8" + ) +fi + +inherit cargo + +DESCRIPTION="A suite of tools for thin provisioning on Linux" +HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/jthornber/thin-provisioning-tools.git" + inherit git-r3 +else + SRC_URI=" + https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${CARGO_CRATE_URIS} + " + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-3" +# Dependent crate licenses +LICENSE+=" Apache-2.0 BSD GPL-3 MIT Unicode-DFS-2016" +SLOT="0" +IUSE="io-uring" + +PATCHES=( "${FILESDIR}/${PN}-1.0.6-build-with-cargo.patch" ) +DOCS=( + CHANGES + COPYING + README.md + doc/TODO.md + doc/thinp-version-2/notes.md +) + +# Rust +QA_FLAGS_IGNORED="usr/sbin/pdata_tools" + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_configure() { + local myfeatures=( $(usev io-uring io_uring) ) + cargo_src_configure +} + +src_install() { + emake \ + DESTDIR="${D}" \ + DATADIR="${ED}/usr/share" \ + PDATA_TOOLS="target/$(usex debug debug release)/pdata_tools" \ + install + + einstalldocs +} diff --git a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild index 60954e6c59..a8f60077bd 100644 --- a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild @@ -1,133 +1,144 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 if [[ ${PV} != *9999 ]]; then - CRATES=" - adler@1.0.2 - aho-corasick@1.0.2 - anstyle@1.0.1 - anyhow@1.0.72 - atty@0.2.14 - autocfg@1.1.0 - base64@0.21.2 - bitflags@1.3.2 - bitflags@2.3.3 - bytemuck@1.13.1 - byteorder@1.4.3 - cassowary@0.3.0 - cc@1.0.81 - cfg-if@1.0.0 - clap@4.3.19 - clap_builder@4.3.19 - clap_lex@0.5.0 - console@0.15.7 - crc32c@0.6.4 - crc32fast@1.3.2 - data-encoding@2.4.0 - difflib@0.4.0 - downcast@0.11.0 - duct@0.13.6 - either@1.9.0 - encode_unicode@0.3.6 - env_logger@0.8.4 - errno@0.3.2 - errno-dragonfly@0.1.2 - exitcode@1.1.2 - fastrand@2.0.0 - fixedbitset@0.4.2 - flate2@1.0.26 - float-cmp@0.9.0 - fragile@2.0.0 - getrandom@0.2.10 - hermit-abi@0.1.19 - hermit-abi@0.3.2 - indicatif@0.17.6 - instant@0.1.12 - iovec@0.1.4 - itertools@0.10.5 - lazy_static@1.4.0 - libc@0.2.147 - linux-raw-sys@0.4.5 - log@0.4.19 - memchr@2.5.0 - minimal-lexical@0.2.1 - miniz_oxide@0.7.1 - mockall@0.11.4 - mockall_derive@0.11.4 - nom@7.1.3 - normalize-line-endings@0.3.0 - num-derive@0.4.0 - num-traits@0.2.16 - num_cpus@1.16.0 - number_prefix@0.4.0 - numtoa@0.1.0 - once_cell@1.18.0 - os_pipe@1.1.4 - portable-atomic@1.4.2 - ppv-lite86@0.2.17 - predicates@2.1.5 - predicates-core@1.0.6 - predicates-tree@1.0.9 - proc-macro2@1.0.66 - quick-xml@0.29.0 - quickcheck@1.0.3 - quickcheck_macros@1.0.0 - quote@1.0.32 - rand@0.8.5 - rand_chacha@0.3.1 - rand_core@0.6.4 - rangemap@1.3.0 - redox_syscall@0.2.16 - redox_syscall@0.3.5 - redox_termios@0.1.2 - regex@1.9.1 - regex-automata@0.3.4 - regex-syntax@0.7.4 - retain_mut@0.1.7 - roaring@0.10.2 - rustc_version@0.4.0 - rustix@0.38.6 - safemem@0.3.3 - semver@1.0.18 - shared_child@1.0.0 - strsim@0.10.0 - syn@1.0.109 - syn@2.0.28 - tempfile@3.7.0 - termion@1.5.6 - termtree@0.4.1 - thiserror@1.0.44 - thiserror-impl@1.0.44 - threadpool@1.8.1 - tui@0.19.0 - unicode-ident@1.0.11 - unicode-segmentation@1.10.1 - unicode-width@0.1.10 - wasi@0.11.0+wasi-snapshot-preview1 - winapi@0.3.9 - winapi-i686-pc-windows-gnu@0.4.0 - winapi-x86_64-pc-windows-gnu@0.4.0 - windows-sys@0.45.0 - windows-sys@0.48.0 - windows-targets@0.42.2 - windows-targets@0.48.1 - windows_aarch64_gnullvm@0.42.2 - windows_aarch64_gnullvm@0.48.0 - windows_aarch64_msvc@0.42.2 - windows_aarch64_msvc@0.48.0 - windows_i686_gnu@0.42.2 - windows_i686_gnu@0.48.0 - windows_i686_msvc@0.42.2 - windows_i686_msvc@0.48.0 - windows_x86_64_gnu@0.42.2 - windows_x86_64_gnu@0.48.0 - windows_x86_64_gnullvm@0.42.2 - windows_x86_64_gnullvm@0.48.0 - windows_x86_64_msvc@0.42.2 - windows_x86_64_msvc@0.48.0 - " +CRATES=" + adler@1.0.2 + aho-corasick@1.1.2 + anstyle@1.0.4 + anyhow@1.0.75 + atty@0.2.14 + autocfg@1.1.0 + base64@0.21.5 + bitflags@1.3.2 + bitflags@2.4.1 + bytemuck@1.14.0 + byteorder@1.5.0 + cassowary@0.3.0 + cfg-if@1.0.0 + clap@4.4.11 + clap_builder@4.4.11 + clap_lex@0.6.0 + console@0.15.7 + crc32c@0.6.4 + crc32fast@1.3.2 + data-encoding@2.5.0 + difflib@0.4.0 + downcast@0.11.0 + duct@0.13.6 + either@1.9.0 + encode_unicode@0.3.6 + env_logger@0.8.4 + errno@0.3.8 + exitcode@1.1.2 + fastrand@2.0.1 + fixedbitset@0.4.2 + flate2@1.0.28 + float-cmp@0.9.0 + fragile@2.0.0 + getrandom@0.2.11 + hermit-abi@0.1.19 + hermit-abi@0.3.3 + indicatif@0.17.7 + instant@0.1.12 + iovec@0.1.4 + itertools@0.10.5 + lazy_static@1.4.0 + libc@0.2.150 + linux-raw-sys@0.4.12 + log@0.4.20 + memchr@2.6.4 + minimal-lexical@0.2.1 + miniz_oxide@0.7.1 + mockall@0.11.4 + mockall_derive@0.11.4 + nom@7.1.3 + normalize-line-endings@0.3.0 + num-derive@0.4.1 + num-traits@0.2.17 + num_cpus@1.16.0 + number_prefix@0.4.0 + numtoa@0.1.0 + once_cell@1.19.0 + os_pipe@1.1.4 + portable-atomic@1.6.0 + ppv-lite86@0.2.17 + predicates-core@1.0.6 + predicates-tree@1.0.9 + predicates@2.1.5 + proc-macro2@1.0.70 + quick-xml@0.29.0 + quickcheck@1.0.3 + quickcheck_macros@1.0.0 + quote@1.0.33 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + rangemap@1.4.0 + redox_syscall@0.2.16 + redox_syscall@0.4.1 + redox_termios@0.1.3 + regex-automata@0.4.3 + regex-syntax@0.8.2 + regex@1.10.2 + retain_mut@0.1.7 + roaring@0.10.2 + rustc_version@0.4.0 + rustix@0.38.27 + safemem@0.3.3 + semver@1.0.20 + shared_child@1.0.0 + strsim@0.10.0 + syn@1.0.109 + syn@2.0.39 + tempfile@3.8.1 + termion@1.5.6 + termtree@0.4.1 + thiserror-impl@1.0.50 + thiserror@1.0.50 + threadpool@1.8.1 + tui@0.19.0 + unicode-ident@1.0.12 + unicode-segmentation@1.10.1 + unicode-width@0.1.11 + wasi@0.11.0+wasi-snapshot-preview1 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.45.0 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.42.2 + windows-targets@0.48.5 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.42.2 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.42.2 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.42.2 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.42.2 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.42.2 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.42.2 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.42.2 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.0 +" + +declare -A GIT_CRATES=( + [rio]='https://github.com/jthornber/rio;2979a720f671e836302c01546f9cc9f7988610c8;rio-%commit%' +) declare -A GIT_CRATES=( [rio]="https://github.com/jthornber/rio;2979a720f671e836302c01546f9cc9f7988610c8" ) @@ -146,10 +157,12 @@ else https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz ${CARGO_CRATE_URIS} " - KEYWORDS="~amd64 ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi -LICENSE="Apache-2.0 BSD GPL-3 MIT Unicode-DFS-2016" +LICENSE="GPL-3" +# Dependent crate licenses +LICENSE+=" Apache-2.0 BSD GPL-3 MIT Unicode-DFS-2016" SLOT="0" IUSE="io-uring" From 68191477bb8e7be59631f2c853aeb4a2ef6e7158 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:15:27 +0000 Subject: [PATCH 090/130] sys-devel/binutils: Sync with Gentoo It's from Gentoo commit c7ece32b5d4a295732ccd888a3cf0fddb92f91b3. --- .../binutils/binutils-2.32-r2.ebuild | 11 +- .../binutils/binutils-2.33.1-r1.ebuild | 11 +- .../binutils/binutils-2.34-r2.ebuild | 11 +- .../sys-devel/binutils/binutils-2.35.2.ebuild | 13 +- .../binutils/binutils-2.36.1-r2.ebuild | 13 +- .../binutils/binutils-2.37_p1-r2.ebuild | 13 +- .../binutils/binutils-2.38-r2.ebuild | 13 +- .../binutils/binutils-2.39-r5.ebuild | 13 +- .../binutils/binutils-2.40-r5.ebuild | 13 +- .../binutils/binutils-2.40-r9.ebuild | 15 +- .../binutils/binutils-2.41-r2.ebuild | 13 +- .../binutils/binutils-2.41-r3.ebuild | 15 +- .../binutils/binutils-2.41-r4.ebuild | 529 ++++++++++++++++++ .../sys-devel/binutils/binutils-9999.ebuild | 22 +- .../files/binutils-2.41-linker-prefix.patch | 56 ++ 15 files changed, 643 insertions(+), 118 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r4.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/binutils/files/binutils-2.41-linker-prefix.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.32-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.32-r2.ebuild index df54d7b742..0fcdb18847 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.32-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.32-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -76,7 +76,7 @@ DEPEND="${RDEPEND} doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) - sys-devel/flex + app-alternatives/lex app-alternatives/yacc " @@ -162,12 +162,7 @@ src_configure() { # Keep things sane strip-flags - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) local x echo diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.33.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.33.1-r1.ebuild index 04c74a25e1..748cab6ef9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.33.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.33.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -68,7 +68,7 @@ DEPEND="${RDEPEND} doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) - sys-devel/flex + app-alternatives/lex app-alternatives/yacc " @@ -155,12 +155,7 @@ src_configure() { # Keep things sane strip-flags - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) local x echo diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.34-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.34-r2.ebuild index 941890975f..42d6d1910d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.34-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.34-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -69,7 +69,7 @@ BDEPEND=" doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) - sys-devel/flex + app-alternatives/lex app-alternatives/yacc " @@ -152,12 +152,7 @@ src_configure() { # Keep things sane strip-flags - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) local x echo diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.35.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.35.2.ebuild index 3e9e6183b4..2dd287d2dc 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.35.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.35.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -58,10 +58,10 @@ BDEPEND=" doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu - sys-devel/bc + app-alternatives/bc ) nls? ( sys-devel/gettext ) - sys-devel/flex + app-alternatives/lex app-alternatives/yacc " @@ -169,12 +169,7 @@ src_configure() { # Keep things sane strip-flags - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) local x echo diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.36.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.36.1-r2.ebuild index dcaa4a446b..2f20daa4bb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.36.1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.36.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -58,10 +58,10 @@ BDEPEND=" doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu - sys-devel/bc + app-alternatives/bc ) nls? ( sys-devel/gettext ) - sys-devel/flex + app-alternatives/lex app-alternatives/yacc " @@ -164,12 +164,7 @@ src_configure() { # Keep things sane strip-flags - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) local x echo diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.37_p1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.37_p1-r2.ebuild index 333ff355ed..4d35c92270 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.37_p1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.37_p1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -58,10 +58,10 @@ BDEPEND=" doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu - sys-devel/bc + app-alternatives/bc ) nls? ( sys-devel/gettext ) - sys-devel/flex + app-alternatives/lex app-alternatives/yacc " @@ -170,12 +170,7 @@ src_configure() { # Keep things sane strip-flags - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.38-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.38-r2.ebuild index bea67260a9..a9791fe4df 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.38-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.38-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -58,10 +58,10 @@ BDEPEND=" doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu - sys-devel/bc + app-alternatives/bc ) nls? ( sys-devel/gettext ) - sys-devel/flex + app-alternatives/lex app-alternatives/yacc " @@ -175,12 +175,7 @@ src_configure() { # Keep things sane strip-flags - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r5.ebuild index c1b0195fae..c9f86dbbc0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -59,10 +59,10 @@ BDEPEND=" doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu - sys-devel/bc + app-alternatives/bc ) nls? ( sys-devel/gettext ) - sys-devel/flex + app-alternatives/lex app-alternatives/yacc " @@ -171,12 +171,7 @@ src_configure() { # Keep things sane strip-flags - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40-r5.ebuild index 8d0073e796..caa14408bc 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -59,11 +59,11 @@ BDEPEND=" doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu - sys-devel/bc + app-alternatives/bc ) nls? ( sys-devel/gettext ) zstd? ( virtual/pkgconfig ) - sys-devel/flex + app-alternatives/lex app-alternatives/yacc " @@ -178,12 +178,7 @@ src_configure() { use cet && filter-flags -mindirect-branch -mindirect-branch=* use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) local x echo diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40-r9.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40-r9.ebuild index d4f97d2149..8c60fad392 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40-r9.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -32,7 +32,7 @@ else [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" SLOT=$(ver_cut 1-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" fi # @@ -62,11 +62,11 @@ BDEPEND=" doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu - sys-devel/bc + app-alternatives/bc ) nls? ( sys-devel/gettext ) zstd? ( virtual/pkgconfig ) - sys-devel/flex + app-alternatives/lex app-alternatives/yacc " @@ -183,12 +183,7 @@ src_configure() { use cet && filter-flags -mindirect-branch -mindirect-branch=* use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) local x echo diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r2.ebuild index aabb87038c..b00ec7113c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -62,11 +62,11 @@ BDEPEND=" doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu - sys-devel/bc + app-alternatives/bc ) nls? ( sys-devel/gettext ) zstd? ( virtual/pkgconfig ) - sys-devel/flex + app-alternatives/lex app-alternatives/yacc " @@ -183,12 +183,7 @@ src_configure() { use cet && filter-flags -mindirect-branch -mindirect-branch=* use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) local x echo diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r3.ebuild index 10a57e9314..15bdc6f5a7 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -32,7 +32,7 @@ else [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" SLOT=$(ver_cut 1-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" fi # @@ -62,11 +62,11 @@ BDEPEND=" doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu - sys-devel/bc + app-alternatives/bc ) nls? ( sys-devel/gettext ) zstd? ( virtual/pkgconfig ) - sys-devel/flex + app-alternatives/lex app-alternatives/yacc " @@ -183,12 +183,7 @@ src_configure() { use cet && filter-flags -mindirect-branch -mindirect-branch=* use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) local x echo diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r4.ebuild new file mode 100644 index 0000000000..08d7d906df --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r4.ebuild @@ -0,0 +1,529 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="https://sourceware.org/binutils/" + +LICENSE="GPL-3+" +IUSE="cet debuginfod doc gold gprofng hardened multitarget +nls pgo +plugins static-libs test vanilla zstd" + +# Variables that can be set here (ignored for live ebuilds) +# PATCH_VER - the patchset version +# Default: empty, no patching +# PATCH_BINUTILS_VER - the binutils version in the patchset name +# - Default: PV +# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/... +# for the patchsets + +PATCH_VER=4 +PATCH_DEV=dilfridge + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + SLOT=${PV} +else + PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} + PATCH_DEV=${PATCH_DEV:-dilfridge} + SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz" + [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" + SLOT=$(ver_cut 1-2) + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +# +# The cross-compile logic +# +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +# +# The dependencies +# +RDEPEND=" + >=sys-devel/binutils-config-3 + sys-libs/zlib + debuginfod? ( + dev-libs/elfutils[debuginfod(-)] + ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( sys-apps/texinfo ) + test? ( + dev-util/dejagnu + app-alternatives/bc + ) + nls? ( sys-devel/gettext ) + zstd? ( virtual/pkgconfig ) + app-alternatives/lex + app-alternatives/yacc +" + +RESTRICT="!test? ( test )" + +MY_BUILDDIR=${WORKDIR}/build + +src_unpack() { + if [[ ${PV} == 9999* ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git + git-r3_src_unpack + mv patches-git/9999 patch || die + + EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" + S=${WORKDIR}/binutils + EGIT_CHECKOUT_DIR=${S} + git-r3_src_unpack + else + unpack ${P/-hppa64/}.tar.xz + + cd "${WORKDIR}" || die + unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz + + # _p patch versions are Gentoo specific tarballs ... + local dir=${P%_p?} + dir=${dir/-hppa64/} + + S=${WORKDIR}/${dir} + fi + + cd "${WORKDIR}" || die + mkdir -p "${MY_BUILDDIR}" || die +} + +src_prepare() { + local patchsetname + if [[ ${PV} == 9999* ]] ; then + patchsetname="from git master" + else + patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}" + fi + + if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then + if ! use vanilla; then + einfo "Applying binutils patchset ${patchsetname}" + eapply "${WORKDIR}/patch" + einfo "Done." + + # This is applied conditionally for now just out of caution. + # It should be okay on non-prefix systems though. See bug #892549. + if is_cross || use prefix; then + eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch \ + "${FILESDIR}"/binutils-2.41-linker-prefix.patch + fi + fi + fi + + # Make sure our explicit libdir paths don't get clobbered, bug #562460 + sed -i \ + -e 's:@bfdlibdir@:@libdir@:g' \ + -e 's:@bfdincludedir@:@includedir@:g' \ + {bfd,opcodes}/Makefile.in || die + + # Fix locale issues if possible, bug #122216 + if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then + einfo "Fixing misc issues in configure files" + for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do + ebegin " Updating ${f/${S}\/}" + patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \ + || eerror "Please file a bug about this" + eend $? + done + fi + + # Apply things from PATCHES and user dirs + default + + # Run misc portage update scripts + gnuconfig_update + elibtoolize --portage --no-uclibc +} + +toolchain-binutils_bugurl() { + printf "https://bugs.gentoo.org/" +} +toolchain-binutils_pkgversion() { + printf "Gentoo ${PV}" + [[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}" +} + +src_configure() { + # 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}" + + # Setup some paths + LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV} + INCPATH=${LIBPATH}/include + DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV} + if is_cross ; then + TOOLPATH=/usr/${CHOST}/${CTARGET} + else + TOOLPATH=/usr/${CTARGET} + fi + BINPATH=${TOOLPATH}/binutils-bin/${PV} + + # Make sure we filter $LINGUAS so that only ones that + # actually work make it through, bug #42033 + strip-linguas -u */po + + # Keep things sane + strip-flags + use cet && filter-flags -mindirect-branch -mindirect-branch=* + use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 + + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + local x + echo + for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do + einfo "$(printf '%10s' ${x}:) ${!x}" + done + echo + + cd "${MY_BUILDDIR}" || die + local myconf=() + + if use plugins ; then + myconf+=( --enable-plugins ) + fi + # enable gold (installed as ld.gold) and ld's plugin architecture + if use gold ; then + myconf+=( --enable-gold ) + fi + + if use nls ; then + myconf+=( --without-included-gettext ) + else + myconf+=( --disable-nls ) + fi + + myconf+=( --with-system-zlib ) + + # For bi-arch systems, enable a 64bit bfd. This matches the bi-arch + # logic in toolchain.eclass. bug #446946 + # + # We used to do it for everyone, but it's slow on 32bit arches. bug #438522 + case $(tc-arch) in + ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;; + esac + + use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd ) + + [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} ) + + is_cross && myconf+=( + --with-sysroot="${EPREFIX}"/usr/${CTARGET} + --enable-poison-system-directories + ) + + myconf+=( --enable-secureplt ) + + # mips can't do hash-style=gnu ... + if [[ $(tc-arch) != mips ]] ; then + myconf+=( --enable-default-hash-style=gnu ) + fi + + myconf+=( + --prefix="${EPREFIX}"/usr + --host=${CHOST} + --target=${CTARGET} + --datadir="${EPREFIX}"${DATAPATH} + --datarootdir="${EPREFIX}"${DATAPATH} + --infodir="${EPREFIX}"${DATAPATH}/info + --mandir="${EPREFIX}"${DATAPATH}/man + --bindir="${EPREFIX}"${BINPATH} + --libdir="${EPREFIX}"${LIBPATH} + --libexecdir="${EPREFIX}"${LIBPATH} + --includedir="${EPREFIX}"${INCPATH} + # portage's econf() does not detect presence of --d-d-t + # because it greps only top-level ./configure. But not + # libiberty's or bfd's configure. + --disable-dependency-tracking + --disable-silent-rules + --enable-obsolete + --enable-shared + --enable-threads + --enable-relro + --enable-install-libiberty + --enable-textrel-check=$(usex hardened error warning) + # Things to think about + #--enable-deterministic-archives + --enable-new-dtags + --disable-jansson + --disable-werror + --with-bugurl="$(toolchain-binutils_bugurl)" + --with-pkgversion="$(toolchain-binutils_pkgversion)" + $(use_enable static-libs static) + $(use_with zstd) + + # Disable modules that are in a combined binutils/gdb tree, bug #490566 + --disable-{gdb,libdecnumber,readline,sim} + # Strip out broken static link flags: https://gcc.gnu.org/PR56750 + --without-stage1-ldflags + # Change SONAME to avoid conflict across {native,cross}/binutils, binutils-libs. bug #666100 + --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st) + + $(use_with debuginfod) + + # Avoid automagic dev-libs/msgpack dep, bug #865875 + --without-msgpack + + # 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) + + # We can enable this by default in future, but it's brand new + # in 2.39 with several bugs: + # - Doesn't build on musl (https://sourceware.org/bugzilla/show_bug.cgi?id=29477) + # - No man pages (https://sourceware.org/bugzilla/show_bug.cgi?id=29521) + # - Broken at runtime without Java (https://sourceware.org/bugzilla/show_bug.cgi?id=29479) + # - binutils-config (and this ebuild?) needs adaptation first (https://bugs.gentoo.org/865113) + $(use_enable gprofng) + ) + + case ${CTARGET} in + x86_64-*|aarch64*|arm64*|i[3456]*) + # These hardening options are available from 2.39+ but + # they unconditionally enable the behaviour even on arches + # where e.g. execstacks can't be avoided. + # See https://sourceware.org/bugzilla/show_bug.cgi?id=29592. + # + # TODO: Get the logic for this fixed upstream so it doesn't + # create impossible broken combinations on some arches, like mips. + # + # TODO: Get the logic for this fixed upstream so --disable-* works + # as expected. + myconf+=( + --enable-warn-execstack=yes + --enable-warn-rwx-segments=yes + ) + + if use hardened ; then + myconf+=( + --enable-default-execstack=no + ) + fi + ;; + *) + ;; + esac + + if use elibc_musl ; then + # Override our earlier setting for musl, as textrels don't + # work there at all. See bug #707660. + myconf+=( + --enable-textrel-check=error + ) + fi + + if ! is_cross ; then + myconf+=( $(use_enable pgo pgo-build lto) ) + + if use pgo ; then + export BUILD_CFLAGS="${CFLAGS}" + fi + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + # Prevent makeinfo from running if doc is unset. + if ! use doc ; then + sed -i \ + -e '/^MAKEINFO/s:=.*:= true:' \ + Makefile || die + fi +} + +src_compile() { + cd "${MY_BUILDDIR}" || die + + # see Note [tooldir hack for ldscripts] + # see linker prefix patch + emake \ + tooldir="${EPREFIX}${TOOLPATH}" \ + gentoo_prefix=$(usex prefix-guest "${EPREFIX}"/usr /usr) \ + all + + # only build info pages if the user wants them + if use doc ; then + emake info + fi + + # we nuke the manpages when we're left with junk + # (like when we bootstrap, no perl -> no manpages) + find . -name '*.1' -a -size 0 -delete +} + +src_test() { + cd "${MY_BUILDDIR}" || die + + # bug #637066 + filter-flags -Wall -Wreturn-type + + emake -k check +} + +src_install() { + local x d + + cd "${MY_BUILDDIR}" || die + + # see Note [tooldir hack for ldscripts] + emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install + rm -rf "${ED}"/${LIBPATH}/bin || die + use static-libs || find "${ED}" -name '*.la' -delete + + # Newer versions of binutils get fancy with ${LIBPATH}, bug #171905 + cd "${ED}"/${LIBPATH} || die + for d in ../* ; do + [[ ${d} == ../${PV} ]] && continue + mv ${d}/* . || die + rmdir ${d} || die + done + + # Now we collect everything intp the proper SLOT-ed dirs + # When something is built to cross-compile, it installs into + # /usr/$CHOST/ by default ... we have to 'fix' that :) + if is_cross ; then + cd "${ED}"/${BINPATH} || die + for x in * ; do + mv ${x} ${x/${CTARGET}-} || die + done + + if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then + mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH} + mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/ + rm -r "${ED}"/usr/${CHOST}/{include,lib} + fi + fi + + insinto ${INCPATH} + local libiberty_headers=( + # Not all the libiberty headers. See libiberty/Makefile.in:install_to_libdir. + demangle.h + dyn-string.h + fibheap.h + hashtab.h + libiberty.h + objalloc.h + splay-tree.h + ) + doins "${libiberty_headers[@]/#/${S}/include/}" + if [[ -d ${ED}/${LIBPATH}/lib ]] ; then + mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ || die + rm -r "${ED}"/${LIBPATH}/lib || die + fi + + # Generate an env.d entry for this binutils + insinto /etc/env.d/binutils + cat <<-EOF > "${T}"/env.d + TARGET="${CTARGET}" + VER="${PV}" + LIBPATH="${EPREFIX}${LIBPATH}" + EOF + newins "${T}"/env.d ${CTARGET}-${PV} + + # Handle documentation + if ! is_cross ; then + cd "${S}" || die + dodoc README + + docinto bfd + dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO + + docinto binutils + dodoc binutils/ChangeLog binutils/NEWS binutils/README + + docinto gas + dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README* + + docinto gprof + dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl + + docinto ld + dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO + + docinto libiberty + dodoc libiberty/ChangeLog* libiberty/README + + docinto opcodes + dodoc opcodes/ChangeLog* + fi + + # Remove shared info pages + rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} + + # Trim all empty dirs + find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null +} + +pkg_postinst() { + # Make sure this ${CTARGET} has a binutils version selected + [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 + binutils-config ${CTARGET}-${PV} +} + +pkg_postrm() { + local current_profile=$(binutils-config -c ${CTARGET}) + + # If no other versions exist, then uninstall for this + # target ... otherwise, switch to the newest version + # Note: only do this if this version is unmerged. We + # rerun binutils-config if this is a remerge, as + # we want the mtimes on the symlinks updated (if + # it is the same as the current selected profile) + if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then + local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') + choice=${choice//$'\n'/ } + choice=${choice/* } + if [[ -z ${choice} ]] ; then + binutils-config -u ${CTARGET} + else + binutils-config ${choice} + fi + elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then + binutils-config ${CTARGET}-${PV} + fi +} + +# Note [slotting support] +# ----------------------- +# Gentoo's layout for binutils files is non-standard as Gentoo +# supports slotted installation for binutils. Many tools +# still expect binutils to reside in known locations. +# binutils-config package restores symlinks into known locations, +# like: +# /usr/bin/${CTARGET}- +# /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips +# /usr/include/ +# +# Note [tooldir hack for ldscripts] +# --------------------------------- +# Build system does not allow ./configure to tweak every location +# we need for slotting binutils hence all the shuffling in +# src_install(). This note is about SCRIPTDIR define handling. +# +# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value +# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib' +# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time. +# Thus we can't just move files around after compilation finished. +# +# Our goal is the following: +# - at build-time set scriptdir to point to symlinked location: +# ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case) +# - at install-time set scriptdir to point to slotted location: +# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-9999.ebuild index 5d9cedc9c2..393acc75d9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -62,11 +62,11 @@ BDEPEND=" doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu - sys-devel/bc + app-alternatives/bc ) nls? ( sys-devel/gettext ) zstd? ( virtual/pkgconfig ) - sys-devel/flex + app-alternatives/lex app-alternatives/yacc " @@ -119,7 +119,8 @@ src_prepare() { # This is applied conditionally for now just out of caution. # It should be okay on non-prefix systems though. See bug #892549. if is_cross || use prefix; then - eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch + eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch \ + "${FILESDIR}"/binutils-2.41-linker-prefix.patch fi fi fi @@ -183,12 +184,7 @@ src_configure() { use cet && filter-flags -mindirect-branch -mindirect-branch=* use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) local x echo @@ -356,7 +352,11 @@ src_compile() { cd "${MY_BUILDDIR}" || die # see Note [tooldir hack for ldscripts] - emake tooldir="${EPREFIX}${TOOLPATH}" all + # see linker prefix patch + emake \ + tooldir="${EPREFIX}${TOOLPATH}" \ + gentoo_prefix=$(usex prefix-guest "${EPREFIX}"/usr /usr) \ + all # only build info pages if the user wants them if use doc ; then diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/files/binutils-2.41-linker-prefix.patch b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/files/binutils-2.41-linker-prefix.patch new file mode 100644 index 0000000000..d97a155992 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/files/binutils-2.41-linker-prefix.patch @@ -0,0 +1,56 @@ +https://bugs.gentoo.org/892549 +https://github.com/gentoo/binutils-gdb/pull/5 + +From 531bc1536dfc3070c1f7d03e98fa14bcb81fdcd0 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sat, 23 Dec 2023 13:48:10 +0000 +Subject: [PATCH 2/2] ld: Allow a Gentoo-specific prefix to override the prefix + used by ld.bfd + +This prefix is only used to locate $prefix/etc/ld.so.conf, with $prefix +usually being /usr. This file is important on Gentoo Prefix systems, +where the /usr prefix is within another directory. The problem is that +Gentoo already passes the same directory as the sysroot, and ld.bfd +therefore looks for /myprefix/myprefix/usr/etc/ld.so.conf. + +The sysroot is dynamic, while the prefix is hardcoded. A hardcoded +prefix that isn't just /usr is unhelpful, not just because of the +doubled prefix issue above, but also because it prevents ld.bfd from +working effectively outside its native environment. We will therefore +hardcode it to just /usr. + +This change does not simply do that though and sets up a $gentoo_prefix +variable instead, with $prefix as a fallback. This is necessary because +Gentoo prefix-guest systems, which use the host's libc, do not apply a +sysroot like RAP prefix systems do. In that case, we must preserve the +existing behaviour. The binutils ebuild will be responsible for setting +this variable appropriately. +--- + ld/emultempl/elf.em | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em +index 3f67f8b09d9..78c8e909b6c 100644 +--- a/ld/emultempl/elf.em ++++ b/ld/emultempl/elf.em +@@ -138,7 +138,7 @@ gld${EMULATION_NAME}_before_plugin_all_symbols_read (void) + ldelf_before_plugin_all_symbols_read ($IS_LIBPATH, $IS_NATIVE, + $IS_LINUX_TARGET, + $IS_FREEBSD_TARGET, +- $ELFSIZE, "$prefix"); ++ $ELFSIZE, "${gentoo_prefix-${prefix}}"); + } + + /* This is called after all the input files have been opened. */ +@@ -147,7 +147,7 @@ static void + gld${EMULATION_NAME}_after_open (void) + { + ldelf_after_open ($IS_LIBPATH, $IS_NATIVE, +- $IS_LINUX_TARGET, $IS_FREEBSD_TARGET, $ELFSIZE, "$prefix"); ++ $IS_LINUX_TARGET, $IS_FREEBSD_TARGET, $ELFSIZE, "${gentoo_prefix-${prefix}}"); + } + + EOF +-- +2.43.0 + From 43231c4b44f32600c89b81db285fc9c5cb9fb31b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:15:28 +0000 Subject: [PATCH 091/130] sys-devel/bison: Sync with Gentoo It's from Gentoo commit ccae5b6b63fd2c852a10bade121de718bc43816d. --- .../portage-stable/sys-devel/bison/bison-3.8.2-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 57d4407aa1..fd8742c3ad 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,7 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=" - sys-devel/flex + app-alternatives/lex test? ( dev-lang/perl ) verify-sig? ( sec-keys/openpgp-keys-bison ) " From 024d0ffbba21f5ad3a5d3a07e8b5269db910a817 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:15:31 +0000 Subject: [PATCH 092/130] sys-devel/gcc: Sync with Gentoo It's from Gentoo commit a3a66f64d44bb3b993af84e402d001dc0ff59839. --- .../portage-stable/sys-devel/gcc/Manifest | 10 +++ .../sys-devel/gcc/gcc-11.4.1_p20240104.ebuild | 64 ++++++++++++++++++ .../sys-devel/gcc/gcc-11.4.1_p20240111.ebuild | 64 ++++++++++++++++++ .../sys-devel/gcc/gcc-12.3.1_p20240105.ebuild | 64 ++++++++++++++++++ .../sys-devel/gcc/gcc-12.3.1_p20240112.ebuild | 64 ++++++++++++++++++ .../sys-devel/gcc/gcc-13.2.1_p20240106.ebuild | 65 +++++++++++++++++++ .../sys-devel/gcc/gcc-13.2.1_p20240113.ebuild | 65 +++++++++++++++++++ .../gcc/gcc-14.0.0_pre20240107.ebuild | 64 ++++++++++++++++++ ...0.0.9999.ebuild => gcc-14.0.1.9999.ebuild} | 4 +- .../gcc/gcc-14.0.1_pre20240114.ebuild | 64 ++++++++++++++++++ .../portage-stable/sys-devel/gcc/metadata.xml | 2 - 11 files changed, 526 insertions(+), 4 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20240104.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20240111.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20240105.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20240112.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240106.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240113.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20240107.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-14.0.0.9999.ebuild => gcc-14.0.1.9999.ebuild} (96%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.1_pre20240114.ebuild 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 177ce8d8a0..5970a3a431 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 @@ -5,6 +5,8 @@ DIST gcc-11-20230622.tar.xz 76199316 BLAKE2B a769dc6be63eabca3bc33944b471d727bf2 DIST gcc-11-20231214.tar.xz 76228348 BLAKE2B fded6ed91e9376d23652490f6b36cf847d1e01c449a26f756a7aee753dd82af37e3583f0cdae3c987923bb8938ed5a199db2b9a7a0c7fe7c8ceb6c8046029c4a SHA512 4e7a644fcd6c51d82b7b4fea368f0c26a887ccc694cddc0ca80af8dad289fe05f92b8036403075e62302a03f6f93a41291e2e925dd6f63e738772ea8f67b432a DIST gcc-11-20231221.tar.xz 76242656 BLAKE2B 279076c197fc9f666985c3f0a5f7e1dc0879ef2fa677e2fb5aeecbd605f52727f5591c58e8e9380f98c4de43f4aedfacd10ee78e450f6f549ac8424df901784d SHA512 004f5380a558f03195fd2988a03d6f1988d5ef13ab8be99a1ca0560950764019001fcd09178bc587e7c0a5c90cd7c147538d3e68d9194d1bf1888011e5565c1f DIST gcc-11-20231228.tar.xz 76245188 BLAKE2B acac14d2915c08bfee3e64f8711c8bdc086a728093d6083f33f23c8db565da334a19d3f5b451788ad5f21f2005a8964890b467728886d85a34356c3908659bc9 SHA512 b30f115f1753195355ac31c59c111a5ed3a8dc1da08d0095fe0aa9107eb210487f3a1557b741c3d3e0c52744e20ace5788a98c642a1bd65d01c506bdafd8e5e3 +DIST gcc-11-20240104.tar.xz 76252696 BLAKE2B 6105b2f9a90c11b792f6fc9693bf8c6d880310b68ee83aa3df062dbdd34979fe86a660f198485ec1ffccd913d42d681f34688bbff7b4c966d4af9fe22ff7125e SHA512 9b36c6b81fd875fc739b82c8d6539c4245509ea2125bf25be5b55e8a8305b2ebdb84f46c9cea46b82d4fc67f447e3c39c2e9399064ac0f3b91e12c039f400861 +DIST gcc-11-20240111.tar.xz 76240620 BLAKE2B dcf3b2493ca6ba1a9cd0137186cfbf1b96296ff9c5625e40ec7b89e5903b07dc151b61ad54b885fc57ccc02214e2cfa7b9249cbd755ac2554c6ca0008f0704d8 SHA512 aaed094cb6dd99166e0ec59886014108574ddab52701581f0f8e7f0abb966320d01f1bce6ff646170618ca7c2819d20523a23615f20114dbe412de43b937caf4 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-12.tar.xz 13824 BLAKE2B e4df9e0dc9512882022aaf325ebf65c540169454c91dd31f913c6f57f6eb291c79ae919671b53db1549799d4a70c09298bf45ed82ad05eb1f961443cc958369d SHA512 87fed0c3f8e28c9f702443db58350bb615110b27ebe334b5de2ea60678e2548c56cd75cffade210d69634e2ac0a9311f5100ddb45d97645aa76d5688bc421a61 @@ -12,22 +14,30 @@ DIST gcc-12-20230825.tar.xz 79804260 BLAKE2B 4d3eb40eb5954d497b3e9586dad0d18c9e5 DIST gcc-12-20231215.tar.xz 79804016 BLAKE2B 547def0a166db31d8654a8b85ec1320f0dfe30f3f340968a67761e7907f56eb135d5a7e28c582d74dabc835027e09eb282c2f01a7be1e830f5f73145739a3084 SHA512 72a0d0721c9d09b6afaf8f6214dec1a577debf0167569166f0fc7c808d90bece35bb088f810b36dc873cbf199b1ae91d5c64e1d6557c92abbf6cf3feb6fbcbfa DIST gcc-12-20231222.tar.xz 79814136 BLAKE2B b50d336adb38d4c45d4097cc8772246d75646e2a3731af65c0b58eb1289508c4e08227eed15b6b1e88843b94933fd241388e5c634ecaa0cf432fc3d4fc71e618 SHA512 78886eb891ed89d9047e12222d7211e4c4e184554c8ce71274314f42afd2c573b8e4a512dab4d013aa26332e02cd1bf90b56607a0437a912d6e0bc2a096ea52f DIST gcc-12-20231229.tar.xz 79826324 BLAKE2B c55f8c8211a2ee6ce25a03348509bc32d46a33398ed8d99f0ca4d0c35e7fdf6280315ab99055dbb4f18c7d1ddf54a60692a830c7179462b143e4e1c4f40569ef SHA512 40587c4f2094d7a6e9fd39249aceada619398c67a3e4160c623b0ffcf84aed1d1d709808c63f18fb9c97a283cad30550c259f4859f6c9e6b7659236fdfb90447 +DIST gcc-12-20240105.tar.xz 79823352 BLAKE2B 72d6e4938a89841866b5eac8ca308c8de3daa558cce79661368d9fb58209a414a105ed3ca3ba71fe6e6cd5eefbbed85eefe3b43fdfc5c0a8318de2507c07b5f1 SHA512 7ded739ef16163b1c504bcb63dea0673647da31518d28e5197047e3c56613089007673fd688891080b48f4e455e3cd19519573e24b5803403a4ba8a2e3c5d8ca +DIST gcc-12-20240112.tar.xz 79832228 BLAKE2B deec7123b8ffc42ddace51e1f3e8e08d5485f7000c0d4b7273b6311912ec0e7e2cb41124297af8c54456bb369a76fa2ef51aff552d8d680ec41dd2b144b08e55 SHA512 2c0a676ad35e6edee915c042a1751ac0263fae9b7af4d324deb49d6603dc73d3ec768832184879543e6ffb1595da5c56d9117288547adab7f243646dcbfc64ac 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-13-20230826.tar.xz 84285788 BLAKE2B c25be594e322dd7145245c42ae21b98aa9e3e6ae69f1fa313830e40bf2e8fcb8435762f1c9d3f1ca1dbf31653bdc76a658bec708b7850fe40a7c55504ac30618 SHA512 3d47632e90651bd50a881c727c1ef2aa3322b4fc3e082919ae430270901abf8a05a34fe93f8b678c10dc9a0758f93dc3b33ed5947c8743dab453d2b50c063722 DIST gcc-13-20231216.tar.xz 84341616 BLAKE2B 416ee94995b0812ac155ccfb9a5cad39529e0b437341eae65fdc75ba64bcdb453742e213f676a80d91615f1840e2e52488e4a8311588a2ed16fde7c176c5dd06 SHA512 66a72380db151355ede533541b2e77406925f2a0f941772018bf93f8a4c2b8eaeacc3f600985897f7d9868234bc250a7af82d27634ba170ab6dfb2a62c68c0ed DIST gcc-13-20231223.tar.xz 84352544 BLAKE2B 1ec97e3b60bbf49d2106e8158e1ff66eb2e2da7d3501e3046ce12a2728e070ea0d44eff42cb5f1765ade284515b2e3c9a24ef036482b6456d5623fff3ce68164 SHA512 f3b066b27003a7c3a83f71d1670f9d662e397388e299ec2e33d674bb1d15b2443fd1608d10052b897f5159584aa3116603da33ace7c906d16e50371af5f8a745 DIST gcc-13-20231230.tar.xz 84353432 BLAKE2B 3efe49291b4727f5d343173ed8a92f10196dc54cc49adcb330f3d82963514527ba33a25a95287fc5d08e87035736979f9cecc9d6909061af41e9e6d458a9f9ac SHA512 f7e6b79d638576ad67b8e4d4b0e151d2ba76f8bc97dca5103d9ed59138c7743eb5b2eb31e8cb85c26fa898a5d872874515c4796b84a019869c8cd98ac1497187 +DIST gcc-13-20240106.tar.xz 84368432 BLAKE2B e352f3994ff4e5626a8f278d488098b87183198d467230283e12706970596fd9f74d9245a97201c01f81da5ab21ed6cadce42467d98bc3803234be54a88fb25e SHA512 698a61ac149c766bdfefd199ce8d2a5e35897c7d2060f1754c04a5b862ee661a9d618501d7aba829e937b56ca53a9a86e799bd74d3821628a058feea700239e2 +DIST gcc-13-20240113.tar.xz 84356052 BLAKE2B 1fbfffc9f2afe443158e3f26182c8bdc3f3b599c5582762117831ecb6e6d3c1c69e8d2e5932f45eb7d534c3967e08a9f7b1bcec31aa5d7ac608bebff9f35120c SHA512 a59886f707cf18f684295031d4d9fc5b03396face1705e61852d7de98729c53ac4cf209e951d00c232f14e9dc48eee40dd92487db7cb6ad0e80f2339d6d9503a DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69 DIST gcc-13.2.0-patches-11.tar.xz 46340 BLAKE2B c9f12ccbe7bb7ba3a2afec16695e69b062429779d544f5614e1ef0617751e54d77eb9bb6e19dc8c6132c57e630f0e77e2cc20cf2c77e0e79d03a6e57b9ba53c6 SHA512 a09801ecefccc66830607986a622bbcc5f217ba08da4ac9f68436e422b5a19042c60c7d5fcb75d4fe9ad9008ab06278382c9798b319ed9630c2e97fa09c3a344 DIST gcc-13.2.0-patches-7.tar.xz 37064 BLAKE2B 4a8700a8d44bfaa84926f8bfd0da4c5b0c0377f47fc0679456e909f7c9029b9cf1b72c0ba0bc505d9035d5c38e27f7e5b029727eaf2bc7aca417a6be966b2f43 SHA512 f440c97e6782ecb8581d41608e31a648ac426e2d870bc1d171da7794cdeff2fd0546cae0c7214e72fd3a00ead8a5c66f3f633b670b74553a2f3a40378b51f20c DIST gcc-14-20231217.tar.xz 86943032 BLAKE2B 8d5ab21fedffad0d4d4e02201c74f3b90cfabe5c2c1abbc048b6c4d179cbf3977cffc6bfc1b7b679d0276b66f86d58ef5c0b8451a4fcb75b88b7240fd7baf41c SHA512 23d8e6dd76aff0a5d7687ce8753aba7bdc374d3330553314da378af84ad629e67dbb532ba416816ce81812857c4c54e31cc5460d3f86619d7a9fb368328ff11d DIST gcc-14-20231224.tar.xz 87027056 BLAKE2B 412a0e8c82063f3aac828620648e5a57942dc2028408904290f7051b5756fe1f78d81fea8d1fba607db57e1905104ed236f86fc7d07b0bb35f407ce6c91f6e4a SHA512 c05eaa660732cbe57e7390afa9218eb99253dd58a00f376287dfd4765ed43acc4672635031439226b2e068899796a20ef14e5ac610f32ca31e285a4cdfa2f65e DIST gcc-14-20231231.tar.xz 87027004 BLAKE2B 55c12dea8b446793667220dd17a75f3081f1ca6608654f1d2c5860f65d757efa4dcd044e9f15373ec7afc89c475876502529abbb96ddaac77206c0a63ff23882 SHA512 79a704d54bd8ace8ebfbf720dca71c70dc7c1d0c70f8f586f70fb476006317846aa29a4754a3f34ebbbe436f4e548a4837f778bacb86f97d8bfc03627bfcaf03 +DIST gcc-14-20240107.tar.xz 87072048 BLAKE2B a605ea26af2e98c17f8efd742e8adc27f03a183d77b107ef74b30183542d44d68ee88cb975af1c45c6098f97b34aa9870302450de0c848832ebf49a4533c20c6 SHA512 6e8ec11feeca073bc4c24aca3d7ada4ec66780ec00735deab48df050d3efa1bfe8bfe7a7c58ab7ada4f585ef829b49ef80203e3251fc4e6bca0d0932ab2fb313 +DIST gcc-14-20240114.tar.xz 87220100 BLAKE2B 96d5196f07b7ca310baf800d2406dbf1a07eb85d6678ca16387551e04bd94f975dab817c7dd171a9e846c032f17c27b7141f5815322a4a3cf4dd3d1b5f583179 SHA512 422b81c9a7ac560865e6d1b1ad94c5bf269ab33ec4cf6e88874a1652c6e911877e926ad7a8bb2d79112eb175dbe6636e640b42fce2b6de7c7fc4f1d10db31d15 DIST gcc-14.0.0-musl-patches-1.tar.xz 3576 BLAKE2B 692baee8a7709905d53aeb150d73a3721c4ba47ee5f397cfb1b5be905cf003ca02b60c94ee294d90ac39645cd5cdf186c7a3aa950c47d8cf680c128ed705b807 SHA512 0592ab98a7142e404623a6511c67dff61e9ade32c3fb2c0e75b456306e0af3799ad13252b50b3d2fdd31e5815d7f0b16b0ad63ab8386fe4d78729fc9c182d617 DIST gcc-14.0.0-patches-11.tar.xz 11272 BLAKE2B 81c63b8aebcfd5b33b698ef4ef8f2d12b94ea2753ecec2b160cf9fab534dccd12875bcb16cfac2aa81211f8d9ff530cfc18f486567721beac487e08daa62363e SHA512 0f51352cbc6815cd1dbc8b73e9c83842a58242220ba712291cc76c08c19b3a612c88a3221b2da437a9c7ecb410a83c2e538aa1984b733f444843bdf79d314a71 DIST gcc-14.0.0-patches-13.tar.xz 47572 BLAKE2B 8f0fc6ba8f9310eab3f6b568ffce39f64e399552ed5c9fdd261e3cc9292200e7ab66724872b392f64bd9bf05ddf9a1fd26ba4092a98d991202b4f6a28861a829 SHA512 a56abdd95f03ed0586df709fdc28cc6af4573465b99750502986efd7f0ce73fd8ab455fdb9621d9227e835721be3cf42a9997a97eacf148b8a0dcf3ba44cc5be DIST gcc-14.0.0-patches-14.tar.xz 47788 BLAKE2B 0d243208f0e94c609f931091bb44ddad25b9fcfb1f57c7ee1c00f94d7af7d6ebbcc3c40951df5ab039c14056db21dce9c4ef11489cd7df4bcdbb199fbcce4816 SHA512 077fc39b95a5f2d24f4bb4ed77f2066dc156950eeeee60f57e3b5ddf3d784df42cccacb0c71a97acdf0b1fe774420bfb4ccba4e10d1296ceb6a144efd90fddd0 +DIST gcc-14.0.0-patches-15.tar.xz 49212 BLAKE2B f206440bcecff8cc7497661c3a3ab970813183904bd07faa40e268cdbba85d2ff1a36547374463cffa0835807177a54e3b7e13c7996124119bbb7cebf9d84283 SHA512 b0c591542e4f30eb1ab16b04961379a4ed29bcd8454837d9916292674bf05267d825e36b01fe792b9f1c2cecf828237f308b547f90005953c34a3723f0c22ee7 +DIST gcc-14.0.0-patches-16.tar.xz 11884 BLAKE2B bb47024c766f59222b50c5ff19ed6b763c9867508352cbcfc069d028d323a3b6fb3bbcbb2c08be7830f1ba266f54410842a17c9448c2bd9f101aa876ffb8f6ee SHA512 890a0b63485558eb2f1e9fea6a274e251442d129bcb67fd2ee11715916a6f8ea15bed0b59c72ed055fff5d6d90e2bfc3140ddee4e057af117d86fd6b7615fcbc DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8 DIST gcc-9.5.0-patches-2.tar.xz 14324 BLAKE2B 1d3bf3e673108ad2fcdcb86daefb4603d1c9f6aa815e34d1591054d466b76d6f50cce124ab4760528c4951ea16eb00888a3e6485417f81ebf250548732df4a8e SHA512 a6d6f650aaf0bd193a17ac279649f0544a282cea295824384c59341c3000eac4b574b60e00dd427585d928f9768166abf85168b47772132790ad98854acacbbf diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20240104.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20240104.ebuild new file mode 100644 index 0000000000..da9833f439 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20240104.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_GCC_VER="11.4.0" +PATCH_VER="12" +MUSL_VER="2" +MUSL_GCC_VER="11.4.0" + +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=$((${MY_PV_2} - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + 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 + +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. + # 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.4.1_p20240111.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20240111.ebuild new file mode 100644 index 0000000000..da9833f439 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20240111.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_GCC_VER="11.4.0" +PATCH_VER="12" +MUSL_VER="2" +MUSL_GCC_VER="11.4.0" + +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=$((${MY_PV_2} - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + 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 + +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. + # 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-12.3.1_p20240105.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20240105.ebuild new file mode 100644 index 0000000000..6976716247 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20240105.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_GCC_VER="12.3.0" +PATCH_VER="2" +MUSL_VER="1" +MUSL_GCC_VER="12.3.0" + +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=$((${MY_PV_2} - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + 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 + +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. + # 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-12.3.1_p20240112.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20240112.ebuild new file mode 100644 index 0000000000..6976716247 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20240112.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_GCC_VER="12.3.0" +PATCH_VER="2" +MUSL_VER="1" +MUSL_GCC_VER="12.3.0" + +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=$((${MY_PV_2} - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + 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 + +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. + # 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-13.2.1_p20240106.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240106.ebuild new file mode 100644 index 0000000000..5f50fcbf06 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240106.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_GCC_VER="13.2.0" +PATCH_VER="11" +MUSL_VER="2" +MUSL_GCC_VER="13.2.0" + +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=$((${MY_PV_2} - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + 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 + +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 ~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.2.1_p20240113.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240113.ebuild new file mode 100644 index 0000000000..5f50fcbf06 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240113.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_GCC_VER="13.2.0" +PATCH_VER="11" +MUSL_VER="2" +MUSL_GCC_VER="13.2.0" + +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=$((${MY_PV_2} - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + 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 + +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 ~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-14.0.0_pre20240107.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20240107.ebuild new file mode 100644 index 0000000000..096272333a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20240107.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_GCC_VER="14.0.0" +PATCH_VER="15" +MUSL_VER="1" +MUSL_GCC_VER="14.0.0" + +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=$((${MY_PV_2} - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + 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 + +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. + # 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.9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.1.9999.ebuild similarity index 96% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0.9999.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.1.9999.ebuild index 1d6aff0d52..944f1ab4e8 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.1.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ PATCH_GCC_VER="14.0.0" MUSL_GCC_VER="14.0.0" if [[ ${PV} == *.9999 ]] ; then - MY_PV_2=$(ver_cut 2) + MY_PV_2=$(ver_cut 3) MY_PV_3=1 if [[ ${MY_PV_2} == 0 ]] ; then MY_PV_2=0 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.1_pre20240114.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.1_pre20240114.ebuild new file mode 100644 index 0000000000..777f9c46c4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.1_pre20240114.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_GCC_VER="14.0.0" +PATCH_VER="16" +MUSL_VER="1" +MUSL_GCC_VER="14.0.0" + +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=$((${MY_PV_2} - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + 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 + +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. + # 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/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml index 67374f76c3..93ff067baa 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/metadata.xml @@ -75,8 +75,6 @@ GCC itself is built and optimized with LTO. Build the GCC Modula-2 language frontend. - Enable support for Intel Memory Protection Extensions (MPX) - Enable support for Native POSIX Threads Library, the new threading module (requires linux-2.6 or better usually) Build support for the Objective C code language Build support for the Objective C++ language Build support for the Objective C code language Garbage Collector From e1315bb8e350b1cc7024ba76082051a6f8ff90dc Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:15:32 +0000 Subject: [PATCH 093/130] sys-devel/libtool: Sync with Gentoo It's from Gentoo commit cc63949e79dcd30f226f08d94064388a489d819e. --- .../sys-devel/libtool/libtool-2.4.7-r2.ebuild | 119 ++++++++++++++++++ .../sys-devel/libtool/libtool-9999.ebuild | 7 +- 2 files changed, 123 insertions(+), 3 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r2.ebuild new file mode 100644 index 0000000000..a2ec01d367 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r2.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Please bump with dev-libs/libltdl. + +# bug #225559 +LIBTOOLIZE="true" +WANT_LIBTOOL="none" +inherit autotools prefix + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git" + 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="A shared library tool for developers" +HOMEPAGE="https://www.gnu.org/software/libtool/" + +LICENSE="GPL-2" +SLOT="2" +IUSE="vanilla" + +# Pull in libltdl directly until we convert packages to the new dep. +RDEPEND=" + sys-devel/gnuconfig + >=sys-devel/autoconf-2.69:* + >=sys-devel/automake-1.13:* +" +DEPEND="${RDEPEND}" +[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man" + +# Note that we have more patches in https://gitweb.gentoo.org/proj/elt-patches.git/ +# for package builds. The patches here are just those which are definitely fine +# for the system-wide libtool installation as well. +PATCHES=( + # bug #109105 + "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch + # bug #581314 + "${FILESDIR}"/${PN}-2.4.6-ppc64le.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 + "${FILESDIR}"/${PN}-2.4.7-grep-3.8.patch +) + +src_prepare() { + if [[ ${PV} == *9999 ]] ; then + eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch # bug #650876 + ./bootstrap || die + else + PATCHES+=( + "${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch # bug #650876 + ) + fi + + # WARNING: File build-aux/ltmain.sh is read-only; trying to patch anyway + chmod +w build-aux/ltmain.sh || die + + if use vanilla ; then + eapply_user + return 0 + else + default + fi + + if use prefix ; then + # seems that libtool has to know about EPREFIX a little bit + # better, since it fails to find prefix paths to search libs + # from, resulting in some packages building static only, since + # libtool is fooled into thinking that libraries are unavailable + # (argh...). This could also be fixed by making the gcc wrapper + # return the correct result for -print-search-dirs (doesn't + # include prefix dirs ...). + eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch + eprefixify m4/libtool.m4 + fi + + pushd libltdl >/dev/null || die + AT_NOELIBTOOLIZE=yes eautoreconf + popd >/dev/null || die + AT_NOELIBTOOLIZE=yes eautoreconf + + # Make sure timestamps don't trigger a rebuild of man pages. #556512 + if [[ ${PV} != *9999 ]] ; then + touch doc/*.1 || die + export HELP2MAN=true + fi +} + +src_configure() { + # the libtool script uses bash code in it and at configure time, tries + # to find a bash shell. if /bin/sh is bash, it uses that. this can + # cause problems for people who switch /bin/sh on the fly to other + # shells, so just force libtool to use /bin/bash all the time. + export CONFIG_SHELL="$(type -P bash)" + + # Do not bother hardcoding the full path to sed. + # Just rely on $PATH. bug #574550 + export ac_cv_path_SED="$(basename "$(type -P sed)")" + + [[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g" + + ECONF_SOURCE="${S}" econf ${myconf} --disable-ltdl-install +} + +src_install() { + default + + local x + while read -d $'\0' -r x ; do + ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die + done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0) +} 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 a27b9abcb0..ce85f708a4 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,11 +30,13 @@ RDEPEND=" sys-devel/gnuconfig >=sys-devel/autoconf-2.69:* >=sys-devel/automake-1.13:* - >=dev-libs/libltdl-2.4.7 " DEPEND="${RDEPEND}" [[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man" +# Note that we have more patches in https://gitweb.gentoo.org/proj/elt-patches.git/ +# for package builds. The patches here are just those which are definitely fine +# for the system-wide libtool installation as well. PATCHES=( # bug #109105 "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch @@ -43,7 +45,6 @@ PATCHES=( "${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 ) src_prepare() { From 46fd0486b4739746ced6b916fdff592fabb4e112 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:15:34 +0000 Subject: [PATCH 094/130] sys-firmware/ipxe: Sync with Gentoo It's from Gentoo commit 1eca37d9cb360ef50b5e6cb2975d8c70bf84aa60. --- .../sys-firmware/ipxe/ipxe-1.21.1.ebuild | 6 +++--- .../ipxe/ipxe-1.21.1_p20230601.ebuild | 18 +++++++++--------- .../sys-firmware/ipxe/metadata.xml | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.21.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.21.1.ebuild index 5136e9ec3d..58c13763d2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.21.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.21.1.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${P}/src" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86" -IUSE="+binary efi ipv6 iso lkrn +qemu undi usb vmware" +IUSE="+binary uefi ipv6 iso lkrn +qemu undi usb vmware" REQUIRED_USE="!amd64? ( !x86? ( binary ) )" SOURCE_DEPEND=" @@ -93,7 +93,7 @@ src_compile() { ipxemake bin/15ad07b0.rom # vmxnet3 fi - use efi && ipxemake PLATFORM=efi BIN=bin-efi bin-efi/ipxe.efi + use uefi && ipxemake PLATFORM=efi BIN=bin-efi bin-efi/ipxe.efi use iso && ipxemake bin/ipxe.iso use undi && ipxemake bin/undionly.kpxe use usb && ipxemake bin/ipxe.usb @@ -107,7 +107,7 @@ src_install() { doins bin/*.rom fi use vmware && doins bin/*.mrom - use efi && doins bin-efi/*.efi + use uefi && doins bin-efi/*.efi use iso && doins bin/*.iso use undi && doins bin/*.kpxe use usb && doins bin/*.usb diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.21.1_p20230601.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.21.1_p20230601.ebuild index 8f24b1ebc7..3ab9d677fb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.21.1_p20230601.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/ipxe-1.21.1_p20230601.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${COMMIT_SHA1}/src" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86" -IUSE="+binary efi efi64 ipv6 iso lkrn +qemu undi usb vmware" +IUSE="+binary uefi32 uefi64 ipv6 iso lkrn +qemu undi usb vmware" REQUIRED_USE="!amd64? ( !x86? ( binary ) )" SOURCE_DEPEND=" @@ -35,7 +35,7 @@ BDEPEND=" )" pkg_setup() { - if use efi || use efi64; then + if use uefi32 || use uefi64; then secureboot_pkg_setup fi } @@ -102,8 +102,8 @@ src_compile() { ipxemake bin/15ad07b0.rom # vmxnet3 fi - use efi && ipxemake PLATFORM=efi BIN=bin-i386-efi bin-i386-efi/ipxe.efi - use efi64 && ipxemake PLATFORM=efi BIN=bin-x86_64-efi bin-x86_64-efi/ipxe.efi + use uefi32 && ipxemake PLATFORM=efi BIN=bin-i386-efi bin-i386-efi/ipxe.efi + use uefi64 && ipxemake PLATFORM=efi BIN=bin-x86_64-efi bin-x86_64-efi/ipxe.efi use iso && ipxemake bin/ipxe.iso use undi && ipxemake bin/undionly.kpxe use usb && ipxemake bin/ipxe.usb @@ -117,19 +117,19 @@ src_install() { doins bin/*.rom fi use vmware && doins bin/*.mrom - use efi && newins bin-i386-efi/ipxe.efi ipxe-i386.efi - use efi64 && newins bin-x86_64-efi/ipxe.efi ipxe-x86_64.efi + use uefi32 && newins bin-i386-efi/ipxe.efi ipxe-i386.efi + use uefi64 && newins bin-x86_64-efi/ipxe.efi ipxe-x86_64.efi # Add a symlink for backwards compatiblity, in case both variants are # enabled the x86_64 bit variant takes presedence. - use efi && dosym ipxe-i386.efi /usr/share/ipxe/ipxe.efi - use efi64 && dosym ipxe-x86_64.efi /usr/share/ipxe/ipxe.efi + use uefi32 && dosym ipxe-i386.efi /usr/share/ipxe/ipxe.efi + use uefi64 && dosym ipxe-x86_64.efi /usr/share/ipxe/ipxe.efi use iso && doins bin/*.iso use undi && doins bin/*.kpxe use usb && doins bin/*.usb use lkrn && doins bin/*.lkrn - if use efi || use efi64; then + if use uefi32 || use uefi64; then secureboot_auto_sign --in-place fi diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/metadata.xml index 11d78499e8..116526e14d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-firmware/ipxe/metadata.xml @@ -11,8 +11,8 @@ Use pre-built binaries - Build a 32bit EFI program for using PXE - Build a 64bit EFI program for using PXE + Build a 32bit UEFI program for using PXE + Build a 64bit UEFI program for using PXE Build a bootable ISO for using PXE Build a linux kernel bootable file for using with grub/etc... Build a bootable USB image for using PXE From dc6cf6bbb7a0c7d4336a4e5f167c895fd978977b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:15:56 +0000 Subject: [PATCH 095/130] sys-libs/binutils-libs: Sync with Gentoo It's from Gentoo commit 7b205f67aa1e81d5665d2d88132ee9ce195f852a. --- .../sys-libs/binutils-libs/binutils-libs-2.40-r5.ebuild | 4 ++-- .../sys-libs/binutils-libs/binutils-libs-2.40-r7.ebuild | 6 +++--- .../sys-libs/binutils-libs/binutils-libs-2.41-r2.ebuild | 4 ++-- .../sys-libs/binutils-libs/binutils-libs-2.41-r3.ebuild | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) 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 11149b0a83..42f4fc71b6 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -151,7 +151,7 @@ multilib_src_compile() { multilib_src_install() { emake V=1 DESTDIR="${D}" install - # Provided by sys-devel/gdb instead + # Provided by dev-debug/gdb instead rm "${ED}"/usr/share/info/sframe-spec.info || die # Provide libiberty.h directly. diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r7.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r7.ebuild index e4b25cc334..92e214f6b3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r7.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~x64-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=" @@ -151,7 +151,7 @@ multilib_src_compile() { multilib_src_install() { emake V=1 DESTDIR="${D}" install - # Provided by sys-devel/gdb instead + # Provided by dev-debug/gdb instead rm "${ED}"/usr/share/info/sframe-spec.info || die # Provide libiberty.h directly. diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r2.ebuild index b2a579141b..56dd112d51 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -154,7 +154,7 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install - # Provided by sys-devel/gdb instead + # Provided by dev-debug/gdb instead rm "${ED}"/usr/share/info/sframe-spec.info || die # Provide libiberty.h directly. diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r3.ebuild index 2b5ddcda5f..3b6503c361 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )" SLOT="0/${PV%_p?}.0" 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 ~x64-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=" @@ -154,7 +154,7 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install - # Provided by sys-devel/gdb instead + # Provided by dev-debug/gdb instead rm "${ED}"/usr/share/info/sframe-spec.info || die # Provide libiberty.h directly. From 3378d3835b1e6f4d7f852f21dc8f17f53dc9c960 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:15:59 +0000 Subject: [PATCH 096/130] sys-libs/ldb: Sync with Gentoo It's from Gentoo commit f7fdfdaeec3764929686064a6054c38a6b2d7788. --- .../third_party/portage-stable/sys-libs/ldb/ldb-2.4.4.ebuild | 4 ++-- .../third_party/portage-stable/sys-libs/ldb/ldb-2.5.2.ebuild | 4 ++-- .../third_party/portage-stable/sys-libs/ldb/ldb-2.5.3.ebuild | 4 ++-- .../third_party/portage-stable/sys-libs/ldb/ldb-2.6.2.ebuild | 4 ++-- .../third_party/portage-stable/sys-libs/ldb/ldb-2.7.2.ebuild | 4 ++-- .../third_party/portage-stable/sys-libs/ldb/ldb-2.8.0.ebuild | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.4.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.4.4.ebuild index a55b9fe509..fbcda7f37a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.4.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -43,7 +43,7 @@ DEPEND="${RDEPEND} BDEPEND="${PYTHON_DEPS} dev-libs/libxslt virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " WAF_BINARY="${S}/buildtools/bin/waf" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.2.ebuild index ed21ae51c6..180e90208d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -43,7 +43,7 @@ DEPEND="${RDEPEND} BDEPEND="${PYTHON_DEPS} dev-libs/libxslt virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " WAF_BINARY="${S}/buildtools/bin/waf" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.3.ebuild index 97a29deb9f..8ec35b8dee 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -43,7 +43,7 @@ DEPEND="${RDEPEND} BDEPEND="${PYTHON_DEPS} dev-libs/libxslt virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " WAF_BINARY="${S}/buildtools/bin/waf" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.6.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.6.2.ebuild index d0c4881fb1..192c588a35 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.6.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -48,7 +48,7 @@ DEPEND=" BDEPEND="${PYTHON_DEPS} dev-libs/libxslt virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " WAF_BINARY="${S}/buildtools/bin/waf" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.7.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.7.2.ebuild index 13af13b433..104e3ff130 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.7.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.7.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -48,7 +48,7 @@ DEPEND=" BDEPEND="${PYTHON_DEPS} dev-libs/libxslt virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " WAF_BINARY="${S}/buildtools/bin/waf" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.8.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.8.0.ebuild index 82c5075edc..695c2e00e9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.8.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -48,7 +48,7 @@ DEPEND=" BDEPEND="${PYTHON_DEPS} dev-libs/libxslt virtual/pkgconfig - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " WAF_BINARY="${S}/buildtools/bin/waf" From 20ff2580717bcca9c29fe1a9ea74937a71c0f211 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:15:59 +0000 Subject: [PATCH 097/130] sys-libs/libcap-ng: Sync with Gentoo It's from Gentoo commit 62ab48d8edb336e83f2a8988f09c85766c368c75. --- .../files/libcap-ng-0.8.4-swig.patch | 31 ++++++ .../libcap-ng/libcap-ng-0.8.4-r1.ebuild | 104 ++++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/files/libcap-ng-0.8.4-swig.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/files/libcap-ng-0.8.4-swig.patch b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/files/libcap-ng-0.8.4-swig.patch new file mode 100644 index 0000000000..4b3f41a580 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/files/libcap-ng-0.8.4-swig.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/921305 +https://github.com/stevegrubb/libcap-ng/issues/48 +https://github.com/stevegrubb/libcap-ng/commit/30453b6553948cd05c438f9f509013e3bb84f25b + +From 30453b6553948cd05c438f9f509013e3bb84f25b Mon Sep 17 00:00:00 2001 +From: Steve Grubb +Date: Thu, 4 Jan 2024 15:06:29 -0500 +Subject: [PATCH] Remove python global exception handler since its deprecated + +--- + bindings/src/capng_swig.i | 7 ------- + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/bindings/src/capng_swig.i b/bindings/src/capng_swig.i +index fcdaf18..fa85e13 100644 +--- a/bindings/src/capng_swig.i ++++ b/bindings/src/capng_swig.i +@@ -30,13 +30,6 @@ + + %varargs(16, signed capability = 0) capng_updatev; + +-%except(python) { +- $action +- if (result < 0) { +- PyErr_SetFromErrno(PyExc_OSError); +- return NULL; +- } +-} + #endif + + %define __signed__ diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild new file mode 100644 index 0000000000..1774677f72 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Keep an eye on Fedora's packaging (https://src.fedoraproject.org/rpms/libcap-ng/tree/rawhide) for patches +# Same maintainer in Fedora as upstream +PYTHON_COMPAT=( python3_{10..12} ) +inherit autotools flag-o-matic python-r1 + +DESCRIPTION="POSIX 1003.1e capabilities" +HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/" +SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +IUSE="python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND=" + ${RDEPEND} + sys-kernel/linux-headers +" +BDEPEND="python? ( >=dev-lang/swig-2 )" + +PATCHES=( + "${FILESDIR}"/${P}-swig.patch +) + +src_prepare() { + default + + if use prefix ; then + sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die + # bug #668722 + eautomake + fi +} + +src_configure() { + use sparc && replace-flags -O? -O0 + + local ECONF_SOURCE="${S}" + + local myconf=( + $(use_enable static-libs static) + ) + + local pythonconf=( + --without-python3 + ) + + # Set up python bindings build(s) + if use python ; then + setup_python_flags_configure() { + pythonconf=( + --with-python3 + ) + + run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}" + } + + python_foreach_impl setup_python_flags_configure + else + local BUILD_DIR="${WORKDIR}"/build + run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}" + fi +} + +src_compile() { + if use python ; then + python_foreach_impl run_in_build_dir emake + else + local BUILD_DIR="${WORKDIR}"/build + emake -C "${BUILD_DIR}" + fi +} + +src_test() { + if [[ "${EUID}" -eq 0 ]] ; then + ewarn "Skipping tests due to root permissions." + return + fi + + if use python ; then + python_foreach_impl run_in_build_dir emake check + else + local BUILD_DIR="${WORKDIR}"/build + emake -C "${BUILD_DIR}" check + fi +} + +src_install() { + if use python ; then + python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install + else + local BUILD_DIR="${WORKDIR}"/build + emake -C "${BUILD_DIR}" DESTDIR="${D}" install + fi + + find "${ED}" -name '*.la' -delete || die +} From f4722446998311422efdf6fedde60950109cb11f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:16:03 +0000 Subject: [PATCH 098/130] sys-libs/libunwind: Sync with Gentoo It's from Gentoo commit 547c370b97ab2fb620bb4e134a995bfa5475a0f9. --- .../sys-libs/libunwind/Manifest | 3 +- .../libunwind-1.7.2-backport-pr521.patch | 31 +++++++++++++++++++ .../sys-libs/libunwind/libunwind-1.7.2.ebuild | 6 ++-- ....8.0_rc1.ebuild => libunwind-1.8.0.ebuild} | 22 +++++-------- .../sys-libs/libunwind/libunwind-9999.ebuild | 5 ++- 5 files changed, 46 insertions(+), 21 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libunwind/files/libunwind-1.7.2-backport-pr521.patch rename sdk_container/src/third_party/portage-stable/sys-libs/libunwind/{libunwind-1.8.0_rc1.ebuild => libunwind-1.8.0.ebuild} (91%) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/Manifest index 6accc56967..96acf6f74e 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/Manifest @@ -3,4 +3,5 @@ DIST libunwind-1.6.2-loong.patch.xz 122756 BLAKE2B 1d369d18e71c4b9faa79a31a917a0 DIST libunwind-1.6.2.tar.gz 901392 BLAKE2B 3d0313f7e92cbc3e1a84ad3831a5170f21cdf772f1697ca0a59dea63cdd47da382e9f1fd77325d9ff8bcd47559a425dc883a820c646c628cd00faed82cb0f83f SHA512 1d17dfb14f99a894a6cda256caf9ec481c14068aaf8f3a85fa3befa7c7cca7fca0f544a91a3a7c2f2fc55bab19b06a67ca79f55ac9081151d94478c7f611f8f7 DIST libunwind-1.7.1-docs.tar.xz 27248 BLAKE2B 0905f49ce72e6cafbb185828a4adf7eb5a88ede335104b1b0679e66199079e3dad9d83815d10a864b4480d88abd82b73bb71181962b1fea39ec41f534d78d549 SHA512 d786572e7fbd5ef7852712f592bd17d4110951083991c5ffcff2bb4ae91e4519b42743f848fe7f2cc9f72d8a0240531ec3d27806972c2c309d06a9048284b97b DIST libunwind-1.7.2.tar.gz 912590 BLAKE2B 519570a02d06ce4a174ca226941e493499054112de1c92938434e9fb56fabc8446f699a886ea8beee672ac5e28acd03d16169257a43e2ee1bab084fb331ef4cf SHA512 903f7e26c7d4c22e6ef4fe8954ca0f153fdf346cec40e1e8f7ab966d251110f4deb0a84d1fd150aee194ed966b5c1e01ee27c821cd043859852da33a94faae1f -DIST libunwind-1.8.0-rc1.tar.gz 977482 BLAKE2B 0cf4dde187b68a2ba642fc588fcb020bf3e631584d4cac888972f714e7c4ce7a88e10a4c816eadec2051f318a196c61f6c3b4ba5e8ebf17ce4e10ff61e6cd0c5 SHA512 0d9cd896a90ea6e36a9a8aeb049ce71ec3a893fcf991533a79bb663c54b0f4b1f04c7b306c06c56e809f829a42284655d52c9fec3d88c60c37f06681dd99d9e3 +DIST libunwind-1.8.0-docs.tar.xz 29280 BLAKE2B 260c5011cf23422ec04449126259c9960b5549b94def8ffa3821ccc67809b5da06be22fb0b465fcee2f0ec89faebab71d2bf3316dc68315a27e0913856513b0a SHA512 6969c8426dc5d79a78a9dae366a9e7b6f1d9a7ce307357913d4f5b8867a540ab8225b5342ee0e06e77b832ef76336fba41dadf12effa5236a076e6bfe72ec548 +DIST libunwind-1.8.0.tar.gz 949829 BLAKE2B 5e88f13365673d7abc6b1fd797250598fa45a5887675dd1b6d2ea553c66bdcb88104d549c029162dd127ba83e02247de4b2118235e0737fac29206a71c75725f SHA512 ecbcfacacbcc4f7e4326397af448c92253f88b8f57c14c31b9b82b3a2951eb67b164b2a137b2800a2ada933a07a5bdd75f0198d3e4c6a2d8d740559e3a76f1b2 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/files/libunwind-1.7.2-backport-pr521.patch b/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/files/libunwind-1.7.2-backport-pr521.patch new file mode 100644 index 0000000000..addfc0a60a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/files/libunwind-1.7.2-backport-pr521.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/913817 +https://github.com/libunwind/libunwind/issues/520 +https://github.com/libunwind/libunwind/pull/521 + +From aaf9909c91f1fa875907df8d437bff689e00172e Mon Sep 17 00:00:00 2001 +From: Stephen Webb +Date: Fri, 26 May 2023 16:22:08 -0400 +Subject: [PATCH] Fix FTBFS on Linux ppc32 + +Looks like the Linux ucontext structure has changed for PPC at some +point. This probably needs some kind of version check, or else ancient +kernels will need to stick with 1.6 or earlier. +--- + src/ppc32/ucontext_i.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ppc32/ucontext_i.h b/src/ppc32/ucontext_i.h +index 64f8ed878..ee93c6979 100644 +--- a/src/ppc32/ucontext_i.h ++++ b/src/ppc32/ucontext_i.h +@@ -44,8 +44,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + //#define MQ_IDX 36 + #define LINK_IDX 36 + +-#define _UC_MCONTEXT_GPR(x) ( (void *)&dmy_ctxt.uc_mcontext.gregs[x] - (void *)&dmy_ctxt) ) +-#define _UC_MCONTEXT_FPR(x) ( ((void *)&dmy_ctxt.uc_mcontext.fpregs[x] - (void *)&dmy_ctxt) ) ++#define _UC_MCONTEXT_GPR(x) ( ((void *)&dmy_ctxt.uc_mcontext.uc_regs->gregs[x] - (void *)&dmy_ctxt) ) ++#define _UC_MCONTEXT_FPR(x) ( ((void *)&dmy_ctxt.uc_mcontext.uc_regs->fpregs.fpregs[x] - (void *)&dmy_ctxt) ) + + /* These are dummy structures used only for obtaining the offsets of the + various structure members. */ diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/libunwind-1.7.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/libunwind-1.7.2.ebuild index e5cd9a5f96..97d9b39814 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/libunwind-1.7.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/libunwind-1.7.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2005-2023 Gentoo Authors +# Copyright 2005-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,7 +29,7 @@ else SRC_URI+=" !doc? ( https://dev.gentoo.org/~${LIBUNWIND_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${LIBUNWIND_DOCS_VERSION}-docs.tar.xz )" fi - KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 -sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 -sparc x86 ~amd64-linux ~x86-linux" fi [[ ${LIBUNWIND_DOCS_PREBUILT} == 1 ]] && LIBUNWIND_DOCS_USEFLAG="doc" @@ -53,6 +53,8 @@ DEPEND=" libatomic? ( dev-libs/libatomic_ops[${MULTILIB_USEDEP}] ) " +PATCHES=( "${FILESDIR}/${PN}-1.7.2-backport-pr521.patch" ) + MULTILIB_WRAPPED_HEADERS=( /usr/include/libunwind.h diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/libunwind-1.8.0_rc1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/libunwind-1.8.0.ebuild similarity index 91% rename from sdk_container/src/third_party/portage-stable/sys-libs/libunwind/libunwind-1.8.0_rc1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/libunwind/libunwind-1.8.0.ebuild index a8d8ee1b3c..7ddf3fd67d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/libunwind-1.8.0_rc1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/libunwind-1.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2005-2023 Gentoo Authors +# Copyright 2005-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,14 +6,14 @@ EAPI=8 # Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-libunwind-docs # Set to 1 if prebuilt, 0 if not # (the construct below is to allow overriding from env for script) -: ${LIBUNWIND_DOCS_PREBUILT:=0} +: ${LIBUNWIND_DOCS_PREBUILT:=1} LIBUNWIND_DOCS_PREBUILT_DEV=sam -LIBUNWIND_DOCS_VERSION=1.7.1 +LIBUNWIND_DOCS_VERSION=1.8.0 # Default to generating docs (inc. man pages) if no prebuilt; overridden later LIBUNWIND_DOCS_USEFLAG="+doc" -inherit autotools multilib-minimal +inherit multilib-minimal DESCRIPTION="Portable and efficient API to determine the call-chain of a program" HOMEPAGE="https://savannah.nongnu.org/projects/libunwind" @@ -74,21 +74,14 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libunwind-x86_64.h ) -PATCHES=( - "${FILESDIR}"/${PN}-1.8.0_rc1-configure-bashism.patch -) - src_prepare() { default chmod +x src/ia64/mk_cursor_i || die - #if [[ ${PV} == 9999 ]] ; then - # eautoreconf - #fi - - # temporarily for bashism patch - eautoreconf + if [[ ${PV} == 9999 ]] ; then + eautoreconf + fi } multilib_src_configure() { @@ -124,7 +117,6 @@ multilib_src_compile() { } multilib_src_test() { - # Explicitly allow parallel build of tests. # Sandbox causes some tests to freak out. SANDBOX_ON=0 emake check } diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/libunwind-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/libunwind-9999.ebuild index a3d63d421d..7ddf3fd67d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/libunwind-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/libunwind-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2005-2023 Gentoo Authors +# Copyright 2005-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ EAPI=8 : ${LIBUNWIND_DOCS_PREBUILT:=1} LIBUNWIND_DOCS_PREBUILT_DEV=sam -LIBUNWIND_DOCS_VERSION=1.7.1 +LIBUNWIND_DOCS_VERSION=1.8.0 # Default to generating docs (inc. man pages) if no prebuilt; overridden later LIBUNWIND_DOCS_USEFLAG="+doc" @@ -117,7 +117,6 @@ multilib_src_compile() { } multilib_src_test() { - # Explicitly allow parallel build of tests. # Sandbox causes some tests to freak out. SANDBOX_ON=0 emake check } From c3a8f029332f00d123d23eb1d24b405da5f8dc01 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:16:04 +0000 Subject: [PATCH 099/130] sys-libs/readline: Sync with Gentoo It's from Gentoo commit d4954f93b743cccea2192b18f9499385ef78f933. --- .../portage-stable/sys-libs/readline/Manifest | 6 + .../sys-libs/readline/readline-8.2_p10.ebuild | 253 ++++++++++++++++++ 2 files changed, 259 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.2_p10.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/readline/Manifest index 23c0a3f351..9861a810a5 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/readline/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/Manifest @@ -20,3 +20,9 @@ DIST readline82-006 3031 BLAKE2B 1a78e7344e2983486bea6fd398b4922ca671016a07f1833 DIST readline82-006.sig 95 BLAKE2B 48a0cf75019d44929eec32bf710438dc58629e41c5074c03e723b7102d23f45c78d726ded242654026e71a16eaf62dde4012ad9642181bade09d69159bc79900 SHA512 3b6da081737670e21a5acaa0be34d4196e576be823ec8f2d2c88b9dd5a7dc53da596731563e35601f0b180a818850d0ad27b120ec0ee48ade9c8487e958626be DIST readline82-007 1422 BLAKE2B 5fbdfea7080a67e197305849f25390634c266a8e2363116ec5dcdc20e6cbce5af787ffdb500edb9d8111388eb6560c6749c4004eb362039813abcbe17cc3bd4e SHA512 e96dafe28f20b1092af08422b9be99965e3a973a0c19f7c57669a6a7fbf74ad4cc3490fa2ad50a1845644a65b0a0e001cfc7ad29528b3b36827a1b9a2c9a96e7 DIST readline82-007.sig 95 BLAKE2B ea73f53d61291193937f28fcbdd09bd0dc46edefdb213db9aef485629d0df7541de4fcb89b0b6c06279c05bacea702a414021a239208515d4ab9050a4aab6984 SHA512 0f60a44eafe181c46331de9154f5d2c56a17e406e424ea8b644ef343e13315f1a363c07c374d5a1d34a4d0bb6048bf991b2c24c488b961ae038652f85161ff2a +DIST readline82-008 1697 BLAKE2B 2752ece47a63ccd3b94b59db36509fff1e3ec60edae079231b57e0352e38953ebf1e16c6b8020ad07259da8a1a56fea283228caa54973be0031afd5e86932b31 SHA512 a92a00a6b6fefc576ef26cf7522525ac99c1a05de510ca8bd5a72a6db40fb4dc5c277931efa1f4a91e7cf72c9da5287bb14bfa8f0668d36bec40e3ccd7cbe418 +DIST readline82-008.sig 95 BLAKE2B 135071c06eb32d8d87b0f2fb3e4235260f5fae4b23f926501d413fa685d9b98557d506284baae23dd700790aa099367ab90c353542235b96df4e0f8d855497be SHA512 d7a290433efb1302fd37c423a622f6be1c16234c209e306ef319259b79ce05d8e788fa471355e2a0155f642632fe2821eb6a7736214997a5bfde2ed8a154d052 +DIST readline82-009 2270 BLAKE2B ecfa4f3f445b0c90d4ba1cf4116c9a773a3e5ee737966d9d9be7a7ca98f8baa852cf800e571de59cfb27b6af77e93653824f20ff2c73d4629154d9ec8010e644 SHA512 57c084c6186befac58a3432c483c9f879cd199d6947ad7dd29f0d60e67ae4ddf5ee8d861b0231b41582868dd6556ae2dda95a849caf11cbd3692fcd2f8663452 +DIST readline82-009.sig 95 BLAKE2B 5484f3df25e550a717915ecf70e8410f747ff6d192a873e5449a4fb664bd3557d21a3cf40c5c9e0097dfaf2cee205243cd1cf6af34200f89e79f9d73626c49c1 SHA512 383cc954f8324588c699968d7cdf9a4f3c0e461917c8a16f5599cd0ffb59ff9539207478195a7d77c1842c11bd912cc17d3b3b56e6a9463db1991fb5c24d5409 +DIST readline82-010 2653 BLAKE2B 44ebbf93b6449d848b2dda49716b494596d207bef08cdea0d01808b5291d68714e01ef914e97652bb73e81808a91fff829c8035a097db5b3649be1e0735e3eab SHA512 b611b42e31601ea5fcd7de59e6c1cdd3fece7cc8287e0e495ddfc4d5e8f765b3c6567b728fe0a317d6cb00240b772fa4c26f374c8bf361355a9d262bc5133874 +DIST readline82-010.sig 95 BLAKE2B a5a6ccaace88a79c4e28f3c9d3a9ffad186ab772ada7668653b729190d5a598cbe46c769861a72acd08b5fb36f84537bd2018a98fbd0602565660411810447f7 SHA512 0c781417f0cf63daa8532f54b71c9fda69bb2206ca41f7f75fceb7f44781ec949f932881d82fd55d69038208aed45692e30a1e6013d698c7d13f8c9984e331bc diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.2_p10.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.2_p10.ebuild new file mode 100644 index 0000000000..23981336f2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/readline/readline-8.2_p10.ebuild @@ -0,0 +1,253 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# There's no standard way of versioning the point releases upstream +# make anyway, so while this was added for RC versions, it's fine +# in general. +QA_PKGCONFIG_VERSION=$(ver_cut 1-2) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/chetramey.asc +inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript verify-sig + +# Official patches +# See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/ +PLEVEL="${PV##*_p}" +MY_PV="${PV/_p*}" +MY_PV="${MY_PV/_/-}" +MY_P="${PN}-${MY_PV}" +MY_PATCHES=() + +is_release() { + case ${PV} in + 9999|*_alpha*|*_beta*|*_rc*) + return 1 + ;; + *) + return 0 + ;; + esac +} + +[[ ${PV} != *_p* ]] && PLEVEL=0 + +DESCRIPTION="Another cute console display library" +HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html https://git.savannah.gnu.org/cgit/readline.git" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/readline.git" + EGIT_BRANCH=devel + inherit git-r3 +elif is_release ; then + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )" + + if [[ ${PLEVEL} -gt 0 ]] ; then + # bash-5.1 -> bash51 + my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2)) + + patch_url= + my_patch_index= + + upstream_url_base="mirror://gnu/readline" + mirror_url_base="ftp://ftp.cwru.edu/pub/readline" + + 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_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/readline/${MY_P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/readline/${MY_P}.tar.gz.sig )" +fi + +if ! is_release ; then + inherit autotools +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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi +IUSE="static-libs +unicode utils" + +RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-chetramey )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-5.0-no_rpath.patch + "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch # bug #385091 + "${FILESDIR}"/${PN}-7.0-headers.patch + "${FILESDIR}"/${PN}-8.0-headers.patch + + # TODO: rebase + #"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch +) + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + else + # Needed because we don't want the patches being unpacked + # (which emits annoying and useless error messages) + verify-sig_src_unpack + unpack ${MY_P}.tar.gz + fi +} + +src_prepare() { + [[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}" + + default + + is_release || eautoreconf + + if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then + # If we're bootstrapping, make a guess. We don't have pkg-config + # around yet. bug #818103. + # Incorrectly populating this leads to underlinked libreadline. + local ncurses_libs + local ncurses_libs_suffix=$(usex unicode w '') + + ncurses_libs="-lncurses${ncurses_libs_suffix}" + + if has_version "sys-libs/ncurses[tinfo(+)]" ; then + ncurses_libs+=" -ltinfo${ncurses_libs_suffix}" + fi + else + # Force ncurses linking, bug #71420. + # Use pkg-config to get the right values, bug #457558. + local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs) + fi + + sed -i \ + -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \ + support/shobj-conf || die + sed -i \ + -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \ + examples/rlfe/configure || die + + # Fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated + # objformat for years, so we don't want to rely on that. + sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die + + # For local readline headers + ln -s ../.. examples/rlfe/readline || die +} + +src_configure() { + # Fix implicit decls with widechar funcs + append-cppflags -D_GNU_SOURCE + # https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html + append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free + + # Make sure configure picks a better ar than `ar`, bug #484866 + export ac_cv_prog_AR="$(tc-getAR)" + + # Force the test since we used sed above to force it. + export bash_cv_termcap_lib=ncurses + + # Control cross-compiling cases when we know the right answer. + # In cases where the C library doesn't support wide characters, readline + # itself won't work correctly, so forcing the answer below should be OK. + if tc-is-cross-compiler ; then + export bash_cv_func_sigsetjmp="present" + export bash_cv_func_ctype_nonascii="yes" + # bug #503312 + export bash_cv_wcwidth_broken="no" + fi + + # This is for rlfe, but we need to make sure LDFLAGS doesn't change + # so we can re-use the config cache file between the two. + append-ldflags -L. + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + --cache-file="${BUILD_DIR}"/config.cache + --with-curses + $(use_enable static-libs static) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then + # Code is full of AC_TRY_RUN() + mkdir -p examples/rlfe || die + cd examples/rlfe || die + + ECONF_SOURCE="${S}"/examples/rlfe econf --cache-file="${BUILD_DIR}"/config.cache + fi +} + +multilib_src_compile() { + emake + + if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then + # Code is full of AC_TRY_RUN() + cd examples/rlfe || die + local l + for l in readline history ; do + ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die + ln -s ../../lib${l}.a lib${l}.a || die + done + emake + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi ; then + # bug #4411 + gen_usr_ldscript -a readline history + + if use utils && ! tc-is-cross-compiler; then + dobin examples/rlfe/rlfe + fi + fi +} + +multilib_src_install_all() { + HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs + + dodoc USAGE + docinto ps + dodoc doc/*.ps +} +pkg_preinst() { + # bug #29865 + # Reappeared in bug #595324 with paludis so keeping this for now... + preserve_old_lib \ + /$(get_libdir)/lib{history,readline}$(get_libname 4) \ + /$(get_libdir)/lib{history,readline}$(get_libname 5) \ + /$(get_libdir)/lib{history,readline}$(get_libname 6) \ + /$(get_libdir)/lib{history,readline}$(get_libname 7) +} + +pkg_postinst() { + preserve_old_lib_notify \ + /$(get_libdir)/lib{history,readline}$(get_libname 4) \ + /$(get_libdir)/lib{history,readline}$(get_libname 5) \ + /$(get_libdir)/lib{history,readline}$(get_libname 6) \ + /$(get_libdir)/lib{history,readline}$(get_libname 7) +} From f92b2644674ae863f9f7be89e6a519fe4dd878dc Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:16:04 +0000 Subject: [PATCH 100/130] sys-libs/talloc: Sync with Gentoo It's from Gentoo commit 5e3d413c90ed50a6f9582ee1e3817398d4a82319. --- .../portage-stable/sys-libs/talloc/talloc-2.4.0.ebuild | 6 +++--- .../portage-stable/sys-libs/talloc/talloc-2.4.1.ebuild | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.0.ebuild index a9a819cb52..b261d2c9ac 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" inherit waf-utils python-single-r1 multilib-minimal @@ -30,7 +30,7 @@ RDEPEND=" # Valgrind is automagic here but it's a build-only dep so it's not so bad. DEPEND=" ${RDEPEND} - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " BDEPEND=" ${PYTHON_DEPS} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.1.ebuild index c3c90959ff..adea9688ba 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -30,7 +30,7 @@ RDEPEND=" # Valgrind is automagic here but it's a build-only dep so it's not so bad. DEPEND=" ${RDEPEND} - valgrind? ( dev-util/valgrind ) + valgrind? ( dev-debug/valgrind ) " BDEPEND=" ${PYTHON_DEPS} From df3961ad6a7751a092fb1a44258837a40482cec9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:16:07 +0000 Subject: [PATCH 101/130] sys-libs/zlib: Sync with Gentoo It's from Gentoo commit 94c6e08a7720f558bb603793f8e4c2d70283c08f. --- .../portage-stable/sys-libs/zlib/Manifest | 2 - .../sys-libs/zlib/zlib-1.2.13-r1.ebuild | 181 ----------------- .../sys-libs/zlib/zlib-1.2.13-r2.ebuild | 184 ------------------ ...{zlib-1.3-r1.ebuild => zlib-1.3-r3.ebuild} | 16 +- 4 files changed, 7 insertions(+), 376 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r2.ebuild rename sdk_container/src/third_party/portage-stable/sys-libs/zlib/{zlib-1.3-r1.ebuild => zlib-1.3-r3.ebuild} (87%) 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 de5404f10c..95af1a3ddd 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.13.tar.xz 1296496 BLAKE2B cefcd25989ce27e7d339af2a88455fcf64f6f5e647bedb0f05a45e4370a885fe45a60c023aa63e79b8ecf20ed3254d0052245f33f5769aca2838b42242be14a8 SHA512 9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725 -DIST zlib-1.2.13.tar.xz.asc 235 BLAKE2B 29206175f06b4e36960fc6b9403101f55c1f5b768e1921ce1402217bc85978b9fba1a4130db2df5c148b6a1c947148372be20ff8c4ce337c6f2541b42fef7274 SHA512 ca5decebe9572e77e88bac5c5119bfda7e222ed3944e4692510ae70fb5f01d8694b59a6878472b84e6b61d2d1682d94473b6312832afa520a2a23293572ea621 DIST zlib-1.3.tar.xz 1295740 BLAKE2B 5fe0f32339267348a313f23a21e9588bdb180b7415be303c85f5f169444d019e5f176ef7322f6e64297c360acc2a6041c50e2f66d1860e5c392d8970990f176a SHA512 3868ac4da5842dd36c9dad794930675b9082ce15cbd099ddb79c0f6bd20a24aa8f33a123f378f26fe0ae02d91f31f2994dccaac565cedeaffed7b315e6ded2a2 DIST zlib-1.3.tar.xz.asc 235 BLAKE2B 5fe6ce952699a19e848d0a6e6c3622f934340068fdcd29afb35c74f3c8ae66d04de644800d10b38c743bb2f4852ba28f1a97313cb0e6e6f9b804cbca5289ebbb SHA512 8f3ce5c21938d6abc7e121d2939648a0ce2dc01a8ab4eb001d44eb159935dd0b4f5b5e371b3ecfc0ceb23689e2cefe002065968908503cde15b1bba08aff9db6 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 deleted file mode 100644 index 109771cd69..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Worth keeping an eye on 'develop' branch upstream for possible backports. -AUTOTOOLS_AUTO_DEPEND="no" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc -inherit autotools multilib-minimal flag-o-matic toolchain-funcs usr-ldscript verify-sig - -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 )" - -LICENSE="ZLIB" -SLOT="0/1" # subslot = SONAME -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]" -DEPEND="${RDEPEND}" -BDEPEND=" - minizip? ( ${AUTOTOOLS_DEPEND} ) - verify-sig? ( sec-keys/openpgp-keys-madler ) -" - -PATCHES=( - # Don't install unexpected & unused crypt.h header (which would clash with other pkgs) - # Pending upstream. bug #658536 - "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch - - # Respect AR, RANLIB, NM during build. Pending upstream. bug #831628 - "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch - - # Respect LDFLAGS during configure tests. Pending upstream - "${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch - - # Fix building on sparc with older binutils, we pass it in ebuild instead - "${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch -) - -src_prepare() { - default - - if use minizip ; then - cd contrib/minizip || die - eautoreconf - fi - - case ${CHOST} in - *-mingw*|mingw*) - # Uses preconfigured Makefile rather than configure script - multilib_copy_sources - - ;; - esac -} - -echoit() { echo "$@"; "$@"; } - -multilib_src_configure() { - # We pass manually instead of relying on the configure script/makefile - # because it would pass it even for older binutils. - use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments) - - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi - - case ${CHOST} in - *-mingw*|mingw*) - ;; - - *) - # bug #347167 - local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) - - local myconf=( - --shared - --prefix="${EPREFIX}/usr" - --libdir="${EPREFIX}/usr/$(get_libdir)" - ${uname:+--uname=${uname}} - ) - - # Not an autoconf script, so can't use econf - echoit "${S}"/configure "${myconf[@]}" || die - - ;; - esac - - if use minizip ; then - local minizipdir="contrib/minizip" - mkdir -p "${BUILD_DIR}/${minizipdir}" || die - - cd ${minizipdir} || die - ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable static-libs static) - fi -} - -multilib_src_compile() { - case ${CHOST} in - *-mingw*|mingw*) - emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- - sed \ - -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \ - -e 's|@exec_prefix@|${prefix}|g' \ - -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \ - -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \ - -e 's|@includedir@|${prefix}/include|g' \ - -e 's|@VERSION@|'${PV}'|g' \ - zlib.pc.in > zlib.pc || die - ;; - - *) - emake - - ;; - esac - - use minizip && emake -C contrib/minizip -} - -sed_macros() { - # Clean up namespace a little, bug #383179 - # We do it here so we only have to tweak 2 files - sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die -} - -multilib_src_install() { - case ${CHOST} in - *-mingw*|mingw*) - emake -f win32/Makefile.gcc install \ - BINARY_PATH="${ED}/usr/bin" \ - LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ - INCLUDE_PATH="${ED}/usr/include" \ - SHARED_MODE=1 - - # Overwrites zlib.pc created from win32/Makefile.gcc, bug #620136 - insinto /usr/$(get_libdir)/pkgconfig - doins zlib.pc - - ;; - - *) - emake install DESTDIR="${D}" LDCONFIG=: - gen_usr_ldscript -a z - - ;; - esac - - sed_macros "${ED}"/usr/include/*.h - - if use minizip ; then - emake -C contrib/minizip install DESTDIR="${D}" - sed_macros "${ED}"/usr/include/minizip/*.h - - # This might not exist if slibtool is used. - # bug #816756 - rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die - fi - - if ! use static-libs ; then - # bug #419645 - rm "${ED}"/usr/$(get_libdir)/libz.a || die - fi -} - -multilib_src_install_all() { - dodoc FAQ README ChangeLog doc/*.txt - - if use minizip ; then - dodoc contrib/minizip/*.txt - doman contrib/minizip/*.1 - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r2.ebuild deleted file mode 100644 index b90fde773c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r2.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Worth keeping an eye on 'develop' branch upstream for possible backports. -AUTOTOOLS_AUTO_DEPEND="no" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc -inherit autotools multilib-minimal flag-o-matic toolchain-funcs usr-ldscript verify-sig - -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 )" - -LICENSE="ZLIB" -SLOT="0/1" # subslot = SONAME -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]" -DEPEND="${RDEPEND}" -BDEPEND=" - minizip? ( ${AUTOTOOLS_DEPEND} ) - verify-sig? ( sec-keys/openpgp-keys-madler ) -" - -PATCHES=( - # Don't install unexpected & unused crypt.h header (which would clash with other pkgs) - # Pending upstream. bug #658536 - "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch - - # Respect AR, RANLIB, NM during build. Pending upstream. bug #831628 - "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch - - # Respect LDFLAGS during configure tests. Pending upstream - "${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch - - # Fix building on sparc with older binutils, we pass it in ebuild instead - "${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch - - # CVE-2023-45853 (bug #916484) - "${FILESDIR}"/${PN}-1.2.13-CVE-2023-45853.patch -) - -src_prepare() { - default - - if use minizip ; then - cd contrib/minizip || die - eautoreconf - fi - - case ${CHOST} in - *-mingw*|mingw*) - # Uses preconfigured Makefile rather than configure script - multilib_copy_sources - - ;; - esac -} - -echoit() { echo "$@"; "$@"; } - -multilib_src_configure() { - # We pass manually instead of relying on the configure script/makefile - # because it would pass it even for older binutils. - use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments) - - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi - - case ${CHOST} in - *-mingw*|mingw*) - ;; - - *) - # bug #347167 - local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) - - local myconf=( - --shared - --prefix="${EPREFIX}/usr" - --libdir="${EPREFIX}/usr/$(get_libdir)" - ${uname:+--uname=${uname}} - ) - - # Not an autoconf script, so can't use econf - echoit "${S}"/configure "${myconf[@]}" || die - - ;; - esac - - if use minizip ; then - local minizipdir="contrib/minizip" - mkdir -p "${BUILD_DIR}/${minizipdir}" || die - - cd ${minizipdir} || die - ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable static-libs static) - fi -} - -multilib_src_compile() { - case ${CHOST} in - *-mingw*|mingw*) - emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- - sed \ - -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \ - -e 's|@exec_prefix@|${prefix}|g' \ - -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \ - -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \ - -e 's|@includedir@|${prefix}/include|g' \ - -e 's|@VERSION@|'${PV}'|g' \ - zlib.pc.in > zlib.pc || die - ;; - - *) - emake - - ;; - esac - - use minizip && emake -C contrib/minizip -} - -sed_macros() { - # Clean up namespace a little, bug #383179 - # We do it here so we only have to tweak 2 files - sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die -} - -multilib_src_install() { - case ${CHOST} in - *-mingw*|mingw*) - emake -f win32/Makefile.gcc install \ - BINARY_PATH="${ED}/usr/bin" \ - LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ - INCLUDE_PATH="${ED}/usr/include" \ - SHARED_MODE=1 - - # Overwrites zlib.pc created from win32/Makefile.gcc, bug #620136 - insinto /usr/$(get_libdir)/pkgconfig - doins zlib.pc - - ;; - - *) - emake install DESTDIR="${D}" LDCONFIG=: - gen_usr_ldscript -a z - - ;; - esac - - sed_macros "${ED}"/usr/include/*.h - - if use minizip ; then - emake -C contrib/minizip install DESTDIR="${D}" - sed_macros "${ED}"/usr/include/minizip/*.h - - # This might not exist if slibtool is used. - # bug #816756 - rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die - fi - - if ! use static-libs ; then - # bug #419645 - rm "${ED}"/usr/$(get_libdir)/libz.a || die - fi -} - -multilib_src_install_all() { - dodoc FAQ README ChangeLog doc/*.txt - - if use minizip ; then - dodoc contrib/minizip/*.txt - doman contrib/minizip/*.1 - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.3-r3.ebuild similarity index 87% rename from sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.3-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.3-r3.ebuild index 801eb15ff2..0be6cfaf49 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.3-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 # Worth keeping an eye on 'develop' branch upstream for possible backports. AUTOTOOLS_AUTO_DEPEND="no" VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/madler.asc -inherit autotools edo multilib-minimal flag-o-matic toolchain-funcs usr-ldscript verify-sig +inherit autotools edo multilib-minimal flag-o-matic usr-ldscript verify-sig DESCRIPTION="Standard (de)compression library" HOMEPAGE="https://zlib.net/" @@ -23,7 +23,7 @@ SRC_URI=" LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -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" +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]" @@ -46,6 +46,9 @@ PATCHES=( # Fix building on sparc with older binutils, we pass it in ebuild instead "${FILESDIR}"/${PN}-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch + + # CVE-2023-45853 (bug #916484) + "${FILESDIR}"/${PN}-1.2.13-CVE-2023-45853.patch ) src_prepare() { @@ -70,12 +73,7 @@ multilib_src_configure() { # because it would pass it even for older binutils. use sparc && append-flags $(test-flags-CCLD -Wl,--no-warn-rwx-segments) - # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs - # https://github.com/gentoo/gentoo/pull/28355 - # mold needs this too but right now tc-ld-is-mold is also not available - if tc-ld-is-lld; then - append-ldflags -Wl,--undefined-version - fi + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) case ${CHOST} in *-mingw*|mingw*) From bb5d537d298219daadf0c6d9cc5c25981cc21325 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:16:08 +0000 Subject: [PATCH 102/130] sys-process/lsof: Sync with Gentoo It's from Gentoo commit 4f3686c867b7c7220237cca087d4be88e54d872b. --- ...lsof-4.98.0-fix-clang-version-parser.patch | 15 ++++++++++++++ .../sys-process/lsof/lsof-4.98.0-r1.ebuild | 12 +++++++++-- .../sys-process/lsof/lsof-4.99.0.ebuild | 20 ++++++++++++++++++- .../sys-process/lsof/lsof-4.99.3.ebuild | 20 ++++++++++++++++++- 4 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-process/lsof/files/lsof-4.98.0-fix-clang-version-parser.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-process/lsof/files/lsof-4.98.0-fix-clang-version-parser.patch b/sdk_container/src/third_party/portage-stable/sys-process/lsof/files/lsof-4.98.0-fix-clang-version-parser.patch new file mode 100644 index 0000000000..ebb5d85d2e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-process/lsof/files/lsof-4.98.0-fix-clang-version-parser.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/919253 +https://github.com/lsof-org/lsof/issues/305 + +Ignore HIP or CUDA versions in clang, when checking for compiler version +--- a/configure.ac ++++ b/configure.ac +@@ -410,7 +410,7 @@ AC_CONFIG_FILES([Makefile]) + + # Pass build configurations to version.h.in + AC_SUBST(cc, $CC) +-AC_SUBST(ccv, $($CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p')) ++AC_SUBST(ccv, $($CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p;q')) + AC_SUBST(ccflags, $CFLAGS) + AC_SUBST(ldflags, "$LDFLAGS$LIBS") + # Reproducible build diff --git a/sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.98.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.98.0-r1.ebuild index 77f81e7410..8505f4c5cb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.98.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.98.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit flag-o-matic +inherit autotools flag-o-matic MY_P="${P/-/_}" DESCRIPTION="Lists open files for running Unix processes" @@ -30,8 +30,16 @@ RESTRICT="test" PATCHES=( "${FILESDIR}"/${P}-fix-common-include-strftime.patch + "${FILESDIR}"/${PN}-4.98.0-fix-clang-version-parser.patch ) +# TODO: drop this block, "inherit autotools" and clang-version-parser patch after 4.99.3 +# https://github.com/lsof-org/lsof/pull/306 +src_prepare() { + default + eautoreconf +} + src_configure() { # TODO: drop after 4.98.0: https://github.com/lsof-org/lsof/commit/4fbe0b78f63ce115f25cf7a49756745e3bf47fea export ac_cv_header_selinux_selinux_h=$(usex selinux) diff --git a/sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.99.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.99.0.ebuild index c94a98abca..5a38a82c40 100644 --- a/sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.99.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.99.0.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit autotools + MY_P="${P/-/_}" DESCRIPTION="Lists open files for running Unix processes" HOMEPAGE="https://github.com/lsof-org/lsof" @@ -26,6 +28,17 @@ BDEPEND=" # Needs fixing first for sandbox RESTRICT="test" +PATCHES=( + "${FILESDIR}"/${PN}-4.98.0-fix-clang-version-parser.patch +) + +# TODO: drop this block, "inherit autotools" and clang-version-parser patch after 4.99.3 +# https://github.com/lsof-org/lsof/pull/306 +src_prepare() { + default + eautoreconf +} + src_configure() { local myeconfargs=( $(use_with rpc libtirpc) @@ -39,6 +52,11 @@ src_compile() { emake DEBUG="" all } +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} + pkg_postinst() { if [[ ${CHOST} == *-solaris* ]] ; then einfo "Note: to use lsof on Solaris you need read permissions on" diff --git a/sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.99.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.99.3.ebuild index 9965531bc3..89ddf51e8c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.99.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-process/lsof/lsof-4.99.3.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit autotools + MY_P="${P/-/_}" DESCRIPTION="Lists open files for running Unix processes" HOMEPAGE="https://github.com/lsof-org/lsof" @@ -26,6 +28,17 @@ BDEPEND=" # Needs fixing first for sandbox RESTRICT="test" +PATCHES=( + "${FILESDIR}"/${PN}-4.98.0-fix-clang-version-parser.patch +) + +# TODO: drop this block, "inherit autotools" and clang-version-parser patch after 4.99.3 +# https://github.com/lsof-org/lsof/pull/306 +src_prepare() { + default + eautoreconf +} + src_configure() { local myeconfargs=( $(use_with rpc libtirpc) @@ -39,6 +52,11 @@ src_compile() { emake DEBUG="" all } +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} + pkg_postinst() { if [[ ${CHOST} == *-solaris* ]] ; then einfo "Note: to use lsof on Solaris you need read permissions on" From 0cffe5e99eebea2189d672ba92af5a7446a23791 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 15 Jan 2024 07:16:55 +0000 Subject: [PATCH 103/130] x11-libs/pixman: Sync with Gentoo It's from Gentoo commit 106b056ffeab053066745fac0ee9e8312e77b2fc. --- .../portage-stable/x11-libs/pixman/Manifest | 1 + .../x11-libs/pixman/pixman-0.43.0.ebuild | 68 +++++++++++++++++++ .../x11-libs/pixman/pixman-9999.ebuild | 9 ++- 3 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.43.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/Manifest b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/Manifest index 47a369091e..0e09fc59d9 100644 --- a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/Manifest +++ b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/Manifest @@ -1 +1,2 @@ DIST pixman-0.42.2.tar.xz 652984 BLAKE2B 6286a9d064a5a24017fccbb0a6e9f6ef932077c2e33ec043826d4a7a6c707c9111d3de4b806cbcdb47fc2794f1f930d24d078de1ff2912061967db0890540957 SHA512 3476e2676e66756b1af61b1e532cd80c985c191fb7956eb01702b419726cce99e79163b7f287f74f66414680e7396d13c3fee525cd663f12b6ac4877070ff4e8 +DIST pixman-0.43.0.tar.xz 638236 BLAKE2B 1a807d4d5598a5fe6077d6bbc7786cba41a698a1f03801cc5367ade8707500ee215a0faf65afe85f9e040b0380f1074c2fdfd31c0805dc41a4e5e34e36416764 SHA512 a90399b8c6aec218abb2f419fb5d6894acf9f4c7acb4fd3893b0b7c805ba47c82ee7efb363be59bb1a15b6997b2dddb7dba062a165503b035e1124fff1b271c9 diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.43.0.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.43.0.ebuild new file mode 100644 index 0000000000..64f5bc702b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.43.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi + +inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs + +DESCRIPTION="Low-level pixel manipulation routines" +HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" +if [[ ${PV} != 9999* ]]; 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" + SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="cpu_flags_ppc_altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test" +RESTRICT="!test? ( test )" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp +} + +multilib_src_configure() { + if ( use arm || use arm64 ) && tc-is-clang ; then + # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 + append-cflags $(test-flags-CC -fno-integrated-as) + fi + + local emesonargs=( + $(meson_feature cpu_flags_arm_iwmmxt iwmmxt) + $(meson_use cpu_flags_arm_iwmmxt2 iwmmxt2) + $(meson_feature cpu_flags_x86_mmxext mmx) + $(meson_feature cpu_flags_x86_sse2 sse2) + $(meson_feature cpu_flags_x86_ssse3 ssse3) + $(meson_feature cpu_flags_ppc_altivec vmx) + $(meson_feature loongson2f loongson-mmi) + $(meson_feature test openmp) # only used in unit tests + $(meson_feature test tests) + -Ddefault_library=$(usex static-libs both shared) + -Ddemos=disabled + -Dgtk=disabled + -Dlibpng=disabled + ) + + if [[ ${ABI} == arm64 ]]; then + emesonargs+=($(meson_feature cpu_flags_arm_neon a64-neon)) + elif [[ ${ABI} == arm ]]; then + emesonargs+=($(meson_feature cpu_flags_arm_neon neon)) + fi + + meson_src_configure +} + +multilib_src_test() { + export OMP_NUM_THREADS=$(makeopts_jobs) + meson_src_test -t 100 +} 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 fa237942c4..64f5bc702b 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,10 +13,8 @@ inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-func DESCRIPTION="Low-level pixel manipulation routines" 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 ~x64-solaris" +if [[ ${PV} != 9999* ]]; 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" SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz" fi @@ -50,6 +48,7 @@ multilib_src_configure() { $(meson_feature test openmp) # only used in unit tests $(meson_feature test tests) -Ddefault_library=$(usex static-libs both shared) + -Ddemos=disabled -Dgtk=disabled -Dlibpng=disabled ) From ef40478bbf9227bc0ff40dda057038782afc67ca Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 15 Jan 2024 15:00:33 +0100 Subject: [PATCH 104/130] portage-stable, overlay: Move some packages In Gentoo, packages dev-util/cmake, dev-util/meson, dev-util/meson-format-array, dev-util/ninja and sys-devel/make got moved to new category named dev-build. Reflect that in our repos too. The {sys-devel,dev-build}/make package is moved from overlay into portage-stable - it used to be there to carry a patch that fixed builds of the sys-devel/binutils package. I think that the issue was fixed long time ago in make, so now it's time to put it back to portage-stable and under package automation. --- .github/workflows/portage-stable-packages-list | 13 ++++++++----- .../{dev-util => dev-build}/cmake/Manifest | 0 .../cmake/cmake-3.26.5-r2.ebuild | 0 .../cmake/cmake-3.27.7.ebuild | 0 .../cmake/cmake-3.27.9.ebuild | 0 .../cmake/cmake-3.28.1.ebuild | 0 .../{dev-util => dev-build}/cmake/cmake-9999.ebuild | 0 .../cmake/files/50cmake-gentoo.el | 0 .../cmake/files/cmake-2.8.10.2-FindPythonLibs.patch | 0 .../cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch | 0 .../files/cmake-3.16.0_rc4-darwin-bundle.patch | 0 .../cmake/files/cmake-3.17.0_rc1-FindBLAS.patch | 0 .../files/cmake-3.18.0-filter_distcc_warning.patch | 0 .../cmake/files/cmake-3.19.1-darwin-gcc.patch | 0 ....so-for-modules-on-darwin-macos.-Use-.bund.patch | 0 ...-proper-paths-to-make-cmake-find-our-tools.patch | 0 ...27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch | 0 ...t-the-correct-version-of-Qt-is-always-used.patch | 0 ..._rc1-0005-Respect-Gentoo-s-Python-eclasses.patch | 0 ...t-distcc-warnings-to-avoid-confusing-CMake.patch | 0 ...fig-ignore-whitespace-separators-in-versio.patch | 0 .../cmake/files/cmake-3.28.0-c99.patch | 0 .../cmake/files/cmake-3.5.2-FindQt4.patch | 0 .../files/cmake-3.9.0_rc2-FindPythonInterp.patch | 0 .../{dev-util => dev-build}/cmake/files/cmake.vim | 0 .../{dev-util => dev-build}/cmake/metadata.xml | 0 .../dev-build}/make/Manifest | 0 .../dev-build}/make/README.md | 0 .../make-3.82-darwin-library_search-dylib.patch | 0 .../make/files/make-4.2-default-cxx.patch | 0 .../make/files/make-4.3-handle-tmpfile-fail.patch | 0 .../dev-build}/make/make-4.3.ebuild | 0 .../dev-build}/make/metadata.xml | 0 .../meson-format-array/files/meson-format-array | 0 .../meson-format-array/meson-format-array-0.ebuild | 0 .../meson-format-array/metadata.xml | 0 .../{dev-util => dev-build}/meson/Manifest | 0 ...y-convert-boolean-values-for-cmake-formats.patch | 0 ...evert-clike-Deduplicate-rpath-linker-flags.patch | 0 ...end-don-t-hide-all-compiler-warnings-for-t.patch | 0 ...endency-ensure-that-setuptools-doesn-t-inj.patch | 0 ...ule-stop-using-distutils-schemes-on-suffic.patch | 0 ...ule-refactor-pypy-detection-into-a-consist.patch | 0 ...ule-stop-using-distutils-link-to-libpython.patch | 0 ...test-case-to-not-import-distutils-on-pytho.patch | 0 ...he-PyPI-metadata-as-supporting-python-3.12.patch | 0 ...t-apply-global-project-and-environment-C-a.patch | 0 .../meson/files/meson-0.63-xtools-support.patch | 0 .../meson/files/meson-1.2.1-llvm-17.patch | 0 .../meson/files/meson-1.2.1-python-path.patch | 0 .../meson/meson-1.1.1.ebuild | 0 .../meson/meson-1.2.1-r1.ebuild | 0 .../meson/meson-1.2.1-r2.ebuild | 0 .../meson/meson-1.2.2-r1.ebuild | 0 .../meson/meson-1.2.2.ebuild | 0 .../meson/meson-1.2.3.ebuild | 0 .../meson/meson-1.3.0-r1.ebuild | 0 .../meson/meson-1.3.0-r2.ebuild | 0 .../meson/meson-1.3.1.ebuild | 0 .../{dev-util => dev-build}/meson/meson-9999.ebuild | 0 .../{dev-util => dev-build}/meson/metadata.xml | 0 .../{dev-util => dev-build}/ninja/Manifest | 0 .../ninja/files/ninja-cflags.patch | 0 .../{dev-util => dev-build}/ninja/metadata.xml | 0 .../ninja/ninja-1.11.1-r2.ebuild | 0 .../ninja/ninja-1.11.1-r3.ebuild | 0 .../{dev-util => dev-build}/ninja/ninja-9999.ebuild | 0 .../{sys-devel => dev-debug}/gdb/Manifest | 0 .../gdb/files/gdb-13.2-fix-sparc-debugging.patch | 0 .../gdb/files/gdb-8.3.1-verbose-build.patch | 0 .../{sys-devel => dev-debug}/gdb/gdb-13.2-r2.ebuild | 0 .../{sys-devel => dev-debug}/gdb/gdb-14.1.ebuild | 0 .../{sys-devel => dev-debug}/gdb/gdb-9999.ebuild | 0 .../{sys-devel => dev-debug}/gdb/metadata.xml | 0 74 files changed, 8 insertions(+), 5 deletions(-) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/Manifest (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/cmake-3.26.5-r2.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/cmake-3.27.7.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/cmake-3.27.9.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/cmake-3.28.1.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/cmake-9999.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/50cmake-gentoo.el (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.18.0-filter_distcc_warning.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.19.1-darwin-gcc.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.28.0-c99.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.5.2-FindQt4.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/files/cmake.vim (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/cmake/metadata.xml (100%) rename sdk_container/src/third_party/{coreos-overlay/sys-devel => portage-stable/dev-build}/make/Manifest (100%) rename sdk_container/src/third_party/{coreos-overlay/sys-devel => portage-stable/dev-build}/make/README.md (100%) rename sdk_container/src/third_party/{coreos-overlay/sys-devel => portage-stable/dev-build}/make/files/make-3.82-darwin-library_search-dylib.patch (100%) rename sdk_container/src/third_party/{coreos-overlay/sys-devel => portage-stable/dev-build}/make/files/make-4.2-default-cxx.patch (100%) rename sdk_container/src/third_party/{coreos-overlay/sys-devel => portage-stable/dev-build}/make/files/make-4.3-handle-tmpfile-fail.patch (100%) rename sdk_container/src/third_party/{coreos-overlay/sys-devel => portage-stable/dev-build}/make/make-4.3.ebuild (100%) rename sdk_container/src/third_party/{coreos-overlay/sys-devel => portage-stable/dev-build}/make/metadata.xml (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson-format-array/files/meson-format-array (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson-format-array/meson-format-array-0.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson-format-array/metadata.xml (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/Manifest (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/files/meson-0.63-xtools-support.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/files/meson-1.2.1-llvm-17.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/files/meson-1.2.1-python-path.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/meson-1.1.1.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/meson-1.2.1-r1.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/meson-1.2.1-r2.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/meson-1.2.2-r1.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/meson-1.2.2.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/meson-1.2.3.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/meson-1.3.0-r1.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/meson-1.3.0-r2.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/meson-1.3.1.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/meson-9999.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/meson/metadata.xml (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/ninja/Manifest (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/ninja/files/ninja-cflags.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/ninja/metadata.xml (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/ninja/ninja-1.11.1-r2.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/ninja/ninja-1.11.1-r3.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/ninja/ninja-9999.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-debug}/gdb/Manifest (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-debug}/gdb/files/gdb-13.2-fix-sparc-debugging.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-debug}/gdb/files/gdb-8.3.1-verbose-build.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-debug}/gdb/gdb-13.2-r2.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-debug}/gdb/gdb-14.1.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-debug}/gdb/gdb-9999.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-debug}/gdb/metadata.xml (100%) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 3419f1dfa7..315c15e923 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -154,10 +154,18 @@ app-text/xmlto app-vim/gentoo-syntax +dev-build/cmake +dev-build/make +dev-build/meson +dev-build/meson-format-array +dev-build/ninja + dev-cpp/gtest dev-db/sqlite +dev-debug/gdb + dev-lang/duktape dev-lang/go-bootstrap dev-lang/lua @@ -264,16 +272,12 @@ dev-python/wheel dev-util/bpftool dev-util/catalyst dev-util/checkbashisms -dev-util/cmake dev-util/cmocka dev-util/desktop-file-utils dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf dev-util/gtk-doc-am -dev-util/meson -dev-util/meson-format-array -dev-util/ninja dev-util/pahole dev-util/patchelf dev-util/patchutils @@ -501,7 +505,6 @@ sys-devel/crossdev sys-devel/flex sys-devel/gcc sys-devel/gcc-config -sys-devel/gdb sys-devel/gettext sys-devel/gnuconfig sys-devel/libtool diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/cmake/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/Manifest diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.5-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.26.5-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.5-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.26.5-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.27.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.7.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.27.7.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.7.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.27.9.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.9.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.27.9.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.9.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.28.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.28.1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.28.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.28.1.ebuild 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-build/cmake/cmake-9999.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-9999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/50cmake-gentoo.el b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/50cmake-gentoo.el similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/50cmake-gentoo.el rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/50cmake-gentoo.el diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.18.0-filter_distcc_warning.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.18.0-filter_distcc_warning.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.19.1-darwin-gcc.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.19.1-darwin-gcc.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.28.0-c99.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.28.0-c99.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.28.0-c99.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.28.0-c99.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.5.2-FindQt4.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.5.2-FindQt4.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake.vim b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake.vim similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake.vim rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake.vim diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/cmake/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/make/Manifest similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-devel/make/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/make/Manifest diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/README.md b/sdk_container/src/third_party/portage-stable/dev-build/make/README.md similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-devel/make/README.md rename to sdk_container/src/third_party/portage-stable/dev-build/make/README.md diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch b/sdk_container/src/third_party/portage-stable/dev-build/make/files/make-3.82-darwin-library_search-dylib.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch rename to sdk_container/src/third_party/portage-stable/dev-build/make/files/make-3.82-darwin-library_search-dylib.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-4.2-default-cxx.patch b/sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.2-default-cxx.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-4.2-default-cxx.patch rename to sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.2-default-cxx.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-4.3-handle-tmpfile-fail.patch b/sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.3-handle-tmpfile-fail.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-4.3-handle-tmpfile-fail.patch rename to sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.3-handle-tmpfile-fail.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/make-4.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/make/make-4.3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-devel/make/make-4.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/make/make-4.3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/make/metadata.xml similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-devel/make/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/make/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/files/meson-format-array b/sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/files/meson-format-array similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/files/meson-format-array rename to sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/files/meson-format-array 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-build/meson-format-array/meson-format-array-0.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/meson-format-array-0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/meson-format-array-0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/meson/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/meson/Manifest diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-0.63-xtools-support.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-0.63-xtools-support.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-0.63-xtools-support.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-0.63-xtools-support.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-1.2.1-llvm-17.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.2.1-llvm-17.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-1.2.1-llvm-17.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.2.1-llvm-17.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-1.2.1-python-path.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.2.1-python-path.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-1.2.1-python-path.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.2.1-python-path.patch 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-build/meson/meson-1.1.1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.1.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.1.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.1-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.1-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.2-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.3.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.3.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.3.0-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.3.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.3.0-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.3.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1.ebuild 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-build/meson/meson-9999.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/meson/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/meson/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/ninja/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/ninja/Manifest diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/files/ninja-cflags.patch b/sdk_container/src/third_party/portage-stable/dev-build/ninja/files/ninja-cflags.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/files/ninja-cflags.patch rename to sdk_container/src/third_party/portage-stable/dev-build/ninja/files/ninja-cflags.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/ninja/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/ninja/metadata.xml 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-build/ninja/ninja-1.11.1-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r3.ebuild 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-build/ninja/ninja-9999.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/Manifest b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gdb/Manifest rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/Manifest diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/files/gdb-13.2-fix-sparc-debugging.patch b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-13.2-fix-sparc-debugging.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gdb/files/gdb-13.2-fix-sparc-debugging.patch rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-13.2-fix-sparc-debugging.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/files/gdb-8.3.1-verbose-build.patch b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-8.3.1-verbose-build.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gdb/files/gdb-8.3.1-verbose-build.patch rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-8.3.1-verbose-build.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.2-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-13.2-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.2-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-13.2-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-14.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-14.1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-14.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-14.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-9999.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-9999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gdb/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/metadata.xml From ab43658d602b4cf94caa64b384b47d6cc164bf07 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 15 Jan 2024 15:10:58 +0100 Subject: [PATCH 105/130] overlay: Fix references to moved packages --- build_library/toolchain_util.sh | 2 +- ...s-dev-0.1.0-r83.ebuild => coreos-dev-0.1.0-r84.ebuild} | 0 .../coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild | 2 +- ...ro-client-0.1.1.ebuild => fero-client-0.1.1-r1.ebuild} | 0 .../coreos-devel/fero-client/fero-client-9999.ebuild | 2 +- .../rust/{rust-1.75.0.ebuild => rust-1.75.0-r1.ebuild} | 8 ++++---- .../profiles/coreos/base/package.accept_keywords | 4 ++-- ...{systemd-252.11-r1.ebuild => systemd-252.11-r2.ebuild} | 2 +- .../rust/{rust-1.75.0.ebuild => rust-1.75.0-r1.ebuild} | 0 9 files changed, 10 insertions(+), 10 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/{coreos-dev-0.1.0-r83.ebuild => coreos-dev-0.1.0-r84.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/{fero-client-0.1.1.ebuild => fero-client-0.1.1-r1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/dev-lang/rust/{rust-1.75.0.ebuild => rust-1.75.0-r1.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-252.11-r1.ebuild => systemd-252.11-r2.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/virtual/rust/{rust-1.75.0.ebuild => rust-1.75.0-r1.ebuild} (100%) diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh index 93f288a453..8afd45e49f 100644 --- a/build_library/toolchain_util.sh +++ b/build_library/toolchain_util.sh @@ -330,7 +330,7 @@ _get_cross_pkgs_for_emerge_and_crossdev() { local -n gcpfeac_emerge_atoms_var_ref="${gcpfeac_emerge_atoms_var_name}" local -n gcpfeac_crossdev_pkg_flags_var_ref="${gcpfeac_crossdev_pkg_flags_var_name}" - local -a all_pkgs=( "${TOOLCHAIN_PKGS[@]}" sys-devel/gdb ) + local -a all_pkgs=( "${TOOLCHAIN_PKGS[@]}" dev-debug/gdb ) local -A crossdev_flags_map=( [binutils]=--binutils [gdb]=--gdb diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r83.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r84.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r83.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r84.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild index 7d80b997f5..c2e71d89de 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild @@ -19,6 +19,7 @@ RDEPEND=" app-portage/gentoolkit coreos-base/coreos coreos-base/emerge-gitclone + dev-debug/gdb dev-lang/python dev-util/pahole dev-util/strace @@ -41,7 +42,6 @@ RDEPEND=" sys-apps/smartmontools sys-apps/which sys-devel/gcc - sys-devel/gdb sys-fs/lvm2 sys-fs/squashfs-tools sys-process/procps diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-0.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-0.1.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-0.1.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-0.1.1-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild index 4bb4ac7507..de7e2d34ba 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild @@ -24,7 +24,7 @@ SLOT="0" IUSE="" DEPEND=">=dev-libs/protobuf-3.0.0 - dev-util/cmake" + dev-build/cmake" RDEPEND=">=dev-libs/protobuf-3.0.0" src_unpack() { diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.75.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.75.0-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.75.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.75.0-r1.ebuild index 88f11540e6..6a13905a1b 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.75.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.75.0-r1.ebuild @@ -96,10 +96,10 @@ BDEPEND="${PYTHON_DEPS} ) system-bootstrap? ( ${BOOTSTRAP_DEPEND} ) !system-llvm? ( - >=dev-util/cmake-3.13.4 - dev-util/ninja + >=dev-build/cmake-3.13.4 + dev-build/ninja ) - test? ( sys-devel/gdb ) + test? ( dev-debug/gdb ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -773,7 +773,7 @@ src_install() { pkg_postinst() { eselect rust update - if has_version sys-devel/gdb || has_version dev-util/lldb; then + if has_version dev-debug/gdb || has_version dev-debug/lldb; then elog "Rust installs a helper script for calling GDB and LLDB," elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}." fi 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 073ad448ad..991b29315f 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 @@ -41,7 +41,7 @@ =dev-lang/nasm-2.15.05 ~arm64 # Accept unstable host Rust compilers. -=dev-lang/rust-1.75.0 ~amd64 ~arm64 +=dev-lang/rust-1.75.0-r1 ~amd64 ~arm64 # Needed by arm64-native SDK. =dev-lang/yasm-1.3.0-r1 ~arm64 @@ -103,4 +103,4 @@ =sys-process/procps-4.0.4 ~amd64 # Accept unstable host Rust compilers. -=virtual/rust-1.75.0 ~amd64 ~arm64 +=virtual/rust-1.75.0-r1 ~amd64 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-252.11-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-252.11-r2.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-252.11-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-252.11-r2.ebuild index 796f927fde..76ef14c334 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-252.11-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-252.11-r2.ebuild @@ -154,7 +154,7 @@ PDEPEND=">=sys-apps/dbus-1.9.8[systemd] BDEPEND=" app-arch/xz-utils:0 dev-util/gperf - >=dev-util/meson-0.46 + >=dev-build/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.75.0.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.75.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.75.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.75.0-r1.ebuild From 577cb554e099ea5806e3a73cbb661f39e8de0635 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 15 Jan 2024 15:11:25 +0100 Subject: [PATCH 106/130] dev-build/cmake: Sync with Gentoo It's from Gentoo commit 2f9c42cb12b476a78214e2f7d5bb3f984ce05de6. --- .../dev-build/cmake/cmake-3.26.5-r2.ebuild | 2 +- .../dev-build/cmake/cmake-3.27.7.ebuild | 2 +- .../dev-build/cmake/cmake-3.27.9.ebuild | 4 +- .../dev-build/cmake/cmake-3.28.1-r1.ebuild | 279 ++++++++++++++++++ .../dev-build/cmake/cmake-3.28.1.ebuild | 2 +- .../dev-build/cmake/cmake-9999.ebuild | 24 +- 6 files changed, 289 insertions(+), 24 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.28.1-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.26.5-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.26.5-r2.ebuild index 0a5b408b8e..dbadb3e177 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.26.5-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.26.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.7.ebuild index 46ec02b1d6..4ca92ca579 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.9.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.9.ebuild index cc2a3ce1d1..d48cae4fd2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-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-20230817 )" fi diff --git a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.28.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.28.1-r1.ebuild new file mode 100644 index 0000000000..defa28f4cf --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.28.1-r1.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2024 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-cmake-docs +# Set to 1 if prebuilt, 0 if not +# (the construct below is to allow overriding from env for script) +: ${CMAKE_DOCS_PREBUILT:=1} + +CMAKE_DOCS_PREBUILT_DEV=sam +#CMAKE_DOCS_VERSION=$(ver_cut 1-3) +CMAKE_DOCS_VERSION=3.27.0 +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +# See bug #784815 +CMAKE_DOCS_USEFLAG="+doc" + +# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja +# ... but seems fine as of 3.22.3? +# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. +CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_REMOVE_MODULES_LIST=( none ) +inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ + toolchain-funcs virtualx xdg-utils + +MY_P="${P/_/-}" + +DESCRIPTION="Cross platform Make" +HOMEPAGE="https://cmake.org/" +if [[ ${PV} == 9999 ]] ; then + CMAKE_DOCS_PREBUILT=0 + + EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" + inherit git-r3 +else + SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" + + if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" + fi + + if [[ ${PV} != *_rc* ]] ; then + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc + inherit verify-sig + + SRC_URI+=" verify-sig? ( + https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt + 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )" + fi +fi + +[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc" + +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-arch/libarchive-3.3.3:= + app-crypt/rhash:0= + >=dev-libs/expat-2.0.1 + >=dev-libs/jsoncpp-1.9.2-r2:0= + >=dev-libs/libuv-1.10.0:= + >=net-misc/curl-7.21.5[ssl] + sys-libs/zlib + virtual/pkgconfig + dap? ( dev-cpp/cppdap ) + gui? ( + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + qt6? ( dev-qt/qtbase:6[gui,widgets] ) + ) + ncurses? ( sys-libs/ncurses:= ) +" +DEPEND="${RDEPEND}" +BDEPEND+=" + doc? ( + dev-python/requests + dev-python/sphinx + ) + test? ( app-arch/libarchive[zstd] ) +" + +SITEFILE="50${PN}-gentoo.el" + +PATCHES=( + # Prefix + "${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch + # Misc + "${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch + "${FILESDIR}"/${PN}-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch + + # Upstream fixes (can usually be removed with a version bump) + "${FILESDIR}"/${PN}-3.28.0-c99.patch +) + +cmake_src_bootstrap() { + # disable running of cmake in bootstrap command + sed -i \ + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ + bootstrap || die "sed failed" + + # execinfo.h on Solaris isn't quite what it is on Darwin + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e 's/execinfo\.h/blablabla.h/' \ + Source/kwsys/CMakeLists.txt || die + fi + + # bootstrap script isn't exactly /bin/sh compatible + tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \ + --prefix="${T}/cmakestrap/" \ + --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ + || die "Bootstrap failed" +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then + default + else + cd "${DISTDIR}" || die + + # See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature + verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc} + verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz + + cd "${WORKDIR}" || die + + default + fi +} + +src_prepare() { + cmake_src_prepare + + if [[ ${CHOST} == *-darwin* ]] ; then + # Disable Xcode hooks, bug #652134 + sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ + Source/CMakeLists.txt || die + sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ + -e '/cmGlobalXCodeGenerator.h/d' \ + Source/cmake.cxx || die + + # Disable isysroot usage with GCC, we've properly instructed + # where things are via GCC configuration and ldwrapper + sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ + Modules/Platform/Apple-GNU-*.cmake || die + # Disable isysroot usage with clang as well + sed -i -e '/_SYSROOT_FLAG/d' \ + Modules/Platform/Apple-Clang.cmake || die + # Don't set a POSIX standard, system headers don't like that, #757426 + sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ + Source/cmLoadCommandCommand.cxx \ + Source/cmStandardLexer.h \ + Source/cmSystemTools.cxx \ + Source/cmTimestamp.cxx + sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ + Source/cmStandardLexer.h + fi + + # Add gcc libs to the default link paths + sed -i \ + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ + -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" + + if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + cmake_src_bootstrap + fi +} + +src_configure() { + # Fix linking on Solaris + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl + + # ODR warnings, bug #858335 + # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 + filter-lto + + local mycmakeargs=( + -DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMake_ENABLE_DEBUGGER=$(usex dap) + -DCMAKE_DOC_DIR=/share/doc/${PF} + -DCMAKE_MAN_DIR=/share/man + -DCMAKE_DATA_DIR=/share/${PN} + -DSPHINX_MAN=$(usex doc) + -DSPHINX_HTML=$(usex doc) + -DBUILD_CursesDialog="$(usex ncurses)" + -DBUILD_TESTING=$(usex test) + -DBUILD_QtDialog=$(usex gui) + ) + + use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) ) + + cmake_src_configure +} + +src_test() { + # Fix OutDir and SelectLibraryConfigurations tests + # these are altered thanks to our eclass + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ + || die + + pushd "${BUILD_DIR}" > /dev/null || die + + # Excluded tests: + # BootstrapTest: we actualy bootstrap it every time so why test it. + # BundleUtilities: bundle creation broken + # CMakeOnly.AllFindModules: pthread issues + # CTest.updatecvs: which fails to commit as root + # Fortran: requires fortran + # RunCMake.CompilerLauncher: also requires fortran + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because + # debugedit binary is not in the expected location + # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because + # it can't find a deb package that owns libc + # TestUpload, which requires network access + # RunCMake.CMP0125, known failure reported upstream (bug #829414) + local myctestargs=( + --output-on-failure + -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \ + ) + + virtx cmake_src_test +} + +src_install() { + cmake_src_install + + # If USE=doc, there'll be newly generated docs which we install instead. + if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] + fi + + insinto /usr/share/vim/vimfiles/syntax + doins Auxiliary/vim/syntax/cmake.vim + + insinto /usr/share/vim/vimfiles/indent + doins Auxiliary/vim/indent/cmake.vim + + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/${PN}.vim" + + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} +} + +pkg_postinst() { + if use gui; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} + +pkg_postrm() { + if use gui; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.28.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.28.1.ebuild index 9554c4047f..6204d925e2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.28.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.28.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-9999.ebuild index c13fb33911..45477a10bf 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,8 @@ EAPI=8 : ${CMAKE_DOCS_PREBUILT:=1} CMAKE_DOCS_PREBUILT_DEV=sam -CMAKE_DOCS_VERSION=$(ver_cut 1-3) +#CMAKE_DOCS_VERSION=$(ver_cut 1-3) +CMAKE_DOCS_VERSION=3.27.0 # Default to generating docs (inc. man pages) if no prebuilt; overridden later # See bug #784815 CMAKE_DOCS_USEFLAG="+doc" @@ -19,7 +20,7 @@ CMAKE_DOCS_USEFLAG="+doc" # TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. CMAKE_MAKEFILE_GENERATOR="emake" CMAKE_REMOVE_MODULES_LIST=( none ) -inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ +inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ toolchain-funcs virtualx xdg-utils MY_P="${P/_/-}" @@ -59,7 +60,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses qt6 test" +IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 test" RESTRICT="!test? ( test )" RDEPEND=" @@ -72,7 +73,6 @@ RDEPEND=" sys-libs/zlib virtual/pkgconfig dap? ( dev-cpp/cppdap ) - emacs? ( >=app-editors/emacs-23.1:* ) gui? ( !qt6? ( dev-qt/qtcore:5 @@ -211,11 +211,6 @@ src_configure() { cmake_src_configure } -src_compile() { - cmake_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - src_test() { # Fix OutDir and SelectLibraryConfigurations tests # these are altered thanks to our eclass @@ -254,11 +249,6 @@ src_install() { doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] fi - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - insinto /usr/share/vim/vimfiles/syntax doins Auxiliary/vim/syntax/cmake.vim @@ -272,8 +262,6 @@ src_install() { } pkg_postinst() { - use emacs && elisp-site-regen - if use gui; then xdg_icon_cache_update xdg_desktop_database_update @@ -282,8 +270,6 @@ pkg_postinst() { } pkg_postrm() { - use emacs && elisp-site-regen - if use gui; then xdg_icon_cache_update xdg_desktop_database_update From a00b1ebb45c32898e4b6ab01381c15bd9e7e991a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 15 Jan 2024 15:03:51 +0100 Subject: [PATCH 107/130] dev-build/make: Sync with Gentoo It's from Gentoo commit 7ef71dd2f0e15a353a958b2572de2f2c353c6afb. --- .../portage-stable/dev-build/make/Manifest | 2 + .../portage-stable/dev-build/make/README.md | 2 - .../files/make-4.3-handle-tmpfile-fail.patch | 23 ------ .../make/files/make-4.4-default-cxx.patch | 11 +++ .../{make-4.3.ebuild => make-4.3-r1.ebuild} | 44 +++++++---- .../dev-build/make/make-4.4.1-r1.ebuild | 76 +++++++++++++++++++ .../dev-build/make/make-9999.ebuild | 76 +++++++++++++++++++ .../dev-build/make/metadata.xml | 15 ++-- 8 files changed, 204 insertions(+), 45 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-build/make/README.md delete mode 100644 sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.3-handle-tmpfile-fail.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.4-default-cxx.patch rename sdk_container/src/third_party/portage-stable/dev-build/make/{make-4.3.ebuild => make-4.3-r1.ebuild} (56%) create mode 100644 sdk_container/src/third_party/portage-stable/dev-build/make/make-4.4.1-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-build/make/make-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-build/make/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/make/Manifest index f9cbb5a172..ceee9e83b6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/make/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-build/make/Manifest @@ -1,2 +1,4 @@ DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c8111179e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99 +DIST make-4.4.1.tar.gz 2348200 BLAKE2B 09a4ad8060259e36854b525ab610fd317a86f4926e44e3ab8adba75dccc8d4b445df9dd25ccfb4c25a54bc0e98238a9127e36401d74cbc3503a329eadcdf4995 SHA512 145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c +DIST make-4.4.1.tar.gz.sig 833 BLAKE2B d5f9a33b0262d4a9216f47718f6596884852662a692e708191a7007964007940da1c06549db28ae1d13683c4a949b9ee86da9dedd9a80da8f8b09e71e659e9a1 SHA512 d7a5531c10f216d690ec036f3875c7f314fa53006e138568c60132d506db48d1a59201623e168091dafa4465b005991019e42f81ff1a96a44610b6b18de08b09 diff --git a/sdk_container/src/third_party/portage-stable/dev-build/make/README.md b/sdk_container/src/third_party/portage-stable/dev-build/make/README.md deleted file mode 100644 index 6eed06d4d8..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-build/make/README.md +++ /dev/null @@ -1,2 +0,0 @@ -We forked this package to carry a patch that we will try to upstream -to both GNU Make and to Gentoo. diff --git a/sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.3-handle-tmpfile-fail.patch b/sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.3-handle-tmpfile-fail.patch deleted file mode 100644 index 340b744673..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.3-handle-tmpfile-fail.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -u -r make-4.3/src/output.c make-4.3-fix/src/output.c ---- make-4.3/src/output.c 2020-01-03 07:11:27.000000000 -0000 -+++ make-4.3-fix/src/output.c 2022-08-17 07:35:01.473471281 -0000 -@@ -286,15 +286,16 @@ - FILE *tfile = tmpfile (); - - if (! tfile) -- pfatal_with_name ("tmpfile"); -+ return -1; - - /* Create a duplicate so we can close the stream. */ - fd = dup (fileno (tfile)); -- if (fd < 0) -- pfatal_with_name ("dup"); - - fclose (tfile); - -+ if (fd < 0) -+ return -1; -+ - set_append_mode (fd); - - umask (mask); diff --git a/sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.4-default-cxx.patch b/sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.4-default-cxx.patch new file mode 100644 index 0000000000..4a56df5da2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.4-default-cxx.patch @@ -0,0 +1,11 @@ +--- a/src/default.c ++++ b/src/default.c +@@ -542,7 +542,7 @@ static const char *default_variables[] = + "CXX", "gcc", + # endif /* __MSDOS__ */ + # else +- "CXX", "g++", ++ "CXX", "c++", + # endif + #endif + /* This expands to $(CO) $(COFLAGS) $< $@ if $@ does not exist, diff --git a/sdk_container/src/third_party/portage-stable/dev-build/make/make-4.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/make/make-4.3-r1.ebuild similarity index 56% rename from sdk_container/src/third_party/portage-stable/dev-build/make/make-4.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/make/make-4.3-r1.ebuild index 533a77aceb..55a24ce460 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/make/make-4.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/make/make-4.3-r1.ebuild @@ -1,20 +1,23 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 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/make.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/make.asc inherit flag-o-matic verify-sig DESCRIPTION="Standard tool to compile source trees" HOMEPAGE="https://www.gnu.org/software/make/make.html" -if [[ "$(ver_cut 3)" -ge 90 ]] ; then - SRC_URI="https://alpha.gnu.org/gnu//make/${P}.tar.gz" - SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu//make/${P}.tar.gz.sig )" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git" + inherit autotools git-r3 +elif [[ $(ver_cut 3) -ge 90 ]] ; then + SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )" else SRC_URI="mirror://gnu//make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu//make/${P}.tar.gz.sig )" - 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 LICENSE="GPL-3+" @@ -30,9 +33,27 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch "${FILESDIR}"/${PN}-4.2-default-cxx.patch - "${FILESDIR}"/${PN}-4.3-handle-tmpfile-fail.patch ) +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + + cd "${S}" || die + ./bootstrap || die + else + default + fi +} + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + fi +} + src_configure() { use static && append-ldflags -static local myeconfargs=( @@ -46,10 +67,7 @@ src_configure() { src_install() { emake DESTDIR="${D}" install dodoc AUTHORS NEWS README* - if [[ ${USERLAND} == "GNU" ]] ; then - # we install everywhere as 'gmake' but on GNU systems, - # symlink 'make' to 'gmake' - dosym gmake /usr/bin/make - dosym gmake.1 /usr/share/man/man1/make.1 - fi + + dosym gmake /usr/bin/make + dosym gmake.1 /usr/share/man/man1/make.1 } diff --git a/sdk_container/src/third_party/portage-stable/dev-build/make/make-4.4.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/make/make-4.4.1-r1.ebuild new file mode 100644 index 0000000000..61fbc91f24 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-build/make/make-4.4.1-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/make.asc +inherit flag-o-matic verify-sig + +DESCRIPTION="Standard tool to compile source trees" +HOMEPAGE="https://www.gnu.org/software/make/make.html" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git" + inherit autotools git-r3 +elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then + SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )" +else + SRC_URI="mirror://gnu/make/${P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" + 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+" +SLOT="0" +IUSE="guile nls static" + +DEPEND="guile? ( >=dev-scheme/guile-1.8:= )" +RDEPEND=" + ${DEPEND} + nls? ( virtual/libintl ) +" +BDEPEND=" + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-make ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.4-default-cxx.patch +) + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + + cd "${S}" || die + ./bootstrap || die + else + default + fi +} + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + fi +} + +src_configure() { + use static && append-ldflags -static + local myeconfargs=( + --program-prefix=g + $(use_with guile) + $(use_enable nls) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS NEWS README* + + dosym gmake /usr/bin/make + dosym gmake.1 /usr/share/man/man1/make.1 +} diff --git a/sdk_container/src/third_party/portage-stable/dev-build/make/make-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/make/make-9999.ebuild new file mode 100644 index 0000000000..2be7d7adb8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-build/make/make-9999.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/make.asc +inherit flag-o-matic verify-sig + +DESCRIPTION="Standard tool to compile source trees" +HOMEPAGE="https://www.gnu.org/software/make/make.html" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git" + inherit autotools git-r3 +elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then + SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )" +else + SRC_URI="mirror://gnu/make/${P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" + 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+" +SLOT="0" +IUSE="guile nls static" + +DEPEND="guile? ( >=dev-scheme/guile-1.8:= )" +RDEPEND=" + ${DEPEND} + nls? ( virtual/libintl ) +" +BDEPEND=" + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-make ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.4-default-cxx.patch +) + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + + cd "${S}" || die + ./bootstrap || die + else + default + fi +} + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + fi +} + +src_configure() { + use static && append-ldflags -static + local myeconfargs=( + --program-prefix=g + $(use_with guile) + $(use_enable nls) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS NEWS README* + + dosym gmake /usr/bin/make + dosym gmake.1 /usr/share/man/man1/make.1 +} diff --git a/sdk_container/src/third_party/portage-stable/dev-build/make/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/make/metadata.xml index 1e62dd9102..068fc3567c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/make/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-build/make/metadata.xml @@ -1,11 +1,12 @@ - - base-system@gentoo.org - Gentoo Base System - - - cpe:/a:gnu:make - + + base-system@gentoo.org + Gentoo Base System + + + cpe:/a:gnu:make + make + From e66a4b1e6ea0c37ff5bad1490ade12776094d4cf Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 15 Jan 2024 15:11:25 +0100 Subject: [PATCH 108/130] dev-build/meson: Sync with Gentoo It's from Gentoo commit 7eca49abfbb82f783f10318780b53224d17968f0. --- .../files/meson-1.3.1-xtools-support.patch | 26 +++++++++++++++++++ .../dev-build/meson/meson-1.1.1.ebuild | 4 +-- .../dev-build/meson/meson-1.2.1-r1.ebuild | 4 +-- .../dev-build/meson/meson-1.2.1-r2.ebuild | 4 +-- .../dev-build/meson/meson-1.2.2-r1.ebuild | 4 +-- .../dev-build/meson/meson-1.2.2.ebuild | 4 +-- .../dev-build/meson/meson-1.2.3.ebuild | 4 +-- .../dev-build/meson/meson-1.3.0-r1.ebuild | 4 +-- .../dev-build/meson/meson-1.3.0-r2.ebuild | 6 ++--- .../dev-build/meson/meson-1.3.1.ebuild | 5 ++-- .../dev-build/meson/meson-9999.ebuild | 4 +-- 11 files changed, 48 insertions(+), 21 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.3.1-xtools-support.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.3.1-xtools-support.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.3.1-xtools-support.patch new file mode 100644 index 0000000000..6e9e670ba8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.3.1-xtools-support.patch @@ -0,0 +1,26 @@ +linkers_detect: detect xtools (Apple ld64 derivative) + +xtools is in use on x86_64 and ppc based darwin Prefix installs. Pick +it up as a valid linker. + +Meson is the only thing known at this point to try and figure out what +linker is in use exactly, so instead of changing the linker (xtools), +just teach Meson about xtools. + +Author: Fabian Groffen +Bug: https://bugs.gentoo.org/868516 + +--- a/mesonbuild/linkers/detect.py ++++ b/mesonbuild/linkers/detect.py +@@ -185,6 +185,11 @@ + v = search_version(o) + + linker = linkers.LLVMDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v) ++ # detect xtools first, bug #868516 ++ elif 'xtools-' in o.split('\n')[0]: ++ xtools = o.split(' ')[0] ++ v = xtools.split('-')[1] ++ linker = AppleDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v) + # First might be apple clang, second is for real gcc, the third is icc. + # Note that "ld: unknown option: " sometimes instead is "ld: unknown options:". + elif e.endswith('(use -v to see invocation)\n') or 'macosx_version' in e or 'ld: unknown option' in e: diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.1.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.1.1.ebuild index affad54f23..e7cc675552 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.1.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2023 Gentoo Authors +# Copyright 2016-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,7 +42,7 @@ DEPEND=" test? ( dev-libs/glib:2 dev-libs/gobject-introspection - dev-util/ninja + app-alternatives/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r1.ebuild index 016c524354..5443030fc8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2023 Gentoo Authors +# Copyright 2016-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,7 +42,7 @@ DEPEND=" test? ( dev-libs/glib:2 dev-libs/gobject-introspection - dev-util/ninja + app-alternatives/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r2.ebuild index 280175c18c..8394dad757 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2023 Gentoo Authors +# Copyright 2016-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,7 +42,7 @@ DEPEND=" test? ( dev-libs/glib:2 dev-libs/gobject-introspection - dev-util/ninja + app-alternatives/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2-r1.ebuild index 191b8ea6ea..f19775d1fd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2023 Gentoo Authors +# Copyright 2016-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,7 +42,7 @@ DEPEND=" test? ( dev-libs/glib:2 dev-libs/gobject-introspection - dev-util/ninja + app-alternatives/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2.ebuild index 429bfd5ba7..2562b7ab02 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2023 Gentoo Authors +# Copyright 2016-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,7 +42,7 @@ DEPEND=" test? ( dev-libs/glib:2 dev-libs/gobject-introspection - dev-util/ninja + app-alternatives/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.3.ebuild index 71e1bdb7dc..9c472cdd34 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2023 Gentoo Authors +# Copyright 2016-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,7 +42,7 @@ DEPEND=" test? ( dev-libs/glib:2 dev-libs/gobject-introspection - dev-util/ninja + app-alternatives/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r1.ebuild index 1621828da1..63d6c0a176 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2023 Gentoo Authors +# Copyright 2016-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,7 +42,7 @@ DEPEND=" test? ( dev-libs/glib:2 dev-libs/gobject-introspection - dev-util/ninja + app-alternatives/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r2.ebuild index af208ef34b..321c8279eb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2023 Gentoo Authors +# Copyright 2016-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,7 @@ else VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg 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" + 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 @@ -42,7 +42,7 @@ DEPEND=" test? ( dev-libs/glib:2 dev-libs/gobject-introspection - dev-util/ninja + app-alternatives/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1.ebuild index 0ae70d8409..0f026f75c3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2023 Gentoo Authors +# Copyright 2016-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,7 +42,7 @@ DEPEND=" test? ( dev-libs/glib:2 dev-libs/gobject-introspection - dev-util/ninja + app-alternatives/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig @@ -54,6 +54,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.2.1-python-path.patch + "${FILESDIR}"/${PN}-1.3.1-xtools-support.patch # backport fix for hiding compiler warnings (such as Modern C) in vala and cython "${FILESDIR}"/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-9999.ebuild index 58946549b0..4e7497b5c8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2023 Gentoo Authors +# Copyright 2016-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,7 +42,7 @@ DEPEND=" test? ( dev-libs/glib:2 dev-libs/gobject-introspection - dev-util/ninja + app-alternatives/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig From 645fd1a01f30d3b5e46a4e81adaa25479e5aab15 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 15 Jan 2024 15:11:25 +0100 Subject: [PATCH 109/130] dev-build/meson-format-array: Sync with Gentoo It's from Gentoo commit db90c393875ad4f98de526b1e124fa7dd7dac04f. --- .../dev-build/meson-format-array/meson-format-array-0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/meson-format-array-0.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/meson-format-array-0.ebuild index 1800171ff9..e9b3d6f92b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/meson-format-array-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/meson-format-array-0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 From 692a779d8d0c5873b1112c2e20589692c5603dda Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 15 Jan 2024 15:11:25 +0100 Subject: [PATCH 110/130] dev-build/ninja: Sync with Gentoo It's from Gentoo commit 251e009ac0acde51363b8667e2ea1bf1a25ef823. --- .../dev-build/ninja/ninja-1.11.1-r2.ebuild | 4 +- .../dev-build/ninja/ninja-1.11.1-r3.ebuild | 4 +- .../dev-build/ninja/ninja-1.11.1-r4.ebuild | 117 ++++++++++++++++++ .../dev-build/ninja/ninja-9999.ebuild | 28 ++--- 4 files changed, 128 insertions(+), 25 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r2.ebuild index a6838532ba..0cb89335a6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2023 Gentoo Authors +# Copyright 2012-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,7 +29,7 @@ BDEPEND=" dev-util/re2c doc? ( app-text/asciidoc - app-doc/doxygen + app-text/doxygen dev-libs/libxslt media-gfx/graphviz ) diff --git a/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r3.ebuild index 0ce6217aa8..2ca427037c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2023 Gentoo Authors +# Copyright 2012-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,7 +29,7 @@ BDEPEND=" dev-util/re2c doc? ( app-text/asciidoc - app-doc/doxygen + app-text/doxygen dev-libs/libxslt media-gfx/graphviz ) diff --git a/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r4.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r4.ebuild new file mode 100644 index 0000000000..4a9cf1f321 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r4.ebuild @@ -0,0 +1,117 @@ +# Copyright 2012-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" + 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="A small build system similar to make" +HOMEPAGE="https://ninja-build.org/" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${PYTHON_DEPS} + dev-util/re2c + doc? ( + app-text/asciidoc + app-text/doxygen + dev-libs/libxslt + media-gfx/graphviz + ) + test? ( dev-cpp/gtest ) +" +PDEPEND=" + app-alternatives/ninja +" + +PATCHES=( + "${FILESDIR}"/ninja-cflags.patch +) + +run_for_build() { + if tc-is-cross-compiler; then + local -x AR=$(tc-getBUILD_AR) + local -x CXX=$(tc-getBUILD_CXX) + local -x CFLAGS= + local -x CXXFLAGS=${BUILD_CXXFLAGS} + local -x LDFLAGS=${BUILD_LDFLAGS} + fi + echo "$@" >&2 + "$@" +} + +src_compile() { + tc-export AR CXX + + # configure.py appends CFLAGS to CXXFLAGS + unset CFLAGS + + append-lfs-flags + + run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die + + if tc-is-cross-compiler; then + mv ninja ninja-build || die + ${EPYTHON} configure.py || die + ./ninja-build -v ninja || die + else + ln ninja ninja-build || die + fi + + if use doc; then + ./ninja-build -v doxygen manual || die + fi +} + +src_test() { + if ! tc-is-cross-compiler; then + # Bug 485772 + ulimit -n 2048 + edo ./ninja -v ninja_test + edo ./ninja_test + fi +} + +src_install() { + dodoc README.md CONTRIBUTING.md + + if use doc; then + docinto html + dodoc -r doc/doxygen/html/. + dodoc doc/manual.html + fi + + newbin ninja ninja-reference + + newbashcomp misc/bash-completion ${PN} + + insinto /usr/share/vim/vimfiles/syntax/ + doins misc/ninja.vim + + echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die + insinto /usr/share/vim/vimfiles/ftdetect + doins "${T}"/ninja.vim + + insinto /usr/share/zsh/site-functions + newins misc/zsh-completion _ninja +} + +pkg_postinst() { + if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then + ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-9999.ebuild index c4874b6be0..4a9cf1f321 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 2012-2023 Gentoo Authors +# Copyright 2012-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs +inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" @@ -20,8 +20,7 @@ HOMEPAGE="https://ninja-build.org/" LICENSE="Apache-2.0" SLOT="0" - -IUSE="doc emacs test" +IUSE="doc test" RESTRICT="!test? ( test )" BDEPEND=" @@ -29,14 +28,15 @@ BDEPEND=" dev-util/re2c doc? ( app-text/asciidoc - app-doc/doxygen + app-text/doxygen dev-libs/libxslt media-gfx/graphviz ) test? ( dev-cpp/gtest ) " -RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )" -PDEPEND="app-alternatives/ninja" +PDEPEND=" + app-alternatives/ninja +" PATCHES=( "${FILESDIR}"/ninja-cflags.patch @@ -75,10 +75,6 @@ src_compile() { if use doc; then ./ninja-build -v doxygen manual || die fi - - if use emacs; then - elisp-compile misc/ninja-mode.el || die - fi } src_test() { @@ -112,20 +108,10 @@ src_install() { insinto /usr/share/zsh/site-functions newins misc/zsh-completion _ninja - - if use emacs; then - cd misc || die - elisp-install ninja ninja-mode.el* || die - fi } pkg_postinst() { - use emacs && elisp-site-regen if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die fi } - -pkg_postrm() { - use emacs && elisp-site-regen -} From e1118b85f000c8821ae589ab977b55a580987207 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 15 Jan 2024 16:09:47 +0100 Subject: [PATCH 111/130] dev-debug/gdb: Sync with Gentoo It's from Gentoo commit 7b205f67aa1e81d5665d2d88132ee9ce195f852a. --- .../third_party/portage-stable/dev-debug/gdb/gdb-13.2-r2.ebuild | 2 +- .../third_party/portage-stable/dev-debug/gdb/gdb-14.1.ebuild | 2 +- .../third_party/portage-stable/dev-debug/gdb/gdb-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-13.2-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-13.2-r2.ebuild index c7ac119915..43890c7910 100644 --- a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-13.2-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-13.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-14.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-14.1.ebuild index 7fbe785c21..89469e9787 100644 --- a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-14.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-14.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-9999.ebuild index 7fbe785c21..89469e9787 100644 --- a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 From 71b6cff3de038c60c1568dc7462478513f9baba1 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 15 Jan 2024 15:33:19 +0100 Subject: [PATCH 112/130] overlay profiles: Mask installkernel flag in sys-apps/debianutils This flag was masked for some time already in Gentoo profiles, and the package that was supposed to be pulled was renamed in the meantime and we didn't notice. Now the mask was moved to a different Gentoo profile, so it stopped being masked in our case and the builds started to fail, because there is no such package like sys-kernel/installkernel in portage-stable (we have sys-kernel/installkernel-gentoo). Mask the flag for SDK. We will drop the installkernel package in following commit. --- .../profiles/coreos/targets/sdk/package.use.mask | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask index 811692a9e5..c4037c4dad 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use.mask @@ -1,2 +1,5 @@ # Allow smartcard support in the SDK for image signing app-crypt/gnupg -smartcard + +# Do not pull unnecessary installkernel stuff +sys-apps/debianutils installkernel From 2e3aa7dbacec718084e61ea63c6a96cd989169c1 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 15 Jan 2024 15:37:42 +0100 Subject: [PATCH 113/130] portage-stable sys-kernel/installkernel: Drop unnecessary package --- .../sys-kernel/installkernel-gentoo/Manifest | 2 - .../installkernel-gentoo-10.ebuild | 56 ------------------- .../installkernel-gentoo-7.ebuild | 39 ------------- .../installkernel-gentoo/metadata.xml | 18 ------ 4 files changed, 115 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-kernel/installkernel-gentoo/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-kernel/installkernel-gentoo/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/installkernel-gentoo/Manifest b/sdk_container/src/third_party/portage-stable/sys-kernel/installkernel-gentoo/Manifest deleted file mode 100644 index af6a85c2cd..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/installkernel-gentoo/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST installkernel-gentoo-10.tar.gz 4379 BLAKE2B 482309090305cf02fe38fb462b7f85a1cbe51b303b1828313210bd37f4f062380bf797bd786274eba53c36eb22e2b5204b1717ec0a50534eca0bc210957b25d0 SHA512 ca4bf98ddca82fdd17b933cbbd1c5604b70450e9c4eb2df288b1bdf31209b1cd6f1f83f6bfadee619a09e5ef01a14472321323cbe8a7b696656cbabfad82bc3a -DIST installkernel-gentoo-7.tar.gz 2962 BLAKE2B 675a1e33470ef10a38cf880591cc78ce3bf92dad20feaea740cee7cdad657b9a9b30f53ff8078b610ed09e7ec306dc3b565856c92755e3aad2a5ef387df0522b SHA512 9944b20884a0fb252dced70d33963f24af221ffa41b99f14f5f3569c155c48a0e0762fc70ca103723cac35740f94fb2120712c7ba41a442e9f971251365a194e diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild deleted file mode 100644 index 798ac29e8a..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/installkernel-gentoo/installkernel-gentoo-10.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Gentoo fork of installkernel script from debianutils" -HOMEPAGE="https://github.com/projg2/installkernel-gentoo" -SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" -IUSE="+dracut grub uki ukify" - -RDEPEND=" - >=sys-apps/debianutils-4.9-r1 - ! - - - - dist-kernel@gentoo.org - Distribution Kernel Project - - - Generate an initrd or UKI on each kernel installation - Re-generate grub.cfg on each kernel installation - Install UKIs to ESP/EFI/Linux for EFI stub booting and/or bootloaders with support for auto-discovering UKIs - Build an UKI with systemd's ukify on each kernel installation - - - projg2/installkernel-gentoo - - - From 665d13dbe3a0c678981900854f53df9386769778 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 15 Jan 2024 15:37:55 +0100 Subject: [PATCH 114/130] .github: Drop sys-kernel/installkernel 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 315c15e923..d7326e0159 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -529,7 +529,6 @@ sys-fs/quota sys-fs/squashfs-tools sys-fs/xfsprogs -sys-kernel/installkernel-gentoo sys-kernel/linux-headers sys-libs/binutils-libs From 286ace766c31aa6661d2b5269e0f8336c875cd0d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 15 Jan 2024 16:58:27 +0100 Subject: [PATCH 115/130] overlay profiles: Add accept keywords for sys-libs/binutils-libs --- .../profiles/coreos/base/package.accept_keywords | 3 +++ 1 file changed, 3 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 991b29315f..9de093bd03 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 @@ -92,6 +92,9 @@ # Keep linux headers in sync with used kernel =sys-kernel/linux-headers-6.6 ~amd64 ~arm64 +# Keep versions on both arches in sync. +=sys-libs/binutils-libs-2.41-r3 ~arm64 + # Needed to fix CVE-2023-29491. =sys-libs/ncurses-6.4_p20230527 ~amd64 ~arm64 From 332dee3cea7a246b21a4676e2dc0f0f9c26c268c Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 Jan 2024 09:05:55 +0100 Subject: [PATCH 116/130] 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 9de093bd03..6091314308 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 @@ -31,7 +31,7 @@ =app-misc/pax-utils-1.3.7 ~amd64 # Required for addressing CVE-2022-3715. -=app-shells/bash-5.2_p21-r1 ~amd64 ~arm64 +=app-shells/bash-5.2_p21-r2 ~amd64 ~arm64 # No keyword for arm64 yet. =coreos-devel/fero-client-0.1.1 ** From 645a3260acfbc80ef6f293d67e617b4e673f1d57 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 Jan 2024 09:06:10 +0100 Subject: [PATCH 117/130] overlay profiles: Drop accept keywords for dev-libs/glib --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 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 6091314308..23075a6ad7 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 @@ -48,7 +48,6 @@ # Keep versions on both arches in sync. =dev-libs/ding-libs-0.6.2-r1 ~arm64 -=dev-libs/glib-2.78.3 ~arm64 =dev-libs/gobject-introspection-1.78.1 ~arm64 =dev-libs/gobject-introspection-common-1.78.1 ~arm64 From 816521eb011ea69bc680be63e9dfe014b7a70384 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 Jan 2024 09:07:37 +0100 Subject: [PATCH 118/130] overlay profiles: Drop accept keywords for dev-libs/gobject-introspection --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 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 23075a6ad7..c4ed381065 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 @@ -48,7 +48,6 @@ # Keep versions on both arches in sync. =dev-libs/ding-libs-0.6.2-r1 ~arm64 -=dev-libs/gobject-introspection-1.78.1 ~arm64 =dev-libs/gobject-introspection-common-1.78.1 ~arm64 # Needed to fix a build issue introduced by a wrong change in an older From 1dda371831c4456e301e682bfcc560f012127aaa Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 Jan 2024 09:08:36 +0100 Subject: [PATCH 119/130] overlay profiles: Drop accept keywords for dev-libs/gobject-introspection-common --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 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 c4ed381065..92398bc754 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 @@ -48,7 +48,6 @@ # Keep versions on both arches in sync. =dev-libs/ding-libs-0.6.2-r1 ~arm64 -=dev-libs/gobject-introspection-common-1.78.1 ~arm64 # Needed to fix a build issue introduced by a wrong change in an older # version of the ebuild. From fef308fe58f38e16b25df6dff6c0888e7d269e93 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 Jan 2024 09:15:29 +0100 Subject: [PATCH 120/130] overlay profiles: Drop accept keywords for dev-libs/libunistring --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 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 92398bc754..876c970412 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 @@ -54,7 +54,6 @@ =dev-libs/libdnet-1.16.4 ~amd64 ~arm64 # Keep versions on both arches in sync. -=dev-libs/libunistring-1.1-r1 ~arm64 =dev-libs/libxml2-2.11.5-r1 ~amd64 =dev-util/bpftool-6.5.7 ~arm64 =dev-util/gdbus-codegen-2.78.3 ~arm64 From 558f60515fc54a2cfff3d3858c543749e722b071 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 Jan 2024 09:22:26 +0100 Subject: [PATCH 121/130] overlay profiles: Drop accept keywords for dev-libs/libxml2 --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 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 876c970412..0ba2f6ff89 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 @@ -54,7 +54,6 @@ =dev-libs/libdnet-1.16.4 ~amd64 ~arm64 # Keep versions on both arches in sync. -=dev-libs/libxml2-2.11.5-r1 ~amd64 =dev-util/bpftool-6.5.7 ~arm64 =dev-util/gdbus-codegen-2.78.3 ~arm64 =dev-util/glib-utils-2.78.3 ~arm64 From 07edfcdc4cf2a344ed6c8e929be3d3f8cc38013d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 Jan 2024 09:35:48 +0100 Subject: [PATCH 122/130] overlay profiles: Drop accept keywords for dev-util/gdbus-codegen --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 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 0ba2f6ff89..b1e55ed429 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 @@ -55,7 +55,6 @@ # Keep versions on both arches in sync. =dev-util/bpftool-6.5.7 ~arm64 -=dev-util/gdbus-codegen-2.78.3 ~arm64 =dev-util/glib-utils-2.78.3 ~arm64 =net-firewall/conntrack-tools-1.4.6-r1 ~arm64 From 525f190b5fac0f010986b5936063258fe0aa9f7e Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 Jan 2024 09:36:20 +0100 Subject: [PATCH 123/130] overlay profiles: Drop accept keywords for dev-util/glib-utils --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 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 b1e55ed429..788db65114 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 @@ -55,7 +55,6 @@ # Keep versions on both arches in sync. =dev-util/bpftool-6.5.7 ~arm64 -=dev-util/glib-utils-2.78.3 ~arm64 =net-firewall/conntrack-tools-1.4.6-r1 ~arm64 # Required for addressing CVE-2023-0361 and CVE-2023-5981. From bd1ca1bc18077d830ee24eb2e7e3efa415ae1182 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 Jan 2024 11:26:51 +0100 Subject: [PATCH 124/130] overlay profiles: Updated 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 788db65114..2a6f377229 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 @@ -65,7 +65,7 @@ =net-libs/libnetfilter_cttimeout-1.0.1 ~arm64 # Needed for addressing CVE-2023-46218 and CVE-2023-46219 -=net-misc/curl-8.5.0 ~amd64 ~arm64 +=net-misc/curl-8.5.0-r2 ~amd64 ~arm64 # Required to allow us to override the sftp subsystem in sshd config. =net-misc/openssh-9.4_p1 ~amd64 ~arm64 From 4dd671e9c61aca259fdb728918ea016518ad8677 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 Jan 2024 11:29:35 +0100 Subject: [PATCH 125/130] overlay profiles: Drop accept keywords for net-nds/openldap --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 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 2a6f377229..33a0608c85 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 @@ -71,7 +71,6 @@ =net-misc/openssh-9.4_p1 ~amd64 ~arm64 # Keep versions on both arches in sync. -=net-nds/openldap-2.6.4-r1 ~amd64 =sys-apps/coreutils-9.4 ~amd64 =sys-apps/kexec-tools-2.0.24 ~arm64 =sys-apps/util-linux-2.39.2-r1 ~amd64 From 1c38bf89026a8e36aeb78e1814c2411f3c0b54ca Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 Jan 2024 11:57:26 +0100 Subject: [PATCH 126/130] scripts: Sync with Gentoo It's from Gentoo commit 5d8794d14ddd53713c77b7f0400aa206a6ab14be. --- .../portage-stable/scripts/bootstrap.sh | 47 +++---------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/scripts/bootstrap.sh b/sdk_container/src/third_party/portage-stable/scripts/bootstrap.sh index 9d312edb24..61bbb0ab9a 100755 --- a/sdk_container/src/third_party/portage-stable/scripts/bootstrap.sh +++ b/sdk_container/src/third_party/portage-stable/scripts/bootstrap.sh @@ -1,10 +1,10 @@ #!/bin/bash -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Maintainer: releng@gentoo.org -file_version="2021.0" # update manually: . +file_version="2024.0" # update manually: . # people who were here: # (drobbins, 06 Jun 2003) @@ -137,7 +137,7 @@ if [[ ! -d ${MYPROFILEDIR} ]] ; then exit 1 fi -echo -e "\n${GOOD}Gentoo Linux; ${BRACKET}http://www.gentoo.org/${NORMAL}" +echo -e "\n${GOOD}Gentoo Linux; ${BRACKET}https://www.gentoo.org/${NORMAL}" echo -e "${file_copyright}; Distributed under the GPLv2" if [[ " ${STRAP_EMERGE_OPTS} " == *" -f "* ]] ; then echo "Fetching all bootstrap-related archives ..." @@ -227,24 +227,9 @@ for opt in ${ORIGUSE} ; do USE_NLS=1 ALLOWED_USE="${ALLOWED_USE} nls" ;; - nptl) - export MYARCH=$(portageq envvar ARCH) - if [[ -z $(portageq best_visible / '>=sys-kernel/linux-headers-2.6.0') ]] ; then - eerror "You need to have >=sys-kernel/linux-headers-2.6.0 unmasked!" - eerror "Please edit the latest >=sys-kernel/linux-headers-2.6.0 package," - eerror "and add your ARCH to KEYWORDS or change your make.profile link" - eerror "to a profile which does not have 2.6 headers masked." - echo - cleanup 1 - fi - USE_NPTL=1 - ;; multilib) ALLOWED_USE="${ALLOWED_USE} multilib" ;; - userlocales) - ALLOWED_USE="${ALLOWED_USE} userlocales" - ;; esac done @@ -277,21 +262,11 @@ for atom in portage.settings.packages: [[ -z ${myTEXINFO} ]] && myTEXINFO="sys-apps/texinfo" [[ -z ${myZLIB} ]] && myZLIB="sys-libs/zlib" [[ -z ${myNCURSES} ]] && myNCURSES="sys-libs/ncurses" -# Flatcar: install curl with BOOTSTRAP_USE=ssl to fetch from https URLs -[[ -z ${myCURL} ]] && myCURL="net-misc/curl" -# Flatcar: upgrade to openssl-3 before system rebuild in stage3 -[[ -z ${myOPENSSL} ]] && myOPENSSL="dev-libs/openssl" +[[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="$(portageq expand_virtual / virtual/os-headers)" # Do we really want gettext/nls? [[ ${USE_NLS} != 1 ]] && myGETTEXT= -if [[ ${USE_NPTL} = "1" ]] ; then - myOS_HEADERS="$(portageq best_visible / '>=sys-kernel/linux-headers-2.6.0')" - [[ -n ${myOS_HEADERS} ]] && myOS_HEADERS=">=${myOS_HEADERS}" - ALLOWED_USE="${ALLOWED_USE} nptl" -fi -[[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="$(portageq expand_virtual / virtual/os-headers)" - einfo "Using baselayout : ${myBASELAYOUT}" einfo "Using portage : ${myPORTAGE}" einfo "Using os-headers : ${myOS_HEADERS}" @@ -302,10 +277,6 @@ einfo "Using libc : ${myLIBC}" einfo "Using texinfo : ${myTEXINFO}" einfo "Using zlib : ${myZLIB}" einfo "Using ncurses : ${myNCURSES}" -# Flatcar: install curl with BOOTSTRAP_USE=ssl to fetch from https URLs -einfo "Using curl : ${myCURL}" -# Flatcar: upgrade to openssl-3 before system rebuild in stage3 -einfo "Using openssl : ${myOPENSSL}" echo ------------------------------------------------------------------------------- show_status 1 Configuring environment echo ------------------------------------------------------------------------------- @@ -330,9 +301,6 @@ if [ ${BOOTSTRAP_STAGE} -le 1 ] ; then fi export USE="-* bootstrap ${ALLOWED_USE} ${BOOTSTRAP_USE}" -# We can't unmerge headers which may or may not exist yet. If your -# trying to use nptl, it may be needed to flush out any old headers -# before fully bootstrapping. if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then show_status 3 Emerging packages if [[ ${RESUME} -eq 1 ]] ; then @@ -340,12 +308,9 @@ if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} --resume" cp /var/run/bootstrap-mtimedb /var/cache/edb else - # Flatcar: install curl with BOOTSTRAP_USE=ssl to fetch from https URLs STRAP_EMERGE_POSARGS="\ ${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} \ - ${myGCC} ${myLIBC} ${myCURL} ${myBASELAYOUT} ${myZLIB}" - # Flatcar: upgrade to openssl-3 before system rebuild in stage3 - STRAP_EMERGE_POSARGS="${STRAP_EMERGE_POSARGS} ${myOPENSSL}" + ${myGCC} ${myLIBC} ${myBASELAYOUT} ${myZLIB}" fi ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${STRAP_EMERGE_POSARGS} || cleanup 1 echo ------------------------------------------------------------------------------- @@ -362,7 +327,7 @@ if [[ -n ${STRAP_RUN} ]] ; then fi if [[ "${output}" = *'All selected packages:'* ]] ; then # Make sure we get the old gcc unmerged ... - ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} --prune sys-devel/gcc || cleanup 1 + ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} --prune sys-devel/gcc # Make sure the profile and /lib/cpp and /usr/bin/cc are valid ... ${GCC_CONFIG} "$(${GCC_CONFIG} --get-current-profile)" &>/dev/null fi From 059a4839cb1b874f89fe47c7d592ba1067396b2c Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Tue, 2 Mar 2021 13:52:48 +0100 Subject: [PATCH 127/130] scripts/bootstrap: Apply Flatcar modifications - install curl before baselayout Now that Github rejects access to an unauthenticated URL with `git://`, we have to make git and libcurl work with `https://`. However, during the SDK stage2, curl is not explicitly installed, but just inherited from the stage1. As a result, curl is built without the `ssl` USE flag. So installation of baselayout fails with: ``` git fetch https://github.com/flatcar-linux/baselayout.git --prune +HEAD:refs/git-r3/HEAD fatal: unable to access 'https://github.com/flatcar-linux/baselayout.git/': Protocol "https" not supported or disabled in libcurl ``` To resolve the issue, we need to install curl with `BOOTSTRAP_USE=ssl` before trying to install baselayout. - update openssl before stage3 Right now our bootstrap flow is different then gentoo's - we don't update the seed when building stage1 and use a different ebuilds snapshot for stage1 compared to stage2 and stage3. This is causing us trouble now, because we introduced openssl-3, but seed/stage1 still contains openssl-1.1. During `emerge -e @system` in stage3, some packages that depend on openssl may build against the stage1 version, which results in an error during depcleaning (they would need to be rebuilt instead). Stage3 is not extensible, so instead, explicitly update openssl in stage2. This workaround can be removed as soon as we release a seed with openssl-3. Co-authored-by: Dongsu Park Co-authored-by: Jeremi Piotrowski Co-authored-by: Krzesimir Nowak --- .../third_party/portage-stable/scripts/bootstrap.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/scripts/bootstrap.sh b/sdk_container/src/third_party/portage-stable/scripts/bootstrap.sh index 61bbb0ab9a..e07310e8e8 100755 --- a/sdk_container/src/third_party/portage-stable/scripts/bootstrap.sh +++ b/sdk_container/src/third_party/portage-stable/scripts/bootstrap.sh @@ -263,6 +263,10 @@ for atom in portage.settings.packages: [[ -z ${myZLIB} ]] && myZLIB="sys-libs/zlib" [[ -z ${myNCURSES} ]] && myNCURSES="sys-libs/ncurses" [[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="$(portageq expand_virtual / virtual/os-headers)" +# Flatcar: install curl with BOOTSTRAP_USE=ssl to fetch from https URLs +[[ -z ${myCURL} ]] && myCURL="net-misc/curl" +# Flatcar: upgrade to openssl-3 before system rebuild in stage3 +[[ -z ${myOPENSSL} ]] && myOPENSSL="dev-libs/openssl" # Do we really want gettext/nls? [[ ${USE_NLS} != 1 ]] && myGETTEXT= @@ -277,6 +281,10 @@ einfo "Using libc : ${myLIBC}" einfo "Using texinfo : ${myTEXINFO}" einfo "Using zlib : ${myZLIB}" einfo "Using ncurses : ${myNCURSES}" +# Flatcar: install curl with BOOTSTRAP_USE=ssl to fetch from https URLs +einfo "Using curl : ${myCURL}" +# Flatcar: upgrade to openssl-3 before system rebuild in stage3 +einfo "Using openssl : ${myOPENSSL}" echo ------------------------------------------------------------------------------- show_status 1 Configuring environment echo ------------------------------------------------------------------------------- @@ -308,9 +316,12 @@ if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} --resume" cp /var/run/bootstrap-mtimedb /var/cache/edb else + # Flatcar: install curl with BOOTSTRAP_USE=ssl to fetch from https URLs STRAP_EMERGE_POSARGS="\ ${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} \ - ${myGCC} ${myLIBC} ${myBASELAYOUT} ${myZLIB}" + ${myGCC} ${myLIBC} ${myCURL} ${myBASELAYOUT} ${myZLIB}" + # Flatcar: upgrade to openssl-3 before system rebuild in stage3 + STRAP_EMERGE_POSARGS="${STRAP_EMERGE_POSARGS} ${myOPENSSL}" fi ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${STRAP_EMERGE_POSARGS} || cleanup 1 echo ------------------------------------------------------------------------------- From 1e017c899d59d03ccc78a73c85387821ca776f8b Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 Jan 2024 12:02:44 +0100 Subject: [PATCH 128/130] overlay profiles: Add accept keywords for sys-devel/binutils --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 + 1 file changed, 1 insertion(+) 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 33a0608c85..d59ea72b60 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 @@ -79,6 +79,7 @@ =sys-cluster/ipvsadm-1.31-r1 ~arm64 # Keep versions on both arches in sync. +=sys-devel/binutils-2.41-r3 ~arm64 =sys-firmware/edk2-aarch64-18.02 ** # Keep linux headers in sync with used kernel From 63b41be8fe2fe77051d61a783bdb1d35caa502e3 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 Jan 2024 12:57:28 +0100 Subject: [PATCH 129/130] changelog: Add an entry --- changelog/updates/2024-01-16-weekly-updates.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/updates/2024-01-16-weekly-updates.md diff --git a/changelog/updates/2024-01-16-weekly-updates.md b/changelog/updates/2024-01-16-weekly-updates.md new file mode 100644 index 0000000000..ad1b6fd099 --- /dev/null +++ b/changelog/updates/2024-01-16-weekly-updates.md @@ -0,0 +1,5 @@ +- git ([2.43.0](https://github.com/git/git/blob/v2.43.0/Documentation/RelNotes/2.43.0.txt) (includes [2.42.0](https://github.com/git/git/blob/v2.42.0/Documentation/RelNotes/2.42.0.txt))) +- iperf ([3.16](https://github.com/esnet/iperf/releases/tag/3.16)) +- libuv ([1.47.0](https://github.com/libuv/libuv/releases/tag/v1.47.0)) +- make ([4.4.1](https://lists.gnu.org/archive/html/info-gnu/2023-02/msg00011.html) (includes [4.4](https://lists.gnu.org/archive/html/help-make/2022-10/msg00020.html))) +- portage ([3.0.61](https://gitweb.gentoo.org/proj/portage.git/tree/NEWS?h=portage-3.0.61)) From 1428452ba51249f9760f19983d97a8eff65860b3 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 Jan 2024 17:37:53 +0100 Subject: [PATCH 130/130] overlay coreos/user-patches: Add a user patch for sys-devel/crossdev --- ...dev-debug-a-default-category-for-gdb.patch | 29 +++++++++++++++++++ .../user-patches/sys-devel/crossdev/README.md | 7 +++++ 2 files changed, 36 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-devel/crossdev/0001-crossdev-Make-dev-debug-a-default-category-for-gdb.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-devel/crossdev/README.md diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-devel/crossdev/0001-crossdev-Make-dev-debug-a-default-category-for-gdb.patch b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-devel/crossdev/0001-crossdev-Make-dev-debug-a-default-category-for-gdb.patch new file mode 100644 index 0000000000..271ad99f08 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-devel/crossdev/0001-crossdev-Make-dev-debug-a-default-category-for-gdb.patch @@ -0,0 +1,29 @@ +From fc3f635e1912b5c8d84c0e9bcf643e5ef6bbc83d Mon Sep 17 00:00:00 2001 +From: Krzesimir Nowak +Date: Tue, 16 Jan 2024 17:21:11 +0100 +Subject: [PATCH] crossdev: Make dev-debug a default category for gdb + +The sys-devel/gdb package was moved to dev-debug category, so reflect +this change in the script. + +Signed-off-by: Krzesimir Nowak +--- + crossdev | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crossdev b/crossdev +index f6ad232..a937796 100755 +--- a/crossdev ++++ b/crossdev +@@ -852,7 +852,7 @@ BCAT="sys-devel" ; BPKG="binutils" ; BVER="" BUSE="" BENV="" BOVL="" BMASK + GCAT="sys-devel" ; GPKG="gcc" ; GVER="" GUSE="" GENV="" GOVL="" GMASK="" GFORCE="" + KCAT="sys-kernel" ; KPKG="linux-headers" ; KVER="" KUSE="" KENV="" KOVL="" KMASK="" KFORCE="" + LCAT="sys-libs" ; LPKG="[none]" ; LVER="" LUSE="" LENV="" LOVL="" LMASK="" LFORCE="" +-DCAT="sys-devel" ; DPKG="gdb" ; DVER="" DUSE="" DENV="" DOVL="" DMASK="" DFORCE="" ++DCAT="dev-debug" ; DPKG="gdb" ; DVER="" DUSE="" DENV="" DOVL="" DMASK="" DFORCE="" + RCAT="sys-libs" ; RPKG="compiler-rt" ; RVER="" RUSE="" RENV="" ROVL="" RMASK="" RFORCE="" + CCAT="sys-devel" ; CPKG="clang-crossdev-wrappers" ; CVER="" CUSE="" CENV="" COVL="" CMASK="" CFORCE="" + XPKGS=() XVERS=() XUSES=() XENVS=() XOVLS=() XMASKS=() XFORCES=() +-- +2.34.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-devel/crossdev/README.md b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-devel/crossdev/README.md new file mode 100644 index 0000000000..a57699ea57 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-devel/crossdev/README.md @@ -0,0 +1,7 @@ +Upstream PR: https://github.com/gentoo/crossdev/pull/17. + +We could fix it by adding "--dcat dev-debug" parameters to crossdev +invocation in build_library/toolchain_util.sh. But we add a user patch +instead, because it will fail to be applied when it stops being +necessary. That way we will know exactly when to remove the +workaround.