From 834430ca551da50418a679d617cefd2fa1f9f766 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:09:51 +0000 Subject: [PATCH 001/127] acct-user/pcscd: Sync with Gentoo It's from Gentoo commit 124ad96264f65068e5d1a4865d40562b0569266b. --- .../third_party/portage-stable/acct-user/pcscd/pcscd-0-r2.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/acct-user/pcscd/pcscd-0-r2.ebuild b/sdk_container/src/third_party/portage-stable/acct-user/pcscd/pcscd-0-r2.ebuild index e2ef2fb4579..7da6a318dcc 100644 --- a/sdk_container/src/third_party/portage-stable/acct-user/pcscd/pcscd-0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/acct-user/pcscd/pcscd-0-r2.ebuild @@ -8,6 +8,5 @@ inherit acct-user DESCRIPTION="A user for pcsc-lite" ACCT_USER_ID=47 ACCT_USER_GROUPS=( pcscd openct usb ) -ACCT_USER_GROUPS=( pcscd openct ) acct-user_add_deps From 9c02cf00069302fa17d087665a6b99fa3b124f20 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:10:10 +0000 Subject: [PATCH 002/127] app-arch/cpio: Sync with Gentoo It's from Gentoo commit 226fcb9d41b4be413a80adac41ddcf090f260bae. --- .../portage-stable/app-arch/cpio/cpio-2.15.ebuild | 6 ++++++ 1 file changed, 6 insertions(+) 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 index e9733b098ca..6f98be317e8 100644 --- 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 @@ -3,6 +3,8 @@ EAPI=8 +inherit multiprocessing + 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" @@ -39,6 +41,10 @@ src_configure() { econf "${myeconfargs[@]}" } +src_test() { + emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" +} + pkg_postinst() { # Ensure to preserve the symlink before app-alternatives/cpio # is installed From dd58c22cf5687a7254fdf2e1ccff118984c1f7d1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:10:10 +0000 Subject: [PATCH 003/127] app-arch/gzip: Sync with Gentoo It's from Gentoo commit c8a345f92153f38fa64cae069b04314a61bd26f4. --- .../third_party/portage-stable/app-arch/gzip/gzip-1.13.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 da682903df4..a864a1774f3 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 @@ -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 1d6e4d1e2ab07448ab6a78d799d09c7a023b6c86 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:10:18 +0000 Subject: [PATCH 004/127] app-arch/tar: Sync with Gentoo It's from Gentoo commit 949746114bb01aaf1b7d00e76732712383a338eb. --- .../third_party/portage-stable/app-arch/tar/tar-1.35.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.35.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.35.ebuild index 8b1f21fcec5..46d2ebf890b 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.35.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/tar/tar-1.35.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 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tar.asc -inherit verify-sig +inherit multiprocessing verify-sig DESCRIPTION="Use this to make tarballs :)" HOMEPAGE="https://www.gnu.org/software/tar/" @@ -70,7 +70,7 @@ src_test() { # Drop after 1.35: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=18f90676e4695ffcf13413e9fbb24cc0ae2ae9d5 local -x XZ_OPT= XZ_DEFAULTS= - default + emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" } src_install() { From c09ed2f20e00c0c70aeeb33245a4732d53b7e381 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:10:19 +0000 Subject: [PATCH 005/127] app-arch/xz-utils: Sync with Gentoo It's from Gentoo commit 73d757e238f49c4f16d95b1f5d5dcf3070178669. --- .../portage-stable/app-arch/xz-utils/Manifest | 4 + .../app-arch/xz-utils/xz-utils-5.4.5.ebuild | 4 +- .../app-arch/xz-utils/xz-utils-5.4.6.ebuild | 146 ++++++++++++++++++ .../xz-utils/xz-utils-5.5.1_alpha.ebuild | 146 ++++++++++++++++++ .../app-arch/xz-utils/xz-utils-9999.ebuild | 10 +- 5 files changed, 303 insertions(+), 7 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.6.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest index 976c7a3cbe2..6b0b9ee0bbc 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest @@ -1,2 +1,6 @@ DIST xz-5.4.5.tar.gz 2884510 BLAKE2B 647c8227080a7f37e3321e778d7f52ccb9da3810f2be81b2d2b46001605b22cef6e724f9b3facfada26a12b24401c9a11449d6066443849b37b28e0eaa199315 SHA512 91f8f548c915de0ed79cee13ce0336b51c1cebf2eb142fa1efecfd07771c662c99cad3730540fcb712057ab274130e13b87960f6b4c62f0bd9477f27a303fb2b DIST xz-5.4.5.tar.gz.sig 566 BLAKE2B c6ec64f92ecb30395e6d580be5d0aad1ee007585245ed42e7b05f1ea3a8cd8bf4317e8dc964c65417daa0a04e8f523c6ba8ae61a7f5b2ff3dc17dd53c7593ce2 SHA512 4f2c779d3c14bacd0451cfd68846201a48931128994c4119fcbf4f0dd7331710c32098039d38561de29327d543d67174fddbb6a83cb2fcfda9b3153cab092d4d +DIST xz-5.4.6.tar.gz 2889306 BLAKE2B f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f23462f5f76459935f4e621538ddaa8452d2feaed278d62a596e38ed2aca18ed9e76512c4ec77fa2f4cc5f SHA512 b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497 +DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 808f1b5e2a17729f36a05ba88a9c00210cda2afa02923e6f289d13dc2a48f7674cafec6e25660e142d67f01dd941c7390cee2757b054df3a3193dde0791363a1 SHA512 d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741 +DIST xz-5.5.1alpha.tar.gz 3020057 BLAKE2B 1a2106b9e43cb06ddde0f8a9fc86754fe2d335367035ec3349d34da5511496af0d1270cd42ce2c1c3324af74092c0eea3663746ec98195d0db449d5754253c0f SHA512 dbd164353012c9ff5ee3e776709704fcbc6e9f644fff52c75846653ca4a26b6dce1a2a5fe1663c3fc8674f99aa67a1a806eeac44cb978246223688c8c105fcf1 +DIST xz-5.5.1alpha.tar.gz.sig 566 BLAKE2B 760946fd09eccd0a221d117cc1f5b656aba5bbbfa911d987fd93c54d9905a1e51dd8c24b6927cc97dda344f2efa774b556e6919bdf0b298fa6370ac8d3a56f76 SHA512 714f07b510a4a8ff0d533e6278cd25f8ed407b3c84b6172ce9d4e9fc2dfe8b0be9849eb008ee3b7ac900f34f85946336277a2700dc5133c6dcae144b8aba6dd7 diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.5.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.5.ebuild index b14b9dda369..4b9909c4c5c 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.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 # Remember: we cannot leverage autotools in this ebuild in order @@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 autotools # bug #272880 and bug #286068 - BDEPEND="sys-devel/gettext >=sys-devel/libtool-2" + BDEPEND="sys-devel/gettext >=dev-build/libtool-2" else VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc inherit verify-sig diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.6.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.6.ebuild new file mode 100644 index 00000000000..10993a19d07 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.4.6.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Remember: we cannot leverage autotools in this ebuild in order +# to avoid circular deps with autotools + +EAPI=8 + +inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript + +if [[ ${PV} == 9999 ]] ; then + # Per tukaani.org, git.tukaani.org is a mirror of github and + # may be behind. + EGIT_REPO_URI=" + https://github.com/tukaani-project/xz + https://git.tukaani.org/xz.git + " + inherit git-r3 autotools + + # bug #272880 and bug #286068 + BDEPEND="sys-devel/gettext >=dev-build/libtool-2" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc + inherit verify-sig + + MY_P="${PN/-utils}-${PV/_}" + SRC_URI=" + https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz + mirror://sourceforge/lzmautils/${MY_P}.tar.gz + https://tukaani.org/xz/${MY_P}.tar.gz + verify-sig? ( + https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig + https://tukaani.org/xz/${MY_P}.tar.gz.sig + ) + " + + if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; 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 + + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Utils for managing LZMA compressed files" +HOMEPAGE="https://tukaani.org/xz/" + +# See top-level COPYING file as it outlines the various pieces and their licenses. +LICENSE="public-domain LGPL-2.1+ GPL-2+" +SLOT="0" +IUSE="doc +extra-filters pgo nls static-libs" + +if [[ ${PV} != 9999 ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )" +fi + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautopoint + eautoreconf + else + # Allow building shared libs on Solaris/x64 + elibtoolize + fi +} + +multilib_src_configure() { + local myconf=( + --enable-threads + $(multilib_native_use_enable doc) + $(use_enable nls) + $(use_enable static-libs static) + ) + + if ! multilib_is_native_abi ; then + myconf+=( + --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} + ) + fi + + if ! use extra-filters ; then + myconf+=( + # LZMA1 + LZMA2 for standard .lzma & .xz files + --enable-encoders=lzma1,lzma2 + --enable-decoders=lzma1,lzma2 + + # those are used by default, depending on preset + --enable-match-finders=hc3,hc4,bt4 + + # CRC64 is used by default, though some (old?) files use CRC32 + --enable-checks=crc32,crc64 + ) + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + export gl_cv_posix_shell="${EPREFIX}"/bin/sh + + # Undo Solaris-based defaults pointing to /usr/xpg5/bin + myconf+=( --disable-path-for-script ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_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}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)") + local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo -fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)") + + emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" + + if use pgo ; then + emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check + + if tc-is-clang; then + llvm-profdata merge "${T}"/${ABI}-pgo --output="${T}"/${ABI}-pgo/default.profdata || die + fi + + emake clean + emake CFLAGS="${CFLAGS} ${pgo_use_flags}" + fi +} + +multilib_src_install() { + default + + gen_usr_ldscript -a lzma +} + +multilib_src_install_all() { + find "${ED}" -type f -name '*.la' -delete || die + + if use doc ; then + rm "${ED}"/usr/share/doc/${PF}/COPYING* || die + fi +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0) +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0) +} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild new file mode 100644 index 00000000000..1ce7c6d3d90 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Remember: we cannot leverage autotools in this ebuild in order +# to avoid circular deps with autotools + +EAPI=8 + +inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript + +if [[ ${PV} == 9999 ]] ; then + # Per tukaani.org, git.tukaani.org is a mirror of github and + # may be behind. + EGIT_REPO_URI=" + https://github.com/tukaani-project/xz + https://git.tukaani.org/xz.git + " + inherit git-r3 autotools + + # bug #272880 and bug #286068 + BDEPEND="sys-devel/gettext >=dev-build/libtool-2" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc + inherit verify-sig + + MY_P="${PN/-utils}-${PV/_}" + SRC_URI=" + https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz + mirror://sourceforge/lzmautils/${MY_P}.tar.gz + https://tukaani.org/xz/${MY_P}.tar.gz + verify-sig? ( + https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig + https://tukaani.org/xz/${MY_P}.tar.gz.sig + ) + " + + if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; 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 + + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Utils for managing LZMA compressed files" +HOMEPAGE="https://tukaani.org/xz/" + +# See top-level COPYING file as it outlines the various pieces and their licenses. +LICENSE="public-domain LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )" +SLOT="0" +IUSE="doc +extra-filters pgo nls static-libs" + +if [[ ${PV} != 9999 ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )" +fi + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautopoint + eautoreconf + else + # Allow building shared libs on Solaris/x64 + elibtoolize + fi +} + +multilib_src_configure() { + local myconf=( + --enable-threads + $(multilib_native_use_enable doc) + $(use_enable nls) + $(use_enable static-libs static) + ) + + if ! multilib_is_native_abi ; then + myconf+=( + --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} + ) + fi + + if ! use extra-filters ; then + myconf+=( + # LZMA1 + LZMA2 for standard .lzma & .xz files + --enable-encoders=lzma1,lzma2 + --enable-decoders=lzma1,lzma2 + + # those are used by default, depending on preset + --enable-match-finders=hc3,hc4,bt4 + + # CRC64 is used by default, though some (old?) files use CRC32 + --enable-checks=crc32,crc64 + ) + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + export gl_cv_posix_shell="${EPREFIX}"/bin/sh + + # Undo Solaris-based defaults pointing to /usr/xpg5/bin + myconf+=( --disable-path-for-script ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_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}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)") + local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo -fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)") + + emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" + + if use pgo ; then + emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check + + if tc-is-clang; then + llvm-profdata merge "${T}"/${ABI}-pgo --output="${T}"/${ABI}-pgo/default.profdata || die + fi + + emake clean + emake CFLAGS="${CFLAGS} ${pgo_use_flags}" + fi +} + +multilib_src_install() { + default + + gen_usr_ldscript -a lzma +} + +multilib_src_install_all() { + find "${ED}" -type f -name '*.la' -delete || die + + if use doc ; then + rm "${ED}"/usr/share/doc/${PF}/COPYING* || die + fi +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0) +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0) +} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild index 817c272e119..1ce7c6d3d90 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-9999.ebuild @@ -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 # Remember: we cannot leverage autotools in this ebuild in order @@ -18,18 +18,18 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 autotools # bug #272880 and bug #286068 - BDEPEND="sys-devel/gettext >=sys-devel/libtool-2" + BDEPEND="sys-devel/gettext >=dev-build/libtool-2" else VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jiatan.asc inherit verify-sig MY_P="${PN/-utils}-${PV/_}" SRC_URI=" - https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz + https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz mirror://sourceforge/lzmautils/${MY_P}.tar.gz https://tukaani.org/xz/${MY_P}.tar.gz verify-sig? ( - https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz.sig + https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig https://tukaani.org/xz/${MY_P}.tar.gz.sig ) " @@ -45,7 +45,7 @@ DESCRIPTION="Utils for managing LZMA compressed files" HOMEPAGE="https://tukaani.org/xz/" # See top-level COPYING file as it outlines the various pieces and their licenses. -LICENSE="public-domain LGPL-2.1+ GPL-2+" +LICENSE="public-domain LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )" SLOT="0" IUSE="doc +extra-filters pgo nls static-libs" From f847954d422fc4b6699768ad8e6002a1661b0935 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:10:21 +0000 Subject: [PATCH 006/127] app-cdr/cdrtools: Sync with Gentoo It's from Gentoo commit ba88ded11a9608e108012cedee8d3e0190cff9ba. --- .../cdrtools/cdrtools-3.02_alpha09-r4.ebuild | 303 ------------------ 1 file changed, 303 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild b/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild deleted file mode 100644 index a5ba82f4c1d..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit fcaps toolchain-funcs flag-o-matic gnuconfig - -MY_P="${P/_alpha/a}" - -DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="https://sourceforge.net/projects/cdrtools/" -SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="acl caps nls unicode selinux" - -BDEPEND=" - nls? ( >=sys-devel/gettext-0.18.1.1 ) - x11-misc/makedepend -" -RDEPEND=" - acl? ( virtual/acl ) - caps? ( sys-libs/libcap ) - nls? ( virtual/libintl ) - selinux? ( sec-policy/selinux-cdrecord ) -" -DEPEND=" - ${RDEPEND} -" - -S=${WORKDIR}/${P/_alpha[0-9][0-9]} - -FILECAPS=( - cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord -- - cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav -- - cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd -) - -cdrtools_os() { - local os="linux" - [[ ${CHOST} == *-darwin* ]] && os="mac-os10" - echo "${os}" -} - -symlink_build_rules() { - local cputype="$1" - pushd "${S}"/RULES > /dev/null || die - ln -sf i586-linux-cc.rul "${cputype}"-linux-cc.rul || die - ln -sf i586-linux-clang.rul "${cputype}"-linux-clang.rul || die - ln -sf i586-linux-clang32.rul "${cputype}"-linux-clang32.rul || die - ln -sf i586-linux-clang64.rul "${cputype}"-linux-clang64.rul || die - ln -sf i586-linux-gcc.rul "${cputype}"-linux-gcc.rul || die - ln -sf i586-linux-gcc32.rul "${cputype}"-linux-gcc32.rul || die - ln -sf i586-linux-gcc64.rul "${cputype}"-linux-gcc64.rul || die - popd > /dev/null || die -} - -src_prepare() { - default - - gnuconfig_update - - # Remove profiled make files. - find -name '*_p.mk' -delete || die "delete *_p.mk" - - # Adjusting hardcoded paths. - sed -i -e "s|opt/schily|usr|" \ - $(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \ - || die "sed opt/schily" - - sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \ - $(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \ - || die "sed doc" - - # Respect libdir. - sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \ - $(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \ - || die "sed multilib" - - # Do not install static libraries. - sed -i -e "s|include\t\t.*rules.lib||" \ - $(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \ - || die "sed rules" - - # Don't quote $(MAKE) - sed -i -e 's|"$(MAKE)"|$(MAKE)|' \ - $(find ./RULES -type f -exec grep -l '"$(MAKE)"' '{}' '+') \ - || die "sed RULES/" - - # Enable verbose build. - sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \ - RULES/*.rul RULES/rules.prg RULES/rules.inc \ - || die "sed verbose rules" - - # Respect CC/CXX variables. - cd "${S}"/RULES || die - local tcCC="$(tc-getCC)" - local tcCXX="$(tc-getCXX)" - - sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \ - rules1.top || die "sed rules1.top" - sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \ - -e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \ - -e "/COPTOPT=/s|-O||" \ - -e 's|$(GCCOPTOPT)||' \ - cc-gcc.rul || die "sed cc-gcc.rul" - sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \ - rules.cnf || die "sed rules.cnf" - - # Add support for arm64 - symlink_build_rules aarch64_be - - # fix RISC-V build err, bug 811375 - symlink_build_rules riscv - symlink_build_rules riscv64 - - # Add support for loong - symlink_build_rules loongarch64 - - # Schily make setup. - cd "${S}"/DEFAULTS || die - local os=$(cdrtools_os) - - sed -i \ - -e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \ - -e "s|^\(LINUX_INCL_PATH=\).*|\1|" \ - -e "s|^\(LDPATH=\).*|\1|" \ - -e "s|^\(RUNPATH=\).*|\1|" \ - -e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \ - -e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \ - -e "s|^\(DEFINSGRP=\).*|\1\t0|" \ - -e '/^DEFUMASK/s,002,022,g' \ - Defaults.${os} || die "sed Schily make setup" - # re DEFUMASK above: - # bug 486680: grsec TPE will block the exec if the directory is - # group-writable. This is painful with cdrtools, because it makes a bunch of - # group-writable directories during build. Change the umask on their - # creation to prevent this. -} - -ac_cv_sizeof() { - cat <<-EOF >"${T}"/test.c - #include - #include - #include - #include - int main () { - static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)]; - test_array [0] = 0; - return test_array [0]; - } - EOF - - local i=1 - while [[ ${i} -lt 20 ]] ; do - if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then - echo ${i} - return 0 - fi - : $(( i += 1 )) - done - return 1 -} - -src_configure() { - use acl || export ac_cv_header_sys_acl_h="no" - use caps || export ac_cv_lib_cap_cap_get_proc="no" - export ac_cv_header_pulse_pulseaudio_h="no" - export ac_cv_header_alsa_asoundlib_h="no" - export ac_cv_lib_asound_snd_pcm_open="no" - - # skip obsolete configure script - if tc-is-cross-compiler ; then - # Cache known values for targets. #486680 - - tc-export CC - local var val t types=( - char "short int" int "long int" "long long" - "unsigned char" "unsigned short int" "unsigned int" - "unsigned long int" "unsigned long long" - float double "long double" size_t ssize_t ptrdiff_t - mode_t uid_t gid_t pid_t dev_t time_t wchar_t - "char *" "unsigned char *" - ) - for t in "${types[@]}" ; do - var="ac_cv_sizeof_${t// /_}" - var=${var//[*]/p} - val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}" - export "${var}=${val}" - einfo "Computing sizeof(${t}) as ${val}" - done - # We don't have these types. - export ac_cv_sizeof___int64=0 - export ac_cv_sizeof_unsigned___int64=0 - export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t} - export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t} - export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t} - - export ac_cv_type_prototypes="yes" - export ac_cv_func_mlock{,all}="yes" - export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc) - export ac_cv_func_dtoa_r="no" - export ac_cv_func_sys_siglist{,_def}="no" - export ac_cv_func_printf_{j,ll}="yes" - export ac_cv_realloc_null="yes" - export ac_cv_no_user_malloc="no" - export ac_cv_var_timezone="yes" - export ac_cv_var___progname{,_full}="yes" - export ac_cv_fnmatch_igncase="yes" - export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes" - export ac_cv_file__usr_src_linux_include="no" - - case $(cdrtools_os) in - linux) - export ac_cv_func_bsd_{g,s}etpgrp="no" - export ac_cv_hard_symlinks="yes" - export ac_cv_link_nofollow="yes" - export ac_cv_access_e_ok="no" - - export ac_cv_dev_minor_noncontig="yes" - case ${ac_cv_sizeof_long_int} in - 4) export ac_cv_dev_minor_bits="32";; - 8) export ac_cv_dev_minor_bits="44";; - esac - - cat <<-EOF >"${T}"/test.c - struct { - char start[6]; - unsigned char x1:4; - unsigned char x2:4; - char end[5]; - } a = { - .start = {'S', 't', 'A', 'r', 'T', '_'}, - .x1 = 5, - .x2 = 4, - .end = {'_', 'e', 'N', 'd', 'X'}, - }; - EOF - ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o - if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then - export ac_cv_c_bitfields_htol="no" - elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then - export ac_cv_c_bitfields_htol="yes" - fi - ;; - esac - fi -} - -src_compile() { - if use unicode; then - local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)" - if [[ -n ${flags} ]]; then - append-flags ${flags} - else - ewarn "Your compiler does not support the options required to build" - ewarn "cdrtools with unicode in USE. unicode flag will be ignored." - fi - fi - - # If not built with -j1, "sometimes" cdda2wav will not be built. - emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \ - LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" -} - -src_install() { - # If not built with -j1, "sometimes" manpages are not installed. - emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \ - LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install - - # These symlinks are for compat with cdrkit. - dosym schily /usr/include/scsilib - dosym ../scg /usr/include/schily/scg - - dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux - - cd "${S}"/cdda2wav || die - docinto cdda2wav - dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO - - cd "${S}"/mkisofs || die - docinto mkisofs - dodoc ChangeLog* TODO - - # Remove man pages related to the build system - rm -rvf "${ED}"/usr/share/man/man5 || die -} - -pkg_postinst() { - fcaps_pkg_postinst - - if [[ ${CHOST} == *-darwin* ]] ; then - einfo - einfo "Darwin/OS X use the following device names:" - einfo - einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices" - einfo - einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices" - einfo - fi -} From d28d7a83614a97cfe0dbf02b5df538f1a73e3a5b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:10:29 +0000 Subject: [PATCH 007/127] app-crypt/ccid: Sync with Gentoo It's from Gentoo commit d0f3c17b8eba3e2af33853922104c18ead580bea. --- .../portage-stable/app-crypt/ccid/Manifest | 1 + .../app-crypt/ccid/ccid-1.5.4.ebuild | 55 +++++++++++++++++++ ...5.4-remove-flex-configure-dependency.patch | 16 ++++++ .../app-crypt/ccid/metadata.xml | 9 ++- 4 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/ccid/ccid-1.5.4.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/ccid/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/ccid/Manifest index 2d167910e1f..e801a4a101a 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/ccid/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-crypt/ccid/Manifest @@ -1 +1,2 @@ DIST ccid-1.5.1.tar.bz2 702586 BLAKE2B 7b9e3c6daf03c186f34ac9b13bd960293a6481f9237ee52937ece1040bd3a79b7dab318e1244205a7feae992261ab5e82292d80ae023a4f621e0e7af7cdb9df5 SHA512 492bde96f5752e2a5316693c44e35e2d041785a00d15e094905c0aafad392f5329009d12801899367276328a582936ee53a1c5239c1813c4536001cb8a608f2e +DIST ccid-1.5.4.tar.bz2 706834 BLAKE2B 8b7f08145808ac94d085eef62c204f8146892cb11f2ce811e46e674272cab016d602afb945c6e808ce3957a80e847c0de2815fedaf15fc8c935cafaccf102762 SHA512 4b30f4768aebf49486a1b1e959615fa077bd393bfdd9e52c15bdc8d6ed63ce27fa7cf82a067d1f80d8b3534c66194036925d3fea5af64b6a775779d38267c757 diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/ccid/ccid-1.5.4.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/ccid/ccid-1.5.4.ebuild new file mode 100644 index 00000000000..f7a11ceca11 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/ccid/ccid-1.5.4.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools udev + +DESCRIPTION="CCID free software driver" +HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID" +SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="twinserial +usb" + +RDEPEND=" + >=sys-apps/pcsc-lite-1.8.3 + twinserial? ( dev-lang/perl ) + usb? ( virtual/libusb:1 ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-remove-flex-configure-dependency.patch +) + +src_prepare() { + default + + eautoconf +} + +src_configure() { + econf \ + LEX=: \ + $(use_enable twinserial) \ + $(use_enable usb libusb) +} + +src_install() { + default + udev_newrules src/92_pcscd_ccid.rules 92-pcsc-ccid.rules +} + +pkg_postinst() { + udev_reload + einfo "Check https://github.com/LudovicRousseau/CCID/blob/master/INSTALL" + einfo "for more info about how to configure and use ccid" +} + +pkg_postrm() { + udev_reload +} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch b/sdk_container/src/third_party/portage-stable/app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch new file mode 100644 index 00000000000..564532c9ab4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch @@ -0,0 +1,16 @@ +Bug: https://bugs.gentoo.org/221361 +Reverts upstream commit eec7cdf0 + +--- a/configure.ac ++++ b/configure.ac +@@ -32,11 +32,6 @@ AC_PROG_CPP + AC_PROG_INSTALL + AC_PROG_MAKE_SET + AC_PROG_LN_S +-AC_PROG_LEX([noyywrap]) +-if test $LEX = ":" +-then +- AC_MSG_ERROR([no lex or flex found]) +-fi + AM_PROG_AR + PKG_PROG_PKG_CONFIG diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/ccid/metadata.xml b/sdk_container/src/third_party/portage-stable/app-crypt/ccid/metadata.xml index cb05a176c9b..5e0f0fdc1d2 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/ccid/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-crypt/ccid/metadata.xml @@ -1,7 +1,14 @@ - + + turret@turret.cyou + Mason Rocha + + + proxy-maint@gentoo.org + Proxy Maintainers + Enable twinserial reader From ec004a70e0d6258be84fd62fe6a2f9929067818f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:10:35 +0000 Subject: [PATCH 008/127] app-editors/vim: Sync with Gentoo It's from Gentoo commit 83d72770bcd85405144b4a6ad2b427abc11fe62c. --- .../app-editors/vim/vim-9.0.1403.ebuild | 6 +++--- .../app-editors/vim/vim-9.0.1503.ebuild | 6 +++--- .../app-editors/vim/vim-9.0.1627.ebuild | 6 +++--- .../app-editors/vim/vim-9.0.1678.ebuild | 6 +++--- .../app-editors/vim/vim-9.0.1777.ebuild | 6 +++--- .../app-editors/vim/vim-9.0.2092.ebuild | 6 +++--- .../app-editors/vim/vim-9.0.2167.ebuild | 11 ++++++++--- .../portage-stable/app-editors/vim/vim-9999.ebuild | 11 ++++++++--- 8 files changed, 34 insertions(+), 24 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1403.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1403.ebuild index 0d0487eb736..b742f953fcf 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1403.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1403.ebuild @@ -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,7 @@ VIM_VERSION="9.0" VIM_PATCHES_VERSION="9.0.1000" LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby27 ruby30 ruby31" @@ -62,7 +62,7 @@ RDEPEND=" DEPEND="${RDEPEND}" # configure runs the Lua interpreter BDEPEND=" - sys-devel/autoconf + dev-build/autoconf lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1503.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1503.ebuild index 191a1abcf95..b589d64dbde 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1503.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1503.ebuild @@ -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,7 @@ VIM_VERSION="9.0" VIM_PATCHES_VERSION="9.0.1000" LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby27 ruby30 ruby31" @@ -62,7 +62,7 @@ RDEPEND=" DEPEND="${RDEPEND}" # configure runs the Lua interpreter BDEPEND=" - sys-devel/autoconf + dev-build/autoconf lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1627.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1627.ebuild index 6daab958469..be5a1d92a8f 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1627.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1627.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,7 @@ VIM_VERSION="9.0" VIM_PATCHES_VERSION="9.0.1000" LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby27 ruby30 ruby31" @@ -61,7 +61,7 @@ RDEPEND=" DEPEND="${RDEPEND}" # configure runs the Lua interpreter BDEPEND=" - sys-devel/autoconf + dev-build/autoconf lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1678.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1678.ebuild index fb932d372b6..f2309016147 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1678.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1678.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,7 @@ VIM_VERSION="9.0" VIM_PATCHES_VERSION="9.0.1000" LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby27 ruby30 ruby31" @@ -61,7 +61,7 @@ RDEPEND=" DEPEND="${RDEPEND}" # configure runs the Lua interpreter BDEPEND=" - sys-devel/autoconf + dev-build/autoconf lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1777.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1777.ebuild index d142c1c4c3a..c50f5558981 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1777.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1777.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,7 @@ VIM_VERSION="9.0" VIM_PATCHES_VERSION="9.0.1000" LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby27 ruby30 ruby31" @@ -61,7 +61,7 @@ RDEPEND=" DEPEND="${RDEPEND}" # configure runs the Lua interpreter BDEPEND=" - sys-devel/autoconf + dev-build/autoconf lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2092.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2092.ebuild index 0cffc596a89..1b113674149 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2092.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2092.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,7 @@ VIM_VERSION="9.0" VIM_PATCHES_VERSION="9.0.2092" LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby27 ruby30 ruby31" @@ -61,7 +61,7 @@ RDEPEND=" DEPEND="${RDEPEND}" # configure runs the Lua interpreter BDEPEND=" - sys-devel/autoconf + dev-build/autoconf lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2167.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2167.ebuild index 854c1a5ce76..89f0524b4be 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2167.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2167.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 @@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.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 DESCRIPTION="Vim, an improved vi-style text editor" @@ -61,7 +61,7 @@ RDEPEND=" DEPEND="${RDEPEND}" # configure runs the Lua interpreter BDEPEND=" - sys-devel/autoconf + dev-build/autoconf lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " @@ -153,6 +153,11 @@ src_prepare() { # (4) Run ./configure (with wrong args) to remake auto/config.mk sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" rm src/auto/configure || die "rm failed" + + # bug 908961 + if use elibc_musl ; then + sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die + fi } src_configure() { diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild index b323e4e54d5..d3ce80bac47 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild @@ -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,7 @@ VIM_VERSION="9.0" VIM_PATCHES_VERSION="9.0.1000" LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby27 ruby30 ruby31" @@ -61,7 +61,7 @@ RDEPEND=" DEPEND="${RDEPEND}" # configure runs the Lua interpreter BDEPEND=" - sys-devel/autoconf + dev-build/autoconf lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " @@ -153,6 +153,11 @@ src_prepare() { # (4) Run ./configure (with wrong args) to remake auto/config.mk sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" rm src/auto/configure || die "rm failed" + + # bug 908961 + if use elibc_musl ; then + sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die + fi } src_configure() { From f18b5c09c6b8be7ce84c29b85983cf3ba5d2ed44 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:10:35 +0000 Subject: [PATCH 009/127] app-editors/vim-core: Sync with Gentoo It's from Gentoo commit 83d72770bcd85405144b4a6ad2b427abc11fe62c. --- .../app-editors/vim-core/vim-core-9.0.1403.ebuild | 4 ++-- .../app-editors/vim-core/vim-core-9.0.1503.ebuild | 4 ++-- .../app-editors/vim-core/vim-core-9.0.1627.ebuild | 4 ++-- .../app-editors/vim-core/vim-core-9.0.1678.ebuild | 4 ++-- .../app-editors/vim-core/vim-core-9.0.1777.ebuild | 4 ++-- .../app-editors/vim-core/vim-core-9.0.2092.ebuild | 4 ++-- .../app-editors/vim-core/vim-core-9.0.2167.ebuild | 11 ++++++++--- .../app-editors/vim-core/vim-core-9999.ebuild | 9 +++++++-- 8 files changed, 27 insertions(+), 17 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1403.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1403.ebuild index 0b299f9cf92..346c974e588 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1403.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1403.ebuild @@ -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 @@ -29,7 +29,7 @@ IUSE="nls acl minimal" # ncurses is only needed by ./configure, so no subslot operator required DEPEND=">=sys-libs/ncurses-5.2-r2:0" -BDEPEND="sys-devel/autoconf" +BDEPEND="dev-build/autoconf" if [[ ${PV} != 9999* ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1503.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1503.ebuild index db2ce95e2a6..a54e0738bee 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1503.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1503.ebuild @@ -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 @@ -29,7 +29,7 @@ IUSE="nls acl minimal" # ncurses is only needed by ./configure, so no subslot operator required DEPEND=">=sys-libs/ncurses-5.2-r2:0" -BDEPEND="sys-devel/autoconf" +BDEPEND="dev-build/autoconf" if [[ ${PV} != 9999* ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1627.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1627.ebuild index 9829a00697c..6cb4710f79e 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1627.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1627.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 @@ -29,7 +29,7 @@ IUSE="nls acl minimal" # ncurses is only needed by ./configure, so no subslot operator required DEPEND=">=sys-libs/ncurses-5.2-r2:0" -BDEPEND="sys-devel/autoconf" +BDEPEND="dev-build/autoconf" if [[ ${PV} != 9999* ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1678.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1678.ebuild index 5fb29ea38fd..66de9fc233f 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1678.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1678.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 @@ -29,7 +29,7 @@ IUSE="nls acl minimal" # ncurses is only needed by ./configure, so no subslot operator required DEPEND=">=sys-libs/ncurses-5.2-r2:0" -BDEPEND="sys-devel/autoconf" +BDEPEND="dev-build/autoconf" if [[ ${PV} != 9999* ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1777.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1777.ebuild index 35098d2a99e..b29cfe23233 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1777.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.1777.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 @@ -29,7 +29,7 @@ IUSE="nls acl minimal" # ncurses is only needed by ./configure, so no subslot operator required DEPEND=">=sys-libs/ncurses-5.2-r2:0" -BDEPEND="sys-devel/autoconf" +BDEPEND="dev-build/autoconf" if [[ ${PV} != 9999* ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.2092.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.2092.ebuild index 58f3ce350b7..2c34d0a6f52 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.2092.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.2092.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 @@ -29,7 +29,7 @@ IUSE="nls acl minimal" # ncurses is only needed by ./configure, so no subslot operator required DEPEND=">=sys-libs/ncurses-5.2-r2:0" -BDEPEND="sys-devel/autoconf" +BDEPEND="dev-build/autoconf" if [[ ${PV} != 9999* ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.2167.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.2167.ebuild index 7650dbd8918..cca287f37b6 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.2167.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.2167.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 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.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 S="${WORKDIR}/vim-${PV}" @@ -29,7 +29,7 @@ IUSE="nls acl minimal" # ncurses is only needed by ./configure, so no subslot operator required DEPEND=">=sys-libs/ncurses-5.2-r2:0" -BDEPEND="sys-devel/autoconf" +BDEPEND="dev-build/autoconf" if [[ ${PV} != 9999* ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc @@ -108,6 +108,11 @@ src_prepare() { # Remove src/auto/configure file. rm -v src/auto/configure || die "rm configure failed" + + # bug 908961 + if use elibc_musl ; then + sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die + fi } src_configure() { diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild index 3e024c92659..acfd3ab4aab 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild @@ -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 @@ -29,7 +29,7 @@ IUSE="nls acl minimal" # ncurses is only needed by ./configure, so no subslot operator required DEPEND=">=sys-libs/ncurses-5.2-r2:0" -BDEPEND="sys-devel/autoconf" +BDEPEND="dev-build/autoconf" if [[ ${PV} != 9999* ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc @@ -108,6 +108,11 @@ src_prepare() { # Remove src/auto/configure file. rm -v src/auto/configure || die "rm configure failed" + + # bug 908961 + if use elibc_musl ; then + sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die + fi } src_configure() { From e96770bcc8f9ad4535c698de2b0c367412ebf59f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:10:36 +0000 Subject: [PATCH 010/127] app-emulation/qemu: Sync with Gentoo It's from Gentoo commit a51d470ab9fcd6932526b4534a91c46635042920. --- .../portage-stable/app-emulation/qemu/qemu-7.2.4.ebuild | 2 +- .../portage-stable/app-emulation/qemu/qemu-7.2.6.ebuild | 2 +- .../portage-stable/app-emulation/qemu/qemu-7.2.7.ebuild | 2 +- .../portage-stable/app-emulation/qemu/qemu-7.2.8.ebuild | 2 +- .../portage-stable/app-emulation/qemu/qemu-8.0.4.ebuild | 2 +- .../portage-stable/app-emulation/qemu/qemu-8.0.5.ebuild | 2 +- .../portage-stable/app-emulation/qemu/qemu-8.1.2.ebuild | 2 +- .../portage-stable/app-emulation/qemu/qemu-8.1.3.ebuild | 2 +- .../portage-stable/app-emulation/qemu/qemu-8.1.4.ebuild | 2 +- .../portage-stable/app-emulation/qemu/qemu-8.2.0.ebuild | 2 +- .../portage-stable/app-emulation/qemu/qemu-9999.ebuild | 2 +- 11 files changed, 11 insertions(+), 11 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 c8c13d8938d..ecb35f27987 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 @@ -154,7 +154,7 @@ ALL_DEPEND=" dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] )" # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) 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 09c62e4b713..a9f6df604bd 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 @@ -154,7 +154,7 @@ ALL_DEPEND=" dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] )" # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) 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 7b45ca3fd82..ac517632fb2 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 @@ -154,7 +154,7 @@ ALL_DEPEND=" dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] )" # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) 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 7b45ca3fd82..ac517632fb2 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 @@ -154,7 +154,7 @@ ALL_DEPEND=" dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] )" # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) 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 c061e812821..592f8ef9cdb 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 @@ -153,7 +153,7 @@ ALL_DEPEND=" dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) " 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 bd9bb2ea231..6c943ce3a21 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 @@ -153,7 +153,7 @@ ALL_DEPEND=" dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) " 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 19515604bcb..1db98820278 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 @@ -154,7 +154,7 @@ ALL_DEPEND=" dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) " 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 19515604bcb..1db98820278 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 @@ -154,7 +154,7 @@ ALL_DEPEND=" dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) " 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 19515604bcb..1db98820278 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 @@ -154,7 +154,7 @@ ALL_DEPEND=" dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) " 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 5b9071fc36e..9523cdbfcf5 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 @@ -159,7 +159,7 @@ ALL_DEPEND=" dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) " 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 5cd95eee6b3..8f55155deb3 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 @@ -159,7 +159,7 @@ ALL_DEPEND=" dev-libs/glib:2[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) " From 38478ebb98cb7e25024bc26bf97c7fe7f493df9a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:10:43 +0000 Subject: [PATCH 011/127] app-misc/mime-types: Sync with Gentoo It's from Gentoo commit 351da57cc6918b9648af7e1af607368e9b0e5c08. --- .../portage-stable/app-misc/mime-types/metadata.xml | 1 + .../app-misc/mime-types/mime-types-2.1.54.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-misc/mime-types/metadata.xml b/sdk_container/src/third_party/portage-stable/app-misc/mime-types/metadata.xml index 84a481f19a6..902d856ebac 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/mime-types/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-misc/mime-types/metadata.xml @@ -9,4 +9,5 @@ Enable mime-types support for www-servers/nginx package + diff --git a/sdk_container/src/third_party/portage-stable/app-misc/mime-types/mime-types-2.1.54.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/mime-types/mime-types-2.1.54.ebuild index 7a8330a5355..0edaa98636d 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/mime-types/mime-types-2.1.54.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-misc/mime-types/mime-types-2.1.54.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 @@ SRC_URI="https://pagure.io/mailcap/archive/r${MY_PV}/mailcap-r${MY_PV}.tar.gz" LICENSE="public-domain 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" IUSE="nginx" S="${WORKDIR}/mailcap-r${MY_PV}" From 5ffd30773f1cff467e9931408089a12bfc38d2f4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:10:45 +0000 Subject: [PATCH 012/127] app-portage/elt-patches: Sync with Gentoo It's from Gentoo commit f7b2d17676704b9192030f968cf18cf1a0969a41. --- .../app-portage/elt-patches/Manifest | 1 + .../elt-patches/elt-patches-20240116.ebuild | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20240116.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 1807e6f3bad..a704939b64d 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,3 +1,4 @@ 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 +DIST elt-patches-20240116.tar.xz 44400 BLAKE2B 0e664bf02180c2d0a5813f25a7661064f6612b71ab4743041a87579bf4fc2af276b2d653cbf75fe412364c2eb0a38dad744cc1eaa1159837239b0b9bbd122c5c SHA512 b014bebf918bb3debb5f38297caa0e250b426bdabfbc3c3e7ae44c1f5cda0d63ae1c0d82c12710a966a615947a5ad823a6e06c2ca485b987a74065dde16216bb diff --git a/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20240116.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20240116.ebuild new file mode 100644 index 00000000000..29410c13f99 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-portage/elt-patches/elt-patches-20240116.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 4a9cab846fa56cef27585f6d29ad1096dae64c32 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:10:45 +0000 Subject: [PATCH 013/127] app-portage/gentoolkit: Sync with Gentoo It's from Gentoo commit 45be97b4062ce6c22dd88e10f7349857ac7369a5. --- .../app-portage/gentoolkit/Manifest | 2 +- .../files/gentoolkit-0.6.1-data_files.patch | 47 ------- .../files/gentoolkit-0.6.1-pkgindex.patch | 45 ------- .../gentoolkit/gentoolkit-0.6.1-r3.ebuild | 73 ----------- .../gentoolkit/gentoolkit-0.6.5.ebuild | 121 ++++++++++++++++++ .../gentoolkit/gentoolkit-9999.ebuild | 2 +- 6 files changed, 123 insertions(+), 167 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.5.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest index 8e03e48e21a..b9fa161f896 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/Manifest @@ -1,2 +1,2 @@ -DIST gentoolkit-0.6.1.tar.gz 3195781 BLAKE2B 27e370de77586b375dc70caa1abba4c2bc4207e8f08e0a7ea2953097135506949db71ff9102a0ead198e4dea425440c57b94ac7a811ca2d5e0016fc7e234bb0d SHA512 1ffc466b69a9c53f1bbd40f6f4d1eb33d5f0f4287bb65ba1a7b1b2675ad61ecffa55ed9fda7c1ae8148744f0a77e224315eb1903dfd61a2a3dab1600fc672d2d DIST gentoolkit-0.6.3.tar.bz2 3186163 BLAKE2B 0f9befac53faa2b578b461a55c7113934a60478fc5d8d5ab0e06cb836ff5a2de75bb290ed797a2b085ec9f33c8494e3c3d5d0d6b643c525fff4dd0a82657118f SHA512 cf51480213fd4bac45d44f5eb5e4be4cb5c5b97ad63ecd832eb54fc7043ab8e974491005431f0897d6c41d251ae0f9fc95cfdfc4d613fc56340630a094bfc61d +DIST gentoolkit-0.6.5.tar.bz2 3186457 BLAKE2B 7f873385b183e51b03e1c4be0edbabc89556e1b3a1dce2be71584c9ea927dd09185ba1022e570de0ed2a46cbb764c67f6eaccf97dc5892f4f355244bac7c0545 SHA512 cff9e7b1b8122941b03f7e156f25b5b416c5e4bbf1b759ecf006c271758f2548323bf59ba94a14f3268eea43081ccbba3ab63e118123af870c0257aaecbb9554 diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch deleted file mode 100644 index 8039864d69f..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5b52ee6c6efab68111d128d45f386ac21eaf84f6 Mon Sep 17 00:00:00 2001 -From: Brian Dolbec -Date: Sun, 10 Jul 2022 13:41:36 -0700 -Subject: [PATCH] Revert "setup.py: migrate to setuptools" - -This reverts commit bbbde97b5e625a49a1a66e307931548cb33f260b. -setuptools only installs data files to the python pkg directory ---- - setup.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index 36995de..23e9b36 100755 ---- a/setup.py -+++ b/setup.py -@@ -3,8 +3,8 @@ - import re - import sys - import subprocess -- --from setuptools import setup, Command -+from distutils import core -+from distutils.cmd import Command - from glob import glob - - import os -@@ -67,7 +67,7 @@ manpages = [ - ] - - --class set_version(Command): -+class set_version(core.Command): - """Set python __version__ and bash VERSION to our __version__.""" - - description = "hardcode scripts' version using VERSION from environment" -@@ -130,7 +130,7 @@ test_data = { - ] - } - --setup( -+core.setup( - name="gentoolkit", - version=__version__, - description="Set of tools that work with and enhance portage.", --- -libgit2 1.4.3 - diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch deleted file mode 100644 index 193eacc2db8..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch +++ /dev/null @@ -1,45 +0,0 @@ -From bf3eb16e451fd1bdee8ef03a0d22e0040e033f19 Mon Sep 17 00:00:00 2001 -From: Brian Dolbec -Date: Sun, 10 Jul 2022 23:41:33 -0700 -Subject: [PATCH] eclean/pkgindex.py: Fix typo in function call - - File "/usr/lib/python3.10/site-packages/gentoolkit/eclean/pkgindex.py", line -60, in clean_pkgs_index - if self.get_emaint_binhost(): -AttributeError: 'PkgIndex' object has no attribute 'get_emaint_binhost'. Did -you mean: '_get_emaint_binhost'? - -Also fix too many parameters in line 68 for the self.controller() call - -Bug: https://bugs.gentoo.org/857555 - -Signed-off-by: Brian Dolbec ---- - pym/gentoolkit/eclean/pkgindex.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pym/gentoolkit/eclean/pkgindex.py b/pym/gentoolkit/eclean/pkgindex.py -index d0878a1..7d6fade 100644 ---- a/pym/gentoolkit/eclean/pkgindex.py -+++ b/pym/gentoolkit/eclean/pkgindex.py -@@ -57,15 +57,15 @@ class PkgIndex: - statinfo = os.stat(file_) - size1 = statinfo.st_size - show_progress = not quiet -- if self.get_emaint_binhost(): -+ if self._get_emaint_binhost(): - self.taskmaster = TaskHandler(show_progress_bar=show_progress) - tasks = [self.binhost] - self.taskmaster.run_tasks(tasks) - else: - self.call_emaint() - statinfo = os.stat(file_) - clean_size = size1 - statinfo.st_size -- self.controller("\n", clean_size, "Packages Index", file_, "Index") -+ self.controller(clean_size, "Packages Index", file_, "Index") - return clean_size - - def call_emaint(self): --- -libgit2 1.4.3 - diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild deleted file mode 100644 index 7cd0e33034b..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{9..11} pypy3 ) -PYTHON_REQ_USE="xml(+),threads(+)" - -inherit distutils-r1 tmpfiles - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" - inherit git-r3 -else - SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${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="Collection of administration scripts for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" - -LICENSE="GPL-2" -SLOT="0" - -# Need newer Portage for XML fix, bug #857537 -DEPEND=" - >=sys-apps/portage-3.0.32[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - app-alternatives/awk - sys-apps/gentoo-functions" - -PATCHES=( - "${FILESDIR}/gentoolkit-0.6.1-data_files.patch" - "${FILESDIR}/gentoolkit-0.6.1-pkgindex.patch" -) - -distutils_enable_tests setup.py - -python_prepare_all() { - python_setup - echo VERSION="${PVR}" "${PYTHON}" setup.py set_version - VERSION="${PVR}" "${PYTHON}" setup.py set_version - distutils-r1_python_prepare_all - - if use prefix-guest ; then - # use correct repo name, bug #632223 - sed -i \ - -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \ - pym/gentoolkit/profile.py || die - fi -} - -pkg_postinst() { - tmpfiles_process revdep-rebuild.conf - - # Only show the elog information on a new install - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog - elog "For further information on gentoolkit, please read the gentoolkit" - elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit" - elog - elog "Another alternative to equery is app-portage/portage-utils" - elog - elog "Additional tools that may be of interest:" - elog - elog " app-admin/eclean-kernel" - elog " app-portage/diffmask" - elog " app-portage/flaggie" - elog " app-portage/portpeek" - elog " app-portage/smart-live-rebuild" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.5.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.5.ebuild new file mode 100644 index 00000000000..551b618d223 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.5.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +PYTHON_REQ_USE="xml(+),threads(+)" + +inherit meson python-r1 tmpfiles + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git" + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~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="Collection of administration scripts for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" + +LICENSE="GPL-2" +SLOT="0" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Need newer Portage for eclean-pkg API, bug #900224 +DEPEND=" + >=sys-apps/portage-3.0.57[${PYTHON_USEDEP}] +" +RDEPEND=" + ${DEPEND} + ${PYTHON_DEPS} + app-alternatives/awk + sys-apps/gentoo-functions +" + +# 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 + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ' python3_12) +" + +src_prepare() { + default + if use prefix-guest ; then + # use correct repo name, bug #632223 + sed -i \ + -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \ + pym/gentoolkit/profile.py || die + fi +} + +src_configure() { + local code_only=false + python_foreach_impl my_src_configure +} + +my_src_configure() { + local emesonargs=( + -Dcode-only=${code_only} + -Deprefix="${EPREFIX}" + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + ) + + meson_src_configure + code_only=true +} + +src_compile() { + python_foreach_impl meson_src_compile +} + +src_test() { + python_foreach_impl meson_src_test --no-rebuild --verbose +} + +src_install() { + python_foreach_impl my_src_install + dotmpfiles data/tmpfiles.d/revdep-rebuild.conf + + local scripts + mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die) + python_replicate_script "${scripts[@]}" +} + +my_src_install() { + local pydirs=( + "${D}$(python_get_sitedir)" + ) + + meson_src_install + python_fix_shebang "${pydirs[@]}" + python_optimize "${pydirs[@]}" +} + +pkg_postinst() { + tmpfiles_process revdep-rebuild.conf + + # Only show the elog information on a new install + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog + elog "For further information on gentoolkit, please read the gentoolkit" + elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit" + elog + elog "Another alternative to equery is app-portage/portage-utils" + elog + elog "Additional tools that may be of interest:" + elog + elog " app-admin/eclean-kernel" + elog " app-portage/diffmask" + elog " app-portage/flaggie" + elog " app-portage/portpeek" + elog " app-portage/smart-live-rebuild" + fi +} 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 a4e22666a53..551b618d223 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 @@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Need newer Portage for eclean-pkg API, bug #900224 DEPEND=" - >=sys-apps/portage-3.0.53[${PYTHON_USEDEP}] + >=sys-apps/portage-3.0.57[${PYTHON_USEDEP}] " RDEPEND=" ${DEPEND} From dd19faca6633485f46b8b2c10b1c594b48facda7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:10:58 +0000 Subject: [PATCH 014/127] app-vim/gentoo-syntax: Sync with Gentoo It's from Gentoo commit 50ff8a45ab1931ad2d1d78a9f504cbfe437a6e35. --- .../app-vim/gentoo-syntax/Manifest | 1 - .../gentoo-syntax/gentoo-syntax-12.ebuild | 42 ------------------- .../gentoo-syntax/gentoo-syntax-13.ebuild | 4 +- 3 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-12.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/Manifest b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/Manifest index 735cc05e644..8f31af34e7d 100644 --- a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/Manifest @@ -1,2 +1 @@ -DIST gentoo-syntax-12.tar.bz2 21022 BLAKE2B 758993282ccc26384bb1fc761f2a07059d5e2e7038f56d48ec19ac82ddecb7cd1601fbdd4221e6b41b43281195d862c93d98c12c47d2d43f4a6cbb4784ae6b46 SHA512 07bc7102b3f687c53d8e46c5ca91c1d605239490f160c6db11c6d17ae95b94d34e9ac654b3c9935099382f39ba8b92ea373b09f86fc6452840d12f135820b2b3 DIST gentoo-syntax-13.tar.bz2 20995 BLAKE2B 90196be7b1f0bbbe8398f327cebe2bbbcffbf8db2e27debc321478911d2413de51ef29d3a94e936e1d92eb4d246237d66d4fa8742fd165e4043ceb2dd80beb9a SHA512 c695dd8c80b551307381a4fb0656adc07321cf60f88e1888ce3a2080343d458a35bb4bda785e233fa4907534b35114c83b5d4b5e3f3bd02d0d6c2dd7ab7deda1 diff --git a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-12.ebuild b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-12.ebuild deleted file mode 100644 index 717484df959..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-12.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit vim-plugin - -DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting" -HOMEPAGE="https://github.com/gentoo/gentoo-syntax" -SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2" - -LICENSE="vim" -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="ignore-glep31" - -VIM_PLUGIN_HELPFILES="gentoo-syntax" -VIM_PLUGIN_MESSAGES="filetype" - -src_prepare() { - default - if use ignore-glep31 ; then - for f in ftplugin/*.vim ; do - ebegin "Removing UTF-8 rules from ${f} ..." - sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \ - || die "waah! bad sed voodoo. need more goats." - eend $? - done - fi -} - -pkg_postinst() { - vim-plugin_pkg_postinst - - if [[ -z ${REPLACING_VERSIONS} ]] ; then - if use ignore-glep31 1>/dev/null ; then - ewarn "You have chosen to disable the rules which ensure GLEP 31" - ewarn "compliance. When editing ebuilds, please make sure you get" - ewarn "the character set correct." - fi - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-13.ebuild b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-13.ebuild index 8465cb7009c..f6ee8664a8b 100644 --- a/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-13.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-vim/gentoo-syntax/gentoo-syntax-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 @@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2" LICENSE="vim" 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="ignore-glep31" VIM_PLUGIN_HELPFILES="gentoo-syntax" From 03e200f567b2316a3678d9d1ed458bf1ddb4138f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:10:59 +0000 Subject: [PATCH 015/127] dev-build/meson: Sync with Gentoo It's from Gentoo commit e538accf3e4cb33b8537290de31ce4fc503047c8. --- .../files/meson-1.3.1-xtools-support.patch | 39 ++++++++++++------- ...son-1.3.1.ebuild => meson-1.3.1-r1.ebuild} | 4 +- 2 files changed, 29 insertions(+), 14 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-build/meson/{meson-1.3.1.ebuild => meson-1.3.1-r1.ebuild} (96%) 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 index 6e9e670ba8d..dfb9b3f6be6 100644 --- 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 @@ -1,26 +1,39 @@ -linkers_detect: detect xtools (Apple ld64 derivative) +From 33527630f1bd0e51093044016557cb44e7bb6547 Mon Sep 17 00:00:00 2001 +From: Fabian Groffen +Date: Wed, 17 Jan 2024 17:04:45 +0100 +Subject: [PATCH] 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. +xtools is in use on Gentoo Prefix x86_64 and ppc based Darwin 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. +Since xtools is answering with a version to --version, as opposed to +ld64, detection of xtools in the ld64 handling block is not possible, +since --version already succeeded. -Author: Fabian Groffen Bug: https://bugs.gentoo.org/868516 +Bug: https://github.com/mesonbuild/meson/issues/10805 +Signed-off-by: Fabian Groffen +Signed-off-by: Eli Schwartz +--- + mesonbuild/linkers/detect.py | 5 +++++ + 1 file changed, 5 insertions(+) +diff --git a/mesonbuild/linkers/detect.py b/mesonbuild/linkers/detect.py +index 918f2e634..1bce413f4 100644 --- a/mesonbuild/linkers/detect.py +++ b/mesonbuild/linkers/detect.py -@@ -185,6 +185,11 @@ +@@ -174,6 +174,11 @@ def guess_nix_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty 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) ++ # detect xtools first, bug #10805 ++ elif 'xtools-' in o.split('\n', maxsplit=1)[0]: ++ xtools = o.split(' ', maxsplit=1)[0] ++ v = xtools.split('-', maxsplit=2)[1] ++ linker = linkers.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: +-- +2.43.0 + 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-r1.ebuild similarity index 96% rename from sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1-r1.ebuild index 0f026f75c31..6a86fb79ded 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-r1.ebuild @@ -54,13 +54,15 @@ 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 # backport revert for broken rpath changes: https://github.com/mesonbuild/meson/pull/12672 "${FILESDIR}"/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch + + # backport macos Prefix fix: https://github.com/mesonbuild/meson/pull/12747 + "${FILESDIR}"/meson-1.3.1-xtools-support.patch ) python_prepare_all() { From b9104e086000d705e31398870984402c439c1c1d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:00 +0000 Subject: [PATCH 016/127] dev-debug/gdb: Sync with Gentoo It's from Gentoo commit a32e214f465b7e90dca9fd6c6439a5bc563daa41. --- .../gdb-14.1-fix-dll-export-forwarding.patch | 60 ++++ .../files/gdb-14.1-fix-list-segfault.patch | 101 ++++++ ...14.1-fix-print-global-variable-stubs.patch | 109 ++++++ .../dev-debug/gdb/gdb-14.1-r1.ebuild | 317 ++++++++++++++++++ 4 files changed, 587 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-14.1-fix-dll-export-forwarding.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-14.1-fix-list-segfault.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-14.1-fix-print-global-variable-stubs.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-14.1-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-14.1-fix-dll-export-forwarding.patch b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-14.1-fix-dll-export-forwarding.patch new file mode 100644 index 00000000000..8c2a49f8042 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-14.1-fix-dll-export-forwarding.patch @@ -0,0 +1,60 @@ +Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31112 + +From https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=43a608adb04251be8999304cf724f55b2d840ac3 +From: Hannes Domani +Date: Wed, 6 Dec 2023 20:52:06 +0100 +Subject: [PATCH] Fix DLL export forwarding + +I noticed it when I was trying to set a breakpoint at ExitProcess: +``` +(gdb) b ExitProcess +Breakpoint 1 at 0x14001fdd0 +(gdb) r +Starting program: C:\qiewer\heob\heob64.exe +Warning: +Cannot insert breakpoint 1. +Cannot access memory at address 0x3dbf4120 +Cannot insert breakpoint 1. +Cannot access memory at address 0x77644120 +``` + +The problem doesn't exist in gdb 13.2, and the difference can easily be +seen when printing ExitProcess. +gdb 14.1: +``` +(gdb) p ExitProcess +$1 = {} 0x77644120 +``` +gdb 13.2: +``` +(gdb) p ExitProcess +$1 = {} 0x77734120 +``` + +The new behavior started with 9675da25357c7a3f472731ddc6eb3becc65b469a, +where VMA was then calculated relative to FORWARD_DLL_NAME, while it was +relative to DLL_NAME before. + +Fixed by calculating VMA relative to DLL_NAME again. + +Bug: https://sourceware.org/PR31112 +Approved-By: Tom Tromey + +(cherry picked from commit 2574cd903dd84e7081506e24c2e232ecda11a736) +--- a/gdb/coff-pe-read.c ++++ b/gdb/coff-pe-read.c +@@ -210,7 +210,10 @@ add_pe_forwarded_sym (minimal_symbol_reader &reader, + " \"%s\" in dll \"%s\", pointing to \"%s\"\n"), + sym_name, dll_name, forward_qualified_name.c_str ()); + +- unrelocated_addr vma = msymbol.minsym->unrelocated_address (); ++ /* Calculate VMA as if it were relative to DLL_NAME/OBJFILE, even though ++ it actually points inside another dll (FORWARD_DLL_NAME). */ ++ unrelocated_addr vma = unrelocated_addr (msymbol.value_address () ++ - objfile->text_section_offset ()); + msymtype = msymbol.minsym->type (); + section = msymbol.minsym->section_index (); + +-- +2.39.3 + diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-14.1-fix-list-segfault.patch b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-14.1-fix-list-segfault.patch new file mode 100644 index 00000000000..76557b5a7e0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-14.1-fix-list-segfault.patch @@ -0,0 +1,101 @@ +Bug: https://bugs.gentoo.org/922336 +Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31256 + +From https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0068bd6fb3579dd8df7561e038cb3fe27f122b0e +From: Guinevere Larsen +To: gdb-patches@sourceware.org +Cc: Guinevere Larsen +Subject: [PATCH] gdb: fix "list ." related crash +Date: Tue, 23 Jan 2024 11:50:43 +0100 + +When a user attempts to use the "list ." command with an inferior that +doesn't have debug symbols, GDB would crash. This was reported as PR +gdb/31256. + +The crash would happen when attempting to get the current symtab_and_line +for the stop location, because the symtab would return a null pointer +and we'd attempt to dereference it to print the line. + +This commit fixes that by checking for an empty symtab and erroring out +of the function if it happens. + +Bug: https://sourceware.org/PR31256 +--- a/gdb/cli/cli-cmds.c ++++ b/gdb/cli/cli-cmds.c +@@ -1291,6 +1291,8 @@ list_command (const char *arg, int from_tty) + set_default_source_symtab_and_line (); + cursal = get_current_source_symtab_and_line (); + } ++ if (cursal.symtab == nullptr) ++ error (_("No debug information available to print source lines.")); + list_around_line (arg, cursal); + /* Set the repeat args so just pressing "enter" after using "list ." + will print the following lines instead of the same lines again. */ +--- /dev/null ++++ b/gdb/testsuite/gdb.base/list-nodebug.c +@@ -0,0 +1,21 @@ ++/* This testcase is part of GDB, the GNU debugger. ++ ++ Copyright 2024 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++int main () ++{ ++ return 0; ++} +--- /dev/null ++++ b/gdb/testsuite/gdb.base/list-nodebug.exp +@@ -0,0 +1,37 @@ ++# Copyright 2024 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++# Test that using the command "list" in a file with no debug information ++# will not crash GDB and will give reasonable output. ++ ++standard_testfile .c ++ ++if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \ ++ {nodebug}]} { ++ return -1 ++} ++ ++if {![runto_main]} { ++ untested "couldn't run to main" ++ return ++} ++ ++# Check that GDB doesn't crash when we use list . on an inferior with ++# no debug information ++gdb_test "list ." "No debug.*" "first 'list .'" ++# This should be called twice because the first list invocation since ++# printing a frame may take a different codepath, which wouldn't ++# trigger the crash. ++gdb_test "list ." "No debug.*" "second 'list .'" +-- +2.43.0 + + diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-14.1-fix-print-global-variable-stubs.patch b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-14.1-fix-print-global-variable-stubs.patch new file mode 100644 index 00000000000..ff0ff7bfb0c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-14.1-fix-print-global-variable-stubs.patch @@ -0,0 +1,109 @@ +Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31128 + +From https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bc23ea51f8a83e9524dfb553baa8baacb29e68a9 +From: Hannes Domani +Date: Fri, 8 Dec 2023 19:06:14 +0100 +Subject: [PATCH] Fix printing of global variable stubs if no inferior is + running + +Since 3c45e9f915ae4aeab7312d6fc55a947859057572 gdb crashes when trying +to print a global variable stub without a running inferior, because of +a missing nullptr-check (the block_scope function took care of that +check before it was converted to a method). + +With this check it works again: +``` +(gdb) print s +$1 = +``` + +Bug: https://sourceware.org/PR31128 +Approved-By: Tom Tromey +(cherry picked from commit 576745e26c0ec76a53ba45b20af464628a50b3e4) +--- a/gdb/cp-namespace.c ++++ b/gdb/cp-namespace.c +@@ -1026,7 +1026,11 @@ cp_lookup_transparent_type (const char *name) + + /* If that doesn't work and we're within a namespace, look there + instead. */ +- scope = get_selected_block (0)->scope (); ++ const block *block = get_selected_block (0); ++ if (block == nullptr) ++ return nullptr; ++ ++ scope = block->scope (); + + if (scope[0] == '\0') + return NULL; +--- /dev/null ++++ b/gdb/testsuite/gdb.cp/print-global-stub.cc +@@ -0,0 +1,31 @@ ++/* This testcase is part of GDB, the GNU debugger. ++ ++ Copyright 2023 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++struct S ++{ ++ S (int); ++ virtual ~S (); ++ ++ int m_i; ++}; ++ ++S s (5); ++ ++int main () ++{ ++ return 0; ++} +--- /dev/null ++++ b/gdb/testsuite/gdb.cp/print-global-stub.exp +@@ -0,0 +1,32 @@ ++# Copyright (C) 2023 Free Software Foundation, Inc. ++ ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++# This file is part of the GDB testsuite. ++# It tests printing of a global stub without inferior. ++ ++require allow_cplus_tests ++ ++standard_testfile .cc ++set objfile [standard_output_file ${testfile}.o] ++ ++if { [gdb_compile $srcdir/$subdir/$srcfile $objfile object \ ++ {c++ debug}] != "" } { ++ untested "failed to compile" ++ return -1 ++} ++ ++clean_restart $objfile ++ ++gdb_test "print s" " = " +-- +2.39.3 + diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-14.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-14.1-r1.ebuild new file mode 100644 index 00000000000..2dc97192ac5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-14.1-r1.ebuild @@ -0,0 +1,317 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# See https://sourceware.org/gdb/wiki/DistroAdvice for general packaging +# tips & notes. + +PYTHON_COMPAT=( python3_{10..12} ) +inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs + +export CTARGET=${CTARGET:-${CHOST}} + +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +case ${PV} in + 9999*) + # live git tree + EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" + inherit git-r3 + SRC_URI="" + ;; + *.*.50_p2???????|*.*.90_p2???????) + # Weekly snapshots + MY_PV="${PV/_p/.}" + SRC_URI=" + https://sourceware.org/pub/gdb/snapshots/branch/gdb-weekly-${MY_PV}.tar.xz + https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${MY_PV}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/gdb-weekly-${MY_PV}.tar.xz + " + S="${WORKDIR}/${PN}-${MY_PV}" + + # e.g. 13.1.90_p20230325 is a snapshot on the stable branch, so it's fine + if [[ ${PV} == *.[123456789].9?_p2??????? ]] ; then + REGULAR_RELEASE=1 + fi + ;; + *.*.9?) + # Prereleases + MY_PV="${PV/_p/.}" + SRC_URI=" + https://sourceware.org/pub/gdb/snapshots/branch/gdb-${MY_PV}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/gdb-${MY_PV}.tar.xz + " + S="${WORKDIR}/${PN}-${MY_PV}" + ;; + *) + # Normal upstream release + SRC_URI=" + mirror://gnu/gdb/${P}.tar.xz + https://sourceware.org/pub/gdb/releases/${P}.tar.xz + " + + REGULAR_RELEASE=1 +esac + +PATCH_DEV="" +PATCH_VER="" +DESCRIPTION="GNU debugger" +HOMEPAGE="https://sourceware.org/gdb/" +SRC_URI=" + ${SRC_URI} + ${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCH_VER}.tar.xz} + ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz} +" + +LICENSE="GPL-3+ LGPL-2.1+" +SLOT="0" +IUSE="cet debuginfod guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd" +if [[ -n ${REGULAR_RELEASE} ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +fi +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/mpfr:= + dev-libs/gmp:= + >=sys-libs/ncurses-5.2-r2:= + >=sys-libs/readline-7:= + sys-libs/zlib + elibc_glibc? ( net-libs/libnsl:= ) + debuginfod? ( + dev-libs/elfutils[debuginfod(-)] + ) + lzma? ( app-arch/xz-utils ) + python? ( ${PYTHON_DEPS} ) + guile? ( >=dev-scheme/guile-2.0 ) + xml? ( dev-libs/expat ) + source-highlight? ( + dev-util/source-highlight + ) + xxhash? ( + dev-libs/xxhash + ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/xz-utils + sys-apps/texinfo + app-alternatives/yacc + nls? ( sys-devel/gettext ) + source-highlight? ( virtual/pkgconfig ) + test? ( dev-util/dejagnu ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + MIN # gnulib FP (bug #898688) +) + +PATCHES=( + "${FILESDIR}"/${PN}-8.3.1-verbose-build.patch + "${FILESDIR}"/${PN}-14.1-fix-list-segfault.patch + "${FILESDIR}"/${PN}-14.1-fix-print-global-variable-stubs.patch + "${FILESDIR}"/${PN}-14.1-fix-dll-export-forwarding.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + strip-linguas -u bfd/po opcodes/po + + # Avoid using ancient termcap from host on Prefix systems + sed -i -e 's/termcap tinfow/tinfow/g' \ + gdb/configure{.ac,} || die +} + +gdb_branding() { + printf "Gentoo ${PV} " + + if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then + printf "p${PATCH_VER}" + else + printf "vanilla" + fi + + [[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}" +} + +src_configure() { + strip-unsupported-flags + + # See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html + # Avoid really confusing logs from subconfigure spam, makes logs far + # more legible. + MAKEOPTS="--output-sync=line ${MAKEOPTS}" + + local myconf=( + # portage's econf() does not detect presence of --d-d-t + # because it greps only top-level ./configure. But not + # libiberty's or gdb's configure. + --disable-dependency-tracking + --disable-silent-rules + + --with-pkgversion="$(gdb_branding)" + --with-bugurl='https://bugs.gentoo.org/' + --disable-werror + # Disable modules that are in a combined binutils/gdb tree. bug #490566 + --disable-{binutils,etc,gas,gold,gprof,gprofng,ld} + + $(use_with debuginfod) + + $(use_enable test unit-tests) + + # Allow user to opt into CET for host libraries. + # Ideally we would like automagic-or-disabled here. + # But the check does not quite work on i686: bug #760926. + $(use_enable cet) + + # Helps when cross-compiling. Not to be confused with --with-sysroot. + --with-build-sysroot="${ESYSROOT}" + ) + + is_cross && myconf+=( + --with-sysroot="\${prefix}/${CTARGET}" + --includedir="\${prefix}/include/${CTARGET}" + --with-gdb-datadir="\${datadir}/gdb/${CTARGET}" + ) + + # gdbserver only works for native targets (CHOST==CTARGET). + # it also doesn't support all targets, so rather than duplicate + # the target list (which changes between versions), use the + # "auto" value when things are turned on, which is triggered + # whenever no --enable or --disable is given + if is_cross || use !server ; then + myconf+=( --disable-gdbserver ) + fi + + myconf+=( + --enable-64-bit-bfd + --disable-install-libbfd + --disable-install-libiberty + --enable-obsolete + # This only disables building in the readline subdir. + # For gdb itself, it'll use the system version. + --disable-readline + --with-system-readline + # This only disables building in the zlib subdir. + # For gdb itself, it'll use the system version. + --without-zlib + --with-system-zlib + --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug + $(use_with xml expat) + $(use_with lzma) + $(use_enable nls) + $(use_enable sim) + $(use_enable source-highlight) + $(use multitarget && echo --enable-targets=all) + $(use_with python python "${EPYTHON}") + $(use_with xxhash) + $(use_with guile) + $(use_with zstd) + + # Find libraries using the toolchain sysroot rather than the configured + # prefix. Needed when cross-compiling. + # + # Check which libraries to apply this to with: + # "${S}"/gdb/configure --help | grep without-lib | sort + --without-lib{babeltrace,expat,gmp,iconv,ipt,lzma,mpfr,xxhash}-prefix + ) + + # source-highlight is detected with pkg-config: bug #716558 + export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)" + + export CC_FOR_BUILD="$(tc-getBUILD_CC)" + + # ensure proper compiler is detected for Clang builds: bug #831202 + export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}" + + econf "${myconf[@]}" +} + +src_test() { + # Run the unittests (nabbed invocation from Fedora's spec file) at least + emake -k -C gdb run GDBFLAGS='-batch -ex "maintenance selftest"' + + # Too many failures + # In fact, gdb's test suite needs some work to get passing. + # See e.g. https://sourceware.org/gdb/wiki/TestingGDB. + # As of 11.2, on amd64: "# of unexpected failures 8600" + # Also, ia64 kernel crashes when gdb testsuite is running. + #emake -k check +} + +src_install() { + emake DESTDIR="${D}" install + + find "${ED}"/usr -name libiberty.a -delete || die + + # Delete translations that conflict with binutils-libs. bug #528088 + # Note: Should figure out how to store these in an internal gdb dir. + if use nls ; then + find "${ED}" \ + -regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \ + -delete || die + fi + + # Don't install docs when building a cross-gdb + if [[ ${CTARGET} != ${CHOST} ]] ; then + rm -rf "${ED}"/usr/share/{doc,info,locale} || die + local f + for f in "${ED}"/usr/share/man/*/* ; do + if [[ ${f##*/} != ${CTARGET}-* ]] ; then + mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die + fi + done + return 0 + fi + + # Install it by hand for now: + # https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html + # Only install if it exists due to the twisted behavior (see + # notes in src_configure above). + [[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay + + docinto gdb + dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \ + gdb/NEWS gdb/PROBLEMS + docinto sim + dodoc sim/{MAINTAINERS,README-HACKING} + + if use server ; then + docinto gdbserver + dodoc gdbserver/README + fi + + # Remove shared info pages + rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info* + + if use python ; then + python_optimize "${ED}"/usr/share/gdb/python/gdb + fi +} + +pkg_postinst() { + # Portage doesn't unmerge files in /etc + rm -vf "${EROOT}"/etc/skel/.gdbinit + + if use prefix && [[ ${CHOST} == *-darwin* ]] ; then + ewarn "gdb is unable to get a mach task port when installed by Prefix" + ewarn "Portage, unprivileged. To make gdb fully functional you'll" + ewarn "have to perform the following steps:" + ewarn " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb" + ewarn " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb" + fi +} From c517267bc3f6b217df893eba55d0371d316587d3 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:03 +0000 Subject: [PATCH 017/127] dev-lang/lua: Sync with Gentoo It's from Gentoo commit 776c7c3b0ec869dd9e7c191489c3c46e5536f7ae. --- .../portage-stable/dev-lang/lua/Manifest | 1 - .../files/lua-5.4.4-lparser-overread.patch | 34 ------------ .../dev-lang/lua/lua-5.4.4-r103.ebuild | 54 ------------------- 3 files changed, 89 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/lua/files/lua-5.4.4-lparser-overread.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.4.4-r103.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/lua/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/lua/Manifest index ec26d04f4fb..8e8837da084 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/lua/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-lang/lua/Manifest @@ -1,4 +1,3 @@ DIST lua-5.1.5.tar.xz 397416 BLAKE2B ef3880d78be1def383a9db6753b7aec4160f6fa8719529c2ea6266015771a23a1be81424520de10bb087a86081f1ec48c58c36eb8b24bff53adb6bd8d791e31b SHA512 bd827cb2e63cd71d15d846eb29c8745bf869e7b70e12c565ce173623d1fcd29dabf4d33a99c48f294151bb580d830c112cf178e2d80a5a5c36acc7b3bfcd7d24 DIST lua-5.3.6.tar.xz 541220 BLAKE2B c356cec06b14cdcbb29e382c951491432a3189618f9fd8c8832bdc8c831640fbcb9e212db05b61a577633c5fe9831e75a158cb97720c1e51cab27544526c9e24 SHA512 9a632a90806fa71398d70be7d38769065c1258fd94709cef72236753b42131b8d30da2a5dd28c74211ef8d04b0c30f52d0c593d49c2e8686568c8896b69577d7 -DIST lua-5.4.4.tar.xz 606456 BLAKE2B ba6cad647c0171e5e737151b189b5b404948c08182e9f17d7974a6c6c3b7d99b03cf930add863188db22674b8613fc600d771f62f9dfc99232aab9caea9b073c SHA512 8f3950ed5972a29d7c79e72af617526f6b9f6be7ab268e66206d7e453acc2564541c9d01e2de08a7e9046ab24c66b02167e48a0d5764753befd95dc922b61219 DIST lua-5.4.6.tar.xz 608376 BLAKE2B bec47685a24be429fa930ac02e6930300ad77105c56d970d3f1a9a6241c23da5ea77b863e9eca36b6c20e1ef1dc90f3635afe9b09dc4221f1e5dd72ce951df38 SHA512 8e7f6bd9d7fdf9327134f7eb01a78df87141989ea0d95f331eb0e71acdbf7c7b7d908da95e16cd91b3f9bad1b496e3b4db2380a851557f29cdc53f4f5255cda5 diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/lua/files/lua-5.4.4-lparser-overread.patch b/sdk_container/src/third_party/portage-stable/dev-lang/lua/files/lua-5.4.4-lparser-overread.patch deleted file mode 100644 index 3e625aa4ffc..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/lua/files/lua-5.4.4-lparser-overread.patch +++ /dev/null @@ -1,34 +0,0 @@ -From https://github.com/lua/lua/commit/1f3c6f4534c6411313361697d98d1145a1f030fa Mon Sep 17 00:00:00 2001 -From: Roberto Ierusalimschy -Date: Tue, 15 Feb 2022 12:28:46 -0300 -Subject: [PATCH] Bug: Lua can generate wrong code when _ENV is - ---- a/src/lparser.c -+++ b/src/lparser.c -@@ -468,6 +468,7 @@ static void singlevar (LexState *ls, expdesc *var) { - expdesc key; - singlevaraux(fs, ls->envn, var, 1); /* get environment variable */ - lua_assert(var->k != VVOID); /* this one must exist */ -+ luaK_exp2anyregup(fs, var); /* but could be a constant */ - codestring(&key, varname); /* key is variable name */ - luaK_indexed(fs, var, &key); /* env[varname] */ - } ---- a/tests/attrib.lua -+++ b/tests/attrib.lua -@@ -434,6 +434,16 @@ a.aVeryLongName012345678901234567890123456789012345678901234567890123456789 == - 10) - - -+do -+ -- _ENV constant -+ local function foo () -+ local _ENV = 11 -+ X = "hi" -+ end -+ local st, msg = pcall(foo) -+ assert(not st and string.find(msg, "number")) -+end -+ - - -- test of large float/integer indices - diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.4.4-r103.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.4.4-r103.ebuild deleted file mode 100644 index ebfa8021edc..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-lang/lua/lua-5.4.4-r103.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic optfeature - -DESCRIPTION="A powerful light-weight programming language designed for extending applications" -HOMEPAGE="https://www.lua.org/" -# tarballs produced from ${PV} branches in https://gitweb.gentoo.org/proj/lua-patches.git -SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz" - -LICENSE="MIT" -SLOT="5.4" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+deprecated readline" - -DEPEND=" - >=app-eselect/eselect-lua-3 - readline? ( sys-libs/readline:= ) - !dev-lang/lua:0" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-lparser-overread.patch" -) - -src_prepare() { - default - - if use elibc_musl; then - # locales on musl are non-functional (#834153) - # https://wiki.musl-libc.org/open-issues.html#Locale-limitations - sed -e 's|os.setlocale("pt_BR") or os.setlocale("ptb")|false|g' \ - -i tests/literals.lua || die - fi -} - -src_configure() { - use deprecated && append-cppflags -DLUA_COMPAT_5_3 - econf $(use_with readline) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - eselect lua set --if-unset "${PN}${SLOT}" - - optfeature "Lua support for Emacs" app-emacs/lua-mode -} From 441304e6d1fa5169720dc3612ab0c2091aac0b0f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:03 +0000 Subject: [PATCH 018/127] dev-lang/perl: Sync with Gentoo It's from Gentoo commit 842c2e9bff302de882b067103e3abf20568e2ee8. --- .../perl-5.36.0-fix-configure-for-clang.patch | 41 +++++++++++++++++++ .../dev-lang/perl/perl-5.36.1-r3.ebuild | 4 ++ .../dev-lang/perl/perl-5.38.0-r1.ebuild | 4 ++ .../dev-lang/perl/perl-5.38.2-r1.ebuild | 4 ++ 4 files changed, 53 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.36.0-fix-configure-for-clang.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.36.0-fix-configure-for-clang.patch b/sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.36.0-fix-configure-for-clang.patch new file mode 100644 index 00000000000..3ad508c95f7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/files/perl-5.36.0-fix-configure-for-clang.patch @@ -0,0 +1,41 @@ +From 40db21129c0ba08ea457b6e40e7357e86ea1404b Mon Sep 17 00:00:00 2001 +From: Raul E Rangel +Date: Fri, 28 Jul 2023 15:50:49 -0600 +Subject: [PATCH] hints/linux: Add additional expression when matching clang + +Newer versions of clang actually print the distro before `clang` when +calling `$CC --version`. This changes fixes the regex so it can match +this new pattern. + +i.e., + + $ clang --version + Debian clang version 14.0.6 + + $ x86_64-pc-linux-gnu-clang --version + Chromium OS 17.0_pre496208_p20230501-r1 clang version 17.0.0 + +Fixes #21099 + +BUG=b:283275881 +See: https://github.com/Perl/perl5/issues/21099 +--- + hints/linux.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hints/linux.sh b/hints/linux.sh +index e1508c7509..5202b28b09 100644 +--- a/hints/linux.sh ++++ b/hints/linux.sh +@@ -166,7 +166,7 @@ esac + if [ -x /usr/bin/gcc ] ; then + gcc=/usr/bin/gcc + # clang also provides -print-search-dirs +-elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then ++elif ${cc:-cc} --version 2>/dev/null | grep -q -e '^clang version' -e ' clang version'; then + gcc=${cc:-cc} + else + gcc=gcc +-- +2.41.0.585.gd2178a4bd4-goog + diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.1-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.1-r3.ebuild index 553ab9f76a3..277079bb9ef 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.1-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.36.1-r3.ebuild @@ -395,6 +395,10 @@ src_prepare() { add_patch "${FILESDIR}/${PN}-5.36.1-http-tiny.patch" "0111-5.36.1-http-tiny.patch"\ "Enable certificate checking in HTTP::Tiny by default"\ "https://bugs.gentoo.org/905296" "https://bugs.debian.org/954089" + add_patch "${FILESDIR}/${PN}-5.36.0-fix-configure-for-clang.patch" \ + "100-5.36.0-fix-configure-for-clang.patch" \ + "Fix clang check in configure" \ + "https://github.com/Perl/perl5/issues/21099" if [[ ${CHOST} == *-solaris* ]] ; then # do NOT mess with nsl, on Solaris this is always necessary, diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.0-r1.ebuild index 66a37abc47a..c518862f3ed 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.0-r1.ebuild @@ -395,6 +395,10 @@ src_prepare() { # add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\ # "Fix broken miniperl on hppa"\ # "https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162" + add_patch "${FILESDIR}/${PN}-5.36.0-fix-configure-for-clang.patch" \ + "100-5.36.0-fix-configure-for-clang.patch" \ + "Fix clang check in configure" \ + "https://github.com/Perl/perl5/issues/21099" if [[ ${CHOST} == *-solaris* ]] ; then # do NOT mess with nsl, on Solaris this is always necessary, diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r1.ebuild index 8edc3aca52b..d0575868dfe 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.38.2-r1.ebuild @@ -396,6 +396,10 @@ src_prepare() { # add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\ # "Fix broken miniperl on hppa"\ # "https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162" + add_patch "${FILESDIR}/${PN}-5.36.0-fix-configure-for-clang.patch" \ + "100-5.36.0-fix-configure-for-clang.patch" \ + "Fix clang check in configure" \ + "https://github.com/Perl/perl5/issues/21099" if [[ ${CHOST} == *-solaris* ]] ; then # do NOT mess with nsl, on Solaris this is always necessary, From 5eb72df901219bf8b825c54912a244daef88be04 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:03 +0000 Subject: [PATCH 019/127] dev-lang/python: Sync with Gentoo It's from Gentoo commit eec2aecb26ca1acf12e5a18260118ef034a54449. --- .../portage-stable/dev-lang/python/Manifest | 3 + .../dev-lang/python/python-3.10.13.ebuild | 2 +- .../dev-lang/python/python-3.11.7.ebuild | 2 +- .../dev-lang/python/python-3.12.1.ebuild | 2 +- .../dev-lang/python/python-3.12.1_p1.ebuild | 4 +- .../python/python-3.13.0_alpha2.ebuild | 2 +- .../python/python-3.13.0_alpha3.ebuild | 533 ++++++++++++++++++ .../dev-lang/python/python-3.8.18.ebuild | 2 +- .../dev-lang/python/python-3.9.18.ebuild | 2 +- 9 files changed, 544 insertions(+), 8 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.13.0_alpha3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/python/Manifest index 8c583adb2a6..cf6a4a4b8d4 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 @@ -8,6 +8,8 @@ DIST Python-3.12.1.tar.xz 20583448 BLAKE2B 20f6f8b7b0d7e560d269138a38c5b9362073a DIST Python-3.12.1.tar.xz.asc 963 BLAKE2B 6c08f666c914fc413d24c3591c24ce7ec22d459a571f9e91b50862b534ea6d98170d7141dd42602c18893cfc07a02f5b44c42edc97571a3a12cac3cdfe6ddc82 SHA512 1c85237b5921fbf940ded4e038d99c8d02682fcb357b5de761eb5bebf94142b308a11654fc6312129663727e2ce1f546fbb5a5a3747d7dc02fc7dced9cb968fd DIST Python-3.13.0a2.tar.xz 20244640 BLAKE2B b1edae4c5f6c33e7250f718caa3164e163ea13f245817a997f0497d20bb9695e6e2f777eb42fc210b21fb315bd1753fe4a46b7f213312a03201481d26544fa63 SHA512 2702f630ebb49a835c213656f2f0d41f87daf2dad6b856821f4011f4614c19279656eaa1dad9f1cbfd258992aa5f59d4571577057c6a4ad1cdcfa4d8ada3b607 DIST Python-3.13.0a2.tar.xz.asc 963 BLAKE2B db603fcf2dcf0c727b3a92a5ccbaadd080e11d664b1c07944ef082b5ca8625b2ccd4d4384d344d14e61eb73466011f2284f5240d710b3be7206c7316e2a3872b SHA512 c6a0101b844701fcd860a519ec4830bde0df486ea78377831544dbe0db25dd67c28360f46d5ef01db64aa4347cf7b0d489590f6dc91e768b16753228f2c93b25 +DIST Python-3.13.0a3.tar.xz 20351452 BLAKE2B 2d90aec5df24ac06e4d4b2e4442c062612b24441442bf3cd02dad8fde2f6db769eac7e4a1ce4943da6e7e9ea3516b2b9175dfaf40a8dd8827ae476ebb7e698ab SHA512 0cabe30ca97f89df7da35684dda9ac8a3018fb7547d97f595e7883323809fdb99ff02c48719d71fb12abdacda1fc86f0ca15b1d27717e941cdc0b31c72fd63bb +DIST Python-3.13.0a3.tar.xz.asc 963 BLAKE2B 30b0b14dbb8ca72f889317b7cbdf75366e6b035ff0beb835c8eacd02f2aa5014e68d4723f0268d591903be4596cb73a5cdd90e069f5bc1ad79e2f7dfe124a3ce SHA512 91efe8e66085e4b60b565130a8ab43b3772e3dafe25fa6266900a8c19004082bcfd7e72e6e5293dc5bc3330ea2db233365d1028ef3b86ee4bb7df1246b6641b0 DIST Python-3.8.18.tar.xz 20696952 BLAKE2B 45be712aeef8bb3ba04aa2bd7d0282aa5f817327749c620ede18ee307fcb432540db9062a8186b08b49467515c74f01eb6fa739f366cca76dfadedcb22858429 SHA512 0be1d85cafade25e99b8277ba51d7b9b3a3d2dbbcc52fd0d1c633c47982e5dd87fd7a0ca180a78d7801d79a8ecafa79bd9d501d544cd7b6da53ea409daa70adf DIST Python-3.8.18.tar.xz.asc 833 BLAKE2B bc4e989748d53c6be7040e78d9f1852227c6a76f4c63a68824f5139defd51d1ea7988df01f961ff5c77382e156ef45fead2bb97bddbb38b208ddfa9c709e4f34 SHA512 99a0fd74fe19144819fd9522836474e10c1593787eb464694bdc6224b2d4a9331e31d2ecafc35c2bbb9bf67f20186295b28f9374c1fdcd05ac13f5f400219489 DIST Python-3.9.18.tar.xz 19673928 BLAKE2B 97da9bedaf29101e5df82199ac3ee12f1da74d5cc89de21ff1510c3f6d34d7f9194489e79855f1ab3c6f26768738e784cb7231c1a692fa746edd21d35558bc4e SHA512 aab155aca757d298394eddb91ff9a8f239665bd46feb495c6b6f735bbcb7489c05c858cc4cd08f1575c24f293b33492d763e9a140d92f0b2b0cc81a165a677c7 @@ -18,5 +20,6 @@ DIST python-gentoo-patches-3.11.7_p1.tar.xz 8364 BLAKE2B 246da406e6d58d85ab2ef79 DIST python-gentoo-patches-3.12.1.tar.xz 5152 BLAKE2B bd1470dbdb4a3336f499534131d9f67329d6a1f6378b61592f6168d9a2500d9d9d65a77167065f80c38745fa1464a2073eac3e4bc0e5c096eefbbc8971a077b6 SHA512 2e608940f2f8c3a4be2699365acd1967d887c7895e71b173327dfe91ea41b6fb10a83d0845b2caa8b59884aa73ea73e49535d7805dc8b50f63b7fcdda67b438a 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.13.0a3.tar.xz 5176 BLAKE2B 388453fe1bee3a901fc526f15580cfd9e2db60bda6ed0d0546df3d1bca8bbfd680931533c8b22f091699be6886985378ef2d8e5c8f2819fa53a1aa8a1cb51750 SHA512 9787feb96bfd50d9be9a5324a3e0c30175baae9fdcb62adb7fcf0d625b6b84494dc4ecefab8f8291256ef508f908350dcb781e1bdd0b12956e662bbe97fad3ae 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/python-3.10.13.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.10.13.ebuild index b71238d52f5..0b1e7b33f03 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 @@ -76,7 +76,7 @@ DEPEND=" " # autoconf-archive needed to eautoreconf BDEPEND=" - sys-devel/autoconf-archive + dev-build/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) 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 d7e61dca5f9..b484a90f142 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 @@ -76,7 +76,7 @@ DEPEND=" " # autoconf-archive needed to eautoreconf BDEPEND=" - sys-devel/autoconf-archive + dev-build/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) 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 1ba026283cf..1f73dafbbdb 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 @@ -81,7 +81,7 @@ DEPEND=" " # autoconf-archive needed to eautoreconf BDEPEND=" - sys-devel/autoconf-archive + dev-build/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) 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 8b1d4b1a483..3f4f8f84f7d 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 @@ -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 @@ -81,7 +81,7 @@ DEPEND=" " # autoconf-archive needed to eautoreconf BDEPEND=" - sys-devel/autoconf-archive + dev-build/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) 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 35ae0c00ceb..3d383937a48 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 @@ -80,7 +80,7 @@ DEPEND=" " # autoconf-archive needed to eautoreconf BDEPEND=" - sys-devel/autoconf-archive + dev-build/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.13.0_alpha3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.13.0_alpha3.ebuild new file mode 100644 index 00000000000..2cd791faab2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.13.0_alpha3.ebuild @@ -0,0 +1,533 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic multiprocessing pax-utils +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}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE=" + https://www.python.org/ + https://github.com/python/cpython/ +" +SRC_URI=" + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc + ) +" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +IUSE=" + bluetooth build debug +ensurepip examples gdbm libedit + +ncurses pgo +readline +sqlite +ssl test tk valgrind +" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND=" + app-arch/bzip2:= + app-arch/xz-utils:= + app-crypt/libb2 + >=dev-libs/expat-2.1:= + dev-libs/libffi:= + dev-python/gentoo-common + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + virtual/libintl + ensurepip? ( dev-python/ensurepip-pip ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + kernel_linux? ( sys-apps/util-linux:= ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( + !libedit? ( >=sys-libs/readline-4.1:= ) + libedit? ( dev-libs/libedit:= ) + ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( >=dev-libs/openssl-1.1.1:= ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) +" +# bluetooth requires headers from bluez +DEPEND=" + ${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( + app-arch/xz-utils + dev-python/ensurepip-pip + dev-python/ensurepip-setuptools + dev-python/ensurepip-wheel + ) + valgrind? ( dev-debug/valgrind ) +" +# autoconf-archive needed to eautoreconf +BDEPEND=" + dev-build/autoconf-archive + app-alternatives/awk + virtual/pkgconfig + verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) +" +RDEPEND+=" + !build? ( app-misc/mime-types ) +" +if [[ ${PV} != *_alpha* ]]; then + RDEPEND+=" + dev-lang/python-exec[python_targets_python${PYVER/./_}(-)] + " +fi + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc + +# large file tests involve a 2.5G file being copied (duplicated) +CHECKREQS_DISK_BUILD=5500M + +QA_PKGCONFIG_VERSION=${PYVER} +# false positives -- functions specific to *BSD +QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags ) + +pkg_pretend() { + use test && check-reqs_pkg_pretend +} + +pkg_setup() { + use test && check-reqs_pkg_setup +} + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} + +src_prepare() { + # Ensure that internal copies of expat and libffi are not used. + # TODO: Makefile has annoying deps on expat headers + #rm -r Modules/expat || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + # force the correct number of jobs + # https://bugs.gentoo.org/737660 + sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die + + eautoreconf +} + +build_cbuild_python() { + # Hack to workaround get_libdir not being able to handle CBUILD, bug #794181 + local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi) + + # pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get + # propagated to sysconfig for built extensions + # + # -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway) + local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto" + local -x LDFLAGS_NODIST=${BUILD_LDFLAGS} + local -x CFLAGS= LDFLAGS= + local -x BUILD_CFLAGS="${CFLAGS_NODIST}" + local -x BUILD_LDFLAGS=${LDFLAGS_NODIST} + + # We need to build our own Python on CBUILD first, and feed it in. + # bug #847910 + local myeconfargs_cbuild=( + "${myeconfargs[@]}" + + --prefix="${BROOT}"/usr + --libdir="${cbuild_libdir:2}" + + # Avoid needing to load the right libpython.so. + --disable-shared + + # As minimal as possible for the mini CBUILD Python + # we build just for cross to satisfy --with-build-python. + --without-lto + --without-readline + --disable-optimizations + ) + + mkdir "${WORKDIR}"/${P}-${CBUILD} || die + pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die + + # Avoid as many dependencies as possible for the cross build. + mkdir Modules || die + cat > Modules/Setup.local <<-EOF || die + *disabled* + nis + _dbm _gdbm + _sqlite3 + _hashlib _ssl + _curses _curses_panel + readline + _tkinter + pyexpat + zlib + # We disabled these for CBUILD because Python's setup.py can't handle locating + # libdir correctly for cross. This should be rechecked for the pure Makefile approach, + # and uncommented if needed. + #_ctypes _crypt + EOF + + ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}" + + # Unfortunately, we do have to build this immediately, and + # not in src_compile, because CHOST configure for Python + # will check the existence of the --with-build-python value + # immediately. + emake + popd &> /dev/null || die +} + +src_configure() { + # disable automagic bluetooth headers detection + if ! use bluetooth; then + local -x ac_cv_header_bluetooth_bluetooth_h=no + fi + + append-flags -fwrapv + filter-flags -malign-double + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + # PKG_CONFIG needed for cross. + tc-export CXX PKG_CONFIG + + local dbmliborder= + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + if use pgo; then + local profile_task_flags=( + -m test + "-j$(makeopts_jobs)" + --pgo-extended + -u-network + + # We use a timeout because of how often we've had hang issues + # here. It also matches the default upstream PROFILE_TASK. + --timeout 1200 + + -x test_gdb + -x test_dtrace + + # All of these seem to occasionally hang for PGO inconsistently + # They'll even hang here but be fine in src_test sometimes. + # bug #828535 (and related: bug #788022) + -x test_asyncio + -x test_httpservers + -x test_logging + -x test_multiprocessing_fork + -x test_socket + -x test_xmlrpc + + # Hangs (actually runs indefinitely executing itself w/ many cpython builds) + # bug #900429 + -x test_tools + ) + + if has_version "app-arch/rpm" ; then + # Avoid sandbox failure (attempts to write to /var/lib/rpm) + profile_task_flags+=( + -x test_distutils + ) + fi + local -x PROFILE_TASK="${profile_task_flags[*]}" + fi + + local myeconfargs=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + + --enable-shared + --without-static-libpython + --enable-ipv6 + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --without-lto + --with-system-expat + --with-platlibdir=lib + --with-pkg-config=yes + --with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip + + $(use_with debug assertions) + $(use_enable pgo optimizations) + $(use_with readline readline "$(usex libedit editline readline)") + $(use_with valgrind) + ) + + # https://bugs.gentoo.org/700012 + if tc-is-lto; then + append-cflags $(test-flags-CC -ffat-lto-objects) + myeconfargs+=( + --with-lto + ) + fi + + # Force-disable modules we don't want built. + # See Modules/Setup for docs on how this works. Setup.local contains our local deviations. + cat > Modules/Setup.local <<-EOF || die + *disabled* + nis + $(usev !gdbm '_gdbm _dbm') + $(usev !sqlite '_sqlite3') + $(usev !ssl '_hashlib _ssl') + $(usev !ncurses '_curses _curses_panel') + $(usev !readline 'readline') + $(usev !tk '_tkinter') + EOF + + # disable implicit optimization/debugging flags + local -x OPT= + + if tc-is-cross-compiler ; then + build_cbuild_python + myeconfargs+=( + # Point the imminent CHOST build to the Python we just + # built for CBUILD. + --with-build-python="${WORKDIR}"/${P}-${CBUILD}/python + ) + fi + + # pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get + # propagated to sysconfig for built extensions + local -x CFLAGS_NODIST=${CFLAGS} + local -x LDFLAGS_NODIST=${LDFLAGS} + local -x CFLAGS= LDFLAGS= + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + if use ncurses; then + append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + fi + + econf "${myeconfargs[@]}" + + if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi + + # install epython.py as part of stdlib + echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + export PYTHONSTRICTEXTENSIONBUILD=1 + + # Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't + # end up writing bytecode & violating sandbox. + # bug #831897 + local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE} + + if use pgo ; then + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + + addwrite "/usr/lib/python${PYVER}/site-packages" + fi + + # also need to clear the flags explicitly here or they end up + # in _sysconfigdata* + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Restore saved value from above. + local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE} + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # this just happens to skip test_support.test_freeze that is broken + # without bundled expat + # TODO: get a proper skip for it upstream + local -x LOGNAME=buildbot + + local test_opts=( + -u-network + -j "$(makeopts_jobs)" + + # fails + -x test_gdb + ) + + if use sparc ; then + # bug #788022 + test_opts+=( + -x test_multiprocessing_fork + -x test_multiprocessing_forkserver + ) + fi + + # workaround docutils breaking tests + cat > Lib/docutils.py <<-EOF || die + raise ImportError("Thou shalt not import!") + EOF + + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + # workaround https://bugs.gentoo.org/775416 + addwrite "/usr/lib/python${PYVER}/site-packages" + + nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \ + CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local ret=${?} + + rm Lib/docutils.py || die + + [[ ${ret} -eq 0 ]] || die "emake test failed" +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + # the Makefile rules are broken + # https://github.com/python/cpython/issues/100221 + mkdir -p "${libdir}"/lib-dynload || die + + # -j1 hack for now for bug #843458 + emake -j1 DESTDIR="${D}" altinstall + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax-kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + rm -r "${libdir}"/ensurepip/_bundled || die + if ! use ensurepip; then + rm -r "${libdir}"/ensurepip || die + fi + if ! use sqlite; then + rm -r "${libdir}/"sqlite3 || die + fi + if ! use tk; then + rm -r "${ED}/usr/bin/idle${PYVER}" || die + rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + fi + + ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$( + printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | + emake --no-print-directory -s -f - 2>/dev/null + ) + newins Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local EPYTHON=python${PYVER} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${scriptdir}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die + # pydoc + ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die + fi +} + +pkg_postinst() { + local v + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 3.11.0_beta4-r2; then + ewarn "Python 3.11.0b4 has changed its module ABI. The .pyc files" + ewarn "installed previously are no longer valid and will be regenerated" + ewarn "(or ignored) on the next import. This may cause sandbox failures" + ewarn "when installing some packages and checksum mismatches when removing" + ewarn "old versions. To actively prevent this, rebuild all packages" + ewarn "installing Python 3.11 modules, e.g. using:" + ewarn + ewarn " emerge -1v /usr/lib/python3.11/site-packages" + fi + done +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.18.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-3.8.18.ebuild index 6fdddf7f55e..27d83e4ca8d 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 @@ -71,7 +71,7 @@ DEPEND=" " # autoconf-archive needed to eautoreconf BDEPEND=" - sys-devel/autoconf-archive + dev-build/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) 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 38032a975cf..24bb1024380 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 @@ -72,7 +72,7 @@ DEPEND=" " # autoconf-archive needed to eautoreconf BDEPEND=" - sys-devel/autoconf-archive + dev-build/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) From 55070595c99a7ffbc2f29d87e5f9d177daafdc30 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:11 +0000 Subject: [PATCH 020/127] dev-libs/glib: Sync with Gentoo It's from Gentoo commit 11641c3d40b399e3eacef4cecf256b5f2b4b5aa3. --- .../portage-stable/dev-libs/glib/Manifest | 1 + .../glib/files/glib-2.78.4-distutils.patch | 36 ++ .../dev-libs/glib/glib-2.76.4.ebuild | 4 +- .../dev-libs/glib/glib-2.78.3.ebuild | 2 +- .../dev-libs/glib/glib-2.78.4-r1.ebuild | 320 ++++++++++++++++++ .../portage-stable/dev-libs/glib/metadata.xml | 2 +- 6 files changed, 361 insertions(+), 4 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.78.4-distutils.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.4-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest index 633e3359a65..b5a930af82f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/Manifest @@ -1,2 +1,3 @@ DIST glib-2.76.4.tar.xz 5274356 BLAKE2B c9ceb514ea81e1e6ab2d0efc82c48c0d8ae6c997fd0e3c56d47a5174b027f785b58266fff73b1d1132e272305126fbff22e3c65d47de46224cd12fa49796d5bc SHA512 f76932dc5090a44880373228e2b162f338415d06f7c90f2950eab1a43bb191c56a1797da4d377594f6a999197fef4defb848039259cfa4105bb68288a928f5b7 DIST glib-2.78.3.tar.xz 5321388 BLAKE2B 6ef754b15e1ce4377eafdfc317025ac65c3d8010a8816a0cef786cec9da2af9f7d7d1da735c971ab8c848b2dcec050330e5b0fdceb156a36d739848e6160cd19 SHA512 9c1af75fb973d23ce0286d5b7836eea45f9628c148ced5ac10e10abceda05024ae4c57f01439824d3287d986527500b7b959828b630b6e4a3314b5224f4d7246 +DIST glib-2.78.4.tar.xz 5331892 BLAKE2B ada7134597d7d863e581a2bb1097ac07a63b27b53309aadab5b1d3686327ee718ad8c5c07af3fce5cc12328e728fc2c4df5fd9e69f431fa00dc634062ef7f926 SHA512 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.78.4-distutils.patch b/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.78.4-distutils.patch new file mode 100644 index 00000000000..70ceebcf709 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/files/glib-2.78.4-distutils.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/922654 +https://gitlab.gnome.org/GNOME/glib/-/issues/3134 +https://gitlab.gnome.org/GNOME/glib/-/commit/6ef967a0f930ce37a8c9b5aff969693b34714291 + +[sam: Trimmed the CI changes.] + +From 6ef967a0f930ce37a8c9b5aff969693b34714291 Mon Sep 17 00:00:00 2001 +From: Jordan Williams +Date: Fri, 1 Dec 2023 09:53:50 -0600 +Subject: [PATCH] Switch from the deprecated distutils module to the packaging + module + +The distutils module was removed in Python 3.12. +--- + +--- a/gio/gdbus-2.0/codegen/utils.py ++++ b/gio/gdbus-2.0/codegen/utils.py +@@ -19,7 +19,7 @@ + # + # Author: David Zeuthen + +-import distutils.version ++import packaging.version + import os + import sys + +@@ -166,4 +166,4 @@ def version_cmp_key(key): + v = str(key[0]) + else: + v = "0" +- return (distutils.version.LooseVersion(v), key[1]) ++ return (packaging.version.Version(v), key[1]) +-- +GitLab + + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.4.ebuild index b5bb50fb4a3..7e94c72d6e0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.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 @@ -49,7 +49,7 @@ BDEPEND=" gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) - systemtap? ( >=dev-util/systemtap-1.3 ) + systemtap? ( >=dev-debug/systemtap-1.3 ) ${PYTHON_DEPS} test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig 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 5ebdb5ce081..e7eba9b15eb 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 @@ -49,7 +49,7 @@ BDEPEND=" gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) - systemtap? ( >=dev-util/systemtap-1.3 ) + systemtap? ( >=dev-debug/systemtap-1.3 ) ${PYTHON_DEPS} test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.4-r1.ebuild new file mode 100644 index 00000000000..ec81f416256 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.4-r1.ebuild @@ -0,0 +1,320 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{10..12} ) + +inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2.1+" +SLOT="2" +IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr" +RESTRICT="!test? ( test )" +REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +# * elfutils (via libelf) does not build on Windows. gresources are not embedded +# within ELF binaries on that platform anyway and inspecting ELF binaries from +# other platforms is not that useful so exclude the dependency in this case. +# * Technically static-libs is needed on zlib, util-linux and perhaps more, but +# these are used by GIO, which glib[static-libs] consumers don't really seem +# to need at all, thus not imposing the deps for now and once some consumers +# are actually found to static link libgio-2.0.a, we can revisit and either add +# them or just put the (build) deps in that rare consumer instead of recursive +# RDEPEND here (due to lack of recursive DEPEND). +RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) + elf? ( virtual/libelf:0= ) + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# libxml2 used for optional tests that get automatically skipped +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + gtk-doc? ( >=dev-util/gtk-doc-1.33 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 ) + systemtap? ( >=dev-debug/systemtap-1.3 ) + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/packaging[${PYTHON_USEDEP}] + ') + test? ( >=sys-apps/dbus-1.2.14 ) + virtual/pkgconfig +" +# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen + +PDEPEND=" + dbus? ( gnome-base/dconf ) + mime? ( x11-misc/shared-mime-info ) +" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# dconf is needed to be able to save settings, bug #498436 + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gio-querymodules$(get_exeext) +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch + "${FILESDIR}"/${PN}-2.78.4-distutils.patch +) + +python_check_deps() { + python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" +} + +pkg_setup() { + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + if use test ; then + CONFIG_CHECK="~IPV6" + WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." + fi + linux-info_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + if use test; then + # TODO: Review the test exclusions, especially now with meson + # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 + if ! has_version dev-util/desktop-file-utils ; then + ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," + ewarn "think on installing it to get these tests run." + sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die + sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die + fi + + # gdesktopappinfo requires existing terminal (gnome-terminal or any + # other), falling back to xterm if one doesn't exist + #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then + # ewarn "Some tests will be skipped due to missing terminal program" + # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready + # for backport (or in a bump) and file new issue if still fails + sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die + # desktop-app-info/launch* might fail similarly + sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die + #fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=722604 + sed -i -e "/timer\/stop/d" glib/tests/timer.c || die + sed -i -e "/timer\/basic/d" glib/tests/timer.c || die + + ewarn "Tests for search-utils have been skipped" + sed -i -e "/search-utils/d" glib/tests/meson.build || die + + # Play nice with network-sandbox, but this approach would defeat the purpose of the test + #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die + else + # Don't build tests, also prevents extra deps, bug #512022 + sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die + fi + + # Don't build fuzzing binaries - not used + sed -i -e '/subdir.*fuzzing/d' meson.build || die + + # gdbus-codegen is a separate package + sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die + + # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon + sed -i -e '/install_dir/d' gio/tests/meson.build || die + + cat > "${T}/glib-test-ld-wrapper" <<-EOF + #!/usr/bin/env sh + exec \${LD:-ld} "\$@" + EOF + chmod a+x "${T}/glib-test-ld-wrapper" || die + sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die + + # make default sane for us + if use prefix ; then + sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die + # bug #308609, without path, bug #314057 + export PERL=perl + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + # fix standards conflicts + sed -i \ + -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \ + -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \ + meson.build || die + sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ + glib/giounix.c || die + fi + + # disable native macOS integrations + sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \ + meson.build || die + sed -i \ + -e '/AvailabilityMacros.h/d' \ + gio/giomodule.c || die + + default + gnome2_environment_reset + # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only +} + +multilib_src_configure() { + # TODO: figure a way to pass appropriate values for all cross properties + # that glib uses (search for get_cross_property) + #if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + # TODO-meson: This should be in meson cross file as 'growing_stack' + # property; and more, look at get_cross_property + #case ${CHOST} in + #hppa*|metag*) export glib_cv_stack_grows=yes ;; + #*) export glib_cv_stack_grows=no ;; + #esac + #fi + + local emesonargs=( + --buildtype $(usex debug debug plain) + -Ddefault_library=$(usex static-libs both shared) + -Druntime_dir="${EPREFIX}"/run + $(meson_feature selinux) + $(meson_use xattr) + -Dlibmount=enabled # only used if host_system == 'linux' + -Dman=true + $(meson_use systemtap dtrace) + $(meson_use systemtap) + $(meson_feature sysprof) + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_use test tests) + -Dinstalled_tests=false + -Dnls=enabled + -Doss_fuzz=disabled + $(meson_native_use_feature elf libelf) + -Dmultiarch=false + ) + meson_src_configure +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + export TZ=UTC + unset GSETTINGS_BACKEND # bug #596380 + python_setup + + # https://bugs.gentoo.org/839807 + local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} + addpredict /usr/b + + # Related test is a bit nitpicking + mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + + meson_src_test --timeout-multiplier 2 --no-suite flaky +} + +multilib_src_install() { + meson_src_install + keepdir /usr/$(get_libdir)/gio/modules +} + +multilib_src_install_all() { + # These are installed by dev-util/glib-utils + # TODO: With patching we might be able to get rid of the python-any deps + # and removals, and test depend on glib-utils instead; revisit now with + # meson + rm "${ED}/usr/bin/glib-genmarshal" || die + rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die + rm "${ED}/usr/bin/glib-mkenums" || die + rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die + rm "${ED}/usr/bin/gtester-report" || die + rm "${ED}/usr/share/man/man1/gtester-report.1" || die + # gdbus-codegen manpage installed by dev-util/gdbus-codegen + rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die +} + +pkg_preinst() { + xdg_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"${cache} || die + else + touch "${ED}"${cache} || die + fi + } + + # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache + # file due to inability to create it and GIO might not look at any of the modules there + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_preinst + fi +} + +pkg_postinst() { + xdg_pkg_postinst + # glib installs no schemas itself, but we force update for fresh install in case + # something has dropped in a schemas file without direct glib dep; and for upgrades + # in case the compiled schema format could have changed + gnome2_schemas_update + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_postinst + else + ewarn "Updating of GIO modules cache skipped due to cross-compilation." + ewarn "You might want to run gio-querymodules manually on the target for" + ewarn "your final image for performance reasons and re-run it when packages" + ewarn "installing GIO modules get upgraded or added to the image." + fi + + for v in ${REPLACING_VERSIONS}; do + if ver_test "$v" "-lt" "2.63.6"; then + ewarn "glib no longer installs the gio-launch-desktop binary. You may need" + ewarn "to restart your session for \"Open With\" dialogs to work." + fi + done +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled + fi +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/glib/metadata.xml index 79eb1eaf570..30120d5d64c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/metadata.xml @@ -21,7 +21,7 @@ Build support for profiling and tracing using - dev-util/systemtap + dev-debug/systemtap Enable profiling data capture support using From dfa353643acb9ea9ab56766236e6d3b23c7d380c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:12 +0000 Subject: [PATCH 021/127] dev-libs/inih: Sync with Gentoo It's from Gentoo commit 2dd3a8d117228f575688a0c862b0eb72a68cb9f9. --- .../portage-stable/dev-libs/inih/Manifest | 2 +- .../dev-libs/inih/inih-57-r1.ebuild | 2 +- .../dev-libs/inih/inih-57.ebuild | 30 ------------------- .../{inih-56-r1.ebuild => inih-58.ebuild} | 8 ++--- 4 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/inih/inih-57.ebuild rename sdk_container/src/third_party/portage-stable/dev-libs/inih/{inih-56-r1.ebuild => inih-58.ebuild} (75%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/inih/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/inih/Manifest index eee67f4d9c0..52b0f107e15 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/inih/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/inih/Manifest @@ -1,2 +1,2 @@ -DIST inih-56.tar.gz 18458 BLAKE2B 51935959a9eb4e393b17302f0932a232963883680f10d404c63d5f2ebbd3bf0b740f44edfa1b2541d0e130016eb853ebedf68a1c40797f658496e2a8c966af3d SHA512 ff3e0910990f73e5b21fddc84737ab346279f201c86c7ad864c6cad9de5bde57c3e0a433b9b8f3585b7d86feaae2ea074185f92891dcadc98c274c1c0745d2d2 DIST inih-57.tar.gz 18954 BLAKE2B df2e2a14b4186616071f6ad2a64e0423148fb9a4624a74d4b16845a4a12eb72b1965f1314b92a710b80cc68d85dbe4ef09d6db159b76be856a4041f21a8c520c SHA512 9f758df876df54ed7e228fd82044f184eefbe47e806cd1e6d62e1b0ea28e2c08e67fa743042d73b4baef0b882480e6afe2e72878b175822eb2bdbb6d89c0e411 +DIST inih-58.tar.gz 19964 BLAKE2B ba71b21b30c039df026adbd29b422b064934046ced21a37479421e866b73969826dc1fea4e3bc0c5ea427248c774d8f80b83056c54769d454bafa2f336d08024 SHA512 d69f488299c1896e87ddd3dd20cd9db5848da7afa4c6159b8a99ba9a5d33f35cadfdb9f65d6f2fe31decdbadb8b43bf610ff2699df475e1f9ff045e343ac26ae 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 index 5e06140e5a5..98e9528ea2d 100644 --- 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 @@ -15,7 +15,7 @@ S="${WORKDIR}"/inih-r${PV} LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" DOCS=( README.md ) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/inih/inih-57.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/inih/inih-57.ebuild deleted file mode 100644 index bb6473c9f6c..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/inih/inih-57.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2020-2023 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 - -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_src_configure -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/inih/inih-56-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/inih/inih-58.ebuild similarity index 75% rename from sdk_container/src/third_party/portage-stable/dev-libs/inih/inih-56-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/inih/inih-58.ebuild index e287c82e011..6793c8255fc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/inih/inih-56-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/inih/inih-58.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ 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 +inherit meson-multilib DESCRIPTION="inih (INI not invented here) simple .INI file parser" HOMEPAGE="https://github.com/benhoyt/inih" @@ -15,7 +15,7 @@ S="${WORKDIR}"/inih-r${PV} LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" DOCS=( README.md ) @@ -26,5 +26,5 @@ src_configure() { -Dwith_INIReader=true ) - meson_src_configure + meson-multilib_src_configure } From ba6c1af479a36557cf9606d09b77aafaf12ffda9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:12 +0000 Subject: [PATCH 022/127] dev-libs/jansson: Sync with Gentoo It's from Gentoo commit e92da579956495086c78eac089068406effd57e5. --- .../portage-stable/dev-libs/jansson/jansson-2.14-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/jansson/jansson-2.14-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/jansson/jansson-2.14-r2.ebuild index 8f8601ce904..094aa5550e1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/jansson/jansson-2.14-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/jansson/jansson-2.14-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 @@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~ IUSE="doc static-libs" BDEPEND=" - sys-devel/autoconf-archive + dev-build/autoconf-archive doc? ( dev-python/sphinx ) " From 884e2f9ed0931f76c50daf8550f7b2f051afdad4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:15 +0000 Subject: [PATCH 023/127] dev-libs/libbsd: Sync with Gentoo It's from Gentoo commit a66e9174d502778cb4f26d46f80a474b2b869ec7. --- .../dev-libs/libbsd/libbsd-0.11.7-r2.ebuild | 5 ++++- .../portage-stable/dev-libs/libbsd/libbsd-0.11.8.ebuild | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild index f90a90c9b11..ad818980639 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libbsd/libbsd-0.11.7-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 @@ -35,6 +35,9 @@ src_prepare() { } multilib_src_configure() { + # Broken (still) with lld-17 (bug #922342, bug #915068) + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + # bug 911726, https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/26 filter-flags -fno-semantic-interposition 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 index b86e2471024..d873c78482e 100644 --- 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 @@ -4,7 +4,7 @@ EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/guillemjover.asc -inherit multilib multilib-minimal verify-sig +inherit flag-o-matic 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" @@ -24,6 +24,12 @@ DEPEND=" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-guillemjover )" multilib_src_configure() { + # Broken (still) with lld-17 (bug #922342, bug #915068) + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + # bug #911726 + filter-flags -fno-semantic-interposition + # The build system will install libbsd-ctor.a despite USE="-static-libs" # which is correct, see: # https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8 From 9bc579b916ff6f5eb735489e70957e48f5be326f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:15 +0000 Subject: [PATCH 024/127] dev-libs/libdnet: Sync with Gentoo It's from Gentoo commit 074fdbb1bf93766079e0310c5543088cdd4ed5e8. --- .../portage-stable/dev-libs/libdnet/Manifest | 2 - .../libdnet/files/libdnet-1.14-ndisc.patch | 796 ------------------ .../libdnet/files/libdnet-1.14-strlcpy.patch | 10 - .../dev-libs/libdnet/libdnet-1.14-r2.ebuild | 84 -- .../dev-libs/libdnet/libdnet-1.16.1.ebuild | 79 -- .../dev-libs/libdnet/libdnet-1.16.2.ebuild | 12 +- 6 files changed, 5 insertions(+), 978 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libdnet/files/libdnet-1.14-ndisc.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libdnet/files/libdnet-1.14-strlcpy.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.14-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/Manifest index 295d6a35d50..d7438fa70aa 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/Manifest @@ -1,5 +1,3 @@ -DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93 -DIST libdnet-1.16.1.tar.gz 666619 BLAKE2B 74472af1bc97c4771909e926eb9b27193c50d665036672fc89ff21159408daeef090e682c5e76e19f31d04e802fb73edf01d1aa057b543568f534d31f8db375b SHA512 9c6899b42502f3892463f1ec694934cc3b02831222fa15b5a899868229366ed4e9cc728ea2c70ec857ee9d676d763b1e390f6878a597a33f7d1cd5a7bd870586 DIST libdnet-1.16.2.tar.gz 675191 BLAKE2B 04e4533dbe45700decec4755c7db608d0ca68be05431bf44e6984b2c6a4aec55888fc0f0159916c8ac4a60ec5f743047d2a0a541786cd13fda61739bd7eef0fb SHA512 4b1902553a57eeb56952968e15be032de92d8106dc6e0ebf8e10470605c9c2ed69cb015f4057a5c119d01509c6795fc0dcda85a311d14124dddefdeb6223f848 DIST libdnet-1.16.4.tar.gz 684358 BLAKE2B 40be891c9004288329aaee0c79a29ebf0f095dfaaca4da98fd5ecfd759e22b8d10dc6b906200db1ac5b0a8cfbbea8fbe509da393e60cddeb5f875ad179cdc67a SHA512 6c5556e365047afcc5da3f76b1c99aa70723c076a7cf75c03d96a661a583dfa6d0ab605076e68efffe5ddca2d69875e4bc4938e0874b8aa24915fcfbfe3f3ff9 DIST libdnet-1.17.0.tar.gz 684645 BLAKE2B b208cb41201145411b1949531cb1ab27b4edc6026b8ca703c24231fdb021f46bfe922eb1da11090c271f439339f5384c93168fad3130ed2f89b3d2eca5c7f89f SHA512 b207b2f61e3759a2b17827eabf37b0eb68cb9fa27418f99ee4efd754b01dfe8504dff465664b14054d54df334195d43963d142c7104dc603b2b8b1491590d2a7 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/files/libdnet-1.14-ndisc.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/files/libdnet-1.14-ndisc.patch deleted file mode 100644 index 439ffb7cb92..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/files/libdnet-1.14-ndisc.patch +++ /dev/null @@ -1,796 +0,0 @@ -From 1c324828f4c6c64c9340f169bc059152dba1f998 Mon Sep 17 00:00:00 2001 -From: Stas Grabois -Date: Sat, 5 Sep 2020 13:15:32 +0300 -Subject: [PATCH] IPv6 support - ---- - configure | 20 ++++ - configure.ac | 7 ++ - include/dnet.h | 1 + - include/dnet/Makefile.am | 2 +- - include/dnet/Makefile.in | 2 +- - include/dnet/ip6.h | 3 + - include/dnet/ndisc.h | 35 +++++++ - include/dnet/route.h | 3 + - src/Makefile.in | 2 +- - src/intf.c | 101 +++++++++++++------- - src/ip6.c | 56 +++++++++++ - src/ndisc-linux.c | 197 +++++++++++++++++++++++++++++++++++++++ - src/ndisc-none.c | 55 +++++++++++ - src/route-linux.c | 95 ++++++++++++++++++- - 14 files changed, 541 insertions(+), 38 deletions(-) - create mode 100644 include/dnet/ndisc.h - create mode 100644 src/ndisc-linux.c - create mode 100644 src/ndisc-none.c - ---- a/configure -+++ b/configure -@@ -22025,6 +22025,26 @@ - - fi - -+if test "$ac_cv_dnet_linux_procfs" = yes ; then -+ case $LIBOBJS in -+ "ndisc-linux.$ac_objext" | \ -+ *" ndisc-linux.$ac_objext" | \ -+ "ndisc-linux.$ac_objext "* | \ -+ *" ndisc-linux.$ac_objext "* ) ;; -+ *) LIBOBJS="$LIBOBJS ndisc-linux.$ac_objext" ;; -+esac -+ -+else -+ case $LIBOBJS in -+ "ndisc-none.$ac_objext" | \ -+ *" ndisc-none.$ac_objext" | \ -+ "ndisc-none.$ac_objext "* | \ -+ *" ndisc-none.$ac_objext "* ) ;; -+ *) LIBOBJS="$LIBOBJS ndisc-none.$ac_objext" ;; -+esac -+ -+fi -+ - if test "$ac_cv_header_linux_if_tun_h" = yes ; then - case $LIBOBJS in - "tun-linux.$ac_objext" | \ ---- a/configure.ac -+++ b/configure.ac -@@ -303,6 +303,13 @@ - AC_LIBOBJ([route-none]) - fi - -+dnl Check for ndisc interface. -+if test "$ac_cv_dnet_linux_procfs" = yes ; then -+ AC_LIBOBJ([ndisc-linux]) -+else -+ AC_LIBOBJ([ndisc-none]) -+fi -+ - dnl Check for tun interface. - if test "$ac_cv_header_linux_if_tun_h" = yes ; then - AC_LIBOBJ([tun-linux]) ---- a/include/dnet.h -+++ b/include/dnet.h -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/include/dnet/Makefile.am -+++ b/include/dnet/Makefile.am -@@ -5,4 +5,4 @@ - dnetincludedir = $(includedir)/dnet - - dnetinclude_HEADERS = addr.h arp.h blob.h eth.h fw.h icmp.h intf.h ip.h \ -- ip6.h os.h rand.h route.h tcp.h tun.h udp.h sctp.h -+ ip6.h os.h rand.h route.h tcp.h tun.h udp.h sctp.h ndisc.h ---- a/include/dnet/Makefile.in -+++ b/include/dnet/Makefile.in -@@ -106,7 +106,7 @@ - dnetincludedir = $(includedir)/dnet - - dnetinclude_HEADERS = addr.h arp.h blob.h eth.h fw.h icmp.h intf.h ip.h \ -- ip6.h os.h rand.h route.h tcp.h tun.h udp.h sctp.h -+ ip6.h os.h rand.h route.h tcp.h tun.h udp.h sctp.h ndisc.h - - subdir = include/dnet - mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs ---- a/include/dnet/ip6.h -+++ b/include/dnet/ip6.h -@@ -179,6 +179,9 @@ - char *ip6_ntoa(const ip6_addr_t *ip6); - #define ip6_aton ip6_pton - -+ssize_t ip6_add_option(void *buf, size_t len, -+ int proto, const void *optbuf, size_t optlen); -+ - void ip6_checksum(void *buf, size_t len); - __END_DECLS - -new file mode 100644 ---- a//dev/null -+++ b/include/dnet/ndisc.h -@@ -0,0 +1,35 @@ -+/* -+ * ndisc.c -+ * -+ * Kernel arp/ndisc table operations. -+ * -+ * Copyright (c) 2000 Dug Song -+ * -+ */ -+ -+#ifndef DNET_NDISC_H -+#define DNET_NDISC_H -+ -+/* -+ * NDISC cache entry -+ */ -+struct ndisc_entry { -+ int intf_index; -+ struct addr ndisc_pa; /* protocol address */ -+ struct addr ndisc_ha; /* hardware address */ -+}; -+ -+typedef struct ndisc_handle ndisc_t; -+ -+typedef int (*ndisc_handler)(const struct ndisc_entry *entry, void *arg); -+ -+__BEGIN_DECLS -+ndisc_t *ndisc_open(void); -+int ndisc_add(ndisc_t *n, const struct ndisc_entry *entry); -+int ndisc_delete(ndisc_t *n, const struct ndisc_entry *entry); -+int ndisc_get(ndisc_t *n, struct ndisc_entry *entry); -+int ndisc_loop(ndisc_t *n, ndisc_handler callback, void *arg); -+ndisc_t *ndisc_close(ndisc_t *r); -+__END_DECLS -+ -+#endif /* DNET_NDISC_H */ ---- a/include/dnet/route.h -+++ b/include/dnet/route.h -@@ -26,7 +26,10 @@ - __BEGIN_DECLS - route_t *route_open(void); - int route_add(route_t *r, const struct route_entry *entry); -+int route_add_dev(route_t *r, const struct route_entry *entry, const char* dev); -+int route6_add(route_t *r, const struct route_entry *entry, int intf_index); - int route_delete(route_t *r, const struct route_entry *entry); -+int route6_delete(route_t *r, const struct route_entry *entry, int intf_index); - int route_get(route_t *r, struct route_entry *entry); - int route_loop(route_t *r, route_handler callback, void *arg); - route_t *route_close(route_t *r); ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -144,7 +144,7 @@ - intf-win32.c intf.c ip-cooked.c ip-win32.c ip.c memcmp.c \ - route-bsd.c route-hpux.c route-linux.c route-none.c \ - route-win32.c strlcat.c strlcpy.c strsep.c tun-bsd.c \ -- tun-linux.c tun-none.c tun-solaris.c -+ tun-linux.c tun-none.c tun-solaris.c ndisc-linux.c ndisc-none.c - SOURCES = $(libdnet_la_SOURCES) - - all: all-am ---- a/src/intf.c -+++ b/src/intf.c -@@ -20,6 +20,9 @@ - # define IP_MULTICAST - #endif - #include -+#ifdef HAVE_NET_IF_DL_H -+# include -+#endif - #ifdef HAVE_NET_IF_VAR_H - # include - #endif -@@ -79,6 +82,21 @@ - u_char ifcbuf[4192]; - }; - -+/* TODO: move to .h */ -+union sockunion { -+#ifdef HAVE_NET_IF_DL_H -+ struct sockaddr_dl sdl; -+#endif -+ struct sockaddr_in sin; -+#ifdef HAVE_SOCKADDR_IN6 -+ struct sockaddr_in6 sin6; -+#endif -+ struct sockaddr sa; -+#ifdef AF_RAW -+ struct sockaddr_raw sr; -+#endif -+}; -+ - static int - intf_flags_to_iff(u_short flags, int iff) - { -@@ -129,14 +147,10 @@ - - setsockopt(intf->fd, SOL_SOCKET, SO_BROADCAST, - (const char *) &one, sizeof(one)); --#ifdef SIOCGIFNETMASK_IN6 - if ((intf->fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { --# ifdef EPROTONOSUPPORT - if (errno != EPROTONOSUPPORT) --# endif - return (intf_close(intf)); - } --#endif - } - return (intf); - } -@@ -586,34 +600,50 @@ - return (_intf_get_aliases(intf, entry)); - } - -+static int -+get_max_bits(const struct addr *a) -+{ -+ if (a->addr_type == ADDR_TYPE_IP) { -+ return IP_ADDR_BITS; -+ } else if (a->addr_type == ADDR_TYPE_IP6) { -+ return IP6_ADDR_BITS; -+ } else { -+ return 0; -+ } -+} -+ - static int - _match_intf_src(const struct intf_entry *entry, void *arg) - { -- int matched = 0; -- int cnt; - struct intf_entry *save = (struct intf_entry *)arg; -- -- if (entry->intf_addr.addr_type == ADDR_TYPE_IP && -- entry->intf_addr.addr_ip == save->intf_addr.addr_ip) { -- matched = 1; -- } else { -- for (cnt = 0; !matched && cnt < (int) entry->intf_alias_num; cnt++) { -- if (entry->intf_alias_addrs[cnt].addr_type != ADDR_TYPE_IP) -- continue; -- if (entry->intf_alias_addrs[cnt].addr_ip == save->intf_addr.addr_ip) -- matched = 1; -- } -+ int len = save->intf_len < entry->intf_len ? save->intf_len : entry->intf_len; -+ int i; -+ -+ struct addr a, saved_addr; -+ -+ saved_addr = save->intf_addr; -+ saved_addr.addr_bits = get_max_bits(&saved_addr); -+ -+ a = entry->intf_addr; -+ a.addr_bits = get_max_bits(&a); -+ -+ if (addr_cmp(&a, &saved_addr) == 0) { -+ memcpy(save, entry, len); -+ return 1; - } - -- if (matched) { -- /* XXX - truncated result if entry is too small. */ -- if (save->intf_len < entry->intf_len) -- memcpy(save, entry, save->intf_len); -- else -- memcpy(save, entry, entry->intf_len); -- return (1); -+ for (i = 0; i < (int)entry->intf_alias_num; i++) { -+ a = entry->intf_alias_addrs[i]; -+ a.addr_bits = get_max_bits(&a); -+ -+ if (addr_cmp(&a, &saved_addr) == 0) { -+ memcpy(save, entry, len); -+ save->intf_addr = entry->intf_alias_addrs[i]; -+ return 1; -+ } - } -- return (0); -+ -+ return 0; - } - - int -@@ -631,24 +661,27 @@ - int - intf_get_dst(intf_t *intf, struct intf_entry *entry, struct addr *dst) - { -- struct sockaddr_in sin; -+ union sockunion sun; - socklen_t n; - -- if (dst->addr_type != ADDR_TYPE_IP) { -+ int fd; -+ -+ if (dst->addr_type != ADDR_TYPE_IP && dst->addr_type != ADDR_TYPE_IP6) { - errno = EINVAL; - return (-1); - } -- addr_ntos(dst, (struct sockaddr *)&sin); -- sin.sin_port = htons(666); -- -- if (connect(intf->fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) -+ addr_ntos(dst, (struct sockaddr *)&sun); -+ sun.sin.sin_port = htons(666); -+ -+ fd = dst->addr_type == ADDR_TYPE_IP6 ? intf->fd6 : intf->fd; -+ if (connect(fd, (struct sockaddr *)&sun, sizeof(sun)) < 0) - return (-1); - -- n = sizeof(sin); -- if (getsockname(intf->fd, (struct sockaddr *)&sin, &n) < 0) -+ n = sizeof(sun); -+ if (getsockname(fd, (struct sockaddr *)&sun, &n) < 0) - return (-1); - -- addr_ston((struct sockaddr *)&sin, &entry->intf_addr); -+ addr_ston((struct sockaddr *)&sun, &entry->intf_addr); - - if (intf_loop(intf, _match_intf_src, entry) != 1) - return (-1); ---- a/src/ip6.c -+++ b/src/ip6.c -@@ -9,6 +9,8 @@ - #include "config.h" - - #include "dnet.h" -+#include -+#include - - #define IP6_IS_EXT(n) \ - ((n) == IP_PROTO_HOPOPTS || (n) == IP_PROTO_DSTOPTS || \ -@@ -70,3 +72,57 @@ - } - } - } -+ -+ssize_t -+ip6_add_option(void *buf, size_t len, int proto, -+ const void *optbuf, size_t optlen) -+{ -+ struct ip6_hdr *ip6; -+ struct tcp_hdr *tcp = NULL; -+ u_char *p; -+ int hl, datalen, padlen; -+ -+ if (proto != IP_PROTO_TCP) { -+ errno = EINVAL; -+ return (-1); -+ } -+ -+ ip6 = (struct ip6_hdr *)buf; -+ p = (u_char *)buf + IP6_HDR_LEN; -+ -+ tcp = (struct tcp_hdr *)p; -+ hl = tcp->th_off << 2; -+ p = (u_char *)tcp + hl; -+ -+ datalen = ntohs(ip6->ip6_plen) + IP6_HDR_LEN - (p - (u_char *)buf); -+ -+ /* Compute padding to next word boundary. */ -+ if ((padlen = 4 - (optlen % 4)) == 4) -+ padlen = 0; -+ -+ /* XXX - IP_HDR_LEN_MAX == TCP_HDR_LEN_MAX */ -+ if (hl + optlen + padlen > IP_HDR_LEN_MAX || -+ ntohs(ip6->ip6_plen) + IP6_HDR_LEN + optlen + padlen > len) { -+ errno = EINVAL; -+ return (-1); -+ } -+ -+ /* Shift any existing data. */ -+ if (datalen) { -+ memmove(p + optlen + padlen, p, datalen); -+ } -+ /* XXX - IP_OPT_NOP == TCP_OPT_NOP */ -+ if (padlen) { -+ memset(p, IP_OPT_NOP, padlen); -+ p += padlen; -+ } -+ memmove(p, optbuf, optlen); -+ p += optlen; -+ optlen += padlen; -+ -+ tcp->th_off = (p - (u_char *)tcp) >> 2; -+ -+ ip6->ip6_plen = htons(ntohs(ip6->ip6_plen) + optlen); -+ -+ return (optlen); -+} -new file mode 100644 ---- a//dev/null -+++ b/src/ndisc-linux.c -@@ -0,0 +1,197 @@ -+/* -+ * ndisc-linux.c -+ * -+ * Copyright (c) 2000 Dug Song -+ * -+ */ -+ -+#include "config.h" -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "dnet.h" -+ -+struct ndisc_handle -+{ -+ int nlfd; -+ int seq; -+}; -+ -+ndisc_t * -+ndisc_open(void) -+{ -+ struct sockaddr_nl snl; -+ ndisc_t *n; -+ -+ if ((n = calloc(1, sizeof(*n))) != NULL) { -+ n->nlfd = -1; -+ -+ if ((n->nlfd = socket(AF_NETLINK, SOCK_RAW, -+ NETLINK_ROUTE)) < 0) -+ return (ndisc_close(n)); -+ -+ memset(&snl, 0, sizeof(snl)); -+ snl.nl_family = AF_NETLINK; -+ -+ if (bind(n->nlfd, (struct sockaddr *)&snl, sizeof(snl)) < 0) -+ return (ndisc_close(n)); -+ } -+ return (n); -+} -+ -+static int -+netlink_addattr(struct nlmsghdr *n, int type, const void *data, int data_len) -+{ -+ int len = RTA_LENGTH(data_len); -+ struct rtattr *rta; -+ -+ rta = (struct rtattr *)((uint8_t*)n + NLMSG_ALIGN(n->nlmsg_len)); -+ rta->rta_type = type; -+ rta->rta_len = len; -+ memcpy(RTA_DATA(rta), data, data_len); -+ n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len); -+ return 0; -+} -+ -+int -+ndisc_modify(ndisc_t *n, const struct ndisc_entry *entry, int type, int flags) -+{ -+ struct nlmsghdr *nmsg; -+ struct ndmsg *ndm; -+ struct rtattr *rta; -+ struct sockaddr_nl snl; -+ struct iovec iov; -+ struct msghdr msg; -+ u_char buf[512]; -+ int i, af, alen; -+ -+ switch (entry->ndisc_pa.addr_type) { -+ case ADDR_TYPE_IP: -+ af = AF_INET; -+ alen = IP_ADDR_LEN; -+ break; -+ case ADDR_TYPE_IP6: -+ af = AF_INET6; -+ alen = IP6_ADDR_LEN; -+ break; -+ default: -+ errno = EINVAL; -+ return (-1); -+ } -+ memset(buf, 0, sizeof(buf)); -+ -+ nmsg = (struct nlmsghdr *)buf; -+ nmsg->nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg)); -+ nmsg->nlmsg_flags = NLM_F_REQUEST | flags; -+ nmsg->nlmsg_type = type; -+ nmsg->nlmsg_seq = ++n->seq; -+ -+ nmsg->nlmsg_flags |= NLM_F_ACK; -+ -+ ndm = (struct ndmsg *)(nmsg + 1); -+ ndm->ndm_family = af; -+ ndm->ndm_state = NUD_PERMANENT; -+ ndm->ndm_ifindex = entry->intf_index; -+ -+ netlink_addattr(nmsg, NDA_DST, &entry->ndisc_pa.addr_data8[0], -+ alen); -+ -+ if (type == RTM_NEWNEIGH) { -+ netlink_addattr(nmsg, NDA_LLADDR, -+ &entry->ndisc_ha.addr_data8[0], ETH_ADDR_LEN); -+ } -+ -+ memset(&snl, 0, sizeof(snl)); -+ snl.nl_family = AF_NETLINK; -+ -+ iov.iov_base = nmsg; -+ iov.iov_len = nmsg->nlmsg_len; -+ -+ memset(&msg, 0, sizeof(msg)); -+ msg.msg_name = &snl; -+ msg.msg_namelen = sizeof(snl); -+ msg.msg_iov = &iov; -+ msg.msg_iovlen = 1; -+ -+ if (sendmsg(n->nlfd, &msg, 0) < 0) -+ return (-1); -+ -+ iov.iov_base = buf; -+ iov.iov_len = sizeof(buf); -+ -+ if ((i = recvmsg(n->nlfd, &msg, 0)) <= 0) -+ return (-1); -+ -+ if (nmsg->nlmsg_len < (int)sizeof(*nmsg) || nmsg->nlmsg_len > i || -+ nmsg->nlmsg_seq != n->seq) { -+ errno = EINVAL; -+ return (-1); -+ } -+ if (nmsg->nlmsg_type == NLMSG_ERROR) { -+ struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(nmsg); -+ errno = -err->error; -+ if (errno == 0) { -+ return 0; -+ } -+ -+ return (-1); -+ } -+ -+ return (-1); -+} -+ -+int -+ndisc_add(ndisc_t *n, const struct ndisc_entry *entry) -+{ -+ return ndisc_modify(n, entry, RTM_NEWNEIGH, NLM_F_CREATE | NLM_F_EXCL); -+} -+ -+int -+ndisc_delete(ndisc_t *n, const struct ndisc_entry *entry) -+{ -+ return ndisc_modify(n, entry, RTM_DELNEIGH, 0); -+} -+ -+int -+ndisc_get(ndisc_t *n, struct ndisc_entry *entry) -+{ -+ /* TBD */ -+ errno = ENOSYS; -+ return (-1); -+} -+ -+int -+nsidc_loop(ndisc_t *n, ndisc_handler callback, void *arg) -+{ -+ /* TBD */ -+ errno = ENOSYS; -+ return (-1); -+} -+ -+ndisc_t * -+ndisc_close(ndisc_t *n) -+{ -+ if (n != NULL) { -+ if (n->nlfd >= 0) -+ close(n->nlfd); -+ free(n); -+ } -+ return (NULL); -+} -new file mode 100644 ---- a//dev/null -+++ b/src/ndisc-none.c -@@ -0,0 +1,55 @@ -+/* -+ * ndisc-linux.c -+ * -+ * Copyright (c) 2000 Dug Song -+ * -+ */ -+ -+#include "config.h" -+ -+#include -+#include -+#include -+ -+#include "dnet.h" -+ -+ndisc_t * -+ndisc_open(void) -+{ -+ errno = ENOSYS; -+ return (NULL); -+} -+ -+int -+ndisc_add(ndisc_t *n, const struct ndisc_entry *entry) -+{ -+ errno = ENOSYS; -+ return (-1); -+} -+ -+int -+ndisc_delete(ndisc_t *n, const struct ndisc_entry *entry) -+{ -+ errno = ENOSYS; -+ return (-1); -+} -+ -+int -+ndisc_get(ndisc_t *n, struct ndisc_entry *entry) -+{ -+ errno = ENOSYS; -+ return (-1); -+} -+ -+int -+nsidc_loop(ndisc_t *n, ndisc_handler callback, void *arg) -+{ -+ errno = ENOSYS; -+ return (-1); -+} -+ -+ndisc_t * -+ndisc_close(ndisc_t *n) -+{ -+ return (NULL); -+} ---- a/src/route-linux.c -+++ b/src/route-linux.c -@@ -39,6 +39,7 @@ - - struct route_handle { - int fd; -+ int fd6; - int nlfd; - }; - -@@ -49,10 +50,13 @@ - route_t *r; - - if ((r = calloc(1, sizeof(*r))) != NULL) { -- r->fd = r->nlfd = -1; -+ r->fd = r->fd6 = r->nlfd = -1; - - if ((r->fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) - return (route_close(r)); -+ -+ if ((r->fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) -+ return (route_close(r)); - - if ((r->nlfd = socket(AF_NETLINK, SOCK_RAW, - NETLINK_ROUTE)) < 0) -@@ -90,6 +94,67 @@ - return (ioctl(r->fd, SIOCADDRT, &rt)); - } - -+int -+route_add_dev(route_t *r, const struct route_entry *entry, const char* dev) -+{ -+ struct rtentry rt; -+ struct addr dst; -+ -+ memset(&rt, 0, sizeof(rt)); -+ rt.rt_flags = RTF_UP; -+ rt.rt_dev = (char*)dev; -+ -+ if (ADDR_ISHOST(&entry->route_dst)) { -+ rt.rt_flags |= RTF_HOST; -+ memcpy(&dst, &entry->route_dst, sizeof(dst)); -+ } else -+ addr_net(&entry->route_dst, &dst); -+ -+ if (entry->route_gw.addr_ip != 0) { -+ rt.rt_flags |= RTF_GATEWAY; -+ } -+ -+ if (addr_ntos(&dst, &rt.rt_dst) < 0 || -+ addr_ntos(&entry->route_gw, &rt.rt_gateway) < 0 || -+ addr_btos(entry->route_dst.addr_bits, &rt.rt_genmask) < 0) -+ return (-1); -+ -+ int ret = (ioctl(r->fd, SIOCADDRT, &rt)); -+ return ret; -+} -+ -+int -+route6_add(route_t *r, const struct route_entry *entry, int intf_index) -+{ -+ struct in6_rtmsg rt; -+ struct addr dst; -+ -+ memset(&rt, 0, sizeof(rt)); -+ rt.rtmsg_flags = RTF_UP; -+ -+ if (ADDR_ISHOST(&entry->route_dst)) { -+ rt.rtmsg_flags |= RTF_HOST; -+ memcpy(&dst, &entry->route_dst, sizeof(dst)); -+ } else { -+ addr_net(&entry->route_dst, &dst); -+ } -+ -+ rt.rtmsg_dst_len = entry->route_dst.addr_bits; -+ rt.rtmsg_ifindex = intf_index; -+ rt.rtmsg_metric = 1; -+ -+ memcpy(&rt.rtmsg_dst, &dst.addr_ip6, sizeof(rt.rtmsg_dst)); -+ -+ if (!IN6_IS_ADDR_UNSPECIFIED(&entry->route_gw.addr_ip6)) { -+ rt.rtmsg_flags |= RTF_GATEWAY; -+ memcpy(&rt.rtmsg_gateway, &entry->route_gw.addr_ip6, -+ sizeof(rt.rtmsg_gateway)); -+ } -+ -+ int ret = (ioctl(r->fd6, SIOCADDRT, &rt)); -+ return ret; -+} -+ - int - route_delete(route_t *r, const struct route_entry *entry) - { -@@ -112,6 +177,32 @@ - return (ioctl(r->fd, SIOCDELRT, &rt)); - } - -+int -+route6_delete(route_t *r, const struct route_entry *entry, int intf_index) -+{ -+ struct in6_rtmsg rt; -+ struct addr dst; -+ -+ memset(&rt, 0, sizeof(rt)); -+ rt.rtmsg_flags = RTF_UP; -+ -+ if (ADDR_ISHOST(&entry->route_dst)) { -+ rt.rtmsg_flags |= RTF_HOST; -+ memcpy(&dst, &entry->route_dst, sizeof(dst)); -+ } else -+ addr_net(&entry->route_dst, &dst); -+ -+ rt.rtmsg_dst_len = entry->route_dst.addr_bits; -+ rt.rtmsg_ifindex = intf_index; -+ rt.rtmsg_metric = 1; -+ -+ memcpy(&rt.rtmsg_dst, &dst, sizeof(rt.rtmsg_dst)); -+ memcpy(&rt.rtmsg_gateway, &entry->route_gw, sizeof(rt.rtmsg_gateway)); -+ -+ int ret = (ioctl(r->fd6, SIOCDELRT, &rt)); -+ return ret; -+} -+ - int - route_get(route_t *r, struct route_entry *entry) - { -@@ -278,6 +369,8 @@ - if (r != NULL) { - if (r->fd >= 0) - close(r->fd); -+ if (r->fd6 >= 0) -+ close(r->fd6); - if (r->nlfd >= 0) - close(r->nlfd); - free(r); diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/files/libdnet-1.14-strlcpy.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/files/libdnet-1.14-strlcpy.patch deleted file mode 100644 index abc3a6b0f2d..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/files/libdnet-1.14-strlcpy.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/python/dnet.c -+++ b/python/dnet.c -@@ -22,6 +22,7 @@ - #endif - __PYX_EXTERN_C double pow(double, double); - #include "dnet.h" -+#include "config.h" - - - typedef struct {const char *s; const void **p;} __Pyx_CApiTabEntry; /*proto*/ diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.14-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.14-r2.ebuild deleted file mode 100644 index 90dbdead440..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.14-r2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -AT_M4DIR="config" -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_OPTIONAL=1 -inherit autotools distutils-r1 - -DESCRIPTION="simplified, portable interface to several low-level networking routines" -HOMEPAGE="https://github.com/ofalk/libdnet" -SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz" -S="${WORKDIR}/${PN}-${P}" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" -IUSE="python test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -DEPEND="python? ( ${PYTHON_DEPS} )" -RDEPEND="${DEPEND}" -BDEPEND=" - python? ( - dev-python/cython[${PYTHON_USEDEP}] - ) -" - -DOCS=( README.md THANKS ) - -PATCHES=( - "${FILESDIR}/${PN}-1.14-ndisc.patch" - "${FILESDIR}/${PN}-1.14-strlcpy.patch" -) - -src_prepare() { - default - - sed -i \ - -e 's/libcheck.a/libcheck.so/g' \ - -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ - configure.ac || die - sed -i \ - -e 's|-L$libdir ||g' \ - dnet-config.in || die - sed -i \ - -e '/^SUBDIRS/s|python||g' \ - Makefile.am || die - - eautoreconf - - if use python; then - cd python || die - distutils-r1_src_prepare - fi -} - -src_configure() { - econf \ - --disable-static \ - $(use_with python) -} - -src_compile() { - default - if use python; then - cd python || die - distutils-r1_src_compile - fi -} - -src_install() { - default - - if use python; then - cd python || die - unset DOCS - distutils-r1_src_install - fi - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.1.ebuild deleted file mode 100644 index 6321f1a1078..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) -DISTUTILS_OPTIONAL=1 -inherit autotools distutils-r1 - -DESCRIPTION="Simplified, portable interface to several low-level networking routines" -HOMEPAGE="https://github.com/ofalk/libdnet" -SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz" -S="${WORKDIR}/${PN}-${P}" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" -IUSE="python test" -RESTRICT="!test? ( test )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="dev-libs/libbsd - python? ( ${PYTHON_DEPS} )" -RDEPEND="${DEPEND}" -BDEPEND="python? ( dev-python/cython[${PYTHON_USEDEP}] ) - test? ( dev-libs/check )" - -DOCS=( README.md THANKS ) - -src_prepare() { - default - - sed -i \ - -e 's/libcheck.a/libcheck.so/g' \ - configure.ac || die - sed -i \ - -e 's|-L$libdir ||g' \ - dnet-config.in || die - sed -i \ - -e '/^SUBDIRS/s|python||g' \ - Makefile.am || die - - # Stale e.g. pkg-config macros w/ bashisms - rm aclocal.m4 {config,m4}/libtool.m4 || die - - AT_M4DIR="config" eautoreconf - - if use python; then - cd python || die - distutils-r1_src_prepare - fi -} - -src_configure() { - econf \ - $(use_with python) \ - $(use_enable test check) -} - -src_compile() { - default - if use python; then - cd python || die - distutils-r1_src_compile - fi -} - -src_install() { - default - - if use python; then - cd python || die - unset DOCS - distutils-r1_src_install - fi - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.2.ebuild index 7b853da8a2f..8ed52eca970 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libdnet/libdnet-1.16.2.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} ) DISTUTILS_OPTIONAL=1 inherit autotools distutils-r1 @@ -15,16 +15,14 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" -IUSE="python test" -RESTRICT="!test? ( test )" +IUSE="python" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND="dev-libs/libbsd python? ( ${PYTHON_DEPS} )" RDEPEND="${DEPEND}" -BDEPEND="python? ( dev-python/cython[${PYTHON_USEDEP}] ) - test? ( dev-libs/check )" +BDEPEND="python? ( dev-python/cython[${PYTHON_USEDEP}] )" DOCS=( README.md THANKS ) @@ -55,7 +53,7 @@ src_prepare() { src_configure() { econf \ $(use_with python) \ - $(use_enable test check) + --without-check } src_compile() { From 735b348df661783a20fd1827255d755b3e8131fd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:22 +0000 Subject: [PATCH 025/127] dev-libs/libltdl: Sync with Gentoo It's from Gentoo commit 0958563a4a1a43a0d800db35ece528e85f37cb39. --- .../dev-libs/libltdl/libltdl-2.4.7-r1.ebuild | 7 ++-- .../dev-libs/libltdl/libltdl-2.4.7.ebuild | 37 ------------------- 2 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild index 9aa655f9c73..8cca8705cd0 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild @@ -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="7" -# Please bump with sys-devel/libtool. +# Please bump with dev-build/libtool. inherit multilib-minimal flag-o-matic @@ -18,7 +18,8 @@ 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="static-libs" -# libltdl doesn't have a testsuite. +# libltdl doesn't have a testsuite. Don't bother trying. +RESTRICT="test" BDEPEND="app-arch/xz-utils" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7.ebuild deleted file mode 100644 index 1569cce6421..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Please bump with sys-devel/libtool. - -inherit multilib-minimal - -MY_P="libtool-${PV}" - -DESCRIPTION="A shared library tool for developers" -HOMEPAGE="https://www.gnu.org/software/libtool/" -SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz" -S="${WORKDIR}"/${MY_P}/libltdl - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="static-libs" -# libltdl doesn't have a testsuite. - -BDEPEND="app-arch/xz-utils" - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - --enable-ltdl-install \ - $(use_enable static-libs static) -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - # While the libltdl.la file is not used directly, the m4 ltdl logic - # keys off of its existence when searching for ltdl support. # bug #293921 - #use static-libs || find "${D}" -name libltdl.la -delete -} From dd9672eeb2c96d21c986994379198326a54faef9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:25 +0000 Subject: [PATCH 026/127] dev-libs/libp11: Sync with Gentoo It's from Gentoo commit f7fdfdaeec3764929686064a6054c38a6b2d7788. --- .../dev-libs/libp11/libp11-0.4.12-r1.ebuild | 4 ++-- ....4.12-r4.ebuild => libp11-0.4.12-r5.ebuild} | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-libs/libp11/{libp11-0.4.12-r4.ebuild => libp11-0.4.12-r5.ebuild} (71%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libp11/libp11-0.4.12-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libp11/libp11-0.4.12-r1.ebuild index 928c1c97516..6590012a74a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libp11/libp11-0.4.12-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libp11/libp11-0.4.12-r1.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 @@ -15,7 +15,7 @@ IUSE="doc static-libs" RDEPEND="dev-libs/openssl:=[bindist(+)]" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen )" + doc? ( app-text/doxygen )" src_configure() { econf \ diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libp11/libp11-0.4.12-r4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libp11/libp11-0.4.12-r5.ebuild similarity index 71% rename from sdk_container/src/third_party/portage-stable/dev-libs/libp11/libp11-0.4.12-r4.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libp11/libp11-0.4.12-r5.ebuild index 6e77eed1ad5..d7028ab084b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libp11/libp11-0.4.12-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libp11/libp11-0.4.12-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=8 @@ -11,19 +11,29 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" IUSE="doc static-libs test" RESTRICT="!test? ( test )" RDEPEND=" - =dev-libs/openssl-3.1.0 + =dev-libs/openssl-3.0.0 + Date: Mon, 29 Jan 2024 07:11:25 +0000 Subject: [PATCH 027/127] dev-libs/libsodium: Sync with Gentoo It's from Gentoo commit 28aeccd77dfecbcfdc518af471c4df2715b82ac0. --- .../libsodium/libsodium-1.0.19-r1.ebuild | 4 +- .../libsodium/libsodium-1.0.19-r2.ebuild | 73 +++++++++++++++++++ 2 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild index 3a6f2d65224..575daa8a505 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19-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 @@ -31,7 +31,7 @@ S="${WORKDIR}"/${PN}-stable LICENSE="ISC" SLOT="0/26" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" IUSE="+asm minimal static-libs +urandom" CPU_USE=( cpu_flags_x86_{aes,sse4_1} ) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild new file mode 100644 index 00000000000..c3e685aae87 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild @@ -0,0 +1,73 @@ +# 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/libsodium.minisig +VERIFY_SIG_METHOD=minisig +inherit autotools multilib-minimal verify-sig + +DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library" +HOMEPAGE="https://libsodium.org" + +if [[ ${PV} == *_p* ]] ; then + MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-) + + # We use _pN to represent 'stable releases' + # These are backports from upstream to the last release branch + # See https://download.libsodium.org/libsodium/releases/README.html + SRC_URI=" + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz + verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig ) + " +else + SRC_URI=" + https://download.libsodium.org/${PN}/releases/${P}.tar.gz + verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.minisig ) + " +fi + +S="${WORKDIR}"/${PN}-stable + +LICENSE="ISC" +SLOT="0/26" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" +IUSE="+asm static-libs +urandom" + +CPU_USE=( cpu_flags_x86_{aes,sse4_1} ) +IUSE+=" ${CPU_USE[@]}" + +BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch +) + +src_prepare() { + default + + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + $(use_enable asm) + $(use_enable cpu_flags_x86_aes aesni) + $(use_enable cpu_flags_x86_sse4_1 sse4_1) + $(use_enable static-libs static) + $(use_enable !urandom blocking-random) + ) + + # --disable-pie is needed on x86, see bug #512734 + # TODO: Check if still needed? + if [[ ${ABI} == x86 ]] ; then + myeconfargs+=( --disable-pie ) + fi + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + default + find "${ED}" -type f -name "*.la" -delete || die +} From a219a70d0d24dbd09e9b38beeca995a197c9ab1f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:26 +0000 Subject: [PATCH 028/127] dev-libs/libuv: Sync with Gentoo It's from Gentoo commit 14c5ce0ac5b7c92ffe52aa893ba84d625d2ecdcc. --- .../portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild | 4 ++-- .../portage-stable/dev-libs/libuv/libuv-1.46.0.ebuild | 4 ++-- .../portage-stable/dev-libs/libuv/libuv-1.47.0-r1.ebuild | 4 ++-- .../portage-stable/dev-libs/libuv/libuv-9999.ebuild | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild index e7750477946..0e54d3d5d97 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild @@ -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 @@ -20,7 +20,7 @@ LICENSE="BSD BSD-2 ISC MIT" SLOT="0/1" BDEPEND=" - sys-devel/libtool + dev-build/libtool virtual/pkgconfig " diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.46.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.46.0.ebuild index ebc3bbc8489..c99da814d35 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.46.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.46.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 @@ -20,7 +20,7 @@ LICENSE="BSD BSD-2 ISC MIT" SLOT="0/1" BDEPEND=" - sys-devel/libtool + dev-build/libtool virtual/pkgconfig " 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 465058e5976..c102af94ad4 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 @@ -13,14 +13,14 @@ 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" SLOT="0/1" BDEPEND=" - sys-devel/libtool + dev-build/libtool virtual/pkgconfig " diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild index 0028ef084a4..14fe0b49c30 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild @@ -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 @@ LICENSE="BSD BSD-2 ISC MIT" SLOT="0/1" BDEPEND=" - sys-devel/libtool + dev-build/libtool virtual/pkgconfig " From 540ada712a710d1ba9c976640c1a173da65bf088 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:26 +0000 Subject: [PATCH 029/127] dev-libs/libverto: Sync with Gentoo It's from Gentoo commit 17c9938140199f771decd94dad844c803d0eb60b. --- .../portage-stable/dev-libs/libverto/libverto-0.3.2.ebuild | 6 +++--- .../portage-stable/dev-libs/libverto/metadata.xml | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libverto/libverto-0.3.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libverto/libverto-0.3.2.ebuild index 4326fa0e327..6fb7b0c2d40 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libverto/libverto-0.3.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libverto/libverto-0.3.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools multilib-minimal @@ -11,7 +11,7 @@ SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.g LICENSE="MIT" SLOT="0" -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="glib +libev libevent +threads" REQUIRED_USE="|| ( glib libev libevent )" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libverto/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libverto/metadata.xml index 8e90132b395..53b04b18b74 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libverto/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libverto/metadata.xml @@ -6,6 +6,9 @@ eras@gentoo.org Eray Aslan + + latchset/libverto + Support event loops using dev-libs/glib Support event loops using dev-libs/libev From 2cefdb9dad8aa106637c8b032ff8731c14c1e8c3 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:26 +0000 Subject: [PATCH 030/127] dev-libs/libxml2: Sync with Gentoo It's from Gentoo commit 6bc2f8f9be31099eb91411a55ca08b4671436747. --- .../third_party/portage-stable/dev-libs/libxml2/Manifest | 2 +- .../dev-libs/libxml2/libxml2-2.11.5-r1.ebuild | 4 ++-- .../portage-stable/dev-libs/libxml2/libxml2-2.11.5.ebuild | 4 ++-- .../portage-stable/dev-libs/libxml2/libxml2-2.11.6.ebuild | 4 ++-- .../{libxml2-2.12.3.ebuild => libxml2-2.12.4.ebuild} | 6 +++--- .../portage-stable/dev-libs/libxml2/libxml2-9999.ebuild | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-libs/libxml2/{libxml2-2.12.3.ebuild => libxml2-2.12.4.ebuild} (95%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest index 5d67cd253bc..e4faf09ab38 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/Manifest @@ -1,6 +1,6 @@ DIST libxml2-2.11.5.tar.xz 2628132 BLAKE2B 4af53ef7c19cfcddcf3de5c694a1b03cf4212f8e4c4cb3d873a897fddd8a89d7a52d049a8b85e96c6cdb471689aa385512d87b9710074e90583bf7ad46319172 SHA512 8f087cdaf61957567f04280facc70211c09ca131a532fd13ed4bfc38ddec50e44b1f842b108e635bd4205232036a3e1097904ac016f1fd135bacd17aebb04272 DIST libxml2-2.11.6.tar.xz 2628652 BLAKE2B 0a1776ca44b21143c538665b6cf7a50962bb1bda6c85f45e4fd4fb7c36ecb4d592d1f5a8d38015bac06a3acb6f7adb1d4afa10fe95987197509f4c1f45b15962 SHA512 43d244450b494c7dbd3521287b87cba0c11267be8d7940a1ecd49dbf0ebefdd052c4c3472c3f267b0d8c431d9b5b964b05067af9e38bc4b0e4f46bc0445b6201 -DIST libxml2-2.12.3.tar.xz 2641720 BLAKE2B 12a7c25d2a13d839aac918268b0948a9bd3c352bc29dd09bb975a9b4ff99d299a0e157b1a90f01bdce8ddc36ede9a6834b0dc26635ac775a41bd28d9b2ad7cff SHA512 3d2f83b0a9a3db66320f2a6514e1e7b3e60c3b02bbfcd72074b22a61688b00e5b346c8ff5a59d68dfe1bb5fa8d06da2cae89b3be60e18bdf9b886077ca973aa0 +DIST libxml2-2.12.4.tar.xz 2643516 BLAKE2B d2a035636ab9c5a56773fe5c3b67780d3b59a7ffeee39cf2b62ad34d1cf3d250c5fd3055e544518713ad3351bd715fc668314165c1e9c9ce4fe3b7a84ef12872 SHA512 859f95eb659279c73d9fbaf3d84d593bcac075da91adcaf829a5feec034a1d3d03b75941879d972f3f448b5fca2caa043a10130d660b75e18573914ced7c56aa DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe 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 f61205d27dd..f11bd3c8ebe 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 @@ -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+=" @@ -53,7 +53,7 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" if [[ ${PV} == 9999 ]] ; then - BDEPEND+=" dev-util/gtk-doc-am" + BDEPEND+=" dev-build/gtk-doc-am" fi MULTILIB_CHOST_TOOLS=( diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.5.ebuild index 59aba116c58..0ccf29812cd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.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 @@ -53,7 +53,7 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" if [[ ${PV} == 9999 ]] ; then - BDEPEND+=" dev-util/gtk-doc-am" + BDEPEND+=" dev-build/gtk-doc-am" fi MULTILIB_CHOST_TOOLS=( diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.6.ebuild index ad027676e47..efd633ea121 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.11.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 @@ -53,7 +53,7 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" if [[ ${PV} == 9999 ]] ; then - BDEPEND+=" dev-util/gtk-doc-am" + BDEPEND+=" dev-build/gtk-doc-am" fi MULTILIB_CHOST_TOOLS=( diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.12.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.12.4.ebuild similarity index 95% rename from sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.12.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.12.4.ebuild index 7a65290535a..bcb12e755d3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.12.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.12.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 @@ -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+=" @@ -53,7 +53,7 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" if [[ ${PV} == 9999 ]] ; then - BDEPEND+=" dev-util/gtk-doc-am" + BDEPEND+=" dev-build/gtk-doc-am" fi MULTILIB_CHOST_TOOLS=( diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-9999.ebuild index 7a65290535a..c4d87530a6d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-9999.ebuild @@ -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 @@ -53,7 +53,7 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" if [[ ${PV} == 9999 ]] ; then - BDEPEND+=" dev-util/gtk-doc-am" + BDEPEND+=" dev-build/gtk-doc-am" fi MULTILIB_CHOST_TOOLS=( From 79593bf5c84bbd709563d0511d5e76aebd857c90 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:32 +0000 Subject: [PATCH 031/127] dev-libs/opensc: Sync with Gentoo It's from Gentoo commit 4c9634563796d4a7afb786f483a7f0965f7706f4. --- .../third_party/portage-stable/dev-libs/opensc/Manifest | 1 + .../dev-libs/opensc/opensc-0.23.0-r3.ebuild | 4 ++-- .../{opensc-0.23.0-r2.ebuild => opensc-0.24.0.ebuild} | 9 ++------- 3 files changed, 5 insertions(+), 9 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-libs/opensc/{opensc-0.23.0-r2.ebuild => opensc-0.24.0.ebuild} (89%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/opensc/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/opensc/Manifest index 5d4728329fb..9a0b274dd7e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/opensc/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/opensc/Manifest @@ -1 +1,2 @@ DIST opensc-0.23.0.tar.gz 2366469 BLAKE2B c0f74379a70347a58be27684ae2cf833e6f35328b566af2c6daa8276174864406fa176acf7ba84931970fe07e3dd8d6eccf7884f079cb0110c4d6ff9a76792dc SHA512 cd102cd64e719c59153960a4921b7525055045f16e6f6ffa8c9def6ce999a9c5098267b41f8753b41107f626bea20c34561002f5d38eddb4ce6b371913a17a1b +DIST opensc-0.24.0.tar.gz 2440952 BLAKE2B afacdd151d169dd1840ecd6df1cec99a9805598d7b7af81e17b648f146cd1b3ad1d3dcae19ed94cf8ce0dbbd5b4285af9653af5ef5739d53908ce30a49544adb SHA512 0fd2ea858874ae0b85c8fe8c4b920988693a47ca95b26449a1e95f86e17b76000f236c1f75d63ee133306e01a965155da5e14c1b8a59053b85026ecb58fb97bb diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/opensc/opensc-0.23.0-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/opensc/opensc-0.23.0-r3.ebuild index dce614bde32..9808951f0b2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/opensc/opensc-0.23.0-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/opensc/opensc-0.23.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 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git" else SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" fi LICENSE="LGPL-2.1" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/opensc/opensc-0.23.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/opensc/opensc-0.24.0.ebuild similarity index 89% rename from sdk_container/src/third_party/portage-stable/dev-libs/opensc/opensc-0.23.0-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/opensc/opensc-0.24.0.ebuild index f372e3e254a..8dfc2900122 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/opensc/opensc-0.23.0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/opensc/opensc-0.24.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 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git" else SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi LICENSE="LGPL-2.1" @@ -40,11 +40,6 @@ REQUIRED_USE=" ctapi? ( !pcsc-lite !openct ) || ( pcsc-lite openct ctapi )" -PATCHES=( - "${FILESDIR}"/${P}-CVE-2023-2977.patch - "${FILESDIR}"/${P}-backport-pr2656.patch -) - src_prepare() { default eautoreconf From 200a4f4c5b14987052ac12c4eddc18c828d99672 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:34 +0000 Subject: [PATCH 032/127] dev-libs/xmlsec: Sync with Gentoo It's from Gentoo commit 3f6205982f2e3f6fcfde59867d39fe5bd339744f. --- .../xmlsec/files/xmlsec-1.3.3-typo-fix.patch | 25 +++++ .../dev-libs/xmlsec/xmlsec-1.3.3-r1.ebuild | 94 +++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/files/xmlsec-1.3.3-typo-fix.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/xmlsec-1.3.3-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/files/xmlsec-1.3.3-typo-fix.patch b/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/files/xmlsec-1.3.3-typo-fix.patch new file mode 100644 index 00000000000..db3eae6c484 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/files/xmlsec-1.3.3-typo-fix.patch @@ -0,0 +1,25 @@ +https://github.com/lsh123/xmlsec/commit/8262167fbc56bce353949b9b18e01af7f7331e76 + +From 8262167fbc56bce353949b9b18e01af7f7331e76 Mon Sep 17 00:00:00 2001 +From: Antoine Martin +Date: Sun, 14 Jan 2024 09:13:11 -0500 +Subject: [PATCH] Fix typo with xmlSecKeyDataEcGetKlass in app.h include (#755) + +--- + include/xmlsec/app.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/xmlsec/app.h b/include/xmlsec/app.h +index 4fe2a744..324561b9 100644 +--- a/include/xmlsec/app.h ++++ b/include/xmlsec/app.h +@@ -85,7 +85,7 @@ XMLSEC_EXPORT xmlSecKeyDataId xmlSecKeyDataDsaGetKlass(void); + * + * The EC key klass. + */ +-#define xmlSecKeyDataEcId xmlSecKeyDataEcetKlass() ++#define xmlSecKeyDataEcId xmlSecKeyDataEcGetKlass() + XMLSEC_EXPORT xmlSecKeyDataId xmlSecKeyDataEcGetKlass(void); + /** + * xmlSecKeyDataGost2001Id: + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/xmlsec-1.3.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/xmlsec-1.3.3-r1.ebuild new file mode 100644 index 00000000000..f4a0c18792b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/xmlsec/xmlsec-1.3.3-r1.ebuild @@ -0,0 +1,94 @@ +# 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 + "${FILESDIR}"/${PN}-1.3.3-typo-fix.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 c15764e08131367cc35cc032b367040b21ee84d0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:50 +0000 Subject: [PATCH 033/127] dev-python/hatchling: Sync with Gentoo It's from Gentoo commit 1bf42aad7319a34ca74f3e6842504e0f0343af2a. --- .../dev-python/hatchling/Manifest | 1 + .../hatchling/hatchling-1.21.1.ebuild | 86 +++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/hatchling/hatchling-1.21.1.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 a46099e807a..59895a6ba09 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 +1,2 @@ DIST hatch-hatchling-v1.21.0.gh.tar.gz 764748 BLAKE2B 3b048ed34df4da9ed5ec8d1c0121e21aabada559e981e9fd36a7188aceedf79594b165ed705edfbc5d210a09ee9a022c8c6e433e930338f2053e4c48feef0d44 SHA512 5ee8151929d6bdbb67e7f4e3e0298c730ff7fef5a7d7b764192eb2e16327d80a2935eee8831c168d19ed41c7184ca5b5eef7a67c9d5756cea25a7bd79945d344 +DIST hatch-hatchling-v1.21.1.gh.tar.gz 774577 BLAKE2B 31e2b50598b4fe120ecea407a37e3262876a2ec1e8cf02f272c25838e73afc37f2fef1f8fab08b2e3b83bfd828f6c558ce303b084081b83504343a8bb057c341 SHA512 91b5684737fac19758d7095b357f99031d46e9f981e093cab848ce770fd1f9440b69212f3ef2217e3700e7dd7985a97c2735bbd27b306c7b8aa7bffc5c950fb4 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/hatchling/hatchling-1.21.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/hatchling/hatchling-1.21.1.ebuild new file mode 100644 index 00000000000..724901016b5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/hatchling/hatchling-1.21.1.ebuild @@ -0,0 +1,86 @@ +# Copyright 2022-2024 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 +} From 7345866855eec882c2a2c9184c66af8055a6af96 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:55 +0000 Subject: [PATCH 034/127] dev-python/lazy-object-proxy: Sync with Gentoo It's from Gentoo commit 9742085f4fcf2a08a9ef760c2c5feac0733ac193. --- .../dev-python/lazy-object-proxy/Manifest | 1 - .../lazy-object-proxy-1.10.0.ebuild | 4 +- .../lazy-object-proxy-1.9.0.ebuild | 37 ------------------- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/Manifest index fb8dbd3a595..abb574d0db4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/Manifest @@ -1,2 +1 @@ DIST lazy-object-proxy-1.10.0.tar.gz 43271 BLAKE2B f2146db4ebb3e48b4af36fa56a1656c3316896eab9e9b9c5450106b18df27a48a04c7ab8609384caf81899f956a20990e54818c836bd20b607766652d9797eca SHA512 0693a2b6d13909580e7b568a030b884f84fc1578b17e49ac4246572e3e8b18c05a2613572f24b908630528ecb606d149a106b46d079f2c42ced5172146e413c5 -DIST lazy-object-proxy-1.9.0.tar.gz 42830 BLAKE2B 565315a3e855bc5335af717d1edc947fef57514c06036280d1f4666ab9642cf7e7b4bb145da87cbca14d9efa9f4869d7ad256031983a773580dc398fb7ce25e0 SHA512 2168254a71cf52ef406e5edf4653b9c8ae05392d4ad3c2e5e8e9f8db56152d968a77d14226acdf7d962f66d460c40add335615442f6f176d697c071f9cb137f5 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.10.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.10.0.ebuild index c3731adf9c6..f72801a8669 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.10.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.10.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 @@ -19,7 +19,7 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+native-extensions" BDEPEND=" diff --git a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild deleted file mode 100644 index 388ac18b33a..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/lazy-object-proxy/lazy-object-proxy-1.9.0.ebuild +++ /dev/null @@ -1,37 +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 -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="A fast and thorough lazy object proxy" -HOMEPAGE=" - https://github.com/ionelmc/python-lazy-object-proxy/ - https://pypi.org/project/lazy-object-proxy/ - https://python-lazy-object-proxy.readthedocs.io/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" - -BDEPEND=" - dev-python/setuptools-scm[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -python_prepare_all() { - # No need to benchmark - sed \ - -e '/benchmark/s:test_:_&:g' \ - -e '/pytest.mark.benchmark/d' \ - -i tests/test_lazy_object_proxy.py || die - distutils-r1_python_prepare_all -} From 8bad2a65ca379a2da3079f15bc032d97add9347e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:56 +0000 Subject: [PATCH 035/127] dev-python/markupsafe: Sync with Gentoo It's from Gentoo commit b665ca1523d435cc0127a73bf86edbb7f1fca740. --- .../dev-python/markupsafe/Manifest | 1 + .../markupsafe/markupsafe-2.1.4.ebuild | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest index 5fcbfad2ed2..67d46cf2a1f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/Manifest @@ -1 +1,2 @@ DIST MarkupSafe-2.1.3.tar.gz 19132 BLAKE2B 1edca84c47c93fddfd22ee2fef2ba3907921ecb2d807c0e105c403d235e5abacba929be94970ad693f4c7d019653ece8255238d825bfc84d1a4a604fb476a783 SHA512 97dcfa9277c8b34e5ebf899069f690452e90943e0f84ba8ffac725263d84e7c2b782294f9f386be31e8b6846505f0ec70835e3965fc76a1ce07b19432de4a7de +DIST MarkupSafe-2.1.4.tar.gz 19288 BLAKE2B 3c358e913b0fb9fc4ea1fb4ed983a8b20a5b6fc6a7212e12cbd4bbd6753e45339dbc88068105cdcab3a86ed812ecd2cb04a6d94222c50bce3752e3125edb783b SHA512 f9abe713349ee81eb0d89c584b665440f7e9c26df3f4f87e277894aa59090cfa769e099a12b16c9029d98257dbb311e49a1d7deeeb4ca9e1863fd38e574b2d94 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.4.ebuild new file mode 100644 index 00000000000..73ae2eb5a6e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/markupsafe/markupsafe-2.1.4.ebuild @@ -0,0 +1,25 @@ +# 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 +PYPI_NO_NORMALIZE=1 +PYPI_PN="MarkupSafe" +PYTHON_COMPAT=( python3_{10..12} pypy3 ) + +inherit distutils-r1 pypi + +DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python" +HOMEPAGE=" + https://palletsprojects.com/p/markupsafe/ + https://github.com/pallets/markupsafe/ + https://pypi.org/project/MarkupSafe/ +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + +distutils_enable_tests pytest From 1ec0fdb2296e70157cd38da0fec78282024393bf Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:11:56 +0000 Subject: [PATCH 036/127] dev-python/more-itertools: Sync with Gentoo It's from Gentoo commit fdaaf401c4a56edadd1ccff537e8ca5a10842efa. --- .../dev-python/more-itertools/Manifest | 1 - .../more-itertools-10.1.0.ebuild | 24 ------------------- .../more-itertools-10.2.0.ebuild | 2 +- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/more-itertools/more-itertools-10.1.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 936fe76f175..80eeb3b1cb5 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,2 +1 @@ -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.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/more-itertools/more-itertools-10.1.0.ebuild deleted file mode 100644 index 5755901270b..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/more-itertools/more-itertools-10.1.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2023 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 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 index ea815ad1b66..f755aed5bcf 100644 --- 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 @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~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" distutils_enable_sphinx docs \ dev-python/sphinx-rtd-theme From 8aec5f3c709e5ecd8d22862939589a831f8bd304 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:12:01 +0000 Subject: [PATCH 037/127] dev-python/pluggy: Sync with Gentoo It's from Gentoo commit 18683eeae63bc305ac31fa7e52d333e1b8c16a98. --- .../portage-stable/dev-python/pluggy/Manifest | 1 + .../dev-python/pluggy/pluggy-1.4.0.ebuild | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pluggy/pluggy-1.4.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pluggy/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/pluggy/Manifest index 7d94b559f75..7706653701d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pluggy/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/pluggy/Manifest @@ -1 +1,2 @@ DIST pluggy-1.3.0.tar.gz 63670 BLAKE2B afa28641ec0a93e97fed2a03655c76077d046b05f49c4e584df3486dd007fb20296f61b001664d8cbb50d4400f1132f75d5de932caa1d3f92e349f78158d7ade SHA512 d4dbb449f533649da161d7e49f82da5800dabdace4f7aa239c412290470612a45a3ba3c50cafd7bd9ed26cb3aa14648bfa3ed3f41fc0db9ae9399fd7f5933d5f +DIST pluggy-1.4.0.tar.gz 65812 BLAKE2B 0a8bff68f1871f0e571105012b0e3961771c6ee34a64711520084d0a951308d192187d01b14136c389b5bc09f127ead1a1f96ebffa7b345d2d5023157c049c43 SHA512 ac21a0c68cfcb9c7c401e5c48404f7447489b75befe8bc8b6e7ea84f24a1c6dbfb3de024577dd9e36ca9f538f9867ef836ba13018e3b8b348bba3e9bbd0c4dfd diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pluggy/pluggy-1.4.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pluggy/pluggy-1.4.0.ebuild new file mode 100644 index 00000000000..bb57bffff54 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/pluggy/pluggy-1.4.0.ebuild @@ -0,0 +1,26 @@ +# 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_{10..12} pypy3 ) + +inherit distutils-r1 pypi + +DESCRIPTION="Plugin and hook calling mechanisms for Python" +HOMEPAGE=" + https://pluggy.readthedocs.io/ + https://github.com/pytest-dev/pluggy/ + https://pypi.org/project/pluggy/ +" + +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" + +BDEPEND=" + dev-python/setuptools-scm[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest From 156073668f26f9b450e096138ee9d60482c52cb4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:12:10 +0000 Subject: [PATCH 038/127] dev-python/snakeoil: Sync with Gentoo It's from Gentoo commit 48700701a98d7760dc7507c9d6d967f14a555da3. --- .../dev-python/snakeoil/Manifest | 1 + .../snakeoil/snakeoil-0.10.7.ebuild | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.7.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/Manifest index 6e975a0d13d..736b73d859e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/Manifest @@ -1,2 +1,3 @@ DIST snakeoil-0.10.5.tar.gz 183358 BLAKE2B 6154eb0b5ce55aefc67484dc33c8a6e36ee903bce4293045252a8c9a3b4ecfc27690c720bb46842c1bca8c14ef59fbae4d3c1f02ebd46a7c91c1c9fbd1aa1532 SHA512 fafc04aa65423ebb3db66daa9c239bdf0968722b8ac14c1206dd3f26e3960d832fd15001e320463f98ca142ec7e1d6bff73ebc0ab10c3c5d3cde241b8160fdc3 DIST snakeoil-0.10.6.tar.gz 174265 BLAKE2B e1d80bdd0eb37604f77b385e31b45a4b5437cf33ca01593b0ec091351e221dd5fea1b631d2962807fd63e5b59cbfa9d953149bf686821011bb37525156cbef79 SHA512 2534398ede5a112c493ffb59c32ad8f1eecea8992d8f97ae37d8d825a428383338820d9a70f784999690367c84eca2bd2cbdb21a73f2b426157a9a917efeb729 +DIST snakeoil-0.10.7.tar.gz 174373 BLAKE2B 73a58adbb653b979b9c3f4b3cbdeef8ec5a3c8ba6262788a9694a41779660efcef724e1b318be1819dd2c2e2170d7d9e8e6bc615d0ad824cccb662527e204bfc SHA512 b84851f39565a0cfdb32e86744472426ac7502507c12e9869ab5f1eb15913ef6372a1f55465a1e6dbf3832a98bb14856004948dbc1197c454ac046423bfb15af diff --git a/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.7.ebuild new file mode 100644 index 00000000000..95d88af8d96 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/snakeoil/snakeoil-0.10.7.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=flit +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +PYTHON_REQ_USE="threads(+)" +inherit distutils-r1 + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/snakeoil.git + https://github.com/pkgcore/snakeoil.git" + inherit git-r3 +else + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" + inherit pypi +fi + +DESCRIPTION="misc common functionality and useful optimizations" +HOMEPAGE="https://github.com/pkgcore/snakeoil" + +LICENSE="BSD BSD-2 MIT" +SLOT="0" + +RDEPEND=" + dev-python/lazy-object-proxy[${PYTHON_USEDEP}] +" +BDEPEND=" + >=dev-python/flit-core-3.8[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest From e77b9b80a65b25484282d014f81012664dafc2b2 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:12:13 +0000 Subject: [PATCH 039/127] dev-python/trove-classifiers: Sync with Gentoo It's from Gentoo commit 39bccf28b827124da45f7c7bd79cb3925166c165. --- .../dev-python/trove-classifiers/Manifest | 1 - .../trove-classifiers-2023.11.29.ebuild | 43 ------------------- .../trove-classifiers-2024.1.8.ebuild | 2 +- 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2023.11.29.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 3de77b93915..635f2631244 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,2 +1 @@ -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-2023.11.29.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2023.11.29.ebuild deleted file mode 100644 index 66a6ca8b487..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/trove-classifiers/trove-classifiers-2023.11.29.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2022-2023 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 -} 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 index 3172a692bdd..35832d4c838 100644 --- 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 @@ -17,7 +17,7 @@ HOMEPAGE=" 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" distutils_enable_tests pytest From df0508eb8bee53a19a6705f12509d9525addcbf9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:12:14 +0000 Subject: [PATCH 040/127] dev-util/catalyst: Sync with Gentoo It's from Gentoo commit ed2ea05fdfde812665d40d35b44f48b4de60deb0. --- .../portage-stable/dev-util/catalyst/Manifest | 1 + .../dev-util/catalyst/catalyst-4.0_rc1.ebuild | 130 ++++++++++++++++++ .../dev-util/catalyst/catalyst-9999.ebuild | 7 +- 3 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-4.0_rc1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest index cd53736eaea..6e330cfa382 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/Manifest @@ -1,2 +1,3 @@ DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267 SHA512 e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c DIST catalyst-3.0.22.tar.bz2 620528 BLAKE2B f0eb5bf1052ba65bcdab4a14fe8ab564b6396c8a7271ee16c664b90c595df2a7bcda480279d64e0c7c6ff2045e0119a6a3afec75819a673ae721e77587e1f2b2 SHA512 c2b2d20ee6581b7c9c837fd64e798b0d1b0e5cc00346827cdf7154af8e8b6e279d32ab0d7f10314aa8d50923065e8b1121d2c01a506521cdae04736769cf6ba4 +DIST catalyst-4.0-rc1.tar.bz2 355575 BLAKE2B 373f3fa4a340e14461ab4881ae17cb8266e01a3d66fdffe37d648e5b816e95064e36360b3ced7dd4dc9f05c80eabdeb41dac506d4c156fa3072056b35a6e1074 SHA512 89660b603ecb6acf39b6bb7eb6e43f035c30b1610636586c84b9a75140963e2aefe4a9d97f465c15c293da9c4fc4146f0edce5685293a290d5d182e131dabb7b diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-4.0_rc1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-4.0_rc1.ebuild new file mode 100644 index 00000000000..9bf921904e9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-4.0_rc1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P=${P/_/-} + +if [[ ${PV} == *9999* ]]; then + SRC_ECLASS="git-r3" + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git" + EGIT_BRANCH="master" +else + SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${MY_P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + S="${WORKDIR}/${MY_P/_/-}" +fi + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 linux-info optfeature tmpfiles ${SRC_ECLASS} + +DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" +HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="doc +iso" + +BDEPEND=" + app-text/asciidoc +" +DEPEND=" + sys-apps/portage[${PYTHON_USEDEP}] + >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] + dev-python/fasteners[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] + sys-apps/util-linux[python,${PYTHON_USEDEP}] +" +RDEPEND=" + ${DEPEND} + >=dev-python/pydecomp-0.3[${PYTHON_USEDEP}] + app-arch/lbzip2 + app-arch/pixz + app-arch/tar[xattr] + dev-vcs/git + sys-fs/dosfstools + sys-fs/squashfs-tools-ng[tools] + + iso? ( + app-cdr/cdrtools + dev-libs/libisoburn + + amd64? ( + sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] + sys-fs/mtools + ) + arm64? ( + sys-boot/grub[grub_platforms_efi-64] + sys-fs/mtools + ) + ia64? ( + sys-boot/grub[grub_platforms_efi-64] + sys-fs/mtools + ) + ppc? ( + sys-boot/grub:2[grub_platforms_ieee1275] + ) + ppc64? ( + sys-boot/grub:2[grub_platforms_ieee1275] + ) + sparc? ( + sys-boot/grub:2[grub_platforms_ieee1275] + ) + x86? ( + sys-boot/grub[grub_platforms_efi-32] + ) + ) +" + +pkg_setup() { + CONFIG_CHECK=" + ~UTS_NS ~IPC_NS + ~SQUASHFS ~SQUASHFS_ZLIB + " + linux-info_pkg_setup +} + +python_prepare_all() { + python_setup + echo VERSION="${PV}" "${PYTHON}" setup.py set_version + VERSION="${PV}" "${PYTHON}" setup.py set_version || die + distutils-r1_python_prepare_all +} + +# Build man pages here so as to not clobber default src_compile +src_configure() { + # build the man pages and docs + emake +} + +python_install_all() { + distutils-r1_python_install_all + if use doc; then + dodoc files/HOWTO.html files/docbook-xsl.css + fi +} + +python_install() { + distutils-r1_python_install + rm -rv "${D}"$(python_get_sitedir)/usr +} + +src_install() { + distutils-r1_src_install + + echo 'd /var/tmp/catalyst 0755 root root' > "${T}"/catalyst-tmpdir.conf + dotmpfiles "${T}"/catalyst-tmpdir.conf + + doman files/catalyst.1 files/catalyst-config.5 files/catalyst-spec.5 + insinto /etc/catalyst + doins etc/* +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + optfeature "ccache support" dev-util/ccache + fi + tmpfiles_process catalyst-tmpdir.conf +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-9999.ebuild index ab85324f0c9..c5bd9ff2d04 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/catalyst/catalyst-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 @@ -103,6 +103,11 @@ python_install_all() { fi } +python_install() { + distutils-r1_python_install + rm -rv "${D}"$(python_get_sitedir)/usr +} + src_install() { distutils-r1_src_install From 6a353db7202a34cee48797f5e84303c9497990a7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:12:16 +0000 Subject: [PATCH 041/127] dev-util/gdbus-codegen: Sync with Gentoo It's from Gentoo commit d2a3cfe3b625829a894f700da57795327a9cbe92. --- .../dev-util/gdbus-codegen/Manifest | 1 + .../gdbus-codegen-2.78.4-distutils.patch | 36 +++++++++ .../gdbus-codegen-2.78.4-r1.ebuild | 80 +++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest index 633e3359a65..b5a930af82f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/Manifest @@ -1,2 +1,3 @@ DIST glib-2.76.4.tar.xz 5274356 BLAKE2B c9ceb514ea81e1e6ab2d0efc82c48c0d8ae6c997fd0e3c56d47a5174b027f785b58266fff73b1d1132e272305126fbff22e3c65d47de46224cd12fa49796d5bc SHA512 f76932dc5090a44880373228e2b162f338415d06f7c90f2950eab1a43bb191c56a1797da4d377594f6a999197fef4defb848039259cfa4105bb68288a928f5b7 DIST glib-2.78.3.tar.xz 5321388 BLAKE2B 6ef754b15e1ce4377eafdfc317025ac65c3d8010a8816a0cef786cec9da2af9f7d7d1da735c971ab8c848b2dcec050330e5b0fdceb156a36d739848e6160cd19 SHA512 9c1af75fb973d23ce0286d5b7836eea45f9628c148ced5ac10e10abceda05024ae4c57f01439824d3287d986527500b7b959828b630b6e4a3314b5224f4d7246 +DIST glib-2.78.4.tar.xz 5331892 BLAKE2B ada7134597d7d863e581a2bb1097ac07a63b27b53309aadab5b1d3686327ee718ad8c5c07af3fce5cc12328e728fc2c4df5fd9e69f431fa00dc634062ef7f926 SHA512 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch new file mode 100644 index 00000000000..38fbe0e1a9b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/files/gdbus-codegen-2.78.4-distutils.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/922654 +https://gitlab.gnome.org/GNOME/glib/-/issues/3134 +https://gitlab.gnome.org/GNOME/glib/-/commit/6ef967a0f930ce37a8c9b5aff969693b34714291 + +[sam: Trimmed the CI changes.] + +From 6ef967a0f930ce37a8c9b5aff969693b34714291 Mon Sep 17 00:00:00 2001 +From: Jordan Williams +Date: Fri, 1 Dec 2023 09:53:50 -0600 +Subject: [PATCH] Switch from the deprecated distutils module to the packaging + module + +The distutils module was removed in Python 3.12. +--- + +--- a/utils.py ++++ b/utils.py +@@ -19,7 +19,7 @@ + # + # Author: David Zeuthen + +-import distutils.version ++import packaging.version + import os + import sys + +@@ -166,4 +166,4 @@ def version_cmp_key(key): + v = str(key[0]) + else: + v = "0" +- return (distutils.version.LooseVersion(v), key[1]) ++ return (packaging.version.Version(v), key[1]) +-- +GitLab + + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild new file mode 100644 index 00000000000..00234d0e217 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.78.4-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +GNOME_ORG_MODULE="glib" +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_SINGLE_IMPL=1 + +inherit gnome.org distutils-r1 + +DESCRIPTION="GDBus code and documentation generator" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/packaging[${PYTHON_USEDEP}] + ') +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/libxslt + app-text/docbook-xsl-stylesheets +" + +S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" + +python_prepare_all() { + PATCHES=( + "${FILESDIR}/${PN}-2.56.1-sitedir.patch" + "${FILESDIR}/${PN}-2.78.4-distutils.patch" + ) + distutils-r1_python_prepare_all + + local MAJOR_VERSION=$(ver_cut 1) + local MINOR_VERSION=$(ver_cut 2) + sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die + sed -e "s:@VERSION@:${PV}:" \ + -e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \ + -e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die + cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed" + sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed" +} + +do_xsltproc_command() { + # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils) + xsltproc \ + --nonet \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 \ + -o "${2}" \ + http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ + "${1}" || die "manpage generation failed" +} + +src_compile() { + distutils-r1_src_compile + do_xsltproc_command \ + "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" \ + "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} + +src_test() { + einfo "Skipping tests. This package is tested by dev-libs/glib" + einfo "when merged with FEATURES=test" +} + +python_install_all() { + distutils-r1_python_install_all # no-op, but prevents QA warning + doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" +} From 6fffcd58a4ff6e9b16b385d017ba9d6043119620 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:12:16 +0000 Subject: [PATCH 042/127] dev-util/glib-utils: Sync with Gentoo It's from Gentoo commit 66e6f06177580d709297f579182428411fcdd991. --- .../dev-util/glib-utils/Manifest | 1 + .../glib-utils/glib-utils-2.78.4.ebuild | 62 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.78.4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest index 633e3359a65..b5a930af82f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/Manifest @@ -1,2 +1,3 @@ DIST glib-2.76.4.tar.xz 5274356 BLAKE2B c9ceb514ea81e1e6ab2d0efc82c48c0d8ae6c997fd0e3c56d47a5174b027f785b58266fff73b1d1132e272305126fbff22e3c65d47de46224cd12fa49796d5bc SHA512 f76932dc5090a44880373228e2b162f338415d06f7c90f2950eab1a43bb191c56a1797da4d377594f6a999197fef4defb848039259cfa4105bb68288a928f5b7 DIST glib-2.78.3.tar.xz 5321388 BLAKE2B 6ef754b15e1ce4377eafdfc317025ac65c3d8010a8816a0cef786cec9da2af9f7d7d1da735c971ab8c848b2dcec050330e5b0fdceb156a36d739848e6160cd19 SHA512 9c1af75fb973d23ce0286d5b7836eea45f9628c148ced5ac10e10abceda05024ae4c57f01439824d3287d986527500b7b959828b630b6e4a3314b5224f4d7246 +DIST glib-2.78.4.tar.xz 5331892 BLAKE2B ada7134597d7d863e581a2bb1097ac07a63b27b53309aadab5b1d3686327ee718ad8c5c07af3fce5cc12328e728fc2c4df5fd9e69f431fa00dc634062ef7f926 SHA512 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.78.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.78.4.ebuild new file mode 100644 index 00000000000..57dd67799df --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.78.4.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) +GNOME_ORG_MODULE="glib" + +inherit gnome.org python-single-r1 + +DESCRIPTION="Build utilities for GLib using projects" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2.1+" +SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/libxslt + app-text/docbook-xsl-stylesheets +" + +src_configure() { :; } + +do_xsltproc_command() { + # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen) + xsltproc \ + --nonet \ + --stringparam man.output.quietly 1 \ + --stringparam funcsynopsis.style ansi \ + --stringparam man.th.extra1.suppress 1 \ + --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 \ + -o "${2}" \ + http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ + "${1}" || die "manpage generation failed" +} + +src_compile() { + sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die + sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die + sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die + do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1 + do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1 + do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1 +} + +src_install() { + python_fix_shebang gobject/glib-genmarshal + python_fix_shebang gobject/glib-mkenums + python_fix_shebang glib/gtester-report + exeinto /usr/bin + doexe gobject/glib-genmarshal + doexe gobject/glib-mkenums + doexe glib/gtester-report + doman docs/reference/gobject/glib-genmarshal.1 + doman docs/reference/gobject/glib-mkenums.1 + doman docs/reference/glib/gtester-report.1 +} From b146688005bb27e4f97e0a5eadfe6c88c1002c37 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:12:19 +0000 Subject: [PATCH 043/127] dev-util/perf: Sync with Gentoo It's from Gentoo commit a51d470ab9fcd6932526b4534a91c46635042920. --- .../third_party/portage-stable/dev-util/perf/perf-6.3.ebuild | 4 ++-- .../third_party/portage-stable/dev-util/perf/perf-6.5.ebuild | 2 +- .../third_party/portage-stable/dev-util/perf/perf-6.6.ebuild | 2 +- 3 files changed, 4 insertions(+), 4 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 58d7202c0f7..a441b1091d0 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 @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit bash-completion-r1 estack flag-o-matic llvm toolchain-funcs python-r1 linux-info DESCRIPTION="Userland tools for Linux Performance Counters" @@ -67,7 +67,7 @@ RDEPEND="audit? ( sys-process/audit ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) slang? ( sys-libs/slang ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) 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 006893a110e..31d57afa8da 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 @@ -79,7 +79,7 @@ RDEPEND=" perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) slang? ( sys-libs/slang ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) tcmalloc? ( dev-util/google-perftools ) unwind? ( sys-libs/libunwind:= ) zstd? ( app-arch/zstd:= ) 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 b5b413be9af..d7386a01aed 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 @@ -78,7 +78,7 @@ RDEPEND=" perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) slang? ( sys-libs/slang ) - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) tcmalloc? ( dev-util/google-perftools ) unwind? ( sys-libs/libunwind:= ) zstd? ( app-arch/zstd:= ) From 808bd09ce252cd06a06a5054384557169c8ab838 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:12:19 +0000 Subject: [PATCH 044/127] dev-util/pkgconf: Sync with Gentoo It's from Gentoo commit 5bc2303601b0dc6bc4113f75292371518f8f2453. --- .../portage-stable/dev-util/pkgconf/Manifest | 3 - .../files/pkgconf-2.1.0-digraph-test.patch | 41 ++++++++ .../files/pkgconf-2.1.0-fix-modversion.patch | 95 +++++++++++++++++++ .../pkgconf-2.1.0-traverse-only-once.patch | 71 ++++++++++++++ .../dev-util/pkgconf/pkgconf-2.0.1.ebuild | 69 -------------- .../dev-util/pkgconf/pkgconf-2.0.2.ebuild | 69 -------------- ...f-2.0.3.ebuild => pkgconf-2.1.0-r1.ebuild} | 8 +- 7 files changed, 214 insertions(+), 142 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pkgconf/files/pkgconf-2.1.0-digraph-test.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pkgconf/files/pkgconf-2.1.0-fix-modversion.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pkgconf/files/pkgconf-2.1.0-traverse-only-once.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.0.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.0.2.ebuild rename sdk_container/src/third_party/portage-stable/dev-util/pkgconf/{pkgconf-2.0.3.ebuild => pkgconf-2.1.0-r1.ebuild} (88%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest index 17e85b200e2..f9500e4543a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest @@ -1,5 +1,2 @@ DIST pkgconf-1.8.1.tar.xz 302372 BLAKE2B 591961f0b1fd185834fd8e2a672199cffc035139599817b1d56d571300d2aa800a719c9477aac4023dfade597ad3cc3b45360babe57498977568ee57077c7bbe SHA512 7a7d5204c1c9bfb6578bda56f299d1fa0300e69a133a65730b10ad77aefbf26fceb74ae77cecda326b3ed5db5736f27fcce94764b3a56d40f4bb99fecdc80bba -DIST pkgconf-2.0.1.tar.xz 310576 BLAKE2B 9cb4a1a2ba9a961f184e8d600e15866b6ca971c84b1f9ce83a9ce528b16ec1f6c425ca0deebe5aa11f54d4daf64afbd59e96289a2e17a4bf62f8a82d48d59248 SHA512 1f6e6e421e6e6228aad5cbd834016c8657a59e3bbb5929de4b62377a79cb4e4a52e339f305378b80e6309701bbc0490179e0ead7bdee9da6d7c78565d7b80bc8 -DIST pkgconf-2.0.2.tar.xz 310604 BLAKE2B bc13a987d2ed4076af126dfd81c77c10004d0436fcb94c9e7ba18d37a7209ac432f4eb6909e65b22bdff0a4392ef1e764840efa7605adab0db1efa687b131796 SHA512 ca0570cff61534508b091408edf0021773c5f7f4c57ec5427474242f5f84a37e8fdc220cc02b9b362e71b6f8735f0be2c2c246e2212c65a833e44182e2e12e32 -DIST pkgconf-2.0.3.tar.xz 310796 BLAKE2B a0a526d59dce4eaafb5a43784676d7717ea8718ea207b3c47e78ef5388804547633ca76cf5b0942d8409c51ff293b8760ee2f9ebfc3ee6c4e4d41861e93db25a SHA512 cdbacd2894f9e5767dd7407ac4d4301a769ee0c6122a1219ce2c89d1a2019056d150cc42b98fda7fb0bd3d167fda2b897a1a92619f64ec5bb02ac9dbc31e445e DIST pkgconf-2.1.0.tar.xz 311576 BLAKE2B 43ac91f15106764f0b03ac4e1c3ff59aaba0436a221a295be93dd1a78b74e0185e60be8d24d040cc4ce0b0fb4446a6a8f493e7cc69bafafe5cefa9beab9b2bd5 SHA512 239dd75814d23f98a64c7df7ab12bc87a0ba52227ef0102086876e39712a2a5d2fdd1e27314070f66f9b38ef5bc0a31f0b90522f34bf8351e7bfb12c75313641 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/files/pkgconf-2.1.0-digraph-test.patch b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/files/pkgconf-2.1.0-digraph-test.patch new file mode 100644 index 00000000000..90232ab4c15 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/files/pkgconf-2.1.0-digraph-test.patch @@ -0,0 +1,41 @@ +https://github.com/pkgconf/pkgconf/pull/340 + +From db387172ac5fe2a3118945bf45bd90d8a2efeaf4 Mon Sep 17 00:00:00 2001 +From: Kai Pastor +Date: Wed, 17 Jan 2024 18:28:38 +0100 +Subject: [PATCH] Test digraph completeness for private-libs-duplication + +Complements 45073b7. +--- a/tests/requires.sh ++++ b/tests/requires.sh +@@ -10,6 +10,7 @@ tests_init \ + argv_parse2 \ + static_cflags \ + private_duplication \ ++ private_duplication_digraph \ + libs_static2 \ + missing \ + requires_internal \ +@@ -73,6 +74,21 @@ private_duplication_body() + pkgconf --static --libs-only-l private-libs-duplication + } + ++private_duplication_digraph_body() ++{ ++ export PKG_CONFIG_PATH="${selfdir}/lib1" ++ atf_check \ ++ -o 'match:"virtual:world" -> "private-libs-duplication"' \ ++ -o 'match:"virtual:world" -> "bar"' \ ++ -o 'match:"virtual:world" -> "baz"' \ ++ -o 'match:"virtual:world" -> "foo"' \ ++ -o 'match:"private-libs-duplication" -> "bar"' \ ++ -o 'match:"private-libs-duplication" -> "baz"' \ ++ -o 'match:"bar" -> "foo"' \ ++ -o 'match:"baz" -> "foo"' \ ++ pkgconf --static --libs-only-l private-libs-duplication --digraph ++} ++ + libs_static2_body() + { + export PKG_CONFIG_PATH="${selfdir}/lib1" + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/files/pkgconf-2.1.0-fix-modversion.patch b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/files/pkgconf-2.1.0-fix-modversion.patch new file mode 100644 index 00000000000..3336a455794 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/files/pkgconf-2.1.0-fix-modversion.patch @@ -0,0 +1,95 @@ +https://github.com/pkgconf/pkgconf/issues/335 +https://github.com/pkgconf/pkgconf/issues/332 +https://github.com/pkgconf/pkgconf/issues/317 +https://github.com/pkgconf/pkgconf/pull/336 + +https://github.com/pkgconf/pkgconf/commit/125af82dbe93eddadb7ec10eebac5087e9fbc451 +https://github.com/pkgconf/pkgconf/commit/b2f8386c32d1cb4dfa8f51c619c0c2a56a3544d6 +https://github.com/pkgconf/pkgconf/commit/5825e2c6d608ef74a97349e81d750ab95c53cf50 + +From 9a5c9be4ccef66a80df7533e00e525f87ff2fb01 Mon Sep 17 00:00:00 2001 +From: Kai Pastor +Date: Fri, 1 Dec 2023 21:20:39 +0100 +Subject: [PATCH 1/3] Test --modversion with constraint + +--- a/tests/regress.sh ++++ b/tests/regress.sh +@@ -27,6 +27,9 @@ tests_init \ + modversion_fullpath \ + modversion_provides \ + modversion_uninstalled \ ++ modversion_one_word_expression \ ++ modversion_two_word_expression \ ++ modversion_three_word_expression \ + pcpath \ + virtual_variable \ + fragment_collision \ +@@ -301,3 +304,21 @@ modversion_uninstalled_body() + atf_check -o inline:"1.2.3\n" \ + pkgconf --with-path="${selfdir}/lib1" --modversion omg + } ++ ++modversion_one_word_expression_body() ++{ ++ atf_check -o inline:"1.2.3\n" \ ++ pkgconf --with-path="${selfdir}/lib1" --modversion "foo > 1.0" ++} ++ ++modversion_two_word_expression_body() ++{ ++ atf_check -o inline:"1.2.3\n" \ ++ pkgconf --with-path="${selfdir}/lib1" --modversion foo "> 1.0" ++} ++ ++modversion_three_word_expression_body() ++{ ++ atf_check -o inline:"1.2.3\n" \ ++ pkgconf --with-path="${selfdir}/lib1" --modversion foo ">" 1.0 ++} + +From 0d4e6fa01074f5e540a7d89731edf44751bd17fc Mon Sep 17 00:00:00 2001 +From: Kai Pastor +Date: Fri, 1 Dec 2023 21:50:46 +0100 +Subject: [PATCH 2/3] Fix --modversion output + +--- a/cli/main.c ++++ b/cli/main.c +@@ -333,7 +333,12 @@ apply_modversion(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int + pkgconf_dependency_t *dep = world_iter->data; + pkgconf_pkg_t *pkg = dep->match; + +- if (strcmp(pkg->why, queue_node->package)) ++ const size_t name_len = strlen(pkg->why); ++ if (name_len > strlen(queue_node->package) || ++ strncmp(pkg->why, queue_node->package, name_len) || ++ (queue_node->package[name_len] != 0 && ++ !isspace(queue_node->package[name_len]) && ++ !PKGCONF_IS_OPERATOR_CHAR(queue_node->package[name_len]))) + continue; + + if (pkg->version != NULL) { + +From ace73a690437488baea28130c98f0b1eaab4689e Mon Sep 17 00:00:00 2001 +From: Kai Pastor +Date: Fri, 1 Dec 2023 22:12:20 +0100 +Subject: [PATCH 3/3] Fix crash on two-word expressions + +--- a/cli/main.c ++++ b/cli/main.c +@@ -1405,6 +1405,15 @@ main(int argc, char *argv[]) + pkgconf_queue_push(&pkgq, package); + pkg_optind++; + } ++ else if (argv[pkg_optind + 2] == NULL) ++ { ++ char packagebuf[PKGCONF_BUFSIZE]; ++ ++ snprintf(packagebuf, sizeof packagebuf, "%s %s", package, argv[pkg_optind + 1]); ++ pkg_optind += 2; ++ ++ pkgconf_queue_push(&pkgq, packagebuf); ++ } + else + { + char packagebuf[PKGCONF_BUFSIZE]; + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/files/pkgconf-2.1.0-traverse-only-once.patch b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/files/pkgconf-2.1.0-traverse-only-once.patch new file mode 100644 index 00000000000..80eab2485e1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/files/pkgconf-2.1.0-traverse-only-once.patch @@ -0,0 +1,71 @@ +https://issuetracker.google.com/issues/317357322 +https://bugs.gentoo.org/912843 +https://github.com/pkgconf/pkgconf/pull/339 + +From 478199b425b46e9dae36bb174f1bd08bf3ffb0f1 Mon Sep 17 00:00:00 2001 +From: Yi Chou +Date: Fri, 22 Dec 2023 00:13:31 +0800 +Subject: [PATCH] Use traverse_id to prevent traverse pkgdep twice + +--- a/libpkgconf/libpkgconf.h ++++ b/libpkgconf/libpkgconf.h +@@ -137,6 +137,8 @@ struct pkgconf_path_ { + #define PKGCONF_PKG_PROPF_CACHED 0x02 + #define PKGCONF_PKG_PROPF_UNINSTALLED 0x08 + #define PKGCONF_PKG_PROPF_VIRTUAL 0x10 ++#define PKGCONF_PKG_PROPF_VISITED 0x20 ++#define PKGCONF_PKG_PROPF_VISITED_PRIVATE 0x40 + + struct pkgconf_pkg_ { + int refcount; +@@ -176,6 +178,7 @@ struct pkgconf_pkg_ { + + uint64_t serial; + uint64_t identifier; ++ uint64_t traverse_id; + }; + + typedef bool (*pkgconf_pkg_iteration_func_t)(const pkgconf_pkg_t *pkg, void *data); +@@ -212,6 +215,7 @@ struct pkgconf_client_ { + + uint64_t serial; + uint64_t identifier; ++ uint64_t traverse_id; + + pkgconf_pkg_t **cache_table; + size_t cache_count; +--- a/libpkgconf/pkg.c ++++ b/libpkgconf/pkg.c +@@ -1628,6 +1628,21 @@ pkgconf_pkg_traverse_main(pkgconf_client_t *client, + if (maxdepth == 0) + return eflags; + ++ unsigned int visited_flag = (client->flags & PKGCONF_PKG_PKGF_ITER_PKG_IS_PRIVATE) ? PKGCONF_PKG_PROPF_VISITED_PRIVATE : PKGCONF_PKG_PROPF_VISITED; ++ ++ if (root->traverse_id == client->traverse_id) ++ { ++ if (root->flags & visited_flag) ++ return eflags; ++ } ++ else ++ { ++ root->traverse_id = client->traverse_id; ++ root->flags &= ~(PKGCONF_PKG_PROPF_VISITED | PKGCONF_PKG_PROPF_VISITED_PRIVATE); ++ } ++ ++ root->flags |= visited_flag; ++ + PKGCONF_TRACE(client, "%s: level %d, serial %"PRIu64, root->id, maxdepth, client->serial); + + if ((root->flags & PKGCONF_PKG_PROPF_VIRTUAL) != PKGCONF_PKG_PROPF_VIRTUAL || (client->flags & PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL) != PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL) +@@ -1672,6 +1687,9 @@ pkgconf_pkg_traverse(pkgconf_client_t *client, + int maxdepth, + unsigned int skip_flags) + { ++ static uint64_t traverse_id = 0; ++ client->traverse_id = ++traverse_id; ++ + if (root->flags & PKGCONF_PKG_PROPF_VIRTUAL) + client->serial++; + + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.0.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.0.1.ebuild deleted file mode 100644 index 742423bfd5a..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.0.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2012-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib multilib-minimal - -if [[ ${PV} == 9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" -else - SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" -HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" - -LICENSE="ISC" -SLOT="0/4" -IUSE="test" - -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - dev-libs/atf - dev-util/kyua - ) -" -RDEPEND="!dev-util/pkgconfig" - -src_prepare() { - default - - [[ ${PV} == 9999 ]] && eautoreconf - - MULTILIB_CHOST_TOOLS=( - /usr/bin/pkgconf - /usr/bin/pkg-config$(get_exeext) - ) -} - -multilib_src_configure() { - local myeconfargs=( - --with-system-includedir="${EPREFIX}/usr/include" - --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH - default -} - -multilib_src_install() { - default - - dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) - dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 -} - -multilib_src_install_all() { - einstalldocs - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.0.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.0.2.ebuild deleted file mode 100644 index 742423bfd5a..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.0.2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2012-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib multilib-minimal - -if [[ ${PV} == 9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git" -else - SRC_URI="https://distfiles.ariadne.space/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" -HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" - -LICENSE="ISC" -SLOT="0/4" -IUSE="test" - -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - dev-libs/atf - dev-util/kyua - ) -" -RDEPEND="!dev-util/pkgconfig" - -src_prepare() { - default - - [[ ${PV} == 9999 ]] && eautoreconf - - MULTILIB_CHOST_TOOLS=( - /usr/bin/pkgconf - /usr/bin/pkg-config$(get_exeext) - ) -} - -multilib_src_configure() { - local myeconfargs=( - --with-system-includedir="${EPREFIX}/usr/include" - --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH - default -} - -multilib_src_install() { - default - - dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) - dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 -} - -multilib_src_install_all() { - einstalldocs - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.0.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.1.0-r1.ebuild similarity index 88% rename from sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.0.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.1.0-r1.ebuild index 1a3b9b6870e..7ad7f087b46 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.0.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-2.1.0-r1.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 @@ -30,6 +30,12 @@ BDEPEND=" " RDEPEND="!dev-util/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-fix-modversion.patch + "${FILESDIR}"/${PN}-2.1.0-digraph-test.patch + "${FILESDIR}"/${PN}-2.1.0-traverse-only-once.patch +) + src_prepare() { default From 05369110715016d57ac9a01e8bab1551cb87a995 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:12:19 +0000 Subject: [PATCH 045/127] dev-util/re2c: Sync with Gentoo It's from Gentoo commit a2aa8ccd3c1522c88386de4904d4bf77fcafb0d8. --- .../portage-stable/dev-util/re2c/Manifest | 1 + .../dev-util/re2c/re2c-3.1.ebuild | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-3.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest index 705c45b9de4..8692b7bb681 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/Manifest @@ -1,2 +1,3 @@ DIST re2c-2.1.1.tar.xz 1340740 BLAKE2B e0e3cdb7ea78324467a8fe3161fe9b0cc1eb44baf9a554b892e1f7f8b8d089e8dca58da347527c595881e1119344858694c133ba0f1676424914f6518adbf4f4 SHA512 13edbe961e0482677aff52ada93129500c10e134b579365f1d0cd180a898251f3060f1fe0597fc6c900c0ea29b1eb28fc2519b0ebfa2ed496a777bf7e138feae DIST re2c-2.2.tar.xz 1460740 BLAKE2B f9e5920cb31c7ae8fa9f880be30513eee33ad23bcc7d44b24bbcb93376e13b092f6d0bee3304e49f87430be54b868c43115592a2accfdd94cda0d789b234f43b SHA512 8c4f18fa9a2ef6b0b5c03b73b8b7deafcbd7b17baf72e0008c9344296fcb0abeee6024d4a78ccb15b090e37ae67ddd6f2a68b4932331096328530612112ee37a +DIST re2c-3.1.tar.xz 1448624 BLAKE2B ecf9e750aa94d9754d703ad65df50786e800ed8ad40f4cce39a24ae4154d7b73db60cacb4e77e371d175c2d16393a812d38fb8af780bc1fb9d1f64c7964bd4f7 SHA512 649c5e103f8012e2717a0c36af135601dfa0a090c3e400bbf466537e7038ad73bc9e0ed36c3717b7c3c785c24ad024d40c7c31998325a14caf4984c4f19cd998 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-3.1.ebuild new file mode 100644 index 00000000000..d285e9d937e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/re2c/re2c-3.1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit python-any-r1 + +DESCRIPTION="Tool for generating C-based recognizers from regular expressions" +HOMEPAGE="https://re2c.org/" +SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="debug test" + +RESTRICT="!test? ( test )" + +# python is used only as a test driver +BDEPEND="test? ( ${PYTHON_DEPS} )" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + econf \ + --enable-golang \ + --enable-rust \ + ac_cv_path_BISON="no" \ + $(use_enable debug) +} + +src_install() { + default + + docompress -x /usr/share/doc/${PF}/examples + dodoc -r README.md CHANGELOG examples +} From 06694caa526ff19ea71b77b501b45af64e83e90a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:12:19 +0000 Subject: [PATCH 046/127] dev-vcs/git: Sync with Gentoo It's from Gentoo commit 252d681ecccc3a93475cfdd6bf1e84dc05c7b6ad. --- .../third_party/portage-stable/dev-vcs/git/git-2.43.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 46dd09f6c33..70354e879dd 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 @@ -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 8ff7f4b0a5136dfc1c4a5a97aa1c023946c317d7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:12:26 +0000 Subject: [PATCH 047/127] eclass/autotools: Sync with Gentoo It's from Gentoo commit 221159b1ca716e208abcd9fc2e3d7efad0db9446. --- .../portage-stable/eclass/autotools.eclass | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass b/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass index 7f48c78739c..2290e806781 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/autotools.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: autotools.eclass @@ -95,8 +95,8 @@ _LATEST_AUTOCONF=( 2.72-r1:2.72 2.71-r6:2.71 ) # WANT value by using a colon: : _LATEST_AUTOMAKE=( 1.16.5:1.16 ) -_automake_atom="sys-devel/automake" -_autoconf_atom="sys-devel/autoconf" +_automake_atom="dev-build/automake" +_autoconf_atom="dev-build/autoconf" if [[ -n ${WANT_AUTOMAKE} ]] ; then case ${WANT_AUTOMAKE} in none) @@ -105,12 +105,12 @@ if [[ -n ${WANT_AUTOMAKE} ]] ; then # the autoreconf tool, so this requirement is correct, bug #401605. ;; latest) - printf -v _automake_atom_tmp '>=sys-devel/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ } + printf -v _automake_atom_tmp '>=dev-build/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ } _automake_atom="|| ( ${_automake_atom_tmp} )" unset _automake_atom_tmp ;; *) - _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" + _automake_atom="=dev-build/automake-${WANT_AUTOMAKE}*" ;; esac export WANT_AUTOMAKE @@ -126,19 +126,19 @@ if [[ -n ${WANT_AUTOCONF} ]] ; then _autoconf_atom="" ;; 2.1) - _autoconf_atom=">=sys-devel/autoconf-2.13-r7:2.1" + _autoconf_atom=">=dev-build/autoconf-2.13-r7:2.1" ;; 2.5) - _autoconf_atom=">=sys-devel/autoconf-2.71-r6:2.71" + _autoconf_atom=">=dev-build/autoconf-2.71-r6:2.71" ;; 2.69) - _autoconf_atom=">=sys-devel/autoconf-2.69-r9:2.69" + _autoconf_atom=">=dev-build/autoconf-2.69-r9:2.69" ;; 2.71) - _autoconf_atom=">=sys-devel/autoconf-2.71-r6:2.71" + _autoconf_atom=">=dev-build/autoconf-2.71-r6:2.71" ;; latest) - printf -v _autoconf_atom_tmp '>=sys-devel/autoconf-%s:%s ' ${_LATEST_AUTOCONF[@]/:/ } + printf -v _autoconf_atom_tmp '>=dev-build/autoconf-%s:%s ' ${_LATEST_AUTOCONF[@]/:/ } _autoconf_atom="|| ( ${_autoconf_atom_tmp} )" unset _autoconf_atom_tmp ;; @@ -149,7 +149,7 @@ if [[ -n ${WANT_AUTOCONF} ]] ; then export WANT_AUTOCONF fi -_libtool_atom=">=sys-devel/libtool-2.4.7" +_libtool_atom=">=dev-build/libtool-2.4.7" if [[ -n ${WANT_LIBTOOL} ]] ; then case ${WANT_LIBTOOL} in none) _libtool_atom="" ;; @@ -570,7 +570,7 @@ autotools_env_setup() { hv_args="-b" ;; esac - has_version ${hv_args} "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break + has_version ${hv_args} "=dev-build/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break done # During bootstrap in prefix there might be no automake merged yet @@ -599,7 +599,7 @@ autotools_env_setup() { hv_args="-b" ;; esac - has_version ${hv_args} "=sys-devel/autoconf-${pv}*" && export WANT_AUTOCONF="${pv}" && break + has_version ${hv_args} "=dev-build/autoconf-${pv}*" && export WANT_AUTOCONF="${pv}" && break done # During bootstrap in prefix there might be no autoconf merged yet From c8bc0f48e9b8fea7cddcfb028a33a260fdb1fe01 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:12:51 +0000 Subject: [PATCH 048/127] eclass/flag-o-matic: Sync with Gentoo It's from Gentoo commit 21e8df74b41639435192141d14f9f071232290ef. --- .../third_party/portage-stable/eclass/flag-o-matic.eclass | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/flag-o-matic.eclass b/sdk_container/src/third_party/portage-stable/eclass/flag-o-matic.eclass index 500ceb5941a..0c75fab185d 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/flag-o-matic.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/flag-o-matic.eclass @@ -90,7 +90,7 @@ _setup-allowed-flags() { '-fdiagnostics*' '-fplugin*' '-W*' -w - # CPPFLAGS and LDFLAGS (TODO: Allow -Wa,*?) + # CPPFLAGS and LDFLAGS '-[DUILR]*' '-Wl,*' # Linker choice flag @@ -124,10 +124,7 @@ _setup-allowed-flags() { -mfix-24k -mno-fix-24k -mfix-r4000 -mno-fix-r4000 -mfix-r4400 -mno-fix-r4400 -mfix-r5900 -mno-fix-r5900 -mfix-rm7000 -mno-fix-rm7000 -mfix-r9500 -mno-fix-r9500 - -mfix-r10000 -mno-fix-r10000 -mfix-vr4120 -mno-fix-vr4120 - -mfix-vr4130 -mfix-sb1 -mno-fix-sb1 - '-Wa,-mfix-loongson2f-nop' - + -mfix-r10000 -mno-fix-r10000 '-mr10k-cache-barrier=*' -mthumb -marm # needed for arm64 (and in particular SCS) From 10851aff31035277ed3bc8a185107ebc936f83a5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:12:57 +0000 Subject: [PATCH 049/127] eclass/java-utils-2: Sync with Gentoo It's from Gentoo commit f007377cffdcdc04c349494481be5dc01ce313f9. --- .../third_party/portage-stable/eclass/java-utils-2.eclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 31f7932a16f..47123287ce7 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 @@ -1,4 +1,4 @@ -# Copyright 2004-2023 Gentoo Authors +# Copyright 2004-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-utils-2.eclass @@ -1972,7 +1972,10 @@ etestng() { # src_prepare Searches for bundled jars # Don't call directly, but via java-pkg-2_src_prepare! java-utils-2_src_prepare() { - eapply_user + case ${EAPI} in + [678]) eapply_user ;; + *) default_src_prepare ;; + esac # Check for files in JAVA_RM_FILES array. if [[ ${JAVA_RM_FILES[@]} ]]; then From 36ecef0ada0a668a42f508e471a3e801748e5c8e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:13:01 +0000 Subject: [PATCH 050/127] eclass/llvm: Sync with Gentoo It's from Gentoo commit 2d437712f06ca05b0cf3f0a01fd81548f5fbe72b. --- .../src/third_party/portage-stable/eclass/llvm.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass b/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass index 1f3ff1f61c2..91cc68d966f 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/llvm.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: llvm.eclass @@ -78,7 +78,7 @@ DEPEND="!!sys-devel/llvm:0" # @INTERNAL # @DESCRIPTION: # Correct values of LLVM slots, newest first. -declare -g -r _LLVM_KNOWN_SLOTS=( {18..8} ) +declare -g -r _LLVM_KNOWN_SLOTS=( {19..8} ) # @ECLASS_VARIABLE: LLVM_ECLASS_SKIP_PKG_SETUP # @INTERNAL From 0e2c598ec2f74c26e37c9f8456db3450680d575e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:13:54 +0000 Subject: [PATCH 051/127] eclass/toolchain-autoconf: Sync with Gentoo It's from Gentoo commit 9aa5370643f92645e3f62b59a3d284f9a62a565f. --- .../portage-stable/eclass/toolchain-autoconf.eclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain-autoconf.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain-autoconf.eclass index 137f0efac15..330ec45dd7d 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/toolchain-autoconf.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain-autoconf.eclass @@ -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 # @ECLASS: toolchain-autoconf.eclass # @MAINTAINER: # # @SUPPORTED_EAPIS: 7 8 -# @BLURB: Common code for sys-devel/autoconf ebuilds +# @BLURB: Common code for dev-build/autoconf ebuilds # @DESCRIPTION: # This eclass contains the common phase functions migrated from -# sys-devel/autoconf eblits. +# dev-build/autoconf eblits. case ${EAPI} in 7|8) ;; @@ -115,6 +115,8 @@ toolchain-autoconf_src_install() { ln -s "$f" "${f/./-${PV}.}" || die done popd >/dev/null || die + + docompress "${TC_AUTOCONF_INFOPATH}" fi } From baaaf32c734edbb0c77c707a57cbbef93a9e232a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:13:54 +0000 Subject: [PATCH 052/127] eclass/toolchain: Sync with Gentoo It's from Gentoo commit 518f49f7400f3b68f7a4a87cf11273fa89daade1. --- .../src/third_party/portage-stable/eclass/toolchain.eclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 ebe427e4416..a6925fa1c8b 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass @@ -328,7 +328,7 @@ fi if tc_has_feature systemtap ; then # gcc needs sys/sdt.h headers on target - DEPEND+=" systemtap? ( dev-util/systemtap )" + DEPEND+=" systemtap? ( dev-debug/systemtap )" fi if tc_has_feature zstd ; then @@ -355,7 +355,7 @@ if tc_has_feature d && tc_version_is_at_least 12.0 ; then BDEPEND+=" d? ( || ( sys-devel/gcc[d(-)] > S + SRC_URI essentials <<---- @@ -1975,6 +1975,8 @@ toolchain_src_install() { rm "${D}${DATAPATH}"/info/dir || die fi + docompress "${DATAPATH}"/{info,man} + # Prune empty dirs left behind find "${ED}" -depth -type d -delete 2>/dev/null From 8b9bfadbddd6e901a9738c39342447714b36bb65 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:14:19 +0000 Subject: [PATCH 053/127] eclass/xorg-3: Sync with Gentoo It's from Gentoo commit 221159b1ca716e208abcd9fc2e3d7efad0db9446. --- .../src/third_party/portage-stable/eclass/xorg-3.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass b/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass index a9825fc3113..dde954ca77a 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/xorg-3.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xorg-3.eclass @@ -130,7 +130,7 @@ fi # Set up autotools shared dependencies # Remember that all versions here MUST be stable EAUTORECONF_DEPEND+=" - >=sys-devel/libtool-2.2.6a + >=dev-build/libtool-2.2.6a sys-devel/m4" if [[ ${PN} != util-macros ]] ; then EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.18" From 6a3c0570a9cafd60947368865f52cac4b7e94900 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:14:19 +0000 Subject: [PATCH 054/127] licenses: Sync with Gentoo It's from Gentoo commit 15099d263d084a60d25d217cd2a933a42ff784ca. --- .../third_party/portage-stable/licenses/BSD-2 | 4 + .../portage-stable/licenses/BSD-2-with-patent | 78 +++++++++++-------- .../portage-stable/licenses/BSD-2-with-views | 28 ------- .../portage-stable/licenses/NVIDIA-NVLM | 54 ++++++------- 4 files changed, 76 insertions(+), 88 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/licenses/BSD-2-with-views diff --git a/sdk_container/src/third_party/portage-stable/licenses/BSD-2 b/sdk_container/src/third_party/portage-stable/licenses/BSD-2 index a7a1f195836..3f412bf0da7 100644 --- a/sdk_container/src/third_party/portage-stable/licenses/BSD-2 +++ b/sdk_container/src/third_party/portage-stable/licenses/BSD-2 @@ -21,3 +21,7 @@ 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 .] diff --git a/sdk_container/src/third_party/portage-stable/licenses/BSD-2-with-patent b/sdk_container/src/third_party/portage-stable/licenses/BSD-2-with-patent index 6ecef73b758..12e5d2b4170 100644 --- a/sdk_container/src/third_party/portage-stable/licenses/BSD-2-with-patent +++ b/sdk_container/src/third_party/portage-stable/licenses/BSD-2-with-patent @@ -1,42 +1,54 @@ LICENSE - BSD+Patent SPDX short identifier: BSD-2-Clause-Patent -Note: This license is designed to provide: a) a simple permissive license; b) that is compatible with the GNU General -Public License (GPL), version 2; and c) which also has an express patent grant included. +Note: This license is designed to provide: a) a simple permissive license; +b) that is compatible with the GNU General Public License (GPL), version 2; +and c) which also has an express patent grant included. Copyright (c) , -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. - -Subject to the terms and conditions of this license, each copyright holder and contributor hereby grants to those -receiving rights under this license a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except -for failure to satisfy the conditions of this license) patent license to make, have made, use, offer to sell, sell, -import, and otherwise transfer this software, where such license applies only to those patent claims, already acquired -or hereafter acquired, licensable by such copyright holder or contributor that are necessarily infringed by: - -(a) their Contribution(s) (the licensed copyrights of copyright holders and non-copyrightable additions of contributors, -in source or binary form) alone; or - -(b) combination of their Contribution(s) with the work of authorship to which such Contribution(s) was added by such -copyright holder or contributor, if, at the time the Contribution is added, such addition causes such combination to be -necessarily infringed. The patent license shall not apply to any other combinations which include the Contribution. - -Except as expressly stated above, no rights or licenses from any copyright holder or contributor is granted under this -license, whether expressly, by implication, estoppel or otherwise. +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. + +Subject to the terms and conditions of this license, each copyright holder +and contributor hereby grants to those receiving rights under this license +a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except for failure to satisfy the conditions of this license) patent +license to make, have made, use, offer to sell, sell, import, and otherwise +transfer this software, where such license applies only to those patent +claims, already acquired or hereafter acquired, licensable by such +copyright holder or contributor that are necessarily infringed by: + +(a) their Contribution(s) (the licensed copyrights of copyright holders and + non-copyrightable additions of contributors, in source or binary form) + alone; or +(b) combination of their Contribution(s) with the work of authorship to + which such Contribution(s) was added by such copyright holder or + contributor, if, at the time the Contribution is added, such addition + causes such combination to be necessarily infringed. The patent license + shall not apply to any other combinations which include the + Contribution. + +Except as expressly stated above, no rights or licenses from any copyright +holder or contributor is granted under this license, whether expressly, by +implication, estoppel or otherwise. DISCLAIMER -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 HOLDERS 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. +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 HOLDERS 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. 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 deleted file mode 100644 index ffb303569e2..00000000000 --- a/sdk_container/src/third_party/portage-stable/licenses/BSD-2-with-views +++ /dev/null @@ -1,28 +0,0 @@ -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 index 6dba958675f..2c878c87ea7 100644 --- a/sdk_container/src/third_party/portage-stable/licenses/NVIDIA-NVLM +++ b/sdk_container/src/third_party/portage-stable/licenses/NVIDIA-NVLM @@ -1,28 +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, + * 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 3c453523b481286ecd64cefc9c1d7fbe86f648ab Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:14:19 +0000 Subject: [PATCH 055/127] media-libs/libpng: Sync with Gentoo It's from Gentoo commit 7751d91adcdaeb2e8d648e108eb04c36529631f4. --- .../portage-stable/media-libs/libpng/Manifest | 4 +- .../media-libs/libpng/libpng-1.6.40-r1.ebuild | 10 +-- .../media-libs/libpng/libpng-1.6.41.ebuild | 70 +++++++++++++++++++ .../media-libs/libpng/metadata.xml | 2 +- 4 files changed, 79 insertions(+), 7 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.41.ebuild diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest b/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest index 4de304a9a1e..956b4ca6759 100644 --- a/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest +++ b/sdk_container/src/third_party/portage-stable/media-libs/libpng/Manifest @@ -1,2 +1,4 @@ -DIST libpng-1.6.40-apng.patch.gz 10330 BLAKE2B e2a5ff10ebaf75019d20edb148ea26fd6b255842aa34e8af31a919ae3c059b28eb827831289f47428e5f55c239f23a600677fde58e74bf0a2db27b5001f9ccb1 SHA512 803c45c2bbaf6c12863a09fb4d307c629680835b11a01c456512c81ef705e4f96c29e98c2486970ff1d86335cb4bd7568a30482c3e69601275d2a31d294058db +DIST libpng-1.6.40-apng-apng.patch.gz 10330 BLAKE2B e2a5ff10ebaf75019d20edb148ea26fd6b255842aa34e8af31a919ae3c059b28eb827831289f47428e5f55c239f23a600677fde58e74bf0a2db27b5001f9ccb1 SHA512 803c45c2bbaf6c12863a09fb4d307c629680835b11a01c456512c81ef705e4f96c29e98c2486970ff1d86335cb4bd7568a30482c3e69601275d2a31d294058db +DIST libpng-1.6.40-libpng-apng-apng.patch.gz 10815 BLAKE2B 47b09d730d6be1d481ab48e511068a38fc3448339aaeab1d8ad21f26de6cb79006c64785de2e0514ff820a75101c0010b84cce923d10e8f6198e4e99916d08f2 SHA512 373cc9f0df15f7c77c0a59ddaac22374cfae37174b63a642e68e3a17a6d0bb1015399d771998c7eb6b356b634f157f0009743f4cc659f3b8e480a9533010ef9c DIST libpng-1.6.40.tar.xz 1021332 BLAKE2B 4dd2df57791ca68cc31ba966b9176ecb37458572c60eef34e31ff0d3266d25ad6ea9d2e8cae6bfaf7932b5c7bc231047d3ed139b3464304c41cc4d89611f5ba8 SHA512 a2ec37c529bf80f3fee3798191d080d06e14d6a1ffecd3c1a02845cb9693b5e308a1d82598a376101f9312d989d19f1fb6735b225d4b0b9f1b73f9f8a3edb17f +DIST libpng-1.6.41.tar.xz 1035328 BLAKE2B 43d8d1c563d9df46b663f706dca9563e31e6e47a2809a77a5d059de8cfa348721054df724d08ac24ef4717ffc101989941127df2d026c9537532375d9b432b68 SHA512 046d0328255572ee2ccab7e751ed457b07e0aedc72474c2f4675a8303e628de3ef8afa1a00c60d768eb788546d1cda1e8b800b2497d9c352694faba6dde2c5b4 diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.40-r1.ebuild b/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.40-r1.ebuild index 427a7cace2c..60485980659 100644 --- a/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.40-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.40-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,8 +12,8 @@ HOMEPAGE="http://www.libpng.org/" SRC_URI=" mirror://sourceforge/${PN}/${P}.tar.xz apng? ( - mirror://sourceforge/${APNG_REPO}/${PN}$(ver_rs 1-2 '' $(ver_cut 1-2 ${APNG_VERSION}))/${PV}/${PN}-${APNG_VERSION}-apng.patch.gz - mirror://sourceforge/${APNG_REPO}/${PN}$(ver_rs 1-2 '' $(ver_cut 1-2 ${APNG_VERSION}))/${PN}-${APNG_VERSION}-apng.patch.gz + mirror://sourceforge/${APNG_REPO}/${PN}$(ver_rs 1-2 '' $(ver_cut 1-2 ${APNG_VERSION}))/${PV}/${PN}-${APNG_VERSION}-apng.patch.gz -> ${PN}-${APNG_VERSION}-${APNG_REPO}-apng.patch.gz + mirror://sourceforge/${APNG_REPO}/${PN}$(ver_rs 1-2 '' $(ver_cut 1-2 ${APNG_VERSION}))/${PN}-${APNG_VERSION}-apng.patch.gz -> ${PN}-${APNG_VERSION}-${APNG_REPO}-apng.patch.gz ) " @@ -33,10 +33,10 @@ src_prepare() { if use apng; then case ${APNG_REPO} in apng) - eapply -p0 "${WORKDIR}"/${PN}-${APNG_VERSION}-apng.patch + eapply -p0 "${WORKDIR}"/${PN}-${APNG_VERSION}-${APNG_REPO}-apng.patch ;; libpng-apng) - eapply "${WORKDIR}"/${PN}-${APNG_VERSION}-apng.patch + eapply "${WORKDIR}"/${PN}-${APNG_VERSION}-${APNG_REPO}-apng.patch ;; *) die "Unknown APNG_REPO!" diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.41.ebuild b/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.41.ebuild new file mode 100644 index 00000000000..b198fcd653b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/media-libs/libpng/libpng-1.6.41.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit libtool multilib-minimal + +APNG_REPO=libpng-apng # sometimes libpng-apng is more up to date +APNG_VERSION="1.6.40" +DESCRIPTION="Portable Network Graphics library" +HOMEPAGE="http://www.libpng.org/" +SRC_URI=" + mirror://sourceforge/${PN}/${P}.tar.xz + apng? ( + mirror://sourceforge/${APNG_REPO}/${PN}$(ver_rs 1-2 '' $(ver_cut 1-2 ${APNG_VERSION}))/${PV}/${PN}-${APNG_VERSION}-apng.patch.gz -> ${PN}-${APNG_VERSION}-${APNG_REPO}-apng.patch.gz + mirror://sourceforge/${APNG_REPO}/${PN}$(ver_rs 1-2 '' $(ver_cut 1-2 ${APNG_VERSION}))/${PN}-${APNG_VERSION}-apng.patch.gz -> ${PN}-${APNG_VERSION}-${APNG_REPO}-apng.patch.gz + ) +" + +LICENSE="libpng2" +SLOT="0/16" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="apng cpu_flags_arm_neon cpu_flags_x86_sse static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO ) + +src_prepare() { + default + + if use apng; then + case ${APNG_REPO} in + apng) + eapply -p0 "${WORKDIR}"/${PN}-${APNG_VERSION}-${APNG_REPO}-apng.patch + ;; + libpng-apng) + eapply "${WORKDIR}"/${PN}-${APNG_VERSION}-${APNG_REPO}-apng.patch + ;; + *) + die "Unknown APNG_REPO!" + ;; + esac + + # Don't execute symbols check with apng patch, bug #378111 + sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die + fi + + elibtoolize +} + +multilib_src_configure() { + local myeconfargs=( + $(multilib_native_enable tools) + $(use_enable test tests) + $(use_enable cpu_flags_arm_neon arm-neon) + $(use_enable cpu_flags_x86_sse intel-sse) + $(use_enable static-libs static) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + default + + find "${ED}" \( -type f -o -type l \) -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libpng/metadata.xml b/sdk_container/src/third_party/portage-stable/media-libs/libpng/metadata.xml index e98eff7f2f6..bb1f3a055ec 100644 --- a/sdk_container/src/third_party/portage-stable/media-libs/libpng/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/media-libs/libpng/metadata.xml @@ -14,7 +14,7 @@ cpe:/a:libpng:libpng - glennrp/libpng + pnggroup/libpng pnggroup/libpng-EXPERIMENTAL glennrp/libpng-releases libpng From d403918d895ba1ac37970718eca50fb6e44e3764 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:14:20 +0000 Subject: [PATCH 056/127] net-dns/c-ares: Sync with Gentoo It's from Gentoo commit 836f644a762cac7047df320cdabf555e5a766bc6. --- .../net-dns/c-ares/c-ares-1.25.0-r1.ebuild | 96 ++++++++++ .../c-ares-1.25.0-fix-sanity-check-rr.patch | 166 ++++++++++++++++++ 2 files changed, 262 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.25.0-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-dns/c-ares/files/c-ares-1.25.0-fix-sanity-check-rr.patch diff --git a/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.25.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.25.0-r1.ebuild new file mode 100644 index 00000000000..e5dd49ff97f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/c-ares-1.25.0-r1.ebuild @@ -0,0 +1,96 @@ +# 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 +) + +PATCHES=( + "${FILESDIR}"/${P}-fix-sanity-check-rr.patch +) + +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 +} diff --git a/sdk_container/src/third_party/portage-stable/net-dns/c-ares/files/c-ares-1.25.0-fix-sanity-check-rr.patch b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/files/c-ares-1.25.0-fix-sanity-check-rr.patch new file mode 100644 index 00000000000..9b494ebfe8f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dns/c-ares/files/c-ares-1.25.0-fix-sanity-check-rr.patch @@ -0,0 +1,166 @@ +https://github.com/c-ares/c-ares/issues/683 +https://github.com/c-ares/c-ares/commit/626dcb155b4daf3360e4251c64ce052e7e520b34 + +From 626dcb155b4daf3360e4251c64ce052e7e520b34 Mon Sep 17 00:00:00 2001 +From: Brad House +Date: Fri, 12 Jan 2024 09:55:42 -0500 +Subject: [PATCH] Do not sanity check RR Name vs Question (#685) + +It appears as though we should never sanity check the RR name vs the question name as some DNS servers may return results for alias records. + +Fixes Bug: #683 +Fix By: Brad House (@bradh352) +--- a/src/lib/ares__parse_into_addrinfo.c ++++ b/src/lib/ares__parse_into_addrinfo.c +@@ -81,7 +81,6 @@ ares_status_t ares__parse_into_addrinfo(const unsigned char *abuf, size_t alen, + } + + for (i = 0; i < ancount; i++) { +- const char *rname = NULL; + ares_dns_rec_type_t rtype; + const ares_dns_rr_t *rr = + ares_dns_record_rr_get(dnsrec, ARES_SECTION_ANSWER, i); +@@ -91,13 +90,18 @@ ares_status_t ares__parse_into_addrinfo(const unsigned char *abuf, size_t alen, + } + + rtype = ares_dns_rr_get_type(rr); +- rname = ares_dns_rr_get_name(rr); + +- /* Old code did this hostname sanity check */ +- if ((rtype == ARES_REC_TYPE_A || rtype == ARES_REC_TYPE_AAAA) && +- strcasecmp(rname, hostname) != 0) { +- continue; +- } ++ /* Issue #683 ++ * Old code did this hostname sanity check, however it appears this is ++ * flawed logic. Other resolvers don't do this sanity check. Leaving ++ * this code commented out for future reference. ++ * ++ * rname = ares_dns_rr_get_name(rr); ++ * if ((rtype == ARES_REC_TYPE_A || rtype == ARES_REC_TYPE_AAAA) && ++ * strcasecmp(rname, hostname) != 0) { ++ * continue; ++ * } ++ */ + + if (rtype == ARES_REC_TYPE_CNAME) { + struct ares_addrinfo_cname *cname; +--- a/src/lib/ares_parse_ptr_reply.c ++++ b/src/lib/ares_parse_ptr_reply.c +@@ -113,7 +113,6 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen_int, + + /* Cycle through answers */ + for (i = 0; i < ancount; i++) { +- const char *rname = NULL; + const ares_dns_rr_t *rr = + ares_dns_record_rr_get(dnsrec, ARES_SECTION_ANSWER, i); + +@@ -141,17 +140,20 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen_int, + continue; + } + +- /* Old code compared the name in the rr to the ptrname, so we'll do that +- * check here, but I'm not sure its necessary */ +- rname = ares_dns_rr_get_name(rr); +- if (rname == NULL) { +- /* Shouldn't be possible */ +- status = ARES_EBADRESP; +- goto done; +- } +- if (strcasecmp(ptrname, rname) != 0) { +- continue; +- } ++ /* Issue #683 ++ * Old code compared the name in the rr to the ptrname, but I think this ++ * is wrong since it was proven wrong for A & AAAA records. Leaving ++ * this code commented out for future reference ++ * ++ * rname = ares_dns_rr_get_name(rr); ++ * if (rname == NULL) { ++ * status = ARES_EBADRESP; ++ * goto done; ++ * } ++ * if (strcasecmp(ptrname, rname) != 0) { ++ * continue; ++ * } ++ */ + + /* Save most recent PTR record as the hostname */ + hostname = ares_dns_rr_get_str(rr, ARES_RR_PTR_DNAME); +--- a/test/ares-test-parse-a.cc ++++ b/test/ares-test-parse-a.cc +@@ -312,13 +312,19 @@ TEST_F(LibraryTest, ParseAReplyErrors) { + EXPECT_EQ(nullptr, host); + pkt.add_question(new DNSQuestion("example.com", T_A)); + +- // Question != answer ++ // Question != answer, this is ok as of Issue #683 + pkt.questions_.clear(); + pkt.add_question(new DNSQuestion("Axample.com", T_A)); + data = pkt.data(); +- EXPECT_EQ(ARES_ENODATA, ares_parse_a_reply(data.data(), (int)data.size(), ++ EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(), + &host, info, &count)); +- EXPECT_EQ(nullptr, host); ++ ASSERT_NE(nullptr, host); ++ std::stringstream ss; ++ ss << HostEnt(host); ++ EXPECT_EQ("{'Axample.com' aliases=[] addrs=[2.3.4.5]}", ss.str()); ++ ares_free_hostent(host); ++ host = nullptr; ++ + pkt.questions_.clear(); + pkt.add_question(new DNSQuestion("example.com", T_A)); + +--- a/test/ares-test-parse-aaaa.cc ++++ b/test/ares-test-parse-aaaa.cc +@@ -139,13 +139,19 @@ TEST_F(LibraryTest, ParseAaaaReplyErrors) { + EXPECT_EQ(nullptr, host); + pkt.add_question(new DNSQuestion("example.com", T_AAAA)); + +- // Question != answer ++ // Question != answer, this is ok as of Issue #683 + pkt.questions_.clear(); + pkt.add_question(new DNSQuestion("Axample.com", T_AAAA)); + data = pkt.data(); +- EXPECT_EQ(ARES_ENODATA, ares_parse_aaaa_reply(data.data(), (int)data.size(), ++ EXPECT_EQ(ARES_SUCCESS, ares_parse_aaaa_reply(data.data(), (int)data.size(), + &host, info, &count)); +- EXPECT_EQ(nullptr, host); ++ ASSERT_NE(nullptr, host); ++ std::stringstream ss; ++ ss << HostEnt(host); ++ EXPECT_EQ("{'Axample.com' aliases=[] addrs=[0101:0101:0202:0202:0303:0303:0404:0404]}", ss.str()); ++ ares_free_hostent(host); ++ ++ host = nullptr; + pkt.questions_.clear(); + pkt.add_question(new DNSQuestion("example.com", T_AAAA)); + +--- a/test/ares-test-parse-ptr.cc ++++ b/test/ares-test-parse-ptr.cc +@@ -163,13 +163,20 @@ TEST_F(LibraryTest, ParsePtrReplyErrors) { + addrv4, sizeof(addrv4), AF_INET, &host)); + pkt.add_question(new DNSQuestion("64.48.32.16.in-addr.arpa", T_PTR)); + +- // Question != answer ++ // Question != answer, ok after #683 ++ host = nullptr; + pkt.questions_.clear(); + pkt.add_question(new DNSQuestion("99.48.32.16.in-addr.arpa", T_PTR)); + data = pkt.data(); +- EXPECT_EQ(ARES_ENODATA, ares_parse_ptr_reply(data.data(), (int)data.size(), ++ EXPECT_EQ(ARES_SUCCESS, ares_parse_ptr_reply(data.data(), (int)data.size(), + addrv4, sizeof(addrv4), AF_INET, &host)); +- EXPECT_EQ(nullptr, host); ++ ASSERT_NE(nullptr, host); ++ std::stringstream ss; ++ ss << HostEnt(host); ++ EXPECT_EQ("{'other.com' aliases=[other.com] addrs=[16.32.48.64]}", ss.str()); ++ ares_free_hostent(host); ++ ++ host = nullptr; + pkt.questions_.clear(); + pkt.add_question(new DNSQuestion("64.48.32.16.in-addr.arpa", T_PTR)); + + From 580fedda6e0075a136724aa001286c7f8dfac03d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:14:21 +0000 Subject: [PATCH 057/127] net-firewall/ipset: Sync with Gentoo It's from Gentoo commit 4cefa7bbe4060e6f75a05acc5aaf045c87e129b7. --- .../net-firewall/ipset/Manifest | 1 - .../ipset/files/ipset-7.16-bashism.patch | 46 ------- .../net-firewall/ipset/ipset-7.17-r1.ebuild | 119 ------------------ .../net-firewall/ipset/ipset-7.19-r1.ebuild | 4 +- .../net-firewall/ipset/ipset-7.19.ebuild | 65 ---------- 5 files changed, 2 insertions(+), 233 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset-7.16-bashism.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.17-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.19.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/Manifest b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/Manifest index 31344ef84f8..e1a520ca5e4 100644 --- a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/Manifest @@ -1,2 +1 @@ -DIST ipset-7.17.tar.bz2 684983 BLAKE2B 43b74ab7caf5a963787184aa75b6c071388c8d28997681444b72118aba68b843e961b50418c3fa70b451b4cb090ec62940b770abac2156910442115edbf90d41 SHA512 e308a0d7707ccf7d0cb06a32cf9a822f97862e007abdbab8a91a5a0d5bfbd9f2fb9a3f5e8f36b250ec0d565438c8648a31e8e5b45d8205a76558e90f46e6e597 DIST ipset-7.19.tar.bz2 686712 BLAKE2B 04290b94be471aedd732601e1dc147a066933606152beb76ba1a21283aa2e3f8b891fd9575db73f2af67b446fb77a0ca6b2432ae606440ac9e9bf80e41d1f640 SHA512 0f4252e6d967b0f130a2c7a0307b17c6b7d48336e86b2f838ea176f5faaa0c9bbbf273060906b43d91e9b38a9f33c18918e33d02292839a6bc321181d5d7f84e diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset-7.16-bashism.patch b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset-7.16-bashism.patch deleted file mode 100644 index ff4d6b09552..00000000000 --- a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/files/ipset-7.16-bashism.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 6004475ff78ddb3afd8beadcb5330664d50081f5 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Thu, 24 Nov 2022 04:38:28 +0000 -Subject: [PATCH] configure.ac: fix bashisms -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -configure scripts need to be runnable with a POSIX-compliant /bin/sh. - -On many (but not all!) systems, /bin/sh is provided by Bash, so errors -like this aren't spotted. Notably Debian defaults to /bin/sh provided -by dash which doesn't tolerate such bashisms as '=='. - -This retains compatibility with bash. - -Signed-off-by: Sam James ---- a/configure.ac -+++ b/configure.ac -@@ -27,7 +27,7 @@ AC_ARG_WITH([kmod], - [Build the kernel module (default: yes)]), - [BUILDKMOD="$withval";], - [BUILDKMOD="yes";]) --AM_CONDITIONAL(WITH_KMOD, test "$BUILDKMOD" == "yes") -+AM_CONDITIONAL(WITH_KMOD, test "$BUILDKMOD" = "yes") - - dnl Additional arguments - dnl Kernel build directory or source tree -@@ -76,7 +76,7 @@ if test "x$enable_bashcompl" = "xyes"; then - AC_SUBST(bashcompdir) - fi - --if test "$BUILDKMOD" == "yes" -+if test "$BUILDKMOD" = "yes" - then - dnl Sigh: check kernel version dependencies - if test "$KBUILDDIR" != "" -@@ -204,7 +204,7 @@ AC_CHECK_TYPES([union nf_inet_addr],,,[#include - dnl Checks for functions - AC_CHECK_FUNCS(gethostbyname2) - --if test "$BUILDKMOD" == "yes" -+if test "$BUILDKMOD" = "yes" - then - dnl Check kernel incompatibilities... Ugly like hell - diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.17-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.17-r1.ebuild deleted file mode 100644 index 9e4680fb986..00000000000 --- a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.17-r1.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-r5 ${PN} - newconfd "${FILESDIR}"/ipset.confd-r1 ${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 -} diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.19-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.19-r1.ebuild index 7770192477a..234ec51e7a3 100644 --- a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.19-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.19-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="https://ipset.netfilter.org/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" RDEPEND=" net-firewall/iptables diff --git a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.19.ebuild b/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.19.ebuild deleted file mode 100644 index b2ba675086e..00000000000 --- a/sdk_container/src/third_party/portage-stable/net-firewall/ipset/ipset-7.19.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools bash-completion-r1 linux-info 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.8.9 - net-libs/libmnl:= -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( ChangeLog INSTALL README UPGRADE ) - -# configurable from outside, e.g. /etc/portage/make.conf -IP_NF_SET_MAX=${IP_NF_SET_MAX:-256} - -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)" -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - export bashcompdir="$(get_bashcompdir)" - - econf \ - --enable-bashcompl \ - --with-kmod=no \ - --with-maxsets=${IP_NF_SET_MAX} -} - -src_install() { - einfo "Installing userspace" - default - - find "${ED}" -name '*.la' -delete || die - - newinitd "${FILESDIR}"/ipset.initd-r5 ${PN} - newconfd "${FILESDIR}"/ipset.confd-r1 ${PN} - systemd_newunit "${FILESDIR}"/ipset.systemd-r1 ${PN}.service - keepdir /var/lib/ipset -} From 3e1383265197c6dc975a5900f9d77761812608fe Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:14:22 +0000 Subject: [PATCH 058/127] net-libs/gnutls: Sync with Gentoo It's from Gentoo commit 80558608ae111ebddad012e63542db9adb34c5b1. --- .../portage-stable/net-libs/gnutls/Manifest | 2 + .../net-libs/gnutls/gnutls-3.7.6.ebuild | 4 +- .../net-libs/gnutls/gnutls-3.7.7.ebuild | 4 +- .../net-libs/gnutls/gnutls-3.7.8.ebuild | 4 +- .../net-libs/gnutls/gnutls-3.7.9.ebuild | 4 +- .../net-libs/gnutls/gnutls-3.8.0.ebuild | 4 +- .../net-libs/gnutls/gnutls-3.8.1-r1.ebuild | 4 +- .../net-libs/gnutls/gnutls-3.8.2.ebuild | 4 +- .../net-libs/gnutls/gnutls-3.8.3.ebuild | 149 ++++++++++++++++++ 9 files changed, 165 insertions(+), 14 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/Manifest index 21e24dad2d5..de811b1744d 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/Manifest @@ -12,3 +12,5 @@ DIST gnutls-3.8.1.tar.xz 6447056 BLAKE2B 16cb6d2dc7d67724ff45765ae3f154c8d268d8c DIST gnutls-3.8.1.tar.xz.sig 685 BLAKE2B bfafa80bef81c2a24556f010f00294643ba7901eff07f055a0ebd9ca532b47b7b3d3403e9d1a1389c14e6f37f474a37afa2844f326d5ab35fa35b195f2ff1ade SHA512 f03fde611927c83f6b57af695d5610ba3cefbb88a261cf5485c94b3fb32c7480a77c68a353a6a28185337195e30011d6b5578c53ea4180a656cf7b175156f7f1 DIST gnutls-3.8.2.tar.xz 6456540 BLAKE2B d70524f17919bc02fefc610ede948d209e50e3276fc1e2d40aaed5c208265455da220d948f4a3f21db57f9d253c103f3a1b9a6daa2229d02c7c224448acc2777 SHA512 b3aa6e0fa7272cfca0bb0d364fe5dc9ca70cfd41878631d57271ba0a597cf6020a55a19e97a2c02f13a253455b119d296cf6f701be2b4e6880ebeeb07c93ef38 DIST gnutls-3.8.2.tar.xz.sig 685 BLAKE2B 7f82c047991d327cc1040bc38ba59e49bb1698968a833d73ec9ea8827b8d49586d5e5b6b6be313810d57ca60d09057b151264731ce5d995032a462717bcdc4ad SHA512 9feb30bfccb8c83e83d3d6df009f2a61f4c48eb357c988789c93b2e5a06a34cb490f33741ad0fd4f881fcd34747b3cf9c5aa45bbb15da680ebba35e07ba602f6 +DIST gnutls-3.8.3.tar.xz 6463720 BLAKE2B 27a4bb4d8a5697e2187113351b2ad1e849bca7bcfb556c1b54fc2d02bef16e2789e7c437ac8db8fe6d2bcfc0e3e3467bbff2dd5d2fc0adb9bf8bda81cb89e452 SHA512 74eddba01ce4c2ffdca781c85db3bb52c85f1db3c09813ee2b8ceea0608f92ca3912fd9266f55deb36a8ba4d01802895ca5d5d219e7d9caec45e1a8534e45a84 +DIST gnutls-3.8.3.tar.xz.sig 580 BLAKE2B 25875eb17d9e59bf1f1b6a61dfc7657d838ac154dbb3e26c8df1995884077878ca607de62a8ce3b9287df1ea7ff523c0abc7c4548f1ca789c308eb6bda0edbaa SHA512 5b2ca0648ca5feeda1de933de2bbaf71fadb70e830a8f0d494d2f0380b6d0d7b79445257cc79e59bba1a7ff639ab4573da3e3e124eb80c20ac6141e29a4827ff diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.6.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.6.ebuild index 21a94f04b6a..092af454895 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.6.ebuild @@ -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 @@ DEPEND="${RDEPEND} seccomp? ( sys-libs/libseccomp ) )" BDEPEND=" - dev-util/gtk-doc-am + dev-build/gtk-doc-am >=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.7.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.7.ebuild index 4ae15ae6659..2e1df5e092b 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.7.ebuild @@ -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 @@ -36,7 +36,7 @@ DEPEND="${RDEPEND} seccomp? ( sys-libs/libseccomp ) )" BDEPEND=" - dev-util/gtk-doc-am + dev-build/gtk-doc-am >=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.8.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.8.ebuild index cb16e3aae9e..be7248ee62a 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.8.ebuild @@ -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 @@ -36,7 +36,7 @@ DEPEND="${RDEPEND} seccomp? ( sys-libs/libseccomp ) )" BDEPEND=" - dev-util/gtk-doc-am + dev-build/gtk-doc-am >=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.9.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.9.ebuild index 4a231228add..a22b20c9947 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.9.ebuild @@ -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 @@ -36,7 +36,7 @@ DEPEND="${RDEPEND} seccomp? ( sys-libs/libseccomp ) )" BDEPEND=" - dev-util/gtk-doc-am + dev-build/gtk-doc-am >=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.0.ebuild index 4a61aa45ae2..535a418e445 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.0.ebuild @@ -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 @@ DEPEND="${RDEPEND} seccomp? ( sys-libs/libseccomp ) )" BDEPEND=" - dev-util/gtk-doc-am + dev-build/gtk-doc-am >=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.1-r1.ebuild index 5ed1748569d..73498bdc4c5 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.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 @@ -42,7 +42,7 @@ DEPEND=" ) " BDEPEND=" - dev-util/gtk-doc-am + dev-build/gtk-doc-am >=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.2.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.2.ebuild index 1cfea5380ba..2d0d61ef314 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.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 @@ -42,7 +42,7 @@ DEPEND=" ) " BDEPEND=" - dev-util/gtk-doc-am + dev-build/gtk-doc-am >=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) diff --git a/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.3.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.3.ebuild new file mode 100644 index 00000000000..eefad049e08 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.8.3.ebuild @@ -0,0 +1,149 @@ +# 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/gnutls.asc +inherit libtool multilib-minimal verify-sig + +DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols" +HOMEPAGE="https://www.gnutls.org/" +SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" +SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )" + +LICENSE="GPL-3 LGPL-2.1+" +# As of 3.8.0, the C++ library is header-only, but we won't drop the subslot +# component for it until libgnutls.so breaks ABI, to avoid pointless rebuilds. +# Subslot format: +# . +SLOT="0/30.30" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd" +REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 seccomp tls-heartbeat tools )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] + dev-libs/libunistring:=[${MULTILIB_USEDEP}] + >=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}] + >=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] + brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] ) + dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) + nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] ) + pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) + idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] ) +" +DEPEND=" + ${RDEPEND} + test? ( + seccomp? ( sys-libs/libseccomp ) + ) +" +BDEPEND=" + dev-build/gtk-doc-am + >=virtual/pkgconfig-0-r1 + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) + test-full? ( + app-crypt/dieharder + || ( sys-libs/libfaketime >=app-misc/datefudge-1.22 ) + dev-libs/softhsm:2[-bindist(-)] + net-dialup/ppp + net-misc/socat + ) + verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20231129 ) +" + +DOCS=( README.md doc/certtool.cfg ) + +HTML_DOCS=() + +QA_CONFIG_IMPL_DECL_SKIP=( + # gnulib FPs + MIN + alignof + static_assert +) + +src_prepare() { + default + + # bug #520818 + export TZ=UTC + + use doc && HTML_DOCS+=( doc/gnutls.html ) + + # don't try to use system certificate store on macOS, it is + # confusingly ignoring our ca-certificates and more importantly + # fails to compile in certain configurations + sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die + + # Use sane .so versioning on FreeBSD. + elibtoolize +} + +multilib_src_configure() { + LINGUAS="${LINGUAS//en/en@boldquot en@quot}" + + local libconf=() + + # TPM needs to be tested before being enabled + # Note that this may add a libltdl dep when enabled. Check configure.ac. + libconf+=( + --without-tpm + --without-tpm2 + ) + + # hardware-accel is disabled on OSX because the asm files force + # GNU-stack (as doesn't support that) and when that's removed ld + # complains about duplicate symbols + [[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration ) + + # -fanalyzer substantially slows down the build and isn't useful for + # us. It's useful for upstream as it's static analysis, but it's not + # useful when just getting something built. + export gl_cv_warn_c__fanalyzer=no + + local myeconfargs=( + --disable-valgrind-tests + $(multilib_native_enable manpages) + $(multilib_native_use_enable doc gtk-doc) + $(multilib_native_use_enable doc) + $(multilib_native_use_enable seccomp seccomp-tests) + $(multilib_native_use_enable test tests) + $(multilib_native_use_enable test-full full-test-suite) + $(multilib_native_use_enable tools) + $(use_enable cxx) + $(use_enable dane libdane) + $(use_enable nls) + $(use_enable openssl openssl-compatibility) + $(use_enable sslv2 ssl2-support) + $(use_enable sslv3 ssl3-support) + $(use_enable static-libs static) + $(use_enable tls-heartbeat heartbeat-support) + $(use_with brotli) + $(use_with idn) + $(use_with pkcs11 p11-kit) + $(use_with zlib) + $(use_with zstd) + --disable-rpath + --with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt + --with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt + --without-included-libtasn1 + $("${S}/configure" --help | grep -o -- '--without-.*-prefix') + ) + + ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + + if use examples; then + docinto examples + dodoc doc/examples/*.c + fi +} From d5cb3a64cf8259e0956a66a65e27d9f2d5e3a8bf Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:14:33 +0000 Subject: [PATCH 059/127] net-misc/curl: Sync with Gentoo It's from Gentoo commit 4d863ec62d7c6ac06be4d944a9dcb7fccf010e41. --- .../net-misc/curl/curl-8.5.0-r1.ebuild | 365 ------------------ ...l-8.5.0-r2.ebuild => curl-8.5.0-r3.ebuild} | 8 +- .../net-misc/curl/curl-8.5.0.ebuild | 4 +- .../portage-stable/net-misc/curl/metadata.xml | 1 + 4 files changed, 8 insertions(+), 370 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0-r1.ebuild rename sdk_container/src/third_party/portage-stable/net-misc/curl/{curl-8.5.0-r2.ebuild => curl-8.5.0-r3.ebuild} (97%) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0-r1.ebuild deleted file mode 100644 index 8c9e7ec34d3..00000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0-r1.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# 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 -) - -PATCHES=( - "${FILESDIR}"/${PN}-prefix.patch - "${FILESDIR}"/${PN}-respect-cflags-3.patch - "${FILESDIR}"/${P}-ipv6-configure-c99.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-8.5.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0-r3.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0-r2.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0-r3.ebuild index 03cc7f61ebc..09cb866808e 100644 --- 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-r3.ebuild @@ -23,7 +23,7 @@ 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" +IUSE+=" +psl +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 )" @@ -69,6 +69,7 @@ RDEPEND=" >=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}] >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] ) + psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] ) rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] ) ssl? ( @@ -256,7 +257,7 @@ multilib_src_configure() { $(use_with idn libidn2) $(use_with kerberos gssapi "${EPREFIX}"/usr) --without-libgsasl - --without-libpsl + $(use_with psl libpsl) --without-msh3 $(use_with nghttp3) $(use_with nghttp3 ngtcp2) @@ -348,7 +349,8 @@ multilib_src_test() { # 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" + # 1474 is flaky and has been removed upstream after the 8.5.0 release. + multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083 !1477 !1474" } multilib_src_install() { diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0.ebuild index 0a5ca2fe245..9d7765b8556 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-8.5.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,7 +17,7 @@ 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 )" diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/metadata.xml b/sdk_container/src/third_party/portage-stable/net-misc/curl/metadata.xml index 7f3ef922ed9..55beac930d9 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/metadata.xml @@ -22,6 +22,7 @@ Enable openssl ssl backend Enable Post Office Protocol 3 support Enable the progress meter + Enable Public Suffix List (PSL) support. See https://daniel.haxx.se/blog/2024/01/10/psl-in-curl/. Enable RTMP Streaming Media support Enable Rustls ssl backend Enable Simple Mail Transfer Protocol support From 458c8b27496c879d6bc5b8d9ca92ee39dc2cf82a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:14:36 +0000 Subject: [PATCH 060/127] net-misc/iperf: Sync with Gentoo It's from Gentoo commit 5a0b872787e62a179fcf323860c50fd9228eef4c. --- .../third_party/portage-stable/net-misc/iperf/iperf-3.16.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4324d7bbd60..4edfb643968 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 @@ -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 243c706f6f1c75467f61bfa409b098b662c4cd9c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:14:36 +0000 Subject: [PATCH 061/127] net-misc/ntp: Sync with Gentoo It's from Gentoo commit d7cfac78b781831cc4af95a499dee35de0771b35. --- ...2.8_p17.ebuild => ntp-4.2.8_p17-r1.ebuild} | 7 +- .../net-misc/ntp/ntp-4.2.8_p17-r2.ebuild | 162 ++++++++++++++++++ 2 files changed, 167 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/portage-stable/net-misc/ntp/{ntp-4.2.8_p17.ebuild => ntp-4.2.8_p17-r1.ebuild} (95%) create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-misc/ntp/ntp-4.2.8_p17.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/ntp/ntp-4.2.8_p17-r1.ebuild similarity index 95% rename from sdk_container/src/third_party/portage-stable/net-misc/ntp/ntp-4.2.8_p17.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/ntp/ntp-4.2.8_p17-r1.ebuild index aedfd361738..2fcce5d7239 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/ntp/ntp-4.2.8_p17.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/ntp/ntp-4.2.8_p17-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 @@ S="${WORKDIR}/${MY_P}" LICENSE="HPND BSD ISC" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" DEPEND=" @@ -65,6 +65,9 @@ src_configure() { # bug #264109 append-cppflags -D_GNU_SOURCE + # https://bugs.gentoo.org/922508 + append-lfs-flags + # avoid libmd5/libelf export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no export ac_cv_lib_elf_nlist=no diff --git a/sdk_container/src/third_party/portage-stable/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild new file mode 100644 index 00000000000..3303e33398f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/ntp/ntp-4.2.8_p17-r2.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic systemd tmpfiles + +MY_P=${P/_p/p} +DESCRIPTION="Network Time Protocol suite/programs" +HOMEPAGE="https://www.ntp.org/" +SRC_URI="https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="HPND BSD ISC" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="caps debug openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" + +DEPEND=" + >=dev-libs/libevent-2.0.9:=[threads(+)?] + readline? ( >=sys-libs/readline-4.1:= ) + kernel_linux? ( caps? ( sys-libs/libcap ) ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) + snmp? ( net-analyzer/net-snmp ) + ssl? ( dev-libs/openssl:= ) + parse-clocks? ( net-misc/pps-tools ) +" +RDEPEND=" + ${DEPEND} + acct-group/ntp + acct-user/ntp + selinux? ( sec-policy/selinux-ntp ) + vim-syntax? ( app-vim/ntp-syntax ) + !net-misc/ntpsec + !openntpd? ( !net-misc/openntpd ) +" +BDEPEND=" + acct-group/ntp + acct-user/ntp + virtual/pkgconfig +" +PDEPEND="openntpd? ( net-misc/openntpd )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch # bug #533966 + "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch # bug #563922 + "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch # bug #711530 + "${FILESDIR}"/${PN}-4.2.8_p15-configure-clang16.patch +) + +src_prepare() { + default + + # Make sure every build uses the same install layout, bug #539092 + find sntp/loc/ -type f '!' -name legacy -delete || die + + # bug #622754 + eautoreconf + + # Disable pointless checks. + touch .checkChangeLog .gcc-warning FRC.html html/.datecheck || die +} + +src_configure() { + # bug #264109 + append-cppflags -D_GNU_SOURCE + + # https://bugs.gentoo.org/922508 + append-lfs-flags + + # avoid libmd5/libelf + export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no + export ac_cv_lib_elf_nlist=no + # blah, no real configure options #176333 + export ac_cv_header_dns_sd_h=$(usex zeroconf) + export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} + # Unity builds, we don't really need support for it, bug #804109 + export PATH_RUBY=/bin/false + + local myeconfargs=( + --cache-file="${S}"/config.cache + + --with-lineeditlibs=readline,edit,editline + --with-yielding-select + --disable-local-libevent + + # Increase the default memlimit from 32MiB to 128MiB, bug #533232 + --with-memlock=256 + + # Avoid overriding the user's toolchain settings, bug #895802 + --with-hardenfile=/dev/null + + $(use_enable caps linuxcaps) + $(use_enable parse-clocks) + $(use_enable debug debugging) + $(use_with readline lineeditlibs readline) + $(use_enable samba ntp-signd) + $(use_with snmp ntpsnmpd) + $(use_with ssl crypto) + $(use_enable threads thread-support) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # Move ntpd/ntpdate to sbin, bug #66671 + dodir /usr/sbin + mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" + + dodoc INSTALL WHERE-TO-START + + insinto /etc + doins "${FILESDIR}"/ntp.conf + + newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd + newconfd "${FILESDIR}"/ntpd.confd ntpd + newinitd "${FILESDIR}"/ntp-client.rc ntp-client + newconfd "${FILESDIR}"/ntp-client.confd ntp-client + newinitd "${FILESDIR}"/sntp.rc sntp + newconfd "${FILESDIR}"/sntp.confd sntp + if ! use caps ; then + sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die + fi + sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die + + if use openntpd ; then + cd "${ED}" || die + rm usr/sbin/ntpd || die + rm etc/{conf,init}.d/ntpd || die + rm usr/share/man/man1/ntpd.1 || die + else + newtmpfiles "${FILESDIR}"/ntp.tmpfiles ntp.conf + systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service + if use caps ; then + sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ + "${D}$(systemd_get_systemunitdir)"/ntpd.service \ + || die + fi + systemd_enable_ntpunit 60-ntpd ntpd.service + fi + + systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service + systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf + systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service + systemd_install_serviced "${FILESDIR}"/sntp.service.conf +} + +pkg_postinst() { + if ! use openntpd; then + tmpfiles_process ntp.conf + fi + + if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then + eerror "The notrust option was found in your /etc/ntp.conf!" + ewarn "If your ntpd starts sending out weird responses," + ewarn "then make sure you have keys properly setup and see" + ewarn "https://bugs.gentoo.org/41827" + fi +} From b68d1d74bb48ef21bf5cc66a4c644ec0685a600e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:14:47 +0000 Subject: [PATCH 062/127] profiles: Sync with Gentoo It's from Gentoo commit 6e93401d19819f19f02ee663570f7dacf2d0f818. --- .../profiles/arch/alpha/package.use.mask | 5 + .../profiles/arch/alpha/use.mask | 7 +- .../arch/amd64/no-multilib/package.mask | 3 - .../profiles/arch/amd64/package.use.mask | 9 +- .../arch/amd64/package.use.stable.mask | 9 ++ .../profiles/arch/amd64/use.mask | 6 - .../profiles/arch/arm/package.use.mask | 4 + .../profiles/arch/arm/use.stable.mask | 4 + .../profiles/arch/arm64/package.use.mask | 8 + .../arch/arm64/package.use.stable.mask | 4 + .../profiles/arch/arm64/use.stable.mask | 4 + .../profiles/arch/base/package.use.mask | 16 +- .../profiles/arch/hppa/package.mask | 4 +- .../profiles/arch/hppa/package.use.mask | 9 ++ .../profiles/arch/hppa/use.stable.mask | 4 + .../profiles/arch/ia64/package.mask | 1 - .../profiles/arch/ia64/package.use.mask | 5 + .../profiles/arch/ia64/use.mask | 1 + .../profiles/arch/loong/package.use.mask | 2 +- .../profiles/arch/m68k/package.use.mask | 2 +- .../profiles/arch/m68k/use.mask | 1 + .../profiles/arch/mips/use.mask | 1 + .../arch/powerpc/ppc32/package.use.mask | 4 + .../arch/powerpc/ppc64/64le/package.mask | 4 +- .../arch/powerpc/ppc64/64le/package.use.mask | 6 + .../ppc64/64le/package.use.stable.mask | 4 - .../profiles/arch/powerpc/ppc64/package.mask | 3 +- .../arch/powerpc/ppc64/package.use.mask | 4 + .../profiles/arch/powerpc/use.stable.mask | 4 + .../profiles/arch/ppc/package.use.mask | 4 + .../profiles/arch/riscv/package.use.mask | 9 ++ .../profiles/arch/riscv/use.mask | 6 +- .../profiles/arch/s390/package.use.mask | 5 + .../profiles/arch/s390/use.mask | 1 + .../profiles/arch/sparc/package.use.mask | 4 + .../profiles/arch/sparc/use.mask | 6 +- .../x86/23.0/desktop => arch/x86/i486}/eapi | 0 .../profiles/arch/x86/i486/make.defaults | 10 ++ .../23.0/desktop/gnome => arch/x86/i686}/eapi | 0 .../profiles/arch/x86/i686/make.defaults | 10 ++ .../profiles/arch/x86/package.use.stable.mask | 3 +- .../profiles/arch/x86/use.stable.mask | 4 + .../portage-stable/profiles/base/package.use | 4 + .../profiles/base/package.use.force | 7 +- .../profiles/base/package.use.mask | 27 ++-- .../profiles/base/package.use.stable.mask | 9 +- .../portage-stable/profiles/base/use.mask | 14 +- .../profiles/base/use.stable.mask | 6 +- .../portage-stable/profiles/categories | 1 + .../profiles/default/linux/make.defaults | 9 +- .../profiles/default/linux/packages.build | 6 +- .../linux/x86/23.0/desktop/gnome/parent | 2 - .../x86/23.0/desktop/gnome/systemd/parent | 2 - .../default/linux/x86/23.0/desktop/parent | 2 - .../linux/x86/23.0/desktop/plasma/parent | 2 - .../x86/23.0/desktop/plasma/systemd/parent | 2 - .../default/linux/x86/23.0/hardened/parent | 2 - .../linux/x86/23.0/hardened/selinux/parent | 2 - .../23.0/{desktop/gnome/systemd => i486}/eapi | 0 .../{desktop/plasma => i486/hardened}/eapi | 0 .../23.0/{split-usr => i486}/hardened/parent | 0 .../systemd => i486/hardened/selinux}/eapi | 0 .../hardened/selinux/parent | 0 .../linux/x86/23.0/{ => i486}/make.defaults | 0 .../x86/23.0/{hardened => i486/musl}/eapi | 0 .../x86/23.0/{ => i486}/musl/make.defaults | 0 .../x86/23.0/{ => i486}/musl/package.mask | 0 .../x86/23.0/{ => i486}/musl/package.use.mask | 0 .../x86/23.0/{split-usr => i486}/musl/parent | 0 .../23.0/{hardened => i486/musl}/selinux/eapi | 0 .../{split-usr => i486}/musl/selinux/parent | 0 .../linux/x86/23.0/{ => i486}/musl/use.force | 0 .../linux/x86/23.0/{ => i486}/musl/use.mask | 0 .../default/linux/x86/23.0/i486/parent | 2 + .../x86/23.0/{musl => i486/split-usr}/eapi | 0 .../selinux => i486/split-usr/hardened}/eapi | 0 .../x86/23.0/i486/split-usr/hardened/parent | 2 + .../split-usr/hardened/selinux}/eapi | 0 .../i486/split-usr/hardened/selinux/parent | 2 + .../split-usr/musl}/eapi | 0 .../{ => i486}/split-usr/musl/make.defaults | 0 .../{ => i486}/split-usr/musl/package.mask | 0 .../split-usr/musl/package.use.mask | 0 .../linux/x86/23.0/i486/split-usr/musl/parent | 2 + .../split-usr/musl/selinux}/eapi | 0 .../23.0/i486/split-usr/musl/selinux/parent | 2 + .../23.0/{ => i486}/split-usr/musl/use.force | 0 .../23.0/{ => i486}/split-usr/musl/use.mask | 0 .../linux/x86/23.0/i486/split-usr/parent | 2 + .../{prefix/kernel-3.2+ => i486/systemd}/eapi | 0 .../linux/x86/23.0/i486/systemd/parent | 2 + .../x86/23.0/{split-usr => i686}/desktop/eapi | 0 .../{split-usr => i686}/desktop/gnome/eapi | 0 .../{split-usr => i686}/desktop/gnome/parent | 0 .../desktop/gnome/systemd}/eapi | 0 .../23.0/i686/desktop/gnome/systemd/parent | 2 + .../23.0/{split-usr => i686}/desktop/parent | 0 .../{split-usr => i686/desktop/plasma}/eapi | 0 .../{split-usr => i686}/desktop/plasma/parent | 0 .../desktop/plasma/systemd}/eapi | 0 .../23.0/i686/desktop/plasma/systemd/parent | 2 + .../{split-usr/hardened/selinux => i686}/eapi | 0 .../{split-usr/musl => i686/hardened}/eapi | 0 .../linux/x86/23.0/i686/hardened/parent | 2 + .../musl => i686/hardened}/selinux/eapi | 0 .../x86/23.0/i686/hardened/selinux/parent | 2 + .../default/linux/x86/23.0/i686/make.defaults | 4 + .../23.0/{split-usr/prefix => i686/musl}/eapi | 0 .../linux/x86/23.0/i686/musl/make.defaults | 5 + .../linux/x86/23.0/i686/musl/package.mask | 2 + .../linux/x86/23.0/i686/musl/package.use.mask | 8 + .../default/linux/x86/23.0/i686/musl/parent | 2 + .../kernel-2.6.16+ => i686/musl/selinux}/eapi | 0 .../linux/x86/23.0/i686/musl/selinux/parent | 2 + .../linux/x86/23.0/i686/musl/use.force | 5 + .../default/linux/x86/23.0/i686/musl/use.mask | 2 + .../default/linux/x86/23.0/i686/parent | 2 + .../kernel-2.6.32+ => i686/prefix}/eapi | 0 .../prefix/kernel-2.6.16+}/eapi | 0 .../prefix/kernel-2.6.16+/parent | 0 .../prefix/kernel-2.6.32+}/eapi | 0 .../prefix/kernel-2.6.32+/parent | 0 .../x86/23.0/i686/prefix/kernel-3.2+/eapi | 1 + .../prefix/kernel-3.2+/parent | 0 .../linux/x86/23.0/{ => i686}/prefix/parent | 0 .../x86/23.0/i686/split-usr/desktop/eapi | 1 + .../23.0/i686/split-usr/desktop/gnome/eapi | 1 + .../23.0/i686/split-usr/desktop/gnome/parent | 2 + .../x86/23.0/i686/split-usr/desktop/parent | 2 + .../23.0/i686/split-usr/desktop/plasma/eapi | 1 + .../23.0/i686/split-usr/desktop/plasma/parent | 2 + .../linux/x86/23.0/i686/split-usr/eapi | 1 + .../x86/23.0/i686/split-usr/hardened/eapi | 1 + .../x86/23.0/i686/split-usr/hardened/parent | 2 + .../23.0/i686/split-usr/hardened/selinux/eapi | 1 + .../i686/split-usr/hardened/selinux/parent | 2 + .../linux/x86/23.0/i686/split-usr/musl/eapi | 1 + .../23.0/i686/split-usr/musl/make.defaults | 5 + .../x86/23.0/i686/split-usr/musl/package.mask | 2 + .../23.0/i686/split-usr/musl/package.use.mask | 8 + .../linux/x86/23.0/i686/split-usr/musl/parent | 2 + .../x86/23.0/i686/split-usr/musl/selinux/eapi | 1 + .../23.0/i686/split-usr/musl/selinux/parent | 2 + .../x86/23.0/i686/split-usr/musl/use.force | 5 + .../x86/23.0/i686/split-usr/musl/use.mask | 2 + .../linux/x86/23.0/i686/split-usr/parent | 2 + .../linux/x86/23.0/i686/split-usr/prefix/eapi | 1 + .../i686/split-usr/prefix/kernel-2.6.16+/eapi | 1 + .../split-usr/prefix/kernel-2.6.16+/parent | 2 + .../i686/split-usr/prefix/kernel-2.6.32+/eapi | 1 + .../split-usr/prefix/kernel-2.6.32+/parent | 2 + .../i686/split-usr/prefix/kernel-3.2+/eapi | 1 + .../i686/split-usr/prefix/kernel-3.2+/parent | 2 + .../23.0/{ => i686}/split-usr/prefix/parent | 0 .../default/linux/x86/23.0/i686/systemd/eapi | 1 + .../linux/x86/23.0/i686/systemd/parent | 2 + .../default/linux/x86/23.0/musl/parent | 2 - .../linux/x86/23.0/musl/selinux/parent | 2 - .../x86/23.0/prefix/kernel-2.6.16+/parent | 2 - .../x86/23.0/prefix/kernel-2.6.32+/parent | 2 - .../linux/x86/23.0/prefix/kernel-3.2+/parent | 2 - .../default/linux/x86/23.0/split-usr/parent | 2 - .../default/linux/x86/23.0/systemd/parent | 2 - .../profiles/desc/cpu_flags_x86.desc | 13 +- .../profiles/desc/php_targets.desc | 3 +- .../profiles/desc/postgres_targets.desc | 3 +- .../profiles/features/musl/make.defaults | 7 + .../profiles/features/musl/package.mask | 22 ++- .../profiles/features/musl/package.use.mask | 1 + .../profiles/features/wd40/package.mask | 1 + .../profiles/features/wd40/package.use.mask | 4 +- .../portage-stable/profiles/info_pkgs | 6 +- .../profiles/package.deprecated | 17 +-- .../portage-stable/profiles/package.mask | 137 ++++++++---------- .../darwin/macos/10.13/x64/package.mask | 1 + .../profiles/prefix/linux/arm/make.defaults | 7 - .../profiles/prefix/linux/arm/parent | 2 +- .../portage-stable/profiles/profiles.desc | 55 +++++++ .../targets/desktop/gnome/package.use | 4 + .../profiles/targets/desktop/package.use | 4 + .../targets/desktop/plasma/package.use | 11 +- .../portage-stable/profiles/updates/1Q-2024 | 46 ++++++ .../portage-stable/profiles/updates/4Q-2020 | 2 +- .../portage-stable/profiles/updates/4Q-2022 | 1 - 184 files changed, 555 insertions(+), 217 deletions(-) rename sdk_container/src/third_party/portage-stable/profiles/{default/linux/x86/23.0/desktop => arch/x86/i486}/eapi (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/arch/x86/i486/make.defaults rename sdk_container/src/third_party/portage-stable/profiles/{default/linux/x86/23.0/desktop/gnome => arch/x86/i686}/eapi (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/arch/x86/i686/make.defaults delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/gnome/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/gnome/systemd/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/plasma/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/plasma/systemd/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/hardened/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/hardened/selinux/parent rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{desktop/gnome/systemd => i486}/eapi (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{desktop/plasma => i486/hardened}/eapi (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr => i486}/hardened/parent (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{desktop/plasma/systemd => i486/hardened/selinux}/eapi (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr => i486}/hardened/selinux/parent (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{ => i486}/make.defaults (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{hardened => i486/musl}/eapi (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{ => i486}/musl/make.defaults (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{ => i486}/musl/package.mask (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{ => i486}/musl/package.use.mask (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr => i486}/musl/parent (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{hardened => i486/musl}/selinux/eapi (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr => i486}/musl/selinux/parent (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{ => i486}/musl/use.force (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{ => i486}/musl/use.mask (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/parent rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{musl => i486/split-usr}/eapi (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{musl/selinux => i486/split-usr/hardened}/eapi (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/hardened/parent rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{prefix => i486/split-usr/hardened/selinux}/eapi (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/hardened/selinux/parent rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{prefix/kernel-2.6.16+ => i486/split-usr/musl}/eapi (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{ => i486}/split-usr/musl/make.defaults (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{ => i486}/split-usr/musl/package.mask (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{ => i486}/split-usr/musl/package.use.mask (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/parent rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{prefix/kernel-2.6.32+ => i486/split-usr/musl/selinux}/eapi (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/selinux/parent rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{ => i486}/split-usr/musl/use.force (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{ => i486}/split-usr/musl/use.mask (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/parent rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{prefix/kernel-3.2+ => i486/systemd}/eapi (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/systemd/parent rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr => i686}/desktop/eapi (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr => i686}/desktop/gnome/eapi (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr => i686}/desktop/gnome/parent (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr/desktop/plasma => i686/desktop/gnome/systemd}/eapi (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/gnome/systemd/parent rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr => i686}/desktop/parent (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr => i686/desktop/plasma}/eapi (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr => i686}/desktop/plasma/parent (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr/hardened => i686/desktop/plasma/systemd}/eapi (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/plasma/systemd/parent rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr/hardened/selinux => i686}/eapi (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr/musl => i686/hardened}/eapi (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/hardened/parent rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr/musl => i686/hardened}/selinux/eapi (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/hardened/selinux/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/make.defaults rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr/prefix => i686/musl}/eapi (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/make.defaults create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/package.mask create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/package.use.mask create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/parent rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr/prefix/kernel-2.6.16+ => i686/musl/selinux}/eapi (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/selinux/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/use.force create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/use.mask create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/parent rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr/prefix/kernel-2.6.32+ => i686/prefix}/eapi (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr/prefix/kernel-3.2+ => i686/prefix/kernel-2.6.16+}/eapi (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr => i686}/prefix/kernel-2.6.16+/parent (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{systemd => i686/prefix/kernel-2.6.32+}/eapi (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr => i686}/prefix/kernel-2.6.32+/parent (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/kernel-3.2+/eapi rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{split-usr => i686}/prefix/kernel-3.2+/parent (100%) rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{ => i686}/prefix/parent (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/gnome/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/gnome/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/plasma/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/plasma/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/selinux/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/selinux/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/make.defaults create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.mask create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/selinux/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/selinux/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/use.force create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/use.mask create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+/parent rename sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/{ => i686}/split-usr/prefix/parent (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/systemd/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/systemd/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/selinux/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/systemd/parent delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/linux/arm/make.defaults 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 17d95fde6ab..a3e08cabceb 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-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# matoro (2024-01-24) +# No LLVM on alpha. +dev-util/perf bpf + # Sam James (2024-01-02) # dev-libs/capstone not keyworded here dev-lang/php capstone @@ -317,6 +321,7 @@ dev-db/percona-server cjk # Mikle Kolyada (2018-10-05) # Not keyworded (see bug #540540c#8) app-admin/sudo sssd +sys-auth/pambase sssd # Andreas Sturmlechner (2018-09-30) # Optional dependency blocking security cleanup, bug #627316 diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/use.mask index ff31c398dfe..53ce21c2ffb 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/alpha/use.mask @@ -1,12 +1,17 @@ -# 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. -alpha +# matoro (2024-01-24) +# sys-apps/flatpak is not keyworded here +flatpak + # matoro (2023-11-14) # Qt is not keyworded here qt5 +qt6 # matoro (2023-06-17) # media-libs/libheif is not keyworded here 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 e94ce63b347..45d113b969a 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 @@ -24,9 +24,7 @@ app-arch/stuffit app-benchmarks/cpuburn app-editors/emacs:18 app-emulation/crossover-bin -app-emulation/protontricks app-emulation/q4wine -app-emulation/winetricks dev-embedded/libftd2xx dev-embedded/openocd dev-util/android-ndk @@ -57,7 +55,6 @@ games-arcade/gish-demo games-arcade/jardinains games-arcade/thinktanks-demo games-emulation/gens - (2024-01-27) +# dev-python/PyQt6 and dev-python/pyside6 are keyworded here +dev-python/QtPy -pyqt6 -pyside6 + +# Michal Privoznik (2024-01-21) +# virtiofsd is available here +app-emulation/libvirt -virtiofsd + # Andrew Ammerlaan (2024-01-13) # Unmask only where grub is keyworded sys-kernel/installkernel -grub @@ -434,7 +442,6 @@ sys-apps/hwloc -gl -nvml # Michał Górny (2013-07-22) # Meaningless on amd64 (it controls the 32-bit x86 JIT). dev-python/pypy-exe cpu_flags_x86_sse2 -dev-python/pypy3-exe cpu_flags_x86_sse2 # Diego Elio Pettenò (2012-11-03) # Unmask here, as it's masked in base. 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 78e11ff93f5..55ec28d2d0d 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 @@ -17,6 +17,14 @@ #--- END OF EXAMPLES --- +# Ionen Wolkens (2024-01-27) +# dev-python/pyside6 is not stable here yet +dev-python/QtPy pyside6 + +# Ionen Wolkens (2024-01-16) +# cuda (and thus cudnn) are not available in stable +media-libs/opencv cudnn + # Joonas Niilola (2024-01-08) # Pulls in pandoc with all of its glory (haskell). #921501 www-apps/hugo test @@ -101,6 +109,7 @@ media-libs/opencv contribcvv contribhdf contribsfm contribxfeatures2d gflags glo # Mikle Kolyada (2018-11-07) # unmask sssd for sudo app-admin/sudo -sssd +sys-auth/pambase -sssd # Thomas Deutschmann (2018-06-01) net-analyzer/wireshark -doc 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 a2dda70023b..903b1e2d2f3 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 @@ -16,12 +16,6 @@ # Unmask secureboot flag on arches where sbsigntools is keyworded -secureboot -# Jimi Huotari (2023-03-03) -# Unmask on amd64 only for now. --qt6 --pyqt6 --pyside6 - # matoro (2022-09-29) # dev-util/google-perftools is supported here -tcmalloc 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 4cfb9679833..46c7b6a6f27 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-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Michal Privoznik (2024-01-18) +# No sys-block/nbdkit on arm, yet +app-emulation/libvirt nbd + # Andrew Ammerlaan (2024-01-13) # Unmask only where grub is keyworded sys-kernel/installkernel -grub diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.stable.mask index 0022a3aafc7..2e2b478ee99 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Ionen Wolkens (2024-01-27) +# Qt6 is not stable here yet +qt6 + # Sam James (2022-01-16) # net-libs/gnome-online-accounts is not marked stable on arm yet gnome-online-accounts 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 edb30fee4c2..c7a747a831b 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,14 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens (2024-01-27) +# dev-python/PyQt6 is keyworded here +dev-python/QtPy -pyqt6 + +# Michal Privoznik (2024-01-18) +# No sys-block/nbdkit on arm, yet +app-emulation/libvirt nbd + # Andrew Ammerlaan (2024-01-13) # Unmask only where grub is keyworded sys-kernel/installkernel -grub diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.stable.mask index 615da88ec98..65ce835fb0f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.stable.mask @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens (2024-01-27) +# dev-python/PyQt6 and dev-python/pyside6 are not stable here yet +dev-python/QtPy pyqt6 pyside6 + # 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/arm64/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.stable.mask index dd47f125ea2..4e253e67a8a 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Ionen Wolkens (2024-01-27) +# Qt6 is not stable here yet +qt6 + # Mart Raudsepp (2023-10-03) # dev-util/sysprof-capture and dev-util/sysprof are not stable yet sysprof 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 ed569262419..39b5b770b7e 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,14 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens (2024-01-27) +# dev-python/PyQt6 and dev-python/pyside6 have very few keywords +dev-python/QtPy pyqt6 pyside6 + +# Michal Privoznik (2024-01-21) +# virtiofsd is only available on some arches +app-emulation/libvirt virtiofsd + # Andrew Ammerlaan (2024-01-13) # Unmask only where grub is keyworded sys-kernel/installkernel grub @@ -76,6 +84,10 @@ kde-plasma/discover snap # See bug #894078. dev-python/tables cpudetection +# Andreas Sturmlechner (2023-03-09) +# media-libs/libplacebo is not keyworded anywhere except amd64/ppc64/x86 yet +media-video/ffmpeg libplacebo + # Michał Górny (2023-01-24) # libomptarget is only supported on 64-bit architectures. >=sys-libs/libomp-16.0.0_pre20230124 offload @@ -453,7 +465,3 @@ media-video/mplayer cpudetection # Ian Whyman (2016-05-22) # Mask raspberry-pi except on arm. dev-libs/libcec raspberry-pi - -# Andreas Sturmlechner (2023-03-09) -# media-libs/libplacebo is not keyworded anywhere except amd64/ppc64/x86 yet -media-video/ffmpeg libplacebo diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.mask index f60c79116aa..38231b9f09d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.mask @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Sam James (2023-03-28) @@ -8,7 +8,7 @@ dev-python/py-cpuinfo # Sam James (2023-03-10) # Fails to build on HPPA w/ sys-kernel/linux-headers-6.2: # https://github.com/strace/strace/issues/241 -=dev-util/strace-6.2 +=dev-debug/strace-6.2 # Quote from : # "Compilation fails with: #error You need to define CycleTimer for 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 4b607081a63..ea0c0add11c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask @@ -4,6 +4,15 @@ # NOTE: When masking a USE flag due to missing keywords, please file a keyword # request bug for the hppa arch. +# Ionen Wolkens (2024-01-23) +# Needs dev-qt/qtquick3d:6 which itself needs media-libs/assimp that +# is not keyworded here and currently fails tests (bug #919896). +dev-qt/qtmultimedia:6 qml + +# Leonardo Hernández Hernández (2024-01-06) +# net-libs/grpc not keyworded here +app-admin/syslog-ng grpc + # Sam James (2024-01-02) # dev-libs/capstone not keyworded here dev-lang/php capstone 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 a2a9aae1ddb..d9780b80ad6 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 @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Ionen Wolkens (2024-01-27) +# Qt6 is not stable here yet +qt6 + # Sam James (2023-07-02) # Unlikely that anybody wants to use net-nds/openldap on hppa & often has # platform-specific bugs. 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 47b2b567a44..a9dc726d7b2 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 @@ -8,4 +8,3 @@ # Sergei Trofimovich (2020-05-02) # greenlet needs arch-specific stack switching code. There is no ia64 port. dev-python/greenlet -virtual/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 c18de78a331..e8912289025 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Leonardo Hernández Hernández (2024-01-15) +# net-libs/grpc not keyworded here +app-admin/syslog-ng grpc + # Andrew Ammerlaan (2024-01-13) # Unmask only where grub is keyworded sys-kernel/installkernel -grub @@ -12,6 +16,7 @@ dev-lang/php capstone # David Seifert (2023-12-30) # sys-auth/sssd not keyworded here anymore app-admin/sudo sssd +sys-auth/pambase sssd # Mart Raudsepp (2023-12-25) # sys-apps/xdg-desktop-portal not keyworded here yet diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/use.mask index 8e5089b10a2..4b316c080a7 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/ia64/use.mask @@ -206,3 +206,4 @@ rbd # Ben de Groot (2015-02-01) # please remove when keyworded qt5 +qt6 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 a80faf224e9..050e85be038 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 @@ -54,7 +54,6 @@ sys-devel/llvm -debuginfod # Revdeps of dev-python/ujson which is masked. dev-python/cattrs test dev-python/requests-cache test -dev-python/ruamel-std-pathlib test # Andrew Ammerlaan (2023-08-30) # Avoid having to keyword more Qt deps @@ -185,6 +184,7 @@ media-video/ffmpeg libilbc libtesseract # WANG Xuerui (2022-12-05) # sys-auth/sssd isn't keyworded here yet app-admin/sudo sssd +sys-auth/pambase sssd # WANG Xuerui (2022-12-04) # neither app-text/ronn or app-text/ronn-ng can be built with 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 84c7e1c2367..3815aedb321 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 @@ -102,7 +102,7 @@ dev-python/numpy lapack net-misc/openssh security-key # Sergei Trofimovich (2019-12-02) -# dev-util/systemtap is not keyworded on m68k +# dev-debug/systemtap is not keyworded on m68k sys-libs/glibc systemtap # Sergei Trofimovich (2019-12-02) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/use.mask index 19ddb6d1950..25d4d1977e9 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/use.mask @@ -82,6 +82,7 @@ ruby # James Le Cuirot (2021-08-20) # Qt is not keyworded or tested. qt5 +qt6 # Sergei Trofimovich (2020-04-23) # valgrind has no m68k port. 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 751e44f5b83..e2536985719 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 @@ -271,3 +271,4 @@ opencl # Ben de Groot (2015-02-01) # please remove when keyworded qt5 +qt6 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 e78219c307f..be0552d9d2c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2024-01-17) +# The generated code is too large and it takes ages to build, bug #922249. +dev-python/mypy native-extensions + # Sam James (2024-01-05) # sys-apps/keyutils not stable here, because of test failures. bug #636252 app-benchmarks/stress-ng keyutils diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask index 703c39a8fa6..e67adf32e84 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/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 # Jimi Huotari (2023-01-11) @@ -86,7 +86,7 @@ # Sergei Trofimovich (2018-04-11) # ltrace is not ported to powerpc64le yet. -dev-util/ltrace +dev-debug/ltrace # Arfrever Frehtes Taifersar Arahesis (2018-02-21) # Mozc supports only little-endian architectures. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.use.mask index e394f7c3712..e7f5bc98d0e 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.use.mask @@ -1,6 +1,12 @@ # Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens (2024-01-27) +# dev-qt/qtwebengine:6 is not available here, technically does +# not need to be masked for Qt5 (is keyworded) but would require +# USE=qt5-webengine or so to make the distinction with Qt6. +sci-astronomy/stellarium webengine + # Marek Szuba (2023-12-05) # Needs USE=video_cards_amdgpu, which IS available on ppc64le. >=sys-apps/fwupd-1.9.10 -amdgpu diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask index 77289a944ed..8c1c7745126 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask @@ -1,10 +1,6 @@ # Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Alexey Sokolov (2022-02-05) -# dev-qt/qtwebengine not stable on ppc64 yet -sci-astronomy/stellarium webengine - # Georgy Yakovlev (2021-05-07) # openjfx:8 will never be stabilized # openjfx:11 probably will neither diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask index 7d3478fc343..694da7e1f32 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/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 # Jimi Huotari (2023-01-11) @@ -8,7 +8,6 @@ # Michał Górny (2022-08-25) # Only ppc64le binpkg is provided. dev-python/pypy-exe-bin -dev-python/pypy3-exe-bin # Sam James (2022-01-18) # No bootstrap binary available on big endian PPC64 right now 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 c1d907fe1c8..ad5f2a0d5f0 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,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Michal Privoznik (2024-01-21) +# virtiofsd is available here +app-emulation/libvirt -virtiofsd + # Ionen Wolkens (2023-10-09) # media-libs/shaderc is keyworded here. media-libs/libplacebo -shaderc diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.stable.mask index afcb4b4b88a..26c5e775699 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Ionen Wolkens (2024-01-27) +# Qt6 is not stable here yet +qt6 + # Matt Turner (2018-04-25) # Dropped stable keywords octave diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/ppc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/ppc/package.use.mask index cf76bfb56d5..fd2fb1587aa 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/ppc/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/ppc/package.use.mask @@ -1,6 +1,10 @@ # Copyright 2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Leonardo Hernández Hernández (2023-12-26) +# net-libs/grpc not keyworded here +app-admin/syslog-ng grpc + # Leonardo Hernández Hernández (2023-11-15) # media-libs/shaderc in not keyworded media-video/ffmpeg shaderc 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 742b8eae397..4980413f977 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask @@ -1,6 +1,10 @@ # Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Michal Privoznik (2024-01-18) +# No sys-block/nbdkit on riscv, yet +app-emulation/libvirt nbd + # Andrew Ammerlaan (2024-01-13) # Unmask only where grub is keyworded sys-kernel/installkernel -grub @@ -239,3 +243,8 @@ sci-libs/opencascade vtk dev-libs/libpcre2 jit dev-libs/libpcre jit www-servers/nginx pcre-jit + +# Ian Jordan (2024-01-24) +# Dependencies not keyworded yet: +# - dev-libs/libisoburn +dev-util/catalyst iso diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/use.mask index 516675aeda5..4eb16fdf74f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/use.mask @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Unmask the flag which corresponds to ARCH. @@ -20,6 +20,10 @@ -gtk3 -introspection +# Yongxiang Liang (2024-01-16) +# Requires qtwebengine, which is not ported to riscv +webengine + # Marek Szuba (2021-08-14) # sci-libs/netcdf fails tests in a way suggesting it might be completely # unreliable on this arch as far as I/O is concerned. 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 ed4e9afb401..212cdaa3663 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Leonardo Hernández Hernández (2024-01-15) +# net-libs/grpc not keyworded here +app-admin/syslog-ng grpc + # Andrew Ammerlaan (2024-01-12) # dracut is not keyworded here sys-kernel/installkernel dracut @@ -119,6 +123,7 @@ app-crypt/pinentry efl # Sam James (2022-04-24) # sssd not keyworded here app-admin/sudo sssd +sys-auth/pambase sssd # Sam James (2022-04-24) # app-crypt/dieharder and dev-libs/softhsm:2 unkeyworded here diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/use.mask index 88c2ad37996..838c3ee29f1 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/use.mask @@ -85,6 +85,7 @@ java hardened vaapi qt5 +qt6 # Needs java pdfannotextractor 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 9fd8b2de823..e7dcc98b990 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Leonardo Hernández Hernández (2024-01-15) +# net-libs/grpc not keyworded here +app-admin/syslog-ng grpc + # Andrew Ammerlaan (2024-01-13) # Unmask only where grub is keyworded sys-kernel/installkernel -grub diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.mask index 922ae7b2820..766fb7f8ce3 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/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 # Unmask the flag which corresponds to ARCH. -sparc +# Ionen Wolkens (2024-01-27) +# Needs bug #918896 for missing Qt6 keywords +qt6 + # matoro (2023-06-17) # media-libs/libheif is not keyworded here heif diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/i486/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/eapi rename to sdk_container/src/third_party/portage-stable/profiles/arch/x86/i486/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/i486/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/i486/make.defaults new file mode 100644 index 00000000000..48bd5c26d31 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/i486/make.defaults @@ -0,0 +1,10 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +CHOST="i486-pc-linux-gnu" +CFLAGS="-O2 -march=i486 -pipe" +CXXFLAGS="${CFLAGS}" +FFLAGS="${CFLAGS}" +FCFLAGS="${CFLAGS}" + +CPU_FLAGS_X86="" diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/i686/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/gnome/eapi rename to sdk_container/src/third_party/portage-stable/profiles/arch/x86/i686/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/i686/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/i686/make.defaults new file mode 100644 index 00000000000..ac358d7c039 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/i686/make.defaults @@ -0,0 +1,10 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +CHOST="i686-pc-linux-gnu" +CFLAGS="-O2 -march=i686 -pipe" +CXXFLAGS="${CFLAGS}" +FFLAGS="${CFLAGS}" +FCFLAGS="${CFLAGS}" + +CPU_FLAGS_X86="mmx sse" diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask index f2ea6348296..9410ac3510f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/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 @@ -97,6 +97,7 @@ media-libs/opencv contribcvv contribhdf contribsfm contribxfeatures2d gflags glo # Mikle Kolyada (2018-11-07) # unmask sssd for sudo app-admin/sudo -sssd +sys-auth/pambase -sssd # Thomas Deutschmann (2018-06-01) net-analyzer/wireshark -doc diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask index 29e2b97d388..70fda23fed3 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Ionen Wolkens (2024-01-27) +# Qt6 is not stable here yet +qt6 + # Sam James (2020-11-10) # media-gfx/openvdb is not stable on x86 # ... and has failing tests right now anyway diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use b/sdk_container/src/third_party/portage-stable/profiles/base/package.use index 3a17ebbaa40..687c1686046 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Alfred Wingate (2023-12-25) +# Default to gbm on non-desktop with REQUIRED_USE: ^^ ( gbm wayland X ) +>=media-tv/kodi-20.2 gbm udev + # Yongxiang Liang (2023-12-12) # Default to lua 5.4 (upstream requires 5.3 or higher) app-i18n/fcitx-lua lua_single_target_lua5-4 diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force index bd0c560a5ae..9a47d64fea2 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force +++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.force @@ -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 # Michael Orlitzky (2023-11-22) @@ -211,11 +211,6 @@ net-misc/netkit-bootparamd libtirpc sci-astronomy/esomidas libtirpc sys-cluster/glusterfs libtirpc -# David Seifert (2017-03-07) -# Only ever use system ffmpeg, allow kodi bundled ffmpeg -# only for debug pruposes. -media-tv/kodi system-ffmpeg - # Maciej Mrozowski (2016-09-01) # Workaround until resolved upstream (bug #586840) >=dev-games/simgear-2016.2.1 dns 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 10099ae25cf..24a7a5c5208 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 @@ -6,6 +6,21 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Michael Orlitzky (2024-01-24) +# A missing "-o pipefail" in the gap-pkg eclass caused me to +# miss a few crashes in dev-gap packages when GAP itself is +# built with kernel debugging enabled. These may not be the +# only problems but it's hard to tell because they cascade: +# +# * https://github.com/frankluebeck/EDIM/issues/24 +# * https://github.com/gap-packages/io/issues/122 +# +sci-mathematics/gap debug + +# Alfredo Tupone (2024-01-20) +# Not working, bug #890756 +sci-mathematics/why3-for-spark doc + # Arthur Zamarin (2023-12-22) # Requires sys-block/hpacucli net-analyzer/nagios-plugin-check_raid hpa @@ -16,11 +31,6 @@ net-analyzer/nagios-plugin-check_raid hpa media-gfx/openvdb ax sys-devel/sparse llvm -# Sam James (2023-12-18) -# libgrust build is broken for multilib -# https://gcc.gnu.org/PR113056 ->=sys-devel/gcc-14.0.0_pre20231217 rust - # Takuya Wakazono (2023-11-21) # app-crypt/rpm-sequoia is not keyworded on most architectures. app-arch/rpm sequoia @@ -71,13 +81,6 @@ net-voip/yate dahdi # Not ported to libsoup:3.0 app-office/abiword collab -# WANG Xuerui (2023-08-28) -# Breaks multiple high-profile packages depending on outdated proc-macro2 when -# USE=nightly and using an affected Rust version; keep until revdep problems -# are gone. -# See https://github.com/rust-lang/rust/issues/113152 ->=dev-lang/rust-1.72.0 nightly - # Michael Orlitzky (2023-08-23) # Polymake itself is masked for removal (bug 909570). sci-mathematics/singular polymake diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask index 1c3d7d94e2d..fae6a0085d6 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask @@ -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. @@ -21,10 +21,6 @@ dev-lang/python-exec -python_targets_python3_12 # xfce-base/libxfce4windowing is not ready to go stable (4.19 branch). xfce-extra/xfce4-pulseaudio-plugin libxfce4windowing -# Alfredo Tupone (2023-04-02) -# For doc, dev-python/sphinxcontrib-bibtex is required -sci-mathematics/why3-for-spark doc - # Daniel Pielmeier (2023-03-04) # For docs, app-text/pandoc is required. For details see: # Bug #737612 @@ -137,7 +133,7 @@ app-emulation/winetricks test # Georgy Yakovlev (2019-12-21) # For bleeding edge features and testing, not generally suitable # for stable systems -dev-lang/rust nightly profiler system-bootstrap +dev-lang/rust nightly system-bootstrap # Andreas Sturmlechner (2019-12-09) # Declared experimental, and dev-cpp/websocketpp not stable yet @@ -172,6 +168,7 @@ media-plugins/grilo-plugins chromaprint # Mikle Kolyada (2018-11-07) # sssd is only stable for amd64 and x86 app-admin/sudo sssd +sys-auth/pambase sssd # Thomas Deutschmann (2018-06-01) # Needs dev-ruby/asciidoctor which has a lot of unstable deps diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/use.mask b/sdk_container/src/third_party/portage-stable/profiles/base/use.mask index 4eefab83753..316658feeba 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/use.mask @@ -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 is only for generic masks. For arch-specific masks (i.e. @@ -8,11 +8,6 @@ # KF6 is not in ::gentoo yet. Move to stable.use.mask on KF6 intro. kf6compat -# David Seifert (2023-09-09) -# EOL upstream in 2 months, causes major headaches for OpenSSL 1.1 -# masking. Removal on 2023-10-09. -php_targets_php8-0 - # Hans de Graaff (2023-08-19) # Ruby 3.0 is not compatible with OpenSSL 3. Please upgrade to a newer # Ruby version. @@ -22,13 +17,6 @@ ruby_targets_ruby30 # Ruby 2.7 is masked for removal. ruby_targets_ruby27 -# Sam James (2022-08-02) -# Masked for testing. The split of some packages may still -# change. bug #838970. -qt6 -pyqt6 -pyside6 - # Matt Turner (2022-04-16) # dev-util/sysprof not keyworded on most arches yet sysprof diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask index 6682b8d46b5..09b5f3aef39 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask @@ -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. @@ -13,10 +13,6 @@ ruby_targets_ruby33 # New unstable PHP slot. php_targets_php8-3 -# Michał Górny (2023-11-10) -# Not stable yet. -postgres_targets_postgres16 - # Michał Górny (2023-05-23) # Mask until dev-lang/python:3.12 becomes stable. python_targets_python3_12 diff --git a/sdk_container/src/third_party/portage-stable/profiles/categories b/sdk_container/src/third_party/portage-stable/profiles/categories index 691304863fd..f7f5996e181 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/categories +++ b/sdk_container/src/third_party/portage-stable/profiles/categories @@ -39,6 +39,7 @@ dev-dotnet dev-embedded dev-erlang dev-games +dev-gap dev-go dev-haskell dev-java diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/make.defaults index 74dd59d5d81..4e21cd58fdf 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/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 @@ -54,3 +54,10 @@ LDFLAGS="-Wl,-O1 -Wl,--as-needed" # Prevent automagic use of 64-bit time_t. # https://bugs.gentoo.org/828001 enable_year2038="no" + +# Sam James (2024-01-22) +# Workaround for sandbox bug which causes this gnulib configure test to take +# many real hours on slower machines, and certainly a huge amount of CPU hours +# on others. Spoof the same result as configure gets on a modern glibc system +# for now. See bug #447970 and bug #922652. +gl_cv_func_getcwd_path_max="yes" 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 40f3d8e84ff..c169d2f8544 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 @@ -10,12 +10,12 @@ app-arch/gzip app-arch/xz-utils app-arch/tar app-shells/bash:0 +dev-build/autoconf +dev-build/automake +dev-build/libtool dev-build/make net-misc/rsync net-misc/wget -sys-devel/autoconf -sys-devel/automake -sys-devel/libtool sys-apps/baselayout sys-apps/coreutils sys-apps/diffutils diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/gnome/parent deleted file mode 100644 index 6589a0e0147..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/gnome/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../targets/desktop/gnome diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/gnome/systemd/parent deleted file mode 100644 index f5c1ae438de..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/gnome/systemd/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../../targets/desktop/gnome/systemd diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/parent deleted file mode 100644 index ad6c5e126fb..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../targets/desktop diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/plasma/parent deleted file mode 100644 index ff3a7b1ec81..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/plasma/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../targets/desktop/plasma diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/plasma/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/plasma/systemd/parent deleted file mode 100644 index 44f88d3e2df..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/plasma/systemd/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../../targets/systemd diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/hardened/parent deleted file mode 100644 index 40a1173682f..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/hardened/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../features/hardened/x86 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/hardened/selinux/parent deleted file mode 100644 index 2190e9797ea..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/hardened/selinux/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../features/selinux diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/gnome/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/gnome/systemd/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/hardened/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/plasma/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/hardened/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/hardened/parent similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/hardened/parent rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/hardened/parent diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/plasma/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/hardened/selinux/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/desktop/plasma/systemd/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/hardened/selinux/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/hardened/selinux/parent similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/hardened/selinux/parent rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/hardened/selinux/parent diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/make.defaults similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/make.defaults rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/make.defaults diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/hardened/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/make.defaults similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/make.defaults rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/make.defaults diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/package.mask similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/package.mask rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/package.mask diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/package.use.mask similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/package.use.mask rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/package.use.mask diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/parent similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/parent rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/parent diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/selinux/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/hardened/selinux/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/selinux/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/selinux/parent similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/selinux/parent rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/selinux/parent diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/use.force similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/use.force rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/use.force diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/use.mask similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/use.mask rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/musl/use.mask diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/parent new file mode 100644 index 00000000000..d32f3b6cc8c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/parent @@ -0,0 +1,2 @@ +.. +../../../../../arch/x86/i486 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/hardened/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/selinux/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/hardened/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/hardened/parent new file mode 100644 index 00000000000..e5d746a4ea0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/hardened/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../features/hardened/x86 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/hardened/selinux/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/hardened/selinux/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/hardened/selinux/parent new file mode 100644 index 00000000000..23c5fe07a24 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/hardened/selinux/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../../features/selinux diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/make.defaults similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/make.defaults rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/make.defaults diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.mask similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/package.mask rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.mask diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/package.use.mask rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/package.use.mask diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/parent new file mode 100644 index 00000000000..b488e1ca01b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../features/musl diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/selinux/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/selinux/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/selinux/parent new file mode 100644 index 00000000000..23c5fe07a24 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/selinux/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../../features/selinux diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/use.force similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/use.force rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/use.force diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/use.mask similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/use.mask rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/musl/use.mask diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/parent new file mode 100644 index 00000000000..25281026829 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/split-usr/parent @@ -0,0 +1,2 @@ +.. +../../../../../../features/split-usr diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/systemd/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/systemd/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/systemd/parent new file mode 100644 index 00000000000..7e061533c15 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i486/systemd/parent @@ -0,0 +1,2 @@ +.. +../../../../../../targets/systemd diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/desktop/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/gnome/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/desktop/gnome/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/gnome/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/gnome/parent similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/desktop/gnome/parent rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/gnome/parent diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/gnome/systemd/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/desktop/plasma/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/gnome/systemd/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/gnome/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/gnome/systemd/parent new file mode 100644 index 00000000000..2122741fb81 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/gnome/systemd/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../../targets/desktop/gnome/systemd diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/parent similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/desktop/parent rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/parent diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/plasma/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/plasma/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/plasma/parent similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/desktop/plasma/parent rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/plasma/parent diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/plasma/systemd/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/hardened/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/plasma/systemd/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/plasma/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/plasma/systemd/parent new file mode 100644 index 00000000000..f7739b40587 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/desktop/plasma/systemd/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../../targets/systemd diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/hardened/selinux/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/hardened/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/hardened/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/hardened/parent new file mode 100644 index 00000000000..178c392e9fe --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/hardened/parent @@ -0,0 +1,2 @@ +.. +../../../../../../features/hardened/x86 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/hardened/selinux/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/musl/selinux/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/hardened/selinux/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/hardened/selinux/parent new file mode 100644 index 00000000000..23c64bb4439 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/hardened/selinux/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../features/selinux diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/make.defaults new file mode 100644 index 00000000000..05f8f6a3654 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/make.defaults @@ -0,0 +1,4 @@ +# Copyright 2023 Gentoo Authors. +# Distributed under the terms of the GNU General Public License v2 + +LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,-z,pack-relative-relocs" diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/make.defaults new file mode 100644 index 00000000000..7dc7895c6db --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/make.defaults @@ -0,0 +1,5 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +CHOST="i686-pc-linux-musl" +CHOST_x86="${CHOST}" diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/package.mask new file mode 100644 index 00000000000..ea771f7580c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/package.mask @@ -0,0 +1,2 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License, v2 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/package.use.mask new file mode 100644 index 00000000000..b794980bdad --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/package.use.mask @@ -0,0 +1,8 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License, v2 + +# Anthony G. Basile (2020-09-06) +# The patch added for 5.39-r1 breaks on musl i686 +# file-5.39-seccomp_sandbox.patch is okay +# file-5.39-portage_sandbox.patch is broken +sys-apps/file seccomp diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/parent new file mode 100644 index 00000000000..5bbe8700f1a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/parent @@ -0,0 +1,2 @@ +.. +../../../../../../features/musl diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.16+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/selinux/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.16+/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/selinux/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/selinux/parent new file mode 100644 index 00000000000..23c64bb4439 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/selinux/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../features/selinux diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/use.force new file mode 100644 index 00000000000..8e450e58d6d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/use.force @@ -0,0 +1,5 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 + +# Many packages break without this, like app-arch/gzip +pic diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/use.mask new file mode 100644 index 00000000000..fe008ec19ef --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/musl/use.mask @@ -0,0 +1,2 @@ +# Copyright 1999-2021 Gentoo Authors. +# Distributed under the terms of the GNU General Public License, v2 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/parent new file mode 100644 index 00000000000..7cba910cc93 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/parent @@ -0,0 +1,2 @@ +.. +../../../../../arch/x86/i686 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.32+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.32+/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-3.2+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.16+/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-3.2+/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.16+/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.16+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.16+/parent similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.16+/parent rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.16+/parent diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.32+/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/systemd/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.32+/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.32+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.32+/parent similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-2.6.32+/parent rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/kernel-2.6.32+/parent diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/kernel-3.2+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/kernel-3.2+/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/kernel-3.2+/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-3.2+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/kernel-3.2+/parent similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/kernel-3.2+/parent rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/kernel-3.2+/parent diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/parent similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/parent rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/prefix/parent diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/gnome/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/gnome/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/gnome/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/gnome/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/gnome/parent new file mode 100644 index 00000000000..d5a56a13f69 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/gnome/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../../targets/desktop/gnome diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/parent new file mode 100644 index 00000000000..fae96e8d36b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../targets/desktop diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/plasma/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/plasma/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/plasma/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/plasma/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/plasma/parent new file mode 100644 index 00000000000..0317df26cc9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/desktop/plasma/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../../targets/desktop/plasma diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/parent new file mode 100644 index 00000000000..e5d746a4ea0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../features/hardened/x86 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/selinux/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/selinux/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/selinux/parent new file mode 100644 index 00000000000..23c5fe07a24 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/hardened/selinux/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../../features/selinux diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/make.defaults new file mode 100644 index 00000000000..7dc7895c6db --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/make.defaults @@ -0,0 +1,5 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +CHOST="i686-pc-linux-musl" +CHOST_x86="${CHOST}" diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.mask new file mode 100644 index 00000000000..ea771f7580c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.mask @@ -0,0 +1,2 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License, v2 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask new file mode 100644 index 00000000000..b794980bdad --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/package.use.mask @@ -0,0 +1,8 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License, v2 + +# Anthony G. Basile (2020-09-06) +# The patch added for 5.39-r1 breaks on musl i686 +# file-5.39-seccomp_sandbox.patch is okay +# file-5.39-portage_sandbox.patch is broken +sys-apps/file seccomp diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/parent new file mode 100644 index 00000000000..b488e1ca01b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../features/musl diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/selinux/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/selinux/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/selinux/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/selinux/parent new file mode 100644 index 00000000000..23c5fe07a24 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/selinux/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../../features/selinux diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/use.force b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/use.force new file mode 100644 index 00000000000..8e450e58d6d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/use.force @@ -0,0 +1,5 @@ +# Copyright 1999-2018 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 + +# Many packages break without this, like app-arch/gzip +pic diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/use.mask new file mode 100644 index 00000000000..fe008ec19ef --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/musl/use.mask @@ -0,0 +1,2 @@ +# Copyright 1999-2021 Gentoo Authors. +# Distributed under the terms of the GNU General Public License, v2 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/parent new file mode 100644 index 00000000000..25281026829 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/parent @@ -0,0 +1,2 @@ +.. +../../../../../../features/split-usr diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+/parent new file mode 100644 index 00000000000..ca2bf4c92bb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../../features/prefix/standalone/kernel-2.6.16+ diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+/parent new file mode 100644 index 00000000000..6d5495a6cf3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../../features/prefix/standalone/kernel-2.6.32+ diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+/parent new file mode 100644 index 00000000000..df2c40188f3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../../features/prefix/standalone diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/parent similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/prefix/parent rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/split-usr/prefix/parent diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/systemd/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/systemd/eapi new file mode 100644 index 00000000000..7ed6ff82de6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/systemd/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/systemd/parent new file mode 100644 index 00000000000..7e061533c15 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/i686/systemd/parent @@ -0,0 +1,2 @@ +.. +../../../../../../targets/systemd diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/parent deleted file mode 100644 index 58651906cb6..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../features/musl diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/selinux/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/selinux/parent deleted file mode 100644 index 2190e9797ea..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/musl/selinux/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../features/selinux diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/parent deleted file mode 100644 index c4bb168d81b..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-2.6.16+/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../features/prefix/standalone/kernel-2.6.16+ diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/parent deleted file mode 100644 index b4882488fc0..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-2.6.32+/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../features/prefix/standalone/kernel-2.6.32+ diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/parent deleted file mode 100644 index b8a505e58f6..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/prefix/kernel-3.2+/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../../features/prefix/standalone diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/parent deleted file mode 100644 index 598ca888c8c..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/split-usr/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../features/split-usr diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/systemd/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/systemd/parent deleted file mode 100644 index ced72403bde..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/x86/23.0/systemd/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../targets/systemd diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/cpu_flags_x86.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/cpu_flags_x86.desc index 5c8a9bceaee..d7dee6227a7 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/desc/cpu_flags_x86.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/desc/cpu_flags_x86.desc @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Whenever the flag name does not correspond to /proc/cpuinfo flags, @@ -10,8 +10,18 @@ aes - Enable support for Intel's AES instruction set (AES-NI) avx - Adds support for Advanced Vector Extensions instructions avx2 - Adds support for Advanced Vector Extensions 2 instructions +avx512_4fmaps - Use AVX-512 Fused Multiply-Accumulate Packed Single Precision instruction set +avx512_4vnniw - Use AVX-512 Vector Neural Network Instructions Word Variable Precision +avx512_bf16 - Use AVX-512 BFloat16 instruction set +avx512_bitalg - Use AVX-512 Bit Algorithms instruction set +avx512_fp16 - Use general-purpose numeric operations for 16-bit half-precision instruction set +avx512_vbmi2 - Use AVX-512 Vector Bit Manipulation Instructions 2 +avx512_vnni - Use vector neural network instructions for 8- and 16-bit multiply-add operations +avx512_vp2intersect - Use AVX-512 Intersect instruction set +avx512_vpopcntdq - Use AVX-512 Vector Population Count Doubleword and Quadword instruction set avx512dq - Use AVX-512 double- and quad-word instructions avx512f - Adds support for AVX-512 Foundation instructions +avx512ifma - Use AVX-512 Integer Fused Multiply-Add instruction set avx512vl - Use AVX-512 vector-length instructions f16c - Adds support for F16C instruction set for converting between half-precision and single-precision floats fma3 - Use the Fused Multiply Add 3 instruction set ([fma] in cpuinfo) @@ -30,4 +40,5 @@ sse4_1 - Enable SSE4.1 instruction support sse4_2 - Enable SSE4.2 instruction support sse4a - Enable SSE4a instruction support ssse3 - Use the SSSE3 instruction set (NOT sse3/pni) +vpclmulqdq - Use Vector Carry-Less Multiplication of Quadwords instruction set xop - Enable the XOP instruction set diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/php_targets.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/php_targets.desc index 0f6c40acfa5..029dd62dce4 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/desc/php_targets.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/desc/php_targets.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 # This file contains descriptions of the PHP_TARGETS USE_EXPAND flags @@ -6,4 +6,3 @@ php8-3 - Build against PHP 8.3 php8-2 - Build against PHP 8.2 php8-1 - Build against PHP 8.1 -php8-0 - Build against PHP 8.0 diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/postgres_targets.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/postgres_targets.desc index c122590b413..d40f508181c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/desc/postgres_targets.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/desc/postgres_targets.desc @@ -1,9 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This file contains descriptions of POSTGRES_TARGETS USE_EXPAND flags. -postgres11 - Build against PostgreSQL 11 postgres12 - Build against PostgreSQL 12 postgres13 - Build against PostgreSQL 13 postgres14 - Build against PostgreSQL 14 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 3078bdd61b0..ca792276e39 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 @@ -17,3 +17,10 @@ FEATURES="-multilib-strict" # that use a charset, it causes package collisons. # Note: we use a full path for locale.alias for bug #799437 INSTALL_MASK="charset.alias /usr/share/locale/locale.alias" + +# Sam James (2024-01-22) +# Workaround for sandbox bug which causes this gnulib configure test to take +# many real hours on slower machines, and certainly a huge amount of CPU hours +# on others. Spoof the same result as configure gets on a modern musl system +# for now. See bug #447970 and bug #922652. +gl_cv_func_getcwd_path_max="no, but it is partly working" 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 3e116910a42..c0162ce33f4 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,11 +1,19 @@ # 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 +# Christopher Fore (2024-01-24) +# >=sys-fs/bcachefs-tools-1.4.1 uses functions currently not in Musl +# https://github.com/koverstreet/bcachefs-tools/issues/213 +>=sys-fs/bcachefs-tools-1.4.1 + +# Conrad Kostecki (2024-01-23) +# Uses glibc function getsourcefilter(), +# which are not available on musl. +net-misc/mcproxy + +# Giuseppe Foti (2024-01-22) +# Binary package, which is compiled against glibc +app-office/drawio-desktop-bin # Maciej Barć (2024-01-06) # Binary package, which is compiled against glibc @@ -142,7 +150,7 @@ www-client/chromium net-misc/netkit-telnetd net-misc/sitecopy -# Andrew Ammerlaan (2022-01-05) +# Andrew Ammerlaan (2024-01-20) # Binary package linked to glibc (rolling mask, use for all such binpkgs) app-admin/awscli-bin app-admin/bitwarden-desktop-bin @@ -151,7 +159,9 @@ app-admin/puppetserver app-arch/rar app-backup/tsm app-benchmarks/geekbench +app-benchmarks/geekbench-ml app-crypt/rainbowcrack +app-crypt/yubioath-flutter-bin app-editors/sublime-text app-editors/vscode app-editors/vscodium 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 e37fc86b088..c134af6cab6 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 @@ -52,6 +52,7 @@ dev-scheme/scm readline # Sam James (2022-10-04) # sys-auth/sssd is masked on musl app-admin/sudo sssd +sys-auth/pambase sssd # Sam James (2022-10-04) # sys-libs/libsmbios is masked on musl 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 2a74df78bd8..cab091c40f7 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 @@ -12,6 +12,7 @@ app-crypt/acme app-crypt/certbot app-crypt/certbot-nginx app-crypt/rpm-sequoia +app-emulation/virtiofsd app-eselect/eselect-rust app-misc/khal app-text/mdbook diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask index cbfafce8748..af589efe2d0 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask @@ -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 # Takuya Wakazono (2023-11-21) @@ -56,7 +56,7 @@ dev-lang/ruby jit # Sam James (2022-12-26) # Needs dev-python/mkdocs-redirects->dev-python/twine which is masked on wd40 -dev-util/gef doc +dev-debug/gef doc # Sam James (2022-12-11) # net-libs/rustls-ffi needs Rust. 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 d73d46d8247..7b6b98e969d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/info_pkgs +++ b/sdk_container/src/third_party/portage-stable/profiles/info_pkgs @@ -6,14 +6,14 @@ ## portage as of 2.0.51-r5. Do not overcrowd the output please. ## app-shells/bash:0 -sys-devel/autoconf -sys-devel/automake +dev-build/autoconf +dev-build/automake sys-kernel/linux-headers sys-libs/glibc sys-libs/musl sys-devel/binutils sys-devel/binutils-config -sys-devel/libtool +dev-build/libtool dev-build/make dev-lang/python dev-lang/perl diff --git a/sdk_container/src/third_party/portage-stable/profiles/package.deprecated b/sdk_container/src/third_party/portage-stable/profiles/package.deprecated index 6a6d86fc199..961e9fda53b 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/package.deprecated +++ b/sdk_container/src/third_party/portage-stable/profiles/package.deprecated @@ -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 specifies packages that are considered deprecated (but not @@ -17,6 +17,11 @@ #--- END OF EXAMPLES --- +# Michał Górny (2024-01-23) +# Unmaintained, very hacky package. Its replacement, berkeleydb, +# was so bad that we've lastrited it. +dev-python/bsddb3 + # Michał Górny (2023-12-10) # Superseded by dev-python/psycopg:0 (version 3). dev-python/psycopg:2 @@ -60,16 +65,6 @@ dev-perl/Type-Tie # which ensures a sound server is installed via PDEPEND. media-sound/pulseaudio -# Michał Górny (2023-05-29) -# Use the following snippet instead: -# -# $(python_gen_cond_dep ' -# dev-python/cffi[${PYTHON_USEDEP}] -# ' 'python*') -# -# Possibly adding version constraints if package declares them. -virtual/python-cffi - # Sam James (2023-04-07) # Inactive upstream, doesn't support newer Rubies. # Please port your package to use dev-ruby/erubis instead. 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 29638fbe331..396069539a0 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/package.mask @@ -33,6 +33,66 @@ #--- END OF EXAMPLES --- +# Fabian Groffen (2024-01-26) +# compilation issues, no reverse dependencies in the tree +# bugs #885057, #875410, #847211 +# Removal on 2024-02-26 +mail-filter/libsrs_alt + +# Andrew Ammerlaan (2024-01-24) +# app-misc/ddcutil-2.1.0 causes core-dump crashes in +# kde-plasma/powerdevil[brightness-control]. +~app-misc/ddcutil-2.1.0 +~app-misc/ddcui-0.5.0 + +# Andrew Ammerlaan (2024-01-24) +# The functionality of sys-kernel/installkernel-systemd has been +# integrated into sys-kernel/installkernel[systemd]. +# Please install sys-kernel/installkernel and remove +# sys-kernel/installkernel-systemd. See the news item entitled +# "Merging of installkernel-gentoo and installkernel-systemd" for details. +# +# Removal on 2024-02-24 +sys-kernel/installkernel-systemd + +# Michał Górny (2024-01-24) +# Unmaintained, tests fail, requires discontinued dev-python/bsddb3. +# No commits since 2022. No reverse dependencies. +# Removal on 2024-02-23. Bug #894688. +dev-python/pymilter + +# David Seifert (2024-01-21) +# Not required anymore since 4.14 is EOL, handled within the kernel +# nowadays. Removal on 2024-02-20. +net-wireless/crda + +# David Seifert (2024-01-18) +# Unmaintained set of packages. Overall, TensorFlow is ill-suited for +# distro packaging, since it's entangled with tons of googleware and +# continually breaks on minor dependency updates coupled with a +# byzantine build system. These 5 packages together have a total of +# 54 bugs reported against them, with zero activity from the maintainer. +# +# Unmasking this requires a sign-off from QA and treecleaners, since +# these packages require a ton of mental bandwidth to keep up to date +# and Google's general unwillingness to take community input quickly +# leads to maintainer burnout. +# Use sci-libs/pytorch as a modern alternative with better packaging. +# Removal on 2024-02-17. Bug #922374 +dev-build/bazel +sci-libs/keras +sci-libs/tensorflow +sci-libs/tensorflow-estimator +sci-visualization/tensorboard + +# Michał Górny (2024-01-17) +# Unmaintained build systems with no reverse dependencies. +# dev-build/cons was last released in 2001. +# dev-build/tup was last released in 2021 and has a few bugs reported. +# Removal on 2024-02-16. Bug #922329. +dev-build/cons +dev-build/tup + # Volkmar W. Pogatzki (2024-01-15) # Old version of a Java library, presently without consumer. # Blocks removal of dev-java/osgi-core-api @@ -97,15 +157,6 @@ x11-libs/snorenotify # 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 @@ -158,12 +209,6 @@ net-misc/monmotha # Removal on 2024-01-30. Bug #920659. net-firewall/sanewall -# Petr Vaněk (2023-12-27) -# Unmaintained package with multiple open bugs. Upstream seems to be inactive. -# Version bumps are available for 7 years but nobody seems to care. -# Removal: 2024-01-26. Bugs #303339, #712770, #732282, #782907, #870883, #898858. -www-apache/anyterm - # Michał Górny (2023-12-27) # Broken with all versions of dev-python/snakeoil. Archived upstream. # No revdeps. @@ -243,12 +288,6 @@ sys-block/hpacucli # Removal on 2024-01-21. Bug #919050. app-containers/go-secbench -# Michał Górny (2023-12-18) -# A broken package that used to be a test dependency -# of dev-python/ruamel-yaml. No revdeps left. -# Removal on 2024-01-17. Bug #920271. -dev-python/ruamel-std-pathlib - # 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 *** @@ -414,6 +453,7 @@ dev-python/ruamel-std-pathlib ~dev-libs/kirigami-addons-0.11.90 ~dev-libs/ktextaddons-1.5.3 ~dev-libs/kweathercore-0.8.0 +~gui-apps/xwaylandvideobridge-0.4.0 ~media-libs/libqaccessibilityclient-0.6.0 ~media-libs/phonon-4.12.0 ~media-libs/phonon-vlc-0.12.0 @@ -427,34 +467,11 @@ dev-python/ruamel-std-pathlib =net-libs/signond-8.61-r100 ~sys-auth/polkit-qt-0.175.0 -# Hans de Graaff (2023-12-17) -# Subslots added by accident. Please use the normal "7" or "8" slots -# instead. Masked for removal on 2024-01-17. -dev-ruby/elasticsearch:7.17.7 -dev-ruby/elasticsearch:8.8.0 - # Michał Górny (2023-12-17) # Broken due to invalid use of tzdata. # https://github.com/sdispater/pendulum/issues/769 =dev-python/pendulum-3.0.0 -# Michał Górny (2023-12-15) -# Superseded by dev-python/pypy3_10-exe{,-bin}. -# Removal on 2024-01-14. Bug #920036. -dev-python/pypy3-exe -dev-python/pypy3-exe-bin - -# Hans de Graaff (2023-12-15) -# Last release in 2020. Does not work with current activesupport -# versions. No reverse dependencies. Masked for removal on 2024-01-15. -dev-ruby/gh - -# Hans de Graaff (2023-12-15) -# Old slot without any remaining reverse dependencies. Does not work -# with ruby32. Use the newer slot instead. Masked for removal on -# 2024-01-15. -dev-ruby/http:4 - # Sam James (2023-12-14) # Gentoo's kernel maintainers have decided to discontinue gentoo-sources and # gentoo-kernel for old kernel LTS branches because of the resources to require @@ -487,31 +504,11 @@ dev-ruby/http:4 =sys-kernel/vanilla-kernel-6.1.64 =sys-kernel/vanilla-kernel-6.1.65 -# 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 -# in ::gentoo. -# Removal on 2024-01-07. Bug #919467. -virtual/python-cffi -virtual/python-greenlet - -# Sam James (2023-12-08) -# Broken build system: -# https://github.com/iovisor/bcc/issues/4823 -# https://github.com/iovisor/bcc/issues/4830 -=dev-util/bcc-0.29.0 - # Eli Schwartz (2023-12-02) # Has a bug that breaks sys-apps/portage. Upgrade to 1.3.0-r1 instead. # Bug #919072. =dev-build/meson-1.3.0 -# Michał Górny (2023-11-30) -# Last commit in 2020. It was used exclusively by dev-python/ipython, -# and it is used no more. -# Removal on 2023-12-30. Bug #916535. -dev-python/backcall - # Sam James (2023-11-25) # Breaks desktop icon rendering, see bug #904468. # Upstream bug: https://gitlab.xfce.org/xfce/xfdesktop/-/issues/242 @@ -532,10 +529,6 @@ dev-python/backcall (2023-11-18) -# Lots of applications need porting, bug #917537. ->=dev-libs/libxml2-2.12.0 - # Sam James (2023-11-05) # Mask broken versions: # - sys-fs/btrfs-progs-6.6(-r0) was respun upstream. @@ -551,10 +544,6 @@ dev-python/backcall # Performance regression. Bug #916713. =dev-db/mydumper-0.15.1.3 -# Ulrich Müller (2023-10-19) -# Pretest versions, masked for testing. - (2023-10-06) # Breaks building scipy: https://github.com/cython/cython/issues/5748 =dev-python/cython-3.0.3 @@ -688,9 +677,9 @@ dev-tex/pdfannotextractor x11-drivers/nvidia-drivers:0/vulkan # Andreas K. Hüttel (2021-09-18) -# sys-devel/automake version 1.11 is EOL and is only useful for testing +# dev-build/automake version 1.11 is EOL and is only useful for testing # old de-ANSI-fication/ansi2knr/AM_C_PROTOTYPES code. Please uninstall. -sys-devel/automake:1.11 +dev-build/automake:1.11 # Joonas Niilola (2021-07-29) # Upstream provided migration instructions from 2. -> 3. update, 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 b1624df9f4c..17ae8c19813 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 @@ -5,3 +5,4 @@ # Fails to compile: # https://github.com/c-ares/c-ares/issues/682 =net-dns/c-ares-1.25.0 +=net-dns/c-ares-1.25.0-r1 diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux/arm/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux/arm/make.defaults deleted file mode 100644 index 22479baf6f0..00000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux/arm/make.defaults +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -ARCH="arm" -# This is a pretty specific profile to the armv7 arch, we can change that later -CHOST="armv7a-softfloat-linux-gnueabi" -CHOST_arm="${CHOST}" diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux/arm/parent b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux/arm/parent index b53dc55dbd9..979515f54f0 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/linux/arm/parent +++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/linux/arm/parent @@ -1,2 +1,2 @@ -../../../default/linux/arm/17.0 +../../../default/linux/arm/17.0/armv7a .. diff --git a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc index 876b5902c5f..1f64033b28a 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc @@ -472,6 +472,12 @@ s390 default/linux/s390/17.0/systemd stable s390 default/linux/s390/17.0/systemd/merged-usr stable s390 default/linux/s390/17.0/s390x/systemd exp s390 default/linux/s390/17.0/s390x/systemd/merged-usr exp +s390 default/linux/s390/23.0 exp +s390 default/linux/s390/23.0/systemd exp +s390 default/linux/s390/23.0/split-usr exp +s390 default/linux/s390/23.0/split-usr/s390x exp +s390 default/linux/s390/23.0/s390x exp +s390 default/linux/s390/23.0/s390x/systemd exp # SPARC Profiles # @MAINTAINER: sparc@gentoo.org @@ -485,6 +491,16 @@ sparc default/linux/sparc/17.0/64ul/desktop stable sparc default/linux/sparc/17.0/64ul/developer exp sparc default/linux/sparc/17.0/64ul/systemd stable sparc default/linux/sparc/17.0/64ul/systemd/merged-usr stable +sparc default/linux/sparc/23.0 exp +sparc default/linux/sparc/23.0/desktop exp +sparc default/linux/sparc/23.0/systemd exp +sparc default/linux/sparc/23.0/64ul exp +sparc default/linux/sparc/23.0/64ul/desktop exp +sparc default/linux/sparc/23.0/64ul/systemd exp +sparc default/linux/sparc/23.0/split-usr exp +sparc default/linux/sparc/23.0/split-usr/desktop exp +sparc default/linux/sparc/23.0/split-usr/64ul exp +sparc default/linux/sparc/23.0/split-usr/64ul/desktop exp # x86 Profiles # @MAINTAINER: x86@gentoo.org @@ -502,6 +518,36 @@ x86 default/linux/x86/17.0/desktop/plasma/systemd/merged-usr stable x86 default/linux/x86/17.0/developer exp x86 default/linux/x86/17.0/systemd stable x86 default/linux/x86/17.0/systemd/merged-usr stable +x86 default/linux/x86/23.0/i686 exp +x86 default/linux/x86/23.0/i686/systemd exp +x86 default/linux/x86/23.0/i686/hardened exp +x86 default/linux/x86/23.0/i686/hardened/selinux exp +x86 default/linux/x86/23.0/i686/desktop exp +x86 default/linux/x86/23.0/i686/desktop/gnome exp +x86 default/linux/x86/23.0/i686/desktop/gnome/systemd exp +x86 default/linux/x86/23.0/i686/desktop/plasma exp +x86 default/linux/x86/23.0/i686/desktop/plasma/systemd exp +x86 default/linux/x86/23.0/i686/prefix exp +x86 default/linux/x86/23.0/i686/prefix/kernel-2.6.32+ exp +x86 default/linux/x86/23.0/i686/prefix/kernel-2.6.16+ exp +x86 default/linux/x86/23.0/i686/prefix/kernel-3.2+ exp +x86 default/linux/x86/23.0/i686/split-usr exp +x86 default/linux/x86/23.0/i686/split-usr/hardened exp +x86 default/linux/x86/23.0/i686/split-usr/hardened/selinux exp +x86 default/linux/x86/23.0/i686/split-usr/desktop exp +x86 default/linux/x86/23.0/i686/split-usr/desktop/gnome exp +x86 default/linux/x86/23.0/i686/split-usr/desktop/plasma exp +x86 default/linux/x86/23.0/i686/split-usr/prefix exp +x86 default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.32+ exp +x86 default/linux/x86/23.0/i686/split-usr/prefix/kernel-2.6.16+ exp +x86 default/linux/x86/23.0/i686/split-usr/prefix/kernel-3.2+ exp +x86 default/linux/x86/23.0/i486 exp +x86 default/linux/x86/23.0/i486/systemd exp +x86 default/linux/x86/23.0/i486/hardened exp +x86 default/linux/x86/23.0/i486/hardened/selinux exp +x86 default/linux/x86/23.0/i486/split-usr exp +x86 default/linux/x86/23.0/i486/split-usr/hardened exp +x86 default/linux/x86/23.0/i486/split-usr/hardened/selinux exp # musl profiles # @MAINTAINER: musl@gentoo.org @@ -554,6 +600,15 @@ riscv default/linux/riscv/23.0/rv64/split-usr/lp64d/musl exp riscv default/linux/riscv/23.0/rv64/split-usr/lp64/musl exp x86 default/linux/x86/17.0/musl dev x86 default/linux/x86/17.0/musl/selinux exp +# x86 default/linux/x86/23.0/i686/musl exp +# x86 default/linux/x86/23.0/i686/musl/selinux exp +# x86 default/linux/x86/23.0/i686/split-usr/musl exp +# x86 default/linux/x86/23.0/i686/split-usr/musl/selinux exp +# x86 default/linux/x86/23.0/i486/musl exp +# x86 default/linux/x86/23.0/i486/musl/selinux exp +# x86 default/linux/x86/23.0/i486/split-usr/musl exp +# x86 default/linux/x86/23.0/i486/split-usr/musl/selinux exp + # These are Gentoo Prefix profiles, maintained by the Prefix team # @MAINTAINER: prefix@gentoo.org diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/package.use b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/package.use index 7e60f311a06..3914d0992c9 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/gnome/package.use @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Alfred Wingate (2023-12-25) +# Prefer wayland over X with REQUIRED_USE: ^^ ( gbm wayland X ) +>=media-tv/kodi-20.2 wayland -X + # Mart Raudsepp (2023-10-01) # x11-wm/mutter[wayland] requires xwayland[libei] for emulated input portal # for e.g. remote desktop remote input support 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 64368f304e8..2052b98303b 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,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Alfred Wingate (2023-12-25) +# Prefer X over gbm with REQUIRED_USE: ^^ ( gbm wayland X ) +>=media-tv/kodi-20.2 X -gbm + # Andreas Sturmlechner (2023-11-12) # NSS: Required by kde-apps/okular[pdf] # Boost: app-text/poppler[qt5] recommended w/ Boost (bug #795888) diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/plasma/package.use b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/plasma/package.use index aea90f890f6..e3eb9e4f43f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/plasma/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/plasma/package.use @@ -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 +# Alfred Wingate (2023-12-25) +# Prefer wayland over X with REQUIRED_USE: ^^ ( gbm wayland X ) +>=media-tv/kodi-20.2 wayland -X + # Marek Szuba (2023-11-12) # FUSE cannot be built with multiple audio drivers, and desktop/gnome # profiles set both USE=pulseaudio (directly) and USE=alsa (inherited @@ -68,6 +72,7 @@ sys-libs/zlib minizip # Keep existing defaults after dropping IUSE=phonon from make.defaults Date: Mon, 29 Jan 2024 07:14:52 +0000 Subject: [PATCH 063/127] sys-apps/acl: Sync with Gentoo It's from Gentoo commit 480fa4246adb1700d8beb568b601db7cd6879c3e. --- .../portage-stable/sys-apps/acl/Manifest | 1 + .../sys-apps/acl/acl-2.3.2.ebuild | 62 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/acl/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/acl/Manifest index 9ae0f62f370..c2761e2fcde 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/acl/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/acl/Manifest @@ -1 +1,2 @@ DIST acl-2.3.1.tar.xz 355676 BLAKE2B 15e81e8159ddb21ef0c262bef3101c0b6fa546738a2ab74c01ccc21fd1c3dc8ab6aaf84a06dee6da22291f3ca4feeffa60c7d11bfac1ab770a6ec28e1f1655e0 SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc +DIST acl-2.3.2.tar.xz 371680 BLAKE2B 9f2abfddcd403df2c716c05f02a1b52453613d10948dc58a65b9ef41b44e37db6de99fb22dcfc4f6f0fb5d0319c939da61bd4e0fba2cdb5643e8087ecd34eeac SHA512 c2d061dbfd28c00cecbc1ae614d67f3138202bf4d39b383f2df4c6a8b10b830f33acec620fb211f268478737dde4037d338a5823af445253cb088c48a135099b diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.2.ebuild new file mode 100644 index 00000000000..1143bebd957 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic libtool multilib-minimal usr-ldscript + +DESCRIPTION="Access control list utilities, libraries, and headers" +HOMEPAGE="https://savannah.nongnu.org/projects/acl" +SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" + +LICENSE="LGPL-2.1+ GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="nls static-libs" + +RDEPEND=" + >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" + +src_prepare() { + default + + # bug #580792 + elibtoolize +} + +multilib_src_configure() { + # Filter out -flto flags as they break getfacl/setfacl binaries (bug #667372) + filter-lto + + local myeconfargs=( + --bindir="${EPREFIX}"/bin + --libexecdir="${EPREFIX}"/usr/$(get_libdir) + --enable-largefile + $(use_enable static-libs static) + $(use_enable nls) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + # Tests call native binaries with an LD_PRELOAD wrapper + # bug #772356 + multilib_is_native_abi && default +} + +multilib_src_install() { + default + + # Move shared libs to / + gen_usr_ldscript -a acl +} + +multilib_src_install_all() { + if ! use static-libs ; then + find "${ED}" -type f -name "*.la" -delete || die + fi +} From aebfe73a96b40e946e405bf742616ad2c5aa24b8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:14:54 +0000 Subject: [PATCH 064/127] sys-apps/checkpolicy: Sync with Gentoo It's from Gentoo commit 2b30c5b2a0d1a79a5c803d745ec3ff2f50f3dafb. --- .../sys-apps/checkpolicy/Manifest | 1 + .../checkpolicy/checkpolicy-3.6.ebuild | 54 +++++++++++++++++++ .../checkpolicy/checkpolicy-9999.ebuild | 2 +- 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-3.6.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/Manifest index d3279c23fc8..d8d08681182 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/Manifest @@ -1 +1,2 @@ DIST checkpolicy-3.5.tar.gz 69904 BLAKE2B e02ccad07534568a1bbb612330018bbe486800ea40df20ed6f9dc38c88aff7f8858782a28ba7915a58c3bb384f180eb8da7a8fe97a92bcb9baa61eec18da6cbc SHA512 fcd490d865af3b4350c32c5dd9916f8406219841e1e255d8945c6dcc958535247aa27af5597a6988e19f11faea7beeabcb46e8ba2431112bb4aa5c7697bca529 +DIST checkpolicy-3.6.tar.gz 70684 BLAKE2B d32a8b86897bd4a08caf61a096a691c8d049fa7b5b4561f4847e0dfbb62a82fc6c3ddb5be163c7cd6163491c50513aec14e4c67842f256f48688b26178c2887a SHA512 0d48fb385b4d1e66d562e40b6e794406f46d8803cc504705b26547130cb13b65fab5fdb4fc032b1c95d4f91862ff134a89fffde854c5ce466c2dd2657e416070 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-3.6.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-3.6.ebuild new file mode 100644 index 00000000000..6d5e91d8b18 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-3.6.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit toolchain-funcs + +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux policy compiler" +HOMEPAGE="http://userspace.selinuxproject.org" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${P}/${PN}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug" + +DEPEND=">=sys-libs/libsepol-${PV}" +BDEPEND="sys-devel/flex + sys-devel/bison" + +RDEPEND=">=sys-libs/libsepol-${PV}" + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + YACC="bison -y" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" +} + +src_install() { + default + + if use debug; then + dobin "${S}/test/dismod" + dobin "${S}/test/dispol" + fi +} + +pkg_postinst() { + if ! tc-is-cross-compiler; then + einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy." + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-9999.ebuild index 496db82366f..6d5e91d8b18 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/checkpolicy/checkpolicy-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" From 088ed4be6dc4b2731872c04ab461b9cc3b465944 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:14:55 +0000 Subject: [PATCH 065/127] sys-apps/coreutils: Sync with Gentoo It's from Gentoo commit 717506d584ca9e89a09f72751a624300ebf9d28e. --- .../sys-apps/coreutils/coreutils-8.32-r1.ebuild | 6 +++--- .../sys-apps/coreutils/coreutils-9.1-r2.ebuild | 6 +++--- .../sys-apps/coreutils/coreutils-9.3-r2.ebuild | 6 +++--- .../sys-apps/coreutils/coreutils-9.3-r3.ebuild | 6 +++--- .../portage-stable/sys-apps/coreutils/coreutils-9.4.ebuild | 6 +++--- .../portage-stable/sys-apps/coreutils/coreutils-9999.ebuild | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.32-r1.ebuild index 3dc5686f020..01a7a97fc19 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.32-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-8.32-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=7 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_10 ) inherit flag-o-matic python-any-r1 toolchain-funcs @@ -38,9 +38,9 @@ BDEPEND=" app-arch/xz-utils dev-lang/perl test? ( + dev-debug/strace dev-lang/perl dev-perl/Expect - dev-util/strace ${PYTHON_DEPS} ) " diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.1-r2.ebuild index 5fb7309f58a..61d1ba7df22 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.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 @@ -7,7 +7,7 @@ EAPI=7 # The upstream coreutils maintainers also maintain the package in Fedora and may # backport fixes which we want to pick up. -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig @@ -52,9 +52,9 @@ BDEPEND=" app-arch/xz-utils dev-lang/perl test? ( + dev-debug/strace dev-lang/perl dev-perl/Expect - dev-util/strace ${PYTHON_DEPS} ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.3-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.3-r2.ebuild index 42a48c3d0a5..be73ff76f43 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.3-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.3-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 @@ -9,7 +9,7 @@ EAPI=8 # # Also recommend subscribing to the coreutils and bug-coreutils MLs. -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig @@ -63,9 +63,9 @@ BDEPEND=" app-arch/xz-utils dev-lang/perl test? ( + dev-debug/strace dev-lang/perl dev-perl/Expect - dev-util/strace ${PYTHON_DEPS} ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.3-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.3-r3.ebuild index bb5183a62b1..4f124cf8322 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.3-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.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 @@ -9,7 +9,7 @@ EAPI=8 # # Also recommend subscribing to the coreutils and bug-coreutils MLs. -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig @@ -63,9 +63,9 @@ BDEPEND=" app-arch/xz-utils dev-lang/perl test? ( + dev-debug/strace dev-lang/perl dev-perl/Expect - dev-util/strace ${PYTHON_DEPS} ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4.ebuild index 69d10c2f153..40a2c20ada6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-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 @@ -33,7 +33,7 @@ else verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig ) " - KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" fi SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )" @@ -63,9 +63,9 @@ BDEPEND=" app-arch/xz-utils dev-lang/perl test? ( + dev-debug/strace dev-lang/perl dev-perl/Expect - dev-util/strace ${PYTHON_DEPS} ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9999.ebuild index 3ad9fc001a0..14e28904991 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/coreutils/coreutils-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 @@ -63,9 +63,9 @@ BDEPEND=" app-arch/xz-utils dev-lang/perl test? ( + dev-debug/strace dev-lang/perl dev-perl/Expect - dev-util/strace ${PYTHON_DEPS} ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) From 92c834a8b046347a9cd536705e4229ab8a53a9d1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:14:56 +0000 Subject: [PATCH 066/127] sys-apps/ethtool: Sync with Gentoo It's from Gentoo commit fbeee6116c591d08015d1f90ac997b5e775c0bee. --- .../portage-stable/sys-apps/ethtool/ethtool-6.6.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/ethtool-6.6.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/ethtool-6.6.ebuild index a7eff7664c7..b84034311ce 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/ethtool-6.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/ethtool/ethtool-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 @@ -9,7 +9,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="+netlink" RDEPEND="netlink? ( net-libs/libmnl )" From a67a063791cef2e8a80f845f689a3a83d841ea3f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:14:57 +0000 Subject: [PATCH 067/127] sys-apps/gawk: Sync with Gentoo It's from Gentoo commit 6f8ef094bd4fb0dfaf7ab70fc79fc826eb0540b8. --- .../gawk/files/gawk-5.3.0-str2wstr.patch | 193 ++++++++++++++++++ .../sys-apps/gawk/gawk-5.3.0-r1.ebuild | 140 +++++++++++++ .../sys-apps/gawk/gawk-5.3.0.ebuild | 4 +- 3 files changed, 335 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/gawk/files/gawk-5.3.0-str2wstr.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.3.0-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gawk/files/gawk-5.3.0-str2wstr.patch b/sdk_container/src/third_party/portage-stable/sys-apps/gawk/files/gawk-5.3.0-str2wstr.patch new file mode 100644 index 00000000000..078ba8b1c74 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gawk/files/gawk-5.3.0-str2wstr.patch @@ -0,0 +1,193 @@ +https://bugs.gentoo.org/921503 +https://lists.gnu.org/archive/html/bug-gawk/2024-01/msg00013.html +https://git.savannah.gnu.org/cgit/gawk.git/commit/?h=gawk-5.3-stable&id=e05040b5d81b5a0e809fc56df2a7c3d654c77e1d + +From e05040b5d81b5a0e809fc56df2a7c3d654c77e1d Mon Sep 17 00:00:00 2001 +From: "Arnold D. Robbins" +Date: Sun, 28 Jan 2024 20:24:09 +0200 +Subject: Bug fix in str2wstr. + +--- + node.c | 26 ++++++++++++++------------ + pc/Makefile.tst | 6 ++++++ + test/Makefile.am | 5 ++++- + test/Makefile.in | 10 +++++++++- + test/Maketests | 5 +++++ + test/match4.awk | 1 + + test/match4.ok | 1 + + 10 files changed, 56 insertions(+), 14 deletions(-) + create mode 100644 test/match4.awk + create mode 100644 test/match4.ok + +diff --git a/node.c b/node.c +index de12f05..5aac5e8 100644 +--- a/node.c ++++ b/node.c +@@ -816,6 +816,20 @@ str2wstr(NODE *n, size_t **ptr) + assert((n->flags & (STRING|STRCUR)) != 0); + + /* ++ * For use by do_match, create and fill in an array. ++ * For each byte `i' in n->stptr (the original string), ++ * a[i] is equal to `j', where `j' is the corresponding wchar_t ++ * in the converted wide string. ++ * ++ * This is needed even for Nnull_string or Null_field. ++ * ++ * Create the array. ++ */ ++ if (ptr != NULL) { ++ ezalloc(*ptr, size_t *, sizeof(size_t) * (n->stlen + 1), "str2wstr"); ++ } ++ ++ /* + * Don't convert global null string or global null field + * variables to a wide string. They are both zero-length anyway. + * This also avoids future double-free errors while releasing +@@ -848,18 +862,6 @@ str2wstr(NODE *n, size_t **ptr) + emalloc(n->wstptr, wchar_t *, sizeof(wchar_t) * (n->stlen + 1), "str2wstr"); + wsp = n->wstptr; + +- /* +- * For use by do_match, create and fill in an array. +- * For each byte `i' in n->stptr (the original string), +- * a[i] is equal to `j', where `j' is the corresponding wchar_t +- * in the converted wide string. +- * +- * Create the array. +- */ +- if (ptr != NULL) { +- ezalloc(*ptr, size_t *, sizeof(size_t) * (n->stlen + 1), "str2wstr"); +- } +- + sp = n->stptr; + src_count = n->stlen; + memset(& mbs, 0, sizeof(mbs)); +diff --git a/pc/Makefile.tst b/pc/Makefile.tst +index daf3c56..9ab61c7 100644 +--- a/pc/Makefile.tst ++++ b/pc/Makefile.tst +@@ -180,6 +180,7 @@ BASIC_TESTS = \ + substr swaplns synerr1 synerr2 synerr3 tailrecurse tradanch \ + trailbs tweakfld uninit2 uninit3 uninit4 uninit5 uninitialized \ + unterm uparrfs uplus wideidx wideidx2 widesub widesub2 widesub3 \ ++ match4 \ + widesub4 wjposer1 zero2 zeroe0 zeroflag + + UNIX_TESTS = \ +@@ -2602,6 +2603,11 @@ widesub3: + AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + ++match4: ++ @echo $@ ++ @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ++ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ++ + widesub4: + @echo $@ $(ZOS_FAIL) + @-[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=ENU_USA.1252; export GAWKLOCALE; \ +diff --git a/test/Makefile.am b/test/Makefile.am +index a876b3a..e1e1f3f 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -1,7 +1,7 @@ + # + # test/Makefile.am --- automake input file for gawk + # +-# Copyright (C) 1988-2023 the Free Software Foundation, Inc. ++# Copyright (C) 1988-2024 the Free Software Foundation, Inc. + # + # This file is part of GAWK, the GNU implementation of the + # AWK Programming Language. +@@ -763,6 +763,8 @@ EXTRA_DIST = \ + match3.awk \ + match3.in \ + match3.ok \ ++ match4.awk \ ++ match4.ok \ + math.awk \ + math.ok \ + mbfw1.awk \ +@@ -1544,6 +1546,7 @@ BASIC_TESTS = \ + substr swaplns synerr1 synerr2 synerr3 tailrecurse tradanch \ + trailbs tweakfld uninit2 uninit3 uninit4 uninit5 uninitialized \ + unterm uparrfs uplus wideidx wideidx2 widesub widesub2 widesub3 \ ++ match4 \ + widesub4 wjposer1 zero2 zeroe0 zeroflag + + UNIX_TESTS = \ +diff --git a/test/Makefile.in b/test/Makefile.in +index 1ef143f..681a85b 100644 +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -17,7 +17,7 @@ + # + # test/Makefile.am --- automake input file for gawk + # +-# Copyright (C) 1988-2023 the Free Software Foundation, Inc. ++# Copyright (C) 1988-2024 the Free Software Foundation, Inc. + # + # This file is part of GAWK, the GNU implementation of the + # AWK Programming Language. +@@ -1027,6 +1027,8 @@ EXTRA_DIST = \ + match3.awk \ + match3.in \ + match3.ok \ ++ match4.awk \ ++ match4.ok \ + math.awk \ + math.ok \ + mbfw1.awk \ +@@ -1808,6 +1810,7 @@ BASIC_TESTS = \ + substr swaplns synerr1 synerr2 synerr3 tailrecurse tradanch \ + trailbs tweakfld uninit2 uninit3 uninit4 uninit5 uninitialized \ + unterm uparrfs uplus wideidx wideidx2 widesub widesub2 widesub3 \ ++ match4 \ + widesub4 wjposer1 zero2 zeroe0 zeroflag + + UNIX_TESTS = \ +@@ -4414,6 +4417,11 @@ widesub3: + AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + ++match4: ++ @echo $@ ++ @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ++ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ++ + widesub4: + @echo $@ $(ZOS_FAIL) + @-[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \ +diff --git a/test/Maketests b/test/Maketests +index bac220f..9a00140 100644 +--- a/test/Maketests ++++ b/test/Maketests +@@ -1288,6 +1288,11 @@ widesub3: + AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + ++match4: ++ @echo $@ ++ @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ++ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ++ + widesub4: + @echo $@ $(ZOS_FAIL) + @-[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \ +diff --git a/test/match4.awk b/test/match4.awk +new file mode 100644 +index 0000000..e50150a +--- /dev/null ++++ b/test/match4.awk +@@ -0,0 +1 @@ ++BEGIN { print match (m, /a?/) } +diff --git a/test/match4.ok b/test/match4.ok +new file mode 100644 +index 0000000..d00491f +--- /dev/null ++++ b/test/match4.ok +@@ -0,0 +1 @@ ++1 +-- +cgit v1.1 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.3.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.3.0-r1.ebuild new file mode 100644 index 00000000000..b5dcc51606c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.3.0-r1.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +#GAWK_IS_BETA=yes + +DESCRIPTION="GNU awk pattern-matching language" +HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html" + +if [[ ${GAWK_IS_BETA} == yes || ${PV} == *_beta* ]] ; then + if [[ ${PV} == *_beta* ]] ; then + # Beta versioning is sometimes for the release prior, e.g. + # 5.2.1_beta is labelled upstream as 5.2.0b. + MY_PV=${PV/_beta/b} + MY_PV=$(ver_cut 1-2 ${MY_PV}).$(($(ver_cut 3 ${MY_PV}) - 1))$(ver_cut 4- ${MY_PV}) + MY_P=${PN}-${MY_PV} + + S="${WORKDIR}"/${MY_P} + else + MY_P=${P} + fi + + SRC_URI="https://www.skeeve.com/gawk/${MY_P}.tar.gz" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gawk.asc + inherit verify-sig + + SRC_URI="mirror://gnu/gawk/${P}.tar.xz" + SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +LICENSE="GPL-3+" +SLOT="0" +# While tempting to enable mpfr by default as e.g. Fedora do, as of 5.2.x, +# MPFR support is "on parole" and may be removed: +# https://www.gnu.org/software/gawk/manual/html_node/MPFR-On-Parole.html. +IUSE="mpfr pma nls readline" + +RDEPEND=" + mpfr? ( + dev-libs/gmp:= + dev-libs/mpfr:= + ) + readline? ( sys-libs/readline:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=sys-apps/texinfo-7.1 + >=sys-devel/bison-3.5.4 + nls? ( sys-devel/gettext ) +" + +if [[ ${GAWK_IS_BETA} != yes ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-gawk )" +fi + +PATCHES=( + "${FILESDIR}"/${P}-str2wstr.patch +) + +src_prepare() { + default + + # Use symlinks rather than hardlinks, and disable version links + sed -i \ + -e '/^LN =/s:=.*:= $(LN_S):' \ + -e '/install-exec-hook:/s|$|\nfoo:|' \ + Makefile.in doc/Makefile.in || die + + # bug #413327 + sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die + + # Fix standards conflict on Solaris + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i \ + -e '/\<_XOPEN_SOURCE\>/s/1$/600/' \ + -e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \ + extension/inplace.c || die + fi +} + +src_configure() { + # README says gawk may not work properly if built with non-Bison. + # We already BDEPEND on Bison, so just unset YACC rather than + # guessing if we need to do yacc.bison or bison -y. + unset YACC + + local myeconfargs=( + --cache-file="${S}"/config.cache + --libexec='$(libdir)/misc' + $(use_with mpfr) + $(use_enable nls) + $(use_enable pma) + $(use_with readline) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + # Automatic dodocs barfs + rm -rf README_d || die + + default + + # Install headers + insinto /usr/include/awk + doins *.h + rm "${ED}"/usr/include/awk/config.h || die +} + +pkg_postinst() { + # Symlink creation here as the links do not belong to gawk, but to any awk + if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then + eselect awk update ifunset + else + local l + for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk ; do + if [[ -e ${l} ]] && ! [[ -e ${l/gawk/awk} ]] ; then + ln -s "${l##*/}" "${l/gawk/awk}" || die + fi + done + + if ! [[ -e ${EROOT}/bin/awk ]] ; then + # /bin might not exist yet (stage1) + [[ -d "${EROOT}/bin" ]] || mkdir "${EROOT}/bin" || die + + ln -s "../usr/bin/gawk" "${EROOT}/bin/awk" || die + fi + fi +} + +pkg_postrm() { + if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then + eselect awk update ifunset + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.3.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.3.0.ebuild index 9141b2adab0..89ad1b20aff 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.3.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gawk/gawk-5.3.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 @@ -29,7 +29,7 @@ else SRC_URI="mirror://gnu/gawk/${P}.tar.xz" SRC_URI+=" verify-sig? ( mirror://gnu/gawk/${P}.tar.xz.sig )" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~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-3+" From c2c937388e1dd7077edc5b3f28367b69cfa372a1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:07 +0000 Subject: [PATCH 068/127] sys-apps/kmod: Sync with Gentoo It's from Gentoo commit 80558608ae111ebddad012e63542db9adb34c5b1. --- .../portage-stable/sys-apps/kmod/kmod-30-r1.ebuild | 6 +++--- .../third_party/portage-stable/sys-apps/kmod/kmod-31.ebuild | 4 ++-- .../portage-stable/sys-apps/kmod/kmod-9999.ebuild | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-30-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-30-r1.ebuild index b6d5169ca96..5dff1407325 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-30-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-30-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 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit autotools libtool bash-completion-r1 python-r1 @@ -44,7 +44,7 @@ DEPEND="${RDEPEND}" BDEPEND=" doc? ( dev-util/gtk-doc - dev-util/gtk-doc-am + dev-build/gtk-doc-am ) lzma? ( virtual/pkgconfig ) python? ( diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-31.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-31.ebuild index a1d670f8bd8..b5acdf3f9a3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-31.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-31.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,7 +44,7 @@ DEPEND="${RDEPEND}" BDEPEND=" doc? ( dev-util/gtk-doc - dev-util/gtk-doc-am + dev-build/gtk-doc-am ) lzma? ( virtual/pkgconfig ) python? ( diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild index 21e19df0980..a67cecf3e9a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kmod/kmod-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 @@ -44,7 +44,7 @@ DEPEND="${RDEPEND}" BDEPEND=" doc? ( dev-util/gtk-doc - dev-util/gtk-doc-am + dev-build/gtk-doc-am ) lzma? ( virtual/pkgconfig ) python? ( From 51e18df944696a5209817f21f14c25f614c4dd22 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:07 +0000 Subject: [PATCH 069/127] sys-apps/less: Sync with Gentoo It's from Gentoo commit d7e195094a0d8d3d8ab6cfa7b9aaa975daae6da2. --- .../portage-stable/sys-apps/less/less-643-r1.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-643-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-643-r1.ebuild index 186eda3b681..f9ccfd4aaad 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-643-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-643-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 @@ -25,7 +25,7 @@ else SRC_URI="https://www.greenwoodsoftware.com/less/${MY_P}.tar.gz" if [[ ${PV} != *_beta* ]] ; 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 @@ -83,7 +83,7 @@ src_install() { } pkg_preinst() { - optfeature "Colorized output supprt" dev-python/pygments + optfeature "Colorized output support" dev-python/pygments if has_version "<${CATEGORY}/${PN}-483-r1" ; then elog "The lesspipe.sh symlink has been dropped. If you are still setting" From 1813fb6a28bb2396563bee1eebfbc355cad5328b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:08 +0000 Subject: [PATCH 070/127] sys-apps/lshw: Sync with Gentoo It's from Gentoo commit 35ddb79c65f58a0df3500057f4171dc8b221809a. --- ...build => lshw-02.19.2b_p20220831-r1.ebuild} | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-apps/lshw/{lshw-02.19.2b_p20220831.ebuild => lshw-02.19.2b_p20220831-r1.ebuild} (88%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.19.2b_p20220831-r1.ebuild similarity index 88% rename from sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.19.2b_p20220831-r1.ebuild index c13c4b22e5b..254bede1f4a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.19.2b_p20220831-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PLOCALES="ca es fr" -inherit desktop flag-o-matic plocale toolchain-funcs xdg +inherit desktop flag-o-matic plocale toolchain-funcs xdg-utils MY_COMMIT=42fef565731411a784101de614a54bff79d1858e MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6) @@ -81,3 +81,17 @@ src_install() { "${DESCRIPTION}" fi } + +pkg_postinst() { + if use gtk ; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} + +pkg_postrm() { + if use gtk ; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} From 60572dc9f8128a35bee25f05c5e221df17bd908b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:14 +0000 Subject: [PATCH 071/127] sys-apps/pcsc-lite: Sync with Gentoo It's from Gentoo commit f74214dfe229020d04c49daba8fec9b7128cbec4. --- .../portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild | 4 ++-- .../portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild index 2b817740a74..0f5bb6e93f4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.0.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.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 @@ -35,7 +35,7 @@ DEPEND=" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-pcscd )" BDEPEND=" - sys-devel/flex + app-alternatives/lex virtual/pkgconfig" PATCHES=( diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild index 3a0cf3c74ca..d32cbfb1cc0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.0.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pcsc-lite/pcsc-lite-2.0.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 @@ -35,7 +35,7 @@ DEPEND=" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-pcscd )" BDEPEND=" - sys-devel/flex + app-alternatives/lex virtual/pkgconfig" PATCHES=( From f08f6ad79f0d5cd0dc5862db2494873b69c64496 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:14 +0000 Subject: [PATCH 072/127] sys-apps/portage: Sync with Gentoo It's from Gentoo commit 871881637464374117b1d87a63fc1025534e95bb. --- .../portage-stable/sys-apps/portage/portage-3.0.59-r1.ebuild | 2 +- .../portage-stable/sys-apps/portage/portage-3.0.61-r1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.59-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.59-r1.ebuild index 4cf41d63b8e..6eb73a76c98 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.59-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.59-r1.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then 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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="GPL-2" 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 index 5007fdd1dd1..1d35f36c8fd 100644 --- 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 @@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then 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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" fi LICENSE="GPL-2" From d8cb4243538dbfca6ef8bfffcaed871318d07867 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:14 +0000 Subject: [PATCH 073/127] sys-apps/pv: Sync with Gentoo It's from Gentoo commit a292cf2d69a034eb7ea75876af7ebd04bb1cd280. --- .../third_party/portage-stable/sys-apps/pv/pv-1.8.5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.8.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.8.5.ebuild index d9f79c24482..3a5e84a8c47 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.8.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/pv/pv-1.8.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 @@ -18,7 +18,7 @@ else verify-sig? ( https://www.ivarch.com/programs/sources/${P}.tar.gz.txt -> ${P}.tar.gz.asc ) " - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi LICENSE="GPL-3+" From b431f760ea4a807a1b4e62d139e15e4ad05865e6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:16 +0000 Subject: [PATCH 074/127] sys-apps/semodule-utils: Sync with Gentoo It's from Gentoo commit 5e4c0876825ae97e95d3d80df48928210441bc28. --- .../sys-apps/semodule-utils/Manifest | 1 + .../semodule-utils/semodule-utils-3.6.ebuild | 42 +++++++++++++++++++ .../semodule-utils/semodule-utils-9999.ebuild | 3 +- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.6.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/Manifest index 72517280356..0b70f909b56 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/Manifest @@ -1 +1,2 @@ DIST semodule-utils-3.5.tar.gz 14383 BLAKE2B a1bb432013bca1023d99b32f43b2c972b6b807a4677f9d8c9fb9aff10225232506f3ecca86fc231b4c63d04582a91a1c4218f87ce5532a4d35a26a09665c6f10 SHA512 7c32f425ae71745040d1c6a6585149a1efb319913aa9d4c8bf185b0a4216dc66378fa38595b171614ee3ae4ade997d3ae56a060346e334faec55c419a87d71dd +DIST semodule-utils-3.6.tar.gz 12844 BLAKE2B e5e7501c412649f471e89cc89569d6c51421e0b46f172f243ce778bbe3a2c658ef9a92e3f3e1e07fb3358e25f63e004b6bd4b56619472fbcae8cb5b916d54170 SHA512 16b58bbafcaef9a2e8e34a20d0e1e4024a9044024de8fa3137c5ba1b9af600afac51c15ccb648dd6bff77747c047f4c9feafeea07c19b1eb14955acc92697a48 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.6.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.6.ebuild new file mode 100644 index 00000000000..621cfaf21ea --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-3.6.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit toolchain-funcs + +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux policy module utilities" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${P}/${PN}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="GPL-2" +SLOT="0" + +DEPEND=">=sys-libs/libsepol-${PV}:=" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror" +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake DESTDIR="${D}" install +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-9999.ebuild index 525188411f4..621cfaf21ea 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/semodule-utils/semodule-utils-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" @@ -23,7 +23,6 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="" DEPEND=">=sys-libs/libsepol-${PV}:=" RDEPEND="${DEPEND}" From d3b4d87c5ea6a259a97c98373f0a90527f7da650 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:16 +0000 Subject: [PATCH 075/127] sys-apps/smartmontools: Sync with Gentoo It's from Gentoo commit fe54e8ae4fb5e75aba600455bc19edc0ac2c719b. --- .../sys-apps/smartmontools/smartmontools-7.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 29894f7c677..d56f94550d5 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 @@ -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 57ae4935373d10f8df9c92cefbc4b49949bf8e2b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:16 +0000 Subject: [PATCH 076/127] sys-apps/texinfo: Sync with Gentoo It's from Gentoo commit 221159b1ca716e208abcd9fc2e3d7efad0db9446. --- .../portage-stable/sys-apps/texinfo/texinfo-7.0.3.ebuild | 8 ++++---- .../portage-stable/sys-apps/texinfo/texinfo-7.1-r1.ebuild | 8 ++++---- .../portage-stable/sys-apps/texinfo/texinfo-9999.ebuild | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.3.ebuild index fcb9ea093d9..368074151fc 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.0.3.ebuild @@ -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 # Note: if your package uses the texi2dvi utility, it must depend on the @@ -16,9 +16,9 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git" REGEN_BDEPEND=" - >=sys-devel/autoconf-2.62 - >=sys-devel/automake-1.16 - sys-devel/libtool + >=dev-build/autoconf-2.62 + >=dev-build/automake-1.16 + dev-build/libtool " elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.1-r1.ebuild index d88637d0247..e6539767a6c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-7.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 # Note: if your package uses the texi2dvi utility, it must depend on the @@ -18,9 +18,9 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git" REGEN_BDEPEND=" - >=sys-devel/autoconf-2.62 - >=sys-devel/automake-1.16 - sys-devel/libtool + >=dev-build/autoconf-2.62 + >=dev-build/automake-1.16 + dev-build/libtool " elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-9999.ebuild index 4f348154302..69014441481 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/texinfo/texinfo-9999.ebuild @@ -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 # Note: if your package uses the texi2dvi utility, it must depend on the @@ -18,9 +18,9 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git" REGEN_BDEPEND=" - >=sys-devel/autoconf-2.62 - >=sys-devel/automake-1.16 - sys-devel/libtool + >=dev-build/autoconf-2.62 + >=dev-build/automake-1.16 + dev-build/libtool " elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz" From d4e29fdad6eb21c99356e39f529b94f2402d1a8f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:16 +0000 Subject: [PATCH 077/127] sys-apps/usbutils: Sync with Gentoo It's from Gentoo commit b3332259824e9a40614f11d667eed038367de5c2. --- .../portage-stable/sys-apps/usbutils/usbutils-017.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-017.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-017.ebuild index aff70399627..8eabc778a18 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-017.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/usbutils/usbutils-017.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 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="python" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" From 6bd539c70da0dbcb18a82fffebd86fc57d6c7246 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:21 +0000 Subject: [PATCH 078/127] sys-block/thin-provisioning-tools: Sync with Gentoo It's from Gentoo commit 495f184e7ffdc16682f125304d2e775de38e7ee4. --- .../thin-provisioning-tools/Manifest | 24 +++ .../thin-provisioning-tools-1.0.10.ebuild | 182 ++++++++++++++++++ .../thin-provisioning-tools-9999.ebuild | 67 +++---- 3 files changed, 229 insertions(+), 44 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.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 f08d5c4739b..962057bdeac 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 @@ -5,10 +5,12 @@ DIST anstyle-1.0.1.crate 13977 BLAKE2B 35be03a7de78737592528967e8ad4851436a74c78 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 anyhow-1.0.79.crate 44931 BLAKE2B 9270f04c6fbbecb535e3081f4275c3df28f6a893c1dfc0a9f7c009994de2deb8ebced04fe5e6f62931b33c3707f4fbfb0c3b28da1a611b413d40d27149d1fd2f SHA512 ecd6fb1367d494df18c0e274b336a133f3acf7b6a5487d20bdd06e08c7f1f729877086a0966e998221daff120504fadd2be2dc4219ed621f81b0a50c2bbc2011 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 base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9 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 @@ -21,11 +23,14 @@ DIST cc-1.0.81.crate 66857 BLAKE2B 1f20aa7fe1e41b7d043242ed2e6b840ef7e764fcd844d 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-4.4.16.crate 55534 BLAKE2B 6d0b65f2c0ca0b8ad023abdaafcf2de397443188f0774c8b6ef6704231a81136476fdf41272e810ccf2a9af68b945c4346dc78c4e10467502527ecbaecb3ac76 SHA512 d3cb37f54bc424220d91c6cd5a3fb04cf116db55c7371356484e52483abb289970f6a0948eda32d54e2dc47c666c533c0e2f3391f47f439f5b73a68fd0b38064 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_builder-4.4.16.crate 163503 BLAKE2B 9e8501c1cb7a3658b817a088ed4e2a94acbdd05d24fa67ac80693ca3fe75b36f07b69d3c44c2e5a892910228b7bfb86e9fc9443f45e06b5290999cfd4a310539 SHA512 0c627bef5bfe57e89c13eaf31e3c44ce730de8c5097d16113ad95cd8e3f65493ef9064bb962c9a617b2cdb537e7eb1cb3a303dd1779a7350539ea17d6facc16b 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 console-0.15.8.crate 36364 BLAKE2B 467de2c2fbfe31688cea20b338558ae9671e50ba1fd07983d21f32d7eacb73e565ebdd6ec5e78b2ae04446f09615c70983c0ee534e25ca5a28fd1b408acfdf34 SHA512 b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9 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 @@ -33,6 +38,7 @@ DIST data-encoding-2.5.0.crate 20632 BLAKE2B 16ea08dd12f09f2e6f8ba2910b3db07d4e7 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 +DIST duct-0.13.7.crate 30055 BLAKE2B f1259e9818a7c2f1df3dc387be3837a987e0246dacac84d3ac3443a0c6870b6cb4dab36d380ef8d04db47545655ef4def8c713c62f6e86f2b995fa3b69a16b6f SHA512 b6e524144360b61b5c134d40aec409664388e88ada241443d152c5f7ef8795535ba243cc792c881557412bf75c2ba73c84e2f620eaf7d4668a15ba6bc274b1e7 DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77 DIST env_logger-0.8.4.crate 33342 BLAKE2B b1bb359be2f34ca6f93f72154c86920b8254f574b48f693b2ae7296cd1ff25d34dea61e95fb2954569fdebb6c522c851ef7499c107005528aa2226df13b0de33 SHA512 9e4478ff609a2e1e1a902a55b221af43a52622fdb5668dc33fb0be354b964708b7b6d13b7f1ef11982f45fa7e71f0712a2ab3fd4ea98155a5115e5a7c3d33049 @@ -49,6 +55,7 @@ DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd 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 getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee 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 @@ -57,19 +64,24 @@ DIST indicatif-0.17.7.crate 63108 BLAKE2B 665bc2077207cac6ca2071d9e6ead76abb30d5 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 itertools-0.11.0.crate 125074 BLAKE2B 8e686f176764e92e4da3697eb781e1bc30d6c57ac61d97343b4fc3a48e4febf669d5771fa8620005c620cce52c236760ee2e1bc344cf602e878bc168a2e69cab SHA512 8ece00ba0a7cf481ad4586da24385a6f0b1719b9c3f0c25b9b5b373dd1a0ca7b9687a77cd179853392890b7bf4d31e0356a4e5fd540465b4ac62bd74ef717fd8 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 libc-0.2.152.crate 740278 BLAKE2B 8eecde477063207d77b6894d6f9194c8dd10e55b69585e3d66296eaa0b9d3f6e2d033e667207182bf4c3cf31f6d38820c9187b2006f4b5ebee898adafb4b2751 SHA512 1722f6f52077efab90026aae3d10306f8c38ebba95366593c3c1adf707fae121ab450064ad9e8be5a667caf6af0b90fad4d1ca1009db0f2220093c44e33c4b5c 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 memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473 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 +DIST mockall-0.12.1.crate 22845 BLAKE2B b2299c6060b609732b041c66f58437e1a52228016ecef33f9d2d6a9e017b86f35079ef69ec7bf511d4fdec309c60bb4dd9cb2570c7a3e079a37366c5c1a0877f SHA512 8681eb1b1ae2fa00bd2b73269a0b493361d0003da4080da79ff047692c75c34359621923b06906046218acddecb1fd49186fb7b4e752c70657dc9becb8f20c6f DIST mockall_derive-0.11.4.crate 44096 BLAKE2B 336fdf8ff3d6e8218bb77c20e7fa6fc6360022b107abf5edb41fa6dc198a72576bd267cfeb59c9eefa0c6eccc1a56f4fb9ea22d3b6011af80061e5d0e4a27293 SHA512 a4aa214feb36b4e844d2b0b3d74c3733ed25085cf65dbe22b6387ac12c8b15517396ff4b875461732865f408582d2ffd3e0c190d438213c3cbcaba669608e735 +DIST mockall_derive-0.12.1.crate 45330 BLAKE2B 6593becbb7eb3393a8f05ca4d5d6fa8ed9d0ff00c1b53a218b39889a6f8e14259e29334f36b0fa926610296d5f46f17e627284cecf8dcd3689334d589078b394 SHA512 5a99f5f9cc0bb1383edc3d2eebfabbe520436154e39cc4a4556f03826493ba888a54127f40ec70df66cf9c83262cecae3ffab03de9cbdac2716c431e7ccd39b5 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 @@ -82,19 +94,24 @@ DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45 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 os_pipe-1.1.5.crate 11430 BLAKE2B 45abc371ddd363d193817a339f9e1894ec6fd275b9c9d190283347bb023ec7686e3ca6a5f2bf09cd7ee6abb8843ae52410c203af2310bf3e35c280c5b9874ea5 SHA512 d862484e9a0594f31e45531fac9a892fe247c1003a9c365a28083c0b5132719fe6fcd7ed996716a4baddf1f8ec4857d62d05663d3fd7ecee5802005c55368048 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-3.0.4.crate 23240 BLAKE2B ff0b96b85668dd24e8368479d82210b38f591f67a0793a080670e02b649516be8acda4ae5f80e98113a2030bfc7ec71cffe53a0fea4fb65f98b3a2fc1f6daece SHA512 b2dbfa83760004abce72f2ef576d7ec079c4ea909120a8fe1ec6b87da0fcc2b48406cd6857ed16e131281b4775a6f33ae94f975e381794fd9a98a2c0e11e1f75 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 proc-macro2-1.0.76.crate 45660 BLAKE2B 40b538d9d9fec10b9e4b147ce0a86efb10feedf9e0452e5568e8ad7d2b88a201ca6ffd2cd62d8815a1ee72d557fe6280120a913868c3d868c1235686742cd8b8 SHA512 2ea7ade475171166489ab3e745e8c526e49c7521bc39b1bfec6dd2fd0807fd3cc5579235f77534be855f9ecab481205e77e66b14ebb22e66d2c3cff842567247 DIST quick-xml-0.29.0.crate 160308 BLAKE2B 7b409153a597edd855752e00f50f5b1fea70570a07932cf2dd78ea31cdf5e1bea4732cfa632615ede79e551b7a35ef535def2c3112a3d07a363337e9b807d277 SHA512 1a6d61e2161e3701e2d4e4b243d1a20072d546a3a0e3389c185f1c9a53bd6af172ed1b791f9a329cec67a2dd9babae44048bebb7293dfdc0efacfce0aba820fb +DIST quick-xml-0.31.0.crate 172236 BLAKE2B b83c7f485a30576027a4ae77aa23cd6284942d786f0f0a14faafdfecff646371ba15133b3ba90f820183c8537c8ac47ad3e1e7deaad65e56761bc662be406026 SHA512 9b1f4f9c32694ccb244938a9a4e9373c3902314afb6af5d2f6b1be55e5ec63fee5cf1085f8f32161570cc10fdd96f3375c7564b1d884bb152542b86593f175de 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 quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 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 @@ -116,26 +133,33 @@ DIST rio-2979a720f671e836302c01546f9cc9f7988610c8.gh.tar.gz 27249 BLAKE2B 5a2206 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.30.crate 374744 BLAKE2B 63ad9fe2e131259a008abdf7a19735d2e2401e62cceae7b449ec7cb6025e82f8d275c24caba5c23c19d9c37de9b3b9263e96db3eea6bba569eb6146f5b3dd62f SHA512 6ffcdc274f97e7dad9fb0a23fe948ec4041fff6ce915204fb46adc31b55646a5fd0ff3d8d6483673da2cc55044ba53af4d6e48ebeb8622e7ac027a5d390231de 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 semver-1.0.21.crate 30445 BLAKE2B 1c779c25576723ee7e44e7c831eacc5dc6bb33cbf051bd0748f688573e01595d05808cdef4ae48a6423df15e474cea58a0664ad7fa5cad490a61f89473f426d7 SHA512 bc3ceb11f2b729be086120c06ca2cefc34c5141d2d4af64279b0868456894eb9097b234b326249f2aa83d8b99086fcac4c5b7ef4a1e14b1198ae808fde245c35 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 syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325 DIST tempfile-3.7.0.crate 31754 BLAKE2B 50df09733ac358ccaa92be5e2284ce4df7f256285f2e9575637888b995af7a2e09d80cc7d228041143a36e08472d9c9f896e419d8208281fd5c768972dd6aa43 SHA512 cfa8fc57b8605edc6f4fecc167df17e484b24ab01f7f1a6cf19ed6f6161b77f124e55c8359a93d0a07970e25ca6aece4509338a66a3c683c4c473fa5ac9532df DIST tempfile-3.8.1.crate 32164 BLAKE2B abccff7939df8cd223a5a8ee61e5af7c35335f1cd61b3e72fed9a8565465c293e99938d57b50743141aace3cd20422ad5d3090507ed66561cb0155771fe0a5ec SHA512 b257bfb70793575d59ec4cf4b7492aff83dafb68b367a48594211f476a3b1d4800b69bddc405d8749d8b320c30cbe71be1261a60b4bbc862663b37a6c7d97a3a +DIST tempfile-3.9.0.crate 32182 BLAKE2B 4e802990988aff3ab5173bd96dbd906651a8df46b2619e6a500a3b9e7f4a3cd01dc7ee977791343f7875afdc4793a845000bb363d8c1a6599aeb6b1efcce5d56 SHA512 04e06c966bfa7a1567e7185ebd5c2876b96e46e36af14931bf0eba63795cd20d1c3427b6709a4cab2a68b8d289fdabd5537a50e5407a76e3a9fa0dcc7d3ce6d7 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.10.tar.gz 397068 BLAKE2B 2dabfe6d64ed806aec8e253902b0465b11105263971839cb2b95cad0d22ce120894a0db0fdb6a34b884509cd52c2f09012ca400104a30b15a1256758bf554808 SHA512 76ff45c6e7df3e1c0b8d7812f8e879879fbacc36949fd5e073e92200caad0005005e2c28de2b2c29eec046379d26b2fff07d9dec41a543d9b039fb27aaf2e105 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-1.0.56.crate 20592 BLAKE2B e98c8bba8d21342c981646e88b72a7cbc146c695a200aae3e076b55948791cc51a29e8818d64451b17233ed4d095d0ef63ba4fb07502f4ffde5af738b8629c37 SHA512 6b7c856745256d6ef9e7ab2ea0027f9c1ed2c75ed5b075068af57cf706abfd835fd4552d9ec7578bece1f820086828c5dec85a9cbada409569838cdc9d63936c 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 thiserror-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794fb8000a0aa292ec0d2d66d7a4d1fcb226c3e2e690ff6a61ba2d8704208014eea84044dba27523d4b2c26d2f7d4ba64d5 SHA512 da66f4674cf699083f7142f3a60c1c9334767b4de3690b4c7af460ffda787fab2089f5bca231e92b6e71724d46fe7dbdcaa19073f5d8100838536d10971efbde 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 diff --git a/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild new file mode 100644 index 00000000000..021c5e9a4b0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.10.ebuild @@ -0,0 +1,182 @@ +# 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.79 + atty@0.2.14 + autocfg@1.1.0 + base64@0.21.7 + 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.16 + clap_builder@4.4.16 + clap_lex@0.6.0 + console@0.15.8 + crc32c@0.6.4 + crc32fast@1.3.2 + data-encoding@2.5.0 + downcast@0.11.0 + duct@0.13.7 + 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 + fragile@2.0.0 + getrandom@0.2.12 + hermit-abi@0.1.19 + hermit-abi@0.3.3 + indicatif@0.17.7 + instant@0.1.12 + iovec@0.1.4 + itertools@0.11.0 + lazy_static@1.4.0 + libc@0.2.152 + linux-raw-sys@0.4.12 + log@0.4.20 + memchr@2.7.1 + minimal-lexical@0.2.1 + miniz_oxide@0.7.1 + mockall@0.12.1 + mockall_derive@0.12.1 + nom@7.1.3 + 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.5 + portable-atomic@1.6.0 + ppv-lite86@0.2.17 + predicates-core@1.0.6 + predicates-tree@1.0.9 + predicates@3.0.4 + proc-macro2@1.0.76 + quick-xml@0.31.0 + quickcheck@1.0.3 + quickcheck_macros@1.0.0 + quote@1.0.35 + 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.30 + safemem@0.3.3 + semver@1.0.21 + shared_child@1.0.0 + strsim@0.10.0 + syn@1.0.109 + syn@2.0.48 + tempfile@3.9.0 + termion@1.5.6 + termtree@0.4.1 + thiserror-impl@1.0.56 + thiserror@1.0.56 + 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.52.0 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.52.0 + 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 a8f60077bd4..021c5e9a4b0 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 @@ -8,26 +8,25 @@ CRATES=" adler@1.0.2 aho-corasick@1.1.2 anstyle@1.0.4 - anyhow@1.0.75 + anyhow@1.0.79 atty@0.2.14 autocfg@1.1.0 - base64@0.21.5 + base64@0.21.7 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@4.4.16 + clap_builder@4.4.16 clap_lex@0.6.0 - console@0.15.7 + console@0.15.8 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 + duct@0.13.7 either@1.9.0 encode_unicode@0.3.6 env_logger@0.8.4 @@ -36,43 +35,41 @@ CRATES=" 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 + getrandom@0.2.12 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 + itertools@0.11.0 lazy_static@1.4.0 - libc@0.2.150 + libc@0.2.152 linux-raw-sys@0.4.12 log@0.4.20 - memchr@2.6.4 + memchr@2.7.1 minimal-lexical@0.2.1 miniz_oxide@0.7.1 - mockall@0.11.4 - mockall_derive@0.11.4 + mockall@0.12.1 + mockall_derive@0.12.1 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 + os_pipe@1.1.5 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 + predicates@3.0.4 + proc-macro2@1.0.76 + quick-xml@0.31.0 quickcheck@1.0.3 quickcheck_macros@1.0.0 - quote@1.0.33 + quote@1.0.35 rand@0.8.5 rand_chacha@0.3.1 rand_core@0.6.4 @@ -86,18 +83,18 @@ CRATES=" retain_mut@0.1.7 roaring@0.10.2 rustc_version@0.4.0 - rustix@0.38.27 + rustix@0.38.30 safemem@0.3.3 - semver@1.0.20 + semver@1.0.21 shared_child@1.0.0 strsim@0.10.0 syn@1.0.109 - syn@2.0.39 - tempfile@3.8.1 + syn@2.0.48 + tempfile@3.9.0 termion@1.5.6 termtree@0.4.1 - thiserror-impl@1.0.50 - thiserror@1.0.50 + thiserror-impl@1.0.56 + thiserror@1.0.56 threadpool@1.8.1 tui@0.19.0 unicode-ident@1.0.12 @@ -107,32 +104,14 @@ CRATES=" 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 " From 4cb9142eb5d2ffdf22e427045bff42fa42779e2a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:26 +0000 Subject: [PATCH 079/127] sys-devel/binutils: Sync with Gentoo It's from Gentoo commit 31b761eeea68a204d13e455001a451e925fa77da. --- .../sys-devel/binutils/Manifest | 1 + .../binutils/binutils-2.41-r3.ebuild | 2 +- .../binutils/binutils-2.41-r4.ebuild | 2 + .../binutils/binutils-2.41-r5.ebuild | 531 ++++++++++++++++++ .../sys-devel/binutils/binutils-9999.ebuild | 2 + 5 files changed, 537 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r5.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/Manifest index c8df0234687..7f5f5df7a6f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/Manifest @@ -19,4 +19,5 @@ DIST binutils-2.40-patches-7.tar.xz 299188 BLAKE2B 170cd2432e0458889b240c3603461 DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925 DIST binutils-2.41-patches-2.tar.xz 20288 BLAKE2B 1cc29e868ded12845856c5da567f23798fe3017961ce079325c20f456b837cab11560d896065f70953b0bab55bf565288541579e9c3e0991a87083edf2a85fa5 SHA512 75619a5e17b75d72f9bdd9d5e5ee3b566c94de64410bfc074f1a9bfb9f08db9ecf8be216efa1053263468aa8ec99b8aa3b2b095e63cb95f3566500ac0c3b9432 DIST binutils-2.41-patches-4.tar.xz 86580 BLAKE2B 32748fd0e81a7e323e9f56f0864f2a1755b8fe1b09c777075e31a292297e365c47b47003f8f1bffacc254ed8dccf1c655b7b13f61da751c9db090e56d819fbb2 SHA512 90dcf38c1ed2ae015eb9de922e946e2be62355bd51276075e7f1c0a06cd52408057c4151a2d2d4c07e33c1d2c5998001cba5509819e5722cce45f70172465ea5 +DIST binutils-2.41-patches-5.tar.xz 95176 BLAKE2B bbc94b3c7d70653a1056afe57a120b6eac9f0c8f51f05e95a1b5f80f2b7ef35e6355d740b49bc1ec2f3a13a838d5210ff4a205aa2bde5a72bc55c12100bce726 SHA512 ad293f97116f71322993f381c1af69fad1719a159f127ff16ddeca62f9b9b62aaf141abfa661985a61e9be7ae0639772148e69293a97364eebbf49182babb691 DIST binutils-2.41.tar.xz 26765692 BLAKE2B 3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75 SHA512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374 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 15bdc6f5a77..e391c34b952 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 @@ -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 # 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 index 08d7d906dfb..44554f947d8 100644 --- 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 @@ -467,6 +467,8 @@ src_install() { # Remove shared info pages rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} + docompress "${DATAPATH}"/{info,man} + # Trim all empty dirs find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r5.ebuild new file mode 100644 index 00000000000..1dd8b1bda2c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r5.ebuild @@ -0,0 +1,531 @@ +# 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=5 +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} + + docompress "${DATAPATH}"/{info,man} + + # 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 393acc75d9d..5f745bd13e6 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 @@ -467,6 +467,8 @@ src_install() { # Remove shared info pages rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} + docompress "${DATAPATH}"/{info,man} + # Trim all empty dirs find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null } From 1a8961bb95d6b4fb98b82e60e40c81178f29d488 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:27 +0000 Subject: [PATCH 080/127] sys-devel/bison: Sync with Gentoo It's from Gentoo commit 54485713cf0ce8a8af217688b7ac5ef9099e3b88. --- .../portage-stable/sys-devel/bison/bison-3.8.2-r2.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/bison/bison-3.8.2-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/bison/bison-3.8.2-r2.ebuild index fd8742c3ad6..b778f945857 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 @@ -4,7 +4,7 @@ EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bison.asc -inherit flag-o-matic verify-sig +inherit flag-o-matic multiprocessing verify-sig DESCRIPTION="A general-purpose (yacc-compatible) parser generator" HOMEPAGE="https://www.gnu.org/software/bison/" @@ -68,6 +68,10 @@ src_configure() { econf "${myeconfargs[@]}" } +src_test() { + emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" +} + src_install() { default From c93be6b5edb1a06570967ffe85341717de01026d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:28 +0000 Subject: [PATCH 081/127] sys-devel/crossdev: Sync with Gentoo It's from Gentoo commit 00a8a341c9c9705630397def721a93dacfb71f58. --- .../sys-devel/crossdev/Manifest | 4 +- .../crossdev/crossdev-20230616.ebuild | 40 ------------------- .../crossdev/crossdev-20230831.ebuild | 40 ------------------- ...230321.ebuild => crossdev-20240117.ebuild} | 5 +-- 4 files changed, 3 insertions(+), 86 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230616.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230831.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/crossdev/{crossdev-20230321.ebuild => crossdev-20240117.ebuild} (89%) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest index 4a3b4caa6f9..eb005c636c2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest @@ -1,4 +1,2 @@ -DIST crossdev-20230321.tar.xz 29620 BLAKE2B a5070ccf8b5e4fd9a6f63f6a903126a6eb199d7dfdcfbe93f0917a66894c4eef2df5749c0fddaf564fe013b40a14d88b2686700034642fb1d876b51731964a49 SHA512 c300b506bb7ed4aa5d43601b37c8298367f6e5307a97b19a23f39e9559e54d2bfdb6e2b7a5fde4d5ff0b4a9b02c1b6f05be92d1857352db6cde9a469c9159e5f -DIST crossdev-20230616.tar.xz 29628 BLAKE2B 856f24f6afcdff8e9283ef9a90ff78312123aaad8386f7003d120b5c00cd74f6ba3a911979739434696ceedc13f432d05b60ef3349ade03aa4b49afa9e59a3fa SHA512 373ebd0c776a8d687bd11faa502a7b513f1e1dce5e310a1783349c7c2ad5b2b7e9bc51a59fdcb4414cb94faabc14ec3d723b187658ce35b4ebf73e4386d69930 -DIST crossdev-20230831.tar.xz 30792 BLAKE2B d8c738ff37dca4de64964fa51fec9981fd4b6ef101cd15d05a15ba8aa08d7e7fd3ad9dd56fdcd103b31fff2e458e94ffa22d586313f7c620fe7099cf0d9a662b SHA512 4e41e6ce37670f908d28adc76badd46532d89351240fe77e47aaf660f14da52320e30e55fee047464876bf7b6aab6968232d88fd8c69b62a3e4a83a8a8aad1dc DIST crossdev-20230923.tar.xz 30824 BLAKE2B f67d57cfcffcbefe56c9150e97b7189c79a87a8d75e41a2e47441ed23ec248d1b0fd6ef774f81e6086544b9d1551a14a4a49917fdb5366dfc9d1a2439f87d68e SHA512 b9048a19b388eebfe42b2fcb27c100fc574d81a4a2d6a11ef08f8552b49b5690c6e076a379a6c50cf45567faa00dface225a8539dacf44d1bfae12d4ab05ee2b +DIST crossdev-20240117.tar.xz 30880 BLAKE2B 35c2aadf633ff8155a3a03c6e062e56655e9e9612a785de516ace8da05d2a2a91578290b8bfae6e44b91af3cce327371373df9cfe202ab09a442cecba7418c41 SHA512 ce830ec3f767843541c4e36b3189e42cd180e77b208939864309b32cca7c4156eb7fd73adbcfec7873a4389f98885e6b1291f38346eba5578e8125e9900ccfaa diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230616.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230616.ebuild deleted file mode 100644 index f72a62e5544..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230616.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -if [[ ${PV} == "99999999" ]] ; then - inherit git-r3 - EGIT_REPO_URI=" - https://anongit.gentoo.org/git/proj/crossdev.git - https://github.com/gentoo/crossdev - " -else - SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -DESCRIPTION="Gentoo Cross-toolchain generator" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev" - -LICENSE="GPL-2" -SLOT="0" - -RDEPEND=" - >=sys-apps/portage-2.1 - app-shells/bash - sys-apps/gentoo-functions - sys-apps/config-site -" -BDEPEND="app-arch/xz-utils" - -src_install() { - default - - if [[ ${PV} == "99999999" ]] ; then - sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die - fi - - dodir /usr/share/config.site.d - mv "${ED}"/usr/share/config.site{,.d/80crossdev.conf} || die -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230831.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230831.ebuild deleted file mode 100644 index 8938d96f9d5..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230831.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -if [[ ${PV} == "99999999" ]] ; then - inherit git-r3 - EGIT_REPO_URI=" - https://anongit.gentoo.org/git/proj/crossdev.git - https://github.com/gentoo/crossdev - " -else - SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -DESCRIPTION="Gentoo Cross-toolchain generator" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev" - -LICENSE="GPL-2" -SLOT="0" - -RDEPEND=" - >=sys-apps/portage-2.1 - app-shells/bash - sys-apps/gentoo-functions - sys-apps/config-site -" -BDEPEND="app-arch/xz-utils" - -src_install() { - default - - if [[ ${PV} == "99999999" ]] ; then - sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die - fi - - dodir /usr/share/config.site.d - mv "${ED}"/usr/share/config.site{,.d/80crossdev.conf} || die -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230321.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20240117.ebuild similarity index 89% rename from sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230321.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20240117.ebuild index 5ed47e49cf4..060ebf803d6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20230321.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20240117.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,8 +10,7 @@ if [[ ${PV} == "99999999" ]] ; then https://github.com/gentoo/crossdev " else - SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz - https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi From a87f5e73506e4923da770328cdb23e39fc3bd009 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:29 +0000 Subject: [PATCH 082/127] sys-devel/gcc: Sync with Gentoo It's from Gentoo commit b4311467026f58c499082963adfd2863f3400f6f. --- .../portage-stable/sys-devel/gcc/Manifest | 26 +++----- .../sys-devel/gcc/gcc-11.4.1_p20231228.ebuild | 64 ------------------ .../sys-devel/gcc/gcc-11.4.1_p20240111.ebuild | 2 +- ...104.ebuild => gcc-11.4.1_p20240118.ebuild} | 0 ...221.ebuild => gcc-11.4.1_p20240125.ebuild} | 2 +- .../sys-devel/gcc/gcc-12.3.1_p20231229.ebuild | 64 ------------------ .../sys-devel/gcc/gcc-12.3.1_p20240112.ebuild | 2 +- ...105.ebuild => gcc-12.3.1_p20240119.ebuild} | 0 ...222.ebuild => gcc-12.3.1_p20240126.ebuild} | 2 +- .../sys-devel/gcc/gcc-13.2.1_p20231230.ebuild | 65 ------------------- ....ebuild => gcc-13.2.1_p20240113-r1.ebuild} | 6 +- ...106.ebuild => gcc-13.2.1_p20240120.ebuild} | 2 +- ...113.ebuild => gcc-13.2.1_p20240127.ebuild} | 2 +- .../gcc/gcc-14.0.0_pre20231224-r1.ebuild | 64 ------------------ .../gcc/gcc-14.0.0_pre20231224.ebuild | 64 ------------------ .../gcc/gcc-14.0.0_pre20231231.ebuild | 64 ------------------ ...4.ebuild => gcc-14.0.1_pre20240121.ebuild} | 0 ...7.ebuild => gcc-14.0.1_pre20240128.ebuild} | 2 +- 18 files changed, 20 insertions(+), 411 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20231228.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-11.4.1_p20240104.ebuild => gcc-11.4.1_p20240118.ebuild} (100%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-11.4.1_p20231221.ebuild => gcc-11.4.1_p20240125.ebuild} (97%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20231229.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-12.3.1_p20240105.ebuild => gcc-12.3.1_p20240119.ebuild} (100%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-12.3.1_p20231222.ebuild => gcc-12.3.1_p20240126.ebuild} (97%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20231230.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-13.2.1_p20231223.ebuild => gcc-13.2.1_p20240113-r1.ebuild} (90%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-13.2.1_p20240106.ebuild => gcc-13.2.1_p20240120.ebuild} (99%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-13.2.1_p20240113.ebuild => gcc-13.2.1_p20240127.ebuild} (99%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20231224-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20231224.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20231231.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-14.0.1_pre20240114.ebuild => gcc-14.0.1_pre20240121.ebuild} (100%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-14.0.0_pre20240107.ebuild => gcc-14.0.1_pre20240128.ebuild} (99%) 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 5970a3a4310..6d093e13e48 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 @@ -3,41 +3,35 @@ DIST gcc-10.5.0-patches-6.tar.xz 18208 BLAKE2B 4cac3340108fb378c76ad62b728429f3c DIST gcc-10.5.0.tar.xz 77846412 BLAKE2B 9b71761f4015649514677784443886e59733ac3845f7dfaa4343f46327d36c08c403c444b9e492b870ac0b3f2e3568f972b7700a0ef05a497fb4066079b3143b SHA512 d86dbc18b978771531f4039465e7eb7c19845bf607dc513c97abf8e45ffe1086a99d98f83dfb7b37204af22431574186de9d5ff80c8c3c3a98dbe3983195bffd DIST gcc-11-20230622.tar.xz 76199316 BLAKE2B a769dc6be63eabca3bc33944b471d727bf230e506773c85977156b187f12664f2cd3e0992a1faefda8ec88ff85d1a8d12795121baadc7e8b9653d69a8025e46e SHA512 8dbc5a4b54f2bc52458914705af40a00b33e46061dd5b335b4b4a6e96d17206fe480d3fec564dd11ebcca6168f054984d706b1b26b7e694e8b327692a13ae7d1 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-20240118.tar.xz 76258832 BLAKE2B 0474e1890bf618dc6dbb3e8cb90d4aab50666a9406f79d10ffc26f445b44573d365890ed6967c214b6f7d25174b127ff59f9d2b597b98e358c2050e1badd9232 SHA512 1a7aa4080cdf007e3f99bdcf6e4dd4a8e91a294b0a69608f8faafbe5dd9ffb68024410a82502c4887a8d01be073a6d21ae90ec8ec53c3521c34908e26009a5f0 +DIST gcc-11-20240125.tar.xz 76243360 BLAKE2B ee2b1260cd5de9bc7d4a15bb4b4b2afe651f2333311c042314b7faa6fcd33f68a931660b215454bd4863f677e4abf38acf33a4f88d4ac98d0384b7ed6b920816 SHA512 d269aab6e5effdcfc3090279c56fee6e4ad5a6bda7a65712892fd0fcaedf3249b9fc20e370d00dfcf8442d07332b0af9717425075f33832b6af96078ecb3d5b0 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 DIST gcc-12-20230825.tar.xz 79804260 BLAKE2B 4d3eb40eb5954d497b3e9586dad0d18c9e561d3fdd0bdccc5c9572edfbe024a235e30371a10116d98c77f0b6042739600c57ac99253d34f0fbb8b8465b187e1f SHA512 a6cd868f474c356886460b95263807828f9a379ce97524611ec504d6a9149ca1f92585128e6ffd03fa2647442e72fde6ebe987fd49f2fc49d8df39ab056905c5 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-20240119.tar.xz 79829068 BLAKE2B 822e3730e21d80216c531426688c23cb8d71ff89d230942c1fbd2c406dfd64c714adf77bebd7137675ad4c7bf1e5b32e27904987f7ac484574ef07d9ae0bed88 SHA512 768a77877928c1b35cd660b3dd60d26ccc9419c5d670d51d99ae0d4467cfeb9f243993c04c188a6250a5e7e6ab4c6ad89a05d07cfc27da3545482b01d1649e72 +DIST gcc-12-20240126.tar.xz 79822228 BLAKE2B 7bee3799f0655d35773c380996d5cccb7b18a2f12ba45a37e54fd190407583a540a9310fce455b72f35718f8e62f7f47e9b99ff99a8462014978b6d90f7b1013 SHA512 b69d6d41038f1c9da982eb4d4e680fe0827a316f8aede741279610108cfd5a8ba7854326cc497850472d3009496ec7b04a0bd0e1a61a96184e7abf54ead95dd4 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-20240120.tar.xz 84362612 BLAKE2B d8aa2ebd73e2911c143505d2ed91bbab1ca4a11238bd58727ff997311bf679a714f4be7844b2570d467e46ed5a36e8316669603a278502ca7c8fa7af338a49f7 SHA512 2c8cc41be30529198c573cc69d1c5c9da1389e1c89f88ba931c7d2475abb8999a22f25f2e1fa75f61550c95e278bb26f2649cba6b298f6cfc8c6d098487552c6 +DIST gcc-13-20240127.tar.xz 84365080 BLAKE2B 735bcff50272765110a14358d6cddd0a96b059876b5d6eb67cd8145362b51ed72162d9333cbb21849df36ddab52d4b3610d74582d2b25d7f9b5c52158042cd2c SHA512 7ab50e7dd637674d69e71a791043074a6887ee07bcb74ea919d8ab4c0164eae5ceaf0f955dc83473d2976692d28b6d7f802f78dbf90da66aec023658e1e60e59 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-12.tar.xz 47404 BLAKE2B ed018bcd7429d1c7aace746cbfc4e59dae409fc0a35231320c1b44c96fff0d912eba5c72109c2deb883f5368159df02148b2d4373396b34da882164c61fe4387 SHA512 b7872a03870bce7b633e4af4329b24fe8f3d50d6d9173f63549f606ce062787748af7f79e7ec4afeb768968d6e8462a849bd1b94316ea6bb284551f99e811617 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-20240121.tar.xz 87469416 BLAKE2B a146f6f62775d2ad82f93dba0581b3aee162113cb0a1ed9fa3db6a8cfc08415555edb0dd0b24d6f4676b91d644d2096ffe22de3c03c8f88b7d6e480515601737 SHA512 af6b623bba274970c58da8cd4a5f329a2b2973cb108e7dc7a910358d7bffb89b8f33437d47d7f10a1ceeafd744f099677621f3c3fac65e54aad1ea4045d19743 +DIST gcc-14-20240128.tar.xz 87528304 BLAKE2B d3a3cce5da54b7342a11a3dceb97bfa5f1203327ea5ee5c9ab02d2b5cae2d0c2ba72feaf2da578d74fba05e10fa0f69433ee49501b5e5ef9a5f95f7284446adc SHA512 8ad32c896765a4013e2e812ab26b7dc5d3c13db27cbe40222090f072b2c26c12808175a12484cd4e0d815bc3f9389d5210a9270de9c3b796c6fa2726d0e2ef44 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-14.0.0-patches-17.tar.xz 11792 BLAKE2B 9e29f3cfaa04ccade9ec768b7d7d8c254ad244d5e71db725a98b217c5beea04c71c05873d9cb93787b84813fe761e846e4e2c2814a3e12df5aefaaed72ebe70e SHA512 fbbbf9e50b030f130cce9089463365a84ca8368fc0f3cda132867d82094a2b91bfabfb2dbf5fc2ceed7c5651e9c24ac5d8978203c724969c325b0b38a78f24dc 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_p20231228.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20231228.ebuild deleted file mode 100644 index 0a84d988821..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20231228.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_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 index da9833f4395..4c5ad43b36d 100644 --- 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 @@ -37,7 +37,7 @@ if tc_is_live ; then 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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" :; fi diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20240104.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20240118.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20240104.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20240118.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20231221.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20240125.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20231221.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20240125.ebuild index 0a84d988821..da9833f4395 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20231221.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.4.1_p20240125.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/sys-devel/gcc/gcc-12.3.1_p20231229.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20231229.ebuild deleted file mode 100644 index 1ffe2b97a4b..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20231229.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_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 index 69767162475..2e6fa245d3a 100644 --- 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 @@ -37,7 +37,7 @@ if tc_is_live ; then 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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" :; fi diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20240105.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20240119.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20240105.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20240119.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20231222.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20240126.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20231222.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20240126.ebuild index 1ffe2b97a4b..69767162475 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20231222.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.3.1_p20240126.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/sys-devel/gcc/gcc-13.2.1_p20231230.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20231230.ebuild deleted file mode 100644 index 945d3a22942..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20231230.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_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_p20231223.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240113-r1.ebuild similarity index 90% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20231223.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240113-r1.ebuild index 945d3a22942..7b1015f0e7c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20231223.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240113-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# 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" +PATCH_VER="12" MUSL_VER="2" MUSL_GCC_VER="13.2.0" @@ -37,7 +37,7 @@ if tc_is_live ; then 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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" :; fi 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_p20240120.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240106.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240120.ebuild index 5f50fcbf06c..e295e327ec9 100644 --- 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_p20240120.ebuild @@ -5,7 +5,7 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" PATCH_GCC_VER="13.2.0" -PATCH_VER="11" +PATCH_VER="12" MUSL_VER="2" MUSL_GCC_VER="13.2.0" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240113.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240127.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240113.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.2.1_p20240127.ebuild index 5f50fcbf06c..e295e327ec9 100644 --- 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_p20240127.ebuild @@ -5,7 +5,7 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" PATCH_GCC_VER="13.2.0" -PATCH_VER="11" +PATCH_VER="12" MUSL_VER="2" MUSL_GCC_VER="13.2.0" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20231224-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20231224-r1.ebuild deleted file mode 100644 index 9bcfa1cd248..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20231224-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_GCC_VER="14.0.0" -PATCH_VER="13" -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_pre20231224.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20231224.ebuild deleted file mode 100644 index 3fd3235d983..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20231224.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_GCC_VER="14.0.0" -PATCH_VER="11" -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_pre20231231.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20231231.ebuild deleted file mode 100644 index af1f684970b..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20231231.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_GCC_VER="14.0.0" -PATCH_VER="14" -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.1_pre20240114.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.1_pre20240121.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.1_pre20240114.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.1_pre20240121.ebuild 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.1_pre20240128.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.0_pre20240107.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-14.0.1_pre20240128.ebuild index 096272333ad..6951477ea99 100644 --- 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.1_pre20240128.ebuild @@ -5,7 +5,7 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" PATCH_GCC_VER="14.0.0" -PATCH_VER="15" +PATCH_VER="17" MUSL_VER="1" MUSL_GCC_VER="14.0.0" From f7b90d29f043b5b5784d0ec1ec929936814c300b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:51 +0000 Subject: [PATCH 083/127] sys-fs/multipath-tools: Sync with Gentoo It's from Gentoo commit 14b57996c7ea8bab4cac18c2f3ed265112de79f8. --- .../sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild index c0f5549b9f6..2d85d3d1064 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.9.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 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86" IUSE="systemd test" RESTRICT="!test? ( test )" From a53ccc3b4e83e8ef29c7cdb0aaa191028f0d3242 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:55 +0000 Subject: [PATCH 084/127] sys-fs/xfsprogs: Sync with Gentoo It's from Gentoo commit b11c7460abd9916be76f8831466d5cc63bd079bf. --- .../portage-stable/sys-fs/xfsprogs/xfsprogs-6.3.0.ebuild | 6 +++--- .../portage-stable/sys-fs/xfsprogs/xfsprogs-6.4.0.ebuild | 6 +++--- .../portage-stable/sys-fs/xfsprogs/xfsprogs-6.5.0.ebuild | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.3.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.3.0.ebuild index 412d486c331..b59bbeb5ee6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.3.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.3.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 -inherit flag-o-matic systemd usr-ldscript +inherit flag-o-matic systemd usr-ldscript toolchain-funcs DESCRIPTION="XFS filesystem utilities" HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/" @@ -75,7 +75,7 @@ src_configure() { $(use_enable libedit editline) ) - if is-flagq -flto ; then + if tc-is-lto ; then myconf+=( --enable-lto ) else myconf+=( --disable-lto ) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.4.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.4.0.ebuild index afc21c0b6d8..5ee0fb214a0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.4.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.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 -inherit flag-o-matic systemd usr-ldscript +inherit flag-o-matic systemd usr-ldscript toolchain-funcs DESCRIPTION="XFS filesystem utilities" HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/" @@ -76,7 +76,7 @@ src_configure() { $(use_enable libedit editline) ) - if is-flagq -flto ; then + if tc-is-lto ; then myconf+=( --enable-lto ) else myconf+=( --disable-lto ) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.5.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.5.0.ebuild index ab384740667..a450486a8f3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.5.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.5.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 -inherit flag-o-matic systemd udev usr-ldscript +inherit flag-o-matic systemd udev usr-ldscript toolchain-funcs DESCRIPTION="XFS filesystem utilities" HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/" @@ -77,7 +77,7 @@ src_configure() { $(use_enable libedit editline) ) - if is-flagq -flto ; then + if tc-is-lto ; then myconf+=( --enable-lto ) else myconf+=( --disable-lto ) From 97a85fa85a4b9c46bea34ee0b2136ca15b9d3f5d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:55 +0000 Subject: [PATCH 085/127] sys-kernel/linux-headers: Sync with Gentoo It's from Gentoo commit ce3160cb91b355648210cf776ab119d394204994. --- .../sys-kernel/linux-headers/Manifest | 2 + .../linux-headers/linux-headers-6.6.ebuild | 4 +- .../linux-headers/linux-headers-6.7.ebuild | 50 +++++++++++++++++++ 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-6.7.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest index 0d351f43a5e..d727755cb14 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/Manifest @@ -8,6 +8,7 @@ DIST gentoo-headers-5.15-1.tar.xz 1496 BLAKE2B 9d88ecc517e226580ba43cba1b5cc6223 DIST gentoo-headers-5.4-2.tar.xz 11352 BLAKE2B 0ff989dbfff9070c291efe1a8b925462770e71d0c3faeb2e53581dcce02abe45969ec293a7293b6d843f483927b15f4accc1f24ee4966483164e8f72727cfad8 SHA512 b460e4d00bdd9ec2ecf229f3b2dde7c6468f775399ba6a49fa0533c0688628c7b27d83835c21eab07407fd98c220043cd1b20e37cc4decbd08a3f2fd9cf6c2be DIST gentoo-headers-6.1-0.tar.xz 1172 BLAKE2B 6929760733cd4a89228554b57b1027ccf887b6c7e56b45f71db9926e9328e2f0cf28b2f386eaaaef461cb2e05e4b1c088ffafea308f25254409f56c381bea2ca SHA512 14c3629a3c3aded37655ed277d718ed8398a08e231682f88037f1feb0c0727ef298f5e17626372fe890606930c027a3a59d8266bac746960651a90443beab5c5 DIST gentoo-headers-6.6-1.tar.xz 1172 BLAKE2B 626bb33b42f48bceca2ba6a0a9c0b043a8607bb391d3b541e98d2af42eacfabeda3a5a3d48b7bee1fd0a2a8ad0b6173bde49d3827ea087e501eb0e91d18c4ab7 SHA512 09bcda97d9d17ee3f66ee46d9c00b8ac4fba5b9662fa24e4e2754bd9e4e7b3f097e5f2d52281eeb7a671dfe303aabe15c8fd66f117fddf29fb094e28d8c603b3 +DIST gentoo-headers-6.7-1.tar.xz 1164 BLAKE2B 081a5bd0e756c4ca9da4e091c1436e2145bc2bbed8c9ce3e632ded7d66daa109f6daad86e38f2209a8e124397622991a709804e94566f03603cea2f6212445a1 SHA512 f3d1d2f7b3929b6084278dc600262fb7972fddcd0f90e7786d7141e5ea6c44f1890e2981f3bdf50125a028c8377379f52b900256f169b37a089fcc5d2fa529d8 DIST gentoo-headers-base-3.18.tar.xz 3776668 BLAKE2B 837a675ecf05ec270549d0ba6b9dcb98fb0e40f22007ebfa3e430152b7149dcfa29c8bbe38c737add07f75642234f1633c1d5ae0170788e8d4f765faf00bbdbe SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535 DIST gentoo-headers-base-4.14.tar.xz 8017944 BLAKE2B e967a3f26fa002f62af72c165cf960e855f5d84dd105b3f136e5ae24f4cdfc9e5f8b217a83955b325ca4bd6bda0a9d4c4de02d8d79fd4aa72191bc63db96183a SHA512 2a4e83a9ee36ffa85b59ebac1e12f4f1c572825b767928a42c4748d924d04f0536bab4d9375ca68c11ad867c226f386c40c7c4d0158d1ab00c838eb5b2f9f21a DIST gentoo-headers-base-4.19.tar.xz 7956220 BLAKE2B 5b6868188b6cb505556b8f307972be6b27c0201e8287f6a2c4d0ac8bf16cfe048cb05afacf879731ba81de5e2a8c5afc4adad007e00b12efb8b2a158a666f4dd SHA512 ef0f159cb31651bf8e00c31d8ac807e64413c7bf88807e1ab4779524db10eec4726b65af0fad034a0cb2e000cd61a6008bcc174828061ffaf633c170dd09645c @@ -18,3 +19,4 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35 +DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-6.6.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-6.6.ebuild index cc9b5489c81..17d8fd815b5 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-6.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-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 @@ -17,7 +17,7 @@ SRC_URI=" " S="${WORKDIR}/linux-${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" BDEPEND=" app-arch/xz-utils diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-6.7.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-6.7.ebuild new file mode 100644 index 00000000000..e16c15ac590 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-6.7.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ETYPE="headers" +H_SUPPORTEDARCH="alpha amd64 arc arm arm64 csky hexagon hppa loong m68k microblaze mips nios2 openrisc ppc ppc64 riscv s390 sh sparc x86 xtensa" +inherit kernel-2 +detect_version + +PATCH_PV=${PV} # to ease testing new versions against not existing patches +PATCH_VER="1" +PATCH_DEV="sam" +SRC_URI=" + ${KERNEL_URI} + ${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz} +" +S="${WORKDIR}/linux-${PV}" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa -ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +BDEPEND=" + app-arch/xz-utils + dev-lang/perl +" + +[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} ) + +src_unpack() { + # Avoid kernel-2_src_unpack + default +} + +src_prepare() { + # TODO: May need forward porting to newer versions + use elibc_musl && PATCHES+=( + "${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch + ) + + # Avoid kernel-2_src_prepare + default +} + +src_install() { + kernel-2_src_install + + find "${ED}" \( -name '.install' -o -name '*.cmd' \) -delete || die + # Delete empty directories + find "${ED}" -empty -type d -delete || die +} From b9cc7bf6e2b48af9612946b9218d0f95b6e09bfd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:55 +0000 Subject: [PATCH 086/127] sys-libs/binutils-libs: Sync with Gentoo It's from Gentoo commit 8493d856a4537767bce88402b71bae2e89740837. --- .../sys-libs/binutils-libs/Manifest | 1 + .../binutils-libs-2.41-r3.ebuild | 2 +- .../binutils-libs-2.41-r5.ebuild | 166 ++++++++++++++++++ 3 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r5.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/Manifest index fd16b545735..87efa135bc4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/Manifest @@ -15,4 +15,5 @@ DIST binutils-2.40-patches-6.tar.xz 299212 BLAKE2B 3a68a924e9747fdd0486327a5bd24 DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925 DIST binutils-2.41-patches-2.tar.xz 20288 BLAKE2B 1cc29e868ded12845856c5da567f23798fe3017961ce079325c20f456b837cab11560d896065f70953b0bab55bf565288541579e9c3e0991a87083edf2a85fa5 SHA512 75619a5e17b75d72f9bdd9d5e5ee3b566c94de64410bfc074f1a9bfb9f08db9ecf8be216efa1053263468aa8ec99b8aa3b2b095e63cb95f3566500ac0c3b9432 DIST binutils-2.41-patches-4.tar.xz 86580 BLAKE2B 32748fd0e81a7e323e9f56f0864f2a1755b8fe1b09c777075e31a292297e365c47b47003f8f1bffacc254ed8dccf1c655b7b13f61da751c9db090e56d819fbb2 SHA512 90dcf38c1ed2ae015eb9de922e946e2be62355bd51276075e7f1c0a06cd52408057c4151a2d2d4c07e33c1d2c5998001cba5509819e5722cce45f70172465ea5 +DIST binutils-2.41-patches-5.tar.xz 95176 BLAKE2B bbc94b3c7d70653a1056afe57a120b6eac9f0c8f51f05e95a1b5f80f2b7ef35e6355d740b49bc1ec2f3a13a838d5210ff4a205aa2bde5a72bc55c12100bce726 SHA512 ad293f97116f71322993f381c1af69fad1719a159f127ff16ddeca62f9b9b62aaf141abfa661985a61e9be7ae0639772148e69293a97364eebbf49182babb691 DIST binutils-2.41.tar.xz 26765692 BLAKE2B 3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75 SHA512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374 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 3b6503c361c..d69ba7f43dc 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 @@ -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=" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r5.ebuild new file mode 100644 index 00000000000..376e1cd8e84 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r5.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PATCH_VER=5 +PATCH_DEV=dilfridge + +inherit libtool toolchain-funcs multilib-minimal + +MY_PN="binutils" +MY_P="${MY_PN}-${PV}" +PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} +PATCH_DEV=${PATCH_DEV:-dilfridge} + +DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages" +HOMEPAGE="https://sourceware.org/binutils/" +SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_P}.tar.xz + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" + +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 ~arm64-macos ~x64-macos ~x64-solaris" +RESTRICT="!test? ( test )" + +BDEPEND=" + nls? ( sys-devel/gettext ) + test? ( dev-util/dejagnu ) +" +DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" +# Need a newer binutils-config that'll reset include/lib symlinks for us. +RDEPEND="${DEPEND} + >=sys-devel/binutils-config-5 +" + +S="${WORKDIR}/${MY_P%_p?}" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/bfd.h +) + +src_prepare() { + if [[ -n ${PATCH_VER} ]] ; then + einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}" + eapply "${WORKDIR}/patch"/*.patch + fi + + # Fix cross-compile relinking issue, bug #626402 + elibtoolize + + if [[ ${CHOST} == *-darwin* ]] ; then + # somehow libtool/configure is messed up and (custom patch at + # upstream?) and misdetects (basically assumes) nm can be called + # with -B arg -- can't run eautoreconf (fails), so patch up + # manually, this would break any target that needs -B to nm + sed -i -e 's/lt_cv_path_NM="$tmp_nm -B"/lt_cv_path_NM="$tmp_nm"/' \ + libctf/configure || die + fi + + # 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. + export MAKEOPTS="--output-sync=line ${MAKEOPTS}" + + default +} + +pkgversion() { + printf "Gentoo ${PVR}" + [[ -n ${PATCHVER} ]] && printf " p${PATCHVER}" +} + +multilib_src_configure() { + local myconf=( + # 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 + # Newer versions (>=2.24) make this an explicit option. #497268 + --enable-install-libiberty + --disable-werror + --with-bugurl="https://bugs.gentoo.org/" + --with-pkgversion="$(pkgversion)" + $(use_enable static-libs static) + # The binutils eclass enables this flag for all bi-arch builds, + # but other tools often don't care about that support. Put it + # beyond a flag if people really want it, but otherwise leave + # it disabled as it can slow things down on 32bit arches. #438522 + $(use_enable 64-bit-bfd) + # This only disables building in the zlib subdir. + # For binutils itself, it'll use the system version. #591516 + --without-zlib + --with-system-zlib + # We only care about the libs, so disable programs. #528088 + --disable-{binutils,etc,ld,gas,gold,gprof,gprofng} + # Disable modules that are in a combined binutils/gdb tree. #490566 + --disable-{gdb,libdecnumber,readline,sim} + # Strip out broken static link flags. + # https://gcc.gnu.org/PR56750 + --without-stage1-ldflags + # We pull in all USE-flags that change ABI in an incompatible + # way. #666100 + # USE=multitarget change size of global arrays + # USE=64-bit-bfd changes data structures of exported API + --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def) + + # avoid automagic dependency on (currently prefix) systems + # systems with debuginfod library, bug #754753 + --without-debuginfod + + # Revisit if it's useful, we do have binutils[zstd] though + --without-zstd + + # 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) + ) + + # mips can't do hash-style=gnu ... + if [[ $(tc-arch) != mips ]] ; then + myconf+=( --enable-default-hash-style=gnu ) + fi + + use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd ) + + use nls \ + && myconf+=( --without-included-gettext ) \ + || myconf+=( --disable-nls ) + + if [[ ${CHOST} == *-darwin* ]] && use nls ; then + # fix underlinking in opcodes + sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \ + "${S}"/opcodes/Makefile.in || die + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" + + # Prevent makeinfo from running as we don't build docs here. + # bug #622652 + sed -i \ + -e '/^MAKEINFO/s:=.*:= true:' \ + Makefile || die +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + # Provided by dev-debug/gdb instead + rm "${ED}"/usr/share/info/sframe-spec.info || die + + # Provide libiberty.h directly. + dosym libiberty/libiberty.h /usr/include/libiberty.h +} + +multilib_src_install_all() { + use static-libs || find "${ED}"/usr -name '*.la' -delete +} From d88a390a1e696747e330879978713b21e8ad681f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:59 +0000 Subject: [PATCH 087/127] sys-libs/libseccomp: Sync with Gentoo It's from Gentoo commit 07b4e2d16a56970aa2081577fd96d6a6dde6f71f. --- .../sys-libs/libseccomp/libseccomp-2.5.4-r1.ebuild | 4 ++-- .../sys-libs/libseccomp/libseccomp-2.5.4.ebuild | 4 ++-- .../sys-libs/libseccomp/libseccomp-2.5.5.ebuild | 6 +++--- .../sys-libs/libseccomp/libseccomp-9999.ebuild | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4-r1.ebuild index 2d5efdbb964..0337809eb98 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4-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=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 multilib-minimal diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4.ebuild index f580e66c807..d8366c83493 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.4.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=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 multilib-minimal diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.5.ebuild index 51018de4ccd..a7ba7a3f25c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-2.5.5.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=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 multilib-minimal @@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then else SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/${PN}-2.5.5-loongarch64-20231204.patch.xz )" - KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="-* amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux" fi LICENSE="LGPL-2.1" diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild index 8f4603d67b3..5cf5976ca5f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libseccomp/libseccomp-9999.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=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 multilib-minimal From 828fa0df45c0dc61c791409555d82205e66570d4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:59 +0000 Subject: [PATCH 088/127] sys-libs/libselinux: Sync with Gentoo It's from Gentoo commit ad05a1d7e765f6c4e4cc3e196dbade6753eb75a8. --- .../sys-libs/libselinux/Manifest | 1 + .../sys-libs/libselinux/libselinux-3.6.ebuild | 158 ++++++++++++++++++ .../libselinux/libselinux-9999.ebuild | 8 +- 3 files changed, 163 insertions(+), 4 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.6.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/Manifest index c6efbb8e1ed..3dedaef745f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/Manifest @@ -1 +1,2 @@ DIST libselinux-3.5.tar.gz 211453 BLAKE2B f7f3067c4bb0448e18bd7085135f11d94ae99728949480a655c0f660486817beb5829d8a43dff7bce286ccd50705b0c657bde85970f01c794e01fb707f469d8b SHA512 4e13261a5821018a5f3cdce676f180bb62e5bc225981ca8a498ece0d1c88d9ba8eaa0ce4099dd0849309a8a7c5a9a0953df841a9922f2c284e5a109e5d937ba7 +DIST libselinux-3.6.tar.gz 194210 BLAKE2B 615198d47ecfb4b6274810cbe32cce5953dd44d1d04e8ce244213dc4ddbd61cde3515f4650046b805cf98f341aba718af8d7a9e1d66773172031ac19599f6032 SHA512 182dcdf3510083ff4b9376a4a6d6a7b33905ac3c5e974c188bf3965686c54b663162c543ecf15eab75102f3c91a2502d33d0f1104dec01dd9b14737ef3f2b544 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.6.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.6.ebuild new file mode 100644 index 00000000000..941b189dd85 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-3.6.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_COMPAT=( python3_{10..12} ) +USE_RUBY="ruby31 ruby32 ruby33" + +# No, I am not calling ruby-ng +inherit python-r1 toolchain-funcs multilib-minimal + +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux userland library" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${P}/${PN}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="public-domain" +SLOT="0" +IUSE="python ruby static-libs ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] + >=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] + python? ( ${PYTHON_DEPS} ) + ruby? ( + ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) + ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) + ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) + ) + elibc_musl? ( sys-libs/fts-standalone )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + python? ( + >=dev-lang/swig-2.0.9 + dev-python/pip[${PYTHON_USEDEP}] +) + ruby? ( >=dev-lang/swig-2.0.9 )" + +src_prepare() { + eapply_user + + multilib_copy_sources +} + +multilib_src_compile() { + tc-export AR CC PKG_CONFIG RANLIB + + local -x CFLAGS="${CFLAGS} -fno-semantic-interposition" + + emake \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" \ + LDFLAGS="-fPIC ${LDFLAGS} -pthread" \ + USE_PCRE2=y \ + FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ + all + + if multilib_is_native_abi && use python; then + building() { + emake \ + LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" \ + USE_PCRE2=y \ + FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ + pywrap + } + python_foreach_impl building + fi + + if multilib_is_native_abi && use ruby; then + building() { + einfo "Calling rubywrap for ${1}" + # Clean up .lo file to force rebuild + rm -f src/selinuxswig_ruby_wrap.lo || die + emake \ + RUBY=${1} \ + LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" \ + USE_PCRE2=y \ + FTS_LDLIBS="$(usex elibc_musl '-lfts' '')" \ + rubywrap + } + for RUBYTARGET in ${USE_RUBY}; do + use ruby_targets_${RUBYTARGET} || continue + + building ${RUBYTARGET} + done + fi +} + +multilib_src_install() { + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" \ + USE_PCRE2=y \ + install + + if multilib_is_native_abi && use python; then + installation() { + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" \ + USE_PCRE2=y \ + install-pywrap + python_optimize # bug 531638 + } + python_foreach_impl installation + fi + + if multilib_is_native_abi && use ruby; then + installation() { + einfo "Calling install-rubywrap for ${1}" + # Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions + rm src/selinuxswig_ruby_wrap.lo + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" \ + RUBY=${1} \ + USE_PCRE2=y \ + install-rubywrap + } + for RUBYTARGET in ${USE_RUBY}; do + use ruby_targets_${RUBYTARGET} || continue + + installation ${RUBYTARGET} + done + fi + + use static-libs || rm "${D}"/usr/lib*/*.a || die +} + +pkg_postinst() { + # Fix bug 473502 + for POLTYPE in ${POLICY_TYPES}; + do + mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die + touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die + # Fix bug 516608 + for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do + if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then + sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \ + || die "Failed to recompile contexts" + fi + done + done +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-9999.ebuild index f5475a7744c..941b189dd85 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libselinux/libselinux-9999.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="7" PYTHON_COMPAT=( python3_{10..12} ) -USE_RUBY="ruby30 ruby31 ruby32" +USE_RUBY="ruby31 ruby32 ruby33" # No, I am not calling ruby-ng inherit python-r1 toolchain-funcs multilib-minimal @@ -26,16 +26,16 @@ fi LICENSE="public-domain" SLOT="0" -IUSE="python ruby static-libs ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32" +IUSE="python ruby static-libs ruby_targets_ruby31 ruby_targets_ruby32 ruby_targets_ruby33" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] >=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}] python? ( ${PYTHON_DEPS} ) ruby? ( - ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) + ruby_targets_ruby33? ( dev-lang/ruby:3.3 ) ) elibc_musl? ( sys-libs/fts-standalone )" DEPEND="${RDEPEND}" From a257a0e0c510427b2a50eb7228090303c9b86f49 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:15:59 +0000 Subject: [PATCH 089/127] sys-libs/libsepol: Sync with Gentoo It's from Gentoo commit f9c83ecfad63b6c0c513399376b52acb319c43fb. --- .../portage-stable/sys-libs/libsepol/Manifest | 1 + .../sys-libs/libsepol/libsepol-3.6.ebuild | 50 +++++++++++++++++++ .../sys-libs/libsepol/libsepol-9999.ebuild | 2 +- 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-3.6.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/Manifest index cef9954d314..aeb3b703de0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/Manifest @@ -1 +1,2 @@ DIST libsepol-3.5.tar.gz 497522 BLAKE2B dad2d346605be53fe41aef69e2e4bd4f1ce68a15f0b9307deb6b66bbe7bf06a9ee6be580e60d2f19aebbc8ee5041ac8a7b831b51342ba7c7089e1f1a447e7691 SHA512 66f45a9f4951589855961955db686b006b4c0cddead6ac49ad238a0e4a34775905bd10fb8cf0c0ff2ab64f9b7d8366b97fcd5b19c382dec39971a2835cc765c8 +DIST libsepol-3.6.tar.gz 509100 BLAKE2B c073c9437004df0c723125971ed26354dc6b8a78b069c593977062527342061303bcc48917fcd9623d17998748254f63408b233173f3c62e92ee0ea2f3c4a430 SHA512 35a42d2749fc4f71bc6b7488380714f56975564007128566f1c73e5c50bf81c17535b2cfda4583aacb4870aa2cd5885321c01523e415bda8b3326bfefb13d58e diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-3.6.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-3.6.ebuild new file mode 100644 index 00000000000..17fe4da8945 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-3.6.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit toolchain-funcs multilib-minimal + +MY_PV="${PV//_/-}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="SELinux binary policy representation library" +HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git" + S="${WORKDIR}/${P}/${PN}" +else + SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="GPL-2" +SLOT="0/2" + +# tests are not meant to be run outside of the full SELinux userland repo +RESTRICT="test" + +src_prepare() { + eapply_user + multilib_copy_sources +} + +multilib_src_compile() { + tc-export CC AR RANLIB + + local -x CFLAGS="${CFLAGS} -fno-semantic-interposition" + + emake \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" +} + +multilib_src_install() { + emake DESTDIR="${D}" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="/$(get_libdir)" \ + install +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-9999.ebuild index f682823e464..17fe4da8945 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-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" From 08e06679270b654833ef382d8b0fb045d42e4ea8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:16:00 +0000 Subject: [PATCH 090/127] sys-libs/libunwind: Sync with Gentoo It's from Gentoo commit a20318e93bb3e42a11c173e7de61e33f98f036c3. --- ...ibunwind-1.8.0_rc1-configure-bashism.patch | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libunwind/files/libunwind-1.8.0_rc1-configure-bashism.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/files/libunwind-1.8.0_rc1-configure-bashism.patch b/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/files/libunwind-1.8.0_rc1-configure-bashism.patch deleted file mode 100644 index b4e36d71efd..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libunwind/files/libunwind-1.8.0_rc1-configure-bashism.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/libunwind/libunwind/pull/675 - -From ac81d339a7999e054deda2c0041c01424df3eadd Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sat, 2 Dec 2023 21:18:44 +0000 -Subject: [PATCH] configure.ac: fix bashism in LDFLAGS append - -'+=' is not required for POSIX shells and may not work with e.g. /bin/sh -provided by dash. Just expand it instead. ---- a/configure.ac -+++ b/configure.ac -@@ -54,7 +54,7 @@ dnl Checks for libraries. - AC_MSG_NOTICE([--- Checking for libraries ---]) - save_LDFLAGS="$LDFLAGS" - save_LIBS="$LIBS" --LDFLAGS+=" -nostdlib" -+LDFLAGS="${LDFLAGS} -nostdlib" - AC_SEARCH_LIBS([_Unwind_Resume], [gcc_s gcc], - [AS_IF([test "$ac_cv_search__Unwind_Resume" != "none required"], - [AC_SUBST([LIBCRTS], ["$ac_cv_search__Unwind_Resume"])])], - From 8244a6f706170bb14d59baffd7d7bc902137ee30 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:16:04 +0000 Subject: [PATCH 091/127] sys-libs/zlib: Sync with Gentoo It's from Gentoo commit 8c5c6c5165a5b5886ac6233e0d11ce9232118ff1. --- .../portage-stable/sys-libs/zlib/Manifest | 2 + ...RWX-segment-warnings-on-sparc-system.patch | 3 + ...RWX-segment-warnings-on-sparc-system.patch | 17 ++ ...configure-fix-AR-RANLIB-NM-detection.patch | 79 ++++++++ .../zlib-1.3.1-use-LDFLAGS-in-configure.patch | 74 ++++++++ .../sys-libs/zlib/zlib-1.3.1.ebuild | 171 ++++++++++++++++++ 6 files changed, 346 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-RANLIB-NM-detection.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-use-LDFLAGS-in-configure.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.3.1.ebuild 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 95af1a3ddd5..74c4bb0f822 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,2 +1,4 @@ +DIST zlib-1.3.1.tar.xz 1305740 BLAKE2B 42d109223801a493de6d52e7343403d7fc3234a6ca816425fe41ac9c18019b01b93841acd28a235e99f2256a6a17f93624e96b2ddb58d588c8190a6bedb82910 SHA512 1e8e70b362d64a233591906a1f50b59001db04ca14aaffad522198b04680be501736e7d536b4191e2f99767e7001ca486cd802362cca2be05d5d409b83ea732d +DIST zlib-1.3.1.tar.xz.asc 235 BLAKE2B b135336ef55a0c4b8e219e760bbe04bad082c405246ce51a2b373c3dfba0b05cb1e6f539363972f4cabd8290be1db1fdb2fc47fb562c6c612a08d9393065f75b SHA512 d181e9772a8139b3b2f3f42b994a65a966101db35eb46b5c84021c5eb0cc3b4511eb5e9172c509483bd9f7015794b15cfca78ed0959bd91e8216dc12c1c6e668 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/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch index 48d58acaaf7..b5a1b4de2c4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch +++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.13-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch @@ -1,3 +1,6 @@ +https://bugs.gentoo.org/879883 +https://github.com/madler/zlib/issues/751 + From 2ad2713e6cb9166dcede9a020f6913b8189ff0c6 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 23 Nov 2022 04:17:16 +0000 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch new file mode 100644 index 00000000000..5bfb8006c4b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-Revert-Turn-off-RWX-segment-warnings-on-sparc-system.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/879883 +https://github.com/madler/zlib/issues/751 + +This breaks building on sparc with older binutils. +--- a/configure ++++ b/configure +@@ -234,10 +234,6 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then + fi + case "$uname" in + Linux* | linux* | *-linux* | GNU | GNU/* | solaris*) +- case "$mname" in +- *sparc*) +- LDFLAGS="${LDFLAGS} -Wl,--no-warn-rwx-segments" ;; +- esac + LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;; + *BSD | *bsd* | DragonFly) + LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-RANLIB-NM-detection.patch b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-RANLIB-NM-detection.patch new file mode 100644 index 00000000000..e1e5cf4b919 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-configure-fix-AR-RANLIB-NM-detection.patch @@ -0,0 +1,79 @@ +From 7d7c0b3ede7d5c30e3cdc7c6fbb33c9d4499516a Mon Sep 17 00:00:00 2001 +From: Adrian Ratiu +Date: Mon, 17 Jan 2022 10:49:58 +0200 +Subject: [PATCH] configure: fix AR/RANLIB/NM detection + +Taken from zlib-devel ML: +https://madler.net/pipermail/zlib-devel_madler.net/2022-January/003322.html + +Bug: https://bugs.gentoo.org/831628 + +Scenarios where ${CROSS_PREFIX}ar & co are set but not desired +are possible, for example in ChromiumOS we use the GNU binutils +tools & GCC to build glibc but LLVM/Clang is used for the rest +of the system. + +This allows $AR/$RANLIB/$NM to override default CROSS_PREFIX +tools so they can be set to llvm-ar/ranlib/nm. + +Suggested-by: Manoj Gupta +Signed-off-by: Adrian Ratiu +--- + configure | 38 ++++++++++++++++++++++---------------- + 1 file changed, 22 insertions(+), 16 deletions(-) + +diff --git a/configure b/configure +index c55098a..2535e04 100755 +--- a/configure ++++ b/configure +@@ -48,25 +48,31 @@ VER3=`echo ${VER}|sed -n -e 's/\([0-9]\{1,\}\(\\.[0-9]\{1,\}\)\{1,2\}\).*/\1/p'` + VER1=`echo ${VER}|sed -n -e 's/\([0-9]\{1,\}\)\\..*/\1/p'` + + # establish commands for library building +-if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then +- AR=${AR-"${CROSS_PREFIX}ar"} +- test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log +-else +- AR=${AR-"ar"} +- test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log ++if [ -z "$AR" ]; then ++ if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then ++ AR=${AR-"${CROSS_PREFIX}ar"} ++ test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log ++ else ++ AR="ar" ++ test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log ++ fi + fi + ARFLAGS=${ARFLAGS-"rc"} +-if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then +- RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"} +- test -n "${CROSS_PREFIX}" && echo Using ${RANLIB} | tee -a configure.log +-else +- RANLIB=${RANLIB-"ranlib"} ++if [ -z "$RANLIB" ]; then ++ if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then ++ RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"} ++ test -n "${CROSS_PREFIX}" && echo Using ${RANLIB} | tee -a configure.log ++ else ++ RANLIB="ranlib" ++ fi + fi +-if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then +- NM=${NM-"${CROSS_PREFIX}nm"} +- test -n "${CROSS_PREFIX}" && echo Using ${NM} | tee -a configure.log +-else +- NM=${NM-"nm"} ++if [ -z "$NM" ]; then ++ if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then ++ NM=${NM-"${CROSS_PREFIX}nm"} ++ test -n "${CROSS_PREFIX}" && echo Using ${NM} | tee -a configure.log ++ else ++ NM="nm" ++ fi + fi + + # set defaults before processing command line options +-- +2.43.0 + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-use-LDFLAGS-in-configure.patch b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-use-LDFLAGS-in-configure.patch new file mode 100644 index 00000000000..2b1d70f7b6f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.3.1-use-LDFLAGS-in-configure.patch @@ -0,0 +1,74 @@ +https://github.com/madler/zlib/pull/599 + +Rebased version of: + +From 37c9730ba474d274f4cc6a974943eef95087b9f6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 8 Mar 2022 22:38:47 -0800 +Subject: [PATCH] configure: Pass LDFLAGS to link tests + +LDFLAGS can contain critical flags without which linking wont succeed +therefore ensure that all configure tests involving link time checks are +using LDFLAGS on compiler commandline along with CFLAGS to ensure the +tests perform correctly. Without this some tests may fail resulting in +wrong confgure result, ending in miscompiling the package + +Signed-off-by: Khem Raj k +--- a/configure ++++ b/configure +@@ -448,8 +448,8 @@ EOF + if test $shared -eq 1; then + echo Checking for shared library support... | tee -a configure.log + # we must test in two steps (cc then ld), required at least on SunOS 4.x +- if try $CC -c $SFLAGS $test.c && +- try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then ++ if try $CC -c $SFLAGS $LDFLAGS $test.c && ++ try $LDSHARED $SFLAGS $LDFLAGS -o $test$shared_ext $test.o; then + echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log + elif test -z "$old_cc" -a -z "$old_cflags"; then + echo No shared library support. | tee -a configure.log +@@ -511,7 +511,7 @@ int main(void) { + } + EOF + fi +- if try $CC $CFLAGS -o $test $test.c; then ++ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then + sizet=`./$test` + echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log + CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}" +@@ -545,7 +545,7 @@ int main(void) { + return 0; + } + EOF +- if try $CC $CFLAGS -o $test $test.c; then ++ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then + echo "Checking for fseeko... Yes." | tee -a configure.log + else + CFLAGS="${CFLAGS} -DNO_FSEEKO" +@@ -562,7 +562,7 @@ cat > $test.c < + int main() { return strlen(strerror(errno)); } + EOF +-if try $CC $CFLAGS -o $test $test.c; then ++if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then + echo "Checking for strerror... Yes." | tee -a configure.log + else + CFLAGS="${CFLAGS} -DNO_STRERROR" +@@ -669,7 +669,7 @@ int main() + return (mytest("Hello%d\n", 1)); + } + EOF +- if try $CC $CFLAGS -o $test $test.c; then ++ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then + echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log + + echo >> configure.log +@@ -759,7 +759,7 @@ int main() + } + EOF + +- if try $CC $CFLAGS -o $test $test.c; then ++ if try $CC $CFLAGS $LDFLAGS -o $test $test.c; then + echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log + + echo >> configure.log diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.3.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.3.1.ebuild new file mode 100644 index 00000000000..f12a76540f6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.3.1.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2024 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 edo multilib-minimal flag-o-matic 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 + https://github.com/madler/zlib/releases/download/v${PV}/${P}.tar.xz + verify-sig? ( + https://zlib.net/${P}.tar.xz.asc + https://github.com/madler/zlib/releases/download/v${PV}/${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.3.1-configure-fix-AR-RANLIB-NM-detection.patch + + # Respect LDFLAGS during configure tests. Pending upstream + "${FILESDIR}"/${PN}-1.3.1-use-LDFLAGS-in-configure.patch + + # Fix building on sparc with older binutils, we pass it in ebuild instead + "${FILESDIR}"/${PN}-1.3.1-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 +} + +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) + + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + 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 + edo "${S}"/configure "${myconf[@]}" + + ;; + 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 +} + +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 + + if use minizip ; then + emake -C contrib/minizip install DESTDIR="${D}" + + # 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 +} From 31f6e517609b9cfc05191dcd8bf6e29b5da135b7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:16:05 +0000 Subject: [PATCH 092/127] sys-process/psmisc: Sync with Gentoo It's from Gentoo commit 221159b1ca716e208abcd9fc2e3d7efad0db9446. --- .../portage-stable/sys-process/psmisc/psmisc-23.4-r1.ebuild | 4 ++-- .../portage-stable/sys-process/psmisc/psmisc-23.5.ebuild | 4 ++-- .../portage-stable/sys-process/psmisc/psmisc-23.6.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-process/psmisc/psmisc-23.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-process/psmisc/psmisc-23.4-r1.ebuild index d878cf0a930..f0470765d3b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-process/psmisc/psmisc-23.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-process/psmisc/psmisc-23.4-r1.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 @@ -23,7 +23,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - >=sys-devel/libtool-2.2.6b + >=dev-build/libtool-2.2.6b nls? ( sys-devel/gettext ) test? ( dev-util/dejagnu ) " diff --git a/sdk_container/src/third_party/portage-stable/sys-process/psmisc/psmisc-23.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-process/psmisc/psmisc-23.5.ebuild index 221b3631be6..60a29f395d7 100644 --- a/sdk_container/src/third_party/portage-stable/sys-process/psmisc/psmisc-23.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-process/psmisc/psmisc-23.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=8 @@ -23,7 +23,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - >=sys-devel/libtool-2.2.6b + >=dev-build/libtool-2.2.6b nls? ( sys-devel/gettext ) test? ( dev-util/dejagnu ) " diff --git a/sdk_container/src/third_party/portage-stable/sys-process/psmisc/psmisc-23.6.ebuild b/sdk_container/src/third_party/portage-stable/sys-process/psmisc/psmisc-23.6.ebuild index 688b820b498..3ee8559aab6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-process/psmisc/psmisc-23.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-process/psmisc/psmisc-23.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 @@ -24,7 +24,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - >=sys-devel/libtool-2.2.6b + >=dev-build/libtool-2.2.6b nls? ( sys-devel/gettext ) test? ( dev-util/dejagnu ) " From 5c675ef6af7e41b0a3a34cd12ab2a2eb07d9b592 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:16:18 +0000 Subject: [PATCH 093/127] virtual/libcrypt: Sync with Gentoo It's from Gentoo commit 7d96e2e4a2f5603d836c51bc6f7795537ab9a485. --- .../libcrypt/{libcrypt-1-r1.ebuild => libcrypt-1-r2.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/portage-stable/virtual/libcrypt/{libcrypt-1-r1.ebuild => libcrypt-1-r2.ebuild} (80%) diff --git a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1-r2.ebuild similarity index 80% rename from sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1-r1.ebuild rename to sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1-r2.ebuild index 65fd54f2007..d88ffbf8fc3 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libcrypt/libcrypt-1-r2.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=7 @@ -13,7 +13,7 @@ IUSE="static-libs" RDEPEND=" !prefix-guest? ( - elibc_glibc? ( sys-libs/glibc[crypt(+),static-libs(+)?] ) + elibc_glibc? ( sys-libs/glibc[crypt(-),static-libs(+)?] ) elibc_musl? ( sys-libs/musl ) ) " From 5850f1407a2e4e3437aba7fa39afba41d22897d1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jan 2024 07:16:49 +0000 Subject: [PATCH 094/127] x11-libs/pixman: Sync with Gentoo It's from Gentoo commit 8442ca1e8de788caea61b0dee0d198f0ec6f013b. --- .../portage-stable/x11-libs/pixman/Manifest | 1 + .../x11-libs/pixman/pixman-0.43.2.ebuild | 68 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.43.2.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 0e09fc59d90..564a01f322e 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,2 +1,3 @@ DIST pixman-0.42.2.tar.xz 652984 BLAKE2B 6286a9d064a5a24017fccbb0a6e9f6ef932077c2e33ec043826d4a7a6c707c9111d3de4b806cbcdb47fc2794f1f930d24d078de1ff2912061967db0890540957 SHA512 3476e2676e66756b1af61b1e532cd80c985c191fb7956eb01702b419726cce99e79163b7f287f74f66414680e7396d13c3fee525cd663f12b6ac4877070ff4e8 DIST pixman-0.43.0.tar.xz 638236 BLAKE2B 1a807d4d5598a5fe6077d6bbc7786cba41a698a1f03801cc5367ade8707500ee215a0faf65afe85f9e040b0380f1074c2fdfd31c0805dc41a4e5e34e36416764 SHA512 a90399b8c6aec218abb2f419fb5d6894acf9f4c7acb4fd3893b0b7c805ba47c82ee7efb363be59bb1a15b6997b2dddb7dba062a165503b035e1124fff1b271c9 +DIST pixman-0.43.2.tar.xz 637976 BLAKE2B 82734efb7cede5b1aeff3a865bfa2a81ff3176be50edc10deb1b5541f160b2dfd21303c1eccba53c0df83f471f3489084479a423dc2f818019af97d4b41dad68 SHA512 1a1d21b86b3c6784c4c2606b7069723b4dbb747eac9fce95bca86516787840379ffd49abc42d11e7143e85c32c85496f33c2562c7a910ca6f963599affdc3224 diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.43.2.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.43.2.ebuild new file mode 100644 index 00000000000..64f5bc702b8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.43.2.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 +} From 558b78ffc5beb64ea178ba9773576383b6cb6a60 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 29 Jan 2024 16:35:30 +0100 Subject: [PATCH 095/127] portage-stable: Rename some packages gtk-doc-am and autotools got moved to dev-build category, strace got moved to dev-debug category. --- .../workflows/portage-stable-packages-list | 20 +++++++++---------- .../autoconf-archive/Manifest | 0 .../autoconf-archive-2023.02.20.ebuild | 0 .../autoconf-archive/metadata.xml | 0 .../autoconf-wrapper/Manifest | 0 .../autoconf-wrapper-20221207-r1.ebuild | 0 .../autoconf-wrapper-20231224.ebuild | 0 .../autoconf-wrapper-99999999.ebuild | 0 .../autoconf-wrapper/metadata.xml | 0 .../autoconf/Manifest | 0 .../autoconf/autoconf-2.13-r7.ebuild | 0 .../autoconf/autoconf-2.13-r8.ebuild | 0 .../autoconf/autoconf-2.69-r9.ebuild | 0 .../autoconf/autoconf-2.71-r6.ebuild | 0 .../autoconf/autoconf-2.71-r7.ebuild | 0 .../autoconf/autoconf-2.72-r1.ebuild | 0 .../autoconf/autoconf-9999.ebuild | 0 ....13-Clang-16-fixes-for-various-tests.patch | 0 .../files/autoconf-2.13-K-R-decls-clang.patch | 0 .../files/autoconf-2.13-destdir.patch | 0 .../autoconf/files/autoconf-2.13-gentoo.patch | 0 .../files/autoconf-2.13-perl-5.26.patch | 0 .../files/autoconf-2.13-test-fixes.patch | 0 .../autoconf/files/autoconf-2.61-darwin.patch | 0 .../files/autoconf-2.69-K-R-decls-clang.patch | 0 .../autoconf-2.69-fix-libtool-test.patch | 0 ...onf-2.69-make-tests-bash5-compatible.patch | 0 .../files/autoconf-2.69-perl-5.26-2.patch | 0 .../files/autoconf-2.69-perl-5.26.patch | 0 .../autoconf-2.71-AC_C_BIGENDIAN-lto.patch | 0 .../autoconf-2.71-AC_LANG_CALL_C_cxx.patch | 0 .../autoconf-2.71-K-R-decls-clang-deux.patch | 0 .../files/autoconf-2.71-K-R-decls-clang.patch | 0 .../autoconf/files/autoconf-2.71-bash52.patch | 0 .../files/autoconf-2.71-cxx11typo.patch | 0 .../autoconf/files/autoconf-2.71-darwin.patch | 0 .../files/autoconf-2.71-make-4.4.patch | 0 .../autoconf/files/autoconf-2.71-time.patch | 0 .../autoconf/metadata.xml | 0 .../automake-wrapper/Manifest | 0 .../automake-wrapper-20221207.ebuild | 0 .../automake-wrapper-99999999.ebuild | 0 .../automake-wrapper/metadata.xml | 0 .../automake/Manifest | 0 .../automake/automake-1.11.6-r4.ebuild | 0 .../automake/automake-1.16.5-r1.ebuild | 0 .../automake/automake-9999.ebuild | 0 ...nstall-sh-avoid-low-risk-race-in-tmp.patch | 0 .../files/automake-1.11.6-perl-5.16.patch | 0 ...-1.11.6-perl-escape-curly-bracket-r1.patch | 0 .../automake-1.16.5-apostrophe-in-tests.patch | 0 ...e-1.16.5-fix-instmany-python.sh-test.patch | 0 ....16.5-fix-py-compile-basedir.sh-test.patch | 0 .../automake-1.16.5-parallel-build.patch | 0 .../files/automake-1.16.5-py3-compile.patch | 0 .../automake/metadata.xml | 0 .../gtk-doc-am/Manifest | 0 .../gtk-doc-am/gtk-doc-am-1.33.2.ebuild | 0 .../gtk-doc-am/metadata.xml | 0 .../{sys-devel => dev-build}/libtool/Manifest | 0 .../files/libtool-2.2.10-eprefix.patch | 0 .../libtool-2.2.6a-darwin-module-bundle.patch | 0 ...tool-2.4.3-use-linux-version-in-fbsd.patch | 0 ...btool-2.4.6-darwin-use-linux-version.patch | 0 .../libtool/files/libtool-2.4.6-ppc64le.patch | 0 .../libtool/files/libtool-2.4.6-pthread.patch | 0 .../libtool-2.4.6-pthread_bootstrapped.patch | 0 .../files/libtool-2.4.7-grep-3.8.patch | 0 .../files/libtool-2.4.7-werror-lto.patch | 0 .../libtool/libtool-2.4.7-r1.ebuild | 0 .../libtool/libtool-2.4.7-r2.ebuild | 0 .../libtool/libtool-9999.ebuild | 0 .../libtool/metadata.xml | 0 .../{dev-util => dev-debug}/strace/Manifest | 0 .../strace/files/strace-5.11-static.patch | 0 .../files/strace-6.4-linux-headers-6.5.patch | 0 .../strace/files/strace-6.5-static.patch | 0 .../strace/metadata.xml | 0 .../strace/strace-6.2.ebuild | 0 .../strace/strace-6.3.ebuild | 0 .../strace/strace-6.4-r1.ebuild | 0 .../strace/strace-6.6.ebuild | 0 .../strace/strace-9999.ebuild | 0 83 files changed, 10 insertions(+), 10 deletions(-) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf-archive/Manifest (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf-archive/autoconf-archive-2023.02.20.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf-archive/metadata.xml (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf-wrapper/Manifest (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf-wrapper/autoconf-wrapper-20231224.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf-wrapper/autoconf-wrapper-99999999.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf-wrapper/metadata.xml (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/Manifest (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/autoconf-2.13-r7.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/autoconf-2.13-r8.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/autoconf-2.69-r9.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/autoconf-2.71-r6.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/autoconf-2.71-r7.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/autoconf-2.72-r1.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/autoconf-9999.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.13-K-R-decls-clang.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.13-destdir.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.13-gentoo.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.13-perl-5.26.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.13-test-fixes.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.61-darwin.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.69-K-R-decls-clang.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.69-fix-libtool-test.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.69-make-tests-bash5-compatible.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.69-perl-5.26-2.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.69-perl-5.26.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.71-AC_C_BIGENDIAN-lto.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.71-K-R-decls-clang-deux.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.71-K-R-decls-clang.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.71-bash52.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.71-cxx11typo.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.71-darwin.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.71-make-4.4.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/files/autoconf-2.71-time.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/autoconf/metadata.xml (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake-wrapper/Manifest (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake-wrapper/automake-wrapper-20221207.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake-wrapper/automake-wrapper-99999999.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake-wrapper/metadata.xml (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake/Manifest (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake/automake-1.11.6-r4.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake/automake-1.16.5-r1.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake/automake-9999.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake/files/automake-1.11.6-perl-5.16.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake/files/automake-1.16.5-apostrophe-in-tests.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake/files/automake-1.16.5-fix-instmany-python.sh-test.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake/files/automake-1.16.5-parallel-build.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake/files/automake-1.16.5-py3-compile.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/automake/metadata.xml (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/gtk-doc-am/Manifest (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/gtk-doc-am/gtk-doc-am-1.33.2.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-build}/gtk-doc-am/metadata.xml (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/libtool/Manifest (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/libtool/files/libtool-2.2.10-eprefix.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/libtool/files/libtool-2.4.6-ppc64le.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/libtool/files/libtool-2.4.6-pthread.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/libtool/files/libtool-2.4.7-grep-3.8.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/libtool/files/libtool-2.4.7-werror-lto.patch (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/libtool/libtool-2.4.7-r1.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/libtool/libtool-2.4.7-r2.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/libtool/libtool-9999.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{sys-devel => dev-build}/libtool/metadata.xml (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-debug}/strace/Manifest (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-debug}/strace/files/strace-5.11-static.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-debug}/strace/files/strace-6.4-linux-headers-6.5.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-debug}/strace/files/strace-6.5-static.patch (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-debug}/strace/metadata.xml (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-debug}/strace/strace-6.2.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-debug}/strace/strace-6.3.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-debug}/strace/strace-6.4-r1.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-debug}/strace/strace-6.6.ebuild (100%) rename sdk_container/src/third_party/portage-stable/{dev-util => dev-debug}/strace/strace-9999.ebuild (100%) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 06b4de89b59..33195cfa9e7 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -105,8 +105,8 @@ app-containers/runc app-crypt/adcli app-crypt/argon2 -app-crypt/efitools app-crypt/ccid +app-crypt/efitools app-crypt/libb2 app-crypt/libmd app-crypt/mhash @@ -159,7 +159,14 @@ app-text/xmlto app-vim/gentoo-syntax +dev-build/autoconf +dev-build/autoconf-archive +dev-build/autoconf-wrapper +dev-build/automake +dev-build/automake-wrapper dev-build/cmake +dev-build/gtk-doc-am +dev-build/libtool dev-build/make dev-build/meson dev-build/meson-format-array @@ -170,6 +177,7 @@ dev-cpp/gtest dev-db/sqlite dev-debug/gdb +dev-debug/strace dev-lang/duktape dev-lang/go-bootstrap @@ -207,10 +215,10 @@ dev-libs/liblinear dev-libs/libltdl dev-libs/libmspack dev-libs/libnl +dev-libs/libp11 dev-libs/libpcre dev-libs/libpcre2 dev-libs/libpipeline -dev-libs/libp11 dev-libs/libsodium dev-libs/libtasn1 dev-libs/libunistring @@ -284,14 +292,12 @@ dev-util/desktop-file-utils dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf -dev-util/gtk-doc-am dev-util/pahole dev-util/patchelf dev-util/patchutils dev-util/perf dev-util/pkgconf dev-util/re2c -dev-util/strace dev-vcs/git dev-vcs/repo @@ -500,11 +506,6 @@ sys-boot/efibootmgr # # sys-boot/gnu-efi -sys-devel/autoconf -sys-devel/autoconf-archive -sys-devel/autoconf-wrapper -sys-devel/automake -sys-devel/automake-wrapper sys-devel/bc sys-devel/binutils sys-devel/binutils-config @@ -515,7 +516,6 @@ sys-devel/gcc sys-devel/gcc-config sys-devel/gettext sys-devel/gnuconfig -sys-devel/libtool sys-devel/m4 sys-devel/patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-archive/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf-archive/Manifest diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/autoconf-archive-2023.02.20.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-archive/autoconf-archive-2023.02.20.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/autoconf-archive-2023.02.20.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf-archive/autoconf-archive-2023.02.20.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-archive/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf-archive/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf-archive/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/Manifest diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20231224.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-20231224.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20231224.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-20231224.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-99999999.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-99999999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/Manifest diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r7.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r7.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r7.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r7.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r8.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r8.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.13-r8.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r8.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r9.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.69-r9.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r9.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.69-r9.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r6.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r6.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r6.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r6.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r7.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r7.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r7.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r7.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.72-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.72-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.72-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.72-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-9999.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-9999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-Clang-16-fixes-for-various-tests.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-K-R-decls-clang.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-K-R-decls-clang.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-K-R-decls-clang.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-K-R-decls-clang.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-destdir.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-destdir.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-destdir.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-destdir.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-gentoo.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-gentoo.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-gentoo.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-gentoo.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-perl-5.26.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-perl-5.26.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-perl-5.26.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-perl-5.26.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-test-fixes.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-test-fixes.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-test-fixes.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-test-fixes.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.61-darwin.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.61-darwin.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.61-darwin.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.61-darwin.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.69-K-R-decls-clang.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.69-K-R-decls-clang.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.69-K-R-decls-clang.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.69-K-R-decls-clang.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.69-fix-libtool-test.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.69-fix-libtool-test.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.69-fix-libtool-test.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.69-fix-libtool-test.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.69-make-tests-bash5-compatible.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.69-make-tests-bash5-compatible.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.69-make-tests-bash5-compatible.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.69-make-tests-bash5-compatible.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.69-perl-5.26-2.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.69-perl-5.26-2.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.69-perl-5.26-2.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.69-perl-5.26-2.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.69-perl-5.26.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.69-perl-5.26.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.69-perl-5.26.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.69-perl-5.26.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-AC_C_BIGENDIAN-lto.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-AC_C_BIGENDIAN-lto.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-AC_C_BIGENDIAN-lto.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-AC_C_BIGENDIAN-lto.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang-deux.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-K-R-decls-clang-deux.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang-deux.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-K-R-decls-clang-deux.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-K-R-decls-clang.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-K-R-decls-clang.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-bash52.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-bash52.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-bash52.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-bash52.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-cxx11typo.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-cxx11typo.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-cxx11typo.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-cxx11typo.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-darwin.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-darwin.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-darwin.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-darwin.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-make-4.4.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-make-4.4.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-make-4.4.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-make-4.4.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-time.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-time.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-time.patch rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.71-time.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/autoconf/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/Manifest diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/automake-wrapper-20221207.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/automake-wrapper-20221207.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/automake/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/automake/Manifest diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.11.6-r4.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.11.6-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.11.6-r4.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.11.6-r4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.16.5-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-1.16.5-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.16.5-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-9999.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/automake-9999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/automake/automake-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch rename to sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.11.6-install-sh-avoid-low-risk-race-in-tmp.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.11.6-perl-5.16.patch b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.11.6-perl-5.16.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.11.6-perl-5.16.patch rename to sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.11.6-perl-5.16.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch rename to sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.11.6-perl-escape-curly-bracket-r1.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.16.5-apostrophe-in-tests.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch rename to sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.16.5-apostrophe-in-tests.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.5-fix-instmany-python.sh-test.patch b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.16.5-fix-instmany-python.sh-test.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.5-fix-instmany-python.sh-test.patch rename to sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.16.5-fix-instmany-python.sh-test.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch rename to sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.5-parallel-build.patch b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.16.5-parallel-build.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.5-parallel-build.patch rename to sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.16.5-parallel-build.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.5-py3-compile.patch b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.16.5-py3-compile.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/files/automake-1.16.5-py3-compile.patch rename to sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.16.5-py3-compile.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/automake/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/automake/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gtk-doc-am/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/gtk-doc-am/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/gtk-doc-am/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/gtk-doc-am/Manifest diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/gtk-doc-am/gtk-doc-am-1.33.2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/gtk-doc-am/gtk-doc-am-1.33.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gtk-doc-am/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/gtk-doc-am/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/gtk-doc-am/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/gtk-doc-am/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/libtool/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/Manifest diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.2.10-eprefix.patch b/sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.2.10-eprefix.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.2.10-eprefix.patch rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.2.10-eprefix.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch b/sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.2.6a-darwin-module-bundle.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch b/sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.4.3-use-linux-version-in-fbsd.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch b/sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.4.6-darwin-use-linux-version.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-ppc64le.patch b/sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.4.6-ppc64le.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-ppc64le.patch rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.4.6-ppc64le.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-pthread.patch b/sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.4.6-pthread.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-pthread.patch rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.4.6-pthread.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch b/sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch b/sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.4.7-grep-3.8.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.4.7-grep-3.8.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.7-werror-lto.patch b/sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.4.7-werror-lto.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.7-werror-lto.patch rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/files/libtool-2.4.7-werror-lto.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r1.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/dev-build/libtool/libtool-2.4.7-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-9999.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-9999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/libtool/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/libtool/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/libtool/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/Manifest b/sdk_container/src/third_party/portage-stable/dev-debug/strace/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/strace/Manifest rename to sdk_container/src/third_party/portage-stable/dev-debug/strace/Manifest diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/files/strace-5.11-static.patch b/sdk_container/src/third_party/portage-stable/dev-debug/strace/files/strace-5.11-static.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/strace/files/strace-5.11-static.patch rename to sdk_container/src/third_party/portage-stable/dev-debug/strace/files/strace-5.11-static.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/files/strace-6.4-linux-headers-6.5.patch b/sdk_container/src/third_party/portage-stable/dev-debug/strace/files/strace-6.4-linux-headers-6.5.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/strace/files/strace-6.4-linux-headers-6.5.patch rename to sdk_container/src/third_party/portage-stable/dev-debug/strace/files/strace-6.4-linux-headers-6.5.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/files/strace-6.5-static.patch b/sdk_container/src/third_party/portage-stable/dev-debug/strace/files/strace-6.5-static.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/strace/files/strace-6.5-static.patch rename to sdk_container/src/third_party/portage-stable/dev-debug/strace/files/strace-6.5-static.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-debug/strace/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/strace/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-debug/strace/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.3.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.4-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.4-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.4-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.6.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.6.ebuild rename to sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.6.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-9999.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/strace/strace-9999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-9999.ebuild From 1a6863cd64987a701b760bcc7f1a6474793932dd Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 29 Jan 2024 16:37:33 +0100 Subject: [PATCH 096/127] dev-build/autoconf: Sync with Gentoo It's from Gentoo commit d7dbfacbf92767bfa5aa46c9cc7ee12dcbcc558f. --- .../autoconf/autoconf-2.13-r7.ebuild | 4 ++-- .../autoconf/autoconf-2.13-r8.ebuild | 5 +++-- .../autoconf/autoconf-2.69-r9.ebuild | 10 +++++++--- .../autoconf/autoconf-2.71-r6.ebuild | 8 ++++---- .../autoconf/autoconf-2.71-r7.ebuild | 8 ++++---- .../autoconf/autoconf-2.72-r1.ebuild | 10 +++++----- .../dev-build/autoconf/autoconf-9999.ebuild | 6 +++--- ...nf-2.13-skip-AC_FUNC_GETLOADAVG-test.patch | 20 +++++++++++++++++++ 8 files changed, 48 insertions(+), 23 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-skip-AC_FUNC_GETLOADAVG-test.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r7.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r7.ebuild index 0c634973f30..55b24574589 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r7.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-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 @@ -23,7 +23,7 @@ BDEPEND=" RDEPEND=" ${BDEPEND} sys-apps/texinfo - >=sys-devel/autoconf-wrapper-13 + >=dev-build/autoconf-wrapper-13 " PATCHES=( diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r8.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r8.ebuild index 1df0f05de4a..8c87a2c23cf 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r8.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.13-r8.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 @@ BDEPEND=" RDEPEND=" ${BDEPEND} sys-apps/texinfo - >=sys-devel/autoconf-wrapper-13 + >=dev-build/autoconf-wrapper-13 " PATCHES=( @@ -33,6 +33,7 @@ PATCHES=( "${FILESDIR}"/${P}-perl-5.26.patch "${FILESDIR}"/${P}-K-R-decls-clang.patch "${FILESDIR}"/${P}-Clang-16-fixes-for-various-tests.patch + "${FILESDIR}"/${P}-skip-AC_FUNC_GETLOADAVG-test.patch ) src_configure() { diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.69-r9.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.69-r9.ebuild index 75df5c300a1..68c89dba765 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.69-r9.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.69-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 @@ -22,7 +22,7 @@ else BDEPEND="verify-sig? ( sec-keys/openpgp-keys-m4 )" fi -inherit toolchain-autoconf +inherit toolchain-autoconf multiprocessing DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" @@ -37,7 +37,7 @@ BDEPEND+=" " RDEPEND=" ${BDEPEND} - >=sys-devel/autoconf-wrapper-13 + >=dev-build/autoconf-wrapper-13 !~sys-devel/${P}:2.5 " @@ -79,3 +79,7 @@ src_prepare() { # We already have an up to date autoconf.info page at this point. touch -r doc/{old_,}autoconf.texi || die } + +src_test() { + emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" +} diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r6.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r6.ebuild index a76ab0e28cd..5897d979294 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r6.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r6.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 @@ -21,7 +21,7 @@ else S="${WORKDIR}"/${MY_P} fi -inherit toolchain-autoconf +inherit toolchain-autoconf multiprocessing DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" @@ -35,7 +35,7 @@ IUSE="emacs" BDEPEND=">=sys-devel/m4-1.4.16 >=dev-lang/perl-5.8" RDEPEND="${BDEPEND} - >=sys-devel/autoconf-wrapper-15 + >=dev-build/autoconf-wrapper-15 sys-devel/gnuconfig !~sys-devel/${P}:2.5" [[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3" @@ -74,7 +74,7 @@ src_prepare() { } src_test() { - emake check + emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" } src_install() { diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r7.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r7.ebuild index fec14a8ce2f..2672d89b27e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-r7.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.71-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 @@ -30,7 +30,7 @@ else BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )" fi -inherit toolchain-autoconf +inherit toolchain-autoconf multiprocessing DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" @@ -47,7 +47,7 @@ BDEPEND+=" " RDEPEND=" ${BDEPEND} - >=sys-devel/autoconf-wrapper-15 + >=dev-build/autoconf-wrapper-15 sys-devel/gnuconfig !~sys-devel/${P}:2.5 " @@ -89,7 +89,7 @@ src_prepare() { } src_test() { - emake check + emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" } src_install() { diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.72-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.72-r1.ebuild index 60238d14ccf..7cace3e2a34 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.72-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-2.72-r1.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 # Bumping notes: -# * Remember to modify LAST_KNOWN_VER 'upstream' in sys-devel/autoconf-wrapper +# * Remember to modify LAST_KNOWN_VER 'upstream' in dev-build/autoconf-wrapper # on new autoconf releases, as well as the dependency in RDEPEND below too. # * Update _WANT_AUTOCONF and _autoconf_atom case statement in autotools.eclass. @@ -35,7 +35,7 @@ else BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )" fi -inherit toolchain-autoconf +inherit toolchain-autoconf multiprocessing DESCRIPTION="Used to create autoconfiguration files" HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" @@ -50,7 +50,7 @@ BDEPEND+=" " RDEPEND=" ${BDEPEND} - >=sys-devel/autoconf-wrapper-20231224 + >=dev-build/autoconf-wrapper-20231224 sys-devel/gnuconfig !~sys-devel/${P}:2.5 " @@ -83,7 +83,7 @@ src_prepare() { } src_test() { - emake check + emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" } src_install() { diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-9999.ebuild index 60238d14ccf..0fff9c20542 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/autoconf-9999.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 # Bumping notes: -# * Remember to modify LAST_KNOWN_VER 'upstream' in sys-devel/autoconf-wrapper +# * Remember to modify LAST_KNOWN_VER 'upstream' in dev-build/autoconf-wrapper # on new autoconf releases, as well as the dependency in RDEPEND below too. # * Update _WANT_AUTOCONF and _autoconf_atom case statement in autotools.eclass. @@ -50,7 +50,7 @@ BDEPEND+=" " RDEPEND=" ${BDEPEND} - >=sys-devel/autoconf-wrapper-20231224 + >=dev-build/autoconf-wrapper-20231224 sys-devel/gnuconfig !~sys-devel/${P}:2.5 " diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-skip-AC_FUNC_GETLOADAVG-test.patch b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-skip-AC_FUNC_GETLOADAVG-test.patch new file mode 100644 index 00000000000..280578ac6b0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf/files/autoconf-2.13-skip-AC_FUNC_GETLOADAVG-test.patch @@ -0,0 +1,20 @@ +The macro itself is broken in autoconf-2.13 but this is caused by newer kernels +etc rather than anything else. Very, very few packages use autoconf-2.13, let +alone AC_FUNC_GETLOADAVG, so not going to worry about it much. + +Do as Fedora and Debian do and skip the test for it. + +https://bugs.gentoo.org/406723 +https://bugs.gentoo.org/677926 +--- a/testsuite/autoconf.s/syntax.exp ++++ b/testsuite/autoconf.s/syntax.exp +@@ -2,7 +2,8 @@ + + send_user "Checking for syntax errors in the specific tests...\n" + set script {s/^AC_DEFUN(\([^,]*\).*/\1/p} +-set macros [exec sed -n $script $srcdir/../acspecific.m4] ++# XXX: AC_FUNC_GETLOADAVG skipped for bug #406723, bug #677926 ++set macros [exec sed -n $script $srcdir/../acspecific.m4 | grep -v AC_FUNC_GETLOADAVG] + + foreach mac $macros { + if { [string match "*F77*" "$mac"] && [catch {exec which g77} ignore_output] } then { From 24590ed04c4213e9bfcffe84dab774e379b050a7 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 29 Jan 2024 16:37:33 +0100 Subject: [PATCH 097/127] dev-build/autoconf-archive: Sync with Gentoo It's from Gentoo commit e92da579956495086c78eac089068406effd57e5. --- .../autoconf-archive/autoconf-archive-2023.02.20.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf-archive/autoconf-archive-2023.02.20.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-archive/autoconf-archive-2023.02.20.ebuild index 332c779840f..8e89dff7eac 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf-archive/autoconf-archive-2023.02.20.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-archive/autoconf-archive-2023.02.20.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 7bc181966a9c31b85dff77ec67588f726b982a0a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 29 Jan 2024 16:37:33 +0100 Subject: [PATCH 098/127] dev-build/autoconf-wrapper: Sync with Gentoo It's from Gentoo commit 62aa01b01114bc2c8c59f8d12c391291a2f4ab97. --- .../autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild | 2 +- .../dev-build/autoconf-wrapper/autoconf-wrapper-20231224.ebuild | 2 +- .../dev-build/autoconf-wrapper/autoconf-wrapper-99999999.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild index 893b84bce96..417ec628886 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-20221207-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 diff --git a/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-20231224.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-20231224.ebuild index e7b7f375311..13b3c2d923e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-20231224.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-20231224.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/autoconf-wrapper/autoconf-wrapper-99999999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-99999999.ebuild index e7b7f375311..13b3c2d923e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-99999999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/autoconf-wrapper/autoconf-wrapper-99999999.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 602db83a7d7a94f3f8cfa9c85cfe65d96b75fa97 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 29 Jan 2024 16:37:33 +0100 Subject: [PATCH 099/127] dev-build/automake: Sync with Gentoo It's from Gentoo commit ad9bfdfb3e7aefb9a306dbd08fe10e39a7f3a7c8. --- .../dev-build/automake/Manifest | 1 + .../automake/automake-1.11.6-r4.ebuild | 8 +++--- .../automake/automake-1.16.5-r1.ebuild | 25 ++++++++++++++----- .../dev-build/automake/automake-9999.ebuild | 10 +++++--- 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-build/automake/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/automake/Manifest index ee180dcca54..8ba58d3e324 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/automake/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake/Manifest @@ -1,2 +1,3 @@ DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba +DIST automake-1.16.5-tests-c99.patch.xz 7176 BLAKE2B 1fa1d3a499bacc5da9ee9d8ea6cb63d9ab91646a708a53d9bb08eef65fe02a6ab34ff95737042348ea7572bd70c6c7467e260d9441239a00c3571d25d73085f0 SHA512 0065b809219257cbce3c6f6f88459b91a5a29272e0027698e06246181357ffe8d5d40057086438f891d821836441a5a96f2568d52dcd3b5acb80e4d4968cbaf9 DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88 diff --git a/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.11.6-r4.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.11.6-r4.ebuild index e8d4e6b93ed..ce79acae946 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.11.6-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.11.6-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=7 @@ -16,8 +16,8 @@ RESTRICT="test !test? ( test )" RDEPEND=" >=dev-lang/perl-5.6 - >=sys-devel/automake-wrapper-10 - >=sys-devel/autoconf-2.69:* + >=dev-build/automake-wrapper-10 + >=dev-build/autoconf-2.69:* sys-devel/gnuconfig " DEPEND=" @@ -88,4 +88,6 @@ src_install() { newenvd - "06automake${idx}" <<-EOF INFOPATH="${MY_INFODIR}" EOF + + docompress "${MY_INFODIR}" } diff --git a/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.16.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.16.5-r1.ebuild index 78b9a56f549..25e29244ced 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.16.5-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.16.5-r1.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=7 # Bumping notes: -# * Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in sys-devel/automake-wrapper +# * Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in dev-build/automake-wrapper # on new automake (major) releases, as well as the dependency in RDEPEND below too. # * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass. @@ -18,8 +18,11 @@ if [[ ${PV} == 9999 ]] ; then else if [[ ${PV/_beta} == ${PV} ]]; then MY_P="${P}" - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" + SRC_URI=" + mirror://gnu/${PN}/${P}.tar.xz + https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.16.5-tests-c99.patch.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" else MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" @@ -43,8 +46,8 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-lang/perl-5.6 - >=sys-devel/automake-wrapper-11 - >=sys-devel/autoconf-2.69:* + >=dev-build/automake-wrapper-11 + >=dev-build/autoconf-2.69:* sys-devel/gnuconfig " DEPEND="${RDEPEND}" @@ -54,6 +57,8 @@ BDEPEND=" test? ( ${PYTHON_DEPS} dev-util/dejagnu + sys-devel/bison + sys-devel/flex ) " @@ -63,6 +68,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.16.5-fix-py-compile-basedir.sh-test.patch "${FILESDIR}"/${PN}-1.16.5-apostrophe-in-tests.patch "${FILESDIR}"/${PN}-1.16.5-parallel-build.patch + "${WORKDIR}"/${PN}-1.16.5-tests-c99.patch ) pkg_setup() { @@ -92,6 +98,11 @@ src_configure() { econf --infodir="${MY_INFODIR}" } +src_test() { + # Fails with byacc/flex + emake YACC="bison -y" LEX="flex" check +} + src_install() { default @@ -128,4 +139,6 @@ src_install() { newenvd - "06automake${idx}" <<-EOF INFOPATH="${MY_INFODIR}" EOF + + docompress "${MY_INFODIR}" } diff --git a/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-9999.ebuild index be9f101590f..b65ba04aa14 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-9999.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=7 # Bumping notes: -# * Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in sys-devel/automake-wrapper +# * Remember to modify LAST_KNOWN_AUTOMAKE_VER 'upstream' in dev-build/automake-wrapper # on new automake (major) releases, as well as the dependency in RDEPEND below too. # * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass. @@ -43,8 +43,8 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-lang/perl-5.6 - >=sys-devel/automake-wrapper-11 - >=sys-devel/autoconf-2.69:* + >=dev-build/automake-wrapper-11 + >=dev-build/autoconf-2.69:* sys-devel/gnuconfig " DEPEND="${RDEPEND}" @@ -125,4 +125,6 @@ src_install() { newenvd - "06automake${idx}" <<-EOF INFOPATH="${infopath}" EOF + + docompress "${MY_INFODIR}" } From 6e57279e2362c298489aa78d8c16f5c4dbddb741 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 29 Jan 2024 16:37:34 +0100 Subject: [PATCH 100/127] dev-build/automake-wrapper: Sync with Gentoo It's from Gentoo commit b17d7668660bdb029954074b520f963d9f192b0b. --- .../dev-build/automake-wrapper/automake-wrapper-20221207.ebuild | 2 +- .../dev-build/automake-wrapper/automake-wrapper-99999999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/automake-wrapper-20221207.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/automake-wrapper-20221207.ebuild index 6983b29ed53..cd58f716d79 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/automake-wrapper-20221207.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/automake-wrapper-20221207.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/automake-wrapper/automake-wrapper-99999999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild index 5cc8b5d149b..ea8e3bb6367 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/automake-wrapper-99999999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake-wrapper/automake-wrapper-99999999.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 e42041e120ec787b3760531bcb8bdcad841703fb Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 29 Jan 2024 16:37:34 +0100 Subject: [PATCH 101/127] dev-build/gtk-doc-am: Sync with Gentoo It's from Gentoo commit 80558608ae111ebddad012e63542db9adb34c5b1. --- .../dev-build/gtk-doc-am/gtk-doc-am-1.33.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-build/gtk-doc-am/gtk-doc-am-1.33.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/gtk-doc-am/gtk-doc-am-1.33.2.ebuild index dd679668c4d..62670941826 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/gtk-doc-am/gtk-doc-am-1.33.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/gtk-doc-am/gtk-doc-am-1.33.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 From 10e1768d1f46b2aa979a315e434bb684bb484571 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 29 Jan 2024 16:37:34 +0100 Subject: [PATCH 102/127] dev-build/libtool: Sync with Gentoo It's from Gentoo commit cd7f047fe43fb631c4ca6979c6efb5038c616f41. --- .../dev-build/libtool/libtool-2.4.7-r1.ebuild | 6 +++--- .../dev-build/libtool/libtool-2.4.7-r2.ebuild | 10 +++++++--- .../dev-build/libtool/libtool-9999.ebuild | 10 +++++++--- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r1.ebuild index a098f7ae0b1..aa94eae26ee 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-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 @@ -28,8 +28,8 @@ 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:* + >=dev-build/autoconf-2.69:* + >=dev-build/automake-1.13:* >=dev-libs/libltdl-2.4.7 " DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r2.ebuild index a2ec01d3671..16ed5d62e18 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-2.4.7-r2.ebuild @@ -8,7 +8,7 @@ EAPI=7 # bug #225559 LIBTOOLIZE="true" WANT_LIBTOOL="none" -inherit autotools prefix +inherit autotools prefix multiprocessing if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git" @@ -28,8 +28,8 @@ 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:* + >=dev-build/autoconf-2.69:* + >=dev-build/automake-1.13:* " DEPEND="${RDEPEND}" [[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man" @@ -109,6 +109,10 @@ src_configure() { ECONF_SOURCE="${S}" econf ${myconf} --disable-ltdl-install } +src_test() { + emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" +} + src_install() { default diff --git a/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-9999.ebuild index ce85f708a49..e5ecf26e097 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/libtool/libtool-9999.ebuild @@ -8,7 +8,7 @@ EAPI=7 # bug #225559 LIBTOOLIZE="true" WANT_LIBTOOL="none" -inherit autotools prefix +inherit autotools prefix multiprocessing if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git" @@ -28,8 +28,8 @@ 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:* + >=dev-build/autoconf-2.69:* + >=dev-build/automake-1.13:* " DEPEND="${RDEPEND}" [[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man" @@ -107,6 +107,10 @@ src_configure() { ECONF_SOURCE="${S}" econf ${myconf} --disable-ltdl-install } +src_test() { + emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" +} + src_install() { default From 78134bb2fab8159d8066a9f398e35180f7cc7076 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 29 Jan 2024 16:38:28 +0100 Subject: [PATCH 103/127] dev-debug/strace: Sync with Gentoo It's from Gentoo commit 717506d584ca9e89a09f72751a624300ebf9d28e. --- .../portage-stable/dev-debug/strace/strace-6.2.ebuild | 2 +- .../portage-stable/dev-debug/strace/strace-6.3.ebuild | 2 +- .../portage-stable/dev-debug/strace/strace-6.4-r1.ebuild | 2 +- .../portage-stable/dev-debug/strace/strace-6.6.ebuild | 2 +- .../portage-stable/dev-debug/strace/strace-9999.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.2.ebuild index 386b0709373..5335711e7f1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-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 diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.3.ebuild index 24320451eac..463bac04d6c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-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 diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.4-r1.ebuild index 9ea02aa9e41..f71d7670bcd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-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 diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.6.ebuild index aae04e4c6be..482af8b00c1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-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 diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-9999.ebuild index d1881f35b45..9c5835571a4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-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 a9b102b2eb13a04aeb7be8e3433945b592bd0054 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 29 Jan 2024 17:11:48 +0100 Subject: [PATCH 104/127] overlay: Update to use new package names --- ...{coreos-dev-0.1.0-r84.ebuild => coreos-dev-0.1.0-r85.ebuild} | 0 .../coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild | 2 +- .../{coreos-0.0.1-r310.ebuild => coreos-0.0.1-r311.ebuild} | 0 .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 2 +- ...ds-0.0.1-r208.ebuild => hard-host-depends-0.0.1-r209.ebuild} | 0 .../hard-host-depends/hard-host-depends-0.0.1.ebuild | 2 +- .../{dbus-glib-0.112.ebuild => dbus-glib-0.112-r1.ebuild} | 2 +- .../{openssh-9.6_p1-r1.ebuild => openssh-9.6_p1-r2.ebuild} | 2 +- .../dbus/{dbus-1.14.4-r1.ebuild => dbus-1.14.4-r2.ebuild} | 2 +- .../sssd/{sssd-2.3.1-r5.ebuild => sssd-2.3.1-r6.ebuild} | 2 +- .../lvm2/{lvm2-2.02.188-r2.ebuild => lvm2-2.02.188-r3.ebuild} | 2 +- 11 files changed, 8 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/{coreos-dev-0.1.0-r84.ebuild => coreos-dev-0.1.0-r85.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r310.ebuild => coreos-0.0.1-r311.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/{hard-host-depends-0.0.1-r208.ebuild => hard-host-depends-0.0.1-r209.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/{dbus-glib-0.112.ebuild => dbus-glib-0.112-r1.ebuild} (98%) rename sdk_container/src/third_party/coreos-overlay/net-misc/openssh/{openssh-9.6_p1-r1.ebuild => openssh-9.6_p1-r2.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/{dbus-1.14.4-r1.ebuild => dbus-1.14.4-r2.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/{sssd-2.3.1-r5.ebuild => sssd-2.3.1-r6.ebuild} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/{lvm2-2.02.188-r2.ebuild => lvm2-2.02.188-r3.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r84.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r85.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r84.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r85.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 c2e71d89de6..3c161381442 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 @@ -20,9 +20,9 @@ RDEPEND=" coreos-base/coreos coreos-base/emerge-gitclone dev-debug/gdb + dev-debug/strace dev-lang/python dev-util/pahole - dev-util/strace dev-vcs/repo net-analyzer/netperf net-analyzer/traceroute diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r310.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r311.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r310.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r311.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 67d4fc6e02c..3303cdd5ee5 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -117,11 +117,11 @@ RDEPEND="${RDEPEND} coreos-base/update_engine coreos-base/ue-rs dev-db/etcdctl + dev-debug/strace dev-libs/libsodium dev-libs/openssl dev-util/bpftool dev-util/bsdiff - dev-util/strace dev-vcs/git net-analyzer/nmap net-analyzer/tcpdump diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r208.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r209.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r208.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r209.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index e41c79f34e1..88ff97adb12 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -34,6 +34,7 @@ RDEPEND="${RDEPEND} app-emulation/qemu app-text/asciidoc app-text/xmlto + dev-build/gtk-doc-am dev-lang/go-bootstrap dev-lang/go:1.19 dev-lang/go:1.20 @@ -55,7 +56,6 @@ RDEPEND="${RDEPEND} dev-python/wheel dev-util/gdbus-codegen dev-util/gperf - >=dev-util/gtk-doc-am-1.13 dev-util/patchutils >=dev-vcs/git-1.7.2 net-libs/libtirpc diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112-r1.ebuild index 248dee046e8..78482ec9d6f 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/dbus-glib/dbus-glib-0.112-r1.ebuild @@ -22,11 +22,11 @@ DEPEND=" " RDEPEND="${DEPEND}" BDEPEND=" + dev-build/gtk-doc-am >=dev-libs/expat-2.1.0-r3 >=dev-libs/glib-2.40:2 >=sys-apps/dbus-1.8 >=dev-util/glib-utils-2.40 - >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig " # CBUILD dependencies are needed to make a native tool while cross-compiling. diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.6_p1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.6_p1-r2.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.6_p1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.6_p1-r2.ebuild index eb005b627f0..4d5e6061460 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.6_p1-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/openssh/openssh-9.6_p1-r2.ebuild @@ -72,7 +72,7 @@ RDEPEND=" " # Weird dep construct for newer gcc-config for bug #872416 BDEPEND=" - sys-devel/autoconf + dev-build/autoconf virtual/pkgconfig || ( >=sys-devel/gcc-config-2.6 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r2.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r2.ebuild index 71a4c75bba0..6be19d79136 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r2.ebuild @@ -28,7 +28,7 @@ BDEPEND=" acct-user/messagebus app-text/xmlto app-text/docbook-xml-dtd:4.4 - sys-devel/autoconf-archive + dev-build/autoconf-archive virtual/pkgconfig doc? ( app-doc/doxygen ) " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r6.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r6.ebuild index ea87f1b4ba8..8b21a463187 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r6.ebuild @@ -80,7 +80,7 @@ RDEPEND="${DEPEND} " # Flatcar: require only autoconf:2.69 BDEPEND=" - sys-devel/autoconf:2.69 + dev-build/autoconf:2.69 doc? ( app-doc/doxygen ) test? ( dev-libs/check diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild index 4a646e65df4..b8d46580a69 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild @@ -46,7 +46,7 @@ DEPEND="${DEPEND_COMMON} >=sys-apps/util-linux-2.16[static-libs] )" BDEPEND=" - sys-devel/autoconf-archive + dev-build/autoconf-archive virtual/pkgconfig " From 202e0550f0e7276a25707e07ac52b0c84202b7c4 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 29 Jan 2024 17:40:14 +0100 Subject: [PATCH 105/127] overlay profiles: Mask dev-libs/libp11-0.4.12-r5 --- .../coreos-overlay/profiles/coreos/base/package.mask | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask index 97238158c13..56119fed293 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask @@ -20,3 +20,6 @@ # Python 3.12 is in portage-stable (currently testing), so avoid picking it # up. Update this to mask later versions when we switch to 3.11. >=dev-lang/python-3.12 + +# Requires openssl version we don't have yet. +=dev-libs/libp11-0.4.12-r5 From 6ccdf8f322d60da6b9eafac16d18640ecb5bd31b Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 30 Jan 2024 12:58:54 +0100 Subject: [PATCH 106/127] overlay profiles: Update unmask of virtual/libcrypt virtual/libcrypt got a revision bump, but we still want to stay at version 1, so instead of unmasking an outdated revision, unmask anything with version lower than 2. --- .../coreos-overlay/profiles/coreos/base/package.unmask | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask index 1cf12438fc3..b57d64a2cdb 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.unmask @@ -7,7 +7,7 @@ # libxcrypt, because we need to figure out how to solve the dep loop # that results from the migration (python -> virtual/libcrypt -> # libxcrypt -> glibc -> python). -=virtual/libcrypt-1-r1 + Date: Tue, 30 Jan 2024 14:37:49 +0100 Subject: [PATCH 107/127] eclass/lua-single: Sync with Gentoo It's from Gentoo commit 2cba2db27919bc449ed2a7bf7ed3259c6b96e65f. --- .../portage-stable/eclass/lua-single.eclass | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/lua-single.eclass b/sdk_container/src/third_party/portage-stable/eclass/lua-single.eclass index 2f4ebaa1419..8432df0583b 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/lua-single.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/lua-single.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: lua-single.eclass @@ -52,7 +52,7 @@ # " # BDEPEND="virtual/pkgconfig" # -# # Only neeed if the setup phase has to do more than just call lua-single_pkg_setup +# # Only need if the setup phase has to do more than just call lua-single_pkg_setup # pkg_setup() { # lua-single_pkg_setup # [...] @@ -64,24 +64,20 @@ # @CODE case ${EAPI} in - 7|8) - ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ ! ${_LUA_SINGLE_R0} ]]; then +if [[ -z ${_LUA_SINGLE_ECLASS} ]]; then +_LUA_SINGLE_ECLASS=1 -if [[ ${_LUA_R0} ]]; then +if [[ ${_LUA_ECLASS} ]]; then die 'lua-single.eclass cannot be used with lua.eclass.' fi inherit lua-utils -fi - -EXPORT_FUNCTIONS pkg_setup - -# @ECLASS-VARIABLE: LUA_COMPAT +# @ECLASS_VARIABLE: LUA_COMPAT # @REQUIRED # @PRE_INHERIT # @DESCRIPTION: @@ -99,7 +95,7 @@ EXPORT_FUNCTIONS pkg_setup # LUA_COMPAT=( lua5-{1..3} ) # @CODE -# @ECLASS-VARIABLE: LUA_COMPAT_OVERRIDE +# @ECLASS_VARIABLE: LUA_COMPAT_OVERRIDE # @USER_VARIABLE # @DEFAULT_UNSET # @DESCRIPTION: @@ -119,7 +115,7 @@ EXPORT_FUNCTIONS pkg_setup # LUA_COMPAT_OVERRIDE='luajit' emerge -1v dev-lua/foo # @CODE -# @ECLASS-VARIABLE: LUA_REQ_USE +# @ECLASS_VARIABLE: LUA_REQ_USE # @DEFAULT_UNSET # @PRE_INHERIT # @DESCRIPTION: @@ -139,7 +135,7 @@ EXPORT_FUNCTIONS pkg_setup # lua_targets_luaX-Y? ( dev-lang/lua:X.Y[deprecated] ) # @CODE -# @ECLASS-VARIABLE: LUA_DEPS +# @ECLASS_VARIABLE: LUA_DEPS # @OUTPUT_VARIABLE # @DESCRIPTION: # This is an eclass-generated Lua dependency string for all @@ -158,7 +154,7 @@ EXPORT_FUNCTIONS pkg_setup # lua_targets_lua5-3? ( dev-lang/lua:5.3 ) # @CODE -# @ECLASS-VARIABLE: LUA_REQUIRED_USE +# @ECLASS_VARIABLE: LUA_REQUIRED_USE # @OUTPUT_VARIABLE # @DESCRIPTION: # This is an eclass-generated required-use expression which ensures at @@ -177,7 +173,7 @@ EXPORT_FUNCTIONS pkg_setup # || ( lua_targets_lua5-1 lua_targets_lua5-3 ) # @CODE -# @ECLASS-VARIABLE: LUA_SINGLE_USEDEP +# @ECLASS_VARIABLE: LUA_SINGLE_USEDEP # @OUTPUT_VARIABLE # @DESCRIPTION: # This is an eclass-generated USE-dependency string which can be used @@ -197,7 +193,7 @@ EXPORT_FUNCTIONS pkg_setup # lua_single_target_lua5-1(-)? # @CODE -# @ECLASS-VARIABLE: LUA_USEDEP +# @ECLASS_VARIABLE: LUA_USEDEP # @OUTPUT_VARIABLE # @DESCRIPTION: # This is an eclass-generated USE-dependency string which can be used to @@ -276,8 +272,6 @@ _lua_single_set_globals() { _lua_single_set_globals unset -f _lua_single_set_globals -if [[ ! ${_LUA_SINGLE_R0} ]]; then - # @FUNCTION: _lua_gen_usedep # @USAGE: [...] # @INTERNAL @@ -532,5 +526,6 @@ lua-single_pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && lua_setup } -_LUA_SINGLE_R0=1 fi + +EXPORT_FUNCTIONS pkg_setup From b2132686b0be71e5c57eb1214bb7f125b936f9c1 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 30 Jan 2024 14:38:21 +0100 Subject: [PATCH 108/127] eclass/lua-utils: Sync with Gentoo It's from Gentoo commit 2cba2db27919bc449ed2a7bf7ed3259c6b96e65f. --- .../portage-stable/eclass/lua-utils.eclass | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/lua-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/lua-utils.eclass index 3b24f383d7a..0ff36734dc8 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/lua-utils.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/lua-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: lua-utils.eclass @@ -18,16 +18,16 @@ # functions. It can be inherited safely. case ${EAPI} in - 7|8) - ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ ! ${_LUA_UTILS_R0} ]]; then +if [[ -z ${_LUA_UTILS_ECLASS} ]]; then +_LUA_UTILS_ECLASS=1 inherit toolchain-funcs -# @ECLASS-VARIABLE: _LUA_ALL_IMPLS +# @ECLASS_VARIABLE: _LUA_ALL_IMPLS # @INTERNAL # @DESCRIPTION: # All supported Lua implementations, most preferred last @@ -39,7 +39,7 @@ _LUA_ALL_IMPLS=( ) readonly _LUA_ALL_IMPLS -# @ECLASS-VARIABLE: _LUA_HISTORICAL_IMPLS +# @ECLASS_VARIABLE: _LUA_HISTORICAL_IMPLS # @INTERNAL # @DESCRIPTION: # All historical Lua implementations that are no longer supported. @@ -171,7 +171,7 @@ _lua_wrapper_setup() { export PATH PKG_CONFIG_PATH } -# @ECLASS-VARIABLE: ELUA +# @ECLASS_VARIABLE: ELUA # @DEFAULT_UNSET # @DESCRIPTION: # The executable name of the current Lua interpreter. This variable is set @@ -182,7 +182,7 @@ _lua_wrapper_setup() { # lua5.1 # @CODE -# @ECLASS-VARIABLE: LUA +# @ECLASS_VARIABLE: LUA # @DEFAULT_UNSET # @DESCRIPTION: # The absolute path to the current Lua interpreter. This variable is set @@ -384,7 +384,7 @@ lua_enable_tests() { busted) test_directory="${2:-spec}" test_pkg="dev-lua/busted" - if [[ ! ${_LUA_SINGLE_R0} ]]; then + if [[ ! ${_LUA_SINGLE_ECLASS} ]]; then eval "lua_src_test() { busted --lua=\"\${ELUA}\" --output=\"plainTerminal\" \"${test_directory}\" || die \"Tests fail with \${ELUA}\" }" @@ -403,7 +403,7 @@ lua_enable_tests() { local test_deps=${RDEPEND} if [[ -n ${test_pkg} ]]; then - if [[ ! ${_LUA_SINGLE_R0} ]]; then + if [[ ! ${_LUA_SINGLE_ECLASS} ]]; then test_deps+=" ${test_pkg}[${LUA_USEDEP}]" else test_deps+=" $(lua_gen_cond_dep " @@ -536,5 +536,4 @@ lua_get_version() { echo "${LUA_VERSION}" } -_LUA_UTILS_R0=1 fi From aa498b3088cdddab0f98ff8bf671036228dc53a8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 30 Jan 2024 14:38:46 +0100 Subject: [PATCH 109/127] eclass/ruby-single: Sync with Gentoo It's from Gentoo commit a95521f59ce3ec40bf4ed01a27655aa2ae409a59. --- .../portage-stable/eclass/ruby-single.eclass | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/ruby-single.eclass b/sdk_container/src/third_party/portage-stable/eclass/ruby-single.eclass index ed230f4a84e..effdbd3e96a 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/ruby-single.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/ruby-single.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ruby-single.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Author: Hans de Graaff # Based on python-single-r1 by: Michał Górny -# @SUPPORTED_EAPIS: 4 5 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @PROVIDES: ruby-utils # @BLURB: An eclass for Ruby packages not installed for multiple implementations. # @DESCRIPTION: @@ -18,27 +18,22 @@ # pull in the dependency on the requested ruby targets. # # @CODE -# USE_RUBY="ruby26 ruby27" +# USE_RUBY="ruby27 ruby30" # inherit ruby-single # RDEPEND="${RUBY_DEPS}" # @CODE -case "${EAPI:-0}" in - 0|1|2|3) - die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" - ;; - 4|5|6|7|8) - ;; - *) - die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" - ;; +case ${EAPI} in + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ ! ${_RUBY_SINGLE} ]]; then +if [[ ! ${_RUBY_SINGLE_ECLASS} ]]; then +_RUBY_SINGLE_ECLASS=1 inherit ruby-utils -# @ECLASS-VARIABLE: USE_RUBY +# @ECLASS_VARIABLE: USE_RUBY # @DEFAULT_UNSET # @PRE_INHERIT # @REQUIRED @@ -48,7 +43,7 @@ inherit ruby-utils # default. All ebuilds are expected to set this variable. -# @ECLASS-VARIABLE: RUBY_DEPS +# @ECLASS_VARIABLE: RUBY_DEPS # @DEFAULT_UNSET # @DESCRIPTION: # @@ -67,20 +62,23 @@ inherit ruby-utils # # Example value: # @CODE -# || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 ) virtual/rubygems +# || ( dev-lang/ruby:3.0 dev-lang/ruby:2.7 ) virtual/rubygems # @CODE # # The order of dependencies will change over time to best match the # current state of ruby targets, e.g. stable version first. _ruby_single_implementations_depend() { - local depend + local _ruby_implementation depend for _ruby_implementation in ${RUBY_TARGETS_PREFERENCE}; do if [[ ${USE_RUBY} =~ ${_ruby_implementation} ]]; then - depend="${depend} $(_ruby_implementation_depend $_ruby_implementation)" + depend+=" (" + depend+=" $(_ruby_implementation_depend ${_ruby_implementation})" + depend+=" virtual/rubygems[ruby_targets_${_ruby_implementation}(-)]" + depend+=" )" fi done - echo "|| ( ${depend} ) virtual/rubygems" + echo "|| ( ${depend} )" } _ruby_single_set_globals() { @@ -88,6 +86,4 @@ _ruby_single_set_globals() { } _ruby_single_set_globals - -_RUBY_SINGLE=1 fi From 07eb8266fec77a60dc822b511b61a9e2afbc0c0d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 30 Jan 2024 14:39:01 +0100 Subject: [PATCH 110/127] eclass/ruby-utils: Sync with Gentoo It's from Gentoo commit d18249523bf04913d041c7b28e3104a76db14553. --- .../portage-stable/eclass/ruby-utils.eclass | 56 ++----------------- 1 file changed, 6 insertions(+), 50 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/ruby-utils.eclass b/sdk_container/src/third_party/portage-stable/eclass/ruby-utils.eclass index 2506aee2554..789f57ce25f 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/ruby-utils.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/ruby-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ruby-utils.eclass @@ -22,8 +22,7 @@ esac if [[ ! ${_RUBY_UTILS} ]]; then - -# @ECLASS-VARIABLE: RUBY_TARGETS_PREFERENCE +# @ECLASS_VARIABLE: RUBY_TARGETS_PREFERENCE # @INTERNAL # @DESCRIPTION: # This variable lists all the known ruby targets in preference of use as @@ -33,60 +32,19 @@ if [[ ! ${_RUBY_UTILS} ]]; then # provide for a better first installation experience. # All stable RUBY_TARGETS -RUBY_TARGETS_PREFERENCE="ruby26 " +RUBY_TARGETS_PREFERENCE="ruby31 " # All other active ruby targets -RUBY_TARGETS_PREFERENCE+="ruby27 ruby30" - +RUBY_TARGETS_PREFERENCE+="ruby32 ruby33" _ruby_implementation_depend() { local rubypn= local rubyslot= case $1 in - ruby18) - rubypn="dev-lang/ruby" - rubyslot=":1.8" - ;; - ruby19) - rubypn="dev-lang/ruby" - rubyslot=":1.9" - ;; - ruby20) - rubypn="dev-lang/ruby" - rubyslot=":2.0" - ;; - ruby21) - rubypn="dev-lang/ruby" - rubyslot=":2.1" - ;; - ruby22) - rubypn="dev-lang/ruby" - rubyslot=":2.2" - ;; - ruby23) + ruby1[89]|ruby2[0-7]|ruby3[0-3]) rubypn="dev-lang/ruby" - rubyslot=":2.3" - ;; - ruby24) - rubypn="dev-lang/ruby" - rubyslot=":2.4" - ;; - ruby25) - rubypn="dev-lang/ruby" - rubyslot=":2.5" - ;; - ruby26) - rubypn="dev-lang/ruby" - rubyslot=":2.6" - ;; - ruby27) - rubypn="dev-lang/ruby" - rubyslot=":2.7" - ;; - ruby30) - rubypn="dev-lang/ruby" - rubyslot=":3.0" + rubyslot=":${1:4:1}.${1:5}" ;; ree18) rubypn="dev-lang/ruby-enterprise" @@ -106,7 +64,5 @@ _ruby_implementation_depend() { echo "$2${rubypn}$3${rubyslot}" } - - _RUBY_UTILS=1 fi From 925961be01dcf8f2e45c429bebbf0ad49685809a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 30 Jan 2024 14:42:12 +0100 Subject: [PATCH 111/127] .github: Add some eclasses to automation --- .github/workflows/portage-stable-packages-list | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 33195cfa9e7..de10a1620e5 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -337,6 +337,8 @@ eclass/linux-info.eclass eclass/linux-mod.eclass eclass/llvm.eclass eclass/ltprune.eclass +eclass/lua-single.eclass +eclass/lua-utils.eclass eclass/meson-multilib.eclass eclass/meson.eclass eclass/mount-boot.eclass @@ -361,6 +363,8 @@ eclass/python-r1.eclass eclass/python-single-r1.eclass eclass/python-utils-r1.eclass eclass/readme.gentoo-r1.eclass +eclass/ruby-single.eclass +eclass/ruby-utils.eclass eclass/savedconfig.eclass eclass/selinux-policy-2.eclass eclass/strip-linguas.eclass From aa698427974acaf380b9f921205a82dfd114b558 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 30 Jan 2024 14:59:47 +0100 Subject: [PATCH 112/127] net-libs/libpsl: Add from Gentoo It's from Gentoo commit 3d94a878ce4e17eb03183cad27db3e29e9a447ba. --- .../portage-stable/net-libs/libpsl/Manifest | 2 + .../files/libpsl-0.21.2-tests-optional.patch | 39 +++++++++++ .../net-libs/libpsl/libpsl-0.21.2.ebuild | 66 +++++++++++++++++++ .../net-libs/libpsl/libpsl-0.21.5.ebuild | 62 +++++++++++++++++ .../net-libs/libpsl/metadata.xml | 8 +++ 5 files changed, 177 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpsl/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpsl/libpsl-0.21.2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpsl/libpsl-0.21.5.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/libpsl/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpsl/Manifest b/sdk_container/src/third_party/portage-stable/net-libs/libpsl/Manifest new file mode 100644 index 00000000000..400b330da1d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libpsl/Manifest @@ -0,0 +1,2 @@ +DIST libpsl-0.21.2.tar.gz 7617025 BLAKE2B b50f805bb467dc3284bc91645a37a2208098ad809d3771c74ef13c3b8f6029a07ad80a56702c7e3d1a1125d272403c85dd97b64a28465b9ff2d095eaf94b9a4d SHA512 f1df72220bf4391d4701007100b0df66c833a2cbcb7481c9d13f0b9e0cad3b66d2d15d4b976e5bad60d2ad1540355112fa1acb07aa925c241d2d7cd20681c71d +DIST libpsl-0.21.5.tar.gz 7624251 BLAKE2B a0076f622b85df99f866de6707850ac216b764bdb68c6d516f4603da42dac8eae3ee4c53d68dbb6af6f779c2c7f1b9caab74c8b558209b1f6823f95c13fc3ceb SHA512 c14d575cecc0f1693894dd79565b6b9220084ddfa43b908a1cefe16d147cdd5ec47796eb0c2135e2f829a951abaf39d8a371ab5c1352f57b36e610e25adf91f5 diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch b/sdk_container/src/third_party/portage-stable/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch new file mode 100644 index 00000000000..0f5773d7573 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libpsl/files/libpsl-0.21.2-tests-optional.patch @@ -0,0 +1,39 @@ +https://github.com/rockdaboot/libpsl/commit/fb6b75317ab669c255906fa4db256837332eb1ed + +From fb6b75317ab669c255906fa4db256837332eb1ed Mon Sep 17 00:00:00 2001 +From: Vincent Torri +Date: Sat, 14 Jan 2023 17:25:31 +0100 +Subject: [PATCH] add 'tests' option to disable tests and fuzzers + +--- + meson.build | 6 ++++-- + meson_options.txt | 3 +++ + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index d96748d..4492354 100644 +--- a/meson.build ++++ b/meson.build +@@ -132,6 +132,8 @@ endif + subdir('include') + subdir('src') + subdir('tools') +-subdir('tests') +-subdir('fuzz') ++if get_option('tests') ++ subdir('tests') ++ subdir('fuzz') ++endif + subdir(join_paths('docs', 'libpsl')) +diff --git a/meson_options.txt b/meson_options.txt +index e9d6a23..d66f256 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -17,3 +17,6 @@ option('psl_testfile', type : 'string', value : '', + + option('docs', type: 'boolean', value: false, + description: 'Build the API reference (requires gtk-doc)') ++ ++option('tests', type: 'boolean', value: true, ++ description: 'Build the tests and fuzzers') + diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpsl/libpsl-0.21.2.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libpsl/libpsl-0.21.2.ebuild new file mode 100644 index 00000000000..8dba8ae8ee9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libpsl/libpsl-0.21.2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +inherit meson-multilib python-any-r1 + +DESCRIPTION="C library for the Public Suffix List" +HOMEPAGE="https://github.com/rockdaboot/libpsl" +SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="icu +idn test" +RESTRICT="!test? ( test )" + +RDEPEND=" + icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) ) + idn? ( + dev-libs/libunistring:=[${MULTILIB_USEDEP}] + net-dns/libidn2:=[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-tests-optional.patch +) + +pkg_pretend() { + if use icu && use idn ; then + ewarn "\"icu\" and \"idn\" USE flags are enabled. Using \"idn\"." + fi +} + +multilib_src_configure() { + local emesonargs=( + $(meson_use test tests) + ) + + # Prefer idn even if icu is in USE as well + if use idn ; then + emesonargs+=( + -Druntime=libidn2 + -Dbuiltin=true + ) + elif use icu ; then + emesonargs+=( + -Druntime=libicu + -Dbuiltin=true + ) + else + emesonargs+=( + -Druntime=no + ) + fi + + meson_src_configure +} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpsl/libpsl-0.21.5.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libpsl/libpsl-0.21.5.ebuild new file mode 100644 index 00000000000..d9bc8856a35 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libpsl/libpsl-0.21.5.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit meson-multilib python-any-r1 + +DESCRIPTION="C library for the Public Suffix List" +HOMEPAGE="https://github.com/rockdaboot/libpsl" +SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="icu +idn test" +RESTRICT="!test? ( test )" + +RDEPEND=" + icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) ) + idn? ( + dev-libs/libunistring:=[${MULTILIB_USEDEP}] + net-dns/libidn2:=[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + sys-devel/gettext + virtual/pkgconfig +" + +pkg_pretend() { + if use icu && use idn ; then + ewarn "\"icu\" and \"idn\" USE flags are enabled. Using \"idn\"." + fi +} + +multilib_src_configure() { + local emesonargs=( + $(meson_use test tests) + ) + + # Prefer idn even if icu is in USE as well + if use idn ; then + emesonargs+=( + -Druntime=libidn2 + -Dbuiltin=true + ) + elif use icu ; then + emesonargs+=( + -Druntime=libicu + -Dbuiltin=true + ) + else + emesonargs+=( + -Druntime=no + ) + fi + + meson_src_configure +} diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libpsl/metadata.xml b/sdk_container/src/third_party/portage-stable/net-libs/libpsl/metadata.xml new file mode 100644 index 00000000000..1d3589a229a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libpsl/metadata.xml @@ -0,0 +1,8 @@ + + + + + + rockdaboot/libpsl + + From 4c60a903b6bedbb0645362eefb5e40f7e4e9f16d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 30 Jan 2024 15:02:20 +0100 Subject: [PATCH 113/127] net-dns/libidn2: Sync with Gentoo It's from Gentoo commit 2a48d347910fca2b15a532e4568cfda3287c7a01. --- .../portage-stable/net-dns/libidn2/Manifest | 6 +- .../net-dns/libidn2/libidn2-2.3.2.ebuild | 58 ------------------- .../net-dns/libidn2/libidn2-2.3.4-r2.ebuild | 58 +++++++++++++++++++ .../net-dns/libidn2/libidn2-2.3.7.ebuild | 56 ++++++++++++++++++ .../net-dns/libidn2/metadata.xml | 1 + 5 files changed, 119 insertions(+), 60 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.4-r2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.7.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/Manifest b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/Manifest index 21d22503114..736b1cf2c4e 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/Manifest @@ -1,2 +1,4 @@ -DIST libidn2-2.3.2.tar.gz 2169556 BLAKE2B 6914630ecf6dcf18eb808dae933b819ee705c73011e6ffd68f8d14dd2c2ed084a9b504385c29988b2c4b439c6c8f2f552e47f4d624ae20d8b64767bf4d47f6a3 SHA512 958dbf49a47a84c7627ac182f4cc8ea452696cec3f0d1ff102a6c48e89893e772b2aa81f75da8223dfc6326515cca3ae085268fbf997828de9330c3a351152f1 -DIST libidn2-2.3.2.tar.gz.sig 488 BLAKE2B 832a5424034147a2c969fdbe0e094c23cda6305fe6411728f7727054571f54f6f056b939cf13023606dcb4f4bd85ed527b8e85bce6e56ed366e893ea16f8eb13 SHA512 0559b51b37c7937f3e1f8bf9de9b193f137f16b79d6673f85691a4f4a12ec132568e913848a70136f8522118817f7ecaa8432d353a5eff6b99a7be8719421fe0 +DIST libidn2-2.3.4.tar.gz 2083823 BLAKE2B 26ef58894ad51ca9775cf07edb1353a8aeb7af0df36ce8698425be216a067903797cdbc50c7644292c7e05b23c7bba35c9fe5e38c70e6f55784d8bcdd9c2fdb2 SHA512 a6e90ccef56cfd0b37e3333ab3594bb3cec7ca42a138ca8c4f4ce142da208fa792f6c78ca00c01001c2bc02831abcbaf1cf9bcc346a5290fd7b30708f5a462f3 +DIST libidn2-2.3.4.tar.gz.sig 228 BLAKE2B 0aa25bbd58b76724dc7f6d7a40dd578bf28f4b786c32933fae330c4330da8fabd549c45b579bfc0ef0178b10122e59c6b33bd78a8425c744dff2ace7e75018dd SHA512 d2a575723326ae256a60e3edf7766af65434f716e11f963bb7ac29b6b2ff2872b41684a1bd1c6f3a3921e8a083512eff1faf2b0fc02513095c2bcf3563312fe0 +DIST libidn2-2.3.7.tar.gz 2155214 BLAKE2B 40fde88e6be1e4665738855608a65c949834728463a3fb466192403f1076e99f7d399b9631308ff6776a28915251a0136ddfe6a67e8e010c7ccdb7fc64125d39 SHA512 eab5702bc0baed45492f8dde43a4d2ea3560ad80645e5f9e0cfa8d3b57bccd7fd782d04638e000ba07924a5d9f85e760095b55189188c4017b94705bef9b4a66 +DIST libidn2-2.3.7.tar.gz.sig 228 BLAKE2B 44f091a5a3ed7ad528ba404b4d1d1f60d1dae52e3c8173b633c30099e6e0405e51f46c954e4f5339b90d0fe883b5af34f8dbf704999e14aa4bd2f414a8473ad2 SHA512 00e5f8c3b6b1aef9ee341db99b339217080a57dbe65fba56798d60ad4be971a9535d8ae27e1f243b18b9fc9e900ada6c452b040a6c8094d5e05d8a76d1d79c03 diff --git a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.2.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.2.ebuild deleted file mode 100644 index a0e563e6100..00000000000 --- a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 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/libidn.asc -inherit multilib-minimal toolchain-funcs verify-sig - -DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)" -HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2" -SRC_URI=" - mirror://gnu/libidn/${P}.tar.gz - verify-sig? ( mirror://gnu/libidn/${P}.tar.gz.sig ) -" -S="${WORKDIR}"/${P/a/} - -LICENSE="GPL-2+ LGPL-3+" -SLOT="0/2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -RDEPEND=" - dev-libs/libunistring:=[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/perl - sys-apps/help2man - verify-sig? ( app-crypt/openpgp-keys-libidn ) -" - -src_prepare() { - default - - if [[ ${CHOST} == *-darwin* ]] ; then - # Darwin ar chokes when TMPDIR doesn't exist (as done for some - # reason in the Makefile) - sed -i -e '/^TMPDIR = /d' Makefile.in || die - export TMPDIR="${T}" - fi - - multilib_copy_sources -} - -multilib_src_configure() { - econf \ - CC_FOR_BUILD="$(tc-getBUILD_CC)" \ - $(use_enable static-libs static) \ - --disable-doc \ - --disable-gcc-warnings \ - --disable-gtk-doc -} - -multilib_src_install() { - default - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.4-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.4-r2.ebuild new file mode 100644 index 00000000000..9db88f00557 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.4-r2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic multilib-minimal toolchain-funcs verify-sig + +DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)" +HOMEPAGE=" + https://www.gnu.org/software/libidn/#libidn2 + https://gitlab.com/libidn/libidn2/ +" +SRC_URI=" + mirror://gnu/libidn/${P}.tar.gz + verify-sig? ( mirror://gnu/libidn/${P}.tar.gz.sig ) +" +S="${WORKDIR}"/${P/a/} + +LICENSE="|| ( GPL-2+ LGPL-3+ ) GPL-3+ unicode" +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="nls static-libs" + +RDEPEND=" + dev-libs/libunistring:=[${MULTILIB_USEDEP}] +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + dev-lang/perl + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-libidn ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libidn.asc + +multilib_src_configure() { + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + + local myconf=( + CC_FOR_BUILD="$(tc-getBUILD_CC)" + $(use_enable static-libs static) + $(multilib_native_use_enable nls) + --enable-doc + --disable-gcc-warnings + --disable-gtk-doc + --disable-valgrind-tests + ) + + local ECONF_SOURCE=${S} + econf "${myconf[@]}" +} + +multilib_src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.7.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.7.ebuild new file mode 100644 index 00000000000..b6e55750538 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/libidn2-2.3.7.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal toolchain-funcs verify-sig + +DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)" +HOMEPAGE=" + https://www.gnu.org/software/libidn/#libidn2 + https://gitlab.com/libidn/libidn2/ +" +SRC_URI=" + mirror://gnu/libidn/${P}.tar.gz + verify-sig? ( mirror://gnu/libidn/${P}.tar.gz.sig ) +" +S="${WORKDIR}"/${P/a/} + +LICENSE="|| ( GPL-2+ LGPL-3+ ) GPL-3+ unicode" +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="nls static-libs" + +RDEPEND=" + dev-libs/libunistring:=[${MULTILIB_USEDEP}] +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + dev-lang/perl + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-libidn ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libidn.asc + +multilib_src_configure() { + local myconf=( + CC_FOR_BUILD="$(tc-getBUILD_CC)" + $(use_enable static-libs static) + $(multilib_native_use_enable nls) + --enable-doc + --disable-gcc-warnings + --disable-gtk-doc + --disable-valgrind-tests + ) + + local ECONF_SOURCE=${S} + econf "${myconf[@]}" +} + +multilib_src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/metadata.xml b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/metadata.xml index 6c92a6952ce..c2652ef897a 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/libidn2/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-dns/libidn2/metadata.xml @@ -15,5 +15,6 @@ cpe:/a:libidn2_project:libidn2 + libidn/libidn2 From 79d126324625e0a54f30ce54e45d14a23e1f8097 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 30 Jan 2024 15:03:27 +0100 Subject: [PATCH 114/127] .github: Add more packages to automation --- .github/workflows/portage-stable-packages-list | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index de10a1620e5..81b21d2d6c3 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -399,6 +399,7 @@ net-analyzer/traceroute net-dns/bind-tools net-dns/c-ares net-dns/dnsmasq +net-dns/libidn2 net-firewall/ipset @@ -416,6 +417,7 @@ net-libs/libnfnetlink net-libs/libnftnl net-libs/libnsl net-libs/libpcap +net-libs/libpsl net-libs/libslirp net-libs/libssh2 net-libs/nghttp2 From 370953550dc1fccb65b3701e209eb3351d9f5847 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 30 Jan 2024 15:04:31 +0100 Subject: [PATCH 115/127] overlay profiles: Update accept keywords for net-misc/curl --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 9b9cfa429e7..fe65748be2d 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 @@ -64,7 +64,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-r2 ~amd64 ~arm64 +=net-misc/curl-8.5.0-r3 ~amd64 ~arm64 # Required to allow us to override the sftp subsystem in sshd config. =net-misc/openssh-9.4_p1 ~amd64 ~arm64 From a3e7a8914e6ec4396f626f91c04980b309aa7916 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 31 Jan 2024 11:07:01 +0100 Subject: [PATCH 116/127] overlay profiles: Add missing accept keywords for dev-libs/opensc No real harm done though, as this package exists only on SDK and we only have amd64 SDKs for now. --- .../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 fe65748be2d..b7a2d004eea 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 @@ -53,6 +53,7 @@ =dev-libs/libdnet-1.16.4 ~amd64 ~arm64 # Keep versions on both arches in sync. +=dev-libs/opensc-0.23.0-r3 ~arm64 =dev-util/bpftool-6.5.7 ~arm64 =net-firewall/conntrack-tools-1.4.6-r1 ~arm64 From 204be48fa11ea73a97164e6a1bf132f80966c2c8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 31 Jan 2024 11:07:40 +0100 Subject: [PATCH 117/127] overlay profiles: Update accept keywords for net-libs/gnutls --- .../profiles/coreos/base/package.accept_keywords | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index b7a2d004eea..c67713a51d2 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 @@ -57,8 +57,9 @@ =dev-util/bpftool-6.5.7 ~arm64 =net-firewall/conntrack-tools-1.4.6-r1 ~arm64 -# Required for addressing CVE-2023-0361 and CVE-2023-5981. -=net-libs/gnutls-3.8.2 ~amd64 ~arm64 +# Required for addressing CVE-2023-0361, CVE-2023-5981, CVE-2024-0567 +# and CVE-2024-0553. +=net-libs/gnutls-3.8.3 ~amd64 ~arm64 # Keep versions on both arches in sync. =net-libs/libnetfilter_cthelper-1.0.1-r1 ~arm64 From 0b6f5e184884210dccdf3b6a19c8b831556741dc Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 31 Jan 2024 11:08:25 +0100 Subject: [PATCH 118/127] overlay profiles: Drop accept keywords for sys-apps/coreutils --- .../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 c67713a51d2..656be409351 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 @@ -72,7 +72,6 @@ =net-misc/openssh-9.4_p1 ~amd64 ~arm64 # Keep versions on both arches in sync. -=sys-apps/coreutils-9.4 ~amd64 =sys-apps/kexec-tools-2.0.24 ~arm64 =sys-apps/util-linux-2.39.2-r1 ~amd64 From f72ac7430cf3ce0b0a375cf8262889f5cab820c0 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 31 Jan 2024 11:29:23 +0100 Subject: [PATCH 119/127] overlay profiles: Drop accept keywords for sys-devel/binutils --- .../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 656be409351..1813154079d 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,7 +79,6 @@ =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 1dfcf4822fcb782aee6310d5b6cc9136f9ca63d1 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 31 Jan 2024 11:39:42 +0100 Subject: [PATCH 120/127] overlay coreos/user-patches: Drop unnecessary patches for sys-devel/crossdev We updated the package to version that contains the change already. --- ...dev-debug-a-default-category-for-gdb.patch | 29 ------------------- .../user-patches/sys-devel/crossdev/README.md | 7 ----- 2 files changed, 36 deletions(-) delete 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 delete 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 deleted file mode 100644 index 271ad99f086..00000000000 --- 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 +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index a57699ea571..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-devel/crossdev/README.md +++ /dev/null @@ -1,7 +0,0 @@ -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. From 0576d56fae66fd50d2ec4960c784a3b54566ac47 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 31 Jan 2024 12:01:20 +0100 Subject: [PATCH 121/127] overlay coreos/user-patches: Update a README for sys-fs/xfsprogs patch --- .../coreos/user-patches/sys-fs/xfsprogs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-fs/xfsprogs/README.md b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-fs/xfsprogs/README.md index 45d471ae1bf..1c50e703e30 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-fs/xfsprogs/README.md +++ b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-fs/xfsprogs/README.md @@ -1 +1 @@ -Drop `0001-libfrog-Fix-cross-compilation-issue-with-randbytes.patch` when upstream or Gentoo includes it. +Drop `0001-libfrog-Fix-cross-compilation-issue-with-randbytes.patch` when updating to 6.5 or greater. From 8eb323d8f52d206cfde4c94f4a6f4aa1f0b1645a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 31 Jan 2024 12:01:35 +0100 Subject: [PATCH 122/127] overlay profiles: Drop accept keywords for sys-kernel/linux-headers --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 1813154079d..dad4115ef52 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 @@ -81,9 +81,6 @@ # Keep versions on both arches in sync. =sys-firmware/edk2-aarch64-18.02 ** -# 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 From 1463ab65c70e6937ced8aaaee858eb48a6ba3116 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 31 Jan 2024 12:02:34 +0100 Subject: [PATCH 123/127] overlay profiles: Drop accept keywords for sys-libs/binutils-libs --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index dad4115ef52..d9c8a11f774 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 @@ -81,9 +81,6 @@ # Keep versions on both arches in sync. =sys-firmware/edk2-aarch64-18.02 ** -# 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 6c4f097f619e1abcd989e6bb83610b69669062ee Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 31 Jan 2024 12:22:55 +0100 Subject: [PATCH 124/127] eclass/bash-completion-r1: Sync with Gentoo It's from Gentoo commit ff113c24e6def397ddf4f864e038480b94be33b8. --- .../portage-stable/eclass/bash-completion-r1.eclass | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass index caae6878e61..df1a2a54d39 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass @@ -43,11 +43,6 @@ esac _bash-completion-r1_get_bashdir() { debug-print-function ${FUNCNAME} "${@}" - # Flatcar: Take a fix for pkg-config paths from systemd.eclass. - # - # https://github.com/pkgconf/pkgconf/issues/205 - local -x PKG_CONFIG_FDO_SYSROOT_RULES=1 - if $(tc-getPKG_CONFIG) --exists bash-completion &>/dev/null; then local path path=$($(tc-getPKG_CONFIG) --variable="${1}" bash-completion) || die From 009ebb89c1da244e07eb5529649eac6977cd2a78 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 31 Jan 2024 12:25:03 +0100 Subject: [PATCH 125/127] .github: Add bash-completion eclass to automation --- .github/workflows/portage-stable-packages-list | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 81b21d2d6c3..06ff7499e14 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -307,9 +307,7 @@ eclass/acct-user.eclass eclass/alternatives.eclass eclass/app-alternatives.eclass eclass/autotools.eclass -# Still has some Flatcar modifications, will need to upstream it first. -# -# eclass/bash-completion-r1.eclass +eclass/bash-completion-r1.eclass eclass/cargo.eclass eclass/cmake-multilib.eclass eclass/cmake.eclass From 9f6479e58e17400520305533040984d4ddbd638e Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 31 Jan 2024 12:27:58 +0100 Subject: [PATCH 126/127] changelog: Add entries --- changelog/security/2024-01-31-weekly-updates.md | 3 +++ changelog/updates/2024-01-31-weekly-updates.md | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 changelog/security/2024-01-31-weekly-updates.md create mode 100644 changelog/updates/2024-01-31-weekly-updates.md diff --git a/changelog/security/2024-01-31-weekly-updates.md b/changelog/security/2024-01-31-weekly-updates.md new file mode 100644 index 00000000000..7d68fc5928a --- /dev/null +++ b/changelog/security/2024-01-31-weekly-updates.md @@ -0,0 +1,3 @@ +- vim ([CVE-2023-48231](https://nvd.nist.gov/vuln/detail/CVE-2023-48231), [CVE-2023-48232](https://nvd.nist.gov/vuln/detail/CVE-2023-48232), [CVE-2023-48233](https://nvd.nist.gov/vuln/detail/CVE-2023-48233), [CVE-2023-48234](https://nvd.nist.gov/vuln/detail/CVE-2023-48234), [CVE-2023-48235](https://nvd.nist.gov/vuln/detail/CVE-2023-48235), [CVE-2023-48236](https://nvd.nist.gov/vuln/detail/CVE-2023-48236), [CVE-2023-48237](https://nvd.nist.gov/vuln/detail/CVE-2023-48237), [CVE-2023-48706](https://nvd.nist.gov/vuln/detail/CVE-2023-48706)) +- gnutls ([CVE-2024-0567](https://nvd.nist.gov/vuln/detail/CVE-2024-0567), [CVE-2024-0553](https://nvd.nist.gov/vuln/detail/CVE-2024-0553)) +- gcc ([CVE-2023-4039](https://nvd.nist.gov/vuln/detail/CVE-2023-4039)) diff --git a/changelog/updates/2024-01-31-weekly-updates.md b/changelog/updates/2024-01-31-weekly-updates.md new file mode 100644 index 00000000000..1c1f606371d --- /dev/null +++ b/changelog/updates/2024-01-31-weekly-updates.md @@ -0,0 +1,12 @@ +- c-ares ([1.25.0](https://c-ares.org/changelog.html#1_25_0)) +- ethtool ([6.6](https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/tree/NEWS?h=v6.6)) +- less ([643](https://www.greenwoodsoftware.com/less/news.643.html)) +- libidn2 ([2.3.4](https://gitlab.com/libidn/libidn2/-/releases/v2.3.4)) +- libseccomp ([2.5.5](https://github.com/seccomp/libseccomp/releases/tag/v2.5.5)) +- libverto ([0.3.2](https://github.com/latchset/libverto/releases/tag/0.3.2)) +- libxml2 ([2.12.4](https://gitlab.gnome.org/GNOME/libxml2/-/blob/v2.12.4/NEWS)) +- mime-types ([2.1.54](https://pagure.io/mailcap/blob/9699055a1b4dfb90f7594ee2e8dda705fa56d3b8/f/NEWS)) +- multipath-tools ([0.9.7](https://github.com/opensvc/multipath-tools/commits/0.9.7)) +- usbutils ([017](https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/tree/NEWS?h=v017)) +- vim ([9.0.2167](https://github.com/vim/vim/commits/v9.0.2167/)) +- xmlsec ([1.3.3](https://github.com/lsh123/xmlsec/releases/tag/1.3.3)) From d86e41425673ba672467c5ba229d3a2d039dd15b Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 2 Feb 2024 11:31:25 +0100 Subject: [PATCH 127/127] overlay profiles: Add a workaround for handling pcscd user in SDK --- .../profiles/coreos/targets/sdk/make.defaults | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults index 218e9f090f7..4017242e593 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults @@ -16,3 +16,12 @@ QEMU_USER_TARGETS="aarch64" # add cros_host to bootstrapping USE flags so SDK / toolchains bootstrapping # will use vim's vimrc instead of baselayouts', BOOTSTRAP_USE="$BOOTSTRAP_USE cros_host" + +# The acct-user/pcscd package wants to add pcscd user to pcscd, openct +# and usb groups. The first two are writable so it succeeds, the last +# one, usb, is immutable - it's defined as a part of +# baselayout. Temporarily drop the usb group from the list. +# +# TODO: Drop this hack when user and group databases are dropped from +# baselayout. +ACCT_USER_PCSCD_GROUPS="pcscd openct"