From 8e954a83acca4c4ee5ab4c95e4def204a49d60c5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:56:55 +0000 Subject: [PATCH 01/23] dev-lang/perl: Sync with Gentoo It's from Gentoo commit 38f097b4daa0c859038a9c7e804ee52c3347ad66. --- .../src/third_party/portage-stable/dev-lang/perl/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-lang/perl/metadata.xml index d72260120d..c36cc7ac87 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/metadata.xml @@ -10,6 +10,7 @@ Enable 128bit floating point arithmetic via libquadmath + cpe:/a:perl:perl Perl/perl5 arsv/perl-cross From da240786190980ae33d7defb26027301d338a571 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:56:56 +0000 Subject: [PATCH 02/23] dev-libs/glib: Sync with Gentoo It's from Gentoo commit be9b6cc2dcdba8005503824981f36cd34a30775f. --- .../dev-libs/glib/glib-2.74.0-r1.ebuild | 2 +- .../dev-libs/glib/glib-2.74.0.ebuild | 288 ------------------ 2 files changed, 1 insertion(+), 289 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.0-r1.ebuild index 9c91688a8c..505345d239 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.0-r1.ebuild @@ -14,7 +14,7 @@ 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 +#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" diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.0.ebuild deleted file mode 100644 index 2afacc7da2..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.0.ebuild +++ /dev/null @@ -1,288 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{8..11} ) - -inherit flag-o-matic 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" - -# * 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},static-libs?] - >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] - kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) - selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) - xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) - elf? ( virtual/libelf:0= ) - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" -# libxml2 used for optional tests that get automatically skipped -BDEPEND=" - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - >=sys-devel/gettext-0.19.8 - gtk-doc? ( >=dev-util/gtk-doc-1.33 - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 ) - systemtap? ( >=dev-util/systemtap-1.3 ) - ${PYTHON_DEPS} - test? ( >=sys-apps/dbus-1.2.14 ) - virtual/pkgconfig -" -# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen - -PDEPEND=" - dbus? ( gnome-base/dconf ) - mime? ( x11-misc/shared-mime-info ) -" -# shared-mime-info needed for gio/xdgmime, bug #409481 -# dconf is needed to be able to save settings, bug #498436 - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gio-querymodules$(get_exeext) -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch - "${FILESDIR}"/${P}-clang-build.patch -) - -pkg_setup() { - if use kernel_linux ; then - CONFIG_CHECK="~INOTIFY_USER" - if use test ; then - CONFIG_CHECK="~IPV6" - WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." - fi - linux-info_pkg_setup - fi - python-any-r1_pkg_setup -} - -src_prepare() { - if use test; then - # TODO: Review the test exclusions, especially now with meson - # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 - if ! has_version dev-util/desktop-file-utils ; then - ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," - ewarn "think on installing it to get these tests run." - sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die - sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die - fi - - # gdesktopappinfo requires existing terminal (gnome-terminal or any - # other), falling back to xterm if one doesn't exist - #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then - # ewarn "Some tests will be skipped due to missing terminal program" - # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson - # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails - sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die - # desktop-app-info/launch* might fail similarly - sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die - #fi - - # https://bugzilla.gnome.org/show_bug.cgi?id=722604 - sed -i -e "/timer\/stop/d" glib/tests/timer.c || die - sed -i -e "/timer\/basic/d" glib/tests/timer.c || die - - ewarn "Tests for search-utils have been skipped" - sed -i -e "/search-utils/d" glib/tests/meson.build || die - - # Play nice with network-sandbox, but this approach would defeat the purpose of the test - #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die - else - # Don't build tests, also prevents extra deps, bug #512022 - sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die - fi - - # Don't build fuzzing binaries - not used - sed -i -e '/subdir.*fuzzing/d' meson.build || die - - # gdbus-codegen is a separate package - sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die - - # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon - sed -i -e '/install_dir/d' gio/tests/meson.build || die - - cat > "${T}/glib-test-ld-wrapper" <<-EOF - #!/usr/bin/env sh - exec \${LD:-ld} "\$@" - EOF - chmod a+x "${T}/glib-test-ld-wrapper" || die - sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die - - default - gnome2_environment_reset - # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only -} - -multilib_src_configure() { - if use debug; then - append-cflags -DG_ENABLE_DEBUG - else - append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833 - fi - - # 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=( - -Ddefault_library=$(usex static-libs both shared) - $(meson_feature selinux) - $(meson_use xattr) - -Dlibmount=enabled # only used if host_system == 'linux' - -Dman=true - $(meson_use systemtap dtrace) - $(meson_use systemtap) - $(meson_feature sysprof) - $(meson_native_use_bool gtk-doc gtk_doc) - $(meson_use test tests) - -Dinstalled_tests=false - -Dnls=enabled - -Doss_fuzz=disabled - $(meson_native_use_feature elf libelf) - -Dmultiarch=false - ) - meson_src_configure -} - -multilib_src_test() { - export XDG_CONFIG_DIRS=/etc/xdg - export XDG_DATA_DIRS=/usr/local/share:/usr/share - export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" - export LC_TIME=C # bug #411967 - export TZ=UTC - unset GSETTINGS_BACKEND # bug #596380 - python_setup - - # https://bugs.gentoo.org/839807 - local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} - addpredict /usr/b - - # Related test is a bit nitpicking - mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - - meson_src_test --timeout-multiplier 2 --no-suite flaky -} - -multilib_src_install() { - meson_src_install - keepdir /usr/$(get_libdir)/gio/modules -} - -multilib_src_install_all() { - # These are installed by dev-util/glib-utils - # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson - rm "${ED}/usr/bin/glib-genmarshal" || die - rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die - rm "${ED}/usr/bin/glib-mkenums" || die - rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die - rm "${ED}/usr/bin/gtester-report" || die - rm "${ED}/usr/share/man/man1/gtester-report.1" || die - # gdbus-codegen manpage installed by dev-util/gdbus-codegen - rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die -} - -pkg_preinst() { - xdg_pkg_preinst - - # Make gschemas.compiled belong to glib alone - local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"${cache} || die - fi - - multilib_pkg_preinst() { - # Make giomodule.cache belong to glib alone - local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"${cache} || die - else - touch "${ED}"${cache} || die - fi - } - - # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache - # file due to inability to create it and GIO might not look at any of the modules there - if ! tc-is-cross-compiler ; then - multilib_foreach_abi multilib_pkg_preinst - fi -} - -pkg_postinst() { - xdg_pkg_postinst - # glib installs no schemas itself, but we force update for fresh install in case - # something has dropped in a schemas file without direct glib dep; and for upgrades - # in case the compiled schema format could have changed - gnome2_schemas_update - - multilib_pkg_postinst() { - gnome2_giomodule_cache_update \ - || die "Update GIO modules cache failed (for ${ABI})" - } - if ! tc-is-cross-compiler ; then - multilib_foreach_abi multilib_pkg_postinst - else - ewarn "Updating of GIO modules cache skipped due to cross-compilation." - ewarn "You might want to run gio-querymodules manually on the target for" - ewarn "your final image for performance reasons and re-run it when packages" - ewarn "installing GIO modules get upgraded or added to the image." - fi - - for v in ${REPLACING_VERSIONS}; do - if ver_test "$v" "-lt" "2.63.6"; then - ewarn "glib no longer installs the gio-launch-desktop binary. You may need" - ewarn "to restart your session for \"Open With\" dialogs to work." - fi - done -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache - } - multilib_foreach_abi multilib_pkg_postrm - rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled - fi -} From 2af1a203eaf67f266aea2521a4978baa6459b5fc Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:56:59 +0000 Subject: [PATCH 03/23] dev-libs/libxml2: Sync with Gentoo It's from Gentoo commit 337cb12f6ac4729d216e81eda3552012ad065b87. --- .../portage-stable/dev-libs/libxml2/Manifest | 1 + .../dev-libs/libxml2/libxml2-2.10.3.ebuild | 194 ++++++++++++++++++ 2 files changed, 195 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.10.3.ebuild 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 f5ac9a3f16..cda56d9516 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,4 +1,5 @@ DIST libxml2-2.10.2.tar.xz 2636304 BLAKE2B 3ccc11ac73a81ee7ea3e565597c95e74923eba3d858c9a915aecf1dcf2fb6ab3e46c6ed2ea504261a822de2ac2132834ffa8ffd039e9e1390a9637a2dac7d6c5 SHA512 c26ee428ae2fae2326fcaec156ed36c5f5d63aeb4839d626f6544a3fad158a1602e9dc0d542b2f947e6a8de0c09ff130da2626a30aec27446ce09614f78466b5 +DIST libxml2-2.10.3.tar.xz 2639908 BLAKE2B aef2cc87e4632ddc478ff719155fdcb17601a8af37ecc1145ca05e01340935b57f07722e016ca2b27e4b269d47bd2fe97db09119a47849e8745e077e42b8bb66 SHA512 33bb87ae9a45c475c3de09477e5d94840d8f687f893ef7839408bc7267e57611c4f2b863ed8ec819a4b5f1ebd6a122db9f6054c73bceed427d37f3e67f62620c DIST libxml2-2.9.14-patches-r0.tar.bz2 8304 BLAKE2B 067faba5bfcbf81e2ef356925c0d3b4ef0aff7604db049366180b8217b781c60c2746be348c5e1a09de925e54fc69e3e431f7e2199ce326b6ff88ea9352ca45c SHA512 e97bada92a14ef0501a5f7be312d35d26eb52b648102d028dc11b3eef62ee0597540d0b474f54bd015a914a9cb7600d4dc34912b0ead5230136e945d80ae8428 DIST libxml2-2.9.14.tar.xz 3129968 BLAKE2B ab584503d5209e4aaf41ae6f44aed5e94c0ae29e28cfba39a9012568aa97515af861b47891b84d2a352a07357626ba50ddb1e344e911fa14ff2ce93c5beff1f1 SHA512 d08e6cafb289c499fdc5b3a12181e032a34f7a249bc66758859f964d3e71e19fd69be79921e1a9d8ab1e692d15b13f5fae95eeb10c3236974d89e218f5107606 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.10.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.10.3.ebuild new file mode 100644 index 0000000000..b8f7fa1688 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libxml2/libxml2-2.10.3.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Note: Please bump in sync with dev-libs/libxslt + +PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_REQ_USE="xml(+)" +inherit flag-o-matic python-r1 multilib-minimal + +XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" +XSTS_NAME_1="xmlschema2002-01-16" +XSTS_NAME_2="xmlschema2004-01-14" +XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" +XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" +XMLCONF_TARBALL="xmlts20130923.tar.gz" + +DESCRIPTION="XML C parser and toolkit" +HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2" + inherit autotools git-r3 +else + inherit gnome.org libtool + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +SRC_URI+=" + test? ( + ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} + ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} + https://www.w3.org/XML/Test/${XMLCONF_TARBALL} + )" +S="${WORKDIR}/${PN}-${PV%_rc*}" + +LICENSE="MIT" +SLOT="2" +IUSE="debug examples +ftp icu lzma +python readline static-libs test" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] + icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +if [[ ${PV} == 9999 ]] ; then + BDEPEND+=" dev-util/gtk-doc-am" +fi + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xml2-config +) + +DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO ) + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + else + local tarname=${P/_rc/-rc}.tar.xz + + # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, + # as they are needed as tarballs in ${S}/xstc instead and not unpacked + unpack ${tarname} + + if [[ -n ${PATCHSET_VERSION} ]] ; then + unpack ${PN}-${PATCHSET_VERSION}.tar.bz2 + fi + fi + + cd "${S}" || die + + if use test ; then + cp "${DISTDIR}/${XSTS_TARBALL_1}" \ + "${DISTDIR}/${XSTS_TARBALL_2}" \ + "${S}"/xstc/ \ + || die "Failed to install test tarballs" + unpack ${XMLCONF_TARBALL} + fi +} + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + else + # Please do not remove, as else we get references to PORTAGE_TMPDIR + # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. + elibtoolize + fi +} + +multilib_src_configure() { + # Filter seemingly problematic CFLAGS (bug #26320) + filter-flags -fprefetch-loop-arrays -funroll-loops + + # Notes: + # The meaning of the 'debug' USE flag does not apply to the --with-debug + # switch (enabling the libxml2 debug module). See bug #100898. + libxml2_configure() { + ECONF_SOURCE="${S}" econf \ + --enable-ipv6 \ + $(use_with ftp) \ + $(use_with debug run-debug) \ + $(use_with icu) \ + $(use_with lzma) \ + $(use_enable static-libs static) \ + $(multilib_native_use_with readline) \ + $(multilib_native_use_with readline history) \ + "$@" + } + + # Build python bindings separately + libxml2_configure --without-python + + multilib_is_native_abi && use python && + python_foreach_impl run_in_build_dir libxml2_configure --with-python +} + +libxml2_py_emake() { + pushd "${BUILD_DIR}"/python >/dev/null || die + + emake top_builddir="${NATIVE_BUILD_DIR}" "$@" + + popd >/dev/null || die +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use python ; then + NATIVE_BUILD_DIR="${BUILD_DIR}" + python_foreach_impl run_in_build_dir libxml2_py_emake all + fi +} + +multilib_src_test() { + ln -s "${S}"/xmlconf || die + + emake check + + multilib_is_native_abi && use python && + python_foreach_impl run_in_build_dir libxml2_py_emake check +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + multilib_is_native_abi && use python && + python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install + + # Hack until automake release is made for the optimise fix + # https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097 + multilib_is_native_abi && use python && python_foreach_impl python_optimize +} + +multilib_src_install_all() { + einstalldocs + + if ! use examples ; then + rm -rf "${ED}"/usr/share/doc/${PF}/examples || die + rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die + fi + + rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not + # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. + if [[ -n "${ROOT}" ]]; then + elog "Skipping XML catalog creation for stage building (bug #208887)." + else + # Need an XML catalog, so no-one writes to a non-existent one + CATALOG="${EROOT}/etc/xml/catalog" + + # We don't want to clobber an existing catalog though, + # only ensure that one is there + # + if [[ ! -e "${CATALOG}" ]]; then + [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" + "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" + einfo "Created XML catalog in ${CATALOG}" + fi + fi +} From 0eaf048d531227a663df0deee965c34dc73b6f0a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:57:01 +0000 Subject: [PATCH 04/23] dev-util/cmake: Sync with Gentoo It's from Gentoo commit 5d2e81a6bc33d743fffae2af549b9e4ef5c5b719. --- .../portage-stable/dev-util/cmake/cmake-3.24.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.24.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.24.2.ebuild index 9491df325a..53c17a9fa5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.24.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.24.2.ebuild @@ -47,7 +47,7 @@ else https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )" fi From ee0e4644a30d1a6a7b424d166c13c8bff3bc3e22 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:57:04 +0000 Subject: [PATCH 05/23] dev-util/gperf: Sync with Gentoo It's from Gentoo commit 4f154ab273d8371e14bb3d5963a2f41b446b306b. --- .../portage-stable/dev-util/gperf/metadata.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gperf/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/gperf/metadata.xml index d69e5f6f28..8ec7a6f186 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gperf/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/gperf/metadata.xml @@ -1,7 +1,10 @@ - - blueness@gentoo.org - + + blueness@gentoo.org + + + gperf + From 4fb3f3402aaa87fbabd8d7445dea3ae46aae75ed Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:57:07 +0000 Subject: [PATCH 06/23] dev-util/ninja: Sync with Gentoo It's from Gentoo commit 4c6daafd2e5188fd304f45b8f7f37d4a957a191c. --- .../portage-stable/dev-util/ninja/Manifest | 1 - .../dev-util/ninja/metadata.xml | 4 +- .../dev-util/ninja/ninja-1.11.0.ebuild | 133 ------------------ ...a-1.11.1.ebuild => ninja-1.11.1-r2.ebuild} | 6 +- .../dev-util/ninja/ninja-9999.ebuild | 4 +- 5 files changed, 9 insertions(+), 139 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.0.ebuild rename sdk_container/src/third_party/portage-stable/dev-util/ninja/{ninja-1.11.1.ebuild => ninja-1.11.1-r2.ebuild} (87%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/ninja/Manifest index b62f6953ec..4ccdb98ca1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/Manifest @@ -1,2 +1 @@ -DIST ninja-1.11.0.tar.gz 229475 BLAKE2B 71c8b6cf9524bdc11cf73f7e761f0d7deef2498a970c1439c10cc7d361e31fed1e3b54bcb185f3c7ed041f15704851a96e42560058af61b8a5df6e918d52ebf3 SHA512 9b9c8dae2251f9ddba50680911271b8504c292994fd90a0da94902f64c69a9edc72212217df5c651ddfc2f79c2ae03e84c99b805497dcd7497c53a1617de83e7 DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/ninja/metadata.xml index 500b650605..9f465f8c98 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/metadata.xml @@ -2,8 +2,8 @@ - chromium@gentoo.org - Chromium in Gentoo Project + base-system@gentoo.org + Gentoo Base System ninja-build/ninja diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.0.ebuild deleted file mode 100644 index 815e93ce74..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.0.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 2012-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..11} ) - -inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" -else - SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A small build system similar to make" -HOMEPAGE="https://ninja-build.org/" - -LICENSE="Apache-2.0" -SLOT="0" - -IUSE="doc emacs test vim-syntax" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${PYTHON_DEPS} - dev-util/re2c - doc? ( - app-text/asciidoc - app-doc/doxygen - dev-libs/libxslt - media-gfx/graphviz - ) - test? ( dev-cpp/gtest ) -" -RDEPEND=" - emacs? ( >=app-editors/emacs-23.1:* ) - vim-syntax? ( - || ( - app-editors/vim - app-editors/gvim - ) - ) -" - -PATCHES=( - "${FILESDIR}"/ninja-cflags.patch -) - -run_for_build() { - if tc-is-cross-compiler; then - local -x AR=$(tc-getBUILD_AR) - local -x CXX=$(tc-getBUILD_CXX) - local -x CFLAGS= - local -x CXXFLAGS=${BUILD_CXXFLAGS} - local -x LDFLAGS=${BUILD_LDFLAGS} - fi - echo "$@" >&2 - "$@" -} - -src_compile() { - tc-export AR CXX - - # configure.py appends CFLAGS to CXXFLAGS - unset CFLAGS - - run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die - - if tc-is-cross-compiler; then - mv ninja ninja-build || die - ${EPYTHON} configure.py || die - ./ninja-build -v ninja || die - else - ln ninja ninja-build || die - fi - - if use doc; then - ./ninja-build -v doxygen manual || die - fi - - if use emacs; then - elisp-compile misc/ninja-mode.el || die - fi -} - -src_test() { - if ! tc-is-cross-compiler; then - # Bug 485772 - ulimit -n 2048 - ./ninja -v ninja_test || die - ./ninja_test || die - fi -} - -src_install() { - dodoc README.md CONTRIBUTING.md - if use doc; then - docinto html - dodoc -r doc/doxygen/html/. - dodoc doc/manual.html - fi - dobin ninja - - newbashcomp misc/bash-completion "${PN}" - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax/ - doins misc/ninja.vim - - echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim" - insinto /usr/share/vim/vimfiles/ftdetect - doins "${T}/ninja.vim" - fi - - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _ninja - - if use emacs; then - cd misc || die - elisp-install ninja ninja-mode.el* || die - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild similarity index 87% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild index bedb66f577..477e2d2504 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild @@ -5,14 +5,14 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..11} ) -inherit edo bash-completion-r1 elisp-common python-any-r1 toolchain-funcs +inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" inherit git-r3 else SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="A small build system similar to make" @@ -59,6 +59,8 @@ src_compile() { # configure.py appends CFLAGS to CXXFLAGS unset CFLAGS + append-lfs-flags + run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die if tc-is-cross-compiler; then diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild index bedb66f577..49a69753e9 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..11} ) -inherit edo bash-completion-r1 elisp-common python-any-r1 toolchain-funcs +inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" @@ -59,6 +59,8 @@ src_compile() { # configure.py appends CFLAGS to CXXFLAGS unset CFLAGS + append-lfs-flags + run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die if tc-is-cross-compiler; then From c9ac737ae5966b4ddec2cc35abf46e6e9e322236 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:57:13 +0000 Subject: [PATCH 07/23] dev-vcs/git: Sync with Gentoo It's from Gentoo commit 3c834f5516ea38cb6c90d1937c98f02116ebeda3. --- .../third_party/portage-stable/dev-vcs/git/git-2.37.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.37.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.37.3.ebuild index e223810359..ac00d04d0a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.37.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.37.3.ebuild @@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" From 7651e9ef7c5804eb8500cadf67bea906f229f224 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:57:30 +0000 Subject: [PATCH 08/23] eclass/linux-mod: Sync with Gentoo It's from Gentoo commit 73a0e712c04bc84b642b9ee5f8fdf3ab52233804. --- .../portage-stable/eclass/linux-mod.eclass | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass b/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass index b7c13cbf7e..7e99938928 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/linux-mod.eclass @@ -150,8 +150,8 @@ # It's a read-only variable. It contains the extension of the kernel modules. case ${EAPI:-0} in - [67]) - inherit eutils + [67]) + inherit eutils ;; 8) ;; @@ -163,7 +163,7 @@ _LINUX_MOD_ECLASS=1 # TODO: When adding support for future EAPIs, please audit this list # for unused inherits and conditionalise them. -inherit linux-info multilib toolchain-funcs +inherit linux-info multilib multiprocessing toolchain-funcs case ${MODULES_OPTIONAL_USE_IUSE_DEFAULT:-n} in [nNfF]*|[oO][fF]*|0|-) _modules_optional_use_iuse_default='' ;; @@ -361,8 +361,8 @@ generate_modulesd() { debug-print-function ${FUNCNAME} $* [ -n "${MODULES_OPTIONAL_USE}" ] && use !${MODULES_OPTIONAL_USE} && return - local currm_path currm currm_t t myIFS myVAR - local module_docs module_enabled module_aliases \ + local currm_path currm currm_t t myIFS myVAR + local module_docs module_enabled module_aliases \ module_additions module_examples module_modinfo module_opts for currm_path in ${@} @@ -380,9 +380,9 @@ generate_modulesd() { module_additions="$(eval echo \${#MODULESD_${currm_t}_ADDITIONS[*]})" module_examples="$(eval echo \${#MODULESD_${currm_t}_EXAMPLES[*]})" - [[ ${module_aliases} -eq 0 ]] && unset module_aliases + [[ ${module_aliases} -eq 0 ]] && unset module_aliases [[ ${module_additions} -eq 0 ]] && unset module_additions - [[ ${module_examples} -eq 0 ]] && unset module_examples + [[ ${module_examples} -eq 0 ]] && unset module_examples # If we specify we dont want it, then lets exit, otherwise we assume # that if its set, we do want it. @@ -712,22 +712,26 @@ linux-mod_src_install() { cd "${objdir}" || die "${objdir} does not exist" insinto "${INSTALL_MOD_PATH}"/lib/modules/${KV_FULL}/${libdir} - # check here for CONFIG_MODULE_COMPRESS_ (NONE, GZIP, XZ, ZSTD) + # check here for CONFIG_MODULE_COMPRESS_ (NONE, GZIP, XZ, ZSTD) # and similarily compress the module being built if != NONE. if linux_chkconfig_present MODULE_COMPRESS_XZ; then - xz ${modulename}.${KV_OBJ} - doins ${modulename}.${KV_OBJ}.xz || die "doins ${modulename}.${KV_OBJ}.xz failed" + xz -T$(makeopts_jobs) --memlimit-compress=50% -q ${modulename}.${KV_OBJ} || die "Compressing ${modulename}.${KV_OBJ} with xz failed" + doins ${modulename}.${KV_OBJ}.xz elif linux_chkconfig_present MODULE_COMPRESS_GZIP; then - gzip ${modulename}.${KV_OBJ} - doins ${modulename}.${KV_OBJ}.gz || die "doins ${modulename}.${KV_OBJ}.gz failed" + if type -P pigz &>/dev/null ; then + pigz -p$(makeopts_jobs) ${modulename}.${KV_OBJ} || die "Compressing ${modulename}.${KV_OBJ} with pigz failed" + else + gzip ${modulename}.${KV_OBJ} || die "Compressing ${modulename}.${KV_OBJ} with gzip failed" + fi + doins ${modulename}.${KV_OBJ}.gz elif linux_chkconfig_present MODULE_COMPRESS_ZSTD; then - zstd ${modulename}.${KV_OBJ} - doins ${modulename}.${KV_OBJ}.zst || die "doins ${modulename}.${KV_OBJ}.zst failed" + zstd -T$(makeopts_jobs) ${modulename}.${KV_OBJ} || "Compressing ${modulename}.${KV_OBJ} with zstd failed" + doins ${modulename}.${KV_OBJ}.zst else - doins ${modulename}.${KV_OBJ} || die "doins ${modulename}.${KV_OBJ} failed" + doins ${modulename}.${KV_OBJ} fi - cd "${OLDPWD}" + cd "${OLDPWD}" || die "${OLDPWD} does not exist" generate_modulesd "${objdir}/${modulename}" done From a73204d43f56bda3fbe759bfe5ad8816603a91de Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:57:45 +0000 Subject: [PATCH 09/23] eclass/toolchain-funcs: Sync with Gentoo It's from Gentoo commit 96ddadb40ddba1bfdba68ff8f2fd889cfd004f03. --- .../eclass/toolchain-funcs.eclass | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass index 48bf11606c..32e446cb23 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass @@ -1173,4 +1173,68 @@ gen_usr_ldscript() { done } +# @FUNCTION: tc-get-cxx-stdlib +# @DESCRIPTION: +# Attempt to identify the C++ standard library used by the compiler. +# If the library is identified, the function returns 0 and prints one +# of the following: +# +# - ``libc++`` for ``sys-libs/libcxx`` +# - ``libstdc++`` for ``sys-devel/gcc``'s libstdc++ +# +# If the library is not recognized, the function returns 1. +tc-get-cxx-stdlib() { + local code='#include + +#if defined(_LIBCPP_VERSION) + HAVE_LIBCXX +#elif defined(__GLIBCXX__) + HAVE_LIBSTDCPP +#endif +' + local res=$( + $(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - \ + <<<"${code}" 2>/dev/null + ) + + case ${res} in + *HAVE_LIBCXX*) + echo libc++;; + *HAVE_LIBSTDCPP*) + echo libstdc++;; + *) + return 1;; + esac + + return 0 +} + +# @FUNCTION: tc-get-c-rtlib +# @DESCRIPTION: +# Attempt to identify the runtime used by the C/C++ compiler. +# If the runtime is identifed, the function returns 0 and prints one +# of the following: +# +# - ``compiler-rt`` for ``sys-libs/compiler-rt`` +# - ``libgcc`` for ``sys-devel/gcc``'s libgcc +# +# If the runtime is not recognized, the function returns 1. +tc-get-c-rtlib() { + local res=$( + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ + -print-libgcc-file-name 2>/dev/null + ) + + case ${res} in + *libclang_rt*) + echo compiler-rt;; + *libgcc*) + echo libgcc;; + *) + return 1;; + esac + + return 0 +} + fi From 9c78b78dceb5e949dffec13bfbb3c1fa1c8483dc Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:57:45 +0000 Subject: [PATCH 10/23] eclass/toolchain: Sync with Gentoo It's from Gentoo commit b2534ce5456f3d70a25035f573eb8747d7341d3d. --- .../portage-stable/eclass/toolchain.eclass | 71 +++++++++++++++---- 1 file changed, 57 insertions(+), 14 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 71342765c7..2bed15110e 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass @@ -6,6 +6,10 @@ # Toolchain Ninjas # @SUPPORTED_EAPIS: 7 8 # @BLURB: Common code for sys-devel/gcc ebuilds +# @DESCRIPTION: +# Common code for sys-devel/gcc ebuilds (and occasionally GCC forks, like +# GNAT for Ada). If not building GCC itself, please use toolchain-funcs.eclass +# instead. case ${EAPI} in 7) inherit eutils ;; @@ -57,6 +61,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } + # @FUNCTION: tc_version_is_at_least # @USAGE: ver1 [ver2] # @DESCRIPTION: @@ -138,6 +143,32 @@ GCCMINOR=$(ver_cut 2 ${GCC_PV}) # GCC micro version. GCCMICRO=$(ver_cut 3 ${GCC_PV}) +tc_use_major_version_only() { + local use_major_version_only=0 + + if ! tc_version_is_at_least 10 ; then + return 1 + fi + + if [[ ${GCCMAJOR} -eq 10 ]] && ver_test ${PV} -ge 10.4.1_p20220929 ; then + use_major_version_only=1 + elif [[ ${GCCMAJOR} -eq 11 ]] && ver_test ${PV} -ge 11.3.1_p20220930 ; then + use_major_version_only=1 + elif [[ ${GCCMAJOR} -eq 12 ]] && ver_test ${PV} -ge 12.2.1_p20221001 ; then + use_major_version_only=1 + elif [[ ${GCCMAJOR} -eq 13 ]] && ver_test ${PV} -ge 13.0.0_pre20221002 ; then + use_major_version_only=1 + elif [[ ${GCCMAJOR} -gt 13 ]] ; then + use_major_version_only=1 + fi + + if [[ ${use_major_version_only} -eq 1 ]] ; then + return 0 + fi + + return 1 +} + # @ECLASS_VARIABLE: GCC_CONFIG_VER # @INTERNAL # @DESCRIPTION: @@ -145,7 +176,11 @@ GCCMICRO=$(ver_cut 3 ${GCC_PV}) # of binary and gcc-config names not directly tied to upstream # versioning. In practice it's hard to untangle from gcc/BASE-VER # (GCC_RELEASE_VER) value. -GCC_CONFIG_VER=${GCC_RELEASE_VER} +if tc_use_major_version_only ; then + GCC_CONFIG_VER=${GCCMAJOR} +else + GCC_CONFIG_VER=${GCC_RELEASE_VER} +fi # Pre-release support. Versioning schema: # 1.0.0_pre9999: live ebuild @@ -830,7 +865,7 @@ make_gcc_hard() { # Most other distros use the logic (including mainline gcc): # lib - 32bit binaries (x86) # lib64 - 64bit binaries (x86_64) -# Over time, Gentoo is migrating to the latter form. +# Over time, Gentoo is migrating to the latter form (17.1 profiles). # # Unfortunately, due to distros picking the lib32 behavior, newer gcc # versions will dynamically detect whether to use lib or lib32 for its @@ -1006,6 +1041,10 @@ toolchain_src_configure() { --with-pkgversion="${BRANDING_GCC_PKGVERSION}" ) + if tc_use_major_version_only ; then + confgcc+=( --with-gcc-major-version-only ) + fi + # If we want hardened support with the newer PIE patchset for >=gcc 4.4 if tc_version_is_at_least 4.4 && want_minispecs && in_iuse hardened ; then confgcc+=( $(use_enable hardened esp) ) @@ -1975,16 +2014,20 @@ toolchain_src_install() { fi done - # We remove the generated fixincludes, as they can cause things to break - # (ncurses, openssl, etc). We do not prevent them from being built, as - # in the following commit which we revert: - # https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.647&r2=1.648 - # This is because bsd userland needs fixedincludes to build gcc, while - # linux does not. Both can dispose of them afterwards. - while read x ; do - grep -q 'It has been auto-edited by fixincludes from' "${x}" \ - && rm -f "${x}" - done < <(find gcc/include*/ -name '*.h') + # Re-enable fixincludes for >= GCC 13 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107128 + if [[ ${GCCMAJOR} -lt 13 ]] ; then + # We remove the generated fixincludes, as they can cause things to break + # (ncurses, openssl, etc). We do not prevent them from being built, as + # in the following commit which we revert: + # https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.647&r2=1.648 + # This is because bsd userland needs fixedincludes to build gcc, while + # linux does not. Both can dispose of them afterwards. + while read x ; do + grep -q 'It has been auto-edited by fixincludes from' "${x}" \ + && rm -f "${x}" + done < <(find gcc/include*/ -name '*.h') + fi if is_jit ; then # See https://gcc.gnu.org/onlinedocs/gcc-11.3.0/jit/internals/index.html#packaging-notes @@ -2713,11 +2756,11 @@ toolchain_death_notice() { pushd "${WORKDIR}"/build >/dev/null (echo '' | $(tc-getCC ${CTARGET}) ${CFLAGS} -v -E - 2>&1) > gccinfo.log [[ -e "${T}"/build.log ]] && cp "${T}"/build.log . - tar jcf "${WORKDIR}"/gcc-build-logs.tar.bz2 \ + tar -acf "${WORKDIR}"/gcc-build-logs.tar.xz \ gccinfo.log build.log $(find -name config.log) rm gccinfo.log build.log eerror - eerror "Please include ${WORKDIR}/gcc-build-logs.tar.bz2 in your bug report." + eerror "Please include ${WORKDIR}/gcc-build-logs.tar.xz in your bug report." eerror popd >/dev/null fi From 91fe294a2b37db508f8c62cbc856432ec89dfa97 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:57:51 +0000 Subject: [PATCH 11/23] licenses: Sync with Gentoo It's from Gentoo commit f1231fa3a4a50b5d4d235f2a9de93b08d52da8bf. --- .../portage-stable/licenses/coldspringharbor | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/licenses/coldspringharbor diff --git a/sdk_container/src/third_party/portage-stable/licenses/coldspringharbor b/sdk_container/src/third_party/portage-stable/licenses/coldspringharbor new file mode 100644 index 0000000000..27f85e9e0c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/licenses/coldspringharbor @@ -0,0 +1,20 @@ +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. See the Artistic License file +in the main Perl distribution for specific terms and conditions of +use. In addition, the following disclaimers apply: + +CSHL makes no representations whatsoever as to the SOFTWARE contained +herein. It is experimental in nature and is provided WITHOUT WARRANTY +OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE OR ANY OTHER +WARRANTY, EXPRESS OR IMPLIED. CSHL MAKES NO REPRESENTATION OR +WARRANTY THAT THE USE OF THIS SOFTWARE WILL NOT INFRINGE ANY PATENT OR +OTHER PROPRIETARY RIGHT. + +By downloading this SOFTWARE, your Institution hereby indemnifies CSHL +against any loss, claim, damage or liability, of whatsoever kind or +nature, which may arise from your Institution's respective use, +handling or storage of the SOFTWARE. + +If publications result from research using this SOFTWARE, we ask that +CSHL be acknowledged and/or credit be given to CSHL scientists, as +scientifically appropriate. From 0961dcbcd1a5f25b53bd08fe00b30a53b6c273fd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:57:52 +0000 Subject: [PATCH 12/23] net-analyzer/nmap: Sync with Gentoo It's from Gentoo commit 3115ab568925606e26785f49d40aceeb34d9d47e. --- .../portage-stable/net-analyzer/nmap/nmap-7.93.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-7.93.ebuild b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-7.93.ebuild index 7c6ddc0d5b..1c9da57558 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-7.93.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/nmap/nmap-7.93.ebuild @@ -22,7 +22,7 @@ else SRC_URI="https://nmap.org/dist/${P}.tar.bz2" SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi LICENSE="|| ( NPSL GPL-2 )" From eeeb4ae51c5ce49fba9cd2ed9bc2037d2b53d86f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:57:52 +0000 Subject: [PATCH 13/23] net-libs/gnutls: Sync with Gentoo It's from Gentoo commit 54129afda5119acd43615ca57d6c004f35aa13df. --- .../portage-stable/net-libs/gnutls/Manifest | 2 + .../net-libs/gnutls/gnutls-3.7.8.ebuild | 144 ++++++++++++++++++ 2 files changed, 146 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.8.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 f468c56dbe..20aefd7eca 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 @@ -2,3 +2,5 @@ DIST gnutls-3.7.6.tar.xz 6338276 BLAKE2B 9f3cce8dfc0b88f2c42d1d2633417dac649a265 DIST gnutls-3.7.6.tar.xz.sig 685 BLAKE2B eae022d6cb0d772e465257411381afd97f3dfd19d6f794a1c3e0f8c3c1232a8a1b91269ca7252a5662782183b11ca393c31efe3f88171a526884400fd0534528 SHA512 c969da9a938b9d29a70cea3b00cce337f9a4c4304aae7f501ef6263894f81a420395ddbe1b005f35dff2e900d3fac75e288f10bbfde0ebea034f7e257bb16d0e DIST gnutls-3.7.7.tar.xz 6351664 BLAKE2B a66037ecc6da660ff12949f50012840263c2e0b174079e41b62a2d884f060cee56f0c64a2815d07321a54b08cce016d2b4c8f0e059636c1ab5f7db9c8d64c7c6 SHA512 ba00b20126379ec7e96c6bfa606cfb7bb0d9a5853318b29b5278a42a85ae40d39d8442778938e1f165debcdb1adaf9c63bcec59a4eb3387dd1ac99b08bcc5c08 DIST gnutls-3.7.7.tar.xz.sig 685 BLAKE2B 53d76a06ed5a74664d6c193459eb310f06e87dd3db97aca9e9fa78837677df58d8de66f187c182b9375786ee0308c5da55f08414183c959c7acb4527c38cd7c7 SHA512 6463bc4661e20051ff9f31c1a557cece34d06b748f4e24f98e807ddc72a3daa9348aa9f0afa83a0f9cd226421c575210eec1936fbeb9a55849e2c397ace9d03d +DIST gnutls-3.7.8.tar.xz 6029220 BLAKE2B 0a21e63c7cb0ba4eeff23593c7282e0b4d704fa2d2a1cd5289998fd04b58ea36fc343f872225ad05478e278b1cdebbcd0fd376459abcb58547f8fa1488485530 SHA512 4199bcf7c9e3aab2f52266aadceefc563dfe2d938d0ea1f3ec3be95d66f4a8c8e5494d3a800c03dd02ad386dec1738bd63e1fe0d8b394a2ccfc7d6c6a0cc9359 +DIST gnutls-3.7.8.tar.xz.sig 1250 BLAKE2B 66c6a335c3b2290a4e44ffa6ae715ad71d2bcd7df485c1d2d9490985d9dcd445768d6eb021ad3a61614431183c6652254c63ebd8abd0f0a03d3164a6193b6192 SHA512 cecf9843e8683a278d065b663dc98ac2b5fcad1905ee25333038c93c2289b518c974629367e77e66552ac1c9d122d551616edba35cb0c4204202ec676f1a2db7 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 new file mode 100644 index 0000000000..3995f16eed --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/gnutls/gnutls-3.7.8.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/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+" +SLOT="0/30.30" # . +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib zstd" + +REQUIRED_USE="test-full? ( cxx dane doc examples guile 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}] ) + guile? ( >=dev-scheme/guile-2:=[networking] ) + 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-util/gtk-doc-am + >=virtual/pkgconfig-0-r1 + doc? ( dev-util/gtk-doc ) + nls? ( sys-devel/gettext ) + valgrind? ( dev-util/valgrind ) + test-full? ( + app-crypt/dieharder + >=app-misc/datefudge-1.22 + dev-libs/softhsm:2[-bindist(-)] + net-dialup/ppp + net-misc/socat + ) + verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20221017 )" + +DOCS=( README.md doc/certtool.cfg ) + +HTML_DOCS=() + +pkg_setup() { + # bug #520818 + export TZ=UTC + + use doc && HTML_DOCS+=( + doc/gnutls.html + ) +} + +src_prepare() { + default + + # 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 ) + + # Cygwin as does not understand these asm files at all + [[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration ) + + # -fanalyzer substantially slows down the build and isn't useful for + # us. It's useful for upstream as it's static analysis, but it's not + # useful when just getting something built. + export gl_cv_warn_c__fanalyzer=no + + local myeconfargs=( + $(multilib_native_enable manpages) + $(multilib_native_use_enable doc gtk-doc) + $(multilib_native_use_enable doc) + $(multilib_native_use_enable guile) + $(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) + $(multilib_native_use_enable valgrind valgrind-tests) + $(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 4fae768ab9c4cfee15811ae96cf2022d2df40f88 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:57:53 +0000 Subject: [PATCH 14/23] profiles: Sync with Gentoo It's from Gentoo commit 955cb7098a87be09d519a9ebc5ef73fc0ce64a62. --- .../profiles/arch/alpha/package.use.mask | 10 +- .../profiles/arch/amd64/package.use.mask | 12 +- .../arch/amd64/package.use.stable.mask | 4 +- .../profiles/arch/amd64/use.mask | 4 + .../profiles/arch/amd64/x32/package.mask | 2 +- .../profiles/arch/amd64/x32/package.use.mask | 4 +- .../profiles/arch/arm/package.use.mask | 16 +- .../profiles/arch/arm/package.use.stable.mask | 4 - .../portage-stable/profiles/arch/arm/use.mask | 4 + .../profiles/arch/arm64/package.use.mask | 4 + .../profiles/arch/arm64/use.mask | 4 + .../profiles/arch/base/package.use.mask | 20 +- .../profiles/arch/base/use.force | 7 +- .../profiles/arch/base/use.mask | 6 +- .../profiles/arch/hppa/package.use.mask | 6 +- .../profiles/arch/hppa/use.mask | 4 - .../profiles/arch/ia64/package.use.mask | 17 +- .../profiles/arch/ia64/use.mask | 4 - .../profiles/arch/loong/package.use.mask | 6 + .../profiles/arch/m68k/package.use.mask | 2 +- .../profiles/arch/mips/package.use.mask | 5 + .../profiles/arch/mips/use.mask | 5 - .../profiles/arch/powerpc/package.use.mask | 14 +- .../arch/powerpc/ppc32/package.use.mask | 7 +- .../arch/powerpc/ppc64/32ul/package.use.mask | 4 - .../arch/powerpc/ppc64/64le/package.mask | 2 +- .../profiles/arch/powerpc/ppc64/package.mask | 6 +- .../arch/powerpc/ppc64/package.use.mask | 9 + .../profiles/arch/powerpc/use.mask | 4 + .../profiles/arch/riscv/package.use.force | 8 +- .../profiles/arch/riscv/package.use.mask | 14 +- .../profiles/arch/riscv/use.mask | 6 +- .../profiles/arch/s390/use.mask | 4 - .../profiles/arch/sparc/package.use.mask | 11 +- .../profiles/arch/sparc/use.mask | 1 - .../profiles/arch/x86/package.mask | 3 + .../profiles/arch/x86/package.use.mask | 9 + .../profiles/arch/x86/package.use.stable.mask | 2 +- .../portage-stable/profiles/arch/x86/use.mask | 4 + .../profiles/base/make.defaults | 2 +- .../profiles/base/package.use.force | 6 - .../profiles/base/package.use.mask | 30 +- .../profiles/base/package.use.stable.mask | 9 - .../portage-stable/profiles/base/use.mask | 4 + .../profiles/base/use.stable.mask | 4 + .../amd64/17.0/musl/clang/package.use.mask | 6 + .../linux/amd64/17.0/musl/clang/parent | 2 +- .../linux/amd64/17.0/musl/package.mask | 7 +- .../default/linux/amd64/17.1/clang/parent | 2 +- .../linux/amd64/17.1/systemd/clang/parent | 2 +- .../linux/arm64/17.0/llvm}/eapi | 0 .../linux/arm64/17.0/llvm/packages.build | 9 + .../default/linux/arm64/17.0/llvm/parent | 2 + .../default/linux/arm64/17.0/musl/llvm/eapi | 1 + .../arm64/17.0/musl/llvm/package.use.mask | 6 + .../default/linux/arm64/17.0/musl/llvm/parent | 2 + .../linux/arm64/17.0/systemd/llvm/eapi | 1 + .../arm64/17.0/systemd/llvm/packages.build | 9 + .../linux/arm64/17.0/systemd/llvm/parent | 2 + .../default/linux/ppc/17.0/musl/parent | 1 + .../profiles/desc/php_targets.desc | 1 + .../profiles/desc/postgres_targets.desc | 3 +- .../profiles/embedded/make.defaults | 2 +- .../profiles/features/llvm/eapi | 1 + .../features/{clang => llvm}/make.defaults | 0 .../{clang => llvm}/package.accept_keywords | 0 .../features/{clang => llvm}/package.use | 1 + .../features/{clang => llvm}/package.use.mask | 0 .../features/{clang => llvm}/packages | 0 .../features/{clang => llvm}/packages.build | 0 .../features/{clang => llvm}/use.force | 0 .../profiles/features/musl/package.mask | 397 ++++++------- .../profiles/features/musl/package.use.force | 4 + .../profiles/features/musl/package.use.mask | 61 +- .../features/musl/package.use.stable.mask | 6 + .../profiles/features/musl/use.mask | 29 +- .../profiles/features/wd40/package.mask | 3 + .../profiles/features/wd40/use.force | 6 + .../profiles/features/wd40/use.mask | 4 + .../portage-stable/profiles/license_groups | 2 +- .../profiles/package.deprecated | 33 ++ .../portage-stable/profiles/package.mask | 525 +++++++++--------- .../prefix/darwin/macos/10.5/package.use.mask | 8 - .../profiles/prefix/darwin/macos/package.mask | 6 - .../portage-stable/profiles/profiles.desc | 73 +-- .../profiles/targets/systemd/make.defaults | 4 +- .../portage-stable/profiles/updates/3Q-2022 | 3 + .../portage-stable/profiles/updates/4Q-2022 | 5 + .../portage-stable/profiles/use.desc | 2 + 89 files changed, 897 insertions(+), 647 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/clang/package.use.mask rename sdk_container/src/third_party/portage-stable/profiles/{features/clang => default/linux/arm64/17.0/llvm}/eapi (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/llvm/packages.build create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/llvm/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/llvm/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/llvm/package.use.mask create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/llvm/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/eapi create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/packages.build create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/parent create mode 100644 sdk_container/src/third_party/portage-stable/profiles/features/llvm/eapi rename sdk_container/src/third_party/portage-stable/profiles/features/{clang => llvm}/make.defaults (100%) rename sdk_container/src/third_party/portage-stable/profiles/features/{clang => llvm}/package.accept_keywords (100%) rename sdk_container/src/third_party/portage-stable/profiles/features/{clang => llvm}/package.use (81%) rename sdk_container/src/third_party/portage-stable/profiles/features/{clang => llvm}/package.use.mask (100%) rename sdk_container/src/third_party/portage-stable/profiles/features/{clang => llvm}/packages (100%) rename sdk_container/src/third_party/portage-stable/profiles/features/{clang => llvm}/packages.build (100%) rename sdk_container/src/third_party/portage-stable/profiles/features/{clang => llvm}/use.force (100%) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.stable.mask create mode 100644 sdk_container/src/third_party/portage-stable/profiles/features/wd40/use.force delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.5/package.use.mask create mode 100644 sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2022 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 11026d6ba4..f430ba409c 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-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# matoro (2022-09-30) +# Per Sam: avoid app-emacs/flycheck deptree, bug #873541 +dev-util/pkgcheck emacs + # matoro (2022-09-22) # Unable to test due to mask, bug #763963 net-misc/openntpd constraints @@ -30,10 +34,6 @@ media-libs/imlib2 svg heif jpegxl # app-text/nuspell is not keyworded app-text/enchant nuspell -# Matt Turner (2022-04-16) -# sys-auth/seatd is not keyworded -dev-libs/weston seatd - # Lars Wendler (2022-04-01) # gnome-base/librsvg missing keywords media-libs/freetype svg @@ -180,7 +180,7 @@ gnome-base/nautilus previewer # needs libgdata[gnome-online-accounts], depends on net-libs/webkit-gtk gnome-base/gvfs google # needs app-text/libgepub which depends on webkit-gtk -xfce-extra/tumbler epub +xfce-base/tumbler epub # Michał Górny (2020-06-14) # Requires dev-python/networkx. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask index 8b3916f244..b9031a92a7 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask @@ -17,6 +17,11 @@ #--- END OF EXAMPLES --- +# WANG Xuerui (2022-10-07) +# sys-libs/libsmbios is available here. +app-laptop/pbbuttonsd -macbook +sys-apps/fwupd -dell + # Alfredo Tupone (2022-08-30) # ada bootstrap currently only available on amd64/x86 sys-devel/gcc -ada @@ -35,7 +40,7 @@ media-sound/qmmp -xmp # Kai-Chun Ning (2022-05-23) # Need intel-hybrid-codec-driver, which only works on amd64 -x11-libs/libva-intel-driver -hybrid +media-libs/libva-intel-driver -hybrid # James Le Cuirot (2021-10-22) # The JIT feature only works on amd64 and x86. @@ -218,11 +223,6 @@ dev-util/catalyst -system-bootloader # Mask everywhere, unmask where appropriate. media-video/mpv -vulkan -# Nick Sarnie (2018-04-29) -# media-libs/vulkan-loader and app-emulation/vkd3d are keyworded on amd64 -app-emulation/wine-staging -vulkan -app-emulation/wine-vanilla -vkd3d -vulkan - # Richard Yao (2018-04-16) # sys-fs/zfs is keyworded on amd64 sys-cluster/ceph -zfs 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 875a20d936..bb1c0370eb 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 @@ -18,9 +18,9 @@ #--- END OF EXAMPLES --- # Kai-Chun Ning (2022-05-23) -# Dependency x11-libs/intel-hybrid-codec-driver is only available on unstable +# Dependency media-libs/intel-hybrid-codec-driver is only available on unstable # branch -x11-libs/libva-intel-driver hybrid +media-libs/libva-intel-driver hybrid # Adel Kara Slimane (2022-03-14) # needs stabilizing 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 173918986b..959adab62d 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 @@ -4,6 +4,10 @@ # Unmask the flag which corresponds to ARCH. -amd64 +# matoro (2022-09-29) +# dev-util/google-perftools is supported here +-tcmalloc + # Matt Turner (2022-04-16) # dev-util/sysprof-capture is keyworded on amd64 -sysprof diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask index acd5a24333..a7c1448efa 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask @@ -3,7 +3,7 @@ # Kai-Chun Ning (2022-05-26) # intel-hybrid-codec-driver does not work on x32 -x11-libs/intel-hybrid-codec-driver +media-libs/intel-hybrid-codec-driver # Jonas Licht (2022-05-01) # Requires net-libs/nodejs, plus mask all reverse-dependecies. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.use.mask index a960225a3a..ea7045e603 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.use.mask @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # Kai-Chun Ning (2022-05-26) -# Dependency x11-libs/intel-hybrid-codec-driver does not work on x32 -x11-libs/libva-intel-driver hybrid +# Dependency media-libs/intel-hybrid-codec-driver does not work on x32 +media-libs/libva-intel-driver hybrid # Andreas Sturmlechner (2021-02-09) # dev-qt/qtwebengine requires net-libs/nodejs, plus mask all 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 de6c9748e4..4e846eeb77 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-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Volkmar W. Pogatzki (2022-08-09) +# dev-java/jaxws-api not keyworded +>=dev-java/jmock-2.12.0 test + # Bernd Waibel (2022-09-16) # dev-libs/optix depends on x11-drivers/nvidia-drivers, # which lacks arm support @@ -175,13 +179,9 @@ net-analyzer/rrdtool rados sys-fs/multipath-tools rbd www-servers/uwsgi uwsgi_plugins_rados -# Anthony G. Basile (2019-03-08) -# hipe code is missing in erlang for arm -dev-lang/erlang hipe - # Andreas Sturmlechner (2019-02-25) -# (SM)BIOS/Thunderbolt outside of amd64/x86? - citation needed -sys-apps/fwupd dell thunderbolt +# (SM)BIOS outside of amd64/x86? - citation needed +sys-apps/fwupd dell # Thomas Deutschmann (2018-10-12) # Requires www-client/firefox which isn't available on ARM yet @@ -248,10 +248,6 @@ dev-libs/libsecp256k1 -asm # DOSBox + OpenGLide is untested on this arch. games-emulation/dosbox glide -# Thomas Deutschmann (2016-12-04) -# sci-libs/gdal[mdb] requires dev-java/jackcess which is not keyworded ->=sci-libs/gdal-2.0.3 mdb - # Ettore Di Giacinto (2016-11-10) # Dependency has no stable keyword # and as for now we have only stable mate versions diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask index 730ecc16d4..b149b0eec5 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.use.stable.mask @@ -148,10 +148,6 @@ media-video/mpv raspberry-pi # net-misc/libteam is not yet stable on arm net-misc/networkmanager teamd -# Pacho Ramos (2015-10-03) -# Missing stable, bug #529462 -media-gfx/graphviz java - # Markus Meier (2015-07-19) # Missing stable media-libs/gegl umfpack diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.mask index fba199bc66..654c40b633 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/use.mask @@ -4,6 +4,10 @@ # Unmask the flag which corresponds to ARCH. -arm +# matoro (2022-09-29) +# dev-util/google-perftools is supported here +-tcmalloc + # Michał Górny (2021-01-07) # Prebuilt kernels are supported here. -dist-kernel 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 a54c74e4c0..5609dc9012 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Volkmar W. Pogatzki (2022-08-09) +# dev-java/jaxws-api not keyworded +>=dev-java/jmock-2.12.0 test + # Alexey Shvetsov (2022-09-15) # Mask nvml use flag for slurm sys-cluster/slurm nvml diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.mask index 1aa7b0ba54..57064e39a9 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/use.mask @@ -4,6 +4,10 @@ # Unmask the flag which corresponds to ARCH. -arm64 +# matoro (2022-09-29) +# dev-util/google-perftools is supported here +-tcmalloc + # Mike Gilbert (2022-08-31) # Requires the following packages to be keyworded/stable: # sys-libs/libapparmor 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 f2c9176131..26044840a0 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,19 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Mike Gilbert (2022-10-16) +# Only supported on MIPS. +dev-lang/gnat-gpl fixed-point +sys-devel/gcc fixed-point + +# WANG Xuerui (2022-10-07) +# sys-libs/libsmbios unavailable on most arches (requires the very low-level +# header that is only ever present on alpha, amd64, ia64 and x86), +# only unmask on relevant arches. +# bug #875830 +app-laptop/pbbuttonsd macbook +sys-apps/fwupd dell + # Conrad Kostecki (2022-07-19) # www-servers/nginx requires keywording www-servers/nginx nginx_modules_http_security @@ -10,7 +23,7 @@ media-sound/qmmp xmp # Kai-Chun Ning (2022-05-23) # Need intel-hybrid-codec-driver, which only works on amd64 -x11-libs/libva-intel-driver hybrid +media-libs/libva-intel-driver hybrid # WANG Xuerui (2022-04-24) # This is only for bringing in the not-upstreamed-yet LoongArch patchset; @@ -204,11 +217,6 @@ dev-util/catalyst system-bootloader # Mask everywhere, unmask where appropriate. media-video/mpv vulkan -# Nick Sarnie (2018-04-29) -# media-libs/vulkan-loader and app-emulation/vkd3d are not available everywhere -app-emulation/wine-staging vulkan -app-emulation/wine-vanilla vkd3d vulkan - # Richard Yao (2018-04-16) # sys-fs/zfs is not available everywhere. sys-cluster/ceph zfs diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.force index 30802cd5b3..b44881f462 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.force +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.force @@ -1,6 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Michał Górny (2022-10-09) +# We want to run all tests by default. This flag is disabled in wd40 +# profiles to avoid unresolved dependencies. +test-rust + # James Le Cuirot (2017-06-29) # Forced and masked by default. Unmask where necessary. big-endian diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.mask index 649d66b60a..1d46d81afb 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/base/use.mask @@ -1,6 +1,11 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# matoro (2022-09-29) +# Pulls in dev-util/google-perftools, which is arch-specific +# Unmask on supported arches. +tcmalloc + # Michał Górny (2021-01-07) # Prebuilt kernels are not supported on all architectures. dist-kernel @@ -75,7 +80,6 @@ cpu_flags_ppc_vsx3 ppcsha1 # mips arch specific USE flags -fixed-point loongson2f mipsdspr1 mipsdspr2 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 85e6179230..0b7e2fd38c 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 @@ -237,10 +237,6 @@ dev-ruby/asciidoctor test # libgo needs an explicit port to hppa: bug #686624 sys-devel/gcc go -# Jeroen Roovers (jer@gentoo.org) (2018-03-22) -# HiPE does not work on HPPA -dev-lang/erlang hipe - # Thomas Deutschmann (2018-07-04) # dev-libs/xxhash not keyworded for hppa app-admin/rsyslog xxhash @@ -356,7 +352,7 @@ sci-mathematics/octave hdf5 qhull # Jeroen Roovers (2012-07-08) # media-libs/devil has not been fully tested on HPPA -media-gfx/graphviz devil lefty +media-gfx/graphviz devil # Jeroen Roovers (2012-07-03) # Mask USE=connman for net-libs/gupnp (bug #424225) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask index f6eb535bcb..83ae1d1951 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask @@ -98,10 +98,6 @@ luajittex # Mask USE=systemtap generally until proper kernel support is in place systemtap -# Jeroen Roovers (2014-05-20) -# USE=tcmalloc needs dev-util/google-perftools -tcmalloc - # Chí-Thanh Christopher Nguyễn (2013-11-10) # sys-devel/llvm is not keyworded, bug #320221 llvm 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 6fdbdd874c..bbb3c72764 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-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# matoro (2022-09-30) +# No ruby on ia64 for dev-ruby/asciidoctor +net-misc/chrony html + # Arthur Zamarin (2022-08-15) # deps not keyworded dev-util/pkgcheck emacs @@ -27,10 +31,6 @@ app-text/enchant nuspell # net-misc/freerdp is not keyworded dev-libs/weston rdp -# Matt Turner (2022-04-16) -# sys-auth/seatd is not keyworded -dev-libs/weston seatd - # Lars Wendler (2022-04-01) # gnome-base/librsvg missing keywords media-libs/freetype svg @@ -135,7 +135,8 @@ media-libs/libsdl2 fcitx4 # Sergei Trofimovich (2020-09-18) # media-libs/libilbc is not ported to ia64 -net-analyzer/wireshark ilbc +# nor is Qt +net-analyzer/wireshark gui ilbc # Matt Turner (2020-08-11) # No drivers on this architecture support Vulkan @@ -181,7 +182,7 @@ gnome-base/nautilus previewer # - net-libs/gnome-online-accounts: depends on webkit-gtk gnome-base/gvfs google # app-text/libgepub depends on webkit-gtk. -xfce-extra/tumbler epub +xfce-base/tumbler epub # Thomas Deutschmann (2020-03-15) # Mask USE=libtesseract, app-text/tesseract is not keyworded @@ -280,10 +281,6 @@ media-video/mplayer dvdnav # Requires USE=v4l that is masked in this profile. media-video/ffmpeg libv4l -# Sergei Trofimovich (2017-07-20) -# pulls in unkeyworded java -sci-libs/gdal mdb - # Sergei Trofimovich (2017-07-20) # pulls in unkeyworded lapack sci-libs/gdal armadillo 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 35691c5b0a..187c06dae9 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 @@ -4,10 +4,6 @@ # Unmask the flag which corresponds to ARCH. -ia64 -# Sam James (2022-07-30) -# dev-util/google-perftools not keyworded here -tcmalloc - # Sam James (2022-07-21) # Untested. ieee1394 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 d1c7930003..4661754420 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask @@ -1,6 +1,12 @@ # Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# WANG Xuerui (2022-10-04) +# Sanitizers partially supported on this architecture. +# +# ASan: https://reviews.llvm.org/D129418 (LLVM 15 and above) +>=sys-libs/compiler-rt-sanitizers-15 -asan + # WANG Xuerui (2022-07-08) # virtual/jre is not available on loong yet. www-client/chromium js-type-check 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 c1cd52961c..bed1ecab87 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 @@ -38,7 +38,7 @@ dev-util/cmake test # James Le Cuirot (2021-09-19) # Avoid having to keyword Poppler and X11 libraries for now. -media-gfx/graphviz lefty pdf +media-gfx/graphviz pdf # James Le Cuirot (2021-09-19) # Requires Rust, which is currently unavailable on m68k. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask index 2c2619a4a2..0b06a8ad3d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask @@ -1,6 +1,11 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Mike Gilbert (2022-10-16) +# Only supported on MIPS. +dev-lang/gnat-gpl -fixed-point +sys-devel/gcc -fixed-point + # matoro (2022-09-14) # Not broken, but better wait on profiles: bug #515694 dev-lang/rust system-llvm 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 7c2cc1ebf1..84935ae0a2 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 @@ -25,10 +25,6 @@ networkmanager # sci-geosciences/gpsd is not keyworded here. gps -# Brian Evans (2018-01-15) -# Mask tcmalloc as dev-util/google-perftools is unavailable -tcmalloc - # James Le Cuirot (2017-06-29) # Unmask as this profile is big endian. -big-endian @@ -263,7 +259,6 @@ ocamlopt fluidsynth # Mips USE flags --fixed-point -loongson2f # Chí-Thanh Christopher Nguyễn (2013-08-22) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask index bcff852d19..1b54d7bbf6 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/package.use.mask @@ -1,6 +1,18 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Bernard Cafarelli (2022-10-17) +# media-libs/libheif not keyworded +media-gfx/geeqie heif + +# Sam James (2022-10-16) +# dev-cpp/notcurses not keyworded here +media-sound/snd notcurses + +# Volkmar W. Pogatzki (2022-08-09) +# dev-java/jaxws-api not keyworded +>=dev-java/jmock-2.12.0 test + # Andrew Ammerlaan (2022-09-23) # Only PyQt5 is keyworded on pcc64 at the moment. # Mask the other Qt4Python implementations @@ -201,6 +213,7 @@ app-portage/g-sorcery bson # Michał Górny (2017-03-24) # libcxx fails to compile on ppc*, #595744. sys-devel/clang default-libcxx +sys-devel/clang-common default-libcxx sys-devel/clang-runtime libcxx # James Le Cuirot (2016-12-14) @@ -246,7 +259,6 @@ gnome-extra/sushi office # test dependencies need keywording dev-haskell/dlist test dev-haskell/haskell-src-exts test -dev-util/bnfc test # Anthony G. Basile (2014-08-16) # Ultimately pulls in nodejs which is broken. 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 734395f077..58aaa24e15 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 @@ -32,7 +32,7 @@ media-libs/freetype svg # Matt Turner (2022-04-16) # sys-auth/seatd is not keyworded -dev-libs/weston seatd +<=dev-libs/weston-10.0.0 seatd # Bernard Cafarelli (2022-03-14) # Now requires dev-java/rhino which is not keyworded @@ -110,6 +110,7 @@ media-libs/gd avif heif # compiler-rt* has no support for ppc32 (yet?) # bug #708344 sys-devel/clang-runtime compiler-rt sanitize +sys-devel/clang-common default-compiler-rt sys-devel/clang default-compiler-rt # Florian Schmaus (2020-12-03) @@ -190,10 +191,6 @@ sys-devel/clang-runtime openmp sanitize # Dropping ppc from sci-libs/armadillo, bug 555896 sci-libs/gdal armadillo -## Thomas Deutschmann (2016-12-04) -# sci-libs/gdal[mdb] requires dev-java/jackcess which is not keyworded -sci-libs/gdal mdb - # Michał Górny (2016-11-18) # libomp does not support 32-bit PPC, #600148. sys-devel/clang-runtime openmp diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/32ul/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/32ul/package.use.mask index bfd49a6d6b..2b06708257 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/32ul/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/32ul/package.use.mask @@ -20,7 +20,3 @@ media-gfx/gimp heif # Andreas Sturmlechner (2019-02-16) # app-text/libwpd and app-text/libwpg are not keyworded media-gfx/inkscape cdr visio wpg - -# Thomas Deutschmann (2016-12-04) -# sci-libs/gdal[mdb] requires dev-java/jackcess which is not keyworded -sci-libs/gdal mdb 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 5c48095368..86a0237523 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 @@ -64,7 +64,7 @@ # Georgy Yakovlev (2020-01-21) # works fine on little-endian --x11-libs/libva +-media-libs/libva -media-video/libva-utils -media-plugins/gst-plugins-vaapi 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 ec04b7c841..96a21d0855 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,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2022-10-08) +# sys-boot/gnu-efi isn't keyworded here right now +sys-kernel/installkernel-systemd-boot + # Michał Górny (2022-08-25) # Only ppc64le binpkg is provided. dev-python/pypy-exe-bin @@ -57,7 +61,7 @@ virtual/dist-kernel # Georgy Yakovlev (2020-01-21) # buggy on big-endian -x11-libs/libva +media-libs/libva media-video/libva-utils media-plugins/gst-plugins-vaapi 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 4d8af12fcb..ef0c262fbb 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,15 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2022-10-13) +# Causes segfaults, bug #871921 +sci-libs/symengine tcmalloc + +# Georgy Yakovlev (2022-09-29) +# USE=fix requires ring crate, which is not portable +# https://github.com/rustsec/rustsec/issues/707 +dev-util/cargo-audit fix + # Andrey Grozin (2022-09-02) # dev-libs/capstone not keyworded dev-lisp/sbcl capstone diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.mask index f320d25db6..9bff3d4bab 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/use.mask @@ -4,6 +4,10 @@ # PPC Specific use flags # +# matoro (2022-09-29) +# dev-util/google-perftools is supported here +-tcmalloc + # Georgy Yakovlev (2021-06-06) # XEN does not support ppc/ppc64 yet xen diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.force index cb405f4ea1..cc0ff66917 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.force +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.force @@ -1,6 +1,12 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# matoro (2022-09-10) +# GHC does not support native codegen for riscv at all. +# It gains LLVM codegen in 9.2, but we maintain a backport of this, +# so force LLVM codegen in all versions. +dev-lang/ghc llvm + # we, kinda, need this on riscv ... sys-devel/llvm llvm_targets_RISCV sys-devel/clang llvm_targets_RISCV 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 a54a8f8260..e55a09567d 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-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Xin Yang (2022-10-18) +# requires qtwebengine, bug #876301 +app-i18n/fcitx-libpinyin dictionary-manager + # Yixun Lan (2022-01-27) # This target supports ASAN/etc... # Andreas K. Hüttel (2022-09-25) @@ -64,11 +68,6 @@ sys-block/fio rbd # Upstream bug for criu: https://github.com/checkpoint-restore/criu/issues/1702 app-containers/crun criu -# Alex Fan (2022-02-28) -# dev-libs/vc is a dummy implementation on this arch -# krita fails to build with it -media-gfx/krita vc - # Adel Kara Slimane (2022-02-17) # Mask AMF keyword on non-amd64 arches # It is unusable, for now, in other arches @@ -114,6 +113,7 @@ dev-ruby/capybara test # - dev-qt/qtwebengine (bdepend) dev-python/ipython qt5 kde-apps/marble webengine +kde-plasma/discover webengine kde-plasma/kdeplasma-addons webengine kde-plasma/libksysguard webengine net-irc/quassel urlpreview @@ -123,7 +123,7 @@ net-irc/quassel urlpreview net-analyzer/suricata hyperscan # Yixun Lan (2021-08-29) -# sys-apps/fwupd not tested, USE=spi,uefi,dell +# sys-apps/fwupd not tested, USE=spi,uefi sys-apps/fwupd spi uefi # Marek Szuba (2021-08-23) @@ -158,8 +158,6 @@ net-libs/libproxy spidermonkey app-text/texlive pdfannotextractor # - JDK media-libs/rubberband jni -# - dev-java/jackcess -sci-libs/gdal mdb # Yixun Lan (2021-08-05) # Boost.Context can be built on riscv 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 6fef498580..1c5098544e 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-2021 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Unmask the flag which corresponds to ARCH. @@ -7,6 +7,10 @@ # Unmask systemd -systemd +# matoro (2022-09-29) +# dev-util/google-perftools is supported here +-tcmalloc + # Yixun Lan (2021-05-19) # Unmask for more testing -elogind 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 e41e114866..6da3d76394 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 @@ -12,10 +12,6 @@ # dev-libs/mongo-c-driver not keyworded here mongodb -# Sam James (2022-04-24) -# Avoid unkeyworded dev-util/google-perftools -tcmalloc - # Sam James (2022-04-24) # Desktopy stacks not currently keyworded alsa 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 dda0c67f23..6601f11402 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 @@ -38,10 +38,6 @@ app-text/enchant nuspell # net-misc/freerdp is not keyworded dev-libs/weston rdp -# Matt Turner (2022-04-16) -# sys-auth/seatd is not keyworded -dev-libs/weston seatd - # Lars Wendler (2022-04-01) # gnome-base/librsvg missing keywords media-libs/freetype svg @@ -103,6 +99,7 @@ dev-cpp/eigen test # Sam James (2021-04-27) # Deps not yet tested/keyworded. sys-devel/clang default-compiler-rt default-lld +sys-devel/clang-common default-compiler-rt default-lld sys-devel/clang-runtime compiler-rt sys-devel/llvm z3 @@ -150,7 +147,7 @@ net-libs/webkit-gtk gamepad # Joonas Niilola (2020-11-16) # app-text/libgepub not yet keyworded on this arch. #754762 -xfce-extra/tumbler epub +xfce-base/tumbler epub # Arfrever Frehtes Taifersar Arahesis (2020-10-14) # app-i18n/fcitx:4 not keyworded. @@ -320,10 +317,6 @@ net-print/cups-filters pdf # Skip keywording it for now. app-office/scribus osg -# Sergei Trofimovich (2018-06-17) -# Mask broken HIPE support on sparc32 (bug #656618) -dev-lang/erlang hipe - # Sergei Trofimovich (2018-05-08) # Mask USE=games to avoid unkeyworded games-util/qstat. net-analyzer/monitoring-plugins game 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 6362e7c746..ff37147126 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 @@ -153,7 +153,6 @@ gts metalink tremor fdk -tcmalloc jemalloc zmq diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask index 2fa62df312..f91453636d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask @@ -1,3 +1,6 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Volkmar W. Pogatzki (2022-08-19) +# dev-java/hamcrest:0 is not keyworded +>=dev-java/jmock-2.12.0 diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask index 9799b25a0a..a5789fc65f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask @@ -1,6 +1,15 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# WANG Xuerui (2022-10-07) +# sys-libs/libsmbios is available here. +app-laptop/pbbuttonsd -macbook +sys-apps/fwupd -dell + +# Volkmar W. Pogatzki (2022-08-09) +# dev-java/jaxws-api not keyworded +>=dev-java/jmock-2.12.0 test + # Alexey Shvetsov (2022-09-15) # Mask nvml use flag for slurm sys-cluster/slurm nvml 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 db6bc5ca83..2183c009cb 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 @@ -82,7 +82,7 @@ dev-ruby/haml test # Adam Feldman (2017-09-27) # patchset variants are not stable -virtual/wine staging +virtual/wine proton staging # Christoph Junghans (2017-02-26) # Stable mask some fabrics (bug #525534) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.mask index f5ed2fdbec..9a57752b6a 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.mask @@ -4,6 +4,10 @@ # Unmask the flag which corresponds to ARCH. -x86 +# matoro (2022-09-29) +# dev-util/google-perftools is supported here +-tcmalloc + # Matt Turner (2022-04-16) # dev-util/sysprof-capture is keyworded on x86 -sysprof diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults index 2c288d12d1..39d5dd1cf8 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults @@ -43,7 +43,7 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" # GOBIN needs to be cleaned as random values in GOBIN can affect the # building of some packages: # https://archives.gentoo.org/gentoo-dev/message/163010f83ae7819d80c0cfdf797cbfe0 -ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH" +ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH" # Variables that are set exclusively by the profile # and not by user configuration files. 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 fa17fcb49e..904108ba96 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 @@ -6,12 +6,6 @@ # so force the flag on until problem fixed upstream >=sys-cluster/ceph-17.2.1 system-boost -# Sam James (2022-05-17) -# Force on jpeg & png for now until build system fixes are made -# by upstream. The CMake port is new so it's fairly expected -# to have a few bumps. bug #844751. -=sci-libs/gdal-3.5.0-r3 jpeg png - # Esteve Varela Colominas (2022-02-19) # Use the jemalloc allocator for telegram, as recommended by upstream, # to reduce memory usage, at least on glibc. 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 fbcf23d6ee..5dd77f442a 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,31 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Sam James (2022-10-08) +# Older versions of libvirt need a vulnerable version of wireshark + (2022-10-07) +# media-sound/rplay is masked for removal. +x11-wm/fvwm3 rplay +x11-wm/ctwm rplay +x11-wm/fvwm rplay +x11-wm/vtwm rplay + +# Viorel Munteanu (2022-10-07) +# Cannot test and fix pax-kernel related bugs on a current grsec kernel +# Mask the flag for now +# Bugs: #643466, #674872, #832161, #855722 +app-emulation/virtualbox pax-kernel +app-emulation/virtualbox-modules pax-kernel + +# Sam James (2022-10-02) +# USE=compat / possibly allowing sys-libs/zlib needs to be figured out, +# but packages want to use the actual zlib-ng library, so we need to +# mask it and can't hold the whole thing up on the compat effort. +sys-libs/zlib-ng compat +sys-libs/minizip-ng compat + # Matt Turner (2022-09-26) # Requires nautilus-43.0 which is not in tree yet. >=x11-terms/gnome-terminal-3.46 nautilus @@ -77,11 +102,6 @@ dev-python/QtPy pyqt6 pyside6 # Doesn't compile with 'Xaw3d' use flag, #849947. app-text/xdvik Xaw3d -# Joonas Niilola (2022-07-13) -# Depends on an older enigmail that only supports python2, which is -# being removed soon. #758344 -www-client/seamonkey crypt - # Sam James (2022-07-10) # TBB support is deprecated/broken upstream, needs older version, # and upstream are inclined to remove it entirely. bug #820827. 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 6da1b54760..b897a27630 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 @@ -23,11 +23,6 @@ sci-electronics/kicad ngspice # app-text/pandoc is not stable app-text/nuspell doc -# Volkmar W. Pogatzki (2022-05-05) -# fop[test] depends on mockito:4, which is not yet stable (bug #727504), -# and itself blocked by libffi stabilization (bug #813756). -dev-java/fop test - # Sam James (2022-02-11) # Needs glibc-2.35(?) (or <2.34) which is not yet even keyworded but # won't be stable for a while. Can be unmasked then. @@ -193,10 +188,6 @@ dev-php/PEAR-Text_Password test # The go flag requires stable masked dev-lang/go[gccgo]. www-servers/uwsgi go uwsgi_plugins_alarm_xmpp -# Michael Palimaka (2017-09-30) -# Required dependeny is not stable -sci-libs/gdal mdb - # Tim Harder (2017-09-11) # Requires guile-2 which is still unstable. >=net-irc/weechat-1.7 guile 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 95771e8b8e..7f933c6c7e 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 @@ -4,6 +4,10 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Brian Evans (2022-09-30) +# PHP 8.2 is in RC +php_targets_php8-2 + # Sam James (2022-08-02) # Masked for testing. The split of some packages may still # change. bug #838970. 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 ca3c1c7516..a4e777b49d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Patrick Lauer (2022-10-13) +# Postgres:15 is not stable yet +postgres_targets_postgres15 + # Michał Górny (2022-05-08) # Mask until dev-lang/python:3.11 becomes stable. python_targets_python3_11 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/clang/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/clang/package.use.mask new file mode 100644 index 0000000000..3435fc7a7d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/clang/package.use.mask @@ -0,0 +1,6 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Sam James (2022-10-15) +# Undo the general musl mask +www-client/firefox -clang diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/clang/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/clang/parent index 45c5283c44..845cedb73f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/clang/parent +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/clang/parent @@ -1,2 +1,2 @@ .. -../../../../../../features/clang +../../../../../../features/llvm diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/package.mask index 03746363ca..25a5df5e91 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.0/musl/package.mask @@ -1,6 +1,11 @@ -# Copyright 2020 Gentoo Authors. +# Copyright 2020-2022 Gentoo Authors. # Distributed under the terms of the GNU General Public License v2 +# Sam James (2022-10-08) +# openjdk-bin is available on amd64 musl +-dev-java/openjdk-bin +dev-java/openjdk-bin:8 + # Georgy Yakovlev (2020-01-28) # rust-bin is available on amd64 musl -dev-lang/rust-bin diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/clang/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/clang/parent index 7cba5799ab..929f409fcc 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/clang/parent +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/clang/parent @@ -1,2 +1,2 @@ .. -../../../../../features/clang +../../../../../features/llvm diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/clang/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/clang/parent index 45c5283c44..845cedb73f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/clang/parent +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/amd64/17.1/systemd/clang/parent @@ -1,2 +1,2 @@ .. -../../../../../../features/clang +../../../../../../features/llvm diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/clang/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/llvm/eapi similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/features/clang/eapi rename to sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/llvm/eapi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/llvm/packages.build b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/llvm/packages.build new file mode 100644 index 0000000000..9ffb08757b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/llvm/packages.build @@ -0,0 +1,9 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# we use glibc here, so we still need these in stage1 +# later stages should pull them in as BDEPEND anyway +sys-devel/gcc +sys-devel/gcc-config +sys-devel/binutils +sys-devel/binutils-config diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/llvm/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/llvm/parent new file mode 100644 index 0000000000..929f409fcc --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/llvm/parent @@ -0,0 +1,2 @@ +.. +../../../../../features/llvm diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/llvm/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/llvm/eapi new file mode 100644 index 0000000000..7ed6ff82de --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/llvm/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/llvm/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/llvm/package.use.mask new file mode 100644 index 0000000000..3435fc7a7d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/llvm/package.use.mask @@ -0,0 +1,6 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Sam James (2022-10-15) +# Undo the general musl mask +www-client/firefox -clang diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/llvm/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/llvm/parent new file mode 100644 index 0000000000..845cedb73f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/musl/llvm/parent @@ -0,0 +1,2 @@ +.. +../../../../../../features/llvm diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/eapi b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/eapi new file mode 100644 index 0000000000..7ed6ff82de --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/packages.build b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/packages.build new file mode 100644 index 0000000000..9ffb08757b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/packages.build @@ -0,0 +1,9 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# we use glibc here, so we still need these in stage1 +# later stages should pull them in as BDEPEND anyway +sys-devel/gcc +sys-devel/gcc-config +sys-devel/binutils +sys-devel/binutils-config diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/parent new file mode 100644 index 0000000000..845cedb73f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/arm64/17.0/systemd/llvm/parent @@ -0,0 +1,2 @@ +.. +../../../../../../features/llvm diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc/17.0/musl/parent b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc/17.0/musl/parent index 58651906cb..9ef7663a23 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc/17.0/musl/parent +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc/17.0/musl/parent @@ -1,2 +1,3 @@ .. ../../../../../features/musl +../../../../../features/wd40 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 301a3e58a8..78c3a07424 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 @@ -3,6 +3,7 @@ # This file contains descriptions of the PHP_TARGETS USE_EXPAND flags +php8-2 - Build against PHP 8.2 php8-1 - Build against PHP 8.1 php8-0 - Build against PHP 8.0 php7-4 - Build against PHP 7.4 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 2aeb36f337..f87ee7f047 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,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This file contains descriptions of POSTGRES_TARGETS USE_EXPAND flags. @@ -8,3 +8,4 @@ postgres11 - Build against PostgreSQL 11 postgres12 - Build against PostgreSQL 12 postgres13 - Build against PostgreSQL 13 postgres14 - Build against PostgreSQL 14 +postgres15 - Build against PostgreSQL 15 diff --git a/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults index 20d5960e9c..050826ef69 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/embedded/make.defaults @@ -70,7 +70,7 @@ CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" # GOBIN needs to be cleaned as random values in GOBIN can affect the # building of some packages: # https://archives.gentoo.org/gentoo-dev/message/163010f83ae7819d80c0cfdf797cbfe0 -ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH" +ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_STATE_HOME XDG_RUNTIME_DIR PERL_MM_OPT PERL5LIB PERL5OPT PERL_MB_OPT PERL_CORE PERLPREFIX GOBIN GOPATH" # Tiziano Müller (2010-01-24) # We usually don't want python to (re)write .py[co] files during phase runs diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/llvm/eapi b/sdk_container/src/third_party/portage-stable/profiles/features/llvm/eapi new file mode 100644 index 0000000000..7ed6ff82de --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/features/llvm/eapi @@ -0,0 +1 @@ +5 diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/clang/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/features/llvm/make.defaults similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/features/clang/make.defaults rename to sdk_container/src/third_party/portage-stable/profiles/features/llvm/make.defaults diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/clang/package.accept_keywords b/sdk_container/src/third_party/portage-stable/profiles/features/llvm/package.accept_keywords similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/features/clang/package.accept_keywords rename to sdk_container/src/third_party/portage-stable/profiles/features/llvm/package.accept_keywords diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/clang/package.use b/sdk_container/src/third_party/portage-stable/profiles/features/llvm/package.use similarity index 81% rename from sdk_container/src/third_party/portage-stable/profiles/features/clang/package.use rename to sdk_container/src/third_party/portage-stable/profiles/features/llvm/package.use index 4b720c60bf..267fafefe7 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/clang/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/features/llvm/package.use @@ -3,6 +3,7 @@ sys-devel/llvm -binutils-plugin # use all defaults sys-devel/clang default-compiler-rt default-lld default-libcxx llvm-libunwind +sys-devel/clang-common default-compiler-rt default-lld default-libcxx llvm-libunwind sys-libs/compiler-rt clang # disable sanitizers for now diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/clang/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/llvm/package.use.mask similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/features/clang/package.use.mask rename to sdk_container/src/third_party/portage-stable/profiles/features/llvm/package.use.mask diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/clang/packages b/sdk_container/src/third_party/portage-stable/profiles/features/llvm/packages similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/features/clang/packages rename to sdk_container/src/third_party/portage-stable/profiles/features/llvm/packages diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/clang/packages.build b/sdk_container/src/third_party/portage-stable/profiles/features/llvm/packages.build similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/features/clang/packages.build rename to sdk_container/src/third_party/portage-stable/profiles/features/llvm/packages.build diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/clang/use.force b/sdk_container/src/third_party/portage-stable/profiles/features/llvm/use.force similarity index 100% rename from sdk_container/src/third_party/portage-stable/profiles/features/clang/use.force rename to sdk_container/src/third_party/portage-stable/profiles/features/llvm/use.force 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 58ba9fbef3..151471cc60 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,8 +1,31 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2022-10-17) +# Needs porting to musl +# https://github.com/rr-debugger/rr/issues/2236 +dev-util/rr + +# Sam James (2022-10-04) +# Packages with dubious sys-libs/glibc dependencies (non-binary) but +# masking for now to allow musl profiles to graduate from exp->dev. +dev-db/pgbouncer +dev-libs/cgreen +media-sound/xwax +net-analyzer/gsad +net-analyzer/gvm +net-analyzer/gvmd +net-analyzer/gvm-libs +net-analyzer/openvas-scanner +net-analyzer/ospd-openvas +net-misc/grive +net-print/pnm2ppa +net-wireless/neard +sys-apps/noexec + # Petr Vaněk (2022-09-23) # Musl does not implement rresvport function, bugs #713810 and #713376. +app-admin/clustershell app-shells/pdsh net-analyzer/ipcad @@ -11,59 +34,27 @@ net-analyzer/ipcad sys-apps/uutils # Sam James (2022-09-12) -# The libxcrypt migration is optional for musl. +# libxcrypt migration masks. +# 1. The libxcrypt migration is optional for musl, so unmask -virtual/libcrypt:0/1. +# 2. virtual/libcrypt-2 doesn't migrate anything on musl, +# we need virtual/libcrypt-2-r1 for the libxcrypt migration there, so +# avoid a useless rebuild, and ensure it happens at the right time instead. -virtual/libcrypt:0/1 - -# Sam James (2022-09-12) -# virtual/libcrypt-2 doesn't migrate anything on musl, -# we need virtual/libcrypt-2-r1 for the libxcrypt migration there, so -# avoid a useless rebuild, and ensure it happens at the right time instead. =virtual/libcrypt-2 -# Andrew Ammerlaan (2022-09-06) -# Binary package linked against glibc -games-action/minecraft-launcher - -# Vladimir Pavljuchenkov (2022-08-21) -# Binary package linked against glibc, bug #832607. -net-p2p/resilio-sync - # Mike Gilbert (2022-08-01) # Fails to build. app-emulation/open-vm-tools -# William Hubbs (2022-07-30) -# Binary package linked against glibc, bug #861893. -app-admin/awscli-bin - -# David Seifert (2022-07-29) -# Binary package linked against glibc -media-sound/baudline - -# David Seifert (2022-07-29) -# Binary package linked against glibc -sys-block/megacli - # Marek Szuba (2022-07-28) # Relies on unimplemented functions outb_p and inb_p, # support for which has never made it into musl. Bug #712972. sys-libs/libsmbios -# Stefan Strogin (2022-06-29) -# Binary package linked against glibc -net-im/element-desktop-bin - -# Florian Schmaus (2022-06-05) -# Binary package linked against glibc, bug #832932 -sys-block/hpssacli - -# Sam James (2022-04-23) -# Binary package linked against glibc, bug #832615 -net-print/cnijfilter2 - # Sam James (2022-04-23) # Compatibility packages for binary/pre-built software shouldn't # be needed on musl (and these fail to build anyway). +sys-apps/byld sys-libs/libtermcap-compat sys-libs/libstdc++-v3 @@ -72,179 +63,177 @@ sys-libs/libstdc++-v3 # bug #713542 net-misc/casync -# Martin Dummer (2022-03-26) -# Binary package linked to glibc. Bug #832558 -net-misc/teamviewer - -# Mike Pagano (2022-03-21) -# Binary package linked to glibc -dev-util/idea-community - -# Pacho Ramos (2022-03-13) -# Binary package linked to glibc -sys-power/dptfxtract - # Bernd Waibel (2022-03-14) # Doesn't build with musl, bug #832742 +app-eselect/eselect-opencascade +media-gfx/freecad +media-gfx/prusaslicer sci-libs/opencascade -# Adel KARA SLIMANE (2022-03-09) -# Binary packages linked to glibc -app-editors/vscode -app-editors/vscodium - -# João Santos (2022-02-22) -# Binary package linked to glibc -app-text/master-pdf-editor - -# Sam James (2022-02-20) -# Binary package linked to glibc -app-admin/bitwarden-desktop-bin - -# Adel Kara Slimane (2022-02-17) -# Binary package linked to glibc -media-libs/amdgpu-pro-vulkan -media-video/amdgpu-pro-amf - -# Ionen Wolkens (2022-02-17) -# Binary package linked to glibc -net-im/discord-bin - -# Conrad Kostecki (2022-02-12) -# Binary package linked to glibc -x11-misc/xflux - -# Stephan Hartmann (2022-02-10) -# Binary package linked to glibc -www-apps/chromedriver-bin - # Stephan Hartmann (2022-02-10) # Doesn't build on musl, bug #833028 www-client/chromium -# Stephan Hartmann (2022-02-10) -# Binary package linked to glibc -www-plugins/chrome-binary-plugins - -# Stephan Hartmann (2022-02-10) -# Binary packages linked to glibc -www-client/opera -www-client/opera-beta -www-client/opera-developer - -# Stephan Hartmann (2022-02-10) -# Binary packages linked to glibc -www-client/google-chrome -www-client/google-chrome-beta -www-client/google-chrome-unstable - -# Stephan Hartmann (2022-02-10) -# Binary packages linked to glibc -www-client/microsoft-edge -www-client/microsoft-edge-beta -www-client/microsoft-edge-dev - -# Paolo Pedroni (2022-02-09) -# Binary package linked to glibc -sci-mathematics/gimps - # Paolo Pedroni (2022-02-09) # It doesn't build on musl # bug #832551 net-misc/netkit-telnetd - -# Henning Schild (2022-02-09) -# Binary package linked to glibc -net-im/telegram-desktop-bin - -# Conrad Kostecki (2022-02-08) -# Binary package linked to glibc -sys-apps/ipmicfg +net-misc/sitecopy # Sam James (2022-02-06) # Latest version doesn't build on musl # bug #831363 =sys-libs/efivar-38 - -# Stephan Hartmann (2022-02-05) -# Binary package linked to glibc -net-im/teams - -# Conrad Kostecki (2022-02-03) -# Binary package linked to glibc -net-misc/ipmiview - -# Conrad Kostecki (2022-02-03) -# Binary package linked to glibc -media-sound/teamspeak-server - -# Conrad Kostecki (2022-02-03) -# Binary package linked to glibc -games-server/steamcmd - -# Conrad Kostecki (2022-02-03) -# Binary package linked to glibc -games-server/bedrock-server - -# Conrad Kostecki (2022-02-03) -# Binary package linked to glibc -dev-libs/luise - -# Conrad Kostecki (2022-02-03) -# Binary package linked to glibc -app-misc/kryoflux-dtc - -# Conrad Kostecki (2022-02-03) -# Binary package linked to glibc -app-benchmarks/geekbench - -# Robert Siebeck (2022-02-02) -# Binary package linked to glibc, bug #832483 -net-im/signal-desktop-bin - -# Ben Kohler (2022-02-02) -# Binary backage linked to glibc -net-misc/dropbox - -# Sergey Popov (2022-02-02) -# Binary package linked to glibc, bug #832581 -net-misc/yandex-disk - -# David Seifert (2022-02-02) -# Binary package linked to glibc -net-im/skypeforlinux - -# Viorel Munteanu (2022-02-01) -# Binary package linked to glibc -net-im/mattermost-desktop-bin - -# Ulrich Müller (2022-01-25) -# Binary packages linked to glibc -media-gfx/brscan4 -net-im/zoom - -# Andreas K. Hüttel (2022-01-22) -# Binary packages linked to glibc -app-backup/tsm -sci-electronics/labone - -# Marco Genasci (2022-01-06) -# dev-db/oracle-instantclient package linked against glibc, -# and the other packages depends on it. -dev-db/oracle-instantclient -dev-db/ocp -dev-db/sqlcl-bin +app-crypt/pesign +sys-kernel/kpatch # Andrew Ammerlaan (2022-01-05) -# Binary package linked to glibc +# Binary package linked to glibc (rolling mask, use for all such binpkgs) +app-admin/awscli-bin +app-admin/bitwarden-desktop-bin +app-admin/puppet-agent +app-admin/puppetserver +app-arch/rar +app-backup/tsm +app-benchmarks/geekbench +app-crypt/rainbowcrack +app-editors/vscode +app-editors/vscodium +app-emulation/crossover-bin +app-misc/kryoflux-dtc +app-office/libreoffice-bin +app-office/libreoffice-bin-debug +app-text/master-pdf-editor app-text/zotero-bin +dev-db/ocp +dev-db/oracle-instantclient +dev-db/sqlcl-bin +dev-games/ps2-packer +dev-java/openjdk-bin +dev-java/openjdk-jre-bin +dev-libs/luise +dev-perl/Lab-Zhinst +dev-php/PEAR-MDB2_Driver_oci8 +dev-python/pyzotero +dev-util/idea-community +games-action/a-story-about-my-uncle +games-action/badland +games-action/brutal-legend-gog +games-action/brutal-legend-hb +games-action/descent3 +games-action/descent3-demo +games-action/minecraft-launcher +games-action/psychonauts2-hb +games-action/shadowgrounds-bin +games-action/shadowgrounds-survivor-bin +games-action/trine +games-action/trine-enchanted-edition +games-action/trine2 +games-arcade/barbarian-bin +games-arcade/jardinains +games-emulation/zinc +games-fps/etqw-bin +games-fps/etqw-data +games-fps/etqw-demo +games-fps/glxquake-bin +games-fps/legends +games-fps/soldieroffortune +games-fps/transfusion-bin +games-fps/tribes2 +games-fps/ut2003 +games-fps/ut2003-bonuspack-cm +games-fps/ut2003-bonuspack-de +games-fps/ut2003-bonuspack-epic +games-fps/ut2003-data +games-fps/ut2003-demo +games-fps/ut2004 +games-fps/ut2004-bonuspack-cbp1 +games-fps/ut2004-bonuspack-cbp2 +games-fps/ut2004-bonuspack-ece +games-fps/ut2004-bonuspack-mega +games-fps/ut2004-data +games-fps/ut2004-demo +games-puzzle/world-of-goo-demo +games-puzzle/world-of-goo-gog +games-puzzle/world-of-goo-hb +games-server/bedrock-server +games-server/etqw-ded +games-server/mtavc +games-server/steamcmd +games-server/ut2004-ded +games-simulation/slime-rancher +games-strategy/darwinia +games-strategy/darwinia-demo +games-strategy/defcon-demo +games-strategy/knights-demo +games-strategy/majesty-demo +gnome-extra/nautilus-dropbox +kde-apps/dolphin-plugins-dropbox +mate-extra/caja-dropbox +media-gfx/brscan4 +media-libs/amdgpu-pro-vulkan +media-sound/baudline +media-sound/teamspeak-server +media-video/amdgpu-pro-amf +media-video/dvbackup +media-video/makemkv media-video/popcorntime-bin +net-im/discord-bin +net-im/element-desktop-bin +net-im/gitter-bin +net-im/mattermost-desktop-bin net-im/rocketchat-desktop-bin -net-im/whatsapp-desktop-bin +net-im/skypeforlinux +net-im/skype-dbus-mock +net-im/slack +net-im/teams +net-im/telegram-desktop-bin net-im/wazzapp-bin +net-im/whatsapp-desktop-bin +net-im/zoom +net-misc/chrome-remote-desktop +net-misc/dropbox +net-misc/dropbox-cli +net-misc/ipmiview +net-misc/teamviewer +net-misc/yandex-disk +net-nntp/sabnzbd +net-p2p/resilio-sync +net-print/cnijfilter2 +net-print/hplip-plugin +sci-chemistry/cara-bin +sci-electronics/eagle +sci-electronics/labone +sci-mathematics/gimps sci-misc/jupyterlab-desktop-bin sci-misc/netlogo-bin -sci-electronics/eagle +sys-apps/ipmicfg +sys-apps/tas +sys-block/hpssacli +sys-block/megacli +sys-power/dptfxtract +www-apps/chromedriver-bin +www-apps/grafana-bin +www-apps/jellyfin +www-apps/kibana-bin +www-apps/prowlarr +www-apps/radarr +www-apps/readarr +www-client/chromium-bin +www-client/google-chrome +www-client/google-chrome-beta +www-client/google-chrome-unstable +www-client/microsoft-edge +www-client/microsoft-edge-beta +www-client/microsoft-edge-dev +www-client/opera +www-client/opera-beta +www-client/opera-developer +www-client/vivaldi +www-client/vivaldi-snapshot +www-plugins/chrome-binary-plugins +x11-misc/xflux +x11-misc/xflux-gui # Ulrich Müller (2022-01-04, 2022-07-31) # Emacs 23 does not support x86_64-gentoo-linux-musl systems @@ -255,10 +244,6 @@ app-editors/emacs:24 app-editors/emacs:25 app-editors/emacs:26 -# Marek Szuba (2022-01-01) -# Binary-only package linked against glibc. -app-crypt/rainbowcrack - # Conrad Kostecki (2021-12-15) # Level Zero needs RTLD_DEEPBIND, which does not exist on musl. dev-libs/level-zero @@ -274,7 +259,12 @@ dev-libs/level-zero # Use of uninitialized value $Text::WrapI18N::charmap in pattern match (m//) at /usr/lib/perl5/vendor_perl/5.34/Text/WrapI18N.pm line 155. # Can't exec "/usr/bin/locale": No such file or directory at /usr/lib/perl5/vendor_perl/5.34/Text/WrapI18N.pm line 134. # ``` +app-doc/kicad-doc +app-i18n/man-pages-l10n app-text/po4a +dev-vcs/git-annex +games-strategy/colobot +www-apps/ikiwiki # Hank Leininger (2021-07-14) # Uses glibc-specific rexec(3) function, bug #715898 @@ -282,8 +272,15 @@ net-misc/netkit-rsh # David Seifert (2021-02-08) # nvidia-drivers only works against glibc. +dev-libs/cudnn +dev-libs/cudnn-frontend +dev-python/pycuda +dev-util/nvidia-cuda-sdk +dev-util/nvidia-cuda-toolkit +media-video/nvidia-video-codec dev-libs/optix x11-drivers/nvidia-drivers +x11-misc/primus # Ulrich Müller (2020-03-31) # Not ported to musl, bug #715642. @@ -293,10 +290,12 @@ app-editors/jasspa-microemacs # Sergei Trofimovich (2020-03-21) # musl has no support for nss subsystem. +sys-apps/unscd sys-auth/libnss-nis +sys-auth/sssd # Sergei Trofimovich (2020-03-21) -# Needs a port no musl. Uses glibc-specific termio and __getppid. +# Needs a port to musl. Uses glibc-specific termio and __getppid. app-emulation/ski # Sergei Trofimovich (2020-03-21) @@ -309,11 +308,21 @@ sys-libs/glibc -sys-libs/musl -sys-libs/libucontext -# As of 2021-08-08, >=sys-fs/udev-249-r2 is patched in Gentoo -# to work on musl, so no need to mask udev. -# systemd itself fails to build without glibc +# systemd doesn't work on musl and upstream aren't interested +# in supporting it. +app-admin/mkosi +app-admin/systemdgenie +dev-python/python-systemd +gnome-extra/office-runner +gnome-extra/gnome-logs +sys-apps/dbus-broker +sys-apps/gentoo-systemd-integration sys-apps/systemd +sys-apps/systemd-readahead sys-boot/systemd-boot +sys-power/switcheroo-control +sys-process/systemd-cron +>=www-misc/profile-sync-daemon-6 # rust-bin requires a glibc system dev-lang/rust-bin diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.force b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.force index 71a3432ba1..e74bebd7fe 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.force +++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.force @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors. # Distributed under the terms of the GNU General Public License v2 +# Sam James (2022-10-04) +# net-misc/netkit-rsh is masked on musl and USE=-crypt depends on it +sys-cluster/torque crypt + # Esteve Varela Colominas (2022-02-19) # The musl allocator works well with telegram net-im/telegram-desktop -jemalloc 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 e33e6d34a9..cfe51a434c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.mask @@ -1,26 +1,53 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Bernd Waibel (2022-10-04) +# Mask loguru until fixed upstream #873601 +sci-libs/vtk logging + +# Sam James (2022-10-04) +# sys-libs/libtermcap-compat is masked on musl +dev-scheme/scm readline + +# Sam James (2022-10-04) +# sys-auth/sssd is masked on musl +app-admin/sudo sssd + +# Sam James (2022-10-04) +# sys-libs/libsmbios is masked on musl +app-laptop/pbbuttonsd macbook +sys-apps/fwupd dell + +# Sam James (2022-10-04) +# Needs masked net-misc/netkit-telnetd +net-irc/ngircd test + +# Sam James (2022-10-04) +# Rolling mask for all USE flags which pull in a masked binary package +# (linked against glibc). Use for all such packages. +kde-apps/kdenetwork-meta dropbox +media-video/ffmpeg amf +net-fs/openafs tsm +net-analyzer/nagios-plugin-check_raid megaraid-sas +sys-apps/hwloc gl +www-client/qutebrowser widevine + +# Sam James (2022-10-03) +# Needs systemd which is masked on musl +net-analyzer/wireshark sdjournal +sys-apps/ipmitool openbmc +sys-auth/pambase homed + # Alfred Persson Forsberg (2022-07-27) # Firefox does not build with these flags enabled on musl libc. # See bug #829033 www-client/firefox clang pgo -# Ionen Wolkens (2022-03-15) # musl package does not currently provide gencat binary, which is needed for # nls support, see bug #712828 x11-wm/fluxbox nls -# Marco Genasci (2022-01-06) -# Pulls dev-db/oracle-instantclient which doesn't work on musl -app-metrics/collectd collectd_plugins_oracle -dev-lang/php oci8-instant-client -dev-qt/qtsql oci8 - # Ulrich Müller (2022-01-04) # musl iconv doesn't know about shift-jis which is needed for Japanese # documentation (bug #830436) @@ -36,8 +63,22 @@ net-misc/iputils rarpd # Sam James (2021-11-20) # Pulls in po4a which doesn't seem to work on musl (wants /usr/bin/locale) +app-arch/dpkg nls +app-emulation/guestfs-tools doc +app-emulation/libguestfs doc +app-text/bibletime doc +dev-util/debhelper l10n_de l10n_es l10n_fr +dev-util/schroot nls +media-video/mkvtoolnix nls +sci-electronics/kicad-meta doc +sys-apps/fakeroot nls sys-apps/man-db nls +sys-apps/man-pages l10n_cs l10n_da l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu +sys-apps/man-pages l10n_id l10n_it l10n_mk l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_ro +sys-apps/man-pages l10n_sr l10n_sv l10n_uk l10n_vi +sys-apps/man-pages l10n_ja l10n_ru l10n_zh-CN sys-apps/sysvinit nls +sys-auth/sssd man # Sam James (2021-11-07) # Disable some sanitizers for LLVM, see bug #753935 diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.stable.mask new file mode 100644 index 0000000000..cb96619931 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.use.stable.mask @@ -0,0 +1,6 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Sam James (2022-10-04) +# libxcrypt migration isn't yet stable on musl. +sys-auth/pambase yescrypt diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/musl/use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/musl/use.mask index b3aee89dcf..9f14eb4801 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/use.mask @@ -5,9 +5,34 @@ -elibc_musl elibc_glibc -# Marco Genasci (2022-01-06) -# Pulls dev-db/oracle-instantclient which doesn't work on musl +# Sam James (2022-10-04) +# sci-libs/opencascade is masked on musl +occ +opencascade + +# Sam James (2022-10-04) +# Mask USE flags which pull in a binary package linked against glibc (rolling +# mask, use for all such packages) +collectd_plugins_oracle +lcd_devices_luise oracle +oci8 +oci8-instant-client + +# Sam James (2022-10-03) +# x11-drivers/nvidia-drivers is a binary package linked against glibc +# and is masked on musl. (We give nvidia its own block given they're +# all related). +cuda +cudnn +collectd_plugins_gpu_nvidia +nvenc +nvdec +nvidia +nvml +optix +video_cards_nvidia # sys-apps/systemd is masked systemd +uwsgi_plugins_systemd_logger 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 9e34df4079..5811b0b8e4 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 @@ -50,6 +50,7 @@ dev-python/spur dev-python/sshtunnel dev-python/tempest dev-python/trustme +>=dev-python/trio-0.22.0 dev-python/twine dev-python/watchfiles dev-ros/roswtf @@ -71,6 +72,7 @@ media-libs/libavif media-video/rav1e >=net-irc/polari-3.37 net-libs/quiche +net-misc/electrum-ltc net-misc/gsutil net-news/newsboat net-p2p/deluge @@ -78,4 +80,5 @@ ros-meta/ros_comm sci-geosciences/gnome-maps >=sys-apps/bat-0.18.1 virtual/rust +www-apps/radicale >=x11-themes/adwaita-icon-theme-3.36 diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/use.force b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/use.force new file mode 100644 index 0000000000..5fd5e390ab --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/use.force @@ -0,0 +1,6 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Michał Górny (2022-10-09) +# Disable tests requiring Rust. +-test-rust diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/use.mask index 94c96a9501..a265b328ac 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/use.mask @@ -3,6 +3,10 @@ rust +# Michał Górny (2022-10-09) +# Disable tests requiring Rust. +test-rust + # Sam James (2022-08-26) # >=media-gfx/libimagequant-4 requires Rust. imagequant diff --git a/sdk_container/src/third_party/portage-stable/profiles/license_groups b/sdk_container/src/third_party/portage-stable/profiles/license_groups index 9a620c661f..12f4be7c01 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/license_groups +++ b/sdk_container/src/third_party/portage-stable/profiles/license_groups @@ -32,7 +32,7 @@ OSI-APPROVED 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Ar # Licenses in this list should NOT appear directly or indirectly in # @FSF-APPROVED or @OSI-APPROVED. # Note: Licenses for fonts should be included in @MISC-FREE-DOCS. -MISC-FREE AIFFWriter.m Allegro alternate AMPAS BEER-WARE boehm-gc BSD-1 BSD-2-with-patent BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 CAOSL CDDL-1.1 CDDL-Schily CMake CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLGPL-2.1 LPPL-1.3 lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-AMD NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA RtMidi rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free TextMate-bundle the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda trio UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH +MISC-FREE AIFFWriter.m Allegro alternate AMPAS BEER-WARE boehm-gc BSD-1 BSD-2-with-patent BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 CAOSL CDDL-1.1 CDDL-Schily CMake coldspringharbor CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLGPL-2.1 LPPL-1.3 lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-AMD NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA RtMidi rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free TextMate-bundle the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda trio UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH # Metaset for all free software FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE 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 192c51f6b8..9720b64431 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/package.deprecated +++ b/sdk_container/src/third_party/portage-stable/profiles/package.deprecated @@ -17,6 +17,37 @@ #--- END OF EXAMPLES --- +# Michał Górny (2022-10-17) +# Nosetests are no longer maintained (since 2015!), are completely +# broken with Python 3.11, and we were already patching it to make it +# work with prior Python versions. If your package still needs it +# (sic!), then either port it to use a maintained test framework (pytest +# preferably) or last rite it. +# +# Case is also unmaintained (since 2018). Nose-random has had last +# commit in 2016 and was not even released to pypi! +dev-python/nose +dev-python/nose-random + +# Michał Górny (2022-10-14) +# The toml package is unmaintained (last release in 2020) and does not +# implement TOML 1.0. The recommended alternatives include the built-in +# tomllib module, dev-python/tomli, dev-python/tomli-w +# and dev-python/tomlkit. Please consult Guide for porting tips: +# https://projects.gentoo.org/python/guide/porting.html#replacing-the-toml-package +dev-python/toml + +# Petr Vaněk (2022-10-06) +# Obsolete virtual. +# Only one provider is left (net-libs/c-client), please change dependency to +# that instead. +virtual/imap-c-client + +# Matt Turner (2022-10-02) +# Dummy packages, now merged into app-accessibility/at-spi2-core. +app-accessibility/at-spi2-atk +dev-libs/atk + # Michał Górny (2022-06-19) # dev-python/tox is a wrapper to run test suite in a virtual # environment, possibly for multiple Python versions. It cannot really @@ -50,10 +81,12 @@ dev-libs/libcroco dev-libs/libIDL dev-libs/libunique:1 gnome-base/gconf +gnome-base/libglade gnome-base/libgnomecanvas gnome-extra/gconf-editor x11-libs/gtksourceview:2.0 x11-libs/libwnck:1 +x11-libs/vte:0 x11-themes/gnome-icon-theme-extras x11-themes/gnome-icon-theme-symbolic x11-themes/gtk-chtheme 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 f8262658f4..098915579b 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/package.mask @@ -33,11 +33,229 @@ #--- END OF EXAMPLES --- -# Stephan Hartmann (2022-09-26) +# Andrew Ammerlaan (2022-10-17) +# Hostile takeover ongoing, integrity of the live version +# cannot be guaranteed. Use the release version only if you +# change the meta server setting. +# Use games-action/multimc-bin instead to be completely safe. +# https://bugs.gentoo.org/877495 +games-action/polymc + +# Michał Górny (2022-10-17) +# Unmaintained since 2018. Requires dev-python/nose. No revdeps left. +# Removal on 2022-11-16. Bug #877375. +dev-python/case + +# Michał Górny (2022-10-17) +# dev-python/nose plugin. No revdeps left. +# Removal on 2022-11-16. Bug #877369. +dev-python/nose_warnings_filters + +# John Helmert III (2022-10-16) +# (2022-10-14) +# Last upstream release in 2013. Last upstream commit in 2019. No maintainer in +# Gentoo. No reverse dependencies. EAPI=6. +# Depends on unmaintained packages: +# - x11-libs/vte:0 +# Bug #811540. +# Removal on 2022-11-14 +x11-terms/lilyterm + +# Matt Turner (2022-10-14) +# Unmaintained upstream with last commit in 2013. No reverse dependencies. +# Depends on unmaintained packages: +# - x11-libs/gtk+:2 +# - x11-libs/vte:0 +# Bugs #769131, #875704. +# Removal on 2022-11-14 +x11-misc/gtkdialog + +# Matt Turner (2022-10-14) +# Unmaintained upstream. Last release in 2008. Only reverse dependency is +# gnome-mud, which is masked for removal. +# Bugs #349301, #713152, #802723, #808435, #870730, #877079. +# Removal on 2022-11-14 +net-libs/gnet + +# Matt Turner (2022-10-14) +# Needs upstream work to modernize codebase. Depends on lots of unmaintained +# packages: +# - app-text/rarian +# - gnome-base/gconf +# - gnome-base/libglade +# - net-libs/gnet:2 +# - x11-libs/gtk+:2 +# - x11-libs/vte:0 +# Bugs #670904, #873859 +# Removal on 2022-11-14 +games-mud/gnome-mud + +# Sam James (2022-10-13) +# Depends on vulnerable version of Rust. See bug #877005. +# Will be unmasked once dependency is updated. + (2022-10-13) +# Difficult-to-resolve build issues on modern toolchains, +# not publicly maintained, developer contact is difficult, +# and project website has SSL certificate issues. +# Bug #838109. +# Removal on 2022-11-13 +net-misc/spread + +# Matt Turner (2022-10-12) +# Unmaintained and archived upstream. Last release in 2017. +# Bug #597960. +# Removal on 2022-11-12 +net-im/empathy + +# Sam James (2022-10-12) +# Upstream has withdrawn these releases because of a (yet unexplained) +# "significant regression". +# See https://mta.openssl.org/pipermail/openssl-announce/2022-October/000237.html. +# and https://github.com/openssl/openssl/issues/19389. +=dev-libs/openssl-1.1.1r +=dev-libs/openssl-3.0.6 + +# Volkmar W. Pogatzki (2022-10-10) +# Unused Java library. Removal on 2022-11-10. +dev-java/objenesis-test + +# Andreas Sturmlechner (2022-10-08) +# Obsolete after Plasma 5.25 release, merged into KWin. +# Removal on 2022-10-22. +kde-plasma/kwayland-server + +# Michał Górny (2022-10-08) +# Repository and SRC_URI gone. Last release in 2012 (guessing +# by filename). +# Removal on 2022-11-07. Bug #876151. +xfce-extra/transd + +# Michał Górny (2022-10-08) +# This package is not really required for anything, as it being missing +# only disables enforcing install_requires. At the same time, it being +# installed causes unexpected verbose output that randomly breaks more +# susceptible test suites (e.g. dev-python/pythran). +# Removal on 2022-11-07. Bug #876082. +dev-python/setuptools-declarative-requirements + +# Michał Górny (2022-10-08) +# The test suite is broken since at least March. No revdeps. +# Removal on 2022-11-07. Bug #834656. +dev-python/kazoo + +# Matt Turner (2022-10-07) +# Unstable release. Masked for testing. +>=x11-libs/cairo-1.17 + +# Sam James (2022-10-07) +# Ancient K&R C codebase which fails to compile with modern Clang; surface +# level fixes are doable, but then get into various dangerous constructs +# in the async code which is non-trivial to port to modern compilers. +# bug #731070, bug #802108, bug #875164. +# Use media-sound/mpd if looking for a modern alternative. Removal on 2022-11-07. +media-sound/rplay + +# Matt Turner (2022-10-01) +# Unmaintained upstream. Last commit was 10 years ago today. +# Unclear if it does anything useful. Many open bugs: #584352, #833102, +# #852728, #866557, #875278. +# Removal on 2022-11-05 +x11-libs/libva-vdpau-driver + +# Michał Górny (2022-10-05) +# Originally added for dev-python/rapidfuzz. Now the algorithm has been +# inlined into rapidfuzz, and the package is semi-deprecated. +# No revdeps left in ::gentoo. +# Removal on 2022-11-04. Bug #875350. +dev-cpp/jarowinkler-cpp +dev-python/jarowinkler + +# Sam James (2022-10-04) +# Regression for some Intel LCDs which may cause physical damage +# Please upgrade to 5.19.13 if affected! +# https://lore.kernel.org/all/YzwooNdMECzuI5+h@intel.com/ +# https://lore.kernel.org/lkml/1664893073238194@kroah.com/T/ +=sys-kernel/gentoo-sources-5.19.12 +=sys-kernel/vanilla-sources-5.19.12 +=sys-kernel/gentoo-kernel-5.19.12 +=sys-kernel/gentoo-kernel-bin-5.19.12 +=sys-kernel/vanilla-kernel-5.19.12 +=virtual/dist-kernel-5.19.12 + +# Sam James (2022-10-04) +# Please upgrade to >= portage-3.0.38.1 for binpkg fixes. +# bug #870283, bug #874771. +=sys-apps/portage-3.0.31 +=sys-apps/portage-3.0.32 +=sys-apps/portage-3.0.33 +=sys-apps/portage-3.0.34 +=sys-apps/portage-3.0.35 +=sys-apps/portage-3.0.36 +=sys-apps/portage-3.0.37 +=sys-apps/portage-3.0.38 + +# Matt Turner (2022-10-01) +# Depends on lots of unmaintained packages: +# - app-text/gnome-doc-utils +# - dev-libs/libunique:1 +# - dev-util/gob +# - x11-libs/gtk+:2 +# Last commit to upstream repository in 2015. Most plugins saw their last +# upstream commit 10+ years ago. Unmaintained in Gentoo since 2016. Many open +# bugs: #582138, #686800, #689364, #721246, #799263, #808447, #808450, #808456, +# #831024. +# Removal on 2022-11-01 +media-sound/gmpc +media-plugins/gmpc-alarm +media-plugins/gmpc-albumview +media-plugins/gmpc-avahi +media-plugins/gmpc-awn +media-plugins/gmpc-discogs +media-plugins/gmpc-extraplaylist +media-plugins/gmpc-jamendo +media-plugins/gmpc-last-fm +media-plugins/gmpc-libnotify +media-plugins/gmpc-lyrics +media-plugins/gmpc-lyricwiki +media-plugins/gmpc-magnatune +media-plugins/gmpc-mdcover +media-plugins/gmpc-mmkeys +media-plugins/gmpc-mserver +media-plugins/gmpc-playlistsort +media-plugins/gmpc-shout +media-plugins/gmpc-tagedit + +# Matt Turner (2022-10-01) +# Metapackage that has outlived its purpose. Made some sense in the immediate +# aftermath of X.Org modularization 15 years ago. +# Use these instead if desired: +# - x11-base/xorg-apps +# - x11-base/xorg-fonts +# Removal on 2022-11-01. Bugs #755233, #872119. +x11-base/xorg-x11 + +# Brian Evans (2022-09-30) +# Mask RC versions for initial testing + (2022-09-29) +# Unfetchable mirror-restricted distfile. No action from maintainer +# in over a year. +# Removal on 2022-10-29. Bug #789477. +games-simulation/bcs-demo + +# Stephan Hartmann (2022-09-29) # Dev channel releases are only for people who # are developers or want more experimental features # and accept a more unstable release. ->=www-client/chromium-107 +>=www-client/chromium-108 # Sam James (2022-09-26) # Masked for testing. Please report bugs! @@ -51,15 +269,6 @@ # Removal on 2022-10-26. Bug #253517. games-sports/torcs -# Ionen Wolkens (2022-09-25) -# This version been causing major issues for some RTX 30xx users and -# no real reason not to stick to 515.65.01 for now (but feel free to -# unmask if it's been fine and need it, notably has fixes to build -# with upcoming 6.0 linux kernels). -# https://bugs.archlinux.org/task/75995 -# https://forums.developer.nvidia.com/t/bug-report-black-x11-screen-and-partial-lockup-when-upgraded-to-515-76-and-dual-rtx3060 -~x11-drivers/nvidia-drivers-515.76 - # Piotr Karbowski (2022-09-25) # No package in tree depends on dev-python/ssh2-python. Masked for removal. # Removal on 2022-10-25. @@ -100,76 +309,17 @@ dev-libs/satyr # Removal: 2022-10-18. media-sound/pulseaudio-modules-bt -# Joonas Niilola (2022-09-16) -# This theme has been incorporated to enlightenment-0.25, and with -# 0.24 removed from Gentoo's git tree, this ebuild is useless. Removal -# in 30 days. #870355 -x11-themes/e-flat-theme - -# Joonas Niilola (2022-09-15) -# Upstream split this font into separate packages: media-fonts/ -# source-code-pro, source-sans, source-serif. The current non-split -# version is broken. Removal in 30 days. #865103 -media-fonts/source-pro - # Mike Gilbert (2022-09-12) # repoman is no longer maintained and has been removed from the portage # git repository. Please use dev-util/pkgcheck and dev-util/pkgdev instead. # Removal on 2022-11-11. Bug #835013. app-portage/repoman -# Michał Górny (2022-09-11) -# Bad quality package with failing tests. No revdeps. -# Removal on 2022-10-11. Bug #869650. -dev-python/pytest-pylint - -# Arthur Zamarin (2022-09-10) -# Python 3.8 only. EAPI=6 ebuild. 5 open bugs. Issues with newer -# dependencies versions. -# Removal: 2022-10-10. Bugs #869524, #684334. -net-analyzer/flent - -# Arthur Zamarin (2022-09-10) -# Python 3.8 only package. Tests are disabled. Newer targets fail -# more tests then 3.8 target. -# Removal: 2022-10-10. Bug #869521. -net-nds/nsscache - -# Arthur Zamarin (2022-09-10) -# Python 3.8 only package, with inactive since 2017 upstream. -# Tests fail and doesn't work on newer python targets. -# Removal: 2022-10-10. Bug #869512. -dev-python/python-etcd - -# Arthur Zamarin (2022-09-10) -# Python 3.8 only package, with capped old dependencies, and open -# bugs and issues. -# Removal: 2022-10-10. Bugs #869506, #695090, #792219, #809272. -net-misc/electrum-ltc - -# Arthur Zamarin (2022-09-10) -# Upstream repository archived. Python 3.8 only, with issues for -# newer targets. No reverse dependencies in tree. -# Removal: 2022-10-10. Bugs #869503, #747997, #832242. -dev-python/SaltTesting - # Matthias Schwarzott (2022-09-08) # Breaks kernel builds with BTF enabled. # Bug #868762. =dev-util/pahole-1.24 -# Arthur Zamarin (2022-09-07) -# Python 3.8 only package, no maintainer left. -# Removal: 2022-10-07. Bug #869107. -www-apps/blohg - -# Arthur Zamarin (2022-09-07) -# Python 3.8 only package, 2 open bugs. Recommended to migrate to borg. -# No upstream activity since 2015. -# Bugs #674822, #830291, #832240 -# Removal: 2022-10-07. Bug #869101. -app-backup/attic - # Mike Gilbert (2022-09-05) # Crash due to double-free. # https://bugs.gentoo.org/868567 @@ -180,190 +330,12 @@ app-backup/attic # bugs #829447, #836227, #862504 mail-filter/sigh -# Michał Górny (2022-08-30) -# Flask-Security-Too is a package with high maintenance cost -# and no revdeps in ::gentoo. The next version bump (once more) -# introduces more dependencies. -# -# The remaining listed packages are used exclusively by this package -# (or its tests). If you find one of them useful, please let us know -# and we'll keep it. -# -# Removal on 2022-09-29. Bug #867415. -dev-python/flask-security -dev-python/flask-babelex -dev-python/flask-mail -dev-python/flask-principal -dev-python/flask-wtf -dev-python/mongomock -dev-python/pony -dev-python/pyqrcode -dev-python/sentinels -dev-python/speaklater -dev-python/zxcvbn - -# Matt Turner (2022-08-29) -# Unpatched security vulerabilities. Bug #857780. -# Removal on 2022-09-29. -=x11-base/xorg-server-1.20* -=x11-base/xorg-drivers-1.20* - -# Matt Turner (2022-08-29) -# Fails to build with xorg-server-21. Bug #828426. -# Removal on 2022-09-29. -x11-drivers/xf86-video-glint - -# Hans de Graaff (2022-08-27) -# No longer maintained upstream and more modern alternatives such as -# www-servers/puma are available. -# Removal in 30 days. -dev-ruby/async_sinatra - -# Sam James (2022-08-27) -# Stuck on deprecated and removed Ruby 2.6. Removal on 2022-09-27. -dev-ruby/aws-sdk -dev-ruby/aws-sdk-core -dev-ruby/aws-sdk-resources -dev-ruby/travis - -# Jaco Kroon (2022-08-22) -# Superceded by bgpq4 (already in tree). Non-co-operative upstream. Removal -# in 30 days. Open bugs, already fixed in bgpq4. Please convert your usage to -# bgpq4. Mostly you just need to drop the -3 argument. -net-misc/bgpq3 - -# Volkmar W. Pogatzki (2022-08-22) -# Java library without consumers. Removal on 2022-09-22 -dev-java/byte-buddy-agent - -# hololeap (2022-08-21) -# Monolithic mask for dev-haskell/* packages which have no reverse dependencies, -# are broken, or severely out of date. The aim is to have the Haskell overlay -# (::haskell) be the place for development packages and only have packages -# needed for end-user applications in ::gentoo, as the status quo has -# proven to be unsustainable. More up-to-date versions of these packages -# are available in ::haskell. -# Removal on 2022-09-19. -app-portage/fquery -dev-games/goatee -dev-haskell/megaparsec -dev-haskell/parser-combinators -dev-haskell/megaparsec-tests -dev-haskell/hspec-megaparsec -dev-haskell/neat-interpolation -dev-haskell/stack -dev-haskell/abstract-deque-tests -dev-haskell/aeson-diff -dev-haskell/annotated-wl-pprint -dev-haskell/authenticate-oauth -dev-haskell/base-prelude -dev-haskell/base-unicode-symbols -dev-haskell/casa-client -dev-haskell/casa-types -dev-haskell/cipher-aes128 -dev-haskell/concurrent-extra -dev-haskell/contravariant-extras -dev-haskell/cpphs -dev-haskell/crypto-pubkey-types -dev-haskell/cryptohash -dev-haskell/cryptohash-cryptoapi -dev-haskell/data-default-instances-base -dev-haskell/drbg -dev-haskell/edit-distance-vector -dev-haskell/either -dev-haskell/filelock -dev-haskell/filepattern -dev-haskell/fsnotify -dev-haskell/genvalidity -dev-haskell/genvalidity-hspec -dev-haskell/genvalidity-property -dev-haskell/ghc-lib-parser -dev-haskell/ghc-lib-parser-ex -dev-haskell/githash -dev-haskell/groupoids -dev-haskell/groups -dev-haskell/haddock -dev-haskell/haddock-api -dev-haskell/hashable-time -dev-haskell/hashtables -dev-haskell/haskell-src-meta -dev-haskell/hdbc-odbc -dev-haskell/hi-file-parser -dev-haskell/hlint -dev-haskell/hpack -dev-haskell/hsopenssl -dev-haskell/hsyaml-aeson -dev-haskell/http-common -dev-haskell/http-download -dev-haskell/http-streams -dev-haskell/hxt -dev-haskell/hxt-charproperties -dev-haskell/hxt-regex-xmlschema -dev-haskell/hxt-unicode -dev-haskell/infer-license -dev-haskell/interpolate -dev-haskell/io-streams -dev-haskell/io-streams-haproxy -dev-haskell/iwlib -dev-haskell/js-flot -dev-haskell/js-jquery -dev-haskell/keys -dev-haskell/lens-aeson -dev-haskell/memotrie -dev-haskell/mintty -dev-haskell/mustache -dev-haskell/newtype-generics -dev-haskell/open-browser -dev-haskell/openssl-streams -dev-haskell/optparse-simple -dev-haskell/pantry -dev-haskell/path -dev-haskell/path-io -dev-haskell/pointed -dev-haskell/polyparse -dev-haskell/prettyclass -dev-haskell/project-template -dev-haskell/readable -dev-haskell/rebase -dev-haskell/refact -dev-haskell/regex-applicative-text -dev-haskell/regex-compat-tdfa -dev-haskell/regex-pcre -dev-haskell/rerebase -dev-haskell/rfc5051 -dev-haskell/rio-orphans -dev-haskell/rio-prettyprint -dev-haskell/rsa -dev-haskell/selective -dev-haskell/snap-core -dev-haskell/snap-server -dev-haskell/tar-conduit -dev-haskell/template-haskell-compat-v0208 -dev-haskell/text-metrics -dev-haskell/th-expand-syns -dev-haskell/th-orphans -dev-haskell/th-reify-many -dev-haskell/threads -dev-haskell/validity -dev-haskell/vector-builder -dev-haskell/vector-instances -dev-haskell/weigh -dev-haskell/wreq -dev-haskell/xhtml -dev-haskell/zlib-bindings -dev-util/bnfc - # hololeap (2022-08-21) # doctest-parallel does not currently work with Setup.hs (used internally by # haskell-cabal.eclass) # See: dev-haskell/doctest-parallel -# John Helmert III (2022-08-14) -# Vulnerable, unmaintained in Gentoo, EAPI6. Removal in 30 days, -# bug #772209 -app-crypt/keybase - # Andrew Ammerlaan (2022-08-12) # Masked for testing, depends on dev-qt/qt*:6 # Pyside6 is stuck on python3_10 for the moment being @@ -395,10 +367,6 @@ dev-qt/qtwebchannel:6 dev-qt/qtwebengine:6 dev-qt/qtwebsockets:6 -# Sam James (2022-08-02) -# Multiple rendering/font issues reported: bug #844115, bug #851141. ->=app-text/ghostscript-gpl-9.56.1 - # Fabian Groffen (2022-07-02) # Segfaults handling SPF validations (warn on permerror), like the # previous release, better not to trust your important mail to @@ -526,12 +494,6 @@ sys-devel/automake:1.15 # This is likely to cause issues in tests; Unmask if using for other purposes >=dev-php/PHP_Timer-5.0 -# Sam James (2021-12-01) -# OSL 12 is a development release (for now). -# Doesn't work with LLVM 13 yet; mask to help -# Blender compatibility (no mixed LLVM versions). -=media-libs/osl-1.12* - # Volkmar W. Pogatzki (2021-11-23) # Does not support updated dev-java/pdfbox-2.0.24, Bug #803488 # Blocks (CVE-2018-11797, CVE-2021-{27807,27906,31811,31812}) @@ -556,12 +518,59 @@ sys-devel/automake:1.11 # New major parallel-installable release which needs special care to not # end up loaded into the same process together with the earlier libsoup ABI. # Migration to it is expected for GNOME 42, NOT to be unmasked with GNOME 41. +>=app-arch/file-roller-43 +>=app-backup/deja-dup-43 +>=app-crypt/seahorse-43 +>=app-misc/tracker-3.4.0-r1 +>=app-misc/tracker-miners-3.4.0-r1 +>=app-text/gtranslator-42 +>=app-text/libgepub-0.7.0 +>=dev-libs/gjs-1.74 +>=dev-libs/libgweather-4.2.0 +>=dev-python/nautilus-python-4.0 +>=dev-util/devhelp-43 +>=dev-util/gnome-builder-43 +>=gnome-base/gnome-applets-3.46 +>=gnome-base/gnome-desktop-43 +>=gnome-base/gnome-flashback-3.46 +>=gnome-base/gnome-panel-3.46 +>=gnome-base/gnome-settings-daemon-43 +>=gnome-base/gnome-shell-43 +>=gnome-base/nautilus-43 +>=gnome-extra/evolution-data-server-3.46 +>=gnome-extra/evolution-ews-3.46 +>=gnome-extra/gnome-boxes-43 >=gnome-extra/gnome-calculator-43 +>=gnome-extra/gnome-calendar-43 +>=gnome-extra/gnome-clocks-43 +>=gnome-extra/gnome-shell-extensions-43 +>=gnome-extra/gnome-shell-frippery-43 +>=gnome-extra/gnome-software-43 +>=gnome-extra/sushi-43 +>=mail-client/balsa-2.6.4 +>=mail-client/evolution-3.46 +>=mail-client/geary-43 +>=media-gfx/gnome-photos-43 media-libs/libshumate +>=net-irc/polari-43 +net-libs/dleyna +>=net-libs/gnome-online-accounts-3.46 +>=net-libs/gssdp-1.6 +>=net-libs/gupnp-1.6 net-libs/libsoup:3.0 +net-libs/phodav:3.0 net-libs/rest:1.0 +net-libs/uhttpmock:1.0 net-libs/webkit-gtk:4.1 +net-libs/webkit-gtk:5 +>=net-misc/gupnp-tools-0.12 +>=net-misc/rygel-0.42 sci-geosciences/geocode-glib:2 +>=sci-geosciences/gnome-maps-43 +>=sys-apps/osinfo-db-tools-1.10.0-r1 +>=sys-libs/libosinfo-1.10.0-r1 +>=www-client/epiphany-43 +>=x11-wm/mutter-43 # Thomas Deutschmann (2021-09-07) # Masked while being tested and reverse deps aren't fully compatible diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.5/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.5/package.use.mask deleted file mode 100644 index 52409fbb3d..0000000000 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/10.5/package.use.mask +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - - -# Fabian Groffen (2008-04-28) -# mach_override.h missing -# http://www.erlang.org/pipermail/erlang-questions/2007-July/027870.html -dev-lang/erlang hipe diff --git a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.mask b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.mask index 0a403530e9..65c385e7ab 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/prefix/darwin/macos/package.mask @@ -1,8 +1,2 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 - -# Fabian Groffen (2022-06-14) -# timer_create build-failure, corrected upstream in 5067 -# https://github.com/vim/vim/commit/f78b52ba24d8d294869cd013dcc4cd5d4a65cea7 -~app-editors/vim-8.2.5066 -~app-editors/vim-core-8.2.5066 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 d5338d2db4..3c83ad1b7c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/profiles.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/profiles.desc @@ -30,12 +30,12 @@ amd64 default/linux/amd64/17.1/hardened/selinux stable amd64 default/linux/amd64/17.1/desktop stable amd64 default/linux/amd64/17.1/desktop/gnome stable amd64 default/linux/amd64/17.1/desktop/gnome/systemd stable -amd64 default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr dev +amd64 default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr stable amd64 default/linux/amd64/17.1/desktop/plasma stable amd64 default/linux/amd64/17.1/desktop/plasma/systemd stable -amd64 default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr dev +amd64 default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr stable amd64 default/linux/amd64/17.1/desktop/systemd stable -amd64 default/linux/amd64/17.1/desktop/systemd/merged-usr dev +amd64 default/linux/amd64/17.1/desktop/systemd/merged-usr stable amd64 default/linux/amd64/17.1/developer exp amd64 default/linux/amd64/17.1/no-multilib stable amd64 default/linux/amd64/17.1/no-multilib/hardened stable @@ -44,7 +44,7 @@ amd64 default/linux/amd64/17.1/no-multilib/systemd dev amd64 default/linux/amd64/17.1/no-multilib/systemd/merged-usr dev amd64 default/linux/amd64/17.1/no-multilib/systemd/selinux exp amd64 default/linux/amd64/17.1/systemd stable -amd64 default/linux/amd64/17.1/systemd/merged-usr dev +amd64 default/linux/amd64/17.1/systemd/merged-usr stable amd64 default/linux/amd64/17.1/systemd/selinux exp amd64 default/linux/amd64/17.1/clang exp amd64 default/linux/amd64/17.1/systemd/clang exp @@ -130,16 +130,18 @@ arm64 default/linux/arm64/17.0/hardened/selinux dev arm64 default/linux/arm64/17.0/desktop stable arm64 default/linux/arm64/17.0/desktop/gnome stable arm64 default/linux/arm64/17.0/desktop/gnome/systemd stable -arm64 default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr dev +arm64 default/linux/arm64/17.0/desktop/gnome/systemd/merged-usr stable arm64 default/linux/arm64/17.0/desktop/plasma stable arm64 default/linux/arm64/17.0/desktop/plasma/systemd stable -arm64 default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr dev +arm64 default/linux/arm64/17.0/desktop/plasma/systemd/merged-usr stable arm64 default/linux/arm64/17.0/desktop/systemd stable -arm64 default/linux/arm64/17.0/desktop/systemd/merged-usr dev +arm64 default/linux/arm64/17.0/desktop/systemd/merged-usr stable arm64 default/linux/arm64/17.0/developer exp arm64 default/linux/arm64/17.0/systemd stable -arm64 default/linux/arm64/17.0/systemd/merged-usr dev +arm64 default/linux/arm64/17.0/systemd/merged-usr stable arm64 default/linux/arm64/17.0/systemd/selinux exp +arm64 default/linux/arm64/17.0/llvm exp +arm64 default/linux/arm64/17.0/systemd/llvm exp # ARM64 Profiles (big-endian) @@ -162,7 +164,7 @@ ia64 default/linux/ia64/17.0 stable ia64 default/linux/ia64/17.0/desktop stable ia64 default/linux/ia64/17.0/desktop/gnome stable ia64 default/linux/ia64/17.0/desktop/gnome/systemd stable -ia64 default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr dev +ia64 default/linux/ia64/17.0/desktop/gnome/systemd/merged-usr stable ia64 default/linux/ia64/17.0/developer exp ia64 default/linux/ia64/17.0/systemd exp ia64 default/linux/ia64/17.0/systemd/merged-usr exp @@ -216,11 +218,11 @@ ppc default/linux/ppc/17.0 stable ppc default/linux/ppc/17.0/desktop stable ppc default/linux/ppc/17.0/desktop/gnome stable ppc default/linux/ppc/17.0/desktop/gnome/systemd stable -ppc default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr dev +ppc default/linux/ppc/17.0/desktop/gnome/systemd/merged-usr stable ppc default/linux/ppc/17.0/systemd stable -ppc default/linux/ppc/17.0/systemd/merged-usr dev +ppc default/linux/ppc/17.0/systemd/merged-usr stable ppc default/linux/ppc/17.0/developer exp -ppc default/linux/ppc/17.0/musl exp +ppc default/linux/ppc/17.0/musl dev ppc default/linux/ppc/17.0/musl/hardened exp # PPC64 profiles @@ -229,11 +231,11 @@ ppc64 default/linux/ppc64/17.0 stable ppc64 default/linux/ppc64/17.0/desktop stable ppc64 default/linux/ppc64/17.0/desktop/gnome stable ppc64 default/linux/ppc64/17.0/desktop/gnome/systemd stable -ppc64 default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr dev +ppc64 default/linux/ppc64/17.0/desktop/gnome/systemd/merged-usr stable ppc64 default/linux/ppc64/17.0/systemd stable -ppc64 default/linux/ppc64/17.0/systemd/merged-usr dev +ppc64 default/linux/ppc64/17.0/systemd/merged-usr stable ppc64 default/linux/ppc64/17.0/developer exp -ppc64 default/linux/ppc64/17.0/musl exp +ppc64 default/linux/ppc64/17.0/musl dev ppc64 default/linux/ppc64/17.0/musl/hardened exp # PPC64LE profiles @@ -242,16 +244,16 @@ ppc64 default/linux/ppc64le/17.0 stable ppc64 default/linux/ppc64le/17.0/desktop stable ppc64 default/linux/ppc64le/17.0/desktop/gnome stable ppc64 default/linux/ppc64le/17.0/desktop/gnome/systemd stable -ppc64 default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr dev +ppc64 default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr stable ppc64 default/linux/ppc64le/17.0/desktop/plasma stable ppc64 default/linux/ppc64le/17.0/desktop/plasma/systemd stable -ppc64 default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr dev +ppc64 default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr stable ppc64 default/linux/ppc64le/17.0/desktop/systemd stable -ppc64 default/linux/ppc64le/17.0/desktop/systemd/merged-usr dev +ppc64 default/linux/ppc64le/17.0/desktop/systemd/merged-usr stable ppc64 default/linux/ppc64le/17.0/systemd stable -ppc64 default/linux/ppc64le/17.0/systemd/merged-usr dev +ppc64 default/linux/ppc64le/17.0/systemd/merged-usr stable ppc64 default/linux/ppc64le/17.0/developer exp -ppc64 default/linux/ppc64le/17.0/musl exp +ppc64 default/linux/ppc64le/17.0/musl dev ppc64 default/linux/ppc64le/17.0/musl/hardened exp # RISC-V Profiles @@ -267,7 +269,7 @@ riscv default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/merged-usr d riscv default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd dev riscv default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/merged-usr dev riscv default/linux/riscv/20.0/rv64gc/lp64d/systemd stable -riscv default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr dev +riscv default/linux/riscv/20.0/rv64gc/lp64d/systemd/merged-usr stable riscv default/linux/riscv/20.0/rv64gc/lp64 stable riscv default/linux/riscv/20.0/rv64gc/lp64/desktop dev riscv default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome dev @@ -279,7 +281,7 @@ riscv default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/merged-usr de riscv default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd dev riscv default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/merged-usr dev riscv default/linux/riscv/20.0/rv64gc/lp64/systemd stable -riscv default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr dev +riscv default/linux/riscv/20.0/rv64gc/lp64/systemd/merged-usr stable riscv default/linux/riscv/20.0/rv64gc/multilib exp riscv default/linux/riscv/20.0/rv64gc/multilib/systemd exp riscv default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr exp @@ -289,7 +291,7 @@ riscv default/linux/riscv/20.0/rv64gc/multilib/systemd/merged-usr exp s390 default/linux/s390/17.0 stable s390 default/linux/s390/17.0/s390x stable s390 default/linux/s390/17.0/systemd stable -s390 default/linux/s390/17.0/systemd/merged-usr dev +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 @@ -299,12 +301,12 @@ sparc default/linux/sparc/17.0 stable sparc default/linux/sparc/17.0/desktop stable sparc default/linux/sparc/17.0/developer exp sparc default/linux/sparc/17.0/systemd stable -sparc default/linux/sparc/17.0/systemd/merged-usr dev +sparc default/linux/sparc/17.0/systemd/merged-usr stable sparc default/linux/sparc/17.0/64ul stable 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 dev +sparc default/linux/sparc/17.0/64ul/systemd/merged-usr stable # x86 Profiles # @MAINTAINER: x86@gentoo.org @@ -315,36 +317,37 @@ x86 default/linux/x86/17.0/hardened/selinux stable x86 default/linux/x86/17.0/desktop stable x86 default/linux/x86/17.0/desktop/gnome stable x86 default/linux/x86/17.0/desktop/gnome/systemd stable -x86 default/linux/x86/17.0/desktop/gnome/systemd/merged-usr dev +x86 default/linux/x86/17.0/desktop/gnome/systemd/merged-usr stable x86 default/linux/x86/17.0/desktop/plasma stable x86 default/linux/x86/17.0/desktop/plasma/systemd stable -x86 default/linux/x86/17.0/desktop/plasma/systemd/merged-usr dev +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 dev +x86 default/linux/x86/17.0/systemd/merged-usr stable # musl profiles # @MAINTAINER: musl@gentoo.org -amd64 default/linux/amd64/17.0/musl exp +amd64 default/linux/amd64/17.0/musl dev amd64 default/linux/amd64/17.0/musl/clang exp amd64 default/linux/amd64/17.0/musl/hardened exp amd64 default/linux/amd64/17.0/musl/hardened/selinux exp -arm default/linux/arm/17.0/musl/armv6j exp +arm default/linux/arm/17.0/musl/armv6j dev arm default/linux/arm/17.0/musl/armv6j/hardened exp arm default/linux/arm/17.0/musl/armv6j/hardened/selinux exp -arm default/linux/arm/17.0/musl/armv7a exp +arm default/linux/arm/17.0/musl/armv7a dev arm default/linux/arm/17.0/musl/armv7a/hardened exp arm default/linux/arm/17.0/musl/armv7a/hardened/selinux exp -arm64 default/linux/arm64/17.0/musl exp +arm64 default/linux/arm64/17.0/musl dev +arm64 default/linux/arm64/17.0/musl/llvm exp arm64 default/linux/arm64/17.0/musl/hardened exp arm64 default/linux/arm64/17.0/musl/hardened/selinux exp mips default/linux/mips/17.0/musl/o32 exp mips default/linux/mips/17.0/musl/n64 exp mips default/linux/mips/17.0/musl/mipsel/o32 exp mips default/linux/mips/17.0/musl/mipsel/n64 exp -riscv default/linux/riscv/20.0/rv64gc/lp64d/musl exp -riscv default/linux/riscv/20.0/rv64gc/lp64/musl exp -x86 default/linux/x86/17.0/musl exp +riscv default/linux/riscv/20.0/rv64gc/lp64d/musl dev +riscv default/linux/riscv/20.0/rv64gc/lp64/musl dev +x86 default/linux/x86/17.0/musl dev x86 default/linux/x86/17.0/musl/selinux exp # These are Gentoo Prefix profiles, maintained by the Prefix team diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/systemd/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/targets/systemd/make.defaults index 8bc064858b..5db64cfb8c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/targets/systemd/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/targets/systemd/make.defaults @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 USE="systemd udev" -BOOTSTRAP_USE="${BOOTSTRAP_USE} systemd udev" +BOOTSTRAP_USE="${BOOTSTRAP_USE} systemd sysv-utils udev" diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2022 b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2022 index 6561c40ede..544205da57 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2022 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2022 @@ -20,3 +20,6 @@ move mail-mta/protonmail-bridge mail-mta/proton-mail-bridge move app-emulation/distrobox app-containers/distrobox move www-servers/tornado dev-python/tornado move dev-python/path-py dev-python/path +move xfce-extra/thunar-volman xfce-base/thunar-volman +move xfce-extra/tumbler xfce-base/tumbler +move xfce-extra/xfce4-power-manager xfce-base/xfce4-power-manager diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2022 b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2022 new file mode 100644 index 0000000000..7e58580c34 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/4Q-2022 @@ -0,0 +1,5 @@ +move x11-libs/libva media-libs/libva +move x11-libs/libva-compat media-libs/libva-compat +move x11-libs/libva-intel-driver media-libs/libva-intel-driver +move x11-libs/libva-intel-media-driver media-libs/libva-intel-media-driver +move x11-libs/intel-hybrid-codec-driver media-libs/intel-hybrid-codec-driver diff --git a/sdk_container/src/third_party/portage-stable/profiles/use.desc b/sdk_container/src/third_party/portage-stable/profiles/use.desc index 83c3e70d13..d7e841f80d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/use.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/use.desc @@ -257,6 +257,7 @@ python - Add optional support/bindings for the Python language qdbm - Add support for the qdbm (Quick Database Manager) library qmail-spp - Add support for qmail SMTP plugins qt5 - Add support for the Qt 5 application and UI framework +qt6 - Add support for the Qt 6 application and UI framework quicktime - Add support for OpenQuickTime radius - Add support for RADIUS authentication raw - Add support for raw image formats @@ -311,6 +312,7 @@ tcmalloc - Use the dev-util/google-perftools libraries to replace the malloc() i tcpd - Add support for TCP wrappers telemetry - Send anonymized usage information to upstream so they can better understand our users test - Enable dependencies and/or preparations necessary to run tests (usually controlled by FEATURES=test but can be toggled independently) +test-rust - Enable important test dependencies that require Rust toolchain theora - Add support for the Theora Video Compression Codec threads - Add threads support for various packages. Usually pthreads tidy - Add support for HTML Tidy From cbe8bcadecc271002ae763cc539d580d0ca85d16 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:57:55 +0000 Subject: [PATCH 15/23] sys-devel/autoconf: Sync with Gentoo It's from Gentoo commit 3c9ccf651585632364416458ab52ca7be2ff2436. --- .../portage-stable/sys-devel/autoconf/metadata.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/metadata.xml index 73dda144f9..4ff4a48125 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/metadata.xml @@ -1,8 +1,11 @@ - - base-system@gentoo.org - Gentoo Base System - + + base-system@gentoo.org + Gentoo Base System + + + autoconf + From 511c634c0be7dd90bdb0a059197ad6a71184fdea Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:57:59 +0000 Subject: [PATCH 16/23] sys-devel/binutils: Sync with Gentoo It's from Gentoo commit 8db889827661b38cfbe74f335e095a4288a83ff7. --- ...nutils-2.39-r3.ebuild => binutils-2.39-r4.ebuild} | 12 ++++++------ .../sys-devel/binutils/binutils-9999.ebuild | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-devel/binutils/{binutils-2.39-r3.ebuild => binutils-2.39-r4.ebuild} (97%) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r4.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r3.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r4.ebuild index 27930510b1..3ac03a449c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r4.ebuild @@ -248,12 +248,12 @@ src_configure() { # Available from 2.35 on --enable-textrel-check=warning - # Available from 2.39 on - --enable-warn-execstack - --enable-warn-rwx-segments - # TODO: Available from 2.39+ on but let's try the warning on for a bit - # first... (--enable-warn-execstack) - # Could put it under USE=hardened? + # 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. + #--enable-warn-execstack + #--enable-warn-rwx-segments #--disable-default-execstack (or is it --enable-default-execstack=no? docs are confusing) # Things to think about 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 c1e00302b9..29f4e844ce 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 @@ -249,12 +249,12 @@ src_configure() { # Available from 2.35 on --enable-textrel-check=warning - # Available from 2.39 on - --enable-warn-execstack - --enable-warn-rwx-segments - # TODO: Available from 2.39+ on but let's try the warning on for a bit - # first... (--enable-warn-execstack) - # Could put it under USE=hardened? + # 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. + #--enable-warn-execstack + #--enable-warn-rwx-segments #--disable-default-execstack (or is it --enable-default-execstack=no? docs are confusing) # Things to think about From 0bc4dd139d9428a4a3e0942992d17c64a09dde7b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:58:01 +0000 Subject: [PATCH 17/23] sys-devel/bison: Sync with Gentoo It's from Gentoo commit 8fa39bfcd76e459f5b95f642f84a0b9611ae6869. --- .../src/third_party/portage-stable/sys-devel/bison/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/bison/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/bison/metadata.xml index 5ed43596bb..2e9f3654b4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/bison/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/bison/metadata.xml @@ -6,6 +6,7 @@ Gentoo Base System + cpe:/a:gnu:bison akimd/bison From 31427847c64d357bed8c97b31dc16b082777aa62 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:58:02 +0000 Subject: [PATCH 18/23] sys-devel/gcc: Sync with Gentoo It's from Gentoo commit 6359da299fc35ad35f193ce005b2b1c0ae5da28d. --- .../portage-stable/sys-devel/gcc/Manifest | 4 +- .../sys-devel/gcc/gcc-10.4.1_p20221006.ebuild | 6 +- .../sys-devel/gcc/gcc-10.4.1_p20221013.ebuild | 58 +++++++++++++++++++ .../sys-devel/gcc/gcc-11.3.1_p20221007.ebuild | 6 +- ...009.ebuild => gcc-11.3.1_p20221014.ebuild} | 25 ++++---- .../sys-devel/gcc/gcc-12.2.1_p20221008.ebuild | 6 +- .../sys-devel/gcc/gcc-12.2.1_p20221015.ebuild | 52 +++++++++++++++++ .../gcc/gcc-13.0.0_pre20221002.ebuild | 2 +- 8 files changed, 135 insertions(+), 24 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221013.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-13.0.0_pre20221009.ebuild => gcc-11.3.1_p20221014.ebuild} (65%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221015.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest index c3f3be0dce..65276d87ec 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest @@ -1,6 +1,7 @@ DIST gcc-10-20220922.tar.xz 71765508 BLAKE2B f5cc860ea6a22374e74a4d0f473b1041488e63127b53de80f5e4adc7ecb4b2956358f2b474eec64c03a26b06a79ac2568d0fea0e95d3b16d970986fd8896a6dc SHA512 f493ebc8e960c861a85f2a2cf9ec07399b4e20a2e2ae9451c7b4997dbd30b1174eb4c850fab9ed92460012be571ca08153c44ff71ca57ab1c340e47115ef28a7 DIST gcc-10-20220929.tar.xz 71808912 BLAKE2B 5e1091e3ecc6f05df663f77a358c2147e01de07c33ee5312f045df519df3c7ef9a4424a7a8857e7f0cb8b2d7f0c81d01c3aa666fb8f97d5a05536f26bddc85dc SHA512 267283ccb4edfc695e2770753513656c071a58d571509d8c752b1f80b0e8a30730933c1b0ee8d6cbf7d2faef9987aea41c387fea7f59996b73ea9d124cfe7b77 DIST gcc-10-20221006.tar.xz 71755692 BLAKE2B 0099821e5fcd5e1a069369a72f105607cb7f20fbef3d627a598d8c7a6439491e050533d6577b4f7953aabb52daf926ffc8eb9cecd8853833a14c90bd878e1ad9 SHA512 3fc1dceff31ec8a84babe31d88a312d9d3d30450ff0c42730b9a9fe45c0fc9509216fb95cd84df7477faebe2b9b7d8f7e269c9e76cecc05417dc6192e3b96c67 +DIST gcc-10-20221013.tar.xz 71758872 BLAKE2B f3bf7e72f29012fc360be09fc578048d5f1dd241803343dc3e2ec595ea326df4abfb577234d0f0854392a15c9ec4575e9dd58a6721e5115e0c10262aa422204d SHA512 c2c9d5fc6680a21b39377936b3bb400b7db3e3dfeef1a9ac685088cacf6892ecd5ee052197902831b422f624ba0bf8cb426af6b55e9de6b5f0279d6b1791d628 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570 DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648 @@ -9,6 +10,7 @@ DIST gcc-10.5.0-patches-0.tar.xz 16188 BLAKE2B 3fe3163c4960ff02eb792b2d00b9b20e1 DIST gcc-11-20220909.tar.xz 75778496 BLAKE2B 6905614b33c1fa74caf409e4a6e87d0d38464e3f965ba92bba4167608af1143e69540b023626578437bcc4d631f94fc60e72e09b32c586be5c1dd6d29774b275 SHA512 22afab5e99cf787aac0eac2b4e5b7f663dd2a9fa82f4d13c08fca8b79007f5937cdbd8c5d49ae31d4b3267def09c9030c5c1dad4bd28c8d28050c4273810cc5d DIST gcc-11-20220930.tar.xz 75795296 BLAKE2B 4c83160b961f77efa138f011cd7cef59553e87c272f7ba46fd821832e90cb11336aab1b81039abc9ad4e642232c72ef6bd82061dedf39f97634e834a4d34e307 SHA512 f64a28ceb8a157ba569868d9ed392e242f4ef328d0427163b090ff0a4a3dd69abce8f6fc92c9dc8fa00683d77f3a35a1052a74a64778c533c60a8e6e784a2f27 DIST gcc-11-20221007.tar.xz 75790520 BLAKE2B de52f7fc5c7f5f82d9cbaeaa13b216e149a4aac8162188c628007c17ddb40aa838d19f2ca18216e8bfe5df2d21438f10c8e87298b53cbde4359f72c9cff87589 SHA512 b785236a00647041c9ea4552e5ea82a09e23a801b029773ba77bfc03675c530369ad0b5fc279330f3d8dd4b9b40aeaa9de84a39b6397f73984b7e2fdf8f0bad2 +DIST gcc-11-20221014.tar.xz 75801968 BLAKE2B 788ba84da31aa209e96039b0d1336dd15c2d69497f458d5943656f375cad36293df603e563a96a238d2d0315f9c823f2ec42aa74e140d48dfa7ce571169d5575 SHA512 67755db033c32d8719e653c6742f5fb7b4e235f0d134bb49de5522f2f8caec6e4df4bbdf47f2fb4b877af041940ede68f54c34951d63d69d76ef9f8888ddd251 DIST gcc-11.3.0-musl-patches-1.tar.xz 3856 BLAKE2B f511f8b4c0696771d906beee9645b5d009ea4b673602baa1ca562d6f23c5b0caf2012aae93578671624617c4286e3937d79a7383d6a03bb438c5b774a06fe8e6 SHA512 cd375ff2affb213475acaabf02989b1f05d719d972970ea0304d20a816986807390893d1401826f3b497787642f35d90a244195f8e466db41e8d768366057334 DIST gcc-11.3.0-patches-7.tar.xz 15184 BLAKE2B 426f00feaa982a35d2c459e7a2c2e9d29b4b467ac3625ebd72bb31077c75bbf0c028137df03921c52ddc97a14d92c49777bd3f27b47a7b47d8a05e2d106b6bdb SHA512 bec8bf26b3e50633a5a2e0bb75ffeaba86becb704c14365ff3342e8d651ab75bb3ceec7808d88a25989b8c7182398184b95b6d1267aaef9aa828f687e4895e9d DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7 @@ -18,12 +20,12 @@ DIST gcc-12-20220917.tar.xz 79137544 BLAKE2B ddd538b339e57fce4d8ef47e18077a27b35 DIST gcc-12-20220924.tar.xz 79135908 BLAKE2B 41cbc1d232bfb07a2a84b6fe4bc692f21378661197447c39ef9f4d56015410c8416e3a01da98dff7329fc3392331dc5b6e404fa09a0df1e35598b9bfb41cb814 SHA512 ba4d9e73d108088da26fbefe18d9b245b76771ffe752c2b4b31bdf38a2d0b638fbc115c377526c27311d4d7ffd4e0d236a5af5016bd364ccaa11a4989d1401e8 DIST gcc-12-20221001.tar.xz 79132788 BLAKE2B e3ab41f7f31a202380063679f9b233c02ac3ea860a1ef43df943e8ad50c261a72a846486a5f1386a125c379948316eeb4f7cec75998bec7e463b12453d7df0eb SHA512 c838aa1f1ab2df3d0d5e738674b4b5e1dc08118ea7d2c21999e186d3af52e82939acf4c2d752cc7a4b49e710263bdfe8b1020669cf80d9a477a3be283d40f359 DIST gcc-12-20221008.tar.xz 79145884 BLAKE2B ff3d684d887e282c79fe95952a449ed5770d4bd74077553baf31c34dbd77177e680b19ac741c04aab26ac2c9bb2b89924f51f63e2f22b440decf2c65274a7640 SHA512 a35a6207e7f4375abca3ae57376c98b082846a88e83522c322d713e759367ceb2b3ad68488bed6f1645e47a106b0bbb2efbca6cb14b077672289acb4373e616f +DIST gcc-12-20221015.tar.xz 79164000 BLAKE2B 5d8677d297aaa0a295b964c6aac884e2fd58d7ce18890640cdde8a7b56184e7636e2d7f83567e207b36f199a73ba75a95c60e134c0b2106b90ed6b7dfd5bcd59 SHA512 6a76d79a95d2826a80c3fbddc0617776964ca8fe65f09ee5706ebc1d92277f695b70d18d165d1964559e8ceb51cebabb7ea4ef464ce0d9d1bb49600c1a429428 DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 DIST gcc-13-20220918.tar.xz 79822640 BLAKE2B 6c35953290e001352aac3a649de7a6dc696bcad85e5b2905bbb6863fd280ce78cfb5663a95e64a1006c869be0e7892adea85e2b1c9f799c3412f634b23f069d0 SHA512 e1b661a483d71f3f8d0dc66bbc2ce6a00bf3b3bb3142b27b07c01d46c10717ad7a95b79d44fa78e3821614032a5ab9194ff444ff280dd3304d4b030373436b6b DIST gcc-13-20221002.tar.xz 79899100 BLAKE2B e7bde088c380dacd08489541ead97a877a3b7cf514bb8c2e61144a5a953ff1da26342f8d52021983438a06f483f9cd6ac0ea966611801d4e57d3723ea13a09d4 SHA512 b47325dd065b579c71b0c2c57282c8d244894c4edd51a39e8ff97898e0a8dc80e920a9ada5ce13204f98c90c61e9015a4ecdae1c04a8417e20d1df93019f147a -DIST gcc-13-20221009.tar.xz 79944512 BLAKE2B 436a290bf7cf99eddb636f2f73cf31d5b2f7626007215f83ee72ce995bc24207b627aec2752fd641ffc14ac6e1c809029a08c566cde6a79503e2041a54c9e914 SHA512 c2bd85dd1b9a2a8e04609614ff6e8fc959f1ce0b98d4468759d806a44b3ca8fababed722e672588cc87dc18d199891f598dcd36bfe69d7d074b93fa74676b6f4 DIST gcc-13.0.0-patches-1.tar.xz 11064 BLAKE2B 82a7ad193dac00475931840bcee82ef7a51718a74af224b03a41f8349e34c2a64a3eb29985b4e2bffde958c58782242eccaedaa54d950e8d51d8bb6f45868e0e SHA512 e04b510f529dd3187a08ae9cb9a894a3d3d30af81f13c43cc082fda7d26c44a3bf19d36ec02024b2ade8b8c193e9730246abeadee603c41b5873c5b785709921 DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb SHA512 b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221006.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221006.ebuild index bb60337891..147a87b613 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221006.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221006.ebuild @@ -35,9 +35,9 @@ inherit toolchain EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi +if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi RDEPEND="" BDEPEND="${CATEGORY}/binutils" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221013.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221013.ebuild new file mode 100644 index 0000000000..bb60337891 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221013.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_SUFFIX="xz" +TOOLCHAIN_PATCH_DEV="sam" +#TOOLCHAIN_GCC_RC=1 +PATCH_GCC_VER="10.5.0" +PATCH_VER="0" +MUSL_VER="1" +MUSL_GCC_VER="10.5.0" + +if [[ $(ver_cut 3) == 9999 ]] ; then + MY_PV_2=$(ver_cut 2) + if [[ ${MY_PV_2} == 0 ]] ; then + MY_PV_2=0 + else + MY_PV_2=$(($(ver_cut 2) - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) +elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then + # Cheesy hack for RCs + MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) + MY_P=${PN}-${MY_PV} + GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" + TOOLCHAIN_SET_S=no + S="${WORKDIR}"/${MY_P} +fi + +inherit toolchain +# Needs to be after inherit (for now?), bug #830908 +EGIT_BRANCH=releases/gcc-$(ver_cut 1) + +# Don't keyword live ebuilds +#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +#fi + +RDEPEND="" +BDEPEND="${CATEGORY}/binutils" + +src_prepare() { + local p upstreamed_patches=( + # add them here + ) + for p in "${upstreamed_patches[@]}"; do + rm -v "${WORKDIR}/patch/${p}" || die + done + + if has_version '>=sys-libs/glibc-2.32-r1'; then + rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die + fi + + toolchain_src_prepare +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221007.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221007.ebuild index 4c05022129..e821929d61 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221007.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221007.ebuild @@ -27,9 +27,9 @@ inherit toolchain EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi +if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi # 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. diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221009.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221014.ebuild similarity index 65% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221009.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221014.ebuild index 641ab05e81..4c05022129 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221009.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221014.ebuild @@ -3,41 +3,40 @@ EAPI=8 -TOOLCHAIN_PATCH_DEV="xen0n" -PATCH_VER="1" -PATCH_GCC_VER="13.0.0" -MUSL_GCC_VER="13.0.0" +TOOLCHAIN_PATCH_SUFFIX="xz" +TOOLCHAIN_PATCH_DEV="sam" +PATCH_VER="2" +PATCH_GCC_VER="11.4.0" +MUSL_VER="0" +MUSL_GCC_VER="11.4.0" if [[ $(ver_cut 3) == 9999 ]] ; then MY_PV_2=$(ver_cut 2) - MY_PV_3=$(($(ver_cut 3) - 9998)) if [[ ${MY_PV_2} == 0 ]] ; then MY_PV_2=0 - MY_PV_3=0 else MY_PV_2=$(($(ver_cut 2) - 1)) fi # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) fi inherit toolchain # Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=master +EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - KEYWORDS="~loong" -fi +#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +#fi # 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[cet(-)?]" +BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" src_prepare() { local p upstreamed_patches=( diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild index 97d104a847..aa3dfbf98f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221008.ebuild @@ -34,9 +34,9 @@ inherit toolchain EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi +if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi # 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. diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221015.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221015.ebuild new file mode 100644 index 0000000000..97d104a847 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221015.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_VER="1" +PATCH_GCC_VER="12.2.0" +MUSL_VER="1" +MUSL_GCC_VER="12.2.0" + +if [[ $(ver_cut 3) == 9999 ]] ; then + MY_PV_2=$(ver_cut 2) + if [[ ${MY_PV_2} == 0 ]] ; then + MY_PV_2=0 + else + MY_PV_2=$(($(ver_cut 2) - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) +elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then + # Cheesy hack for RCs + MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) + MY_P=${PN}-${MY_PV} + GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" + TOOLCHAIN_SET_S=no + S="${WORKDIR}"/${MY_P} +fi + +inherit toolchain + +# Needs to be after inherit (for now?), bug #830908 +EGIT_BRANCH=releases/gcc-$(ver_cut 1) + +# Don't keyword live ebuilds +#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +#fi + +# 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(-)?]" + +src_prepare() { + toolchain_src_prepare + + eapply_user +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221002.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221002.ebuild index 641ab05e81..eaaa94a046 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221002.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221002.ebuild @@ -29,7 +29,7 @@ EGIT_BRANCH=master # Don't keyword live ebuilds if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - KEYWORDS="~loong" + KEYWORDS="" fi # Technically only if USE=hardened *too* right now, but no point in complicating it further. From 29f1ebe5c3d302975551d66944e91bc66889207a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:58:02 +0000 Subject: [PATCH 19/23] sys-devel/gcc-config: Sync with Gentoo It's from Gentoo commit 90de032e647c1ab386151ab9ad04dede8cab4db5. --- .../third_party/portage-stable/sys-devel/gcc-config/Manifest | 2 +- .../gcc-config/{gcc-config-2.7.ebuild => gcc-config-2.8.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/{gcc-config-2.7.ebuild => gcc-config-2.8.ebuild} (100%) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/Manifest index cda0b548e7..fd30a7bcc1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/Manifest @@ -1,4 +1,4 @@ DIST gcc-config-2.4.tar.xz 17552 BLAKE2B 631645a5cc9f3e7ab0ff089960ee3d0b2ecea29aa96f839a03a86985db512bf0d182b67a7b1bb73b95808c04523f32d6b8c122cdfbe8dbf94e7d319a1e49a23c SHA512 852b4aefaccfae1d91c551e226ac28110fa23f9668075c190a5fb9129c86d2f3e4994e96b7a5e8a2801883c5a5b16d9fbf3e9066e6b6a423055fdefa490793c7 DIST gcc-config-2.5.tar.xz 17664 BLAKE2B fa7133a54d3b49df20d3ae6036a65602c8a0d9e8668e2874a87d080add241a31322a3f4694bff8a5fe61957740603862539c0d9750e446d36beb2fb42ff0ba27 SHA512 20a8d62192faf54101352cfb6ca00503c9b2ab83aefecd94c4c887302a000d78334545a3424603a66a50e5f3ff07b67b16828813407893df5d94051776252b83 DIST gcc-config-2.6.tar.xz 17772 BLAKE2B 5f06ac46c64fd241be9e7b95e277395623f015016c5abbe5e3275dce3fbf326d998a897a915b87387c878a1b57cdc847a6f95fa0b7ca00aa954c13d00a6e7d09 SHA512 27de726b266b2f58f28a4eab0a77141a8c0cfc9e939f4f0ee8dd382578a1cdececd30a4ae15bab858fec01a533c41248c9858f25d5d7314c36e8f2fcd57df429 -DIST gcc-config-2.7.tar.xz 17916 BLAKE2B 4c775ad64648e9b463981f43ff03f0c5b703c7cb0812f3a4579fdc939630b8d91d0b1d8a9bb56e47098155be492452698907c9640f0accd5e2141dc49216093d SHA512 69888798257ea6a9c16e387b3cee872ad47aa891f191ef6fbbbf18df243fba649505799c9cad57474f34720ff8892d8f21c96b69d5d6279efe0c7ee79a9ca8b3 +DIST gcc-config-2.8.tar.xz 17968 BLAKE2B aa34e681ef0c86bb846d89b816b46276f5c7c32974c785a9611a903a4fe165c997a34664abe17aa4d8720a96f194054e5d8c371a6c9270b1c235d7539094436c SHA512 5e91df44fb7782b9ad41ed06fbd53f74868c059f892c6c2b8195ebaa899905dd9f502562887f1a3765dd6b61698e956d01c6fa6f97a535cf16e26e70fcd902ba diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.7.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.8.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.7.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.8.ebuild From c80bc4e5d17c673cb9100ac341f24c0d3fd51dbb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:58:02 +0000 Subject: [PATCH 20/23] sys-devel/gettext: Sync with Gentoo It's from Gentoo commit 22abbfd63a3d84dd063e300eeaa5b8c15b33d0d4. --- .../portage-stable/sys-devel/gettext/Manifest | 2 + .../files/gettext-0.21.1-java-autoconf.patch | 100 ++++++++++ .../sys-devel/gettext/gettext-0.21-r4.ebuild | 4 + .../sys-devel/gettext/gettext-0.21.1.ebuild | 173 ++++++++++++++++++ 4 files changed, 279 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/Manifest index 653a9cf078..b0e7dcae84 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/Manifest @@ -1,2 +1,4 @@ +DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b21cc213dc3b98616b4a9fc321c90911d94d314f323cfffd0d2c3e9371b5b8f7985b9a785adc61617dd042b6f4df5 SHA512 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9 +DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0 DIST gettext-0.21.tar.xz 9714352 BLAKE2B e36418323c79f582d13777083b455ae76ccb29e41a8259a2f4d6d9f5d8e2ac7c8ecc4df1b1fa2e9838c819cb27345fe254772398bdb88b3315410866048f755a SHA512 f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf DIST gettext-0.21.tar.xz.sig 819 BLAKE2B 22a6e5f6e8a6322e24db9c1f575754bccbf6c7cff7cd14cb51ae8f5cf17cd7b677d8ecfc6b876e1b6f8d62077d568cbf57930e1d8accc5306e6869d3c6560bf4 SHA512 67c9515ad5e11773a28599d517dd84131e4afd878d67e97f505cd024e290518ca9cffff7446c62f88b56aea2c7234d11811738e8e2a076b2159f24c2f6809703 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch new file mode 100644 index 0000000000..a7471ac724 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/files/gettext-0.21.1-java-autoconf.patch @@ -0,0 +1,100 @@ +From b8fc039e4266570f5af5ee1c2cd201369a766f1e Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Tue, 11 Oct 2022 01:54:44 +0200 +Subject: [PATCH] Avoid warnings during configure execution with + --disable-java. + +Reported by Sam James +in . + +* gettext-runtime/configure.ac: Expand gt_JAVACOMP_DISABLED inline. +* gettext-tools/configure.ac: Expand gt_JAVAEXEC_DISABLED and +gt_JAVACOMP_DISABLED inline. +--- a/gettext-runtime/configure.ac ++++ b/gettext-runtime/configure.ac +@@ -42,7 +42,16 @@ AS_IF([test "$JAVA_CHOICE" != no], [ + BUILDJAVA=no + fi + ], [ +- gt_JAVACOMP_DISABLED ++ CONF_JAVAC= ++ HAVE_JAVAC_ENVVAR= ++ HAVE_GCJ_C= ++ HAVE_JAVAC= ++ HAVE_JIKES= ++ AC_SUBST([CONF_JAVAC]) ++ AC_SUBST([HAVE_JAVAC_ENVVAR]) ++ AC_SUBST([HAVE_GCJ_C]) ++ AC_SUBST([HAVE_JAVAC]) ++ AC_SUBST([HAVE_JIKES]) + JAR= + BUILDJAVA=no + ]) +--- a/gettext-tools/configure.ac ++++ b/gettext-tools/configure.ac +@@ -43,8 +43,28 @@ AS_IF([test "$JAVA_CHOICE" != no], [ + BUILDJAVA=no + fi + ], [ +- gt_JAVAEXEC_DISABLED +- gt_JAVACOMP_DISABLED ++ CONF_JAVA= ++ HAVE_JAVA_ENVVAR= ++ HAVE_GIJ= ++ HAVE_JAVA= ++ HAVE_JRE= ++ HAVE_JVIEW= ++ AC_SUBST([CONF_JAVA]) ++ AC_SUBST([HAVE_JAVA_ENVVAR]) ++ AC_SUBST([HAVE_GIJ]) ++ AC_SUBST([HAVE_JAVA]) ++ AC_SUBST([HAVE_JRE]) ++ AC_SUBST([HAVE_JVIEW]) ++ CONF_JAVAC= ++ HAVE_JAVAC_ENVVAR= ++ HAVE_GCJ_C= ++ HAVE_JAVAC= ++ HAVE_JIKES= ++ AC_SUBST([CONF_JAVAC]) ++ AC_SUBST([HAVE_JAVAC_ENVVAR]) ++ AC_SUBST([HAVE_GCJ_C]) ++ AC_SUBST([HAVE_JAVAC]) ++ AC_SUBST([HAVE_JIKES]) + JAR= + BUILDJAVA=no + ]) +diff --git a/gettext-runtime/configure b/gettext-runtime/configure +index 5e2d593..cf579ff 100755 +--- a/gettext-runtime/configure ++++ b/gettext-runtime/configure +@@ -7070,7 +7070,11 @@ fi + + else $as_nop + +- gt_JAVACOMP_DISABLED ++ CONF_JAVAC= ++ HAVE_JAVAC_ENVVAR= ++ HAVE_GCJ_C= ++ HAVE_JAVAC= ++ HAVE_JIKES= + JAR= + BUILDJAVA=no + +diff --git a/gettext-tools/configure b/gettext-tools/configure +index f897bc3..3af54cd 100755 +--- a/gettext-tools/configure ++++ b/gettext-tools/configure +@@ -8718,8 +8718,11 @@ fi + + else $as_nop + +- gt_JAVAEXEC_DISABLED +- gt_JAVACOMP_DISABLED ++ CONF_JAVAC= ++ HAVE_JAVAC_ENVVAR= ++ HAVE_GCJ_C= ++ HAVE_JAVAC= ++ HAVE_JIKES= + JAR= + BUILDJAVA=no + diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21-r4.ebuild index b8bcb0f641..e538718146 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21-r4.ebuild @@ -5,6 +5,10 @@ EAPI=7 +if [[ ${PV} != 0.21 ]] ; then + die "Please check if https://savannah.gnu.org/bugs/?63193 is fixed before bumping!" +fi + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc inherit mono-env libtool java-pkg-opt-2 multilib-minimal verify-sig diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild new file mode 100644 index 0000000000..e56429d0b6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21.1.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Note: Keep version bumps in sync with dev-libs/libintl. + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gettext.asc +inherit java-pkg-opt-2 libtool multilib-minimal verify-sig + +DESCRIPTION="GNU locale utilities" +HOMEPAGE="https://www.gnu.org/software/gettext/" +if [[ ${PV} == *_rc* ]] ; then + SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz" + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${P/_/-}.tar.xz.sig )" + S="${WORKDIR}/${P/_/-}" +else + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +fi +# Only libasprintf is under the LGPL (and libintl is in a sep package), +# so put that license behind USE=cxx. +LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )" +SLOT="0" +IUSE="acl cvs +cxx doc emacs git java ncurses nls openmp static-libs" + +# only runtime goes multilib +# Note: The version of libxml2 corresponds to the version bundled via gnulib. +# If the build detects too old of a system version, it will end up falling back +# to the bundled copy. #596918 +# Note: expat lacks a subslot because it is dynamically loaded at runtime. We +# would depend on older subslots if they were available (based on the ABIs that +# are explicitly handled), but expat doesn't currently use subslots. +DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.3:= + dev-libs/expat + acl? ( virtual/acl ) + ncurses? ( sys-libs/ncurses:0= ) + java? ( virtual/jdk:1.8 )" +RDEPEND="${DEPEND} + !git? ( cvs? ( dev-vcs/cvs ) ) + git? ( dev-vcs/git ) + java? ( virtual/jre:1.8 )" +BDEPEND=" + !git? ( cvs? ( dev-vcs/cvs ) ) + git? ( dev-vcs/git ) + verify-sig? ( sec-keys/openpgp-keys-gettext )" +PDEPEND="emacs? ( app-emacs/po-mode )" + +MULTILIB_WRAPPED_HEADERS=( + # only installed for native ABI + /usr/include/gettext-po.h + + /usr/include/autosprintf.h + /usr/include/textstyle.h + /usr/include/textstyle/stdbool.h + /usr/include/textstyle/version.h + /usr/include/textstyle/woe32dll.h +) + +PATCHES=( + "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168 + "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530 + "${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch + "${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch + "${FILESDIR}"/${P}-java-autoconf.patch +) + +QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so" + +pkg_setup() { + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + java-pkg-opt-2_src_prepare + + default + + # gettext-0.21.1-java-autoconf.patch changes + # gettext-{runtime,tools}/configure.ac and the corresponding + # configure scripts. Avoid regenerating other autotools output. + touch -c gettext-{runtime,tools}/{aclocal.m4,Makefile.in,config.h.in,configure} || die + + # Makefile.am adds a dependency on gettext-{runtime,tools}/configure.ac + touch -c configure || die + + elibtoolize + + use elibc_musl && eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch +} + +multilib_src_configure() { + local myconf=( + # switches common to runtime and top-level + --cache-file="${BUILD_DIR}"/config.cache + #--docdir="\$(datarootdir)/doc/${PF}" + + # Emacs support is now in a separate package + --without-emacs + --without-lispdir + # glib depends on us so avoid circular deps + --with-included-glib + # libcroco depends on glib which ... ^^^ + --with-included-libcroco + # this will _disable_ libunistring (since it is not bundled), + # see bug #326477 + --with-included-libunistring + # Never build libintl since it's in dev-libs/libintl now. + --without-included-gettext + # Never build bundled copy of libxml2. + --without-included-libxml + + --disable-csharp + + $(use_enable acl) + $(use_enable cxx c++) + $(use_enable cxx libasprintf) + $(use_with git) + $(usex git --without-cvs $(use_with cvs)) + $(multilib_native_use_enable java) + $(use_enable ncurses curses) + $(use_enable nls) + $(use_enable openmp) + $(use_enable static-libs static) + ) + + local ECONF_SOURCE="${S}" + if ! multilib_is_native_abi ; then + # for non-native ABIs, we build runtime only + ECONF_SOURCE+=/gettext-runtime + fi + + econf "${myconf[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi ; then + dosym msgfmt /usr/bin/gmsgfmt #43435 + dobin gettext-tools/misc/gettextize + fi +} + +multilib_src_install_all() { + find "${ED}" -type f -name "*.la" -delete || die + + if use java ; then + java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar + rm "${ED}"/usr/share/${PN}/*.jar || die + rm "${ED}"/usr/share/${PN}/*.class || die + if use doc ; then + java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2 + fi + fi + + dodoc AUTHORS ChangeLog NEWS README THANKS + + if use doc ; then + docinto html + dodoc "${ED}"/usr/share/doc/${PF}/*.html + else + rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1} + fi + rm "${ED}"/usr/share/doc/${PF}/*.html || die +} + +pkg_preinst() { + java-pkg-opt-2_pkg_preinst +} From 8874b8b562dd70ad142cb627235c4a8a259c7ff4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:58:04 +0000 Subject: [PATCH 21/23] sys-devel/m4: Sync with Gentoo It's from Gentoo commit 9421f0d8a455a2f09c8555ba156297b06331d20c. --- .../portage-stable/sys-devel/m4/metadata.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/m4/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/m4/metadata.xml index 73dda144f9..dce0ffc83f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/m4/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/m4/metadata.xml @@ -1,8 +1,11 @@ - - base-system@gentoo.org - Gentoo Base System - + + base-system@gentoo.org + Gentoo Base System + + + m4 + From 5ccd77bf8ad2f2c619fce04cd7dcc29c9bafc819 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 18 Oct 2022 15:58:07 +0000 Subject: [PATCH 22/23] sys-libs/zlib: Sync with Gentoo It's from Gentoo commit 4efe01ba2e5b6a4696ce14f70006f4ec05ac14ac. --- .../portage-stable/sys-libs/zlib/Manifest | 2 + ...zlib-1.2.13-use-LDFLAGS-in-configure.patch | 72 +++++++ .../sys-libs/zlib/zlib-1.2.13.ebuild | 191 ++++++++++++++++++ 3 files changed, 265 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.13-use-LDFLAGS-in-configure.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13.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 64bfa1e367..6f127872cd 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/Manifest @@ -1,4 +1,6 @@ DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274 SHA512 14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a DIST zlib-1.2.12.tar.gz 1490071 BLAKE2B 76e7b26f8dc761b0eae6276cc32bc36fa74a88197699c95d158c1548f97b80db5e39d21144ecd6ee3eb90c42730aa5f387f9952d9a3f0930b56e9dfcd12f1e67 SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14 DIST zlib-1.2.12.tar.gz.asc 235 BLAKE2B bb1efc89b10b894ebc8e8008ee3e98104348f197fae54d298d62057a2d8b8d7246de937962b531189f80ad64a803112300a73862cba121cbf6a6d5ac5f9bc40c SHA512 5c1144371a83b83f9f1d008aa9297e23c0db992cab6c4a8966f9320e70c6186867d62753511d6a663b0fe181cd37fe256c53586358a42ea348ccc0747b1a7153 +DIST zlib-1.2.13.tar.xz 1296496 BLAKE2B cefcd25989ce27e7d339af2a88455fcf64f6f5e647bedb0f05a45e4370a885fe45a60c023aa63e79b8ecf20ed3254d0052245f33f5769aca2838b42242be14a8 SHA512 9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725 +DIST zlib-1.2.13.tar.xz.asc 235 BLAKE2B 29206175f06b4e36960fc6b9403101f55c1f5b768e1921ce1402217bc85978b9fba1a4130db2df5c148b6a1c947148372be20ff8c4ce337c6f2541b42fef7274 SHA512 ca5decebe9572e77e88bac5c5119bfda7e222ed3944e4692510ae70fb5f01d8694b59a6878472b84e6b61d2d1682d94473b6312832afa520a2a23293572ea621 DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.13-use-LDFLAGS-in-configure.patch b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.13-use-LDFLAGS-in-configure.patch new file mode 100644 index 0000000000..9f2b240334 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/files/zlib-1.2.13-use-LDFLAGS-in-configure.patch @@ -0,0 +1,72 @@ +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 +--- a/configure ++++ b/configure +@@ -436,7 +436,7 @@ 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 -w -c $SFLAGS $test.c && +- try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then ++ 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 +@@ -498,7 +498,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}" +@@ -532,7 +532,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" +@@ -549,7 +549,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" +@@ -656,7 +656,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 +@@ -746,7 +746,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.2.13.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13.ebuild new file mode 100644 index 0000000000..ed611f394e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13.ebuild @@ -0,0 +1,191 @@ +# Copyright 1999-2022 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="${BROOT}"/usr/share/openpgp-keys/madler.asc +inherit autotools multilib-minimal usr-ldscript verify-sig + +CYGWINPATCHES=( + "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch" + "https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> ${PN}-1.2.7-cygwin-minizip.patch" +) + +DESCRIPTION="Standard (de)compression library" +HOMEPAGE="https://zlib.net/" +SRC_URI="https://zlib.net/${P}.tar.xz + https://zlib.net/fossils/${P}.tar.xz + https://zlib.net/current/beta/${P}.tar.xz + verify-sig? ( https://zlib.net/${P}.tar.xz.asc ) + elibc_Cygwin? ( ${CYGWINPATCHES[*]} )" + +LICENSE="ZLIB" +SLOT="0/1" # subslot = SONAME +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="minizip static-libs" + +RDEPEND="!sys-libs/zlib-ng[compat]" +DEPEND="${RDEPEND}" +BDEPEND=" + minizip? ( ${AUTOTOOLS_DEPEND} ) + verify-sig? ( sec-keys/openpgp-keys-madler ) +" + +PATCHES=( + # Don't install unexpected & unused crypt.h header (which would clash with other pkgs) + # Pending upstream. bug #658536 + "${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch + + # Respect AR, RANLIB, NM during build. Pending upstream. bug #831628 + "${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch + + # Respect LDFLAGS during configure tests. Pending upstream + "${FILESDIR}"/${PN}-1.2.13-use-LDFLAGS-in-configure.patch +) + +src_prepare() { + default + + if use elibc_Cygwin ; then + local p + for p in "${CYGWINPATCHES[@]}" ; do + # Strip out the "... -> " from the array + eapply -p2 "${DISTDIR}/${p#*> }" + done + fi + + if use minizip ; then + cd contrib/minizip || die + eautoreconf + fi + + case ${CHOST} in + *-cygwin*) + # Do not use _wopen, it's a mingw-only symbol + sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die + + # zlib1.dll is the mingw name, need cygz.dll + # cygz.dll is loaded by toolchain, put into subdir + sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die + + ;; + esac + + case ${CHOST} in + *-mingw*|mingw*|*-cygwin*) + # Uses preconfigured Makefile rather than configure script + multilib_copy_sources + + ;; + esac +} + +echoit() { echo "$@"; "$@"; } + +multilib_src_configure() { + case ${CHOST} in + *-mingw*|mingw*|*-cygwin*) + ;; + + *) + # bug #347167 + local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) + + local myconf=( + --shared + --prefix="${EPREFIX}/usr" + --libdir="${EPREFIX}/usr/$(get_libdir)" + ${uname:+--uname=${uname}} + ) + + # Not an autoconf script, so can't use econf + echoit "${S}"/configure "${myconf[@]}" || die + + ;; + esac + + if use minizip ; then + local minizipdir="contrib/minizip" + mkdir -p "${BUILD_DIR}/${minizipdir}" || die + + cd ${minizipdir} || die + ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable static-libs static) + fi +} + +multilib_src_compile() { + case ${CHOST} in + *-mingw*|mingw*|*-cygwin*) + emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}- + sed \ + -e 's|@prefix@|'"${EPREFIX}"'/usr|g' \ + -e 's|@exec_prefix@|${prefix}|g' \ + -e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \ + -e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \ + -e 's|@includedir@|${prefix}/include|g' \ + -e 's|@VERSION@|'${PV}'|g' \ + zlib.pc.in > zlib.pc || die + ;; + + *) + emake + + ;; + esac + + use minizip && emake -C contrib/minizip +} + +sed_macros() { + # Clean up namespace a little, bug #383179 + # We do it here so we only have to tweak 2 files + sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die +} + +multilib_src_install() { + case ${CHOST} in + *-mingw*|mingw*|*-cygwin*) + emake -f win32/Makefile.gcc install \ + BINARY_PATH="${ED}/usr/bin" \ + LIBRARY_PATH="${ED}/usr/$(get_libdir)" \ + INCLUDE_PATH="${ED}/usr/include" \ + SHARED_MODE=1 + + # Overwrites zlib.pc created from win32/Makefile.gcc, bug #620136 + insinto /usr/$(get_libdir)/pkgconfig + doins zlib.pc + + ;; + + *) + emake install DESTDIR="${D}" LDCONFIG=: + gen_usr_ldscript -a z + + ;; + esac + + sed_macros "${ED}"/usr/include/*.h + + if use minizip ; then + emake -C contrib/minizip install DESTDIR="${D}" + sed_macros "${ED}"/usr/include/minizip/*.h + fi + + if use minizip; then + # 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 + use minizip && dodoc contrib/minizip/*.txt +} From 6b4e3b2d938bd4724f83ce474727144875489765 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 19 Oct 2022 08:40:43 +0200 Subject: [PATCH 23/23] changelog: Add entries --- .../changelog/security/2022-10-19-weekly-package-updates.md | 1 + .../changelog/updates/2022-10-19-weekly-package-updates.md | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/changelog/security/2022-10-19-weekly-package-updates.md create mode 100644 sdk_container/src/third_party/portage-stable/changelog/updates/2022-10-19-weekly-package-updates.md diff --git a/sdk_container/src/third_party/portage-stable/changelog/security/2022-10-19-weekly-package-updates.md b/sdk_container/src/third_party/portage-stable/changelog/security/2022-10-19-weekly-package-updates.md new file mode 100644 index 0000000000..a2afefc641 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/security/2022-10-19-weekly-package-updates.md @@ -0,0 +1 @@ +- libxml2 ([CVE-2022-40303](https://nvd.nist.gov/vuln/detail/CVE-2022-40303), [CVE-2022-40304](https://nvd.nist.gov/vuln/detail/CVE-2022-40304)) diff --git a/sdk_container/src/third_party/portage-stable/changelog/updates/2022-10-19-weekly-package-updates.md b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-10-19-weekly-package-updates.md new file mode 100644 index 0000000000..890b189978 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-10-19-weekly-package-updates.md @@ -0,0 +1,3 @@ +- libxml2 ([2.10.3](https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.10.3)) +- nmap ([7.93](https://nmap.org/changelog.html#7.93)) +- zlib ([1.2.13](https://github.com/madler/zlib/releases/tag/v1.2.13))