From 313be82d701b72164e3616905cbcbb46985ac4f8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:19:33 +0000 Subject: [PATCH 01/41] app-editors/vim: Sync with Gentoo It's from Gentoo commit e1012aa8921b3a09f3730df4400d85106d3f65ad. --- .../portage-stable/app-editors/vim/Manifest | 3 - .../vim-0.0.0828-configure-clang16.patch | 28 -- ...-fix-create-timer-for-cros-compiling.patch | 28 -- .../app-editors/vim/vim-9.0.0099-r1.ebuild | 371 ----------------- .../app-editors/vim/vim-9.0.0828-r1.ebuild | 374 ------------------ 5 files changed, 804 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-0.0.0828-configure-clang16.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-9.0-fix-create-timer-for-cros-compiling.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0099-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0828-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest b/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest index 2953ddceb3..cc371e9489 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest @@ -1,6 +1,3 @@ -DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498 -DIST vim-9.0.0828.tar.gz 16782339 BLAKE2B 6b997c1c828338d64a8b204a1e232676ec075834b1b7e74c2fc671e315f9bf6026b0c419ebb3c31e7ce58dbca23828ca11d866b2bfcb73f8a86fb31fa0d51b00 SHA512 03f93515039a2f275a8fe6b84bbac5875ffff17768ab3201e111eba4897a2485fe4ccfe238151f393334c7a6ea77eddd8898f0b816e26dbdb884f4e6bcbd2943 DIST vim-9.0.1000.tar.gz 16842747 BLAKE2B 85edab7d13daa3e84ef0aeb50e3e9bfd31f0634d8e480c105727b0c34318e0adf7f1276dcdac53df8fc416fd8dfb70377cd74ed570752a3e77f07a083fa6c113 SHA512 9d2b914a112948d77b92c8dcafc2f711a83c3fdaf35a28f7f606e77007b9320e2260a0f6b24fc875a817c33c012f077f89730b34e9f12d6f00795c5c806704c8 DIST vim-9.0.1157.tar.gz 16924574 BLAKE2B 0cdc6cf61f5abdaff0762b98550bfa5bae8f0485ddd0e9947a5fe52390f9da54fc8f5fdae767fb8f5d3ac2b441253917a80ae7f6092f67b69bdc9b6a630df8e2 SHA512 19240a9bcf5900766db42e2894b1bf7b849274711f17dc267671aacd867b334c3d30f39947dde7dd0245f289e9ad801eeb272f34a2ab15d01fac40bf71a54271 -DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942 DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-0.0.0828-configure-clang16.patch b/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-0.0.0828-configure-clang16.patch deleted file mode 100644 index e202a9dd3c..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-0.0.0828-configure-clang16.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/vim/vim/pull/11496 - -From 360b569f86b851c37e32b7cfaec079823188ff27 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Fri, 4 Nov 2022 03:18:23 +0000 -Subject: [PATCH] configure.ac: Fix -Wimplicit-int - -Clang 16 makes -Wimplicit-int an error by default. Fixes errors like: -``` -error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Werror,-Wimplicit-int] -``` - -We already use proper declarations with every other test anyway, so -let's be consistent. - -Signed-off-by: Sam James ---- a/src/configure.ac -+++ b/src/configure.ac -@@ -3654,7 +3654,7 @@ dnl check if struct sigcontext is defined (used for SGI only) - AC_MSG_CHECKING(for struct sigcontext) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ - #include --test_sig() -+int test_sig() - { - struct sigcontext *scont; - scont = (struct sigcontext *)0; - diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-9.0-fix-create-timer-for-cros-compiling.patch b/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-9.0-fix-create-timer-for-cros-compiling.patch deleted file mode 100644 index 5247a80754..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-9.0-fix-create-timer-for-cros-compiling.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bba26c9ed9d4ddc82afd0343f145dc9e14b91498 Mon Sep 17 00:00:00 2001 -From: Varsha Teratipally -Date: Tue, 2 Aug 2022 22:18:29 +0000 -Subject: [PATCH] Configure check for timer_create may give wrong error. -Give a warning instead of an error - -Partial solution from github.com/vim/vim/commit/5f6cae8b8a49c435556e32f84d067cd0b4d28e4c - ---- - src/configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/configure.ac b/src/configure.ac -index e8522ec05..41f41dee3 100644 ---- a/src/configure.ac -+++ b/src/configure.ac -@@ -3850,7 +3850,7 @@ static void set_flag(union sigval sv) {} - ])], - vim_cv_timer_create=yes, - vim_cv_timer_create=no), -- AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create') -+ AC_MSG_WARN(cross-compiling: please set 'vim_cv_timer_create') - )] - ) - --- - - diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0099-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0099-r1.ebuild deleted file mode 100644 index 2e4c3941c6..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0099-r1.ebuild +++ /dev/null @@ -1,371 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please bump with app-editors/vim-core and app-editors/gvim - -VIM_VERSION="9.0" -LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby27 ruby30 ruby31" - -inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vim/vim.git" -else - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.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="Vim, an improved vi-style text editor" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" - -LICENSE="vim" -SLOT="0" -IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" -REQUIRED_USE=" - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - vim-pager? ( !minimal ) -" - -RDEPEND=" - >=app-eselect/eselect-vi-1.1 - >=sys-libs/ncurses-5.2-r2:0= - nls? ( virtual/libintl ) - acl? ( kernel_linux? ( sys-apps/acl ) ) - crypt? ( dev-libs/libsodium:= ) - cscope? ( dev-util/cscope ) - gpm? ( >=sys-libs/gpm-1.19.3 ) - lua? ( ${LUA_DEPS} - $(lua_gen_impl_dep 'deprecated' lua5-1) - ) - ~app-editors/vim-core-${PV} - !> "${S}"/src/feature.h || die "echo failed" - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ - >> "${S}"/src/feature.h || die "echo failed" - - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. - # Hopefully this pattern won't break for a while at least. - # This fixes bug #29398 (27 Sep 2003 agriffis) - sed -i -e \ - 's/\> "$c" || die "echo failed" - done - - # conditionally make the manpager.sh script - if use vim-pager; then - cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" - #!/bin/sh - sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ - vim \\ - -c 'let no_plugin_maps = 1' \\ - -c 'set nolist nomod ft=man ts=8' \\ - -c 'let g:showmarks_enable=0' \\ - -c 'runtime! macros/less.vim' - - _EOF_ - fi - - # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]]; then - sed -i -e \ - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile || die "sed failed" - fi - - cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - - sed -i -e \ - "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - - # Fix bug 18245: Prevent "make" from the following chain: - # (1) Notice configure.ac is newer than auto/configure - # (2) Rebuild auto/configure - # (3) Notice auto/configure is newer than auto/config.mk - # (4) Run ./configure (with wrong args) to remake auto/config.mk - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm src/auto/configure || die "rm failed" - - eapply_user -} - -src_configure() { - - # Fix bug #37354: Disallow -funroll-all-loops on amd64 - # Bug #57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for - # everyone since previous flag filtering bugs have turned out to affect - # multiple archs... - replace-flags -O3 -O2 - - emake -j1 -C src autoconf - - # This should fix a sandbox violation (see bug #24447). The hvc - # things are for ppc64, see bug #86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do - if [[ -e "${file}" ]]; then - addwrite ${file} - fi - done - - local myconf=() - if use minimal; then - myconf=( - --with-features=tiny - --disable-nls - --disable-canberra - --disable-acl - --enable-gui=no - --without-x - --disable-darwin - --disable-luainterp - --disable-perlinterp - --disable-pythoninterp - --disable-mzschemeinterp - --disable-rubyinterp - --disable-selinux - --disable-tclinterp - --disable-gpm - ) - else - use debug && append-flags "-DDEBUG" - - myconf=( - --with-features=huge - $(use_enable sound canberra) - $(use_enable acl) - $(use_enable crypt libsodium) - $(use_enable cscope) - $(use_enable gpm) - $(use_enable nls) - $(use_enable perl perlinterp) - $(use_enable python python3interp) - $(use_with python python3-command "${PYTHON}") - $(use_enable racket mzschemeinterp) - $(use_enable ruby rubyinterp) - $(use_enable selinux) - $(use_enable tcl tclinterp) - $(use_enable terminal) - ) - - # --with-features=huge forces on cscope even if we --disable it. We need - # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) - if ! use cscope; then - sed -i -e \ - '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed" - fi - - if use lua; then - # -DLUA_COMPAT_OPENLIB=1 is required to enable the - # deprecated (in 5.1) luaL_openlib API (#874690) - use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 - - myconf+=( - --enable-luainterp - $(use_with lua_single_target_luajit luajit) - --with-lua-prefix="${EPREFIX}/usr" - ) - fi - - # don't test USE=X here ... see bug #19115 - # but need to provide a way to link against X ... see bug #20093 - myconf+=( - --enable-gui=no - --disable-darwin - $(use_with X x) - ) - fi - - # let package manager strip binaries - export ac_cv_prog_STRIP="$(type -P true ) faking strip" - - # keep prefix env contained within the EPREFIX - use prefix && myconf+=( --without-local-dir ) - - if tc-is-cross-compiler ; then - export vim_cv_getcwd_broken=no \ - vim_cv_memmove_handles_overlap=yes \ - vim_cv_stat_ignores_slash=yes \ - vim_cv_terminfo=yes \ - vim_cv_toupper_broken=no - fi - - econf \ - --with-modified-by=Gentoo-${PVR} \ - "${myconf[@]}" -} - -src_compile() { - # The following allows emake to be used - emake -j1 -C src auto/osdef.h objects - - emake -} - -src_test() { - einfo - einfo "Starting vim tests. Several error messages will be shown" - einfo "while the tests run. This is normal behaviour and does not" - einfo "indicate a fault." - einfo - ewarn "If the tests fail, your terminal may be left in a strange" - ewarn "state. Usually, running 'reset' will fix this." - einfo - - # Don't let vim talk to X - unset DISPLAY - - # Arch and opensuse seem to do this and at this point, I'm willing - # to try anything to avoid random test hangs! - export TERM=xterm - - # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5 - # for more information on test variables we can use. - # Note that certain variables need vim-compatible regex (not PCRE), see e.g. - # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml. - # - # Skipped tests: - # - Test_expand_star_star - # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680) - # - Test_exrc - # Looks in wrong location? (bug #742710) - # - Test_job_tty_in_out - # Fragile and depends on TERM(?) - # - Test_spelldump_bang - # Hangs. - # - Test_fuzzy_completion_env - # Too sensitive to leaked environment variables. - # - Test_term_mouse_multiple_clicks_to_select_mode - # Hangs. - # - Test_spelldump - # Hangs. - export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)' - - emake -j1 -C src/testdir nongui -} - -# Call eselect vi update with --if-unset -# to respect user's choice (bug #187449) -eselect_vi_update() { - ebegin "Calling eselect vi update" - eselect vi update --if-unset - eend $? -} - -src_install() { - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} - - # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are - # managed by eselect-vi - dobin src/vim - if ! use minimal ; then - dosym vim /usr/bin/vimdiff - fi - dosym vim /usr/bin/rvim - dosym vim /usr/bin/rview - if use vim-pager ; then - dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager - dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager - insinto ${vimfiles}/macros - doins runtime/macros/manpager.sh - fperms a+x ${vimfiles}/macros/manpager.sh - fi - - domenu runtime/vim.desktop - - newbashcomp "${FILESDIR}"/${PN}-completion ${PN} - - # keep in sync with 'complete ... -F' list - bashcomp_alias vim ex vi view rvim rview vimdiff -} - -pkg_postinst() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # Call eselect vi update - eselect_vi_update - - # update desktop file mime cache - xdg_desktop_database_update -} - -pkg_postrm() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # Call eselect vi update - eselect_vi_update - - # update desktop file mime cache - xdg_desktop_database_update -} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0828-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0828-r1.ebuild deleted file mode 100644 index 035c07e22f..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.0828-r1.ebuild +++ /dev/null @@ -1,374 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please bump with app-editors/vim-core and app-editors/gvim - -VIM_VERSION="9.0" -LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby27 ruby30 ruby31" - -inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vim/vim.git" -else - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.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="Vim, an improved vi-style text editor" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" - -LICENSE="vim" -SLOT="0" -IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" -REQUIRED_USE=" - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - vim-pager? ( !minimal ) -" - -RDEPEND=" - >=app-eselect/eselect-vi-1.1 - >=sys-libs/ncurses-5.2-r2:0= - nls? ( virtual/libintl ) - acl? ( kernel_linux? ( sys-apps/acl ) ) - crypt? ( dev-libs/libsodium:= ) - cscope? ( dev-util/cscope ) - gpm? ( >=sys-libs/gpm-1.19.3 ) - lua? ( ${LUA_DEPS} - $(lua_gen_impl_dep 'deprecated' lua5-1) - ) - ~app-editors/vim-core-${PV} - !> "${S}"/src/feature.h || die "echo failed" - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ - >> "${S}"/src/feature.h || die "echo failed" - - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. - # Hopefully this pattern won't break for a while at least. - # This fixes bug #29398 (27 Sep 2003 agriffis) - sed -i -e \ - 's/\> "$c" || die "echo failed" - done - - # conditionally make the manpager.sh script - if use vim-pager; then - cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" - #!/bin/sh - sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ - vim \\ - -c 'let no_plugin_maps = 1' \\ - -c 'set nolist nomod ft=man ts=8' \\ - -c 'let g:showmarks_enable=0' \\ - -c 'runtime! macros/less.vim' - - _EOF_ - fi - - # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]]; then - sed -i -e \ - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile || die "sed failed" - fi - - cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - - sed -i -e \ - "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - - # Fix bug 18245: Prevent "make" from the following chain: - # (1) Notice configure.ac is newer than auto/configure - # (2) Rebuild auto/configure - # (3) Notice auto/configure is newer than auto/config.mk - # (4) Run ./configure (with wrong args) to remake auto/config.mk - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm src/auto/configure || die "rm failed" - - eapply_user -} - -src_configure() { - - # Fix bug #37354: Disallow -funroll-all-loops on amd64 - # Bug #57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for - # everyone since previous flag filtering bugs have turned out to affect - # multiple archs... - replace-flags -O3 -O2 - - emake -j1 -C src autoconf - - # This should fix a sandbox violation (see bug #24447). The hvc - # things are for ppc64, see bug #86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do - if [[ -e "${file}" ]]; then - addwrite ${file} - fi - done - - local myconf=() - if use minimal; then - myconf=( - --with-features=tiny - --disable-nls - --disable-canberra - --disable-acl - --enable-gui=no - --without-x - --disable-darwin - --disable-luainterp - --disable-perlinterp - --disable-pythoninterp - --disable-mzschemeinterp - --disable-rubyinterp - --disable-selinux - --disable-tclinterp - --disable-gpm - ) - else - use debug && append-flags "-DDEBUG" - - myconf=( - --with-features=huge - $(use_enable sound canberra) - $(use_enable acl) - $(use_enable crypt libsodium) - $(use_enable cscope) - $(use_enable gpm) - $(use_enable nls) - $(use_enable perl perlinterp) - $(use_enable python python3interp) - $(use_with python python3-command "${PYTHON}") - $(use_enable racket mzschemeinterp) - $(use_enable ruby rubyinterp) - $(use_enable selinux) - $(use_enable tcl tclinterp) - $(use_enable terminal) - ) - - # --with-features=huge forces on cscope even if we --disable it. We need - # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) - if ! use cscope; then - sed -i -e \ - '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed" - fi - - if use lua; then - # -DLUA_COMPAT_OPENLIB=1 is required to enable the - # deprecated (in 5.1) luaL_openlib API (#874690) - use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 - - myconf+=( - --enable-luainterp - $(use_with lua_single_target_luajit luajit) - --with-lua-prefix="${EPREFIX}/usr" - ) - fi - - # don't test USE=X here ... see bug #19115 - # but need to provide a way to link against X ... see bug #20093 - myconf+=( - --enable-gui=no - --disable-darwin - $(use_with X x) - ) - fi - - # let package manager strip binaries - export ac_cv_prog_STRIP="$(type -P true ) faking strip" - - # keep prefix env contained within the EPREFIX - use prefix && myconf+=( --without-local-dir ) - - if tc-is-cross-compiler ; then - export vim_cv_getcwd_broken=no \ - vim_cv_memmove_handles_overlap=yes \ - vim_cv_stat_ignores_slash=yes \ - vim_cv_terminfo=yes \ - vim_cv_toupper_broken=no - fi - - econf \ - --with-modified-by=Gentoo-${PVR} \ - "${myconf[@]}" -} - -src_compile() { - # The following allows emake to be used - emake -j1 -C src auto/osdef.h objects - - emake -} - -src_test() { - einfo - einfo "Starting vim tests. Several error messages will be shown" - einfo "while the tests run. This is normal behaviour and does not" - einfo "indicate a fault." - einfo - ewarn "If the tests fail, your terminal may be left in a strange" - ewarn "state. Usually, running 'reset' will fix this." - einfo - - # Don't let vim talk to X - unset DISPLAY - - # Arch and opensuse seem to do this and at this point, I'm willing - # to try anything to avoid random test hangs! - export TERM=xterm - - # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5 - # for more information on test variables we can use. - # Note that certain variables need vim-compatible regex (not PCRE), see e.g. - # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml. - # - # Skipped tests: - # - Test_expand_star_star - # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680) - # - Test_exrc - # Looks in wrong location? (bug #742710) - # - Test_job_tty_in_out - # Fragile and depends on TERM(?) - # - Test_spelldump_bang - # Hangs. - # - Test_fuzzy_completion_env - # Too sensitive to leaked environment variables. - # - Test_term_mouse_multiple_clicks_to_select_mode - # Hangs. - # - Test_spelldump - # Hangs. - export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)' - - emake -j1 -C src/testdir nongui -} - -# Call eselect vi update with --if-unset -# to respect user's choice (bug #187449) -eselect_vi_update() { - ebegin "Calling eselect vi update" - eselect vi update --if-unset - eend $? -} - -src_install() { - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} - - # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are - # managed by eselect-vi - dobin src/vim - if ! use minimal ; then - dosym vim /usr/bin/vimdiff - fi - dosym vim /usr/bin/rvim - dosym vim /usr/bin/rview - if use vim-pager ; then - dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager - dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager - insinto ${vimfiles}/macros - doins runtime/macros/manpager.sh - fperms a+x ${vimfiles}/macros/manpager.sh - fi - - domenu runtime/vim.desktop - - newbashcomp "${FILESDIR}"/${PN}-completion ${PN} - - # keep in sync with 'complete ... -F' list - bashcomp_alias vim ex vi view rvim rview vimdiff -} - -pkg_postinst() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # Call eselect vi update - eselect_vi_update - - # update desktop file mime cache - xdg_desktop_database_update -} - -pkg_postrm() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # Call eselect vi update - eselect_vi_update - - # update desktop file mime cache - xdg_desktop_database_update -} From 5667fc97035eec1fcba02662eb6a2037af2adde4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:19:34 +0000 Subject: [PATCH 02/41] app-editors/vim-core: Sync with Gentoo It's from Gentoo commit 8218305dc9dc0468081f5e0a503ed890a301c8ab. --- .../app-editors/vim-core/Manifest | 3 - .../vim-0.0.0828-configure-clang16.patch | 28 --- ...-fix-create-timer-for-cros-compiling.patch | 28 --- .../vim-core/vim-core-9.0.0099.ebuild | 234 ------------------ .../vim-core/vim-core-9.0.0828-r1.ebuild | 234 ------------------ 5 files changed, 527 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.0099.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.0828-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest index 2953ddceb3..cc371e9489 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest @@ -1,6 +1,3 @@ -DIST vim-9.0.0099.tar.gz 16712565 BLAKE2B b3277ebda0bb40601d995935422006d1a266bb862be612e69abd057a7342d13457ded5cb4743cf43a09b7d2001438f5a426ba12c30947bb7c193188c5fc13cf7 SHA512 ca0dea7b7fd78cf9c7cd4656611d066540f9d81ab17bcb75c79f0e989bdcfb769940ea29f75445c554b159e9eb3b2c4f9d77448254c3e4e4457b1bf721936498 -DIST vim-9.0.0828.tar.gz 16782339 BLAKE2B 6b997c1c828338d64a8b204a1e232676ec075834b1b7e74c2fc671e315f9bf6026b0c419ebb3c31e7ce58dbca23828ca11d866b2bfcb73f8a86fb31fa0d51b00 SHA512 03f93515039a2f275a8fe6b84bbac5875ffff17768ab3201e111eba4897a2485fe4ccfe238151f393334c7a6ea77eddd8898f0b816e26dbdb884f4e6bcbd2943 DIST vim-9.0.1000.tar.gz 16842747 BLAKE2B 85edab7d13daa3e84ef0aeb50e3e9bfd31f0634d8e480c105727b0c34318e0adf7f1276dcdac53df8fc416fd8dfb70377cd74ed570752a3e77f07a083fa6c113 SHA512 9d2b914a112948d77b92c8dcafc2f711a83c3fdaf35a28f7f606e77007b9320e2260a0f6b24fc875a817c33c012f077f89730b34e9f12d6f00795c5c806704c8 DIST vim-9.0.1157.tar.gz 16924574 BLAKE2B 0cdc6cf61f5abdaff0762b98550bfa5bae8f0485ddd0e9947a5fe52390f9da54fc8f5fdae767fb8f5d3ac2b441253917a80ae7f6092f67b69bdc9b6a630df8e2 SHA512 19240a9bcf5900766db42e2894b1bf7b849274711f17dc267671aacd867b334c3d30f39947dde7dd0245f289e9ad801eeb272f34a2ab15d01fac40bf71a54271 -DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b1af2d1414d10b794dbee9f5e7797fb3d34e00c2e065c339d4c82bf28aed53e0b5f2f8f1ee5c7ce69851cd63360788609bf144ac922 SHA512 7d5c64d674fa77048fdca7287072c0e488723133e254c10711dbadf750416c368725327ca9b76f332017bc70aa544a9baef671765eabf0d172d39921ffd7d942 DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch deleted file mode 100644 index e202a9dd3c..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vim-0.0.0828-configure-clang16.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/vim/vim/pull/11496 - -From 360b569f86b851c37e32b7cfaec079823188ff27 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Fri, 4 Nov 2022 03:18:23 +0000 -Subject: [PATCH] configure.ac: Fix -Wimplicit-int - -Clang 16 makes -Wimplicit-int an error by default. Fixes errors like: -``` -error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Werror,-Wimplicit-int] -``` - -We already use proper declarations with every other test anyway, so -let's be consistent. - -Signed-off-by: Sam James ---- a/src/configure.ac -+++ b/src/configure.ac -@@ -3654,7 +3654,7 @@ dnl check if struct sigcontext is defined (used for SGI only) - AC_MSG_CHECKING(for struct sigcontext) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ - #include --test_sig() -+int test_sig() - { - struct sigcontext *scont; - scont = (struct sigcontext *)0; - diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch deleted file mode 100644 index 5247a80754..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bba26c9ed9d4ddc82afd0343f145dc9e14b91498 Mon Sep 17 00:00:00 2001 -From: Varsha Teratipally -Date: Tue, 2 Aug 2022 22:18:29 +0000 -Subject: [PATCH] Configure check for timer_create may give wrong error. -Give a warning instead of an error - -Partial solution from github.com/vim/vim/commit/5f6cae8b8a49c435556e32f84d067cd0b4d28e4c - ---- - src/configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/configure.ac b/src/configure.ac -index e8522ec05..41f41dee3 100644 ---- a/src/configure.ac -+++ b/src/configure.ac -@@ -3850,7 +3850,7 @@ static void set_flag(union sigval sv) {} - ])], - vim_cv_timer_create=yes, - vim_cv_timer_create=no), -- AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create') -+ AC_MSG_WARN(cross-compiling: please set 'vim_cv_timer_create') - )] - ) - --- - - diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.0099.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.0099.ebuild deleted file mode 100644 index f754552aef..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.0099.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please bump with app-editors/vim and app-editors/gvim - -VIM_VERSION="9.0" -inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vim/vim.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} -else - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.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 -S="${WORKDIR}/vim-${PV}" - -DESCRIPTION="vim and gvim shared files" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" - -LICENSE="vim" -SLOT="0" -IUSE="nls acl minimal" - -# ncurses is only needed by ./configure, so no subslot operator required -DEPEND=">=sys-libs/ncurses-5.2-r2:0" -BDEPEND="sys-devel/autoconf" -# Avoid icon file collision, bug #673880 -RDEPEND="!> "${S}"/src/feature.h || die - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die - - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. - # Hopefully this pattern won't break for a while at least. - # This fixes bug #29398 (27 Sep 2003 agriffis) - sed -i 's/\> "$c" || die "echo failed" - done - - # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]]; then - sed -i -e \ - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile || die "sed failed" - fi - - cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - sed -i -e \ - "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - - # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for - # everyone since previous flag filtering bugs have turned out to affect - # multiple archs... - replace-flags -O3 -O2 - - # Fix bug #18245: Prevent "make" from the following chain: - # (1) Notice configure.ac is newer than auto/configure - # (2) Rebuild auto/configure - # (3) Notice auto/configure is newer than auto/config.mk - # (4) Run ./configure (with wrong args) to remake auto/config.mk - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - - # Remove src/auto/configure file. - rm -v src/auto/configure || die "rm configure failed" - - eapply_user -} - -src_configure() { - # Fix bug #37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - emake -j1 -C src autoconf - - # This should fix a sandbox violation (see bug 24447). The hvc - # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do - if [[ -e "${file}" ]]; then - addwrite ${file} - fi - done - - # Let Portage do the stripping. Some people like that. - export ac_cv_prog_STRIP="$(type -P true ) faking strip" - - local myconf=( - --with-modified-by=Gentoo-${PVR} - --enable-gui=no - --without-x - --disable-darwin - --disable-perlinterp - --disable-pythoninterp - --disable-rubyinterp - --disable-gpm - --disable-selinux - $(use_enable nls) - $(use_enable acl) - ) - - # Keep Gentoo Prefix env contained within the EPREFIX - use prefix && myconf+=( --without-local-dir ) - - if tc-is-cross-compiler ; then - export vim_cv_getcwd_broken=no \ - vim_cv_memmove_handles_overlap=yes \ - vim_cv_stat_ignores_slash=yes \ - vim_cv_terminfo=yes \ - vim_cv_toupper_broken=no - fi - - econf "${myconf[@]}" -} - -src_compile() { - emake -j1 -C src auto/osdef.h objects - emake tools -} - -src_test() { :; } - -src_install() { - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} - - dodir /usr/{bin,share/{man/man1,vim}} - emake -C src \ - installruntime \ - installmanlinks \ - installmacros \ - installtutor \ - installtutorbin \ - installtools \ - install-languages \ - DESTDIR="${D}" \ - BINDIR="${EPREFIX}"/usr/bin \ - MANDIR="${EPREFIX}"/usr/share/man \ - DATADIR="${EPREFIX}"/usr/share - - keepdir ${vimfiles}/keymap - - # default vimrc is installed by vim-core since it applies to - # both vim and gvim - insinto /etc/vim/ - newins "${FILESDIR}"/vimrc-r6 vimrc - eprefixify "${ED}"/etc/vim/vimrc - - if use minimal; then - # To save space, install only a subset of the files. - # Helps minimalize the livecd, bug 65144. - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die - rm -v "${ED}"/usr/bin/vimtutor || die - - for f in "${ED}${vimfiles}"/colors/*.vim; do - if [[ ${f} != */@(default).vim ]] ; then - printf '%s\0' "${f}" - fi - done | xargs -0 rm -f || die - - for f in "${ED}${vimfiles}"/syntax/*.vim; do - if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then - printf '%s\0' "${f}" - fi - done | xargs -0 rm -f || die - fi - - newbashcomp "${FILESDIR}"/xxd-completion xxd - - # install gvim icon since both vim/gvim desktop files reference it - doicon -s scalable "${FILESDIR}"/gvim.svg -} - -pkg_postinst() { - # update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # update icon cache - xdg_icon_cache_update -} - -pkg_postrm() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # update icon cache - xdg_icon_cache_update -} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.0828-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.0828-r1.ebuild deleted file mode 100644 index e078361724..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9.0.0828-r1.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Please bump with app-editors/vim and app-editors/gvim - -VIM_VERSION="9.0" -inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vim/vim.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} -else - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-9.0.0049-patches.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 -S="${WORKDIR}/vim-${PV}" - -DESCRIPTION="vim and gvim shared files" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" - -LICENSE="vim" -SLOT="0" -IUSE="nls acl minimal" - -# ncurses is only needed by ./configure, so no subslot operator required -DEPEND=">=sys-libs/ncurses-5.2-r2:0" -BDEPEND="sys-devel/autoconf" - -PATCHES=( - "${FILESDIR}"/vim-0.0.0828-configure-clang16.patch -) - -pkg_setup() { - # people with broken alphabets run into trouble. bug #82186. - unset LANG LC_ALL - export LC_COLLATE="C" -} - -src_prepare() { - if [[ ${PV} != 9999* ]] ; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches - fi - - # Fixup a script to use awk instead of nawk - sed -i \ - -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ - "${S}"/runtime/tools/mve.awk || die "sed failed" - - # See bug #77841. We remove this file after the tarball extraction. - rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" - - # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die - - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. - # Hopefully this pattern won't break for a while at least. - # This fixes bug #29398 (27 Sep 2003 agriffis) - sed -i 's/\> "$c" || die "echo failed" - done - - # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]]; then - sed -i -e \ - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile || die "sed failed" - fi - - cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - sed -i -e \ - "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - - # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for - # everyone since previous flag filtering bugs have turned out to affect - # multiple archs... - replace-flags -O3 -O2 - - # Fix bug #18245: Prevent "make" from the following chain: - # (1) Notice configure.ac is newer than auto/configure - # (2) Rebuild auto/configure - # (3) Notice auto/configure is newer than auto/config.mk - # (4) Run ./configure (with wrong args) to remake auto/config.mk - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - - # Remove src/auto/configure file. - rm -v src/auto/configure || die "rm configure failed" - - eapply_user -} - -src_configure() { - # Fix bug #37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - emake -j1 -C src autoconf - - # This should fix a sandbox violation (see bug 24447). The hvc - # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do - if [[ -e "${file}" ]]; then - addwrite ${file} - fi - done - - # Let Portage do the stripping. Some people like that. - export ac_cv_prog_STRIP="$(type -P true ) faking strip" - - local myconf=( - --with-modified-by=Gentoo-${PVR} - --enable-gui=no - --without-x - --disable-darwin - --disable-perlinterp - --disable-pythoninterp - --disable-rubyinterp - --disable-gpm - --disable-selinux - $(use_enable nls) - $(use_enable acl) - ) - - # Keep Gentoo Prefix env contained within the EPREFIX - use prefix && myconf+=( --without-local-dir ) - - if tc-is-cross-compiler ; then - export vim_cv_getcwd_broken=no \ - vim_cv_memmove_handles_overlap=yes \ - vim_cv_stat_ignores_slash=yes \ - vim_cv_terminfo=yes \ - vim_cv_toupper_broken=no - fi - - econf "${myconf[@]}" -} - -src_compile() { - emake -j1 -C src auto/osdef.h objects - emake tools -} - -src_test() { :; } - -src_install() { - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} - - dodir /usr/{bin,share/{man/man1,vim}} - emake -C src \ - installruntime \ - installmanlinks \ - installmacros \ - installtutor \ - installtutorbin \ - installtools \ - install-languages \ - DESTDIR="${D}" \ - BINDIR="${EPREFIX}"/usr/bin \ - MANDIR="${EPREFIX}"/usr/share/man \ - DATADIR="${EPREFIX}"/usr/share - - keepdir ${vimfiles}/keymap - - # default vimrc is installed by vim-core since it applies to - # both vim and gvim - insinto /etc/vim/ - newins "${FILESDIR}"/vimrc-r6 vimrc - eprefixify "${ED}"/etc/vim/vimrc - - if use minimal; then - # To save space, install only a subset of the files. - # Helps minimalize the livecd, bug 65144. - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die - rm -v "${ED}"/usr/bin/vimtutor || die - - for f in "${ED}${vimfiles}"/colors/*.vim; do - if [[ ${f} != */@(default).vim ]] ; then - printf '%s\0' "${f}" - fi - done | xargs -0 rm -f || die - - for f in "${ED}${vimfiles}"/syntax/*.vim; do - if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then - printf '%s\0' "${f}" - fi - done | xargs -0 rm -f || die - fi - - newbashcomp "${FILESDIR}"/xxd-completion xxd - - # install gvim icon since both vim/gvim desktop files reference it - doicon -s scalable "${FILESDIR}"/gvim.svg -} - -pkg_postinst() { - # update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # update icon cache - xdg_icon_cache_update -} - -pkg_postrm() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags - - # update icon cache - xdg_icon_cache_update -} From 90cccffec7fe3cd550b212ff29f508ec3b17dffb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:19:34 +0000 Subject: [PATCH 03/41] app-emulation/qemu: Sync with Gentoo It's from Gentoo commit a13c9106cd8f1ffc67859c2d670b9370f098fe02. --- .../app-emulation/qemu/Manifest | 2 - .../qemu/files/qemu-7.1.0-faccessat2.patch | 78 -- .../qemu/files/qemu-7.1.0-loong-stat.patch | 98 -- .../files/qemu-7.1.0-mips-n32-syscalls.patch | 94 -- .../qemu/files/qemu-7.1.0-strings.patch | 26 - .../app-emulation/qemu/metadata.xml | 1 - .../app-emulation/qemu/qemu-7.1.0-r2.ebuild | 967 ----------------- .../app-emulation/qemu/qemu-7.1.0.ebuild | 985 ------------------ .../app-emulation/qemu/qemu-7.2.0.ebuild | 2 +- 9 files changed, 1 insertion(+), 2252 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-faccessat2.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-loong-stat.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-mips-n32-syscalls.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-strings.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.1.0-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.1.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest index 12a458ea48..0754b3215f 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/Manifest @@ -1,4 +1,2 @@ -DIST qemu-7.1.0-docs.tar.xz 2016780 BLAKE2B 1b84361fe58d504ab740a0b805a25d02f497ca776e7251a99f0e98e3720d1a2029b7a171f9d79dd128ba17a82c72d497e09baa1a4b2f192ba390f0f3b1950792 SHA512 7a328303b8af0ab63aa1f0fe07a121d3ca459d00fca817412e645416af795930dbea0a3e60f4ca006a74d1672e84fa4e626e4d83918e0b685b601043d0d8159e -DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf SHA512 c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06 SHA512 a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585 DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530 SHA512 f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13 diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-faccessat2.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-faccessat2.patch deleted file mode 100644 index ea168f609f..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-faccessat2.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 35a2c85f7d691db7aa2c47181902ac87478eef7a Mon Sep 17 00:00:00 2001 -From: WANG Xuerui -Date: Sun, 9 Oct 2022 14:08:13 +0800 -Subject: [PATCH] linux-user: Implement faccessat2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -User space has been preferring this syscall for a while, due to its -closer match with C semantics, and newer platforms such as LoongArch -apparently have libc implementations that don't fallback to faccessat -so normal access checks are failing without the emulation in place. - -Tested by successfully emerging several packages within a Gentoo loong -stage3 chroot, emulated on amd64 with help of static qemu-loongarch64. - -Reported-by: Andreas K. Hüttel -Signed-off-by: WANG Xuerui -Message-Id: <20221009060813.2289077-1-xen0n@gentoo.org> -[lv: removing defined(__NR_faccessat2) in syscall.c, - adding defined(TARGET_NR_faccessat2) on print_faccessat()] -Signed-off-by: Laurent Vivier ---- - linux-user/strace.c | 2 +- - linux-user/strace.list | 3 +++ - linux-user/syscall.c | 9 +++++++++ - 3 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/linux-user/strace.c b/linux-user/strace.c -index 86c081c83f..9ae5a812cd 100644 ---- a/linux-user/strace.c -+++ b/linux-user/strace.c -@@ -1969,7 +1969,7 @@ print_execv(CPUArchState *cpu_env, const struct syscallname *name, - } - #endif - --#ifdef TARGET_NR_faccessat -+#if defined(TARGET_NR_faccessat) || defined(TARGET_NR_faccessat2) - static void - print_faccessat(CPUArchState *cpu_env, const struct syscallname *name, - abi_long arg0, abi_long arg1, abi_long arg2, -diff --git a/linux-user/strace.list b/linux-user/strace.list -index a87415bf3d..3df2184580 100644 ---- a/linux-user/strace.list -+++ b/linux-user/strace.list -@@ -178,6 +178,9 @@ - #ifdef TARGET_NR_faccessat - { TARGET_NR_faccessat, "faccessat" , NULL, print_faccessat, NULL }, - #endif -+#ifdef TARGET_NR_faccessat2 -+{ TARGET_NR_faccessat2, "faccessat2" , NULL, print_faccessat, NULL }, -+#endif - #ifdef TARGET_NR_fadvise64 - { TARGET_NR_fadvise64, "fadvise64" , NULL, NULL, NULL }, - #endif -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index d499cac1d5..e985ad167f 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -9143,6 +9143,15 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, - unlock_user(p, arg2, 0); - return ret; - #endif -+#if defined(TARGET_NR_faccessat2) -+ case TARGET_NR_faccessat2: -+ if (!(p = lock_user_string(arg2))) { -+ return -TARGET_EFAULT; -+ } -+ ret = get_errno(faccessat(arg1, p, arg3, arg4)); -+ unlock_user(p, arg2, 0); -+ return ret; -+#endif - #ifdef TARGET_NR_nice /* not on alpha */ - case TARGET_NR_nice: - return get_errno(nice(arg1)); --- -2.37.4 - diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-loong-stat.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-loong-stat.patch deleted file mode 100644 index 85fd2c9891..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-loong-stat.patch +++ /dev/null @@ -1,98 +0,0 @@ -From xen0n@gentoo.org Thu Oct 06 10:07:10 2022 -Return-Path: -X-Original-To: dilfridge@gentoo.org -Delivered-To: dilfridge@gentoo.org -From: WANG Xuerui -To: qemu-devel@nongnu.org -Cc: Richard Henderson , - =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , - WANG Xuerui , - Song Gao , - Xiaojuan Yang , - =?UTF-8?q?Andreas=20K=20=2E=20H=C3=BCttel?= -Subject: [PATCH RESEND] linux-user: Fix struct statfs ABI on loongarch64 -Date: Thu, 6 Oct 2022 18:07:10 +0800 -Message-Id: <20221006100710.427252-1-xen0n@gentoo.org> -X-Mailer: git-send-email 2.38.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Previously the 32-bit version was incorrectly chosen, leading to funny -but incorrect output from e.g. df(1). Simply select the version -corresponding to the 64-bit asm-generic definition. - -For reference, this program should produce the same output no matter -natively compiled or not, for loongarch64 or not: - -```c -#include -#include - -int main(int argc, const char *argv[]) -{ - struct statfs b; - if (statfs(argv[0], &b)) - return 1; - - printf("f_type = 0x%lx\n", b.f_type); - printf("f_bsize = %ld\n", b.f_bsize); - printf("f_blocks = %ld\n", b.f_blocks); - printf("f_bfree = %ld\n", b.f_bfree); - printf("f_bavail = %ld\n", b.f_bavail); - - return 0; -} - -// Example output on my amd64 box, with the test binary residing on a -// btrfs partition. - -// Native and emulated output after the fix: -// -// f_type = 0x9123683e -// f_bsize = 4096 -// f_blocks = 268435456 -// f_bfree = 168406890 -// f_bavail = 168355058 - -// Output before the fix, note the messed layout: -// -// f_type = 0x10009123683e -// f_bsize = 723302085239504896 -// f_blocks = 168355058 -// f_bfree = 2250817541779750912 -// f_bavail = 1099229433104 -``` - -Fixes: 1f63019632 ("linux-user: Add LoongArch syscall support") -Signed-off-by: WANG Xuerui -Cc: Song Gao -Cc: Xiaojuan Yang -Cc: Andreas K. Hüttel ---- - -Resend with amended commit message to 100% clarify the example output -are generated on my box and will differ for everyone else. Sorry for -the noise. - - linux-user/syscall_defs.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h -index 01ee10a88f..77864de57f 100644 ---- a/linux-user/syscall_defs.h -+++ b/linux-user/syscall_defs.h -@@ -2262,7 +2262,8 @@ struct target_statfs64 { - }; - #elif (defined(TARGET_PPC64) || defined(TARGET_X86_64) || \ - defined(TARGET_SPARC64) || defined(TARGET_AARCH64) || \ -- defined(TARGET_RISCV)) && !defined(TARGET_ABI32) -+ defined(TARGET_RISCV) || defined(TARGET_LOONGARCH64)) && \ -+ !defined(TARGET_ABI32) - struct target_statfs { - abi_long f_type; - abi_long f_bsize; --- -2.38.0 - - diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-mips-n32-syscalls.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-mips-n32-syscalls.patch deleted file mode 100644 index 5ed67668d0..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-mips-n32-syscalls.patch +++ /dev/null @@ -1,94 +0,0 @@ -From xen0n@gentoo.org Thu Oct 06 08:55:00 2022 -Return-Path: -X-Original-To: dilfridge@gentoo.org -Delivered-To: dilfridge@gentoo.org -From: WANG Xuerui -To: qemu-devel@nongnu.org -Cc: WANG Xuerui , - =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , - Jiaxun Yang , - =?UTF-8?q?Andreas=20K=20=2E=20H=C3=BCttel?= , - Joshua Kinard -Subject: [PATCH] linux-user: Fix more MIPS n32 syscall ABI issues -Date: Thu, 6 Oct 2022 16:55:00 +0800 -Message-Id: <20221006085500.290341-1-xen0n@gentoo.org> -X-Mailer: git-send-email 2.38.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In commit 80f0fe3a85 ("linux-user: Fix syscall parameter handling for -MIPS n32") the ABI problem regarding offset64 on MIPS n32 was fixed, -but still some cases remain where the n32 is incorrectly treated as any -other 32-bit ABI that passes 64-bit arguments in pairs of GPRs. Fix by -excluding TARGET_ABI_MIPSN32 from various TARGET_ABI_BITS == 32 checks. - -Closes: https://gitlab.com/qemu-project/qemu/-/issues/1238 -Signed-off-by: WANG Xuerui -Cc: Philippe Mathieu-Daudé -Cc: Jiaxun Yang -Cc: Andreas K. Hüttel -Cc: Joshua Kinard ---- - -Note: I can't reproduce the crash with neither MIPS n32 sysroot at my hand -(a self-built one for Loongson-2F, and stage3-mips64_n32-openrc-20221001T170527Z), -so I can only verify by looking at the (host and qemu) strace outputs, and -would have to ask you to review/test this harder. Thanks. - - linux-user/syscall.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 2e954d8dbd..8b2d39fe73 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -11793,7 +11793,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, - return -host_to_target_errno(ret); - #endif - --#if TARGET_ABI_BITS == 32 -+#if TARGET_ABI_BITS == 32 && !defined(TARGET_ABI_MIPSN32) - - #ifdef TARGET_NR_fadvise64_64 - case TARGET_NR_fadvise64_64: -@@ -11920,7 +11920,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, - return get_errno(sys_gettid()); - #ifdef TARGET_NR_readahead - case TARGET_NR_readahead: --#if TARGET_ABI_BITS == 32 -+#if TARGET_ABI_BITS == 32 && !defined(TARGET_ABI_MIPSN32) - if (regpairs_aligned(cpu_env, num)) { - arg2 = arg3; - arg3 = arg4; -@@ -12612,7 +12612,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, - #endif /* CONFIG_EVENTFD */ - #if defined(CONFIG_FALLOCATE) && defined(TARGET_NR_fallocate) - case TARGET_NR_fallocate: --#if TARGET_ABI_BITS == 32 -+#if TARGET_ABI_BITS == 32 && !defined(TARGET_ABI_MIPSN32) - ret = get_errno(fallocate(arg1, arg2, target_offset64(arg3, arg4), - target_offset64(arg5, arg6))); - #else -@@ -12623,7 +12623,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, - #if defined(CONFIG_SYNC_FILE_RANGE) - #if defined(TARGET_NR_sync_file_range) - case TARGET_NR_sync_file_range: --#if TARGET_ABI_BITS == 32 -+#if TARGET_ABI_BITS == 32 && !defined(TARGET_ABI_MIPSN32) - #if defined(TARGET_MIPS) - ret = get_errno(sync_file_range(arg1, target_offset64(arg3, arg4), - target_offset64(arg5, arg6), arg7)); -@@ -12645,7 +12645,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, - case TARGET_NR_arm_sync_file_range: - #endif - /* This is like sync_file_range but the arguments are reordered */ --#if TARGET_ABI_BITS == 32 -+#if TARGET_ABI_BITS == 32 && !defined(TARGET_ABI_MIPSN32) - ret = get_errno(sync_file_range(arg1, target_offset64(arg3, arg4), - target_offset64(arg5, arg6), arg2)); - #else --- -2.38.0 - - diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-strings.patch b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-strings.patch deleted file mode 100644 index 01f235b9a3..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/files/qemu-7.1.0-strings.patch +++ /dev/null @@ -1,26 +0,0 @@ -Forward-ported from original patch for 5.2.0. - -diff --git a/configure b/configure -index da2501489f..4660ee3ee5 100755 ---- a/configure -+++ b/configure -@@ -400,6 +400,7 @@ ld="${LD-${cross_prefix}ld}" - nm="${NM-${cross_prefix}nm}" - smbd="$SMBD" - strip="${STRIP-${cross_prefix}strip}" -+strings="${STRINGS-${cross_prefix}strings}" - widl="${WIDL-${cross_prefix}widl}" - windres="${WINDRES-${cross_prefix}windres}" - pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}" -@@ -1466,9 +1467,9 @@ int main(int argc, char *argv[]) - EOF - - if compile_prog ; then -- if strings -a $TMPE | grep -q BiGeNdIaN ; then -+ if $strings -a $TMPE | grep -q BiGeNdIaN ; then - bigendian="yes" -- elif strings -a $TMPE | grep -q LiTtLeEnDiAn ; then -+ elif $strings -a $TMPE | grep -q LiTtLeEnDiAn ; then - bigendian="no" - else - echo big/little test failed diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml index bdb00757ca..55860ffa18 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/metadata.xml @@ -53,7 +53,6 @@ Use sys-apps/usbredir to redirect USB devices to another machine over TCP Enable VDE-based networking Enable accelerated networking using vhost-net, see https://www.linux-kvm.org/page/VhostNet - Enable shared file system access using the FUSE protocol carried over virtio. Enable experimental Virgil 3d (virtual software GPU) Enable VirtFS via virtio-9p-pci / fsdev. See https://wiki.qemu.org/Documentation/9psetup Enable terminal support (x11-libs/vte) in the GTK+ interface diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.1.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.1.0-r2.ebuild deleted file mode 100644 index d3ffa41c14..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.1.0-r2.ebuild +++ /dev/null @@ -1,967 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs -# Set to 1 if prebuilt, 0 if not -# (the construct below is to allow overriding from env for script) -QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1} -QEMU_DOCS_PREBUILT_DEV=ajak -QEMU_DOCS_VERSION="${PV}" -# Default to generating docs (inc. man pages) if no prebuilt; overridden later -# bug #830088 -QEMU_DOC_USEFLAG="+doc" - -PYTHON_COMPAT=( python3_{9,10,11} ) -PYTHON_REQ_USE="ncurses,readline" - -FIRMWARE_ABI_VERSION="7.1.0" - -inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \ - pax-utils xdg-utils - -if [[ ${PV} == *9999* ]]; then - QEMU_DOCS_PREBUILT=0 - - EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/" - EGIT_SUBMODULES=( - tests/fp/berkeley-softfloat-3 - tests/fp/berkeley-testfloat-3 - ui/keycodemapdb - ) - inherit git-r3 - SRC_URI="" -else - MY_P="${PN}-${PV/_rc/-rc}" - SRC_URI="https://download.qemu.org/${MY_P}.tar.xz" - - if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then - SRC_URI+=" !doc? ( https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz )" - fi - - S="${WORKDIR}/${MY_P}" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" - -LICENSE="GPL-2 LGPL-2 BSD-2" -SLOT="0" - -[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc" - -IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG} - +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring - jack jemalloc +jpeg - lzo multipath - ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs - plugins +png pulseaudio python rbd sasl sdl sdl-image selinux - +slirp - smartcard snappy spice ssh static static-user systemtap test udev usb - usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen - zstd" - -COMMON_TARGETS=" - aarch64 - alpha - arm - cris - hppa - i386 - loongarch64 - m68k - microblaze - microblazeel - mips - mips64 - mips64el - mipsel - nios2 - or1k - ppc - ppc64 - riscv32 - riscv64 - s390x - sh4 - sh4eb - sparc - sparc64 - x86_64 - xtensa - xtensaeb -" -IUSE_SOFTMMU_TARGETS=" - ${COMMON_TARGETS} - avr - rx - tricore -" -IUSE_USER_TARGETS=" - ${COMMON_TARGETS} - aarch64_be - armeb - hexagon - mipsn32 - mipsn32el - ppc64le - sparc32plus -" - -use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) -use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) -IUSE+=" ${use_softmmu_targets} ${use_user_targets}" - -RESTRICT="!test? ( test )" -# Allow no targets to be built so that people can get a tools-only build. -# Block USE flag configurations known to not work. -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - qemu_softmmu_targets_arm? ( fdt ) - qemu_softmmu_targets_microblaze? ( fdt ) - qemu_softmmu_targets_mips64el? ( fdt ) - qemu_softmmu_targets_ppc64? ( fdt ) - qemu_softmmu_targets_ppc? ( fdt ) - qemu_softmmu_targets_riscv32? ( fdt ) - qemu_softmmu_targets_riscv64? ( fdt ) - qemu_softmmu_targets_x86_64? ( fdt ) - sdl-image? ( sdl ) - static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev ) - static-user? ( !plugins ) - virgl? ( opengl ) - virtfs? ( xattr ) - vnc? ( gnutls ) - vte? ( gtk ) - multipath? ( udev ) - plugins? ( !static !static-user ) -" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# and user/softmmu targets (qemu-*, qemu-system-*). -# -# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -# -# The attr lib isn't always linked in (although the USE flag is always -# respected). This is because qemu supports using the C library's API -# when available rather than always using the external library. -ALL_DEPEND=" - >=dev-libs/glib-2.0[static-libs(+)] - sys-libs/zlib[static-libs(+)] - python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) - xattr? ( sys-apps/attr[static-libs(+)] )" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# softmmu targets (qemu-system-*). -SOFTMMU_TOOLS_DEPEND=" - sys-libs/libcap-ng[static-libs(+)] - >=sys-libs/libseccomp-2.1.0[static-libs(+)] - >=x11-libs/pixman-0.28.0[static-libs(+)] - accessibility? ( - app-accessibility/brltty[api] - app-accessibility/brltty[static-libs(+)] - ) - aio? ( dev-libs/libaio[static-libs(+)] ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bpf? ( dev-libs/libbpf:= ) - bzip2? ( app-arch/bzip2[static-libs(+)] ) - capstone? ( dev-libs/capstone:= ) - curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) - fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) - fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) - gnutls? ( - dev-libs/nettle:=[static-libs(+)] - >=net-libs/gnutls-3.0:=[static-libs(+)] - ) - gtk? ( - x11-libs/gtk+:3 - vte? ( x11-libs/vte:2.91 ) - ) - infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) - iscsi? ( net-libs/libiscsi ) - io-uring? ( sys-libs/liburing:=[static-libs(+)] ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc ) - jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] ) - lzo? ( dev-libs/lzo:2[static-libs(+)] ) - multipath? ( sys-fs/multipath-tools ) - ncurses? ( - sys-libs/ncurses:=[unicode(+)] - sys-libs/ncurses:=[static-libs(+)] - ) - nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - opengl? ( - virtual/opengl - media-libs/libepoxy[static-libs(+)] - media-libs/mesa[static-libs(+)] - media-libs/mesa[egl(+),gbm(+)] - ) - pam? ( sys-libs/pam ) - png? ( media-libs/libpng:0=[static-libs(+)] ) - pulseaudio? ( media-sound/pulseaudio ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) - sdl? ( - media-libs/libsdl2[video] - media-libs/libsdl2[static-libs(+)] - ) - sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) - slirp? ( net-libs/libslirp[static-libs(+)] ) - smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) - snappy? ( app-arch/snappy:= ) - spice? ( - >=app-emulation/spice-protocol-0.12.3 - >=app-emulation/spice-0.12.0[static-libs(+)] - ) - ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) - udev? ( virtual/libudev:= ) - usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) - usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) - vde? ( net-misc/vde[static-libs(+)] ) - virgl? ( media-libs/virglrenderer[static-libs(+)] ) - virtfs? ( sys-libs/libcap ) - xen? ( app-emulation/xen-tools:= ) - zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) -" - -EDK2_OVMF_VERSION="202202" -SEABIOS_VERSION="1.16.0" - -X86_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} - ~sys-firmware/ipxe-1.21.1[binary,qemu] - ~sys-firmware/seabios-bin-${SEABIOS_VERSION} - ~sys-firmware/sgabios-0.1_pre10[binary] - ) - !pin-upstream-blobs? ( - || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} - ) - sys-firmware/ipxe[qemu] - || ( - >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] - >=sys-firmware/seabios-bin-${SEABIOS_VERSION} - ) - sys-firmware/sgabios - )" -PPC_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/seabios-bin-${SEABIOS_VERSION} - ) - !pin-upstream-blobs? ( - || ( - >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] - >=sys-firmware/seabios-bin-${SEABIOS_VERSION} - ) - ) -" - -BDEPEND=" - $(python_gen_impl_dep) - dev-lang/perl - dev-util/meson - sys-apps/texinfo - virtual/pkgconfig - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ) - gtk? ( nls? ( sys-devel/gettext ) ) - test? ( - dev-libs/glib[utils] - sys-devel/bc - ) -" -CDEPEND=" - !static? ( - ${ALL_DEPEND//\[static-libs(+)]} - ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} - ) - qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} ) -" -DEPEND="${CDEPEND} - kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - static? ( - ${ALL_DEPEND} - ${SOFTMMU_TOOLS_DEPEND} - ) - static-user? ( ${ALL_DEPEND} )" -RDEPEND="${CDEPEND} - acct-group/kvm - selinux? ( - sec-policy/selinux-qemu - sys-libs/libselinux - )" - -PATCHES=( - "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch - "${FILESDIR}"/${PN}-6.0.0-make.patch - "${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch - "${FILESDIR}"/${PN}-7.1.0-strings.patch - "${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch - "${FILESDIR}"/${PN}-7.1.0-mips-n32-syscalls.patch - "${FILESDIR}"/${PN}-7.1.0-loong-stat.patch - "${FILESDIR}"/${PN}-7.1.0-faccessat2.patch -) - -QA_PREBUILT=" - usr/share/qemu/hppa-firmware.img - usr/share/qemu/openbios-ppc - usr/share/qemu/openbios-sparc64 - usr/share/qemu/openbios-sparc32 - usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf - usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf - usr/share/qemu/palcode-clipper - usr/share/qemu/s390-ccw.img - usr/share/qemu/s390-netboot.img - usr/share/qemu/u-boot.e500 -" - -QA_WX_LOAD="usr/bin/qemu-i386 - usr/bin/qemu-x86_64 - usr/bin/qemu-alpha - usr/bin/qemu-arm - usr/bin/qemu-cris - usr/bin/qemu-m68k - usr/bin/qemu-microblaze - usr/bin/qemu-microblazeel - usr/bin/qemu-mips - usr/bin/qemu-mipsel - usr/bin/qemu-or1k - usr/bin/qemu-ppc - usr/bin/qemu-ppc64 - usr/bin/qemu-sh4 - usr/bin/qemu-sh4eb - usr/bin/qemu-sparc - usr/bin/qemu-sparc64 - usr/bin/qemu-armeb - usr/bin/qemu-sparc32plus - usr/bin/qemu-s390x - usr/bin/qemu-unicore32 -" - -DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the -kernel module loaded before running kvm. The easiest way to ensure that the -kernel module is loaded is to load it on boot. - For AMD CPUs the module is called 'kvm-amd'. - For Intel CPUs the module is called 'kvm-intel'. -Please review /etc/conf.d/modules for how to load these. - -Make sure your user is in the 'kvm' group. Just run - $ gpasswd -a kvm -then have re-login. - -For brand new installs, the default permissions on /dev/kvm might not let -you access it. You can tell udev to reset ownership/perms: - $ udevadm trigger -c add /dev/kvm - -If you want to register binfmt handlers for qemu user targets: -For openrc: - # rc-update add qemu-binfmt -For systemd: - # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" - -pkg_pretend() { - if use kernel_linux && kernel_is lt 2 6 25; then - eerror "This version of KVM requires a host kernel of 2.6.25 or higher." - elif use kernel_linux; then - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - else - CONFIG_CHECK="~KVM ~TUN ~BRIDGE" - ERROR_KVM="You must enable KVM in your kernel to continue" - ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" - ERROR_KVM_AMD+=" your kernel configuration." - ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" - ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." - ERROR_TUN="You will need the Universal TUN/TAP driver compiled" - ERROR_TUN+=" into your kernel or loaded as a module to use the" - ERROR_TUN+=" virtual network device if using -net tap." - ERROR_BRIDGE="You will also need support for 802.1d" - ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." - use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" - ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" - ERROR_VHOST_NET+=" support" - - if use amd64 || use x86 || use amd64-linux || use x86-linux; then - if grep -q AuthenticAMD /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_AMD" - elif grep -q GenuineIntel /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_INTEL" - fi - fi - - use python && CONFIG_CHECK+=" ~DEBUG_FS" - ERROR_DEBUG_FS="debugFS support required for kvm_stat" - - # Now do the actual checks setup above - check_extra_config - fi - fi - - if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then - eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" - eerror "instances are still pointing to it. Please update your" - eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" - eerror "and the right system binary (e.g. qemu-system-x86_64)." - die "update your virt configs to not use qemu-kvm" - fi -} - -# Sanity check to make sure target lists are kept up-to-date. -check_targets() { - local var=$1 mak=$2 - local detected sorted - - pushd "${S}"/configs/targets/ >/dev/null || die - - # Force C locale until glibc is updated. #564936 - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "${var}: ${sorted}" - eerror "$(printf '%-*s' ${#var} configure): ${detected}" - die "sync ${var} to the list of targets" - fi - - popd >/dev/null -} - -src_prepare() { - check_targets IUSE_SOFTMMU_TARGETS softmmu - check_targets IUSE_USER_TARGETS linux-user - - default - - # Use correct toolchain to fix cross-compiling - tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS - export WINDRES=${CHOST}-windres - - # Verbose builds - MAKEOPTS+=" V=1" - - # We already force -D_FORTIFY_SOURCE=2 (or 3) in our toolchain, but - # this setting (-U then -D..=2) will prevent us from trying out 3, so - # drop it. No change to level of protection b/c we patch our toolchain. - sed -i -e 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2//' configure || die - - # Remove bundled modules - rm -r dtc meson roms/*/ slirp || die -} - -## -# configures qemu based on the build directory and the build type -# we are using. -# -qemu_src_configure() { - debug-print-function ${FUNCNAME} "$@" - - local buildtype=$1 - local builddir="${S}/${buildtype}-build" - - mkdir "${builddir}" || die - - local conf_opts=( - --prefix=/usr - --sysconfdir=/etc - --bindir=/usr/bin - --libdir=/usr/$(get_libdir) - --datadir=/usr/share - --docdir=/usr/share/doc/${PF}/html - --mandir=/usr/share/man - --localstatedir=/var - --disable-bsd-user - --disable-containers # bug #732972 - --disable-guest-agent - --disable-strip - --with-git-submodules=ignore - - # bug #746752: TCG interpreter has a few limitations: - # - it does not support FPU - # - it's generally slower on non-self-modifying code - # It's advantage is support for host architectures - # where native codegeneration is not implemented. - # Gentoo has qemu keyworded only on targets with - # native code generation available. Avoid the interpreter. - --disable-tcg-interpreter - - --disable-werror - # We support gnutls/nettle for crypto operations. It is possible - # to use gcrypt when gnutls/nettle are disabled (but not when they - # are enabled), but it's not really worth the hassle. Disable it - # all the time to avoid automatically detecting it. #568856 - --disable-gcrypt - --cc="$(tc-getCC)" - --cxx="$(tc-getCXX)" - --host-cc="$(tc-getBUILD_CC)" - - $(use_enable alsa) - $(use_enable debug debug-info) - $(use_enable debug debug-tcg) - $(use_enable jack) - $(use_enable nls gettext) - $(use_enable oss) - $(use_enable plugins) - $(use_enable pulseaudio pa) - $(use_enable selinux) - $(use_enable xattr attr) - ) - - # Disable options not used by user targets. This simplifies building - # static user targets (USE=static-user) considerably. - conf_notuser() { - if [[ ${buildtype} == "user" ]] ; then - echo "--disable-${2:-$1}" - else - use_enable "$@" - fi - } - # Enable option only for softmmu build, but not 'user' or 'tools' - conf_softmmu() { - if [[ ${buildtype} == "softmmu" ]] ; then - use_enable "$@" - else - echo "--disable-${2:-$1}" - fi - } - # Enable option only for tools build, but not 'user' or 'softmmu' - conf_tools() { - if [[ ${buildtype} == "tools" ]] ; then - use_enable "$@" - else - echo "--disable-${2:-$1}" - fi - } - # Special case for the malloc flag, because the --disable flag does - # not exist and trying like above will break configuring. - conf_malloc() { - if [[ ! ${buildtype} == "user" ]] ; then - usex "${1}" "--enable-malloc=${1}" "" - fi - } - conf_opts+=( - $(conf_notuser accessibility brlapi) - $(conf_notuser aio linux-aio) - $(conf_softmmu bpf) - $(conf_notuser bzip2) - $(conf_notuser capstone) - $(conf_notuser curl) - $(conf_tools doc docs) - $(conf_notuser fdt) - $(conf_notuser fuse) - $(conf_notuser glusterfs) - $(conf_notuser gnutls) - $(conf_notuser gnutls nettle) - $(conf_notuser gtk) - $(conf_notuser infiniband rdma) - $(conf_notuser iscsi libiscsi) - $(conf_notuser io-uring linux-io-uring) - $(conf_malloc jemalloc) - $(conf_notuser jpeg vnc-jpeg) - $(conf_notuser kernel_linux kvm) - $(conf_notuser lzo) - $(conf_notuser multipath mpath) - $(conf_notuser ncurses curses) - $(conf_notuser nfs libnfs) - $(conf_notuser numa) - $(conf_notuser opengl) - $(conf_notuser pam auth-pam) - $(conf_notuser png) - $(conf_notuser rbd) - $(conf_notuser sasl vnc-sasl) - $(conf_notuser sdl) - $(conf_softmmu sdl-image) - $(conf_notuser slirp slirp system) - $(conf_notuser smartcard) - $(conf_notuser snappy) - $(conf_notuser spice) - $(conf_notuser ssh libssh) - $(conf_notuser udev libudev) - $(conf_notuser usb libusb) - $(conf_notuser usbredir usb-redir) - $(conf_notuser vde) - $(conf_notuser vhost-net) - $(conf_notuser virgl virglrenderer) - $(conf_softmmu virtfs) - $(conf_notuser vnc) - $(conf_notuser vte) - $(conf_notuser xen) - $(conf_notuser xen xen-pci-passthrough) - # use prebuilt keymaps, bug #759604 - --disable-xkbcommon - $(conf_notuser zstd) - ) - - if [[ ! ${buildtype} == "user" ]] ; then - # audio options - local audio_opts=( - # Note: backend order matters here: #716202 - # We iterate from higher-level to lower level. - $(usex pulseaudio pa "") - $(usev jack) - $(usev sdl) - $(usev alsa) - $(usev oss) - ) - conf_opts+=( - --audio-drv-list=$(IFS=,; echo "${audio_opts[*]}") - ) - fi - - case ${buildtype} in - user) - conf_opts+=( - --enable-linux-user - --disable-system - --disable-blobs - --disable-tools - --disable-cap-ng - --disable-seccomp - ) - local static_flag="static-user" - ;; - softmmu) - conf_opts+=( - --disable-linux-user - --enable-system - --disable-tools - --enable-cap-ng - --enable-seccomp - ) - local static_flag="static" - ;; - tools) - conf_opts+=( - --disable-linux-user - --disable-system - --disable-blobs - --enable-cap-ng - --enable-seccomp - --enable-tools - ) - local static_flag="static" - ;; - esac - - local targets="${buildtype}_targets" - [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) - - # Add support for SystemTAP - use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) - - # We always want to attempt to build with PIE support as it results - # in a more secure binary. But it doesn't work with static or if - # the current GCC doesn't have PIE support. - if use ${static_flag}; then - conf_opts+=( --static --disable-pie ) - else - tc-enables-pie && conf_opts+=( --enable-pie ) - fi - - # Meson will not use a cross-file unless cross_prefix is set. - tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" ) - - # Plumb through equivalent of EXTRA_ECONF to allow experiments - # like bug #747928. - conf_opts+=( ${EXTRA_CONF_QEMU} ) - - echo "../configure ${conf_opts[*]}" - cd "${builddir}" - ../configure "${conf_opts[@]}" || die "configure failed" -} - -src_configure() { - local target - - python_setup - - softmmu_targets= softmmu_bins=() - user_targets= user_bins=() - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - if use "qemu_softmmu_targets_${target}"; then - softmmu_targets+=",${target}-softmmu" - softmmu_bins+=( "qemu-system-${target}" ) - fi - done - - for target in ${IUSE_USER_TARGETS} ; do - if use "qemu_user_targets_${target}"; then - user_targets+=",${target}-linux-user" - user_bins+=( "qemu-${target}" ) - fi - done - - softmmu_targets=${softmmu_targets#,} - user_targets=${user_targets#,} - - [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" - [[ -n ${user_targets} ]] && qemu_src_configure "user" - qemu_src_configure "tools" -} - -src_compile() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" || die - default - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" || die - default - fi - - cd "${S}/tools-build" || die - default -} - -src_test() { - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" || die - pax-mark m */qemu-system-* #515550 - emake check - fi -} - -qemu_python_install() { - python_domodule "${S}/python/qemu" - - python_doscript "${S}/scripts/kvm/vmxcap" - python_doscript "${S}/scripts/qmp/qmp-shell" - python_doscript "${S}/scripts/qmp/qemu-ga-client" -} - -# Generate binfmt support files. -# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) -# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) -generate_initd() { - local out="${T}/qemu-binfmt" - local out_systemd="${T}/qemu.conf" - local d="${T}/binfmt.d" - - einfo "Generating qemu binfmt scripts and configuration files" - - # Generate the debian fragments first. - mkdir -p "${d}" - "${S}"/scripts/qemu-binfmt-conf.sh \ - --debian \ - --exportdir "${d}" \ - --qemu-path "${EPREFIX}/usr/bin" \ - || die - # Then turn the fragments into a shell script we can source. - sed -E -i \ - -e 's:^([^ ]+) (.*)$:\1="\2":' \ - "${d}"/* || die - - # Generate the init.d script by assembling the fragments from above. - local f qcpu package interpreter magic mask - cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die - for f in "${d}"/qemu-* ; do - source "${f}" - - # Normalize the cpu logic like we do in the init.d for the native cpu. - qcpu=${package#qemu-} - case ${qcpu} in - arm*) qcpu="arm";; - mips*) qcpu="mips";; - ppc*) qcpu="ppc";; - s390*) qcpu="s390";; - sh*) qcpu="sh";; - sparc*) qcpu="sparc";; - esac - - # we use 'printf' here to be portable across 'sh' - # implementations: #679168 - cat <>"${out}" - if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then - printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register - fi -EOF - - echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" - - done - cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die -} - -src_install() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - emake DESTDIR="${ED}" install - - # Install binfmt handler init script for user targets. - generate_initd - doinitd "${T}/qemu-binfmt" - - # Install binfmt/qemu.conf. - insinto "/usr/share/qemu/binfmt.d" - doins "${T}/qemu.conf" - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - emake DESTDIR="${ED}" install - - # This might not exist if the test failed. #512010 - [[ -e check-report.html ]] && dodoc check-report.html - - if use kernel_linux; then - udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules - fi - - if use python; then - python_foreach_impl qemu_python_install - fi - fi - - cd "${S}/tools-build" || die - emake DESTDIR="${ED}" install - - # If USE=doc, there'll be newly generated docs which we install instead. - if ! use doc && [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${PN}-${QEMU_DOCS_VERSION}-docs/docs/*.[0-8] - fi - - # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 - pushd "${ED}"/usr/bin >/dev/null || die - pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 - popd >/dev/null || die - - # Install config file example for qemu-bridge-helper - insinto "/etc/qemu" - doins "${FILESDIR}/bridge.conf" - - cd "${S}" || die - dodoc MAINTAINERS docs/specs/pci-ids.txt - newdoc pc-bios/README README.pc-bios - - # Disallow stripping of prebuilt firmware files. - dostrip -x ${QA_PREBUILT} - - if [[ -n ${softmmu_targets} ]]; then - # Remove SeaBIOS since we're using the SeaBIOS packaged one - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin - fi - - # Remove vgabios since we're using the seavgabios packaged one - rm "${ED}/usr/share/qemu/vgabios.bin" - rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" - rm "${ED}/usr/share/qemu/vgabios-qxl.bin" - rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" - rm "${ED}/usr/share/qemu/vgabios-virtio.bin" - rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - - # PPC/PPC64 loads vgabios-stdvga - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then - dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin - dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin - dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin - dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin - dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin - dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin - fi - - # Remove sgabios since we're using the sgabios packaged one - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin - fi - - # Remove iPXE since we're using the iPXE packaged one - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom - dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom - dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom - dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom - dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom - dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom - fi - fi - - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -firmware_abi_change() { - local pv - for pv in ${REPLACING_VERSIONS}; do - if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then - return 0 - fi - done - return 1 -} - -pkg_postinst() { - if [[ -n ${softmmu_targets} ]] && use kernel_linux; then - udev_reload - fi - - xdg_icon_cache_update - - [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ - fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper - - DISABLE_AUTOFORMATTING=true - readme.gentoo_print_elog - - if use pin-upstream-blobs && firmware_abi_change; then - ewarn "This version of qemu pins new versions of firmware blobs:" - - if has_version 'sys-firmware/edk2-ovmf-bin'; then - ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" - else - ewarn " $(best_version sys-firmware/edk2-ovmf)" - fi - - if has_version 'sys-firmware/seabios-bin'; then - ewarn " $(best_version sys-firmware/seabios-bin)" - else - ewarn " $(best_version sys-firmware/seabios)" - fi - - ewarn " $(best_version sys-firmware/ipxe)" - ewarn " $(best_version sys-firmware/sgabios)" - ewarn "This might break resume of hibernated guests (started with a different" - ewarn "firmware version) and live migration to/from qemu versions with different" - ewarn "firmware. Please (cold) restart all running guests. For functional" - ewarn "guest migration ensure that all" - ewarn "hosts run at least" - ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." - fi -} - -pkg_info() { - echo "Using:" - echo " $(best_version app-emulation/spice-protocol)" - - if has_version 'sys-firmware/edk2-ovmf-bin'; then - echo " $(best_version sys-firmware/edk2-ovmf-bin)" - else - echo " $(best_version sys-firmware/edk2-ovmf)" - fi - - if has_version 'sys-firmware/seabios-bin'; then - echo " $(best_version sys-firmware/seabios-bin)" - else - echo " $(best_version sys-firmware/seabios)" - fi - - echo " $(best_version sys-firmware/ipxe)" - echo " $(best_version sys-firmware/sgabios)" -} - -pkg_postrm() { - xdg_icon_cache_update - udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.1.0.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.1.0.ebuild deleted file mode 100644 index b1ff815a7c..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.1.0.ebuild +++ /dev/null @@ -1,985 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs -# Set to 1 if prebuilt, 0 if not -# (the construct below is to allow overriding from env for script) -QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1} -QEMU_DOCS_PREBUILT_DEV=ajak -QEMU_DOCS_VERSION="${PV}" -# Default to generating docs (inc. man pages) if no prebuilt; overridden later -# bug #830088 -QEMU_DOC_USEFLAG="+doc" - -PYTHON_COMPAT=( python3_{9,10,11} ) -PYTHON_REQ_USE="ncurses,readline" - -FIRMWARE_ABI_VERSION="7.1.0" - -inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \ - pax-utils xdg-utils - -if [[ ${PV} == *9999* ]]; then - QEMU_DOCS_PREBUILT=0 - - EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/" - EGIT_SUBMODULES=( - tests/fp/berkeley-softfloat-3 - tests/fp/berkeley-testfloat-3 - ui/keycodemapdb - ) - inherit git-r3 - SRC_URI="" -else - MY_P="${PN}-${PV/_rc/-rc}" - SRC_URI="https://download.qemu.org/${MY_P}.tar.xz" - - if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then - SRC_URI+=" !doc? ( https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz )" - fi - - S="${WORKDIR}/${MY_P}" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" - -LICENSE="GPL-2 LGPL-2 BSD-2" -SLOT="0" - -[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc" - -IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug ${QEMU_DOC_USEFLAG} - +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring - jack jemalloc +jpeg - lzo multipath - ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs - plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux - +slirp - smartcard snappy spice ssh static static-user systemtap test udev usb - usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen - zstd" - -COMMON_TARGETS=" - aarch64 - alpha - arm - cris - hppa - i386 - loongarch64 - m68k - microblaze - microblazeel - mips - mips64 - mips64el - mipsel - nios2 - or1k - ppc - ppc64 - riscv32 - riscv64 - s390x - sh4 - sh4eb - sparc - sparc64 - x86_64 - xtensa - xtensaeb -" -IUSE_SOFTMMU_TARGETS=" - ${COMMON_TARGETS} - avr - rx - tricore -" -IUSE_USER_TARGETS=" - ${COMMON_TARGETS} - aarch64_be - armeb - hexagon - mipsn32 - mipsn32el - ppc64le - sparc32plus -" - -use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) -use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) -IUSE+=" ${use_softmmu_targets} ${use_user_targets}" - -RESTRICT="!test? ( test )" -# Allow no targets to be built so that people can get a tools-only build. -# Block USE flag configurations known to not work. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - qemu_softmmu_targets_arm? ( fdt ) - qemu_softmmu_targets_microblaze? ( fdt ) - qemu_softmmu_targets_mips64el? ( fdt ) - qemu_softmmu_targets_ppc64? ( fdt ) - qemu_softmmu_targets_ppc? ( fdt ) - qemu_softmmu_targets_riscv32? ( fdt ) - qemu_softmmu_targets_riscv64? ( fdt ) - qemu_softmmu_targets_x86_64? ( fdt ) - sdl-image? ( sdl ) - static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev ) - static-user? ( !plugins ) - vhost-user-fs? ( caps seccomp ) - virgl? ( opengl ) - virtfs? ( caps xattr ) - vnc? ( gnutls ) - vte? ( gtk ) - multipath? ( udev ) - plugins? ( !static !static-user ) -" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# and user/softmmu targets (qemu-*, qemu-system-*). -# -# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -# -# The attr lib isn't always linked in (although the USE flag is always -# respected). This is because qemu supports using the C library's API -# when available rather than always using the external library. -ALL_DEPEND=" - >=dev-libs/glib-2.0[static-libs(+)] - sys-libs/zlib[static-libs(+)] - python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) - xattr? ( sys-apps/attr[static-libs(+)] )" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# softmmu targets (qemu-system-*). -SOFTMMU_TOOLS_DEPEND=" - >=x11-libs/pixman-0.28.0[static-libs(+)] - accessibility? ( - app-accessibility/brltty[api] - app-accessibility/brltty[static-libs(+)] - ) - aio? ( dev-libs/libaio[static-libs(+)] ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bpf? ( dev-libs/libbpf:= ) - bzip2? ( app-arch/bzip2[static-libs(+)] ) - capstone? ( dev-libs/capstone:= ) - caps? ( sys-libs/libcap-ng[static-libs(+)] ) - curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) - fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] ) - fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) - gnutls? ( - dev-libs/nettle:=[static-libs(+)] - >=net-libs/gnutls-3.0:=[static-libs(+)] - ) - gtk? ( - x11-libs/gtk+:3 - vte? ( x11-libs/vte:2.91 ) - ) - infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) - iscsi? ( net-libs/libiscsi ) - io-uring? ( sys-libs/liburing:=[static-libs(+)] ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc ) - jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] ) - lzo? ( dev-libs/lzo:2[static-libs(+)] ) - multipath? ( sys-fs/multipath-tools ) - ncurses? ( - sys-libs/ncurses:=[unicode(+)] - sys-libs/ncurses:=[static-libs(+)] - ) - nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - opengl? ( - virtual/opengl - media-libs/libepoxy[static-libs(+)] - media-libs/mesa[static-libs(+)] - media-libs/mesa[egl(+),gbm(+)] - ) - pam? ( sys-libs/pam ) - png? ( media-libs/libpng:0=[static-libs(+)] ) - pulseaudio? ( media-sound/pulseaudio ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) - sdl? ( - media-libs/libsdl2[video] - media-libs/libsdl2[static-libs(+)] - ) - sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) - seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) - slirp? ( net-libs/libslirp[static-libs(+)] ) - smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) - snappy? ( app-arch/snappy:= ) - spice? ( - >=app-emulation/spice-protocol-0.12.3 - >=app-emulation/spice-0.12.0[static-libs(+)] - ) - ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) - udev? ( virtual/libudev:= ) - usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) - usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) - vde? ( net-misc/vde[static-libs(+)] ) - virgl? ( media-libs/virglrenderer[static-libs(+)] ) - virtfs? ( sys-libs/libcap ) - xen? ( app-emulation/xen-tools:= ) - zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) -" - -EDK2_OVMF_VERSION="202202" -SEABIOS_VERSION="1.16.0" - -X86_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} - ~sys-firmware/ipxe-1.21.1[binary,qemu] - ~sys-firmware/seabios-bin-${SEABIOS_VERSION} - ~sys-firmware/sgabios-0.1_pre10[binary] - ) - !pin-upstream-blobs? ( - || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} - ) - sys-firmware/ipxe[qemu] - || ( - >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] - >=sys-firmware/seabios-bin-${SEABIOS_VERSION} - ) - sys-firmware/sgabios - )" -PPC_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/seabios-bin-${SEABIOS_VERSION} - ) - !pin-upstream-blobs? ( - || ( - >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] - >=sys-firmware/seabios-bin-${SEABIOS_VERSION} - ) - ) -" - -BDEPEND=" - $(python_gen_impl_dep) - dev-lang/perl - dev-util/meson - sys-apps/texinfo - virtual/pkgconfig - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ) - gtk? ( nls? ( sys-devel/gettext ) ) - test? ( - dev-libs/glib[utils] - sys-devel/bc - ) -" -CDEPEND=" - !static? ( - ${ALL_DEPEND//\[static-libs(+)]} - ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} - ) - qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} ) -" -DEPEND="${CDEPEND} - kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) - static? ( - ${ALL_DEPEND} - ${SOFTMMU_TOOLS_DEPEND} - ) - static-user? ( ${ALL_DEPEND} )" -RDEPEND="${CDEPEND} - acct-group/kvm - selinux? ( - sec-policy/selinux-qemu - sys-libs/libselinux - )" - -PATCHES=( - "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch - "${FILESDIR}"/${PN}-6.0.0-make.patch - "${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch - "${FILESDIR}"/${PN}-7.1.0-strings.patch - "${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch -) - -QA_PREBUILT=" - usr/share/qemu/hppa-firmware.img - usr/share/qemu/openbios-ppc - usr/share/qemu/openbios-sparc64 - usr/share/qemu/openbios-sparc32 - usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf - usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf - usr/share/qemu/palcode-clipper - usr/share/qemu/s390-ccw.img - usr/share/qemu/s390-netboot.img - usr/share/qemu/u-boot.e500 -" - -QA_WX_LOAD="usr/bin/qemu-i386 - usr/bin/qemu-x86_64 - usr/bin/qemu-alpha - usr/bin/qemu-arm - usr/bin/qemu-cris - usr/bin/qemu-m68k - usr/bin/qemu-microblaze - usr/bin/qemu-microblazeel - usr/bin/qemu-mips - usr/bin/qemu-mipsel - usr/bin/qemu-or1k - usr/bin/qemu-ppc - usr/bin/qemu-ppc64 - usr/bin/qemu-sh4 - usr/bin/qemu-sh4eb - usr/bin/qemu-sparc - usr/bin/qemu-sparc64 - usr/bin/qemu-armeb - usr/bin/qemu-sparc32plus - usr/bin/qemu-s390x - usr/bin/qemu-unicore32 -" - -DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the -kernel module loaded before running kvm. The easiest way to ensure that the -kernel module is loaded is to load it on boot. - For AMD CPUs the module is called 'kvm-amd'. - For Intel CPUs the module is called 'kvm-intel'. -Please review /etc/conf.d/modules for how to load these. - -Make sure your user is in the 'kvm' group. Just run - $ gpasswd -a kvm -then have re-login. - -For brand new installs, the default permissions on /dev/kvm might not let -you access it. You can tell udev to reset ownership/perms: - $ udevadm trigger -c add /dev/kvm - -If you want to register binfmt handlers for qemu user targets: -For openrc: - # rc-update add qemu-binfmt -For systemd: - # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" - -pkg_pretend() { - if use kernel_linux && kernel_is lt 2 6 25; then - eerror "This version of KVM requires a host kernel of 2.6.25 or higher." - elif use kernel_linux; then - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - else - CONFIG_CHECK="~KVM ~TUN ~BRIDGE" - ERROR_KVM="You must enable KVM in your kernel to continue" - ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" - ERROR_KVM_AMD+=" your kernel configuration." - ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" - ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." - ERROR_TUN="You will need the Universal TUN/TAP driver compiled" - ERROR_TUN+=" into your kernel or loaded as a module to use the" - ERROR_TUN+=" virtual network device if using -net tap." - ERROR_BRIDGE="You will also need support for 802.1d" - ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." - use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" - ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" - ERROR_VHOST_NET+=" support" - - if use amd64 || use x86 || use amd64-linux || use x86-linux; then - if grep -q AuthenticAMD /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_AMD" - elif grep -q GenuineIntel /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_INTEL" - fi - fi - - use python && CONFIG_CHECK+=" ~DEBUG_FS" - ERROR_DEBUG_FS="debugFS support required for kvm_stat" - - # Now do the actual checks setup above - check_extra_config - fi - fi - - if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then - eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" - eerror "instances are still pointing to it. Please update your" - eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" - eerror "and the right system binary (e.g. qemu-system-x86_64)." - die "update your virt configs to not use qemu-kvm" - fi -} - -# Sanity check to make sure target lists are kept up-to-date. -check_targets() { - local var=$1 mak=$2 - local detected sorted - - pushd "${S}"/configs/targets/ >/dev/null || die - - # Force C locale until glibc is updated. #564936 - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "${var}: ${sorted}" - eerror "$(printf '%-*s' ${#var} configure): ${detected}" - die "sync ${var} to the list of targets" - fi - - popd >/dev/null -} - -src_prepare() { - check_targets IUSE_SOFTMMU_TARGETS softmmu - check_targets IUSE_USER_TARGETS linux-user - - default - - # Use correct toolchain to fix cross-compiling - tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS - export WINDRES=${CHOST}-windres - - # Verbose builds - MAKEOPTS+=" V=1" - - # We already force -D_FORTIFY_SOURCE=2 (or 3) in our toolchain, but - # this setting (-U then -D..=2) will prevent us from trying out 3, so - # drop it. No change to level of protection b/c we patch our toolchain. - sed -i -e 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2//' configure || die - - # Remove bundled modules - rm -r dtc meson roms/*/ slirp || die -} - -## -# configures qemu based on the build directory and the build type -# we are using. -# -qemu_src_configure() { - debug-print-function ${FUNCNAME} "$@" - - local buildtype=$1 - local builddir="${S}/${buildtype}-build" - - mkdir "${builddir}" || die - - local conf_opts=( - --prefix=/usr - --sysconfdir=/etc - --bindir=/usr/bin - --libdir=/usr/$(get_libdir) - --datadir=/usr/share - --docdir=/usr/share/doc/${PF}/html - --mandir=/usr/share/man - --localstatedir=/var - --disable-bsd-user - --disable-containers # bug #732972 - --disable-guest-agent - --disable-strip - --with-git-submodules=ignore - - # bug #746752: TCG interpreter has a few limitations: - # - it does not support FPU - # - it's generally slower on non-self-modifying code - # It's advantage is support for host architectures - # where native codegeneration is not implemented. - # Gentoo has qemu keyworded only on targets with - # native code generation available. Avoid the interpreter. - --disable-tcg-interpreter - - --disable-werror - # We support gnutls/nettle for crypto operations. It is possible - # to use gcrypt when gnutls/nettle are disabled (but not when they - # are enabled), but it's not really worth the hassle. Disable it - # all the time to avoid automatically detecting it. #568856 - --disable-gcrypt - --cc="$(tc-getCC)" - --cxx="$(tc-getCXX)" - --host-cc="$(tc-getBUILD_CC)" - - $(use_enable alsa) - $(use_enable debug debug-info) - $(use_enable debug debug-tcg) - $(use_enable jack) - $(use_enable nls gettext) - $(use_enable oss) - $(use_enable plugins) - $(use_enable pulseaudio pa) - $(use_enable selinux) - $(use_enable xattr attr) - ) - - # Disable options not used by user targets. This simplifies building - # static user targets (USE=static-user) considerably. - conf_notuser() { - if [[ ${buildtype} == "user" ]] ; then - echo "--disable-${2:-$1}" - else - use_enable "$@" - fi - } - # Enable option only for softmmu build, but not 'user' or 'tools' - conf_softmmu() { - if [[ ${buildtype} == "softmmu" ]] ; then - use_enable "$@" - else - echo "--disable-${2:-$1}" - fi - } - # Enable option only for tools build, but not 'user' or 'softmmu' - conf_tools() { - if [[ ${buildtype} == "tools" ]] ; then - use_enable "$@" - else - echo "--disable-${2:-$1}" - fi - } - # Special case for the malloc flag, because the --disable flag does - # not exist and trying like above will break configuring. - conf_malloc() { - if [[ ! ${buildtype} == "user" ]] ; then - usex "${1}" "--enable-malloc=${1}" "" - fi - } - conf_opts+=( - $(conf_notuser accessibility brlapi) - $(conf_notuser aio linux-aio) - $(conf_softmmu bpf) - $(conf_notuser bzip2) - $(conf_notuser capstone) - $(conf_notuser caps cap-ng) - $(conf_notuser curl) - $(conf_tools doc docs) - $(conf_notuser fdt) - $(conf_notuser fuse) - $(conf_notuser glusterfs) - $(conf_notuser gnutls) - $(conf_notuser gnutls nettle) - $(conf_notuser gtk) - $(conf_notuser infiniband rdma) - $(conf_notuser iscsi libiscsi) - $(conf_notuser io-uring linux-io-uring) - $(conf_malloc jemalloc) - $(conf_notuser jpeg vnc-jpeg) - $(conf_notuser kernel_linux kvm) - $(conf_notuser lzo) - $(conf_notuser multipath mpath) - $(conf_notuser ncurses curses) - $(conf_notuser nfs libnfs) - $(conf_notuser numa) - $(conf_notuser opengl) - $(conf_notuser pam auth-pam) - $(conf_notuser png) - $(conf_notuser rbd) - $(conf_notuser sasl vnc-sasl) - $(conf_notuser sdl) - $(conf_softmmu sdl-image) - $(conf_notuser seccomp) - $(conf_notuser slirp slirp system) - $(conf_notuser smartcard) - $(conf_notuser snappy) - $(conf_notuser spice) - $(conf_notuser ssh libssh) - $(conf_notuser udev libudev) - $(conf_notuser usb libusb) - $(conf_notuser usbredir usb-redir) - $(conf_notuser vde) - $(conf_notuser vhost-net) - $(conf_notuser virgl virglrenderer) - $(conf_softmmu virtfs) - $(conf_notuser vnc) - $(conf_notuser vte) - $(conf_notuser xen) - $(conf_notuser xen xen-pci-passthrough) - # use prebuilt keymaps, bug #759604 - --disable-xkbcommon - $(conf_notuser zstd) - ) - - if [[ ! ${buildtype} == "user" ]] ; then - # audio options - local audio_opts=( - # Note: backend order matters here: #716202 - # We iterate from higher-level to lower level. - $(usex pulseaudio pa "") - $(usev jack) - $(usev sdl) - $(usev alsa) - $(usev oss) - ) - conf_opts+=( - --audio-drv-list=$(IFS=,; echo "${audio_opts[*]}") - ) - fi - - case ${buildtype} in - user) - conf_opts+=( - --enable-linux-user - --disable-system - --disable-blobs - --disable-tools - ) - local static_flag="static-user" - ;; - softmmu) - conf_opts+=( - --disable-linux-user - --enable-system - --disable-tools - ) - local static_flag="static" - - for target in ${IUSE_SOFTMMU_TARGETS}; do - if use "qemu_softmmu_targets_${target}"; then - conf_opts+=( - # For some reason, adding this with the setting set - # to on *or* off makes the build always fail. - # --with-devices-${target}=gentoo - ) - fi - done - ;; - tools) - conf_opts+=( - --disable-linux-user - --disable-system - --disable-blobs - --enable-tools - ) - local static_flag="static" - ;; - esac - - local targets="${buildtype}_targets" - [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) - - # Add support for SystemTAP - use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) - - # We always want to attempt to build with PIE support as it results - # in a more secure binary. But it doesn't work with static or if - # the current GCC doesn't have PIE support. - if use ${static_flag}; then - conf_opts+=( --static --disable-pie ) - else - tc-enables-pie && conf_opts+=( --enable-pie ) - fi - - # Meson will not use a cross-file unless cross_prefix is set. - tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" ) - - # Plumb through equivalent of EXTRA_ECONF to allow experiments - # like bug #747928. - conf_opts+=( ${EXTRA_CONF_QEMU} ) - - echo "../configure ${conf_opts[*]}" - cd "${builddir}" - ../configure "${conf_opts[@]}" || die "configure failed" -} - -src_configure() { - local target - - python_setup - - softmmu_targets= softmmu_bins=() - user_targets= user_bins=() - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - if use "qemu_softmmu_targets_${target}"; then - softmmu_targets+=",${target}-softmmu" - softmmu_bins+=( "qemu-system-${target}" ) - - # Needed to rework vhost-user-fs handling thanks to https://gitlab.com/qemu-project/qemu/-/commit/5166dab - # The option was converted into being configurable by - # Kconfig's. So, to enable it, we insert the necessary - # options into each arch's softmmu target gentoo.mak file, - # then configure with --with-devices-${target}=gentoo. - if use vhost-user-fs; then - echo "CONFIG_VHOST_USER_FS=y for ${target}-softmmu" || die - echo "CONFIG_VIRTIO=y" >> "configs/devices/${target}-softmmu/gentoo.mak" || die - echo "CONFIG_VHOST_USER_FS=y" >> "configs/devices/${target}-softmmu/gentoo.mak" || die - else - echo "CONFIG_VHOST_USER_FS=n for ${target}-softmmu" || die - echo "CONFIG_VIRTIO=n" >> "configs/devices/${target}-softmmu/gentoo.mak" || die - echo "CONFIG_VHOST_USER_FS=n" >> "configs/devices/${target}-softmmu/gentoo.mak" || die - fi - fi - done - - for target in ${IUSE_USER_TARGETS} ; do - if use "qemu_user_targets_${target}"; then - user_targets+=",${target}-linux-user" - user_bins+=( "qemu-${target}" ) - fi - done - - softmmu_targets=${softmmu_targets#,} - user_targets=${user_targets#,} - - [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" - [[ -n ${user_targets} ]] && qemu_src_configure "user" - qemu_src_configure "tools" -} - -src_compile() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" || die - default - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" || die - default - fi - - cd "${S}/tools-build" || die - default -} - -src_test() { - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" || die - pax-mark m */qemu-system-* #515550 - emake check - fi -} - -qemu_python_install() { - python_domodule "${S}/python/qemu" - - python_doscript "${S}/scripts/kvm/vmxcap" - python_doscript "${S}/scripts/qmp/qmp-shell" - python_doscript "${S}/scripts/qmp/qemu-ga-client" -} - -# Generate binfmt support files. -# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) -# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) -generate_initd() { - local out="${T}/qemu-binfmt" - local out_systemd="${T}/qemu.conf" - local d="${T}/binfmt.d" - - einfo "Generating qemu binfmt scripts and configuration files" - - # Generate the debian fragments first. - mkdir -p "${d}" - "${S}"/scripts/qemu-binfmt-conf.sh \ - --debian \ - --exportdir "${d}" \ - --qemu-path "${EPREFIX}/usr/bin" \ - || die - # Then turn the fragments into a shell script we can source. - sed -E -i \ - -e 's:^([^ ]+) (.*)$:\1="\2":' \ - "${d}"/* || die - - # Generate the init.d script by assembling the fragments from above. - local f qcpu package interpreter magic mask - cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die - for f in "${d}"/qemu-* ; do - source "${f}" - - # Normalize the cpu logic like we do in the init.d for the native cpu. - qcpu=${package#qemu-} - case ${qcpu} in - arm*) qcpu="arm";; - mips*) qcpu="mips";; - ppc*) qcpu="ppc";; - s390*) qcpu="s390";; - sh*) qcpu="sh";; - sparc*) qcpu="sparc";; - esac - - # we use 'printf' here to be portable across 'sh' - # implementations: #679168 - cat <>"${out}" - if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then - printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register - fi -EOF - - echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" - - done - cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die -} - -src_install() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - emake DESTDIR="${ED}" install - - # Install binfmt handler init script for user targets. - generate_initd - doinitd "${T}/qemu-binfmt" - - # Install binfmt/qemu.conf. - insinto "/usr/share/qemu/binfmt.d" - doins "${T}/qemu.conf" - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - emake DESTDIR="${ED}" install - - # This might not exist if the test failed. #512010 - [[ -e check-report.html ]] && dodoc check-report.html - - if use kernel_linux; then - udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules - fi - - if use python; then - python_foreach_impl qemu_python_install - fi - fi - - cd "${S}/tools-build" || die - emake DESTDIR="${ED}" install - - # If USE=doc, there'll be newly generated docs which we install instead. - if ! use doc && [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${PN}-${QEMU_DOCS_VERSION}-docs/docs/*.[0-8] - fi - - # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 - pushd "${ED}"/usr/bin >/dev/null || die - pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 - popd >/dev/null || die - - # Install config file example for qemu-bridge-helper - insinto "/etc/qemu" - doins "${FILESDIR}/bridge.conf" - - cd "${S}" || die - dodoc MAINTAINERS docs/specs/pci-ids.txt - newdoc pc-bios/README README.pc-bios - - # Disallow stripping of prebuilt firmware files. - dostrip -x ${QA_PREBUILT} - - if [[ -n ${softmmu_targets} ]]; then - # Remove SeaBIOS since we're using the SeaBIOS packaged one - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin - fi - - # Remove vgabios since we're using the seavgabios packaged one - rm "${ED}/usr/share/qemu/vgabios.bin" - rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" - rm "${ED}/usr/share/qemu/vgabios-qxl.bin" - rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" - rm "${ED}/usr/share/qemu/vgabios-virtio.bin" - rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - - # PPC/PPC64 loads vgabios-stdvga - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then - dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin - dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin - dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin - dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin - dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin - dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin - fi - - # Remove sgabios since we're using the sgabios packaged one - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin - fi - - # Remove iPXE since we're using the iPXE packaged one - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom - dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom - dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom - dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom - dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom - dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom - fi - fi - - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -firmware_abi_change() { - local pv - for pv in ${REPLACING_VERSIONS}; do - if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then - return 0 - fi - done - return 1 -} - -pkg_postinst() { - if [[ -n ${softmmu_targets} ]] && use kernel_linux; then - udev_reload - fi - - xdg_icon_cache_update - - [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ - fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper - - DISABLE_AUTOFORMATTING=true - readme.gentoo_print_elog - - if use pin-upstream-blobs && firmware_abi_change; then - ewarn "This version of qemu pins new versions of firmware blobs:" - - if has_version 'sys-firmware/edk2-ovmf-bin'; then - ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" - else - ewarn " $(best_version sys-firmware/edk2-ovmf)" - fi - - if has_version 'sys-firmware/seabios-bin'; then - ewarn " $(best_version sys-firmware/seabios-bin)" - else - ewarn " $(best_version sys-firmware/seabios)" - fi - - ewarn " $(best_version sys-firmware/ipxe)" - ewarn " $(best_version sys-firmware/sgabios)" - ewarn "This might break resume of hibernated guests (started with a different" - ewarn "firmware version) and live migration to/from qemu versions with different" - ewarn "firmware. Please (cold) restart all running guests. For functional" - ewarn "guest migration ensure that all" - ewarn "hosts run at least" - ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." - fi -} - -pkg_info() { - echo "Using:" - echo " $(best_version app-emulation/spice-protocol)" - - if has_version 'sys-firmware/edk2-ovmf-bin'; then - echo " $(best_version sys-firmware/edk2-ovmf-bin)" - else - echo " $(best_version sys-firmware/edk2-ovmf)" - fi - - if has_version 'sys-firmware/seabios-bin'; then - echo " $(best_version sys-firmware/seabios-bin)" - else - echo " $(best_version sys-firmware/seabios)" - fi - - echo " $(best_version sys-firmware/ipxe)" - echo " $(best_version sys-firmware/sgabios)" -} - -pkg_postrm() { - xdg_icon_cache_update - udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0.ebuild index ee76679ed3..7fe74ad78b 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.0.ebuild @@ -41,7 +41,7 @@ else fi S="${WORKDIR}/${MY_P}" - [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv x86" + [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" From a5e72cd0b7b5559ddaf51b823092bce470777401 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:19:36 +0000 Subject: [PATCH 04/41] dev-libs/boost: Sync with Gentoo It's from Gentoo commit a77e2be3202141061f919937ad9ccab5eb92c75f. --- .../dev-libs/boost/boost-1.81.0.ebuild | 340 ------------------ 1 file changed, 340 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0.ebuild deleted file mode 100644 index 59b674d933..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/boost/boost-1.81.0.ebuild +++ /dev/null @@ -1,340 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal - -MY_PV="$(ver_rs 1- _)" - -DESCRIPTION="Boost Libraries for C++" -HOMEPAGE="https://www.boost.org/" -SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" -S="${WORKDIR}/${PN}_${MY_PV}" - -LICENSE="Boost-1.0" -SLOT="0/${PV}" # ${PV} instead of the major version due to bug 486122 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python tools zlib zstd" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -# the tests will never fail because these are not intended as sanity -# tests at all. They are more a way for upstream to check their own code -# on new compilers. Since they would either be completely unreliable -# (failing for no good reason) or completely useless (never failing) -# there is no point in having them in the ebuild to begin with. -RESTRICT="test" - -RDEPEND=" - !=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] ) - !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) - lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] ) - mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] ) - python? ( - ${PYTHON_DEPS} - numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) - ) - zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND=">=dev-util/b2-4.9.2" - -PATCHES=( - "${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch - "${FILESDIR}"/${PN}-1.79.0-context-x32.patch - "${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch - # Boost.MPI's __init__.py doesn't work on Py3 - "${FILESDIR}"/${PN}-1.79.0-boost-mpi-python-PEP-328.patch - "${FILESDIR}"/${PN}-1.80.0-fix-mips1-transition.patch - - # (upstreamed) -) - -python_bindings_needed() { - multilib_is_native_abi && use python -} - -tools_needed() { - multilib_is_native_abi && use tools -} - -create_user-config.jam() { - local user_config_jam="${BUILD_DIR}"/user-config.jam - if [[ -s ${user_config_jam} ]]; then - einfo "${user_config_jam} already exists, skipping configuration" - return - else - einfo "Creating configuration in ${user_config_jam}" - fi - - local compiler compiler_version compiler_executable="$(tc-getCXX)" - if [[ ${CHOST} == *-darwin* ]]; then - compiler="darwin" - compiler_version="$(gcc-fullversion)" - else - compiler="gcc" - compiler_version="$(gcc-version)" - fi - - if use mpi; then - local mpi_configuration="using mpi ;" - fi - - cat > "${user_config_jam}" <<- __EOF__ || die - using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" "$(tc-getAR)" "$(tc-getRANLIB)" ; - ${mpi_configuration} - __EOF__ - - if python_bindings_needed; then - append_to_user_config() { - local py_config - if tc-is-cross-compiler; then - py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;" - else - py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;" - fi - echo "${py_config}" >> "${user_config_jam}" || die - } - python_foreach_impl append_to_user_config - fi - - if python_bindings_needed && use numpy; then - einfo "Enabling support for NumPy extensions in Boost.Python" - else - einfo "Disabling support for NumPy extensions in Boost.Python" - - # Boost.Build does not allow for disabling of numpy - # extensions, thereby leading to automagic numpy - # https://github.com/boostorg/python/issues/111#issuecomment-280447482 - sed \ - -e 's/\[ unless \[ python\.numpy \] : no \]/no/g' \ - -i "${BUILD_DIR}"/libs/python/build/Jamfile || die - fi -} - -pkg_setup() { - # Bail out on unsupported build configuration, bug #456792 - if [[ -f "${EROOT}"/etc/site-config.jam ]]; then - if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then - eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets." - eerror "Boost can not be built in such configuration." - eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it." - die "Unsupported target in ${EROOT}/etc/site-config.jam" - fi - fi -} - -src_prepare() { - default - multilib_copy_sources -} - -ejam() { - create_user-config.jam - - local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" ) - if python_bindings_needed; then - append_to_b2_opts() { - b2_opts+=( python="${EPYTHON#python}" ) - } - python_foreach_impl append_to_b2_opts - else - b2_opts+=( --without-python ) - fi - b2_opts+=( "$@" ) - - echo b2 "${b2_opts[@]}" >&2 - b2 "${b2_opts[@]}" -} - -src_configure() { - # Workaround for too many parallel processes requested, bug #506064 - [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64" - - # We don't want to end up with -L/usr/lib on our linker lines - # which then gives us lots of - # skipping incompatible /usr/lib/libc.a when searching for -lc - # warnings - [[ -n ${ESYSROOT} ]] && local icuarg="-sICU_PATH=${ESYSROOT}/usr" - - OPTIONS=( - $(usex debug gentoodebug gentoorelease) - "-j$(makeopts_jobs)" - -q - -d+2 - pch=off - $(usex icu "${icuarg}" '--disable-icu boost.locale.icu=off') - $(usev !mpi --without-mpi) - $(usev !nls --without-locale) - $(usev !context '--without-context --without-coroutine --without-fiber') - --without-stacktrace - --boost-build="${BROOT}"/usr/share/b2/src - --layout=system - # building with threading=single is currently not possible - # https://svn.boost.org/trac/boost/ticket/7105 - threading=multi - link=shared - # this seems to be the only way to disable compression algorithms - # https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build - -sNO_BZIP2=$(usex bzip2 0 1) - -sNO_LZMA=$(usex lzma 0 1) - -sNO_ZLIB=$(usex zlib 0 1) - -sNO_ZSTD=$(usex zstd 0 1) - ) - - if [[ ${CHOST} == *-darwin* ]]; then - # We need to add the prefix, and in two cases this exceeds, so prepare - # for the largest possible space allocation. - append-ldflags -Wl,-headerpad_max_install_names - fi - - # Use C++17 globally as of 1.80 - append-cxxflags -std=c++17 -} - -multilib_src_compile() { - ejam \ - --prefix="${EPREFIX}"/usr \ - "${OPTIONS[@]}" || die - - if tools_needed; then - pushd tools >/dev/null || die - ejam \ - --prefix="${EPREFIX}"/usr \ - "${OPTIONS[@]}" \ - || die "Building of Boost tools failed" - popd >/dev/null || die - fi -} - -multilib_src_install() { - ejam \ - --prefix="${ED}"/usr \ - --includedir="${ED}"/usr/include \ - --libdir="${ED}"/usr/$(get_libdir) \ - "${OPTIONS[@]}" install || die "Installation of Boost libraries failed" - - if tools_needed; then - dobin dist/bin/* - - insinto /usr/share - doins -r dist/share/boostbook - fi - - # boost's build system truely sucks for not having a destdir. Because for - # this reason we are forced to build with a prefix that includes the - # DESTROOT, dynamic libraries on Darwin end messed up, referencing the - # DESTROOT instread of the actual EPREFIX. There is no way out of here - # but to do it the dirty way of manually setting the right install_names. - if [[ ${CHOST} == *-darwin* ]]; then - einfo "Working around completely broken build-system(tm)" - local d - for d in "${ED}"/usr/lib/*.dylib; do - if [[ -f ${d} ]]; then - # fix the "soname" - ebegin " correcting install_name of ${d#${ED}}" - install_name_tool -id "/${d#${D}}" "${d}" - eend $? - # fix references to other libs - refs=$(otool -XL "${d}" | \ - sed -e '1d' -e 's/^\t//' | \ - grep "^libboost_" | \ - cut -f1 -d' ') - local r - for r in ${refs}; do - ebegin " correcting reference to ${r}" - install_name_tool -change \ - "${r}" \ - "${EPREFIX}/usr/lib/${r}" \ - "${d}" - eend $? - done - fi - done - fi -} - -multilib_src_install_all() { - if ! use numpy; then - rm -r "${ED}"/usr/include/boost/python/numpy* || die - fi - - if use python; then - if use mpi; then - move_mpi_py_into_sitedir() { - python_moduleinto boost - python_domodule "${S}"/libs/mpi/build/__init__.py - - python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so - rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die - - python_optimize - } - python_foreach_impl move_mpi_py_into_sitedir - else - rm -r "${ED}"/usr/include/boost/mpi/python* || die - fi - else - rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die - fi - - if ! use nls; then - rm -r "${ED}"/usr/include/boost/locale || die - fi - - if ! use context; then - rm -r "${ED}"/usr/include/boost/context || die - rm -r "${ED}"/usr/include/boost/coroutine{,2} || die - rm "${ED}"/usr/include/boost/asio/spawn.hpp || die - fi - - if use doc; then - # find extraneous files that shouldn't be installed - # as part of the documentation and remove them. - find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die - find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die - find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die - - docinto html - dodoc *.{htm,html,png,css} - dodoc -r doc libs more tools - - # To avoid broken links - dodoc LICENSE_1_0.txt - - dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost - fi -} - -pkg_preinst() { - # Yay for having symlinks that are nigh-impossible to remove without - # resorting to dirty hacks like these. Removes lingering symlinks - # from the slotted versions. - local symlink - for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do - if [[ -L ${symlink} ]]; then - rm -f "${symlink}" || die - fi - done - - # some ancient installs still have boost cruft lying around - # for unknown reasons, causing havoc for reverse dependencies - # Bug: 607734 - rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die -} - -pkg_postinst() { - elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as" - elog - elog " undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation" - elog " ::transform_primary[abi:cxx11](char const*, char const*) const'" - elog - elog "Then you need to recompile Boost and all its reverse dependencies" - elog "using the same toolchain. In general, *every* change of the C++ toolchain" - elog "requires a complete rebuild of the Boost-dependent ecosystem." - elog - elog "See for instance https://bugs.gentoo.org/638138" -} From 83a31b21977feb3baf13c27659846ad310aa147e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:19:39 +0000 Subject: [PATCH 05/41] dev-libs/glib: Sync with Gentoo It's from Gentoo commit 18a78a2fbf3d5667523c4f4fb3c2d678f3109ec8. --- .../third_party/portage-stable/dev-libs/glib/glib-2.74.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.4.ebuild index 893dd43479..9d4a61eeb1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.4.ebuild @@ -16,7 +16,7 @@ IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test u RESTRICT="!test? ( test )" #REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" +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 From 1818c97fc0f88c7bd85a1e73d625f61b54f348ef Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:19:39 +0000 Subject: [PATCH 06/41] dev-libs/gmp: Sync with Gentoo It's from Gentoo commit 41be178f55e7a4f36b9d287398d679fd7877d8bd. --- .../portage-stable/dev-libs/gmp/gmp-6.2.1-r5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gmp/gmp-6.2.1-r5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gmp/gmp-6.2.1-r5.ebuild index 566858f65c..be3203afdc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gmp/gmp-6.2.1-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gmp/gmp-6.2.1-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,7 +27,7 @@ S="${WORKDIR}"/${MY_P%a} LICENSE="|| ( LGPL-3+ GPL-2+ )" # The subslot reflects the C & C++ SONAMEs. SLOT="0/10.4" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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" IUSE="+asm doc +cpudetection +cxx pic static-libs" REQUIRED_USE="cpudetection? ( asm )" RESTRICT="!cpudetection? ( bindist )" From a0305117b32e07cdc7a5cbd6340be21717cfa519 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:19:41 +0000 Subject: [PATCH 07/41] dev-libs/libltdl: Sync with Gentoo It's from Gentoo commit a1a498b77d74a9904808cdf9a3943f995ebeae00. --- .../dev-libs/libltdl/libltdl-2.4.7-r1.ebuild | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild new file mode 100644 index 0000000000..f5c82fdbc2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +# Please bump with sys-devel/libtool. + +inherit multilib-minimal flag-o-matic + +MY_P="libtool-${PV}" + +DESCRIPTION="A shared library tool for developers" +HOMEPAGE="https://www.gnu.org/software/libtool/" +SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz" +S="${WORKDIR}"/${MY_P}/libltdl + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs" +# libltdl doesn't have a testsuite. + +BDEPEND="app-arch/xz-utils" + +multilib_src_configure() { + append-lfs-flags + ECONF_SOURCE="${S}" \ + econf \ + --enable-ltdl-install \ + $(use_enable static-libs static) +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + # While the libltdl.la file is not used directly, the m4 ltdl logic + # keys off of its existence when searching for ltdl support. # bug #293921 + #use static-libs || find "${D}" -name libltdl.la -delete +} From d6615e27a8e52381ee24840b4dc8f73dc8fe37d1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:19:41 +0000 Subject: [PATCH 08/41] dev-libs/libpcre2: Sync with Gentoo It's from Gentoo commit 853ffc254e93646e53de72c0b5db8b2b04521941. --- .../{libpcre2-10.42.ebuild => libpcre2-10.42-r1.ebuild} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/{libpcre2-10.42.ebuild => libpcre2-10.42-r1.ebuild} (87%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.42.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.42-r1.ebuild similarity index 87% rename from sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.42.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.42-r1.ebuild index c8948edf59..215da4f0f5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.42.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libpcre2/libpcre2-10.42-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0/3" # libpcre2-posix.so version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib" REQUIRED_USE="?? ( libedit readline )" @@ -85,7 +85,7 @@ multilib_src_install() { DESTDIR="${D}" \ $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ install - multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix + multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix pcre2-8 } multilib_src_install_all() { From 10d882c9a5ac294ba0dfee7d6bb9953dfd840914 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:19:53 +0000 Subject: [PATCH 09/41] dev-util/b2: Sync with Gentoo It's from Gentoo commit 978f3791fcc7b3f04d8a7e05785a9c3744ea98b2. --- .../portage-stable/dev-util/b2/Manifest | 1 - .../dev-util/b2/b2-4.9.2.ebuild | 64 ------------------- .../files/b2-4.9.2-respect-user-flags.patch | 11 ---- 3 files changed, 76 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-respect-user-flags.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/b2/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/b2/Manifest index 488992304b..38bd7479eb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/b2/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/b2/Manifest @@ -1,2 +1 @@ -DIST b2-4.9.2.tar.gz 975882 BLAKE2B 83c2ef85c9f1ae20922541ca8c344316f1660ee069426e3a9907c0a19e1c94db470c67d0c29a1f31788eddb86ab414ab06b9713f8ea53d974d1d8f0ca29f4aa5 SHA512 eab180770608b863dcf6a5fbc626e1733cf4353cf62f4189bd28258a03591fdb7853f5dddb4d3dad60f1bb06db5415025b792a30c2c65f7b1278f61e33f903e3 DIST b2-4.9.3.tar.gz 975934 BLAKE2B 8d16e7227676786408f0d84efb577806e304a9181b89656dad1243b5b0b48e67d4226fa51ea97d4ea10110e4ea86f3ae2884d711fa4b04e36bdaa68dff0a4710 SHA512 8f861074a50720ad5469277a469523ef5f87ef2aab65d745f4c5e6af0ed8f40af91c43cd42b7845982c065974026ce1ecc77a831cd0c698c7e22fa848cc81009 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.2.ebuild deleted file mode 100644 index 14e6346af9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/b2/b2-4.9.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo flag-o-matic toolchain-funcs - -MY_PV="$(ver_rs 1- _)" - -DESCRIPTION="A system for large project software construction, simple to use and powerful" -HOMEPAGE="https://www.bfgroup.xyz/b2/" -SRC_URI="https://github.com/bfgroup/b2/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}/src" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples" -RESTRICT="test" - -RDEPEND="!dev-util/boost-build" - -PATCHES=( - "${FILESDIR}"/${PN}-4.9.2-disable_python_rpath.patch - "${FILESDIR}"/${PN}-4.9.2-darwin-gentoo-toolchain.patch - "${FILESDIR}"/${PN}-4.9.2-add-none-feature-options.patch - "${FILESDIR}"/${PN}-4.9.2-respect-user-flags.patch - "${FILESDIR}"/${PN}-4.9.2-no-implicit-march-flags.patch - "${FILESDIR}"/${PN}-4.9.2-odr.patch -) - -src_configure() { - # need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100) - append-lfs-flags -} - -src_compile() { - cd engine || die - edo ${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python -} - -src_test() { - # Forget tests, b2 is a lost cause - : -} - -src_install() { - dobin engine/b2 - - insinto /usr/share/b2/src - doins -r "${FILESDIR}/site-config.jam" \ - bootstrap.jam build-system.jam ../example/user-config.jam \ - build kernel options tools util - - find "${ED}"/usr/share/b2/src -iname '*.py' -delete || die - - dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt - - if use examples; then - docinto examples - dodoc -r ../example/. - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-respect-user-flags.patch b/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-respect-user-flags.patch deleted file mode 100644 index b0de4f0e88..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/b2/files/b2-4.9.2-respect-user-flags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/engine/build.sh -+++ b/engine/build.sh -@@ -496,7 +496,7 @@ modules/set.cpp \ - if test_true ${B2_DEBUG_OPT} ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}" - else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG" - fi -- ( B2_VERBOSE_OPT=${TRUE} echo_run ${B2_CXX} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 ) -+ ( B2_VERBOSE_OPT=${TRUE} echo_run ${B2_CXX} ${CPPFLAGS} ${B2_CXXFLAGS} ${LDFLAGS} ${B2_SOURCES} -o b2 ) - } - - if test_true ${B2_VERBOSE_OPT} ; then From 0c2bb3b07494c4b7ec63185b55911fbf71668ed4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:19:53 +0000 Subject: [PATCH 10/41] dev-util/bpftool: Sync with Gentoo It's from Gentoo commit 6b171e74a39049cade0c9499059210250d2a60df. --- .../portage-stable/dev-util/bpftool/Manifest | 2 + .../dev-util/bpftool/bpftool-6.1.7.ebuild | 123 ++++++++++++++++++ 2 files changed, 125 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-6.1.7.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/Manifest index a9565ab901..6379bf4e6b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/Manifest @@ -1,5 +1,7 @@ DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714 +DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68 DIST patch-5.19.12.xz 828424 BLAKE2B fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1 SHA512 40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc DIST patch-6.0.12.xz 635356 BLAKE2B f7407d0f95ee70e7cbb80139e61b68d2da5467a95a3d4a3c9c434616f2c6420beea483b115c60ce645d4ba586188d8beb8a82ddb32de09816d6773ba89bc21aa SHA512 d604975d02735d6ba8f98268d418397d78bf49d129aabd326599196708bf05795b17d22398ddd0229bc2944f7b152902e9638ff9aa04977c46a229566894dd00 +DIST patch-6.1.7.xz 533812 BLAKE2B b08005dfaa1247378fa2b3d1955537bcbbc6ee8c9171552e27ce51716c4c414e6b442d6ee33344431275e6b0140f315a5ea986977d102b298bb7651e5dbbbcef SHA512 e824cca5bb1e98439b152b15674292f042a5df8567ba2439a111af58084277ff800df6b326d6ecf0e3ee325d5ab2d2ddddd9dc31db7a0176828f1690bd855b2a DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b diff --git a/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-6.1.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-6.1.7.ebuild new file mode 100644 index 0000000000..4f68a43259 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/bpftool/bpftool-6.1.7.ebuild @@ -0,0 +1,123 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..10} ) +inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs + +MY_PV="${PV/_/-}" +MY_PV="${MY_PV/-pre/-git}" + +DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps" +HOMEPAGE="https://kernel.org/" + +LINUX_V="${PV:0:1}.x" +LINUX_VER=$(ver_cut 1-2) +LINUX_PATCH=patch-${PV}.xz +SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" + +LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" +SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" + +S_K="${WORKDIR}/linux-${LINUX_VER}" +S="${S_K}/tools/bpf/bpftool" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="caps" + +RDEPEND=" + sys-libs/binutils-libs:= + sys-libs/zlib:= + virtual/libelf:= + caps? ( sys-libs/libcap:= ) +" +DEPEND=" + ${RDEPEND} + >=sys-kernel/linux-headers-5.8 +" +BDEPEND=" + ${LINUX_PATCH+dev-util/patchutils} + ${PYTHON_DEPS} + app-arch/tar + dev-python/docutils +" + +CONFIG_CHECK="~DEBUG_INFO_BTF" + +# src_unpack and src_prepare are copied from dev-util/perf since +# it's building from the same tarball, please keep it in sync with perf +src_unpack() { + local paths=( + tools/bpf kernel/bpf + tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib" + ) + + # We expect the tar implementation to support the -j and --wildcards option + echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" + gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ + "${paths[@]/#/linux-${LINUX_VER}/}" || die + + if [[ -n ${LINUX_PATCH} ]] ; then + eshopts_push -o noglob + ebegin "Filtering partial source patch" + filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \ + > ${P}.patch + eend $? || die "filterdiff failed" + eshopts_pop + fi + + local a + for a in ${A}; do + [[ ${a} == ${LINUX_SOURCES} ]] && continue + [[ ${a} == ${LINUX_PATCH} ]] && continue + unpack ${a} + done +} + +src_prepare() { + default + + if [[ -n ${LINUX_PATCH} ]] ; then + pushd "${S_K}" >/dev/null || die + eapply "${WORKDIR}"/${P}.patch + popd || die + fi + + pushd "${S_K}" >/dev/null || die + # bug #890638 + eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch + popd || die + + # dev-python/docutils installs rst2man.py, not rst2man + sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die +} + +bpftool_make() { + local arch=$(tc-arch-kernel) + tc-export AR CC LD + + emake V=1 VF=1 \ + HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ + EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \ + prefix="${EPREFIX}"/usr \ + bash_compdir="$(get_bashcompdir)" \ + feature-libcap="$(usex caps 1 0)" \ + "$@" +} + +src_compile() { + bpftool_make + bpftool_make -C Documentation +} + +src_install() { + bpftool_make DESTDIR="${D}" install + bpftool_make mandir="${ED}"/usr/share/man -C Documentation install +} + +pkg_postinst() { + optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF] +} From 9f183182262693534b60da695ab4cff36fc21b5f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:19:54 +0000 Subject: [PATCH 11/41] dev-util/cmake: Sync with Gentoo It's from Gentoo commit 8877a73ac9a312eccd29f218275206477102339c. --- .../portage-stable/dev-util/cmake/Manifest | 9 +- .../dev-util/cmake/cmake-3.23.3.ebuild | 261 ------------------ .../dev-util/cmake/cmake-3.25.2.ebuild | 2 +- ...-3.25.1.ebuild => cmake-3.26.0_rc1.ebuild} | 7 +- .../dev-util/cmake/cmake-9999.ebuild | 7 +- 5 files changed, 11 insertions(+), 275 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.23.3.ebuild rename sdk_container/src/third_party/portage-stable/dev-util/cmake/{cmake-3.25.1.ebuild => cmake-3.26.0_rc1.ebuild} (98%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest index c0665edbe0..1e12ca339a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest @@ -1,15 +1,10 @@ -DIST cmake-3.23.3-SHA-256.txt 1452 BLAKE2B aa2e2dfb2757210688a5a9131ca1fffdf6617a52219d373fd908c08e52b7d77f0e980086561a083cabaf8d9f3e24b15064bb74ad2737fcbfe11c8aba5814eb4e SHA512 22808c050e8927867fc5d2daa6999d9eed53e99015f89d1f5bef61397d1b2a9888728e86fdca8716c47f8133e02b3fa726d0cc97c0bb4ab5f5ff16a1fc0ae82f -DIST cmake-3.23.3-SHA-256.txt.asc 833 BLAKE2B 10f61d7cfaa5c86d0e372f33d9ba0dbe7ae9cbfe17669107167b3ae72d0e337c63fb1c27a528dcda804323a1f0d4843b630e15427c33e0f5d5c568e27cea769d SHA512 75ff4b25fdd71bc05a7d6fec3c72ec5b8d6ed7ac980d533e6c820855c74a1a58f52d53c1a454dffe1a15568445c4c1c805891997e5709567c9e7709ba1c5e4d9 -DIST cmake-3.23.3.tar.gz 9988050 BLAKE2B 55105ce380e5e9f1839fc38cc0eaefe505d58bffa60feab9813a36c7cac92f4fb6aa6b6aaad899f1e8d58cfa5ececb9e7335a470244ccc06848d833b1eddf224 SHA512 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632 DIST cmake-3.24.3-SHA-256.txt 1646 BLAKE2B 739503a16c2e333c9b05a3232e2dcc56105f6933414a4a2054a582b9cf53a12c2b1a37d2189077cbcd138b8cc2828ef1819ab0fc74ded926ef0df7c7ea8c79e1 SHA512 b670acc21b98d1da22b31743f83ba10d6dbfda60341457a02639ee6f15d50462ddcd90b5992eff275d77e7cce6f074aff72abd95c539d18f191682ad87d7884e DIST cmake-3.24.3-SHA-256.txt.asc 833 BLAKE2B f8797072c2d30facfbbebc972c68cd1a6510331e63c67e6b665bd97dd9013e354bab68e03d578698d2f9e50c173ff8e1cac40751c7a3645be294a717f4bfee3a SHA512 bc67eaf6dba935df85ae3d7c37600259b032579813b275087332d5cc4c72dd6bdf44762260729a15f237f69f772670291bb2f2dcc4b155fb17112e0e8fa01d6b DIST cmake-3.24.3-docs.tar.xz 492156 BLAKE2B 92edd031189673c46e8e13a5e1200917734b918651dc01d982c25602e48cd5d5f014fa8563bdc79b3d09d90ef07a52c9d5a570a5181c59c233ba5bf450cdd5df SHA512 75806743fca976098b9b7ee777c494478142ab5686dc8ccb18510b5938c7e88cf8b3bc47321022f55f33c04bb0a7f549d70be8c765d1ec143467e679c8863132 DIST cmake-3.24.3.tar.gz 10399876 BLAKE2B 24e2ff8cf4f63ba182dd305c14367fa0163f6187da84f7ec10b1ad6241c7df5b48f329b67ba5f7b5d3b644cba89c7adb848a3ae7196bf5b4dbfaedf178dba250 SHA512 57edf2a8c1c9edeed7fd11271083f333d940b31e0e909d9c71671465961559c505e4e22f36e68bfe1a40a01eb05fe94bc8d37b062f9be613f959f864207e3764 -DIST cmake-3.25.1-SHA-256.txt 1646 BLAKE2B b5ebf93e481b2bf63c5448875983f0b4d13f4e588eb226577969738f3b56c0ca14d9ab99ffc4dbcf8a2ab74a159de00368ce6ebf9667b90ef657083f351c4c01 SHA512 5e7618b27b0cdb674ee0ea7e1e6641ba31da6f4414ae1a08ed11691e105ebd89a39a307b53e04e2386785bcd2917e1b8d65755ef7c07a1d9f4f400dcb5385b44 -DIST cmake-3.25.1-SHA-256.txt.asc 833 BLAKE2B 3dce05d9ad5852165418726fc16de4fcc6c66aa379ce926a68c10515dcd87ed40b60ce345952fc2c83f342b5ebb0f02134af6c07b58e9dcf7e1757ad6294d8b5 SHA512 70ec7f1cef52d76ab6732556b663509de780648a2009608632a7df0de86c1d8b91fab874233413216a486fa97648d95de1556f89f48cea936408b609380c5aa4 -DIST cmake-3.25.1-docs.tar.xz 499680 BLAKE2B 0baac457fbde68046080a906093be96c6fe3d7a4b592125237258768eeb0f9c80d3e1e867e2850fe3ebd27a1284d2f47245ca73b8f5b6eb4c046f2afdab78e56 SHA512 02e1bf84be15a7c796a9a7535ee286ca3cddc478707daa1be076be44285f762a0c5eb620b34815e6713b7262a534d7c7fb48e53896c4706645792397f8da83e3 -DIST cmake-3.25.1.tar.gz 10561054 BLAKE2B 3aaf546ebc935caaaf6d15c61f99184964902a50004222ba29e17714488b219f8d8754008f2b2d701dd7befe8c0f4cd0edad92fcabb8ad37b981f31b2d1e37a2 SHA512 ec4203cac569e3c340bf6535d193d9ccff9c4e4d59a7a7ae5b9156172f647d9f9212bdc37b3c12cbd676b1351b9a64364c563aaa968a2f41e0f402410ed78d57 DIST cmake-3.25.2-SHA-256.txt 1646 BLAKE2B 10289acf1a74e45ad1109bb0759ce82024553947ff60c8358854f26d276e89155df9b44561adee4b838d95fb2fcb54b4d2ca1e957b35a90ee80ea56dc63d94be SHA512 75d6a0c4c9350ad466559f44f56f2d18308cdfbaba24da3c86950c9bfb4861f9486f031b41206de83019850944081f304953dbd04b55501ea7b3912aabfb1e00 DIST cmake-3.25.2-SHA-256.txt.asc 833 BLAKE2B 823c1132836529c3ca1c9060f504ad9904169621e3284c489b92f6334454ffa82791d336c78a27e705eca686e63131aed249c44e61b5f7fb915e80cca0155edc SHA512 16d5f8e0071db7f29b2f502b8a26e71e73519980555f64a548f1b3d5e917ec377cdfa49a4750dffde952e6b818dd37d000992bf67b553902b2117809f02b9486 DIST cmake-3.25.2-docs.tar.xz 500144 BLAKE2B 9f45daf51c3acddce8e273649cd7445d00324883f2feccc98632a35d2ba72e7f6fd286f65bc362969f41d13cd5f34881aac8a229c9f6533caf0d86e1092075a8 SHA512 191daffb9a244fac79700bb0d21b3d65c7b94685dafd589122d37017660d13768e3e3257170bbfe46871efc59da6e7e2fcad0ce860cf87f1dc149c80df73cf91 DIST cmake-3.25.2.tar.gz 10561266 BLAKE2B ca093cf0b2a0254494965c8b46ab188024b6d745cd56461451f4fa023fbb4f2cca7077877f1698c082d8a3b52c898d6f793657d8da3879f19f7b24139cbab7f0 SHA512 20146d06a1722c36249192944a58e4780aad334d2bc5ce2a3d8c4f24656630c5b71ca0ae7ed53587e3d46f488bd773452fa60c3fc7045fe54db2dbc6ffd86390 +DIST cmake-3.26.0-rc1.tar.gz 10666314 BLAKE2B 1fcc779757447f3c07e41160f2f16648e902fff66ece3099bf5c5c57b6cca75e55e7b35c5eca0dc128146aec5d0064f5a35fecca0015beca6fa0102585c6e808 SHA512 6280fd7f3f04da291350441847d4be001bcc56d7e31a08739327958a26721a88cab2de608e53b28154324dc857aeb67dca0f2cd5243b4b3269744628273d6386 +DIST cmake-3.26.0_rc1-docs.tar.xz 507308 BLAKE2B 83cc5c43acdd7b38961b68c3b477ef070553230823a0a1636222b8ac4e5d268beab4f6bfbaf7d631c07135011a5c1842db227306fbbe5542a629fd03d039c324 SHA512 d2a366e8c56035ad697f71d30b37bd9b096c07edb7c84e0b8c271ba1daf1cdc4f59caa1fadf9ad9fad597dcbbd2a0b80f0bf7cd5a23f6888d2d8794d604cf617 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.23.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.23.3.ebuild deleted file mode 100644 index 01a0ab8891..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.23.3.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja -# ... but seems fine as of 3.22.3? -# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. -CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES_LIST=( none ) -inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ - toolchain-funcs virtualx xdg-utils - -MY_P="${P/_/-}" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="https://cmake.org/" -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" -else - SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" - if [[ ${PV} != *_rc* ]] ; then - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc - inherit verify-sig - - SRC_URI+=" verify-sig? ( - https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt - https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc - )" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )" - fi -fi - -LICENSE="CMake" -SLOT="0" -IUSE="doc emacs ncurses qt5 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-arch/libarchive-3.3.3:= - app-crypt/rhash - >=dev-libs/expat-2.0.1 - >=dev-libs/jsoncpp-1.9.2-r2:0= - >=dev-libs/libuv-1.10.0:= - >=net-misc/curl-7.21.5[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( >=app-editors/emacs-23.1:* ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND}" -BDEPEND+=" - doc? ( - dev-python/requests - dev-python/sphinx - ) - test? ( app-arch/libarchive[zstd] ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" - -PATCHES=( - # prefix - "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch - - # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch - # Next patch needs to be reworked - #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch - "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch - - # respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch - - "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544 - - # upstream fixes (can usually be removed with a version bump) -) - -cmake_src_bootstrap() { - # disable running of cmake in bootstrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' \ - Source/kwsys/CMakeLists.txt || die - fi - - # bootstrap script isn't exactly /bin/sh compatible - tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ - || die "Bootstrap failed" -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - elif ! use verify-sig || [[ ${PV} == *_rc ]] ; then - default - else - cd "${DISTDIR}" || die - - # See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature - verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc} - verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz - - cd "${WORKDIR}" || die - - default - fi -} - -src_prepare() { - cmake_src_prepare - - if [[ ${CHOST} == *-darwin* ]] ; then - # disable Xcode hooks, bug #652134 - sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ - Source/CMakeLists.txt || die - sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ - -e '/cmGlobalXCodeGenerator.h/d' \ - Source/cmake.cxx || die - # disable isysroot usage with GCC, we've properly instructed - # where things are via GCC configuration and ldwrapper - sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ - Modules/Platform/Apple-GNU-*.cmake || die - # disable isysroot usage with clang as well - sed -i -e '/_SYSROOT_FLAG/d' \ - Modules/Platform/Apple-Clang.cmake || die - # don't set a POSIX standard, system headers don't like that, #757426 - sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ - Source/cmLoadCommandCommand.cxx \ - Source/cmStandardLexer.h \ - Source/cmSystemTools.cxx \ - Source/cmTimestamp.cxx - sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ - Source/cmStandardLexer.h - fi - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - - if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - cmake_src_bootstrap - fi -} - -src_configure() { - # Fix linking on Solaris - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl - - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DSPHINX_MAN=$(usex doc) - -DSPHINX_HTML=$(usex doc) - -DBUILD_CursesDialog="$(usex ncurses)" - -DBUILD_TESTING=$(usex test) - ) - use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null || die - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # BundleUtilities: bundle creation broken - # CMakeOnly.AllFindModules: pthread issues - # CTest.updatecvs: which fails to commit as root - # Fortran: requires fortran - # RunCMake.CompilerLauncher: also requires fortran - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because - # debugedit binary is not in the expected location - # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because - # it can't find a deb package that owns libc - # TestUpload, which requires network access - # RunCMake.CMP0125, known failure reported upstream (bug #829414) - local myctestargs=( - --output-on-failure - -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \ - ) - - virtx cmake_src_test -} - -src_install() { - cmake_src_install - - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Auxiliary/vim/syntax/cmake.vim - - insinto /usr/share/vim/vimfiles/indent - doins Auxiliary/vim/indent/cmake.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use qt5; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen - if use qt5; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.2.ebuild index bcb269c0b9..8825af2a4a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.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 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.0_rc1.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.0_rc1.ebuild index 9491df325a..a2b661bbcd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.0_rc1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,8 @@ EAPI=8 : ${CMAKE_DOCS_PREBUILT:=1} CMAKE_DOCS_PREBUILT_DEV=sam -CMAKE_DOCS_VERSION=$(ver_cut 1-3) +#CMAKE_DOCS_VERSION=$(ver_cut 1-3) +CMAKE_DOCS_VERSION=${PV} # Default to generating docs (inc. man pages) if no prebuilt; overridden later # See bug #784815 CMAKE_DOCS_USEFLAG="+doc" @@ -133,7 +134,7 @@ cmake_src_bootstrap() { src_unpack() { if [[ ${PV} == 9999 ]] ; then git-r3_src_unpack - elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then + elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then default else cd "${DISTDIR}" || die diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-9999.ebuild index 9491df325a..a2b661bbcd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,8 @@ EAPI=8 : ${CMAKE_DOCS_PREBUILT:=1} CMAKE_DOCS_PREBUILT_DEV=sam -CMAKE_DOCS_VERSION=$(ver_cut 1-3) +#CMAKE_DOCS_VERSION=$(ver_cut 1-3) +CMAKE_DOCS_VERSION=${PV} # Default to generating docs (inc. man pages) if no prebuilt; overridden later # See bug #784815 CMAKE_DOCS_USEFLAG="+doc" @@ -133,7 +134,7 @@ cmake_src_bootstrap() { src_unpack() { if [[ ${PV} == 9999 ]] ; then git-r3_src_unpack - elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then + elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then default else cd "${DISTDIR}" || die From 357418b26556166e18867e9c7c9168292c5e95e4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:19:58 +0000 Subject: [PATCH 12/41] dev-util/gdbus-codegen: Sync with Gentoo It's from Gentoo commit c2cdbe81e9cac0977686948d67afc38ce73f0546. --- .../dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild index 489fd545c8..d4ca839d30 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" From f12a89242e6b555f175e3112184058d609d567fd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:19:58 +0000 Subject: [PATCH 13/41] dev-util/glib-utils: Sync with Gentoo It's from Gentoo commit 99eeab3b0464b2b8a31ac0853ed142c7b6ef471d. --- .../portage-stable/dev-util/glib-utils/glib-utils-2.74.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.4.ebuild index 0ad7e86cf1..d94a24e0b1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.4.ebuild @@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+" SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" From 461b679f12e294a8d4fdfb15486ce28ed19373a5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:19:58 +0000 Subject: [PATCH 14/41] dev-util/gperf: Sync with Gentoo It's from Gentoo commit 857fded076aa394ed355ad8ec0de000d4cfa9194. --- .../portage-stable/dev-util/gperf/gperf-3.1-r1.ebuild | 4 ++-- .../third_party/portage-stable/dev-util/gperf/metadata.xml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r1.ebuild index 0341b9fc6b..ab2b4430c8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/gperf/gperf-3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" PATCHES=( "${FILESDIR}"/${P}-strncmp-decl-mismatch.patch 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 8ec7a6f186..eca624ba24 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,8 +1,9 @@ - - blueness@gentoo.org + + base-system@gentoo.org + Gentoo Base System gperf From fd5711f0e14e3426da9196704c19ed85c17ea271 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:20:04 +0000 Subject: [PATCH 15/41] dev-util/pkgconf: Sync with Gentoo It's from Gentoo commit a8a6d230ec262834bc4c3b8cad56ff5228a3682d. --- .../portage-stable/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild | 4 ++-- .../portage-stable/dev-util/pkgconf/pkgconf-1.8.1.ebuild | 2 +- .../portage-stable/dev-util/pkgconf/pkgconf-1.9.4.ebuild | 2 +- .../portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild index bb47d458c3..1595ef6c3f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2022 Gentoo Authors +# Copyright 2012-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ else KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi -DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" +DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" LICENSE="ISC" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.1.ebuild index 311850a40d..cdefc7db77 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.1.ebuild @@ -13,7 +13,7 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi -DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" +DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" LICENSE="ISC" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.4.ebuild index 9417bbe7cb..d8b5b2b9e2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.9.4.ebuild @@ -14,7 +14,7 @@ else #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi -DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" +DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" LICENSE="ISC" diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild index e962927aff..d8b5b2b9e2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2022 Gentoo Authors +# Copyright 2012-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ else #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi -DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" +DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99" HOMEPAGE="https://gitea.treehouse.systems/ariadne/pkgconf" LICENSE="ISC" From 0ba7e3c462b90ff564015be131dab5f3f5634097 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:20:04 +0000 Subject: [PATCH 16/41] dev-util/strace: Sync with Gentoo It's from Gentoo commit 16a1d2021c0f1fa5498141ed1217b8a43032f382. --- .../portage-stable/dev-util/strace/strace-6.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.1.ebuild index 49ada01092..078730c10e 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/strace/strace-6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A useful diagnostic, instructional, and debugging tool" From 4d9f988beb3cdb734fb9bfc489dd2c6bbfb3f9b6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:20:41 +0000 Subject: [PATCH 17/41] eclass/kernel-2: Sync with Gentoo It's from Gentoo commit 954e5a3ea67dbc14a0ec2a7887e88f424b4a8f4d. --- .../portage-stable/eclass/kernel-2.eclass | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass b/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass index 873d4a2046..3c78aa5a84 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/kernel-2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: kernel-2.eclass @@ -745,25 +745,35 @@ cross_pre_c_headers() { use headers-only && [[ ${CHOST} != ${CTARGET} ]] } -# @FUNCTION: env_setup_xmakeopts +# @FUNCTION: env_setup_kernel_makeopts # @USAGE: # @DESCRIPTION: -# set the ARCH/CROSS_COMPILE when cross compiling +# Set the toolchain variables, as well as ARCH and CROSS_COMPILE when +# cross-compiling. -env_setup_xmakeopts() { +env_setup_kernel_makeopts() { # Kernel ARCH != portage ARCH export KARCH=$(tc-arch-kernel) # When cross-compiling, we need to set the ARCH/CROSS_COMPILE # variables properly or bad things happen ! - xmakeopts="ARCH=${KARCH}" + KERNEL_MAKEOPTS=( ARCH="${KARCH}" ) if [[ ${CTARGET} != ${CHOST} ]] && ! cross_pre_c_headers; then - xmakeopts="${xmakeopts} CROSS_COMPILE=${CTARGET}-" + KERNEL_MAKEOPTS+=( CROSS_COMPILE="${CTARGET}-" ) elif type -p ${CHOST}-ar >/dev/null; then - xmakeopts="${xmakeopts} CROSS_COMPILE=${CHOST}-" + KERNEL_MAKEOPTS+=( CROSS_COMPILE="${CHOST}-" ) fi - xmakeopts="${xmakeopts} HOSTCC=$(tc-getBUILD_CC) CC=$(tc-getCC) LD=$(tc-getLD) AR=$(tc-getAR) NM=$(tc-getNM) OBJCOPY=$(tc-getOBJCOPY) READELF=$(tc-getREADELF) STRIP=$(tc-getSTRIP)" - export xmakeopts + KERNEL_MAKEOPTS+=( + HOSTCC="$(tc-getBUILD_CC)" + CC="$(tc-getCC)" + LD="$(tc-getLD)" + AR="$(tc-getAR)" + NM="$(tc-getNM)" + OBJCOPY="$(tc-getOBJCOPY)" + READELF="$(tc-getREADELF)" + STRIP="$(tc-getSTRIP)" + ) + export KERNEL_MAKEOPTS } # @FUNCTION: universal_unpack @@ -849,8 +859,8 @@ install_universal() { install_headers() { local ddir=$(kernel_header_destdir) - env_setup_xmakeopts - emake headers_install INSTALL_HDR_PATH="${ED}"${ddir}/.. ${xmakeopts} + env_setup_kernel_makeopts + emake headers_install INSTALL_HDR_PATH="${ED}"${ddir}/.. "${KERNEL_MAKEOPTS[@]}" # let other packages install some of these headers rm -rf "${ED}"${ddir}/scsi || die #glibc/uclibc/etc... @@ -1416,8 +1426,8 @@ kernel-2_src_unpack() { [[ -z ${K_NOSETEXTRAVERSION} ]] && unpack_set_extraversion unpack_fix_install_path - # Setup xmakeopts and cd into sourcetree. - env_setup_xmakeopts + # Setup KERNEL_MAKEOPTS and cd into sourcetree. + env_setup_kernel_makeopts cd "${S}" || die if [[ ${K_DEBLOB_AVAILABLE} == 1 ]] && use deblob; then From e32dbc868db0dbaf69765c607e346dc4f93bad1f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:20:45 +0000 Subject: [PATCH 18/41] eclass/linux-mod: Sync with Gentoo It's from Gentoo commit e6c8f5df8110ea74e30b0937db43f567004c5dd7. --- .../src/third_party/portage-stable/eclass/linux-mod.eclass | 6 +----- 1 file changed, 1 insertion(+), 5 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 6cf9969b19..98b22dcb9f 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: linux-mod.eclass @@ -624,10 +624,6 @@ linux-mod_src_compile() { cd "${srcdir}" || die ln -s "${S}"/Module.symvers Module.symvers # no die for bug #888679 einfo "Preparing ${modulename} module" - if [[ -n ${ECONF_PARAMS} ]]; then - eqawarn "This package relies on the deprecated functionality of econf being called in linux-mod_src_compile (ECONF_PARAMS), which will go away in 30 days (20230107) (https://bugs.gentoo.org/340597)" - econf ${ECONF_PARAMS} - fi # This looks messy, but it is needed to handle multiple variables # being passed in the BUILD_* stuff where the variables also have From 34e8f764b256fa74c6d4a56748bdfea07918de19 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:20:46 +0000 Subject: [PATCH 19/41] eclass/llvm: Sync with Gentoo It's from Gentoo commit d27219ef714fd17289c3e645f79d45053cd95ef7. --- .../src/third_party/portage-stable/eclass/llvm.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass b/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass index cdbc766fee..022820d012 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/llvm.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: llvm.eclass @@ -78,7 +78,7 @@ DEPEND="!!sys-devel/llvm:0" # @INTERNAL # @DESCRIPTION: # Correct values of LLVM slots, newest first. -declare -g -r _LLVM_KNOWN_SLOTS=( {16..8} ) +declare -g -r _LLVM_KNOWN_SLOTS=( {17..8} ) # @FUNCTION: get_llvm_slot # @USAGE: [-b|-d] [] From dbba02fcd749918b9712640be7d7d4d7e00e9563 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:21:20 +0000 Subject: [PATCH 20/41] eclass/toolchain-funcs: Sync with Gentoo It's from Gentoo commit ceab713f67593524e98c4f75995860723095dec6. --- .../eclass/toolchain-funcs.eclass | 58 ++++++++++++------- 1 file changed, 38 insertions(+), 20 deletions(-) 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 bfcd6819ed..c2c2d11991 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 @@ -1,4 +1,4 @@ -# Copyright 2002-2022 Gentoo Authors +# Copyright 2002-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: toolchain-funcs.eclass @@ -422,19 +422,19 @@ tc-env_build() { # src_configure() { # ECONF_SOURCE=${S} # if tc-is-cross-compiler ; then -# mkdir "${WORKDIR}"/${CBUILD} -# pushd "${WORKDIR}"/${CBUILD} >/dev/null +# mkdir "${WORKDIR}"/${CBUILD} || die +# pushd "${WORKDIR}"/${CBUILD} >/dev/null || die # econf_build --disable-some-unused-stuff -# popd >/dev/null +# popd >/dev/null || die # fi # ... normal build paths ... # } # src_compile() { # if tc-is-cross-compiler ; then -# pushd "${WORKDIR}"/${CBUILD} >/dev/null +# pushd "${WORKDIR}"/${CBUILD} >/dev/null || die # emake one-or-two-build-tools -# ln/mv build-tools to normal build paths in ${S}/ -# popd >/dev/null +# ln/mv build-tools to normal build paths in ${S}/ || die +# popd >/dev/null || die # fi # ... normal build paths ... # } @@ -676,7 +676,7 @@ tc-has-tls() { # Parse information from CBUILD/CHOST/CTARGET rather than # use external variables from the profile. tc-ninja_magic_to_arch() { -ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } + ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } local type=$1 local host=$2 @@ -815,8 +815,8 @@ tc-get-compiler-type() { case ${res} in *HAVE_PATHCC*) echo pathcc;; *HAVE_CLANG*) echo clang;; - *HAVE_GCC*) echo gcc;; - *) echo unknown;; + *HAVE_GCC*) echo gcc;; + *) echo unknown;; esac } @@ -834,11 +834,11 @@ tc-is-clang() { # Internal func. The first argument is the version info to expand. # Query the preprocessor to improve compatibility across different -# compilers rather than maintaining a --version flag matrix. #335943 +# compilers rather than maintaining a --version flag matrix, bug #335943. _gcc_fullversion() { local ver="$1"; shift set -- $($(tc-getCPP "$@") -E -P - <<<"__GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__") - eval echo "$ver" + eval echo "${ver}" } # @FUNCTION: gcc-fullversion @@ -871,7 +871,7 @@ gcc-micro-version() { _clang_fullversion() { local ver="$1"; shift set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__") - eval echo "$ver" + eval echo "${ver}" } # @FUNCTION: clang-fullversion @@ -996,6 +996,15 @@ gcc-specs-stack-check() { [[ "${directive/\{!fno-stack-check:}" != "${directive}" ]] } +# @FUNCTION: tc-enables-cxx-assertions +# @RETURN: Truth if the current compiler enables assertions in the C++ standard library +# @DESCRIPTION: +# Return truth if the current compiler enables assertions in the C++ standard +# library. For libstdc++, this is -D_GLIBCXX_ASSERTIONS, and for libcxx/libc++, +# this is -D_LIBCPP_ENABLE_ASSERTIONS. +tc-enables-cxx-assertions() { + tc-cpp-is-true "defined(_GLIBCXX_ASSERTIONS) || defined(_LIBCPP_ENABLE_ASSERTIONS)" ${CPPFLAGS} ${CXXFLAGS} +} # @FUNCTION: tc-enables-pie # @RETURN: Truth if the current compiler generates position-independent code (PIC) which can be linked into executables @@ -1003,7 +1012,16 @@ gcc-specs-stack-check() { # Return truth if the current compiler generates position-independent code (PIC) # which can be linked into executables. tc-enables-pie() { - tc-cpp-is-true "defined(__PIE__)" ${CPPFLAGS} ${CFLAGS} + tc-cpp-is-true "defined(__PIE__)" ${CPPFLAGS} ${CFLAGS} ${CXXFLAGS} +} + +# @FUNCTION: tc-enables-fortify-source +# @RETURN: Truth if the current compiler enables FORTIFY_SOURCE at any level +# @DESCRIPTION: +# Return truth if the current compiler enables fortification (FORTIFY_SOURCE) +# at any level (-D_FORTIFY_SOURCE). +tc-enables-fortify-source() { + tc-cpp-is-true "defined(_FORTIFY_SOURCE)" ${CPPFLAGS} ${CFLAGS} ${CXXFLAGS} } # @FUNCTION: tc-enables-ssp @@ -1015,7 +1033,7 @@ tc-enables-pie() { # -fstack-protector-strong # -fstack-protector-all tc-enables-ssp() { - tc-cpp-is-true "defined(__SSP__) || defined(__SSP_STRONG__) || defined(__SSP_ALL__)" ${CPPFLAGS} ${CFLAGS} + tc-cpp-is-true "defined(__SSP__) || defined(__SSP_STRONG__) || defined(__SSP_ALL__)" ${CPPFLAGS} ${CFLAGS} ${CXXFLAGS} } # @FUNCTION: tc-enables-ssp-strong @@ -1026,7 +1044,7 @@ tc-enables-ssp() { # -fstack-protector-strong # -fstack-protector-all tc-enables-ssp-strong() { - tc-cpp-is-true "defined(__SSP_STRONG__) || defined(__SSP_ALL__)" ${CPPFLAGS} ${CFLAGS} + tc-cpp-is-true "defined(__SSP_STRONG__) || defined(__SSP_ALL__)" ${CPPFLAGS} ${CFLAGS} ${CXXFLAGS} } # @FUNCTION: tc-enables-ssp-all @@ -1036,7 +1054,7 @@ tc-enables-ssp-strong() { # on level corresponding to any of the following options: # -fstack-protector-all tc-enables-ssp-all() { - tc-cpp-is-true "defined(__SSP_ALL__)" ${CPPFLAGS} ${CFLAGS} + tc-cpp-is-true "defined(__SSP_ALL__)" ${CPPFLAGS} ${CFLAGS} ${CXXFLAGS} } @@ -1080,7 +1098,7 @@ gen_usr_ldscript() { # is referenced ... makes multilib saner local flags=( ${CFLAGS} ${LDFLAGS} -Wl,--verbose ) if $(tc-getLD) --version | grep -q 'GNU gold' ; then - # If they're using gold, manually invoke the old bfd. #487696 + # If they're using gold, manually invoke the old bfd, bug #487696 local d="${T}/bfd-linker" mkdir -p "${d}" ln -sf $(type -P ${CHOST}-ld.bfd) "${d}"/ld @@ -1193,7 +1211,7 @@ tc-get-cxx-stdlib() { #endif ' local res=$( - $(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - \ + $(tc-getCXX) ${CPPFLAGS} ${CXXFLAGS} -x c++ -E -P - \ <<<"${code}" 2>/dev/null ) @@ -1221,7 +1239,7 @@ tc-get-cxx-stdlib() { # If the runtime is not recognized, the function returns 1. tc-get-c-rtlib() { local res=$( - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \ + $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} \ -print-libgcc-file-name 2>/dev/null ) From 8a6f8708a311792a6a16d53f2eac50e7a8b8366b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:21:20 +0000 Subject: [PATCH 21/41] eclass/toolchain: Sync with Gentoo It's from Gentoo commit 597efc1908793a77001d42ebbd96ebb07f8ee631. --- .../portage-stable/eclass/toolchain.eclass | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) 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 0dd23d93e3..6d8901d218 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain.eclass @@ -719,6 +719,19 @@ toolchain_src_prepare() { einfo "Remove texinfo (bug #198182, bug #464008)" eapply "${FILESDIR}"/gcc-configure-texinfo.patch + if ! use prefix-guest && [[ -n ${EPREFIX} ]] ; then + einfo "Prefixifying dynamic linkers..." + for f in gcc/config/*/*linux*.h ; do + ebegin " Updating ${f}" + if [[ ${f} == gcc/config/rs6000/linux*.h ]]; then + sed -i -r "s,(DYNAMIC_LINKER_PREFIX\s+)\"\",\1\"${EPREFIX}\",g" "${f}" || die + else + sed -i -r "/_DYNAMIC_LINKER/s,([\":])(/lib),\1${EPREFIX}\2,g" "${f}" || die + fi + eend $? + done + fi + # >=gcc-4 if [[ -x contrib/gcc_update ]] ; then einfo "Touching generated files" @@ -1200,6 +1213,21 @@ toolchain_src_configure() { confgcc+=( --enable-threads=posix ) ;; esac + + if ! use prefix-guest ; then + # GNU ld scripts, such as those in glibc, reference unprefixed paths + # as the sysroot given here is automatically prepended. For + # prefix-guest, we use the host's libc instead. + if [[ -n ${EPREFIX} ]] ; then + confgcc+=( --with-sysroot="${EPREFIX}" ) + fi + + # We need to build against the right headers and libraries. Again, + # for prefix-guest, this is the host's. + if [[ -n ${ESYSROOT} ]] ; then + confgcc+=( --with-build-sysroot="${ESYSROOT}" ) + fi + fi fi # __cxa_atexit is "essential for fully standards-compliant handling of From d8e507d69d93029ef87f92f73cbff10d5b6a058c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:21:34 +0000 Subject: [PATCH 22/41] licenses: Sync with Gentoo It's from Gentoo commit f9d3bb52b434ef9f6bf8437a9d1f06c989858989. --- .../third_party/portage-stable/licenses/Ms-RL | 72 ++++++ .../third_party/portage-stable/licenses/phrap | 210 ------------------ 2 files changed, 72 insertions(+), 210 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/licenses/Ms-RL delete mode 100644 sdk_container/src/third_party/portage-stable/licenses/phrap diff --git a/sdk_container/src/third_party/portage-stable/licenses/Ms-RL b/sdk_container/src/third_party/portage-stable/licenses/Ms-RL new file mode 100644 index 0000000000..3487566239 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/licenses/Ms-RL @@ -0,0 +1,72 @@ +Microsoft Reciprocal License (Ms-RL) + +This license governs use of the accompanying software. If you use the +software, you accept this license. If you do not accept the license, +do not use the software. + + 1. Definitions + + The terms "reproduce," "reproduction," "derivative works," and + "distribution" have the same meaning here as under U.S. copyright + law. + + A "contribution" is the original software, or any additions or + changes to the software. + + A "contributor" is any person that distributes its contribution + under this license. + + "Licensed patents" are a contributor's patent claims that read + directly on its contribution. + + 2. Grant of Rights + + (A) Copyright Grant- Subject to the terms of this license, + including the license conditions and limitations in section 3, + each contributor grants you a non-exclusive, worldwide, + royalty-free copyright license to reproduce its contribution, + prepare derivative works of its contribution, and distribute its + contribution or any derivative works that you create. + + (B) Patent Grant- Subject to the terms of this license, including + the license conditions and limitations in section 3, each + contributor grants you a non-exclusive, worldwide, royalty-free + license under its licensed patents to make, have made, use, sell, + offer for sale, import, and/or otherwise dispose of its + contribution in the software or derivative works of the + contribution in the software. + + 3. Conditions and Limitations + + (A) Reciprocal Grants- For any file you distribute that contains + code from the software (in source code or binary format), you must + provide recipients the source code to that file along with a copy + of this license, which license will govern that file. You may + license other files that are entirely your own work and do not + contain code from the software under any terms you choose. + + (B) No Trademark License- This license does not grant you rights + to use any contributors' name, logo, or trademarks. + + (C) If you bring a patent claim against any contributor over + patents that you claim are infringed by the software, your patent + license from such contributor to the software ends automatically. + + (D) If you distribute any portion of the software, you must retain + all copyright, patent, trademark, and attribution notices that are + present in the software. + + (E) If you distribute any portion of the software in source code + form, you may do so only under this license by including a + complete copy of this license with your distribution. If you + distribute any portion of the software in compiled or object code + form, you may only do so under a license that complies with this + license. + + (F) The software is licensed "as-is." You bear the risk of using + it. The contributors give no express warranties, guarantees, or + conditions. You may have additional consumer rights under your + local laws which this license cannot change. To the extent + permitted under your local laws, the contributors exclude the + implied warranties of merchantability, fitness for a particular + purpose and non-infringement. diff --git a/sdk_container/src/third_party/portage-stable/licenses/phrap b/sdk_container/src/third_party/portage-stable/licenses/phrap deleted file mode 100644 index 0e1df110ad..0000000000 --- a/sdk_container/src/third_party/portage-stable/licenses/phrap +++ /dev/null @@ -1,210 +0,0 @@ -ACADEMIC USER AGREEMENT - -Please read the entire agreement, fill in the information in the -indicated positions (such as "NAME:"), and return the entire document -to the indicated people. Please send the document as the message--not -as an attachment. - -Phrap: A program for assembling DNA sequence data. - -Swat: A program for searching one or more DNA or protein query sequences -against a sequence database, using (an efficient implementation of) the -Smith-Waterman-Gotoh algorithm. - -Cross_Match: A general-purpose utility based on Swat for comparing any -two sets of (long or short) DNA sequences. - -Phred: A program that reads DNA sequencer trace data, calls bases, -assigns quality values to the bases, and writes the base calls and quality -values to output files. - -Consed: A program for viewing and editing Phrap assemblies. - -To receive any of these programs you will need to agree to the following -conditions. They should be taken seriously! - -1) You agree to read the documentation. We welcome feedback on any -inaccuracies. - -2) You agree to report any bugs to us. (To fix bugs, we will need -from you a dataset and a procedure that reproduces the problem; but do -not send datasets without first emailing us to describe the nature of -the bug.) - -3) You agree not to make the programs (including source code, -executables, or any part thereof, in modified or unmodified form) -available to anyone outside your group, and not to put them where they -may be accessible to outside individuals without your direct knowledge -(e.g. on a computer to which people outside your group have login -privileges). The documentation however may be freely distributed. -Refer any requests for the programs to the authors. If you are -operating a computer facility which provides access to several -independent investigators, you agree to set the permissions on the -executables and source code to allow execute but not read access, so -that the programs may not be copied. Investigators who want copies of -the software for their own use must return a separate copy of this -agreement. - -4) You agree not to use the programs for any commercial purpose, -including but not limited to commercially restricted sequencing -(defined as sequencing for which a company retains patenting or -licensing rights regarding the sequence, or the right to restrict or -delay dissemination of the sequence; with the sole exception that -sequencing is not considered to be commercially restricted if it is -federally funded and the investigators adopt the data release policies -endorsed at the Wellcome Trust-sponsored Bermuda meeting, -i.e. immediate release of data as it is generated). - [If you wish to obtain the software for commercially restricted -sequencing or any other commercial purposes, you will need to execute -a separate licensing agreement with the University of Washington and -pay a fee. In that case please contact: - -Lisa Heinz -University of Washington TechTransfer, Digital Ventures -Box 354990 -4311-11th Avenue NE, Suite 500 -Seattle, WA 98105-4608 - -http://depts.washington.edu/techtran - -206-616-3451 FAX: 206-616-3322 -swxfr@u.washington.edu - -Do not contact her if the academic license applies.] - -5) You acknowledge that the software is experimental in nature and is -supplied "AS IS", without obligation by the authors or the University -of Washington to provide accompanying services or support. The entire -risk as to the quality and performance of the Software is with you. -UW AND THE AUTHORS EXPRESSLY DISCLAIM ANY AND ALL WARRANTIES -REGARDING THE SOFTWARE, WHETHER EXPRESS OR IMPLIED, INCLUDING BUT NOT -LIMITED TO WARRANTIES PERTAINING TO MERCHANTABILITY OR FITNESS FOR A -PARTICULAR PURPOSE. - -6) All members of your group with access to the software agree to the -same conditions. - - - -Having read the above, if you are still interested in obtaining the -programs, please return a copy of this entire message (which MUST be -included so that it is clear what you are agreeing to) by email -together with the following information: - -NAME: Your name in first name/last name order. - -NAME: - - -Example: -NAME: John Dracula -(Please do not use all capitals such as John DRACULA) - -ACKNOWLEDGEMENT: An acknowledgement that you and the members of your -group agree to these conditions. - -ACKNOWLEDGEMENT: - -Example: -ACKNOWLEDGEMENT: I agree to the license. - -PROGRAMS: Which programs you want (phrap,cross_match, and swat are -distributed together). You must cc the message to each appropriate -individual (Brent Ewing, David Gordon, and/or Phil Green) at the email -addresses below so that they will know to send you the appropriate -program. - -PROGRAMS: - -Example: -PROGRAMS: phred, phrap, consed - -INSTITUTION: Your academic or government institution (give full name, -not abbreviation) - -INSTITUTION: - -Example: -INSTITUTION: University of Lower Transylvania - -DEPARTMENT: Your department - -DEPARTMENT: - -Example: -DEPARTMENT: Department of Hematology - -EMAIL: Your email address for all future correspondence. Ideally this -should be a Unix computer running a generic mail program, since -several of the programs are sent as uuencoded files which may be -corrupted by some mail programs. - If this address is not at the institution & department listed above, -please explain the discrepancy. - -EMAIL: - -Example: -EMAIL: john.dracula@utrans.edu - -OS: (Consed requestors only) Which platform(s) you want Consed for: -solaris 2.5.1, solaris 2.6, solaris 2.7 (solaris 7), solaris 8, -solaris 9, digital unix 4.0 (or better), hp-ux 11.x, sgi irix 6.2, -6.3, 6.4, or 6.5, linux (normal 32 bit) (Redhat 7.1-1 or better), -linux (Itanium), linux (AMD64), ibm aix 5.2 (or better), macosx 10.2 -(Darwin kernel 6.0) (or better), or solaris-intel (2.8 or better). - -OS: - -Example: -OS: hpux - -Note: Consed is not available for PC's running Windows, XP, NT, or -2000. - -IP: (Consed requestors only) The ip address of the computer on which -you will be running a web browser to download consed. This does not -have to be the same computer as the one on which you will run consed. -Please view page -http://bozeman.mbt.washington.edu/consed/find_ip_address.html -which will tell you what my computer thinks is your ip address. - -(Even if you think you know your ip address, firewalls and proxies can -cause your browser to transmit a different ip address, and thus my -webserver would deny you access to consed. So it would be a good idea -to view the page above and send me the ip address it shows, even if -this isn't your real ip address.) - -IP: - -Example: -IP: 123.49.74.80 - - -If you want Consed/Autofinish, you must include OS and IP (above). -Consed cannot be obtained without them. - -Please return this entire agreement so it is clear what you are -agreeing to. - -Please send all of this, including the agreement, as part of the -email message--not as an attachment. - -Send it to each of the relevant individuals below: - -Contacts for obtaining the programs and for questions, bug reports, -suggestions: - - Phrap/cross_match/swat: Phil Green, phg (at) u.washington.edu - Phred: Brent Ewing, bge (at) u.washington.edu - Consed: David Gordon, gordon (at) genome.washington.edu - -where the " (at) " is replaced by "@". - -It can take up to 2 weeks for a license application to be processed, -so please be patient. - - - - - - From 54a97cafe22ba6f19495f1ed8675bcc073402c85 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:21:35 +0000 Subject: [PATCH 23/41] net-dns/bind-tools: Sync with Gentoo It's from Gentoo commit 1352a480e30e215bfcea3f08e9af4d3079dbebe9. --- .../net-dns/bind-tools/Manifest | 1 + ...33.ebuild => bind-tools-9.16.33-r1.ebuild} | 7 +- ...36.ebuild => bind-tools-9.16.36-r1.ebuild} | 7 +- .../bind-tools/bind-tools-9.16.37-r1.ebuild | 160 ++++++++++++++++++ 4 files changed, 171 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/portage-stable/net-dns/bind-tools/{bind-tools-9.16.33.ebuild => bind-tools-9.16.33-r1.ebuild} (93%) rename sdk_container/src/third_party/portage-stable/net-dns/bind-tools/{bind-tools-9.16.36.ebuild => bind-tools-9.16.36-r1.ebuild} (89%) create mode 100644 sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/Manifest b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/Manifest index 2c771ae434..37e6c33e70 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/Manifest @@ -1,2 +1,3 @@ DIST bind-9.16.33.tar.xz 5092516 BLAKE2B 4246b61ce91af3d494ace4b8065b4c0043b2cfaf28c6de326691a969837e7d1cfbc0dac6b1e1a5182fc32af68048abcfa1202d00022951f3caa13afb03ebeb69 SHA512 43fd2cea52dfd1115a4cca83830ab5b93208be401cdbbdff2bbf204b8f0d99fb434ad3156d3a21649488cc904ae09f145feba97b9b6918b0cf063ff5e2b10af5 DIST bind-9.16.36.tar.xz 5105696 BLAKE2B 3f506198b038ee96d9c6d5b20d629bc8cf44eadc1d86a0a0cf7126f615a929fa95fa27a63db3a5bcbff2af6aebc74a734ed5abcdfd38c9488ca89ebeb536875a SHA512 521a021456b6daf260fead75efc298dd964ff00947fd95fadb3c13d52f4c07fb61b74861601d22722e8d546dca284524fd4d770cc5cf347d9659b6df9654ed95 +DIST bind-9.16.37.tar.xz 5109440 BLAKE2B 3b18f7c780ce04e296498e30c09628ad8eb89f38afdb032700455f193a3f8556029cd2e3d3c42861965d5fc776f56f761b8d21a74a0f95d82338e65fb519acfb SHA512 2c4b01f6cc598849688b5b2710caf48db47e1e860df785783ef2b140a25507b48357a9becf7911ba0feda285c4bca87764e21128fac5cf17efa47fd5134dc59f diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.33.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.33-r1.ebuild similarity index 93% rename from sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.33.ebuild rename to sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.33-r1.ebuild index 9fac2b5c98..a0e03ab006 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.33.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.33-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,8 +21,11 @@ IUSE="+caps doc gssapi idn libedit readline test xml" # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687 RESTRICT="!test? ( test )" +# libuv lower bound should be the highest value seen at +# https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/lib/isc/netmgr/netmgr.c#L244 +# to avoid issues with matching stable/testing, etc COMMON_DEPEND=" - dev-libs/libuv:= + >=dev-libs/libuv-1.42.0:= dev-libs/openssl:= caps? ( sys-libs/libcap ) xml? ( dev-libs/libxml2 ) diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.36.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.36-r1.ebuild similarity index 89% rename from sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.36.ebuild rename to sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.36-r1.ebuild index 3ef97fde7b..6321737511 100644 --- a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.36.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.36-r1.ebuild @@ -16,13 +16,16 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+caps doc gssapi idn libedit readline test xml" # no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687 RESTRICT="!test? ( test )" +# libuv lower bound should be the highest value seen at +# https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/lib/isc/netmgr/netmgr.c#L244 +# to avoid issues with matching stable/testing, etc COMMON_DEPEND=" - dev-libs/libuv:= + >=dev-libs/libuv-1.42.0:= dev-libs/openssl:= caps? ( sys-libs/libcap ) xml? ( dev-libs/libxml2 ) diff --git a/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild new file mode 100644 index 0000000000..da4c92eb0d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dns/bind-tools/bind-tools-9.16.37-r1.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic multiprocessing toolchain-funcs + +MY_PN=${PN//-tools} +MY_PV=${PV/_p/-P} +MY_PV=${MY_PV/_rc/rc} +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" +HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9" +SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+caps doc gssapi idn libedit readline test xml" +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687 +RESTRICT="!test? ( test )" + +# libuv lower bound should be the highest value seen at +# https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/lib/isc/netmgr/netmgr.c#L244 +# to avoid issues with matching stable/testing, etc +COMMON_DEPEND=" + >=dev-libs/libuv-1.42.0:= + dev-libs/openssl:= + caps? ( sys-libs/libcap ) + xml? ( dev-libs/libxml2 ) + idn? ( net-dns/libidn2:= ) + gssapi? ( virtual/krb5 ) + libedit? ( dev-libs/libedit ) + !libedit? ( + readline? ( sys-libs/readline:= ) + ) +" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" + +# sphinx required for man-page and html creation +BDEPEND=" + virtual/pkgconfig + doc? ( dev-python/sphinx ) + test? ( + dev-util/cmocka + dev-util/kyua + ) +" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)" + + # Do not disable thread local storage on Solaris, it works with our + # toolchain, and it breaks further configure checks + sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die + + # bug #220361 + rm aclocal.m4 || die + rm -rf libtool.m4/ || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --localstatedir="${EPREFIX}"/var + --without-python + --without-libjson + --without-zlib + --without-lmdb + --without-maxminddb + --disable-geoip + --with-openssl="${ESYSROOT}"/usr + $(use_with idn libidn2 "${ESYSROOT}"/usr) + $(use_with xml libxml2) + $(use_with gssapi) + $(use_with readline) + $(use_enable caps linux-caps) + AR="$(type -P $(tc-getAR))" + ) + + # bug 607400 + if use libedit ; then + myeconfargs+=( --with-readline=-ledit ) + elif use readline ; then + myeconfargs+=( --with-readline=-lreadline ) + else + myeconfargs+=( --without-readline ) + fi + + # bug #344029 + append-cflags "-DDIG_SIGCHASE" + + # to expose CMSG_* macros from sys/sockets.h + [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" + + # localstatedir for nsupdate -l, bug #395785 + tc-export BUILD_CC + econf "${myeconfargs[@]}" + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h || die +} + +src_compile() { + local AR="$(tc-getAR)" + + emake AR="${AR}" -C lib/ + emake AR="${AR}" -C bin/delv/ + emake AR="${AR}" -C bin/dig/ + emake AR="${AR}" -C bin/nsupdate/ + emake AR="${AR}" -C bin/dnssec/ + emake -C doc/man/ man $(usev doc) +} + +src_test() { + # system tests ('emake test') require network configuration for IPs etc + # so we run the unit tests instead. + TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit +} + +src_install() { + local man_dir="${S}/doc/man" + local html_dir="${man_dir}/_build/html" + + dodoc README CHANGES + + cd "${S}"/bin/delv || die + dobin delv + doman ${man_dir}/delv.1 + + cd "${S}"/bin/dig || die + dobin dig host nslookup + doman ${man_dir}/{dig,host,nslookup}.1 + + cd "${S}"/bin/nsupdate || die + dobin nsupdate + doman ${man_dir}/nsupdate.1 + if use doc; then + docinto html + dodoc ${html_dir}/nsupdate.html + fi + + cd "${S}"/bin/dnssec || die + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + dobin dnssec-"${tool}" + doman ${man_dir}/dnssec-"${tool}".8 + if use doc; then + docinto html + dodoc ${html_dir}/dnssec-"${tool}".html + fi + done +} From 3e7ffd1fb0681c668290213dcc079207005aa868 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:21:41 +0000 Subject: [PATCH 24/41] net-misc/curl: Sync with Gentoo It's from Gentoo commit 70e478afca6ee420e77c320a37bbb6045b6a302e. --- .../portage-stable/net-misc/curl/Manifest | 2 - .../net-misc/curl/curl-7.86.0-r3.ebuild | 302 ------------------ .../net-misc/curl/curl-7.87.0-r1.ebuild | 301 ----------------- .../net-misc/curl/curl-7.87.0-r2.ebuild | 2 +- .../portage-stable/net-misc/curl/metadata.xml | 10 +- 5 files changed, 8 insertions(+), 609 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest b/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest index bd22780778..51a46b81b6 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/Manifest @@ -1,4 +1,2 @@ -DIST curl-7.86.0.tar.xz 2518356 BLAKE2B a1de7feb229de42bf1deeb5017f97df3b1c10c75fac99bcd0cd21a5dc69b6d8b62520744106d6a113c7a86bd6731dba536a263aabfa22be50d520c43e894acce SHA512 18e03a3c00f22125e07bddb18becbf5acdca22baeb7b29f45ef189a5c56f95b2d51247813f7a9a90f04eb051739e9aa7d3a1c5be397bae75d763a2b918d1b656 -DIST curl-7.86.0.tar.xz.asc 488 BLAKE2B a9abe2f3af801b3a48be7db09cb82b6bb83bd26a9d5caf51c0d5a4a2e6881fb478f1768a6b71efbd9283563e2c7e2badbc5a6d6df265013e14eee2ec7e9be148 SHA512 9e97d5f44b3c856f401fe30ba713e1ca1f74edfc693dc42f1ce8e43f9f6dd4bf6998c579bc9c5d0f749f475a7d67d232e92ab6f89b95141acdb53e149f2312f0 DIST curl-7.87.0.tar.xz 2547932 BLAKE2B b272ec928c5ef1728434630d8910f58834327a30570913df9d47921a2810d002bd88b81371005197db857d3a53386420c1e28b1e463e6241d46c1e50fbce0c13 SHA512 aa125991592667280dce3788aabe81487cf8c55b0afc59d675cc30b76055bb7114f5380b4a0e3b6461a8f81bf9812fa26d493a85f7e01d84263d484a0d699ee7 DIST curl-7.87.0.tar.xz.asc 488 BLAKE2B 031d8236b357bd3c519548b181254dc0aea1efc1375738bce04f4f331d35bafe99d1ca394ecf5943ede7cae040854b6d2b478fd305147eb7330f8d50e5d95c96 SHA512 0bcc12bafc4ae50d80128af2cf4bf1a1ec6018ebb8d5b9c49f52b51c0c25acc77e820858965656549ef43c1f923f4e5fe75b0a3523623154b4cfb9dc8a1d76e4 diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild deleted file mode 100644 index 08d3a7d0b1..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild +++ /dev/null @@ -1,302 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit autotools prefix multilib-minimal verify-sig - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="https://curl.se/" -SRC_URI="https://curl.se/download/${P}.tar.xz - verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )" - -LICENSE="curl" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" -IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" -IUSE+=" nghttp3 quiche" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc - -# Only one default ssl provider can be enabled -REQUIRED_USE=" - ssl? ( - ^^ ( - curl_ssl_gnutls - curl_ssl_mbedtls - curl_ssl_nss - curl_ssl_openssl - curl_ssl_rustls - ) - )" - -# lead to lots of false negatives, bug #285669 -RESTRICT="!test? ( test )" - -RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - mbedtls? ( - net-libs/mbedtls:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - openssl? ( - dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] - ) - nss? ( - dev-libs/nss:0[${MULTILIB_USEDEP}] - dev-libs/nss-pem - app-misc/ca-certificates - ) - rustls? ( - net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] - ) - ) - http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) - nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] - ) - quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) - idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) - sys-libs/zlib[${MULTILIB_USEDEP}] - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" - -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 -# rtmp? ( -# media-video/rtmpdump -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) -# ) - -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl - virtual/pkgconfig - test? ( - sys-apps/diffutils - ) - verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" - -DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/curl/curlbuild.h -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/curl-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-7.30.0-prefix.patch - "${FILESDIR}"/${PN}-respect-cflags-3.patch - "${FILESDIR}"/${P}-proxy-noproxy-tailmatching.patch - "${FILESDIR}"/${P}-proxy-noproxy-match-comma.patch - "${FILESDIR}"/${P}-noproxy-tailmatch-like-in-7.85.0-and-earlier.patch -) - -src_prepare() { - default - - eprefixify curl-config.in - eautoreconf -} - -multilib_src_configure() { - # We make use of the fact that later flags override earlier ones - # So start with all ssl providers off until proven otherwise - # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) - local myconf=() - - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) - #myconf+=( --without-default-ssl-backend ) - if use ssl ; then - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls ) - - if use gnutls || use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - myconf+=( --with-gnutls --with-nettle ) - fi - if use mbedtls || use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" - myconf+=( --with-mbedtls ) - fi - if use nss || use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss --with-nss-deprecated ) - fi - if use openssl || use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - fi - if use rustls || use curl_ssl_rustls; then - einfo "SSL provided by rustls" - myconf+=( --with-rustls ) - fi - - if use curl_ssl_gnutls; then - einfo "Default SSL provided by gnutls" - myconf+=( --with-default-ssl-backend=gnutls ) - elif use curl_ssl_mbedtls; then - einfo "Default SSL provided by mbedtls" - myconf+=( --with-default-ssl-backend=mbedtls ) - elif use curl_ssl_nss; then - einfo "Default SSL provided by nss" - myconf+=( --with-default-ssl-backend=nss ) - elif use curl_ssl_openssl; then - einfo "Default SSL provided by openssl" - myconf+=( --with-default-ssl-backend=openssl ) - elif use curl_ssl_rustls; then - einfo "Default SSL provided by rustls" - myconf+=( --with-default-ssl-backend=rustls ) - else - eerror "We can't be here because of REQUIRED_USE." - fi - - else - myconf+=( --without-ssl ) - einfo "SSL disabled" - fi - - # These configuration options are organized alphabetically - # within each category. This should make it easier if we - # ever decide to make any of them contingent on USE flags: - # 1) protocols first. To see them all do - # 'grep SUPPORT_PROTOCOLS configure.ac' - # 2) --enable/disable options second. - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort - # 3) --with/without options third. - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort - - myconf+=( - $(use_enable alt-svc) - --enable-crypto-auth - --enable-dict - --disable-ech - --enable-file - $(use_enable ftp) - $(use_enable gopher) - $(use_enable hsts) - --enable-http - $(use_enable imap) - $(use_enable ldap) - $(use_enable ldap ldaps) - --enable-ntlm - --disable-ntlm-wb - $(use_enable pop3) - --enable-rt - --enable-rtsp - $(use_enable samba smb) - $(use_with ssh libssh2) - $(use_enable smtp) - $(use_enable telnet) - $(use_enable tftp) - --enable-tls-srp - $(use_enable adns ares) - --enable-cookies - --enable-dateparse - --enable-dnsshuffle - --enable-doh - --enable-symbol-hiding - --enable-http-auth - $(use_enable ipv6) - --enable-largefile - --enable-manual - --enable-mime - --enable-netrc - $(use_enable progress-meter) - --enable-proxy - --disable-sspi - $(use_enable static-libs static) - --enable-pthreads - --enable-threaded-resolver - --disable-versioned-symbols - --without-amissl - --without-bearssl - $(use_with brotli) - --without-fish-functions-dir - $(use_with http2 nghttp2) - --without-hyper - $(use_with idn libidn2) - $(use_with kerberos gssapi "${EPREFIX}"/usr) - --without-libgsasl - --without-libpsl - --without-msh3 - $(use_with nghttp3) - $(use_with nghttp3 ngtcp2) - $(use_with quiche) - $(use_with rtmp librtmp) - --without-schannel - --without-secure-transport - $(use_enable websockets) - --without-winidn - --without-wolfssl - --with-zlib - $(use_with zstd) - ) - - ECONF_SOURCE="${S}" econf "${myconf[@]}" - - if ! multilib_is_native_abi; then - # avoid building the client - sed -i -e '/SUBDIRS/s:src::' Makefile || die - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die - fi - - # Fix up the pkg-config file to be more robust. - # https://github.com/curl/curl/issues/864 - local priv=() libs=() - # We always enable zlib. - libs+=( "-lz" ) - priv+=( "zlib" ) - if use http2; then - libs+=( "-lnghttp2" ) - priv+=( "libnghttp2" ) - fi - if use quiche; then - libs+=( "-lquiche" ) - priv+=( "quiche" ) - fi - if use nghttp3; then - libs+=( "-lnghttp3" "-lngtcp2" ) - priv+=( "libnghttp3" "-libtcp2" ) - fi - if use ssl && use curl_ssl_openssl; then - libs+=( "-lssl" "-lcrypto" ) - priv+=( "openssl" ) - fi - grep -q Requires.private libcurl.pc && die "need to update ebuild" - libs=$(printf '|%s' "${libs[@]}") - sed -i -r \ - -e "/^Libs.private/s:(${libs#|})( |$)::g" \ - libcurl.pc || die - echo "Requires.private: ${priv[*]}" >> libcurl.pc || die -} - -multilib_src_test() { - # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 - # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) - # -v: verbose - # -a: keep going on failure (so we see everything which breaks, not just 1st test) - # -k: keep test files after completion - # -am: automake style TAP output - # -p: print logs if test fails - # Note: if needed, we can disable tests. See e.g. Fedora's packaging - # or just read https://github.com/curl/curl/tree/master/tests#run. - multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p" -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete || die - rm -rf "${ED}"/etc/ || die -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r1.ebuild deleted file mode 100644 index 1277249868..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r1.ebuild +++ /dev/null @@ -1,301 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit autotools prefix multilib-minimal verify-sig - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="https://curl.se/" -SRC_URI="https://curl.se/download/${P}.tar.xz - verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )" - -LICENSE="curl" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" -IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" -IUSE+=" nghttp3 quiche" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc - -# Only one default ssl provider can be enabled -REQUIRED_USE=" - ssl? ( - ^^ ( - curl_ssl_gnutls - curl_ssl_mbedtls - curl_ssl_nss - curl_ssl_openssl - curl_ssl_rustls - ) - )" - -# lead to lots of false negatives, bug #285669 -RESTRICT="!test? ( test )" - -RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - ssl? ( - gnutls? ( - net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - mbedtls? ( - net-libs/mbedtls:=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - openssl? ( - dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] - ) - nss? ( - dev-libs/nss:0[${MULTILIB_USEDEP}] - dev-libs/nss-pem - app-misc/ca-certificates - ) - rustls? ( - net-libs/rustls-ffi:=[${MULTILIB_USEDEP}] - ) - ) - http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) - nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] - ) - quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) - idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) - sys-libs/zlib[${MULTILIB_USEDEP}] - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" - -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 -# rtmp? ( -# media-video/rtmpdump -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) -# ) - -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl - virtual/pkgconfig - test? ( - sys-apps/diffutils - ) - verify-sig? ( sec-keys/openpgp-keys-danielstenberg )" - -DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/curl/curlbuild.h -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/curl-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-7.30.0-prefix.patch - "${FILESDIR}"/${PN}-respect-cflags-3.patch - - "${FILESDIR}"/${P}-gnutls-openssl-build.patch -) - -src_prepare() { - default - - eprefixify curl-config.in - eautoreconf -} - -multilib_src_configure() { - # We make use of the fact that later flags override earlier ones - # So start with all ssl providers off until proven otherwise - # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) - local myconf=() - - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) - #myconf+=( --without-default-ssl-backend ) - if use ssl ; then - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls ) - - if use gnutls || use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - myconf+=( --with-gnutls ) - fi - if use mbedtls || use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" - myconf+=( --with-mbedtls ) - fi - if use nss || use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss --with-nss-deprecated ) - fi - if use openssl || use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - fi - if use rustls || use curl_ssl_rustls; then - einfo "SSL provided by rustls" - myconf+=( --with-rustls ) - fi - - if use curl_ssl_gnutls; then - einfo "Default SSL provided by gnutls" - myconf+=( --with-default-ssl-backend=gnutls ) - elif use curl_ssl_mbedtls; then - einfo "Default SSL provided by mbedtls" - myconf+=( --with-default-ssl-backend=mbedtls ) - elif use curl_ssl_nss; then - einfo "Default SSL provided by nss" - myconf+=( --with-default-ssl-backend=nss ) - elif use curl_ssl_openssl; then - einfo "Default SSL provided by openssl" - myconf+=( --with-default-ssl-backend=openssl ) - elif use curl_ssl_rustls; then - einfo "Default SSL provided by rustls" - myconf+=( --with-default-ssl-backend=rustls ) - else - eerror "We can't be here because of REQUIRED_USE." - fi - - else - myconf+=( --without-ssl ) - einfo "SSL disabled" - fi - - # These configuration options are organized alphabetically - # within each category. This should make it easier if we - # ever decide to make any of them contingent on USE flags: - # 1) protocols first. To see them all do - # 'grep SUPPORT_PROTOCOLS configure.ac' - # 2) --enable/disable options second. - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort - # 3) --with/without options third. - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort - - myconf+=( - $(use_enable alt-svc) - --enable-crypto-auth - --enable-dict - --disable-ech - --enable-file - $(use_enable ftp) - $(use_enable gopher) - $(use_enable hsts) - --enable-http - $(use_enable imap) - $(use_enable ldap) - $(use_enable ldap ldaps) - --enable-ntlm - --disable-ntlm-wb - $(use_enable pop3) - --enable-rt - --enable-rtsp - $(use_enable samba smb) - $(use_with ssh libssh2) - $(use_enable smtp) - $(use_enable telnet) - $(use_enable tftp) - --enable-tls-srp - $(use_enable adns ares) - --enable-cookies - --enable-dateparse - --enable-dnsshuffle - --enable-doh - --enable-symbol-hiding - --enable-http-auth - $(use_enable ipv6) - --enable-largefile - --enable-manual - --enable-mime - --enable-netrc - $(use_enable progress-meter) - --enable-proxy - --disable-sspi - $(use_enable static-libs static) - --enable-pthreads - --enable-threaded-resolver - --disable-versioned-symbols - --without-amissl - --without-bearssl - $(use_with brotli) - --without-fish-functions-dir - $(use_with http2 nghttp2) - --without-hyper - $(use_with idn libidn2) - $(use_with kerberos gssapi "${EPREFIX}"/usr) - --without-libgsasl - --without-libpsl - --without-msh3 - $(use_with nghttp3) - $(use_with nghttp3 ngtcp2) - $(use_with quiche) - $(use_with rtmp librtmp) - --without-schannel - --without-secure-transport - $(use_enable websockets) - --without-winidn - --without-wolfssl - --with-zlib - $(use_with zstd) - ) - - ECONF_SOURCE="${S}" econf "${myconf[@]}" - - if ! multilib_is_native_abi; then - # avoid building the client - sed -i -e '/SUBDIRS/s:src::' Makefile || die - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die - fi - - # Fix up the pkg-config file to be more robust. - # https://github.com/curl/curl/issues/864 - local priv=() libs=() - # We always enable zlib. - libs+=( "-lz" ) - priv+=( "zlib" ) - if use http2; then - libs+=( "-lnghttp2" ) - priv+=( "libnghttp2" ) - fi - if use quiche; then - libs+=( "-lquiche" ) - priv+=( "quiche" ) - fi - if use nghttp3; then - libs+=( "-lnghttp3" "-lngtcp2" ) - priv+=( "libnghttp3" "libngtcp2" ) - fi - if use ssl && use curl_ssl_openssl; then - libs+=( "-lssl" "-lcrypto" ) - priv+=( "openssl" ) - fi - grep -q Requires.private libcurl.pc && die "need to update ebuild" - libs=$(printf '|%s' "${libs[@]}") - sed -i -r \ - -e "/^Libs.private/s:(${libs#|})( |$)::g" \ - libcurl.pc || die - echo "Requires.private: ${priv[*]}" >> libcurl.pc || die -} - -multilib_src_test() { - # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721 - # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches) - # -v: verbose - # -a: keep going on failure (so we see everything which breaks, not just 1st test) - # -k: keep test files after completion - # -am: automake style TAP output - # -p: print logs if test fails - # Note: if needed, we can disable tests. See e.g. Fedora's packaging - # or just read https://github.com/curl/curl/tree/master/tests#run. - multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p" -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete || die - rm -rf "${ED}"/etc/ || die -} diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r2.ebuild index 65942b7021..41b0429d92 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.87.0-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://curl.se/download/${P}.tar.xz LICENSE="curl" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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" IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd" IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls" IUSE+=" nghttp3 quiche" diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/metadata.xml b/sdk_container/src/third_party/portage-stable/net-misc/curl/metadata.xml index e33f2001ba..cdd47f1033 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/metadata.xml @@ -1,9 +1,13 @@ - - blueness@gentoo.org - Anthony G. Basile + + Matt.Jolly@footclan.ninja + Matt Jolly + + + base-system@gentoo.org + Gentoo Base System Enable alt-svc support From 01889e4270e4e660a0f83e680b81cf832dc9ea52 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:21:42 +0000 Subject: [PATCH 25/41] net-misc/iputils: Sync with Gentoo It's from Gentoo commit 591ed0e276efdd24dc383db54157e819807b9a46. --- .../portage-stable/net-misc/iputils/iputils-20221126.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20221126.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20221126.ebuild index a23c56b417..67616acd2a 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20221126.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20221126.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # For released versions, we precompile the man/html pages and store @@ -22,7 +22,7 @@ else https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-docs.tar.xz " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" From 2ee731f6a50999c77535585323b71d734fb4cce9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:21:49 +0000 Subject: [PATCH 26/41] profiles: Sync with Gentoo It's from Gentoo commit d407d986f56e449fd699a403ffa9138463fbe029. --- .../profiles/arch/alpha/package.use.mask | 5 + .../arch/amd64/no-multilib/package.mask | 1 - .../profiles/arch/amd64/package.use.mask | 6 +- .../profiles/arch/amd64/x32/package.mask | 8 +- .../profiles/arch/arm/package.mask | 96 +- .../profiles/arch/arm/package.use.mask | 28 +- .../portage-stable/profiles/arch/arm/use.mask | 7 +- .../profiles/arch/arm64/package.use.mask | 10 +- .../profiles/arch/base/package.use.mask | 6 +- .../profiles/arch/hppa/make.defaults | 4 - .../profiles/arch/hppa/package.use.mask | 2 +- .../profiles/arch/hppa/use.stable.mask | 4 - .../profiles/arch/ia64/package.use.mask | 2 +- .../profiles/arch/m68k/package.use.mask | 5 + .../profiles/arch/powerpc/package.use.mask | 2 +- .../arch/powerpc/ppc64/package.use.mask | 6 +- .../profiles/arch/riscv/package.use.mask | 6 +- .../profiles/arch/s390/package.use.mask | 2 +- .../profiles/arch/sparc/64ul/package.use.mask | 6 +- .../profiles/arch/sparc/package.use.mask | 11 +- .../profiles/arch/x86/package.mask | 94 ++ .../profiles/arch/x86/package.use.mask | 21 +- .../portage-stable/profiles/arch/x86/use.mask | 7 +- .../profiles/arch/x86/use.stable.mask | 4 + .../portage-stable/profiles/base/package.use | 4 - .../profiles/base/package.use.mask | 13 +- .../profiles/base/package.use.stable.mask | 6 + .../portage-stable/profiles/base/use.mask | 7 - .../portage-stable/profiles/categories | 2 - .../profiles/default/linux/packages.build | 1 - .../linux/ppc/17.0/musl/package.use.mask | 7 + .../linux/ppc64/17.0/musl/package.use.mask | 7 +- .../ieee-long-double/package.accept_keywords | 6 +- .../17.0/ieee-long-double/package.mask | 3 +- .../17.0/ieee-long-double/profile.bashrc | 11 - .../linux/ppc64le/17.0/musl/package.use.mask | 7 + .../profiles/desc/ada_target.desc | 3 +- .../profiles/desc/amdgpu_targets.desc | 5 +- .../profiles/features/musl/package.mask | 9 - .../features/prefix/standalone/profile.bashrc | 35 +- .../profiles/features/wd40/package.mask | 3 - .../portage-stable/profiles/license_groups | 4 +- .../profiles/package.deprecated | 8 + .../portage-stable/profiles/package.mask | 1266 ++++++++--------- .../portage-stable/profiles/updates/1Q-2023 | 4 + .../portage-stable/profiles/updates/2Q-2018 | 1 - 46 files changed, 948 insertions(+), 807 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc/17.0/musl/package.use.mask delete mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/17.0/ieee-long-double/profile.bashrc create mode 100644 sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/17.0/musl/package.use.mask 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 d911bcaf7b..e446e594c5 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,11 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Stijn Tintel (2023-02-02) +# Dependency not keyworded +# https://bugs.gentoo.org/show_bug.cgi?id=892389 +net-misc/openvswitch unwind + # matoro (2022-09-22) # Unable to test due to mask, bug #763963 net-misc/openntpd constraints diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.mask index 3c9e9735f3..e0ca879ed2 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/no-multilib/package.mask @@ -31,7 +31,6 @@ app-emulation/crossover-bin app-emulation/protontricks app-emulation/q4wine app-emulation/winetricks -<=app-shells/scsh-0.6.9 dev-embedded/libftd2xx dev-embedded/openocd dev-util/android-ndk 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 b0e7ddb895..7e4569ff15 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # When you add an entry to the top of this file, add your name, the date, and @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Michał Górny (2023-01-24) +# libomptarget is only supported on 64-bit architectures. +>=sys-libs/libomp-16.0.0_pre20230124 -offload + # Sam James (2023-01-05) # asm is only available for amd64 and arm, but for arm, is gated # behind an experimental flag. 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 9ed88dd6ea..dbf52e2554 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/x32/package.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Kai-Chun Ning (2022-05-26) @@ -13,6 +13,8 @@ net-analyzer/gsad # Andrew Ammerlaan (2022-02-13) # Requires qtwebengine sci-electronics/eagle +sci-geosciences/gpsbabel +sci-geosciences/viking # Andrew Ammerlaan (2021-09-09) # Jupyterlab and friends require net-libs/nodejs @@ -98,7 +100,7 @@ kde-apps/parley:5 kde-apps/pim-data-exporter:5 kde-apps/pim-sieve-editor:5 kde-apps/plasma-telepathy-meta:5 ->=kde-misc/kio-gdrive-22.04.3-r1 +kde-misc/kio-gdrive kde-misc/tellico:5 kde-misc/zanshin:5 mail-client/kube @@ -106,7 +108,7 @@ media-gfx/digikam:5 media-gfx/luminance-hdr media-sound/frescobaldi media-sound/teamspeak-client:3 ->=media-video/openshot-2.6.0 +media-video/openshot media-video/vidify media-video/vidify-audiosync net-analyzer/nmapsi diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.mask index 40a2ac1ce0..36ce30e861 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm/package.mask @@ -1,6 +1,100 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andreas Sturmlechner (2023-02-06) +# Successful build of dev-qt/qtwebengine depends on 64-bit host +# Bug #893234 +dev-qt/qtwebengine +dev-qt/qtwebview +dev-python/PyQt6-WebEngine +dev-python/PyQtWebEngine +app-admin/calamares +app-doc/zeal +app-editors/ghostwriter +app-editors/notepadqq +app-editors/retext +app-misc/anki +app-office/kalendar:5 +app-office/kmymoney:5 +app-office/skrooge:5 +app-office/texmaker +app-text/bibletime +app-text/calibre +app-text/cb2bib +app-text/kchmviewer +app-text/sigil +dev-lang/typescript +dev-python/spyder +dev-python/spyder-terminal +dev-python/spyder-unittest +dev-python/spyder-line-profiler +dev-python/spyder-vim +dev-python/spyder-notebook +dev-util/kdevelop:5 +dev-util/kdevelop-php:5 +dev-util/kdevelop-python:5 +gnome-extra/gnome-shell-extension-pop-shell +kde-apps/akonadi-calendar:5 +kde-apps/akonadi-import-wizard:5 +kde-apps/akonadiconsole:5 +kde-apps/akregator:5 +kde-apps/calendarjanitor:5 +kde-apps/calendarsupport:5 +kde-apps/cantor:5 +kde-apps/eventviews:5 +kde-apps/grantlee-editor:5 +kde-apps/incidenceeditor:5 +kde-apps/kaccounts-providers:5 +kde-apps/kaddressbook:5 +kde-apps/kalarm:5 +kde-apps/kalgebra:5 +kde-apps/kdepim-addons:5 +kde-apps/kdepim-meta:5 +kde-apps/kdepim-runtime:5 +kde-apps/kimagemapeditor:5 +kde-apps/kmail:5 +kde-apps/kmail-account-wizard:5 +kde-apps/kmailtransport:5 +kde-apps/knotes:5 +kde-apps/konqueror:5 +kde-apps/konsolekalendar:5 +kde-apps/kontact:5 +kde-apps/korganizer:5 +kde-apps/ktp-accounts-kcm:5 +kde-apps/ktp-text-ui:5 +kde-apps/libksieve:5 +kde-apps/mailcommon:5 +kde-apps/messagelib:5 +kde-apps/mbox-importer:5 +kde-apps/parley:5 +kde-apps/pim-data-exporter:5 +kde-apps/pim-sieve-editor:5 +kde-apps/plasma-telepathy-meta:5 +kde-misc/kio-gdrive +kde-misc/tellico:5 +kde-misc/zanshin:5 +mail-client/kube +media-gfx/digikam:5 +media-gfx/luminance-hdr +media-sound/frescobaldi +media-sound/teamspeak-client:3 +media-video/openshot +media-video/vidify +media-video/vidify-audiosync +net-analyzer/nmapsi +net-libs/signon-ui +net-misc/nextcloud-client +net-p2p/ktorrent:5 +sci-geosciences/qmapshack +>=sci-geosciences/gpsbabel-1.8.0 +sci-mathematics/rkward:5 +sci-visualization/labplot:5 +sys-apps/polychromatic +www-client/falkon +www-client/otter +www-client/qutebrowser +media-video/jellyfin-media-player + # Sam James (2020-06-24) # Valgrind lacks support for < ARMv7 # https://valgrind.org/info/platforms.html 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 a359b831e8..2c653de823 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,25 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andreas Sturmlechner (2023-02-06) +# Successful build of dev-qt/qtwebengine depends on 64-bit host +# Bug #893234 +app-i18n/fcitx-libpinyin dictionary-manager +dev-lang/idris2 test-full +dev-python/cloudscraper test +dev-python/QtPy test +games-util/lgogdownloader gui +kde-apps/kde-apps-meta:5 pim +kde-apps/kdenetwork-meta:5 bittorrent telepathy +kde-apps/kleopatra:5 pim +kde-apps/umbrello:5 php +kde-misc/kio-gdrive share +net-irc/quassel urlpreview +net-misc/fatrat bittorrent +net-misc/seafile-client shibboleth +sci-mathematics/yacas gui +sci-physics/root qt5 + # Florian Schmaus (2022-11-23) # avoid larger deptree, bug #882593 dev-python/bracex doc @@ -126,15 +145,6 @@ games-strategy/0ad nvtt # Cinnamon is not keyworded on this architecture. x11-themes/arc-theme cinnamon -# Sam James (2020-07-11) -# Don't drag in qtwebengine for Plasma right now -# Not going for nuclear option of general mask -# (or dropping keywords) because unclear if it's caused -# by the use of a linux32 chroot. -# See bug #713900 -kde-plasma/libksysguard webengine -kde-plasma/kdeplasma-addons webengine - # Sam James (2020-06-27) # Tests require Valgrind, not available on (2023-02-06) +# Successful build of dev-qt/qtwebengine depends on 64-bit host +# Bug #893234 +webengine + # matoro (2022-09-29) # dev-util/google-perftools is supported here -tcmalloc 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 de330c657d..be323d0530 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask @@ -1,6 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2023-01-27) +# media-libs/shaderc not keyworded here +games-action/supertuxkart vulkan + +# Michał Górny (2023-01-24) +# libomptarget is only supported on 64-bit architectures. +>=sys-libs/libomp-16.0.0_pre20230124 -offload + # Florian Schmaus (2022-11-23) # avoid larger deptree, bug #882593 dev-python/bracex doc 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 fd4c6198dd..576802f39c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask @@ -1,6 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Michał Górny (2023-01-24) +# libomptarget is only supported on 64-bit architectures. +>=sys-libs/libomp-16.0.0_pre20230124 offload + # Sam James (2023-01-05) # asm is only available for amd64 and arm, but for arm, is gated # behind an experimental flag. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/make.defaults index 197fd6f830..9d9c0c818b 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/make.defaults @@ -22,7 +22,3 @@ CHOST_hppa="${CHOST}" # Donnie Berkholz (2006-08-18) # Defaults for video drivers VIDEO_CARDS="fbdev" - -# Hans de Graaff (2023-01-15) -# Temporary mask for https://bugs.gentoo.org/890915 -RUBY_TARGETS="ruby27" 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 6e1b69e6e3..073c161ed5 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # NOTE: When masking a USE flag due to missing keywords, please file a keyword diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask index 93c97503dd..cc3e1b11d8 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.stable.mask @@ -4,10 +4,6 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask -# Hans de Graaff (2023-01-15) -# Temporary mask for https://bugs.gentoo.org/890915 -ruby_targets_ruby30 - # Rolf Eike Beer (2021-11-12) # dev-libs/nspr and dev-libs/nss are not stable on hppa nss 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 cc8cf039c8..78e6aa7442 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,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Sam James (2022-12-26) 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 98c973ac29..0fac36b10e 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/m68k/package.use.mask @@ -1,6 +1,11 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Stijn Tintel (2023-02-02) +# Dependency not keyworded +# https://bugs.gentoo.org/show_bug.cgi?id=892389 +net-misc/openvswitch unwind + # Andreas K. Hüttel (2022-05-29) # No TMP here, no xkb here sys-apps/systemd tpm xkb 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 d83ff7d53b..eb5b15c442 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,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Sam James (2022-11-19) 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 ef0c262fbb..37ba660a00 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.mask @@ -1,6 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Michał Górny (2023-01-24) +# libomptarget is only supported on 64-bit architectures. +>=sys-libs/libomp-16.0.0_pre20230124 -offload + # Sam James (2022-10-13) # Causes segfaults, bug #871921 sci-libs/symengine tcmalloc 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 1071becd31..3608bef132 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 +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2023-01-27) +# media-libs/shaderc not keyworded here +games-action/supertuxkart vulkan + # Mike Rivnak (2022-11-30) # luajit is currently not supported on riscv app-editors/neovim lua_single_target_luajit diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask index 53c1348f82..953f2e3d45 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Florian Schmaus (2022-11-23) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/64ul/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/64ul/package.use.mask index c19643d0ff..9192b0dc79 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/64ul/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/64ul/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Sam James (2021-03-20) @@ -6,10 +6,6 @@ # in for grep -P. Debian completely disable it too. dev-libs/libpcre jit -# Matt Turner (2019-08-26) -# jit not supported on sparc64 -dev-libs/libpcre2 jit - # Anna Vyalkova (2022-03-13) # depends on dev-lisp/sbcl dev-lisp/alexandria doc 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 efba7e14ae..525793fbb2 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/sparc/package.use.mask @@ -1,6 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Stijn Tintel (2023-02-02) +# Dependency not keyworded +# https://bugs.gentoo.org/show_bug.cgi?id=892389 +net-misc/openvswitch unwind + +# Sam James (2023-01-31) +# jit not supported on sparc32 or sparc64 +dev-libs/libpcre2 jit + # Sam James (2022-12-26) # Unkeyworded dependencies dev-util/diffoscope opendocument pascal pdf R 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 9e960f3c60..dc1d37b816 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.mask @@ -1,6 +1,100 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andreas Sturmlechner (2023-02-06) +# Successful build of dev-qt/qtwebengine depends on 64-bit host +# Bug #893234 +dev-qt/qtwebengine +dev-qt/qtwebview +dev-python/PyQt6-WebEngine +dev-python/PyQtWebEngine +app-admin/calamares +app-doc/zeal +app-editors/ghostwriter +app-editors/notepadqq +app-editors/retext +app-misc/anki +app-office/kalendar:5 +app-office/kmymoney:5 +app-office/skrooge:5 +app-office/texmaker +app-text/bibletime +app-text/calibre +app-text/cb2bib +app-text/kchmviewer +app-text/sigil +dev-lang/typescript +dev-python/spyder +dev-python/spyder-terminal +dev-python/spyder-unittest +dev-python/spyder-line-profiler +dev-python/spyder-vim +dev-python/spyder-notebook +dev-util/kdevelop:5 +dev-util/kdevelop-php:5 +dev-util/kdevelop-python:5 +gnome-extra/gnome-shell-extension-pop-shell +kde-apps/akonadi-calendar:5 +kde-apps/akonadi-import-wizard:5 +kde-apps/akonadiconsole:5 +kde-apps/akregator:5 +kde-apps/calendarjanitor:5 +kde-apps/calendarsupport:5 +kde-apps/cantor:5 +kde-apps/eventviews:5 +kde-apps/grantlee-editor:5 +kde-apps/incidenceeditor:5 +kde-apps/kaccounts-providers:5 +kde-apps/kaddressbook:5 +kde-apps/kalarm:5 +kde-apps/kalgebra:5 +kde-apps/kdepim-addons:5 +kde-apps/kdepim-meta:5 +kde-apps/kdepim-runtime:5 +kde-apps/kimagemapeditor:5 +kde-apps/kmail:5 +kde-apps/kmail-account-wizard:5 +kde-apps/kmailtransport:5 +kde-apps/knotes:5 +kde-apps/konqueror:5 +kde-apps/konsolekalendar:5 +kde-apps/kontact:5 +kde-apps/korganizer:5 +kde-apps/ktp-accounts-kcm:5 +kde-apps/ktp-text-ui:5 +kde-apps/libksieve:5 +kde-apps/mailcommon:5 +kde-apps/messagelib:5 +kde-apps/mbox-importer:5 +kde-apps/parley:5 +kde-apps/pim-data-exporter:5 +kde-apps/pim-sieve-editor:5 +kde-apps/plasma-telepathy-meta:5 +kde-misc/kio-gdrive +kde-misc/tellico:5 +kde-misc/zanshin:5 +mail-client/kube +media-gfx/digikam:5 +media-gfx/luminance-hdr +media-sound/frescobaldi +media-sound/teamspeak-client:3 +media-video/openshot +media-video/vidify +media-video/vidify-audiosync +net-analyzer/nmapsi +net-libs/signon-ui +net-misc/nextcloud-client +net-p2p/ktorrent:5 +sci-geosciences/qmapshack +>=sci-geosciences/gpsbabel-1.8.0 +sci-mathematics/rkward:5 +sci-visualization/labplot:5 +sys-apps/polychromatic +www-client/falkon +www-client/otter +www-client/qutebrowser +media-video/jellyfin-media-player + # Viorel Munteanu (2022-12-22) # The x86 build is broken and no longer available. Bug #887831 # Removal on 2023-01-22. 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 e5b25a5c0b..610fbd0c2b 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,25 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andreas Sturmlechner (2023-02-06) +# Successful build of dev-qt/qtwebengine depends on 64-bit host +# Bug #893234 +app-i18n/fcitx-libpinyin dictionary-manager +dev-lang/idris2 test-full +dev-python/cloudscraper test +dev-python/QtPy test +games-util/lgogdownloader gui +kde-apps/kde-apps-meta:5 pim +kde-apps/kdenetwork-meta:5 bittorrent telepathy +kde-apps/kleopatra:5 pim +kde-apps/umbrello:5 php +kde-misc/kio-gdrive share +net-irc/quassel urlpreview +net-misc/fatrat bittorrent +net-misc/seafile-client shibboleth +sci-mathematics/yacas gui +sci-physics/root qt5 + # Michael Orlitzky (2022-12-23) # sci-libs/lrslib is keyworded ~x86, but probably shouldn't have been: # 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 9a57752b6a..b06aa1c535 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.mask @@ -1,9 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Unmask the flag which corresponds to ARCH. -x86 +# Andreas Sturmlechner (2023-02-06) +# Successful build of dev-qt/qtwebengine depends on 64-bit host +# Bug #893234 +webengine + # matoro (2022-09-29) # dev-util/google-perftools is supported here -tcmalloc diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask index 29e2b97d38..5b5cab87da 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Alfredo Tupone (2023-2-2) +# sys-devel/gcc:12 is not stable yet on x86 +ada_target_gcc_12 + # Sam James (2020-11-10) # media-gfx/openvdb is not stable on x86 # ... and has failing tests right now anyway diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use b/sdk_container/src/third_party/portage-stable/profiles/base/package.use index b56f43c470..7bf7829580 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use @@ -5,10 +5,6 @@ # Default to lua 5.4 (upstream requires 5.2 or higher) >=app-editors/vis-0.7-r1 lua_single_target_lua5-4 -# Andreas Sturmlechner (2022-06-14) -# Only python 3.9 supported, bug #835921 -=sys-cluster/ceph-17.2.0 lua_single_target_lua5-4 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 eae9c78511..c3f8b6eb7b 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,12 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Bernd Waibel (2023-01-28) +# Has some issues building and needs some love first. +# Bug #891829 +# https://github.com/gentoo/gentoo/pull/29236#issuecomment-1407373536 +sci-libs/vtk debug + # Michał Górny (2023-01-21) # media-libs/libextractor is masked for removal. media-plugins/vdr-xineliboutput libextractor @@ -379,7 +385,6 @@ www-servers/apache apache2_modules_lua dev-php/PEAR-Text_Wiki_Mediawiki test dev-php/PHP_CodeSniffer test dev-php/php-redmine-api test -dev-php/phptal test dev-php/recaptcha test dev-php/symfony-config test dev-php/symfony-event-dispatcher test @@ -476,12 +481,6 @@ dev-util/meson test # Ada support is not yet ready for sys-devel/gcc sys-devel/gcc ada -# Michał Górny (2020-03-28) -# Requires masked dev-vcs/bzr. Remove the mask if breezy is packaged -# and the package is confirmed to work with it. -<=dev-util/rosinstall-0.7.8 test -<=dev-util/wstool-0.1.18 test - # Guilherme Amadio (2020-03-16) # Requires dev-libs/cudnn which is only available on amd64 sci-physics/root cudnn 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 6045032710..20cf4761af 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 @@ -4,6 +4,12 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in package.use.mask +# Arsen Arsenović (2023-01-27) +# Pulls in large amounts of unstable dependencies, blocking +# stabilization of other packages. +# Bug #891965. +sys-block/nbdkit libguestfs + # Andreas Sturmlechner (2022-12-24) # dev-util/hip and its rocm dependencies not stable yet sci-physics/lammps hip 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..386046f5ef 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 @@ -31,13 +31,6 @@ pch # Please upgrade to a newer slot php_targets_php7-2 -# Alexis Ballier (2020-10-13) -# Nothing depends on those ROS messages. dev-ros/geneus -# is half broken in our setup where it looks for packages -# on the filesystem and causes build failures. -# See e.g. bug #741076 -ros_messages_eus - # Matt Turner (2019-09-01) # app-office/texmacs is package.mask'd. Bug #436400 texmacs diff --git a/sdk_container/src/third_party/portage-stable/profiles/categories b/sdk_container/src/third_party/portage-stable/profiles/categories index 64963f1467..18601c58f9 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/categories +++ b/sdk_container/src/third_party/portage-stable/profiles/categories @@ -49,7 +49,6 @@ dev-perl dev-php dev-python dev-qt -dev-ros dev-ruby dev-scheme dev-tcltk @@ -123,7 +122,6 @@ net-voip net-vpn net-wireless perl-core -ros-meta sci-astronomy sci-biology sci-calculators diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/packages.build b/sdk_container/src/third_party/portage-stable/profiles/default/linux/packages.build index 687daa689c..7515c782bc 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/packages.build +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/packages.build @@ -40,4 +40,3 @@ virtual/editor virtual/libc virtual/os-headers virtual/pkgconfig -sys-apps/which diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc/17.0/musl/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc/17.0/musl/package.use.mask new file mode 100644 index 0000000000..80fbaf3654 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc/17.0/musl/package.use.mask @@ -0,0 +1,7 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Sam James (2023-01-29) +# Fails to build on combination of ppc* + musl because of mcontext. +# libsanitizer needs adapting, bug #892079. +sys-devel/gcc sanitize diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64/17.0/musl/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64/17.0/musl/package.use.mask index 48ea7e4593..d3d557acae 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64/17.0/musl/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64/17.0/musl/package.use.mask @@ -1,6 +1,11 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2023-01-29) +# Fails to build on combination of ppc* + musl because of mcontext. +# libsanitizer needs adapting, bug #892079. +sys-devel/gcc sanitize + # Georgy Yakovlev (2020-02-18) # perlasm assumes elfv1 abi on big endian # mask until merged and released diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.accept_keywords b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.accept_keywords index 490d12daa4..26021bb8ff 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.accept_keywords +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.accept_keywords @@ -1,6 +1,6 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Georgy Yakovlev (2022-12-04) -# only gcc-12 provides ieee-long-double, which is not stable yet. -=sys-devel/gcc-12* ~ppc64 +# only contains critical ieee-long-double patches. +=sys-libs/glibc-2.36-r7 ~ppc64 diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.mask index 02742c7c8a..f730c94e92 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/17.0/ieee-long-double/package.mask @@ -1,7 +1,8 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Georgy Yakovlev (2022-12-04) # We only need versions that support ieee-long-double. =sys-devel/gcc-12[ieee-long-double] OR >=sys-devel/clang-15.0.5[ieee-long-double]" - fi - fi -fi diff --git a/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/17.0/musl/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/17.0/musl/package.use.mask new file mode 100644 index 0000000000..80fbaf3654 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/profiles/default/linux/ppc64le/17.0/musl/package.use.mask @@ -0,0 +1,7 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Sam James (2023-01-29) +# Fails to build on combination of ppc* + musl because of mcontext. +# libsanitizer needs adapting, bug #892079. +sys-devel/gcc sanitize diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/ada_target.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/ada_target.desc index a02d28dcd8..5df7974f37 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/desc/ada_target.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/desc/ada_target.desc @@ -1,5 +1,6 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 gnat_2021 - Compile with dev-lang/gnat-gpl-2021 +gcc_12 - Compile with sys-devel/gcc:12 gcc_12_2_0 - Compile with sys-devel/gcc-12.2.0 diff --git a/sdk_container/src/third_party/portage-stable/profiles/desc/amdgpu_targets.desc b/sdk_container/src/third_party/portage-stable/profiles/desc/amdgpu_targets.desc index 66a9a7a859..9c5739e9d9 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/desc/amdgpu_targets.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/desc/amdgpu_targets.desc @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors. +# Copyright 1999-2023 Gentoo Authors. # Distributed under the terms of the GNU General Public License v2 # Reference: @@ -15,3 +15,6 @@ gfx1011 - RDNA GPU, codename navi12, including Radeon Pro 5600M/V520 gfx1012 - RDNA GPU, codename navi14, including Radeon RX 5500XT/5500/5500M/5500XTB/5300/5300M, Radeon Pro 5500XT/5500M/5300/5300M, Radeon Pro W5500X/W5500/W5500M/W5300M gfx1030 - RDNA2 GPU, codename navi21/sienna cichlid, including Radeon RX 6950XT/6900XT/6800XT/6800, Radeon Pro W6800 gfx1031 - RDNA2 GPU, codename navi22/navy flounder, including Radeon RX 6750XT/6700XT/6800M/6700M +gfx1100 - RDNA3 GPU, codename navi31/plum bonito, including Radeon RX 7900XTX/7900XT +gfx1101 - RDNA3 GPU, codename navi32 +gfx1102 - RDNA3 GPU, codename navi33 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 1da0c19018..f1198e1f99 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 @@ -27,15 +27,6 @@ dev-libs/intel-compute-runtime # These packages depend on dev-lisp/sbcl unconditionally app-emacs/sly dev-lisp/alexandria -dev-ros/roslisp -ros-meta/desktop -ros-meta/desktop_full -ros-meta/perception -ros-meta/robot -ros-meta/ros_core -ros-meta/ros_base -ros-meta/simulators -ros-meta/viz x11-wm/stumpwm x11-wm/stumpwm-contrib diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/profile.bashrc b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/profile.bashrc index fd95e43f7f..d46933210d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/profile.bashrc +++ b/sdk_container/src/third_party/portage-stable/profiles/features/prefix/standalone/profile.bashrc @@ -1,5 +1,5 @@ # -*- mode: shell-script; -*- -# Copyright 2018-2021 Gentoo Authors +# Copyright 2018-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # RAP specific patches pending upstream: @@ -9,38 +9,7 @@ # Disable RAP trick during bootstrap stage2 [[ -z ${BOOTSTRAP_RAP_STAGE2} ]] || return 0 -if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; then - cd "${S}" - einfo "Prefixifying dynamic linkers..." - for h in gcc/config/*/*linux*.h; do - ebegin " Updating $h" - if [[ "${h}" == gcc/config/rs6000/linux*.h ]]; then - sed -i -r "s,(DYNAMIC_LINKER_PREFIX\s+)\"\",\1\"${EPREFIX}\",g" $h - else - sed -i -r "/_DYNAMIC_LINKER/s,([\":])(/lib),\1${EPREFIX}\2,g" $h - fi - eend $? - done - - # use sysroot of toolchain to get correct include and library at compile time - EXTRA_ECONF="${EXTRA_ECONF} --with-sysroot=${EPREFIX}" - - ebegin "remove --sysroot call on ld for native toolchain" - sed -i 's/--sysroot=%R//' gcc/gcc.c* - eend $? -elif [[ ${CATEGORY}/${PN} == sys-devel/clang && ${EBUILD_PHASE} == configure ]]; then - ebegin "Use ${EPREFIX} as default sysroot" - sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" "${S}"/CMakeLists.txt - eend $? - pushd "${S}/lib/Driver/ToolChains" >/dev/null - ebegin "Use dynamic linker from ${EPREFIX}" - sed -i -e "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX%/}/\"@" Linux.cpp - eend $? - ebegin "Remove --sysroot call on ld for native toolchain" - sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp - eend $? - popd >/dev/null -elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then +if [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then ebegin "Prefixifying native library path" sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \ "${S}"/ld/configure.tgt 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 dd5994ae17..6ad4715ed9 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 @@ -67,7 +67,6 @@ dev-python/trio dev-python/twine dev-python/watchfiles dev-python/wcmatch -dev-ros/roswtf dev-util/buildbot-worker dev-util/cargo-c dev-util/cbindgen @@ -85,7 +84,6 @@ gnome-extra/gnome-browser-connector gnome-extra/gnome-tweaks gnome-extra/sushi >=media-gfx/libimagequant-4 -media-libs/libavif >=media-libs/libopenraw-0.3.2 media-video/rav1e net-im/gajim @@ -95,7 +93,6 @@ net-misc/electrum-ltc net-misc/gsutil net-news/newsboat net-p2p/deluge -ros-meta/ros_comm sci-geosciences/gnome-maps >=sys-apps/bat-0.18.1 sys-fs/bcachefs-tools 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 3864349505..dc1aa07eb7 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/license_groups +++ b/sdk_container/src/third_party/portage-stable/profiles/license_groups @@ -18,12 +18,12 @@ GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD ECL-2.0 FSFAP FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-2+-with-openssl-exception GPL-2-with-classpath-exception GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-2+-with-Pyinstaller-Bootloader-exception GPL-3 GPL-3+ GPL-3+-with-autoconf-exception GPL-3+-with-font-exception GPL-3-with-font-exception GPL-3-with-openssl-exception HPND IJG ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception-1.1 OPENLDAP PSF-2 PSF-2.2 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat tanuki-community Transmission-OpenSSL-exception unicode Unlicense UoI-NCSA UPX-exception vim W3C WTFPL-2 wxWinLL-3.1 ZLIB ZPL # Free software licenses approved by the FSF -FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 BSD-4 CDDL CeCILL-B CeCILL-C CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 FraunhoferFDK gnuplot IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL-1.0 Zend-2.0 +FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 BSD-4 CDDL CeCILL-B CeCILL-C CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 FraunhoferFDK gnuplot IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL Ms-RL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL-1.0 Zend-2.0 # Licenses approved by the Open Source Initiative # https://www.opensource.org/licenses # Note that the FSF lists these as nonfree: Artistic NOSA Watcom-1.0 -OSI-APPROVED 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MirOS MIT MIT-0 MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL-1.0 Sleepycat Unicode-DFS-2016 UoI-NCSA W3C Watcom-1.0 wxWinLL-3 ZLIB ZPL +OSI-APPROVED 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MirOS MIT MIT-0 MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL Ms-RL nethack NOSA OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL-1.0 Sleepycat Unicode-DFS-2016 UoI-NCSA W3C Watcom-1.0 wxWinLL-3 ZLIB ZPL # Misc licenses that are probably free software, i.e. follow the # Free Software Definition at https://www.gnu.org/philosophy/free-sw.html 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 26bcae9746..06ccb462c8 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,14 @@ #--- END OF EXAMPLES --- +# Michał Górny (2023-01-30) +# The package is on keep-alive by Debian. Nevertheless, they can't +# keep up with changes in dev-python/setuptools, and they do not accept +# bug reports. PEP517 build systems are simply a no-go for this class +# of packages (partially due to the limitations of wheel format), meson +# and autotools are both much better choices. +dev-python/python-distutils-extra + # Michał Górny (2023-01-18) # Renamed to dev-python/pyproject-hooks (with upstream module name change). dev-python/pep517 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 2630b81a20..eeee93ac2c 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/package.mask @@ -33,6 +33,591 @@ #--- END OF EXAMPLES --- +# Volkmar W. Pogatzki (2023-02-07) +# Unused Java libraries. Removal on 2023-03-08. +# jspeex had last upstream activities in 2005. +dev-java/jspeex +dev-java/osgi-annotation-versioning +dev-java/commons-text + +# Michał Górny (2023-02-05) +# dev-python/python-box has broken build system that prevents us from +# bumping it. Its only used by dev-python/tavern that is last rited, +# and dev-python/tavalidate that no longer has any revdeps. +# Removal on 2023-03-07. +dev-python/python-box +dev-python/tavalidate + +# Arthur Zamarin (2023-02-04) +# pytest plugin, which breaks a lot of python_test of other ebuilds +# if installed unless disabled. The package itself is hard to +# maintain. No reverse dependencies. +# Removal: 2023-03-06. Bug #893212. +dev-python/tavern + +# Michał Górny (2023-02-03) +# Uses unmaintained dev-python/future. No reverse dependencies. +# Removal on 2023-03-05. Bug #888283. +dev-python/textX + +# Michał Górny (2023-02-03) +# Hacky build system that does not work via PEP517 build backend. +# No reverse dependencies. +# Removal on 2023-03-05. Bug #890321. +dev-python/pyFFTW + +# Michał Górny (2023-02-03) +# Dead upstream, no active maintainer, no reverse dependencies. +# Removal on 2023-03-05. Bug #892916. +x11-themes/echo-icon-theme + +# Michał Górny (2023-02-03) +# Dead upstream, no active maintainer, no reverse dependencies, +# build issues. +# Removal on 2023-03-05. Bug #892918. +x11-themes/gtk-engines-nodoka + +# Michał Górny (2023-02-03) +# The package has been archived upstream. It is broken with all Python +# versions supported by Gentoo, and it is broken with django-2. +# The other listed packages are its reverse dependencies. +# Removal on 2023-03-05. Bug #718972. +app-misc/gcalcli +app-misc/goobook +dev-python/gcs-oauth2-boto-plugin +dev-python/google-apitools +dev-python/google-reauth-python +dev-python/oauth2client +net-misc/gsutil + +# Michał Górny (2023-02-02) +# dev-python/citeproc-py requires dev-python/nose and is not maintained +# upstream. Its only revdep, dev-python/duecredit has no reverse +# dependencies left. +# Removal on 2023-03-04. Bug #888239. +dev-python/citeproc-py +dev-python/duecredit + +# Michał Górny (2023-02-01) +# dev-python/blockdiag still requires dev-python/nose. There was a PR +# made to switch to pytest in Feb 2020 but it's not progressing at all. +# It was needed only for dev-python/aiohttp[doc]. +# Removal on 2023-03-03. Bug #888233. +dev-python/blockdiag +dev-python/sphinxcontrib-blockdiag + +# Michał Górny (2023-02-01) +# Requires legacy setuptools backend. Hacky build system. The only +# revdep is dev-python/rdflib where it is entirely optional. +# Removal on 2023-03-03. Bug #892854. +dev-python/berkeleydb + +# Andreas Sturmlechner (2023-02-01) +# >=5.1 series uses vanilla llvm/clang instead of forked versions. +# Removal on 2023-03-02 +sys-devel/llvm-roc +dev-util/rocm-clang-ocl + +# Michał Górny (2023-01-31) +# No tests, no activity since Aug 2020, no reverse dependencies. +# Removal on 2023-03-02. Bug #892744. +dev-python/alagitpull + +# Michał Górny (2023-01-31) +# The test suite is broken (async tests don't run). No revdeps. +# Removal on 2023-03-02. Bug #892742. +dev-python/aiohttp-jinja2 + +# Ben Kohler (2023-01-30) +# Breaks too many revdeps for now +=app-text/discount-3* + +# Sam James (2023-01-29) +# Commands trigger an assertion and crashes, bug #892487 +=sys-fs/lvm2-2.03.18 + +# Bernd Waibel (2023-01-28) +# Possible security issues, obsolete. Use OpenEXR-3 / Imath instead. +# No revdeps and consumers left in ::gentoo +# Removal in 30 days. Bug #892375 +media-libs/ilmbase + +# Hans de Graaff (2023-01-28) +# No upstream releases since 2010. No longer maintained +# upstream. ruby27-only package. Masked for removal on 2023-02-27. +dev-ruby/ruby_gntp + +# Mike Gilbert (2023-01-28) +# No upstream releases since 2008. +# No Gentoo maintainer since 2009. +# Installs files in the wrong places (bug #455542) +# and with the wrong mode (bug #892325). +# Removal on 2023-02-27. +app-admin/bastille + +# Ionen Wolkens (2023-01-28) +# Recently broke at runtime, and its relationship with evolving +# swig+python is likely to keep breaking this further without an +# active upstream (no activty since 2018) to keep up with changes. +# Removal: 2023-02-27. Bug #892323 +games-rpg/adonthell +games-rpg/wastesedge + +# Florian Schmaus (2023-01-27) +# Previous dependencies of dev-lang/clojure, now part of the clojure +# ebuild and no longer needed. +# Removal on 2023-02-27. +dev-java/core-specs-alpha +dev-java/spec-alpha + +# Michał Górny (2023-01-26) +# Unmaintained. Last release in 2003. The package fails to install +# since Aug 2021 and while a fix would be trivial, there does not seem +# to have been any interest in it during that period. +# Removal on 2023-02-25. Bug #806384. +www-misc/wsmake + +# Marek Szuba (2023-01-26) +# Upstream keeps the module files unversioned so it is only the use of +# mirroring that has prevented us from seeing regular hash mismatches +# - and it is not clear for many of the modules whether we are allowed +# to mirror them or not. A convoluted and fragile process has been +# required to detect new modules and versions, and the request for a +# Repology-friendly upstream endpoint appears to have stalled. +# Please switch to managing SWORD modules on a per-user basis, using +# tools bundled with app-text/sword (see e.g. +# https://wiki.crosswire.org/SWORD_Module_Source_Discovery_and_Module_Updating) +# or appropriate functionality in GUI front-end software. +# Removal on 2023-02-26. Bug #892069. +app-dicts/sword-2BabDict +app-dicts/sword-AB +app-dicts/sword-Abbott +app-dicts/sword-AbbottSmith +app-dicts/sword-AbbottSmithStrongs +app-dicts/sword-ABP +app-dicts/sword-ABPGRK +app-dicts/sword-ABS_Essay_GoodSam_SWB +app-dicts/sword-ACV +app-dicts/sword-Afr1953 +app-dicts/sword-AKJV +app-dicts/sword-Alb +app-dicts/sword-Aleppo +app-dicts/sword-alzat +app-dicts/sword-AmTract +app-dicts/sword-Anderson +app-dicts/sword-Antoniades +app-dicts/sword-AraNAV +app-dicts/sword-AraSVD +app-dicts/sword-ArmEastern +app-dicts/sword-ArmWestern +app-dicts/sword-ASV +app-dicts/sword-Azeri +app-dicts/sword-BaptistConfession1646 +app-dicts/sword-BaptistConfession1689 +app-dicts/sword-Barnes +app-dicts/sword-BasHautin +app-dicts/sword-BBE +app-dicts/sword-BDBGlosses_Strongs +app-dicts/sword-BeaMRK +app-dicts/sword-Bela +app-dicts/sword-br_en +app-dicts/sword-BretonNT +app-dicts/sword-BulCarigradNT +app-dicts/sword-BulVeren +app-dicts/sword-BurCBCM +app-dicts/sword-BurJudson +app-dicts/sword-Burkitt +app-dicts/sword-BWE +app-dicts/sword-Byz +app-dicts/sword-Calo +app-dicts/sword-Catena +app-dicts/sword-Cawdrey +app-dicts/sword-CBC +app-dicts/sword-CebPinadayag +app-dicts/sword-Chamorro +app-dicts/sword-Che1860 +app-dicts/sword-ChiNCVs +app-dicts/sword-ChiNCVt +app-dicts/sword-ChiSB +app-dicts/sword-ChiUn +app-dicts/sword-ChiUnL +app-dicts/sword-ChiUns +app-dicts/sword-Clarke +app-dicts/sword-Common +app-dicts/sword-Concord +app-dicts/sword-CopNT +app-dicts/sword-CopSahBible2 +app-dicts/sword-CopSahHorner +app-dicts/sword-CopSahidica +app-dicts/sword-CopSahidicMSS +app-dicts/sword-CPDV +app-dicts/sword-CroSaric +app-dicts/sword-CSlElizabeth +app-dicts/sword-CzeB21 +app-dicts/sword-CzeBKR +app-dicts/sword-CzeCEP +app-dicts/sword-CzeCSP +app-dicts/sword-Daily +app-dicts/sword-DaNT1819 +app-dicts/sword-DaOT1871NT1907 +app-dicts/sword-DaOT1931NT1907 +app-dicts/sword-Darby +app-dicts/sword-Dari +app-dicts/sword-DarkNightOfTheSoul +app-dicts/sword-DBD +app-dicts/sword-Diaglott +app-dicts/sword-Dodson +app-dicts/sword-DRC +app-dicts/sword-DTN +app-dicts/sword-DutKant +app-dicts/sword-DutKingComm +app-dicts/sword-DutSVV +app-dicts/sword-DutSVVA +app-dicts/sword-Easton +app-dicts/sword-Elzevir +app-dicts/sword-EMBReality +app-dicts/sword-EMTV +app-dicts/sword-en_eu +app-dicts/sword-Esperanto +app-dicts/sword-Est +app-dicts/sword-Etheridge +app-dicts/sword-Eusebian_num +app-dicts/sword-Eusebian_vs +app-dicts/sword-f35 +app-dicts/sword-Family +app-dicts/sword-FarHezareNoh +app-dicts/sword-FarOPV +app-dicts/sword-FarTPV +app-dicts/sword-FinBiblia +app-dicts/sword-Finney +app-dicts/sword-FinPR +app-dicts/sword-FinPR92 +app-dicts/sword-FinRK +app-dicts/sword-FinSTLK2017 +app-dicts/sword-FreAug +app-dicts/sword-FreBailly +app-dicts/sword-FreBBB +app-dicts/sword-FreBDM1707 +app-dicts/sword-FreBDM1744 +app-dicts/sword-FreChry +app-dicts/sword-FreCJE +app-dicts/sword-FreCrampon +app-dicts/sword-FreDAW +app-dicts/sword-FreGBM +app-dicts/sword-FreGeneve1669 +app-dicts/sword-FreJND +app-dicts/sword-FreKhan +app-dicts/sword-FreLSN1872 +app-dicts/sword-FreLXX +app-dicts/sword-FreOltramare1874 +app-dicts/sword-FrePGR +app-dicts/sword-FrePilgrim +app-dicts/sword-FreSegond1910 +app-dicts/sword-FreStapfer1889 +app-dicts/sword-FreSynodale1921 +app-dicts/sword-FVDPVietAnh +app-dicts/sword-Geez +app-dicts/sword-Geneva +app-dicts/sword-Geneva1599 +app-dicts/sword-GerAlbrecht +app-dicts/sword-GerAugustinus +app-dicts/sword-GerBoLut +app-dicts/sword-GerElb1871 +app-dicts/sword-GerElb1905 +app-dicts/sword-GerGruenewald +app-dicts/sword-GerHfa2002 +app-dicts/sword-GerHfaLex2002 +app-dicts/sword-GerKingComm +app-dicts/sword-GerLeoNA28 +app-dicts/sword-GerLeoRP18 +app-dicts/sword-GerLutherpredigten +app-dicts/sword-GerMenge +app-dicts/sword-GerNeUe +app-dicts/sword-GerOffBiSt +app-dicts/sword-GerReinhardt +app-dicts/sword-GerSch +app-dicts/sword-GerTafel +app-dicts/sword-GerTextbibel +app-dicts/sword-GerZurcher +app-dicts/sword-Godbey +app-dicts/sword-GodsWord +app-dicts/sword-GreekHebrew +app-dicts/sword-GreVamvas +app-dicts/sword-Haitian +app-dicts/sword-HebDelitzsch +app-dicts/sword-HebModern +app-dicts/sword-HebrewGreek +app-dicts/sword-Heretics +app-dicts/sword-HinERV +app-dicts/sword-Hitchcock +app-dicts/sword-HunIMIT +app-dicts/sword-HunKar +app-dicts/sword-HunKNB +app-dicts/sword-HunRUF +app-dicts/sword-HunUj +app-dicts/sword-Imitation +app-dicts/sword-Institutes +app-dicts/sword-IriODomhnuill +app-dicts/sword-ISBE +app-dicts/sword-ISV +app-dicts/sword-ItaDio +app-dicts/sword-ItaRive +app-dicts/sword-ItDizGreco +app-dicts/sword-ItNomiBibbia +app-dicts/sword-JapBungo +app-dicts/sword-JapDenmo +app-dicts/sword-JapKougo +app-dicts/sword-JapMeiji +app-dicts/sword-JapRaguet +app-dicts/sword-JCRHoliness +app-dicts/sword-JEAffections +app-dicts/sword-JESermons +app-dicts/sword-JFB +app-dicts/sword-JOChrist +app-dicts/sword-JOCommGod +app-dicts/sword-JOGlory +app-dicts/sword-JOMortSin +app-dicts/sword-Josephus +app-dicts/sword-JPS +app-dicts/sword-JST +app-dicts/sword-Jubilee2000 +app-dicts/sword-Kapingamarangi +app-dicts/sword-Kaz +app-dicts/sword-KD +app-dicts/sword-Kekchi +app-dicts/sword-KhmerNT +app-dicts/sword-KingComm +app-dicts/sword-KJV +app-dicts/sword-KJVA +app-dicts/sword-KJVPCE +app-dicts/sword-KLV +app-dicts/sword-KLVen_iklingon +app-dicts/sword-KLViklingon_en +app-dicts/sword-KorHKJV +app-dicts/sword-KorRV +app-dicts/sword-KtuVB +app-dicts/sword-la_en +app-dicts/sword-Latvian +app-dicts/sword-LawGospel +app-dicts/sword-LEB +app-dicts/sword-Leeser +app-dicts/sword-Lightfoot +app-dicts/sword-LinVB +app-dicts/sword-LITV +app-dicts/sword-LO +app-dicts/sword-LtKBB +app-dicts/sword-Luther +app-dicts/sword-LvGluck8 +app-dicts/sword-LXX +app-dicts/sword-MAK +app-dicts/sword-Mal1910 +app-dicts/sword-ManxGaelic +app-dicts/sword-Maori +app-dicts/sword-MapM +app-dicts/sword-Mg1865 +app-dicts/sword-MHC +app-dicts/sword-MHCC +app-dicts/sword-MKJV +app-dicts/sword-MLStrong +app-dicts/sword-MollColossians +app-dicts/sword-MonKJV +app-dicts/sword-Montgomery +app-dicts/sword-MorphGNT +app-dicts/sword-Murdock +app-dicts/sword-Nave +app-dicts/sword-Ndebele +app-dicts/sword-Nestle1904 +app-dicts/sword-NETfree +app-dicts/sword-NETnotesfree +app-dicts/sword-NETtext +app-dicts/sword-NHEB +app-dicts/sword-NHEBJE +app-dicts/sword-NHEBME +app-dicts/sword-NlCanisius1939 +app-dicts/sword-NorBroed +app-dicts/sword-Norsk +app-dicts/sword-NorSMB +app-dicts/sword-NorthernAzeri +app-dicts/sword-Noyes +app-dicts/sword-OEB +app-dicts/sword-OEBcth +app-dicts/sword-OrthJBC +app-dicts/sword-Orthodoxy +app-dicts/sword-OSHB +app-dicts/sword-OSHM +app-dicts/sword-OxfordTR +app-dicts/sword-Packard +app-dicts/sword-Passion +app-dicts/sword-Personal +app-dicts/sword-Peshitta +app-dicts/sword-Phaistos +app-dicts/sword-Pilgrim +app-dicts/sword-PNT +app-dicts/sword-PohnOld +app-dicts/sword-Pohnpeian +app-dicts/sword-PolGdanska +app-dicts/sword-PolUGdanska +app-dicts/sword-PorAlmeida1911 +app-dicts/sword-PorAR +app-dicts/sword-PorBLivre +app-dicts/sword-PorBLivreTR +app-dicts/sword-PorCap +app-dicts/sword-PorIBP +app-dicts/sword-PotLykins +app-dicts/sword-Practice +app-dicts/sword-QuotingPassages +app-dicts/sword-RecVer +app-dicts/sword-Rieger +app-dicts/sword-RKJNT +app-dicts/sword-RNKJV +app-dicts/sword-Robinson +app-dicts/sword-RomCor +app-dicts/sword-Rotherham +app-dicts/sword-RusCARS +app-dicts/sword-RusCARSA +app-dicts/sword-RusCARSADICT +app-dicts/sword-RusCARSDict +app-dicts/sword-RusCARST +app-dicts/sword-RusCARSTDICT +app-dicts/sword-RusMakarij +app-dicts/sword-RusSynodal +app-dicts/sword-RusSynodalLIO +app-dicts/sword-RusVZh +app-dicts/sword-RWebster +app-dicts/sword-RWP +app-dicts/sword-SahidicBible +app-dicts/sword-SAOA +app-dicts/sword-SBLGNT +app-dicts/sword-SBLGNTApp +app-dicts/sword-Scofield +app-dicts/sword-ScotsGaelic +app-dicts/sword-Sentiment +app-dicts/sword-Shona +app-dicts/sword-SloKJV +app-dicts/sword-SloOjacano +app-dicts/sword-SloStritar +app-dicts/sword-SME +app-dicts/sword-Smith +app-dicts/sword-sml_BL_2008 +app-dicts/sword-SomKQA +app-dicts/sword-Sorani +app-dicts/sword-SP +app-dicts/sword-SpaPlatense +app-dicts/sword-SpaRV +app-dicts/sword-SpaRV1865 +app-dicts/sword-SpaRV1909 +app-dicts/sword-SpaRVG +app-dicts/sword-SpaTDP +app-dicts/sword-SpaVNT +app-dicts/sword-SPDSS +app-dicts/sword-SPE +app-dicts/sword-SPMT +app-dicts/sword-Spurious +app-dicts/sword-SPVar +app-dicts/sword-SrKDEkavski +app-dicts/sword-SrKDIjekav +app-dicts/sword-StrongsGreek +app-dicts/sword-StrongsHebrew +app-dicts/sword-Swahili +app-dicts/sword-Swe1917 +app-dicts/sword-Swe1917Of +app-dicts/sword-SweFolk1998 +app-dicts/sword-SweKarlXII +app-dicts/sword-SweKarlXII1873 +app-dicts/sword-Tagalog +app-dicts/sword-TagAngBiblia +app-dicts/sword-Tausug +app-dicts/sword-TCR +app-dicts/sword-TDavid +app-dicts/sword-TFG +app-dicts/sword-ThaiKJV +app-dicts/sword-Tisch +app-dicts/sword-TNT +app-dicts/sword-Torrey +app-dicts/sword-TR +app-dicts/sword-TSK +app-dicts/sword-TurHADI +app-dicts/sword-TurNTB +app-dicts/sword-Twenty +app-dicts/sword-Tyndale +app-dicts/sword-UKJV +app-dicts/sword-Ukrainian +app-dicts/sword-UkrKulish +app-dicts/sword-Uma +app-dicts/sword-UrduGeo +app-dicts/sword-UrduGeoDeva +app-dicts/sword-UrduGeoRoman +app-dicts/sword-UyCyr +app-dicts/sword-VarApp +app-dicts/sword-VieRobinson +app-dicts/sword-VieStrongsGreek +app-dicts/sword-Viet +app-dicts/sword-VietLCCMN +app-dicts/sword-VietLCCMNCT +app-dicts/sword-VietNVB +app-dicts/sword-vlsJoNT +app-dicts/sword-Vulgate +app-dicts/sword-Vulgate_HebPs +app-dicts/sword-VulgClementine +app-dicts/sword-VulgConte +app-dicts/sword-VulgGlossa +app-dicts/sword-VulgHetzenauer +app-dicts/sword-VulgSistine +app-dicts/sword-Webster +app-dicts/sword-Webster1806 +app-dicts/sword-Webster1913 +app-dicts/sword-WelBeiblNet +app-dicts/sword-Wesley +app-dicts/sword-Westminster +app-dicts/sword-Westminster21 +app-dicts/sword-Weymouth +app-dicts/sword-WHNU +app-dicts/sword-WLC +app-dicts/sword-Worsley +app-dicts/sword-Wulfila +app-dicts/sword-Wycliffe +app-dicts/sword-YLT +app-dicts/sword-ZhEnglish +app-dicts/sword-ZhHanzi +app-dicts/sword-ZhPinyin +app-text/sword-modules + +# Michał Górny (2023-01-25) +# Unmaintained. Multiple build failure bugs reported. This version +# predates 2008. +# Removal on 2023-02-24. Bug #837611. +sys-cluster/wulfware + +# Ionen Wolkens (2023-01-24) +# Mostly obsoleted by the better maintained net-misc/yt-dlp, please +# migrate. If had USE=yt-dlp enabled (default) then was likely already +# using through its youtube-dl compatibility wrapper and this will +# change nothing beside needing to ensure that it is not depcleaned. +# +# Upstream is mostly focusing on compatibility and old python support, +# still uses deprecated Nose for tests, and has not seen a new release +# to deploy fixes in a long time despite major issues (e.g. throttling). +# +# Been kept due to some packages lacking compatibility with yt-dlp's +# python modules, but none are left in tree. Those that call the command +# rather than modules will often work as-is with yt-dlp's wrapper. +# Removal: 2023-02-23. Bug #891917 +net-misc/youtube-dl + +# Michał Górny (2023-01-24) +# mps-youtube does not seem to work "out of the box". It has had its +# last release in 2018, and no commits since 2020. It is the only +# package needing dev-python/pafy, and pafy is the final package +# requiring net-misc/youtube-dl. +# Removal on 2023-02-23. Bug #891911. +dev-python/pafy +media-sound/mps-youtube + +# David Seifert (2023-01-23) +# EOL branch, switch to mariadb-10.4/galera-26.4, removal on 2023-02-22. + (2023-01-23) # Please upgrade to >=app-eselect/eselect-wxwidgets-20230114-r1 as -r0 may # lead to build failures. @@ -60,13 +645,6 @@ media-video/ffmpeg2theora # Removal on 2023-02-20. Bug #578340. games-strategy/wargus-data -# Joonas Niilola (2023-01-21) -# 102.7.0 has a critical authentication issue with Microsoft 365 -# Business accounts. Fix should land in 102.7.1. If you're not affected -# and really want this update, please unmask it for yourself. -~mail-client/thunderbird-102.7.0 -~mail-client/thunderbird-bin-102.7.0 - # Hans de Graaff (2023-01-21) # No longer maintained upstream and missing recent security fixes. # Use a newer Rails version instead. @@ -220,12 +798,6 @@ sys-auth/google-authenticator-libpam-hardened # Removal: 2023-01-30. Bug #889194. x11-plugins/pidgin-funyahoo-plusplus -# Maciej Barć (2022-12-29) -# Real upstream dead, uses old R5RS standard, many open bugs. -# Removal on 2022-01-29. -app-shells/scsh -dev-scheme/scsh-lib - # Volkmar W. Pogatzki (2022-12-29) # Upstream is dead, last activity in Nov 2017. Does not # work with newer log4j, bug #857663. Use net-p2p/biglybt @@ -233,68 +805,11 @@ dev-scheme/scsh-lib net-p2p/vuze net-p2p/vuze-coreplugins -# Marco Scardovi (2022-12-27) -# It builds only with a really old version of libfprint -# and has never been updated to new one. No revdeps, no real usage -# Removal on 2023-01-26. Bug #888665 -sys-auth/pam_fprint - -# Sam James (2022-12-27) -# Obsolete and incompatible with app-alternatives/* (see news item). -# Removal on 2023-01-27. bug #886019 and bug #886021 respectively. -app-eselect/eselect-awk -app-eselect/eselect-sh - # Sam James (2022-12-27) # Regression in listing subvolumes (no UUIDs), bug #888549 # https://github.com/kdave/btrfs-progs/issues/562 =sys-fs/btrfs-progs-6.1 -# Fabian Groffen (2022-12-27) -# Old SVN version, with open bugs #830031, #770946, #712534, all fixed -# in app-admin/coreboot-utils package. (Conflict in #888581) Removal -# on 2023-01-26. -sys-apps/superiotool - -# David Seifert (2022-12-26) -# Lots of K&R C, hidden behind an annoying authwall, fails with modern -# GCC and Clang (-fcommon), license prohibits distributing, EAPI 6, -# last release 8 years ago. Removal on 2023-01-25. -sci-biology/consed -sci-biology/phrap -sci-biology/phred - -# David Seifert (2022-12-26) -# EAPI 6, cheesy build system, last release over 13 years ago, no other -# distro packages this. Removal on 2023-01-25. -sci-misc/flashdot - -# Michał Górny (2022-12-25) -# Broken with pytest-7.2. Repository archived upstream. No reverse -# dependencies. -# Removal on 2023-01-24. Bug #888219. -dev-python/pytest-toolbox - -# Michał Górny (2022-12-25) -# The project did not catch, with hardly any data submissions. -# Removal on 2023-01-24. Bug #843344. -app-portage/gander - -# Hans de Graaff (2022-12-25) -# Last release in 2018. Poor quality C extension code. Package -# consistently segfaults on it tests with the latest ruby versions. -# No reverse dependencies. Removal in 30 days. -dev-ruby/hiredis - -# Marco Scardovi (2022-12-22) -# Per robbat2 request, I'm gonna treeclean it as we -# are actually the only one maintaining it. -# No update upstream, EAPI 6 and with a bug #687786 -# As replacement, it is possible to use pv --rate-limit -# instead. -# Removal on 2023-01-21 -net-misc/valve - # Ionen Wolkens (2022-12-24) # Upstream dropped wxGTK support in >=games-emulation/pcsx2-1.7.3773, # and it now always requires Qt6. Masked given Qt6 is also masked in @@ -304,530 +819,6 @@ net-misc/valve # and package.unmask the whole list alongside pcsx2. >=games-emulation/pcsx2-1.7.3773 -# Arthur Zamarin (2022-12-24) -# Live only packages for 4 years! Upstream repositories are archived -# or inactive. -# Removal: 2023-01-23. Bug #888175. -media-libs/kodi-platform -media-plugins/kodi-game-libretro-fceumm -media-plugins/kodi-peripheral-steamcontroller - -# Arthur Zamarin (2022-12-24) -# EAPI=6 ebuilds, live only packages for 5.79 years! -# maintainer-needed packages for a long time. -# Removal: 2023-01-23. Bug #888173. -x11-misc/xowl -x11-wm/xoat - -# Michał Górny (2022-12-24) -# Obsolete package with broken tests. Last released in 2018, last -# activity in 2021. No reverse dependencies. -# Removal on 2023-01-23. Bug #888147. -dev-python/ndg-httpsclient - -# Michał Górny (2022-12-24) -# RobotOS is suffering from serious lack of manpower in Gentoo. -# While the packages are being bumped, the bugs reported against them -# are not being addressed. Whenever tests are present, they are often -# failing and/or still relying on dead dev-python/nose. Python 3.11 -# support is blocked, and 3.10 barely managed. -# Removal on 2023-01-23. Bug #888167. -acct-group/ros -acct-user/ros -dev-python/ament_package -dev-python/catkin_pkg -dev-python/osrf_pycommon -dev-python/python_orocos_kdl -dev-python/rosdistro -dev-python/rospkg -dev-python/urdf_parser_py -dev-python/vcstools -dev-ros/actionlib -dev-ros/actionlib_msgs -dev-ros/actionlib_tools -dev-ros/actionlib_tutorials -dev-ros/amcl -dev-ros/ament_cmake_copyright -dev-ros/ament_cmake_core -dev-ros/ament_cmake_cppcheck -dev-ros/ament_cmake_cpplint -dev-ros/ament_cmake_export_definitions -dev-ros/ament_cmake_export_dependencies -dev-ros/ament_cmake_export_include_directories -dev-ros/ament_cmake_export_interfaces -dev-ros/ament_cmake_export_libraries -dev-ros/ament_cmake_export_link_flags -dev-ros/ament_cmake_export_targets -dev-ros/ament_cmake_gen_version_h -dev-ros/ament_cmake_gmock -dev-ros/ament_cmake_gtest -dev-ros/ament_cmake_include_directories -dev-ros/ament_cmake_libraries -dev-ros/ament_cmake_lint_cmake -dev-ros/ament_cmake_pytest -dev-ros/ament_cmake_python -dev-ros/ament_cmake_ros -dev-ros/ament_cmake_target_dependencies -dev-ros/ament_cmake_test -dev-ros/ament_cmake_uncrustify -dev-ros/ament_cmake_version -dev-ros/ament_cmake_xmllint -dev-ros/ament_copyright -dev-ros/ament_cppcheck -dev-ros/ament_cpplint -dev-ros/ament_flake8 -dev-ros/ament_lint -dev-ros/ament_lint_auto -dev-ros/ament_lint_cmake -dev-ros/ament_pep257 -dev-ros/ament_uncrustify -dev-ros/ament_xmllint -dev-ros/angles -dev-ros/audio_capture -dev-ros/audio_common_msgs -dev-ros/audio_play -dev-ros/base_local_planner -dev-ros/bond -dev-ros/bondcpp -dev-ros/bondpy -dev-ros/calibration_estimation -dev-ros/calibration_launch -dev-ros/calibration_msgs -dev-ros/calibration_setup_helper -dev-ros/camera_calibration -dev-ros/camera_calibration_parsers -dev-ros/camera_info_manager -dev-ros/carrot_planner -dev-ros/class_loader -dev-ros/clear_costmap_recovery -dev-ros/cmake_modules -dev-ros/collada_parser -dev-ros/collada_urdf -dev-ros/combined_robot_hw -dev-ros/combined_robot_hw_tests -dev-ros/compressed_depth_image_transport -dev-ros/compressed_image_transport -dev-ros/console_bridge_vendor -dev-ros/controller_interface -dev-ros/controller_manager -dev-ros/controller_manager_msgs -dev-ros/controller_manager_tests -dev-ros/control_msgs -dev-ros/control_toolbox -dev-ros/convex_decomposition -dev-ros/costmap_2d -dev-ros/cpp_common -dev-ros/cv_bridge -dev-ros/depth_image_proc -dev-ros/depthimage_to_laserscan -dev-ros/diagnostic_aggregator -dev-ros/diagnostic_analysis -dev-ros/diagnostic_common_diagnostics -dev-ros/diagnostic_msgs -dev-ros/diagnostic_updater -dev-ros/driver_base -dev-ros/dwa_local_planner -dev-ros/dynamic_reconfigure -dev-ros/eigen_conversions -dev-ros/eigen_stl_containers -dev-ros/fake_localization -dev-ros/filters -dev-ros/gazebo_dev -dev-ros/gazebo_msgs -dev-ros/gazebo_plugins -dev-ros/gazebo_ros -dev-ros/gazebo_ros_control -dev-ros/gencpp -dev-ros/geneus -dev-ros/genlisp -dev-ros/genmsg -dev-ros/gennodejs -dev-ros/genpy -dev-ros/geodesy -dev-ros/geographic_msgs -dev-ros/geometric_shapes -dev-ros/geometry_msgs -dev-ros/global_planner -dev-ros/gmapping -dev-ros/hardware_interface -dev-ros/hector_compressed_map_transport -dev-ros/hector_geotiff -dev-ros/hector_geotiff_launch -dev-ros/hector_geotiff_plugins -dev-ros/hector_imu_attitude_to_tf -dev-ros/hector_imu_tools -dev-ros/hector_mapping -dev-ros/hector_map_server -dev-ros/hector_map_tools -dev-ros/hector_marker_drawing -dev-ros/hector_nav_msgs -dev-ros/hector_pose_estimation -dev-ros/hector_pose_estimation_core -dev-ros/hector_slam_launch -dev-ros/hector_trajectory_server -dev-ros/image_cb_detector -dev-ros/image_geometry -dev-ros/image_proc -dev-ros/image_publisher -dev-ros/image_rotate -dev-ros/image_transport -dev-ros/image_view -dev-ros/imu_complementary_filter -dev-ros/imu_filter_madgwick -dev-ros/imu_processors -dev-ros/imu_transformer -dev-ros/interactive_markers -dev-ros/interactive_marker_tutorials -dev-ros/interval_intersection -dev-ros/ivcon -dev-ros/joint_limits_interface -dev-ros/joint_state_publisher -dev-ros/joint_state_publisher_gui -dev-ros/joint_states_settler -dev-ros/kdl_conversions -dev-ros/kdl_parser -dev-ros/kdl_parser_py -dev-ros/laser_assembler -dev-ros/laser_cb_detector -dev-ros/laser_filters -dev-ros/laser_geometry -dev-ros/laser_proc -dev-ros/libmavconn -dev-ros/librviz_tutorial -dev-ros/map_msgs -dev-ros/map_server -dev-ros/mavlink-gbp-release -dev-ros/mavros -dev-ros/mavros_extras -dev-ros/mavros_msgs -dev-ros/media_export -dev-ros/message_filters -dev-ros/message_generation -dev-ros/message_runtime -dev-ros/message_to_tf -dev-ros/mk -dev-ros/monocam_settler -dev-ros/move_base -dev-ros/move_base_msgs -dev-ros/moveit_msgs -dev-ros/move_slow_and_clear -dev-ros/nav_core -dev-ros/navfn -dev-ros/nav_msgs -dev-ros/nmea_msgs -dev-ros/nodelet -dev-ros/nodelet_topic_tools -dev-ros/nodelet_tutorial_math -dev-ros/object_recognition_msgs -dev-ros/octomap_msgs -dev-ros/octomap_ros -dev-ros/opencv_apps -dev-ros/opencv_tests -dev-ros/openni2_camera -dev-ros/openni2_launch -dev-ros/openslam_gmapping -dev-ros/pcl_conversions -dev-ros/pcl_msgs -dev-ros/pcl_ros -dev-ros/pluginlib -dev-ros/pluginlib_tutorials -dev-ros/poco_vendor -dev-ros/pointcloud_to_laserscan -dev-ros/polled_camera -dev-ros/pr2_dashboard_aggregator -dev-ros/pr2_description -dev-ros/pr2_machine -dev-ros/pr2_msgs -dev-ros/python_cmake_module -dev-ros/python_qt_binding -dev-ros/qt_dotgraph -dev-ros/qt_gui -dev-ros/qt_gui_app -dev-ros/qt_gui_cpp -dev-ros/qt_gui_py_common -dev-ros/random_numbers -dev-ros/realtime_tools -dev-ros/resource_retriever -dev-ros/rgbd_launch -dev-ros/robot_localization -dev-ros/robot_pose_ekf -dev-ros/robot_pose_publisher -dev-ros/robot_state_publisher -dev-ros/rosapi -dev-ros/rosauth -dev-ros/rosbag -dev-ros/rosbag_migration_rule -dev-ros/rosbag_storage -dev-ros/rosbash -dev-ros/rosboost_cfg -dev-ros/rosbridge_library -dev-ros/rosbridge_msgs -dev-ros/rosbridge_server -dev-ros/rosbuild -dev-ros/rosclean -dev-ros/rosconsole -dev-ros/rosconsole_bridge -dev-ros/roscpp -dev-ros/roscpp_serialization -dev-ros/roscpp_traits -dev-ros/roscpp_tutorials -dev-ros/roscreate -dev-ros/rosdiagnostic -dev-ros/ros_environment -dev-ros/rosgraph -dev-ros/rosgraph_msgs -dev-ros/roslang -dev-ros/roslaunch -dev-ros/roslib -dev-ros/roslint -dev-ros/roslisp -dev-ros/roslz4 -dev-ros/rosmake -dev-ros/rosmaster -dev-ros/rosmsg -dev-ros/rosnode -dev-ros/rosout -dev-ros/rospack -dev-ros/rosparam -dev-ros/rospy -dev-ros/rospy_tutorials -dev-ros/rosserial_arduino -dev-ros/rosserial_client -dev-ros/rosserial_embeddedlinux -dev-ros/rosserial_msgs -dev-ros/rosserial_python -dev-ros/rosserial_server -dev-ros/rosserial_tivac -dev-ros/rosserial_windows -dev-ros/rosserial_xbee -dev-ros/rosservice -dev-ros/rostest -dev-ros/rostime -dev-ros/rostopic -dev-ros/rosunit -dev-ros/roswtf -dev-ros/rotate_recovery -dev-ros/rqt_action -dev-ros/rqt_bag -dev-ros/rqt_bag_plugins -dev-ros/rqt_console -dev-ros/rqt_controller_manager -dev-ros/rqt_dep -dev-ros/rqt_graph -dev-ros/rqt_gui -dev-ros/rqt_gui_cpp -dev-ros/rqt_gui_py -dev-ros/rqt_image_view -dev-ros/rqt_launch -dev-ros/rqt_logger_level -dev-ros/rqt_moveit -dev-ros/rqt_msg -dev-ros/rqt_nav_view -dev-ros/rqt_plot -dev-ros/rqt_pose_view -dev-ros/rqt_publisher -dev-ros/rqt_py_common -dev-ros/rqt_py_console -dev-ros/rqt_reconfigure -dev-ros/rqt_robot_dashboard -dev-ros/rqt_robot_monitor -dev-ros/rqt_robot_steering -dev-ros/rqt_runtime_monitor -dev-ros/rqt_rviz -dev-ros/rqt_service_caller -dev-ros/rqt_shell -dev-ros/rqt_srv -dev-ros/rqt_tf_tree -dev-ros/rqt_top -dev-ros/rqt_topic -dev-ros/rqt_web -dev-ros/rviz -dev-ros/rviz_imu_plugin -dev-ros/rviz_plugin_tutorials -dev-ros/rviz_python_tutorial -dev-ros/self_test -dev-ros/sensor_msgs -dev-ros/settlerlib -dev-ros/shape_msgs -dev-ros/smach -dev-ros/smach_msgs -dev-ros/smach_ros -dev-ros/smclib -dev-ros/stage_ros -dev-ros/std_msgs -dev-ros/std_srvs -dev-ros/stereo_image_proc -dev-ros/stereo_msgs -dev-ros/test_bond -dev-ros/test_diagnostic_aggregator -dev-ros/test_nodelet -dev-ros/test_nodelet_topic_tools -dev-ros/test_rosbag -dev-ros/test_rosbag_storage -dev-ros/test_roscpp -dev-ros/test_rosgraph -dev-ros/test_roslaunch -dev-ros/test_roslib_comm -dev-ros/test_rosmaster -dev-ros/test_rosparam -dev-ros/test_rospy -dev-ros/test_rosservice -dev-ros/test_tf2 -dev-ros/tf -dev-ros/tf2 -dev-ros/tf2_bullet -dev-ros/tf2_eigen -dev-ros/tf2_geometry_msgs -dev-ros/tf2_kdl -dev-ros/tf2_msgs -dev-ros/tf2_py -dev-ros/tf2_ros -dev-ros/tf2_sensor_msgs -dev-ros/tf2_tools -dev-ros/tf_conversions -dev-ros/theora_image_transport -dev-ros/timestamp_tools -dev-ros/topic_tools -dev-ros/trajectory_msgs -dev-ros/transmission_interface -dev-ros/turtle_actionlib -dev-ros/turtlesim -dev-ros/turtle_tf -dev-ros/turtle_tf2 -dev-ros/unique_id -dev-ros/urdf -dev-ros/urdf_parser_plugin -dev-ros/urdf_tutorial -dev-ros/urg_c -dev-ros/urg_node -dev-ros/uuid_msgs -dev-ros/visp_auto_tracker -dev-ros/visp_bridge -dev-ros/visp_camera_calibration -dev-ros/visp_hand2eye_calibration -dev-ros/visp_tracker -dev-ros/visualization_marker_tutorials -dev-ros/visualization_msgs -dev-ros/voxel_grid -dev-ros/xacro -dev-ros/xmlrpcpp -dev-util/catkin -dev-util/rosdep -dev-util/rosinstall -dev-util/wstool -ros-meta/ament_cmake -ros-meta/audio_common -ros-meta/bond_core -ros-meta/calibration -ros-meta/common_msgs -ros-meta/common_tutorials -ros-meta/desktop -ros-meta/desktop_full -ros-meta/diagnostics -ros-meta/driver_common -ros-meta/executive_smach -ros-meta/gazebo_ros_pkgs -ros-meta/geographic_info -ros-meta/geometry -ros-meta/geometry2 -ros-meta/geometry_tutorials -ros-meta/hector_localization -ros-meta/hector_slam -ros-meta/image_common -ros-meta/image_pipeline -ros-meta/image_transport_plugins -ros-meta/imu_pipeline -ros-meta/imu_tools -ros-meta/laser_pipeline -ros-meta/mavros -ros-meta/navigation -ros-meta/nodelet_core -ros-meta/perception -ros-meta/perception_pcl -ros-meta/pr2_common -ros-meta/qt_gui_core -ros-meta/robot -ros-meta/robot_model -ros-meta/ros -ros-meta/ros_base -ros-meta/rosbridge_suite -ros-meta/ros_comm -ros-meta/ros_control -ros-meta/ros_core -ros-meta/roscpp_core -ros-meta/rosserial -ros-meta/ros_tutorials -ros-meta/rqt -ros-meta/rqt_common_plugins -ros-meta/rqt_robot_plugins -ros-meta/simulators -ros-meta/slam_gmapping -ros-meta/unique_identifier -ros-meta/vision_opencv -ros-meta/vision_visp -ros-meta/visualization_tutorials -ros-meta/viz - -# Michał Górny (2022-12-23) -# Packages that still use dev-python/nose and have no revdeps. -# -# dev-python/blessings: EAPI 7, last rel. in 2018, git act. in 2020 -# dev-python/errorhandler: EAPI 7, last rel. in 2016, git act. in 2018 -# dev-python/flask-restful: EAPI 7, last rel. in 2021, git act. in Mar -# dev-python/imread: non-PEP517, last rel. in 2020, uses pytest in git -# dev-python/influxdb: EAPI 7, last rel. 2020, archived on GitHub -# dev-python/nose-random: nose plugin -# dev-python/pilkit: EAPI 7, last rel. in 2017, uses pytest in git -# dev-python/PyContracts: EAPI 7, last rel. in 2019, git act. in 2020 -# dev-python/python-zipstream: EAPI 7, last rel. in 2016, git in 2018 -# dev-python/PyUtilib: EAPI 7, last rel. and git act. in 2020 -# dev-python/socketio-client: EAPI 7, last rel. in 2016, git in 2017 -# dev-python/www-authenticate: EAPI 7, last rel. in 2015, git in 2019 -# -# Removal on 2023-01-22. Bug #888087. -dev-python/blessings -dev-python/errorhandler -dev-python/flask-restful -dev-python/imread -dev-python/influxdb -dev-python/nose-random -dev-python/pilkit -dev-python/PyContracts -dev-python/python-zipstream -dev-python/PyUtilib -dev-python/socketio-client -dev-python/www-authenticate - -# Michał Górny (2022-12-23) -# sci-libs/votca-tools fail to build with GCC 12. Pending version bump -# since January 2022. -# Removal on 2023-01-22. Bug #841830. -sci-chemistry/votca-csg -sci-chemistry/votca-csgapps -sci-chemistry/votca-xtp -sci-libs/votca-tools - -# Michał Górny (2022-12-21) -# The mauve project is no longer maintained upstream, and the actual -# program has been removed from Gentoo in 2016. These are leftover -# libraries with no reverse dependencies. Last bumped in 2009. -# Removal on 2023-01-20. Bug #677558. -sci-libs/libgenome -sci-libs/libmems - -# Michał Górny (2022-12-21) -# Fails to build both against MySQL and PostgreSQL. Homepage gone. -# Last bumped in 2005. -# Removal on 2023-01-20. Bug #677528, #807835. -dev-db/mysql-super-smack - -# Michał Górny (2022-12-21) -# Reported to be incompatible with PHP 7+. Abandoned upstream. -# No reverse dependencies. There is a maintained fork, should anyone -# want to revive it. -# Removal on 2023-01-20. Bug #737842. -dev-php/phptal - # Georgy Yakovlev (2022-12-19) # This version currently is not compatible with kernel build (yet) ~dev-util/bindgen-0.63.0 @@ -856,11 +847,6 @@ dev-cpp/sourcetrail # bug #885075, https://github.com/libarchive/libarchive/issues/1766 =app-arch/libarchive-3.6.2 -# Michał Górny (2022-12-08) -# Seems to break some logic in pkg_resources. Masked for the time being -# to prevent breakage. ->=dev-python/packaging-22.0 - # Stephan Hartmann (2023-01-15) # Dev channel releases are only for people who # are developers or want more experimental features @@ -915,6 +901,7 @@ dev-python/pyside6-tools # Jimi Huotari (2022-08-02) # Masked for testing. The split of some packages may still # change. bug #838970. +>=app-editors/retext-8.0.0 dev-python/PyQt6 dev-python/PyQt6-WebEngine dev-qt/qt5compat:6 @@ -954,87 +941,6 @@ dev-qt/qtwebsockets:6 # should update to that. #841437 ~sci-physics/bullet-3.22b -# Alfredo Tupone (2022-04-27) -# New release of janestreet packages need to tested -dev-ml/sexplib0:0/0.15 -dev-ml/sexplib:0/0.15 -dev-ml/base:0/0.15 -dev-ml/stdio:0/0.15 -dev-ml/ppx_sexp_conv:0/0.15 -dev-ml/ppx_enumerate:0/0.15 -dev-ml/ppx_compare:0/0.15 -dev-ml/ppx_hash:0/0.15 -dev-ml/ppx_cold:0/0.15 -dev-ml/parsexp:0/0.15 -dev-ml/ppx_base:0/0.15 -dev-ml/ppx_fields_conv:0/0.15 -dev-ml/ppx_here:0/0.15 -dev-ml/ppx_let:0/0.15 -dev-ml/ppx_sexp_message:0/0.15 -dev-ml/ppx_sexp_value:0/0.15 -dev-ml/ppx_assert:0/0.15 -dev-ml/ppx_optcomp:0/0.15 -dev-ml/time_now:0/0.15 -dev-ml/ppx_inline_test:0/0.15 -dev-ml/ppx_bench:0/0.15 -dev-ml/splittable_random:0/0.15 -dev-ml/base_quickcheck:0/0.15 -dev-ml/ppx_bin_prot:0/0.15 -dev-ml/ppx_custom_printf:0/0.15 -dev-ml/ppx_disable_unused_warnings:0/0.15 -dev-ml/ppx_expect:0/0.15 -dev-ml/ppx_fixed_literal:0/0.15 -dev-ml/ppx_log:0/0.15 -dev-ml/ppx_module_timer:0/0.15 -dev-ml/ppx_optional:0/0.15 -dev-ml/ppx_stable:0/0.15 -dev-ml/ppx_string:0/0.15 -dev-ml/typerep:0/0.15 -dev-ml/ppx_typerep_conv:0/0.15 -dev-ml/variantslib:0/0.15 -dev-ml/ppx_variants_conv:0/0.15 -dev-ml/ppx_jane:0/0.15 -dev-ml/int_repr:0/0.15 -dev-ml/base_bigstring:0/0.15 -dev-ml/ppx_js_style:0/0.15 -dev-ml/core:0/0.15 -dev-ml/core_kernel:0/0.15 -dev-ml/sexp_pretty:0/0.15 -dev-ml/expect_test_helpers_core:0/0.15 -dev-ml/timezone:0/0.15 -dev-ml/core_unix:0/0.15 -dev-ml/textutils_kernel:0/0.15 -dev-ml/textutils:0/0.15 -dev-ml/async_kernel:0/0.15 -dev-ml/protocol_version_header:0/0.15 -dev-ml/async_rpc_kernel:0/0.15 -dev-ml/async_unix:0/0.15 -dev-ml/async:0/0.15 -dev-ml/async_extra:0/0.15 -dev-ml/core_bench:0/0.15 -dev-ml/patience_diff:0/0.15 -dev-util/patdiff:0/0.15 -=dev-ml/alcotest-1.6.0* - -# Maciej Barć (2022-02-20) -# Masked for testing, builds and passes tests but randomly segfaults, -# meaningless backtrace, debugging (flags, symbols) do not help ->app-shells/scsh-0.6.9 - -# Zoltan Puskas (2022-02-18) -# Multiple vulnerabilities (CVE-2022-{23803,23804,23946,23947}) -# 5.X series is masked to avoid accidental use, but it's kept for -# industrial users who are in the process of migrating to the new -# format of the 6.X series. - (2022-01-24) # Mask experimental software =mail-mta/postfix-3.8* diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2023 b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2023 index 64e6720dd8..e84d89f9b9 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2023 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2023 @@ -1 +1,5 @@ move net-im/discord-bin net-im/discord +move dev-python/python-recurring-ical-events dev-python/recurring-ical-events +move dev-python/snappy dev-python/python-snappy +move dev-python/pkgcraft-python dev-python/pkgcraft +move dev-python/python-nbxmpp dev-python/nbxmpp diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2018 b/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2018 index 1e9c38d2cc..2de43c8cc5 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2018 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/2Q-2018 @@ -5,7 +5,6 @@ move kde-apps/kstars sci-astronomy/kstars move media-video/kamoso kde-apps/kamoso move app-backup/kbackup kde-apps/kbackup move x11-proto/xcb-proto x11-base/xcb-proto -move ros-meta/geometry_experimental ros-meta/geometry2 slotmove =dev-ruby/websocket-driver-0.7.0 0 0.7 move kde-plasma/oxygen-fonts media-fonts/oxygen-fonts move media-libs/vulkan-tools dev-util/vulkan-tools From 606cbc8ee983d13b140e73efad5e141d6a2e5fec Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:21:50 +0000 Subject: [PATCH 27/41] sys-apps/diffutils: Sync with Gentoo It's from Gentoo commit cc023c47f0a30174d43fb940109fce5781edda95. --- .../sys-apps/diffutils/diffutils-3.9.ebuild | 10 +++++-- .../diffutils-3.9-make-4.4-test-color.patch | 30 +++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.9-make-4.4-test-color.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9.ebuild index ebbd0424d1..acce50bad2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/diffutils-3.9.ebuild @@ -27,8 +27,14 @@ LICENSE="GPL-2" SLOT="0" IUSE="nls static" -BDEPEND="nls? ( sys-devel/gettext ) - verify-sig? ( sec-keys/openpgp-keys-diffutils )" +BDEPEND=" + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-diffutils ) +" + +PATCHES=( + "${FILESDIR}"/${P}-make-4.4-test-color.patch +) src_configure() { use static && append-ldflags -static diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.9-make-4.4-test-color.patch b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.9-make-4.4-test-color.patch new file mode 100644 index 0000000000..01f6aeedc9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/diffutils/files/diffutils-3.9-make-4.4-test-color.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/879891 +https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59905 +https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=89f3daeaaf021a77177daec8666bcd80ec476833 + +From 89f3daeaaf021a77177daec8666bcd80ec476833 Mon Sep 17 00:00:00 2001 +From: Jim Meyering +Date: Mon, 16 Jan 2023 15:48:10 -0800 +Subject: tests: accommodate newer GNU make's SIGPIPE-ignore +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* tests/colors: Allow an exit code of not just 141 (SIGPIPE), +but also "error": 2. +Reported by Tomasz Kłoczko in http://bugs.gnu.org/59905. +--- a/tests/colors ++++ b/tests/colors +@@ -128,6 +128,9 @@ printf '%1000000s-a' > a + printf '%1000000s-b' > b + head -c 10 < fifo > /dev/null & + diff --color=always ---presume-output-tty a b > fifo +-test $? = 141 || fail=1 ++ ++# Depending on version of GNU make (4.3.92-4.4 set SIGPIPE to "ignore"), ++# either of these is acceptable. ++case $? in 2|141) ;; *) fail=1 ;; esac + + Exit $fail +-- +cgit v1.1 From d1b110961241f25751c94e0fbe6cc9897d0af038 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:21:52 +0000 Subject: [PATCH 28/41] sys-apps/gentoo-functions: Sync with Gentoo It's from Gentoo commit e66873a3b765467c70f30bf20a01e02b3f37bb03. --- .../sys-apps/gentoo-functions/Manifest | 1 + .../gentoo-functions-0.19.ebuild | 30 +++++++++++++++++++ .../gentoo-functions-9999.ebuild | 5 +++- .../sys-apps/gentoo-functions/metadata.xml | 3 -- 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/Manifest index d25f2f43a4..f77fb3b45d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/Manifest @@ -1 +1,2 @@ DIST gentoo-functions-0.17.tar.bz2 10798 BLAKE2B 1b725945421ab36b1412f9addc22e9fe299c0e6460790ee2832b9f63d4c06b86bb0d054b01505640a5dc1e62f3cd257628717fec852116a4c8b2c9f9d2d149ee SHA512 6a3de93b5e4d761a53a622f41e6079606cc4ad8a964771d49dafdefbb632afdf722fd055d261e494aa0be956c4160c49a775ab40c927c5340b8e4da275ef51fb +DIST gentoo-functions-0.19.tar.bz2 12079 BLAKE2B be0a3a54d4dee1755866047b670a69cd6fec368239123c3f0c08180b79a33c20147bca0e35e568faef6877513551e731bdf0c181aeb0460f6574d2d708219373 SHA512 2674d3fe5724cc6d685ae58bf0ee33f4a1bdba2c5e5809cfb193fd0a710d4678c2d9392c2c62d2321cf455f524950266dc1629ab684fe46632d179e539d5a39e diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild new file mode 100644 index 0000000000..decad7ffcc --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-0.19.ebuild @@ -0,0 +1,30 @@ +# Copyright 2014-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git" +else + SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +fi + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="Base functions required by all Gentoo systems" +HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git" + +LICENSE="GPL-2" +SLOT="0" + +# Specifically needs GNU find, as well. +RDEPEND=">=sys-apps/findutils-4.9" + +src_configure() { + tc-export CC + append-lfs-flags + export ROOTPREFIX="${EPREFIX}" + export PREFIX="${EPREFIX}/usr" +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild index cf5513d3fc..decad7ffcc 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2014-2022 Gentoo Authors +# Copyright 2014-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,6 +19,9 @@ HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git" LICENSE="GPL-2" SLOT="0" +# Specifically needs GNU find, as well. +RDEPEND=">=sys-apps/findutils-4.9" + src_configure() { tc-export CC append-lfs-flags diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/metadata.xml index 3756aa0576..a228a51ef7 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/gentoo-functions/metadata.xml @@ -4,9 +4,6 @@ williamh@gentoo.org - - blueness@gentoo.org - base-system@gentoo.org Gentoo Base System From 5e2fb595aed8409b7bf46d1522632ffda087053d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:21:57 +0000 Subject: [PATCH 29/41] sys-devel/autoconf-wrapper: Sync with Gentoo It's from Gentoo commit d08bd3ca926b604cd45496db04aab7cfa44dcf15. --- .../autoconf-wrapper-20221207-r1.ebuild | 45 +++++++++++++++++++ .../autoconf-wrapper-20221207.ebuild | 6 ++- .../autoconf-wrapper-99999999.ebuild | 18 ++++++-- 3 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild new file mode 100644 index 0000000000..0de54de36d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="autotools-wrappers-at-${PV}" + +DESCRIPTION="Wrapper for autoconf to manage multiple autoconf versions" +HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/autotools-wrappers.git + https://github.com/gentoo/autotools-wrappers + " + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz" + S="${WORKDIR}/${MY_P}" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" + +src_prepare() { + default + + # usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell + if use prefix ; then + sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' ac-wrapper.sh || die + fi +} + +src_install() { + exeinto /usr/$(get_libdir)/misc + doexe ac-wrapper.sh + + dodir /usr/bin + local x= + for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do + dosym -r /usr/$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x} + done +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild index 9788b3e841..3b2a7a8ff4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221207.ebuild @@ -9,11 +9,13 @@ DESCRIPTION="Wrapper for autoconf to manage multiple autoconf versions" HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git" if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI=" https://anongit.gentoo.org/git/proj/autotools-wrappers.git" + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/autotools-wrappers.git + https://github.com/gentoo/autotools-wrappers + " inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz" - #SRC_URI="https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild index 00ae376153..0de54de36d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,11 +9,13 @@ DESCRIPTION="Wrapper for autoconf to manage multiple autoconf versions" HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git" if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/autotools-wrappers.git" + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/autotools-wrappers.git + https://github.com/gentoo/autotools-wrappers + " inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz" - #SRC_URI="https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" @@ -22,12 +24,20 @@ fi LICENSE="GPL-2" SLOT="0" +src_prepare() { + default + + # usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell + if use prefix ; then + sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' ac-wrapper.sh || die + fi +} + src_install() { exeinto /usr/$(get_libdir)/misc doexe ac-wrapper.sh dodir /usr/bin - local x= for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do dosym -r /usr/$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x} From 46d7c01333148e5e69aa8554849baf8babb92f28 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:21:57 +0000 Subject: [PATCH 30/41] sys-devel/automake-wrapper: Sync with Gentoo It's from Gentoo commit b520046dbc50dc7b57245fdc4108b0332a910b44. --- .../sys-devel/automake-wrapper/Manifest | 1 + .../automake-wrapper-20221207.ebuild | 46 +++++++++++++++++++ .../automake-wrapper-99999999.ebuild | 15 ++++-- 3 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/Manifest new file mode 100644 index 0000000000..5a292895ab --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/Manifest @@ -0,0 +1 @@ +DIST autotools-wrappers-at-20221207.tar.gz 3646 BLAKE2B 82bec40e03ae5ec133252fd3c05c3fed537bb415e800918df9c9d783d48a9d76cbe60c53dd7daf6d94653d79fc52be8c089183dda996e8a72dd03ffa83098613 SHA512 12ea99721e6fc60a3ed7351d6c228aaf6e4eef0bd0444eda8cd742f74fa91150ef07bb52f6bcad4a350269e8032f5d4e204d2f2108b0d9c441ddd7f9755862b7 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild new file mode 100644 index 0000000000..65c38465fb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-20221207.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="autotools-wrappers-at-${PV}" + +DESCRIPTION="Wrapper for automake to manage multiple automake versions" +HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/autotools-wrappers.git + https://github.com/gentoo/autotools-wrappers + " + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz" + S="${WORKDIR}"/${MY_P} + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" + +src_prepare() { + default + + # usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell + if use prefix ; then + sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' am-wrapper.sh || die + fi +} + +src_install() { + exeinto /usr/$(get_libdir)/misc + doexe am-wrapper.sh + + local x= + for x in automake aclocal ; do + dosym -r /usr/$(get_libdir)/misc/am-wrapper.sh /usr/bin/${x} + done + + keepdir /usr/share/aclocal +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild index ecb9a1b053..65c38465fb 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-99999999.ebuild @@ -1,19 +1,24 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +MY_P="autotools-wrappers-at-${PV}" + DESCRIPTION="Wrapper for automake to manage multiple automake versions" HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git" if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/autotools-wrappers.git" + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/autotools-wrappers.git + https://github.com/gentoo/autotools-wrappers + " inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/autotools-wrappers.git/snapshot/${MY_P}.tar.gz" + S="${WORKDIR}"/${MY_P} - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - S="${WORKDIR}" + 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" @@ -24,7 +29,7 @@ src_prepare() { # usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell if use prefix ; then - sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' am-wrapper-${PV}.sh || die + sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' am-wrapper.sh || die fi } From eeadf30b6fd10cc50555b92b73a24d071e6ba203 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:21:58 +0000 Subject: [PATCH 31/41] sys-devel/binutils: Sync with Gentoo It's from Gentoo commit 5d1e75b4126ff6760ce5d2707591cd4ea7505edb. --- .../portage-stable/sys-devel/binutils/binutils-2.40.ebuild | 2 +- .../portage-stable/sys-devel/binutils/binutils-9999.ebuild | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40.ebuild index 95fe278997..0d5192d356 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40.ebuild @@ -171,7 +171,7 @@ src_configure() { # Keep things sane strip-flags - + use cet && filter-flags -mindirect-branch -mindirect-branch=* use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 local x 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 eae71c276c..c8e0d5f949 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 @@ -171,6 +171,8 @@ src_configure() { # Keep things sane strip-flags + use cet && filter-flags -mindirect-branch -mindirect-branch=* + use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs # https://github.com/gentoo/gentoo/pull/28355 From f072fa33d439517834ddf7b188f38ee00aeccccc Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:21:59 +0000 Subject: [PATCH 32/41] sys-devel/crossdev: Sync with Gentoo It's from Gentoo commit 8f5b8377a95de202da995b688c0aff8a1611a324. --- .../sys-devel/crossdev/crossdev-20220909.ebuild | 7 +++++-- .../sys-devel/crossdev/crossdev-20221228.ebuild | 7 +++++-- .../sys-devel/crossdev/crossdev-99999999.ebuild | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220909.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220909.ebuild index 62e271684d..dcd2b79897 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220909.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20220909.ebuild @@ -1,11 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" if [[ ${PV} == "99999999" ]] ; then inherit git-r3 - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git" + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/crossdev.git + https://github.com/gentoo/crossdev + " else SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20221228.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20221228.ebuild index a3a84da996..4cb66350d4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20221228.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20221228.ebuild @@ -1,11 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" if [[ ${PV} == "99999999" ]] ; then inherit git-r3 - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git" + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/crossdev.git + https://github.com/gentoo/crossdev + " else SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-99999999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-99999999.ebuild index a3a84da996..4cb66350d4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-99999999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-99999999.ebuild @@ -1,11 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" if [[ ${PV} == "99999999" ]] ; then inherit git-r3 - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git" + EGIT_REPO_URI=" + https://anongit.gentoo.org/git/proj/crossdev.git + https://github.com/gentoo/crossdev + " else SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" From 3ecb5bf74a5c6733f3611f597b665b4b53f205d1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:21:59 +0000 Subject: [PATCH 33/41] sys-devel/gcc: Sync with Gentoo It's from Gentoo commit a4fc7049d963e6c1045fd65e9dfbe2d69eacea0f. --- .../portage-stable/sys-devel/gcc/Manifest | 26 +++++++-- .../sys-devel/gcc/gcc-10.4.1_p20221208.ebuild | 4 +- .../gcc/gcc-10.4.1_p20230119-r1.ebuild | 4 +- .../sys-devel/gcc/gcc-10.4.1_p20230126.ebuild | 58 +++++++++++++++++++ .../sys-devel/gcc/gcc-10.4.1_p20230202.ebuild | 58 +++++++++++++++++++ .../sys-devel/gcc/gcc-11.3.1_p20221209.ebuild | 4 +- .../gcc/gcc-11.3.1_p20230120-r1.ebuild | 4 +- .../sys-devel/gcc/gcc-11.3.1_p20230127.ebuild | 52 +++++++++++++++++ .../sys-devel/gcc/gcc-11.3.1_p20230203.ebuild | 52 +++++++++++++++++ .../sys-devel/gcc/gcc-12.2.0.ebuild | 4 +- .../sys-devel/gcc/gcc-12.2.1_p20221126.ebuild | 2 +- .../gcc/gcc-12.2.1_p20230121-r1.ebuild | 4 +- .../sys-devel/gcc/gcc-12.2.1_p20230128.ebuild | 52 +++++++++++++++++ .../gcc/gcc-12.2.1_p20230204-r1.ebuild | 52 +++++++++++++++++ .../sys-devel/gcc/gcc-12.2.1_p20230204.ebuild | 52 +++++++++++++++++ .../gcc/gcc-13.0.1_pre20230129-r1.ebuild | 54 +++++++++++++++++ .../gcc/gcc-13.0.1_pre20230205-r1.ebuild | 54 +++++++++++++++++ .../gcc/gcc-13.0.1_pre20230205.ebuild | 54 +++++++++++++++++ .../sys-devel/gcc/gcc-8.5.0-r1.ebuild | 7 ++- .../sys-devel/gcc/gcc-9.5.0.ebuild | 4 +- 20 files changed, 577 insertions(+), 24 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230126.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230202.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230127.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230203.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230128.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230204-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230204.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230129-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230205-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230205.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 a4714bcaec..b080fd5deb 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,27 +1,41 @@ DIST gcc-10-20221208.tar.xz 72098912 BLAKE2B 8167b3d91fb95c727caa3a76d8bd6d70e0d0bd79eda72305f3005c9f7163dcd425c75386ba55b2d71644ecf83d998a4bccb6fd265bb615dcdd104f27cadb8e76 SHA512 5e49159d86300eaa4c2f34fb3537b5f257931e861a1a1217dbabcfcd5ef9da224d4a6023aaf8d24c8893ecd204ec0cd6e96349ae0dd445d62d92ebb041aeb054 DIST gcc-10-20230119.tar.xz 72112952 BLAKE2B 6e28cba9f6ff5c9f9231828bb400c82b8658a4f9c0166c28a6a12d71728d4460904152a8c84bbeff88c06b7f9378937b7b61bf4a871a10c56bd005170dc5fde2 SHA512 6cbb567ef1da1b6fa65892b6e71c3b7cd37e0c483e049720ea1987d444a0e7b4eb15d1e99f4e35995acdce560a811a779574eeba52bb252c61325accedd6a5c5 +DIST gcc-10-20230126.tar.xz 72121284 BLAKE2B add27f5cacaf5c36c4c54e2c71f6e60edd03242bf52e1729aa708cc6d927814f3640cccbf9711d105c252b90e980e0ab071a2204c7859045c35bacaac9664c7a SHA512 619f73041be838b0e48a10f5dbe4bb775367fc13511f4b98d65c4336b397f1ccae2df64f11b7cd066e2635783b2d61f815c3ab0a6478ec3c98dd7b33728d2ae5 +DIST gcc-10-20230202.tar.xz 72116996 BLAKE2B 79e06176ee536d4f313f68838fad5b26d087054ce477a394d35b3726ba857e203201dd4ad6a41004b47031fd40735c382c604f8645e15b817d37e48bf722f42d SHA512 c904bdc5874cdc723d1e6d781961ffa3f9ccc3847b0edc6a498cfb740846b77bd4516b4d6c8342938febea9dec2aa4ec5d5f361d14b54fa8b789136909a682e0 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 -DIST gcc-10.5.0-musl-patches-1.tar.xz 3816 BLAKE2B 5995f934a40665d877342853fde8b414eed8770c72e6b11b295b7e7b3c9d38d7407dff63b5751f4449f6fa842c02e87f156cc868e7436a8313f7c8514242d255 SHA512 b93cc54cd7b78fdc487df7c449b03bbfd10094e45f3f8eef20cd69f27a68a14817fe662a2ec119b384eea2dad0491b70f838d010457e386700030b76457afad6 +DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d SHA512 86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5 DIST gcc-10.5.0-patches-1.tar.xz 17180 BLAKE2B d8ecc7cc15fa1ab420fa9eff11173a1d5544b369720e8c54fc59375e591ebd0a429b7e81a2a3df86bd2eaf19e4b8148bf2e1b0c8410de3944d4801ce412016b2 SHA512 5855aa23ee0b262c20a1b6fd2d4a947180c079dc00e0fa675043edceee0c822eec0dc752f5fcb281b70c04e50c6fcaf6c5d5160ab15d3f0c51fa030eb2d79d26 DIST gcc-10.5.0-patches-4.tar.xz 17880 BLAKE2B f368b741fd42199c85b770ec45a5232d27295cf7796163251f24fa963f2264c473e161bb34e66b43c4b227e41859d540a66331111392478b280b289d359806c6 SHA512 94f7fbd1b4672f0378c85ac3a96f7954cd22bd7cc1013c32519bbe1cae0ebb5183e14469c61dfc9d931b8d1c261f2ead1c4b47278104d1b5189a0c787aabc40e +DIST gcc-10.5.0-patches-5.tar.xz 17324 BLAKE2B e97b471fb6115fd0421be8a6390f7d88312de7ac0132fde3aa43dbf2a49d3bc640ec05f766f20363f033adeaf0430e90c42b5a6f92a422d1a82128f119e769f6 SHA512 2589b8a3be0bc60dd7b205ef9955dfd1ba525508879b30ee8057779d2677783c7c13a0bf901bc2a126e15c52d440663e6fe22a299d935e0706a037406e1cfb31 DIST gcc-11-20221209.tar.xz 76240768 BLAKE2B 3be0f1ece4473bbbf10f7242102f330a6e246c8481da5bd32620dcb15d2acd008bad60d2576a301f03e444e3d93a3c72d5184740c6fb3de2bc05e1863b68a0bc SHA512 33d9581d434c012526eb4d49a4453cf77c57b459fd43f84e49bc764745e0772939eac007e119269f4f1989755df8678613732a84474c691b0c2452237c5b38a3 DIST gcc-11-20230120.tar.xz 76201244 BLAKE2B 07bc819dad3e2ee3747f09f43fd73a4263f06274362728174b32d9ead52ea95c25ea6a192397378b9b4c4f958285d97488d28e425c26129d23f143b1a8668fbc SHA512 81f71aeb706b4ccb89e2af5201770fd72cc3190b9b5eac0b5a25a522626b9c4015a2e5d13e4bd1360ac0f7f1be27df51fc530c15ce3c3d782f39f34d5c58803e -DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a85e13368279849f6f3ab89ad7abe505316afacf5084846c0cb133bdcb5c918244644242c194e6ce55455a26e67b3983d73ef SHA512 a81db52d21de364137461dcff7e1af696df4a02fa26452f90439ae4af14ccbffe68eb4ee93ae56257490ab8aa36b4bff37c4e1f2cf4dd4624b3a6fb4cb50b7ac -DIST gcc-11.4.0-musl-patches-1.tar.xz 4320 BLAKE2B 9f59aef44243b6d63bd9c4639b413523e74784dc0da931a9f1be75d2091f7e99c530b32b567315972a88816d6b30d2c404465a2f28138ba2cc894914d7a123fb SHA512 c174623bf40fb0cab53d1ca82fa7e0b05f0114c61c839e316dfff7678d202b850d4d5011432cf6fa40c54e563e28381e9a9f80667d9428b3f272ba8391c6ac84 +DIST gcc-11-20230127.tar.xz 76128480 BLAKE2B 4fdff08bd120fbff1b1e87d09606a9049fa28f456444c07c5d0dc3738216be3c2b418137bbb57ac79e584b68cf277033707c63a5e2ecb75497f3778f7cf3fef6 SHA512 772f4ea802aba04a63a50272b59c293b0f1a143c00b88beae98c9bef4ef3a36ad4fd50ec670113d1d031e831262fe50e0b1017536f02c8553be61b05708678b8 +DIST gcc-11-20230203.tar.xz 76157392 BLAKE2B ed70b6c94d5440e647881e1e026da75547c9dcbb677d7d6f67aa89a04edc64d64b88eb14bf644c78f46b5c45c1d58f1f38f99c1bda913c42303fcec3ac329aa7 SHA512 125437acd0e1d14204542965d52392e7ed3cbe369f85ec43fa1278c536039f9eb2ce1af28a1c31b67573dcac15da432fb7a61d1c236b30eaca5ca9774ea41aa9 +DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c DIST gcc-11.4.0-patches-3.tar.xz 15200 BLAKE2B a393df941a2a31164f477d6bc0032e28319e8f0bd87200eb453708f85aa8c0bf5d67e733ee7b75cf6d14743e18cc941cee1b77a8247f8c5683d17a98cbeb280f SHA512 6f6096d95c7c62780d1070097739882393a8df5172c3a5ae811a8d4d1c98a0cd14a34f3f7e95410c8f210aec434330ac3b8876c688faeb130d7bb8fa3333ece9 DIST gcc-11.4.0-patches-7.tar.xz 14416 BLAKE2B 3ebf62cba04cac8830a93a99d11c21347c38891db3a81493a10e02e8b7af0c86389ffbede50672dfe1189a77a67b832f8f97a1d95d43eff11db131a143b1d03d SHA512 41e2ed1ccf6d3631accccdab057877c79c99eb1b3c32f9d35628bca6c633c4f8dadb1d7f93bed2e4d7ff9f36cc9e46ea00f0e57e8af64b2e5f4b3b01285c6da3 +DIST gcc-11.4.0-patches-8.tar.xz 13788 BLAKE2B a1406d5dcd906ed51ef06bb6571c216d83f74ab5ba05d2f1783d20619ee4ae9a4aa60c15917c861c24b708621b1605411011df9d217472f92001ec1c59a22b5b SHA512 b18b068422911216063948e21f0ec01073edb45c828a351282730111642638a0a42b97394a3f7522f892fe79e30b391372c829b542ce64fd0dc58c2a83f091bf DIST gcc-12-20221126.tar.xz 79631864 BLAKE2B 3bb97ef4a1a17ab8b92b431b1f792c11131085a1b523efa08c5b4f995b44bf628be371564813e5affb1f8e2320bb8a9b04532e57b2deeef26b33f517783daa5e SHA512 163e0aa39dc5c24980f84000bd6ccd4b7c24581831b7a4cdbd63e4726be5c2b1933d034ce12c65cf95e4c0ebe1175af7e32facace465bfd7c7c377401350a2df DIST gcc-12-20230121.tar.xz 79652428 BLAKE2B f4f0e6474d179454dc56dd05c823fca919a894e9efdc64625bb13045c7bd549a7bab59dfb4052d45d594d4484801ab5b18cf3f3d6277be54eaec24a53abd439c SHA512 b6c2486916418a64fab64c3655329bc18ca93ee4eca240e8779bd6d8280124fcd07b1aa8eff979fd317656646ecdba9353107887338354d8bd2c1f68c1609349 -DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606 +DIST gcc-12-20230128.tar.xz 79655464 BLAKE2B 6c4c6397749a3c9d11af8dd6ca1bd39312a9b06289f1f41fcf21df0cb55e3ab0b6e0efe44f4b8656ad41d6d49f6443ddda454ea5bbc956ef116cc011befe25c1 SHA512 7086b66509a9f7080805d9c4f8abf463c8e37729158eb2da60d9de97f9cdfd8664fe481a75c3730b78e12812bc9711c29554370f1af227c664ee6d3cf8708ede +DIST gcc-12-20230204.tar.xz 79685036 BLAKE2B cc602a3a48566d188e0751a5a2bcf3d88fd055431f3e8765039f10d66ebccaf8c469c7fe3ca7fa7c3bc98fbc60f070590863af19a0148abc5ef7de44bc45a376 SHA512 4b251c255844d263122056ca559badcfe33b0b96f2c8ab6d4cd4c197bd183559df51ceac5ba14bae5f48a9db923fcfcab0c9e7f54d45b7be1aa806702b639ed4 +DIST gcc-12.2.0-musl-patches-7.tar.xz 3652 BLAKE2B 295ea907efea854a3c2447d472bedb24714d78b7b725476b1eac3898d89c0c549da8e69db28911205bb3293f62cf344a90ade0898ecf5fed57ff00fcf8547a9f SHA512 7a7a440bc08de8dcb37c080ea0c27904adaaadaaaafaab24d90becd2d009243dcfc886d8f674ce3ccddb4ebb5ad17f04d841064d9ec2e2e2e96a1afac3002111 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258 DIST gcc-12.2.0-patches-10.tar.xz 14252 BLAKE2B 99368db982227728a6a9e2b1f694999f041f38db4a3806b6a740c86218735f9b561197bc150423a3caad0b5fd335c95d1aca130a519754423cd44a083e655373 SHA512 f7f0d8185e908926046f579793dba5916dc27392b85bfe50a7e70c213c3ba29479dfdb1b27514765b76bc897c4dbb530680e59c4deca7a245a808ed566120e4c +DIST gcc-12.2.0-patches-11.tar.xz 13652 BLAKE2B 3747d3e337ec2f2758fba90f5ffffb1ff62129e5752031c43934211806d96e1153039e4cd6d8d28c19fdf5d5f0d1f4875388dbb177a300aacd50124e38a7ed7c SHA512 50f9a6b0bd8b18dfb0bdc0a7179f26bd4cf8de7970c0b64a0cd9c8c92c002708ae961b9c904b735f15f827b3b8dab447515112d9b64e8f59568eb1e208029277 +DIST gcc-12.2.0-patches-12.tar.xz 15880 BLAKE2B 312144c6d881a7fbc1dd078a8d7c410a0354980ea58d31b24b377cda38383c04ac6392f5fd780ec0a7483232019cb90271fdc2e0c8b5d4556ccd1baa96de0720 SHA512 68c7352c661d74c159f20eb5ab9a6f8d95cac728e40fdb32cd61dd476feaf6caa0bdd917c6f1e3d915731533c7937eb96a49c1f39b9c2be86bb3f63079493540 DIST gcc-12.2.0-patches-2.tar.xz 13952 BLAKE2B a9e798911acaf45c3f585f69721130cfbecec016727a50ac0f4767b37a2ab9df39e0828abb07f1e429619cc102808f81af8422fef0265415c287d303d9d97fc0 SHA512 1808a05e98094577099d115ff5f3e136e3fc8f39fbe35c5183fd7775383f94439212e5e4174ab8d0ae8c0874e227ff84a958ffdfa1c99c9a8306a9842d126ef9 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 DIST gcc-13-20230122.tar.xz 82869800 BLAKE2B fff4bee436910ba587640600a95c2a89ddec415e12f629c941c8b27d28202c62b39dac2ca0b5d82d9fb4ca271310b178e89202f488f5ef4a7fbc63cd3ecfd7d7 SHA512 a24c0acedc81f72104fe13aba7403ee8920949089971aad5a296de7b46b8969d82b77df92bfd4ef2537b2e5c2010b72d3a33e3bf35ff734d9c49a7a1746026b5 +DIST gcc-13-20230129.tar.xz 82957104 BLAKE2B 15a8db17737a774c528116cc43a507cb702070371a15a9e65352f2485dc37651f99cb0d985258bff8267d7af2690933758016f60703b0ef3f5c44bb977baf955 SHA512 242038dbdedc5e9e0ea3b6832bfbea32411ad84360598dd1a57c3cb4ced01ced2d3a75ef440bcca71e457128731244d5c586bc553cd40709db3c23c93cb82c63 +DIST gcc-13-20230205.tar.xz 83535700 BLAKE2B 0a4ac98652dd0a0777133b23ab6e9b3855fd7be8a3f790745be2c42428acb28937f8061fb0bd51a20a733f213282f59439aa562b4b32801f04c87ce7b644fa40 SHA512 b3064c0de7c4bd92a6fd4d043cead7a238651449bb3e19f977e57f504dd3a191dafd67487d099238e07e3bac4b368b791b3ebefe9dfe78a9e572d8cdbc2a47d8 +DIST gcc-13.1.0-musl-patches-1.tar.xz 3528 BLAKE2B c572ab4a0fb929b16ec36b3a3616cdcccd62f7ee27ded8077008b9beb50539db64cc251ff8a3eade54e8ebfe1012f8f32d0802379bf8ffb0f1b8ce7c8457da37 SHA512 ffb7dfa54a9d23b5333664e915efd9f18a43cd696f4ff5669a8b072a0e9cf4978de53e315123542441a2533e4f269de0bb7d90ee7a37d3a7517b7cda6ea06681 DIST gcc-13.1.0-patches-5.tar.xz 11404 BLAKE2B 5ba2b4002e917750757a28fa4c7ff6ff7090c35f28eb984aee6ad7fc0ac80c88a9d08e1d4d9efa98e6bd3f06e89df47b10b51f8294bb7d2ef0d1ac3fd2a1a963 SHA512 6864738794237bd7430c612404dd4b84e275362cb5abd081284a91e5b24c1b0aa97d90b9543168c72147be146887219715325d52ae2920912d9c4e17e7224aa3 -DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb SHA512 b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2 +DIST gcc-13.1.0-patches-6.tar.xz 11552 BLAKE2B 65ad3f4f9f767712ba11146edc25c7cc8ceb66a42f031059f904a4bb36171065489f4b72f55f85665fac275c11bf1f9a19d546747eaba7d835d2bdccf4211db7 SHA512 4d8f7f59469a64ca541a62bb48983603db540434c5763dd157960f176b05f69360a36a0b057263e6c21148a74ec5e3eeb78f8eef0924a3a4f6af1c83bbcb1c67 +DIST gcc-13.1.0-patches-7.tar.xz 13472 BLAKE2B 186d2c4144759ceef40d7dcffb44a1b0b63b641fc7d11144444991f0f6dd25e00ae0561ce4a1f54231216d089f63557b3758c881b6b3aca7e940c18b9308e2f2 SHA512 6f793e0ce69f52b73289f1d8bc6e89ab84c380c3fe311740e31890001412643a49a4865fb33a3403ce229e5d5060157edd438a5f3d7621b4fc1b9f98aa6c9969 +DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8 -DIST gcc-9.5.0-patches-1.tar.xz 13772 BLAKE2B 2e2e84a28a729cd271a23716ff3fe08b7209b72254af279f04dd15dbd39482fb7d905dc9293dc326536e14bca9a53397bd7e1c4b617ed8cbe42bcf617fcce3fb SHA512 50e292e665bfae18bf71c0714074025b4f7cb87042862071815874f7c5b241acac3b8f60d85b8970b11978103c2e7616c02d789f6c3b091d7b736b65c535b743 +DIST gcc-9.5.0-patches-2.tar.xz 14324 BLAKE2B 1d3bf3e673108ad2fcdcb86daefb4603d1c9f6aa815e34d1591054d466b76d6f50cce124ab4760528c4951ea16eb00888a3e6485417f81ebf250548732df4a8e SHA512 a6d6f650aaf0bd193a17ac279649f0544a282cea295824384c59341c3000eac4b574b60e00dd427585d928f9768166abf85168b47772132790ad98854acacbbf DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f732c6d3f2b14d9382750b40c4f14b5d3051225b81f936ef8297b0ba8cb5439512e961dae5815d3bee2b0bfdb SHA512 cdd144ce4f747e051480410afc8506c90a57cb45da89071ddae377b1453bca3014422455ade9fe4563ebe51f4b6348cbc0c61905a9b8801cd597d51ad0ec62b3 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild index 2e1186f347..d109ff1e84 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ TOOLCHAIN_PATCH_DEV="sam" #TOOLCHAIN_GCC_RC=1 PATCH_GCC_VER="10.5.0" PATCH_VER="1" -MUSL_VER="1" +MUSL_VER="2" MUSL_GCC_VER="10.5.0" if [[ $(ver_cut 3) == 9999 ]] ; then diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230119-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230119-r1.ebuild index 2d7951f9c2..c11d683719 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230119-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230119-r1.ebuild @@ -8,7 +8,7 @@ TOOLCHAIN_PATCH_DEV="sam" #TOOLCHAIN_GCC_RC=1 PATCH_GCC_VER="10.5.0" PATCH_VER="4" -MUSL_VER="1" +MUSL_VER="2" MUSL_GCC_VER="10.5.0" if [[ $(ver_cut 3) == 9999 ]] ; then @@ -36,7 +36,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" fi RDEPEND="" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230126.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230126.ebuild new file mode 100644 index 0000000000..68d9c25226 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230126.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_SUFFIX="xz" +TOOLCHAIN_PATCH_DEV="sam" +#TOOLCHAIN_GCC_RC=1 +PATCH_GCC_VER="10.5.0" +PATCH_VER="5" +MUSL_VER="2" +MUSL_GCC_VER="10.5.0" + +if [[ $(ver_cut 3) == 9999 ]] ; then + MY_PV_2=$(ver_cut 2) + if [[ ${MY_PV_2} == 0 ]] ; then + MY_PV_2=0 + else + MY_PV_2=$(($(ver_cut 2) - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) +elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then + # Cheesy hack for RCs + MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) + MY_P=${PN}-${MY_PV} + GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" + TOOLCHAIN_SET_S=no + S="${WORKDIR}"/${MY_P} +fi + +inherit toolchain +# Needs to be after inherit (for now?), bug #830908 +EGIT_BRANCH=releases/gcc-$(ver_cut 1) + +# Don't keyword live ebuilds +#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +# KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" +#fi + +RDEPEND="" +BDEPEND="${CATEGORY}/binutils" + +src_prepare() { + local p upstreamed_patches=( + # add them here + ) + for p in "${upstreamed_patches[@]}"; do + rm -v "${WORKDIR}/patch/${p}" || die + done + + if has_version '>=sys-libs/glibc-2.32-r1'; then + rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die + fi + + toolchain_src_prepare +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230202.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230202.ebuild new file mode 100644 index 0000000000..68d9c25226 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20230202.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_SUFFIX="xz" +TOOLCHAIN_PATCH_DEV="sam" +#TOOLCHAIN_GCC_RC=1 +PATCH_GCC_VER="10.5.0" +PATCH_VER="5" +MUSL_VER="2" +MUSL_GCC_VER="10.5.0" + +if [[ $(ver_cut 3) == 9999 ]] ; then + MY_PV_2=$(ver_cut 2) + if [[ ${MY_PV_2} == 0 ]] ; then + MY_PV_2=0 + else + MY_PV_2=$(($(ver_cut 2) - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) +elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then + # Cheesy hack for RCs + MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) + MY_P=${PN}-${MY_PV} + GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" + TOOLCHAIN_SET_S=no + S="${WORKDIR}"/${MY_P} +fi + +inherit toolchain +# Needs to be after inherit (for now?), bug #830908 +EGIT_BRANCH=releases/gcc-$(ver_cut 1) + +# Don't keyword live ebuilds +#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +# KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" +#fi + +RDEPEND="" +BDEPEND="${CATEGORY}/binutils" + +src_prepare() { + local p upstreamed_patches=( + # add them here + ) + for p in "${upstreamed_patches[@]}"; do + rm -v "${WORKDIR}/patch/${p}" || die + done + + if has_version '>=sys-libs/glibc-2.32-r1'; then + rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die + fi + + toolchain_src_prepare +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild index 821ee78ba0..f947b7097d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ TOOLCHAIN_PATCH_SUFFIX="xz" TOOLCHAIN_PATCH_DEV="sam" PATCH_VER="3" PATCH_GCC_VER="11.4.0" -MUSL_VER="0" +MUSL_VER="2" MUSL_GCC_VER="11.4.0" if [[ $(ver_cut 3) == 9999 ]] ; then diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild index 9c37d622eb..877d1c2ecf 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild @@ -7,7 +7,7 @@ TOOLCHAIN_PATCH_SUFFIX="xz" TOOLCHAIN_PATCH_DEV="sam" PATCH_VER="7" PATCH_GCC_VER="11.4.0" -MUSL_VER="1" +MUSL_VER="2" MUSL_GCC_VER="11.4.0" if [[ $(ver_cut 3) == 9999 ]] ; then @@ -28,7 +28,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" fi # Technically only if USE=hardened *too* right now, but no point in complicating it further. diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230127.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230127.ebuild new file mode 100644 index 0000000000..3029159b6f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230127.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_SUFFIX="xz" +TOOLCHAIN_PATCH_DEV="sam" +PATCH_VER="8" +PATCH_GCC_VER="11.4.0" +MUSL_VER="2" +MUSL_GCC_VER="11.4.0" + +if [[ $(ver_cut 3) == 9999 ]] ; then + MY_PV_2=$(ver_cut 2) + if [[ ${MY_PV_2} == 0 ]] ; then + MY_PV_2=0 + else + MY_PV_2=$(($(ver_cut 2) - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) +fi + +inherit toolchain +# Needs to be after inherit (for now?), bug #830908 +EGIT_BRANCH=releases/gcc-$(ver_cut 1) + +# Don't keyword live ebuilds +#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +# KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" +#fi + +# 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() { + local p upstreamed_patches=( + # add them here + ) + for p in "${upstreamed_patches[@]}"; do + rm -v "${WORKDIR}/patch/${p}" || die + done + + toolchain_src_prepare + + eapply_user +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230203.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230203.ebuild new file mode 100644 index 0000000000..3029159b6f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20230203.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_SUFFIX="xz" +TOOLCHAIN_PATCH_DEV="sam" +PATCH_VER="8" +PATCH_GCC_VER="11.4.0" +MUSL_VER="2" +MUSL_GCC_VER="11.4.0" + +if [[ $(ver_cut 3) == 9999 ]] ; then + MY_PV_2=$(ver_cut 2) + if [[ ${MY_PV_2} == 0 ]] ; then + MY_PV_2=0 + else + MY_PV_2=$(($(ver_cut 2) - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) +fi + +inherit toolchain +# Needs to be after inherit (for now?), bug #830908 +EGIT_BRANCH=releases/gcc-$(ver_cut 1) + +# Don't keyword live ebuilds +#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +# KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" +#fi + +# 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() { + local p upstreamed_patches=( + # add them here + ) + for p in "${upstreamed_patches[@]}"; do + rm -v "${WORKDIR}/patch/${p}" || die + done + + toolchain_src_prepare + + eapply_user +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.0.ebuild index aa3dfbf98f..3b7175fe4a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" PATCH_VER="1" PATCH_GCC_VER="12.2.0" -MUSL_VER="1" +MUSL_VER="7" MUSL_GCC_VER="12.2.0" if [[ $(ver_cut 3) == 9999 ]] ; then diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild index e1e84c1bc2..18f3ae78e0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221126.ebuild @@ -6,7 +6,7 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" PATCH_VER="2" PATCH_GCC_VER="12.2.0" -MUSL_VER="1" +MUSL_VER="7" MUSL_GCC_VER="12.2.0" if [[ $(ver_cut 3) == 9999 ]] ; then diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild index 1d9c09da85..148aa2769b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" PATCH_VER="10" PATCH_GCC_VER="12.2.0" -MUSL_VER="1" +MUSL_VER="7" MUSL_GCC_VER="12.2.0" if [[ $(ver_cut 3) == 9999 ]] ; then @@ -35,7 +35,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1) # Don't keyword live ebuilds if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86" fi # Technically only if USE=hardened *too* right now, but no point in complicating it further. diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230128.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230128.ebuild new file mode 100644 index 0000000000..f5950cb3f0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230128.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_VER="11" +PATCH_GCC_VER="12.2.0" +MUSL_VER="7" +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-12.2.1_p20230204-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230204-r1.ebuild new file mode 100644 index 0000000000..f06e3092b9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230204-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_VER="12" +PATCH_GCC_VER="12.2.0" +MUSL_VER="7" +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-12.2.1_p20230204.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230204.ebuild new file mode 100644 index 0000000000..f5950cb3f0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20230204.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_VER="11" +PATCH_GCC_VER="12.2.0" +MUSL_VER="7" +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.1_pre20230129-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230129-r1.ebuild new file mode 100644 index 0000000000..11249ed6c9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230129-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_VER="6" +PATCH_GCC_VER="13.1.0" +MUSL_VER="1" +MUSL_GCC_VER="13.1.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} +fi + +inherit toolchain +# Needs to be after inherit (for now?), bug #830908 +EGIT_BRANCH=master + +# Don't keyword live ebuilds +if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~loong" +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(-)?]" + +src_prepare() { + local p upstreamed_patches=( + # add them here + ) + for p in "${upstreamed_patches[@]}"; do + rm -v "${WORKDIR}/patch/${p}" || die + done + + toolchain_src_prepare + + eapply_user +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230205-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230205-r1.ebuild new file mode 100644 index 0000000000..168e1635cb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230205-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_VER="7" +PATCH_GCC_VER="13.1.0" +MUSL_VER="1" +MUSL_GCC_VER="13.1.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} +fi + +inherit toolchain +# Needs to be after inherit (for now?), bug #830908 +EGIT_BRANCH=master + +# Don't keyword live ebuilds +if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~loong" +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(-)?]" + +src_prepare() { + local p upstreamed_patches=( + # add them here + ) + for p in "${upstreamed_patches[@]}"; do + rm -v "${WORKDIR}/patch/${p}" || die + done + + toolchain_src_prepare + + eapply_user +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230205.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230205.ebuild new file mode 100644 index 0000000000..11249ed6c9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.1_pre20230205.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_VER="6" +PATCH_GCC_VER="13.1.0" +MUSL_VER="1" +MUSL_GCC_VER="13.1.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} +fi + +inherit toolchain +# Needs to be after inherit (for now?), bug #830908 +EGIT_BRANCH=master + +# Don't keyword live ebuilds +if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~loong" +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(-)?]" + +src_prepare() { + local p upstreamed_patches=( + # add them here + ) + for p in "${upstreamed_patches[@]}"; do + rm -v "${WORKDIR}/patch/${p}" || die + done + + toolchain_src_prepare + + eapply_user +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-8.5.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-8.5.0-r1.ebuild index ff79926837..2d77b92b03 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-8.5.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-8.5.0-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TOOLCHAIN_PATCH_DEV="slyfox" -PATCH_VER="2" +TOOLCHAIN_PATCH_SUFFIX="xz" +TOOLCHAIN_PATCH_DEV="sam" +PATCH_VER="4" inherit toolchain diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-9.5.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-9.5.0.ebuild index 133de20067..868742a9b8 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-9.5.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-9.5.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 TOOLCHAIN_PATCH_DEV="sam" PATCH_GCC_VER="9.5.0" -PATCH_VER="1" +PATCH_VER="2" if [[ $(ver_cut 3) == 9999 ]] ; then MY_PV_2=$(ver_cut 2) From b467dc7d6bb5ab8e3878aa0968ca1a93f6bc9fd1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:22:00 +0000 Subject: [PATCH 34/41] sys-devel/libtool: Sync with Gentoo It's from Gentoo commit cfb6be2cca843dbf53924056bf74d626a2660e85. --- .../files/libtool-2.4.7-grep-3.8.patch | 31 +++++++++++++++++++ .../sys-devel/libtool/libtool-2.4.7-r1.ebuild | 8 +++-- .../sys-devel/libtool/libtool-9999.ebuild | 6 ++-- 3 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch new file mode 100644 index 0000000000..8f1de478ae --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/892635 +https://lists.gnu.org/archive/html/libtool-patches/2022-12/msg00004.html + +From 414deacee0f564afdf2d7750450274c581330a59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= +Date: Wed, 21 Dec 2022 13:14:03 +0100 +Subject: [PATCH] tests: Fix grep warning about stray \ before / + +Recent version of grep emit a warning if stray \ is found before /. +This leads to the link-order test failure. + + * tests/link-order.at: Remove unneeded \ before / +--- a/tests/link-order.at ++++ b/tests/link-order.at +@@ -99,12 +99,12 @@ aix* | interix*) ;; # These systems have different path syntax + case $hardcode_direct$hardcode_direct_absolute in + yesno) + AT_CHECK([if $EGREP relinking stderr; then +- $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout ++ $EGREP " .*/new/lib/libb$shared_ext .*/old/lib/libcee$shared_ext" stdout + else :; fi], [0], [ignore], [], [echo "wrong link order"]) + ;; + *) + AT_CHECK([if $EGREP relinking stderr; then +- $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout ++ $EGREP " -L.*/new/lib -lb -L.*/old/lib -lcee" stdout + else :; fi], [0], [ignore], [], [echo "wrong link order"]) + ;; + esac +-- +2.38.1 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild index 75a9976589..440935aac6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-2.4.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" fi DESCRIPTION="A shared library tool for developers" @@ -30,7 +30,8 @@ RDEPEND=" sys-devel/gnuconfig >=sys-devel/autoconf-2.69:* >=sys-devel/automake-1.13:* - >=dev-libs/libltdl-2.4.7" + >=dev-libs/libltdl-2.4.7 +" DEPEND="${RDEPEND}" [[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man" @@ -44,6 +45,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch "${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch "${FILESDIR}"/${PN}-2.4.7-werror-lto.patch + "${FILESDIR}"/${PN}-2.4.7-grep-3.8.patch ) src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-9999.ebuild index ae3d351ad4..17e6697331 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/libtool/libtool-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,7 +30,8 @@ RDEPEND=" sys-devel/gnuconfig >=sys-devel/autoconf-2.69:* >=sys-devel/automake-1.13:* - >=dev-libs/libltdl-2.4.7" + >=dev-libs/libltdl-2.4.7 +" DEPEND="${RDEPEND}" [[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man" @@ -43,6 +44,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.4.6-mint.patch "${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch "${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch + "${FILESDIR}"/${PN}-2.4.7-grep-3.8.patch ) src_prepare() { From 6cb982133c95b8c330a95ddd8b0e4fa427e934a4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:22:01 +0000 Subject: [PATCH 35/41] sys-devel/patch: Sync with Gentoo It's from Gentoo commit 1f1ff19f615b6568ca81c49f051e38359de1f2c0. --- .../portage-stable/sys-devel/patch/patch-2.7.6-r5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r5.ebuild index 09f7c0284f..e93ac48c38 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/patch/patch-2.7.6-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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" IUSE="static test xattr" RESTRICT="!test? ( test )" From dd9cfac64707da4e450fa4ffb24fb1c33bdd55b2 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:22:06 +0000 Subject: [PATCH 36/41] sys-kernel/linux-headers: Sync with Gentoo It's from Gentoo commit 3ad39371aca6624de8c7234867ebd8f81dab3ae4. --- .../sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild | 2 +- .../sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild | 2 +- .../sys-kernel/linux-headers/linux-headers-5.19.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild index 08907ac2fb..06fcc6978c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild @@ -40,7 +40,7 @@ src_prepare() { } src_test() { - emake headers_check ${xmakeopts} + emake headers_check "${KERNEL_MAKEOPTS[@]}" } src_install() { diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild index 9d2ebae3da..dae40c5ab6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild @@ -43,7 +43,7 @@ src_prepare() { } src_test() { - emake headers_check ${xmakeopts} + emake headers_check "${KERNEL_MAKEOPTS[@]}" } src_install() { diff --git a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.19.ebuild b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.19.ebuild index 527b4b401d..8ae17e59be 100644 --- a/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.19.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-kernel/linux-headers/linux-headers-5.19.ebuild @@ -42,7 +42,7 @@ src_prepare() { } src_test() { - emake headers_check ${xmakeopts} + emake headers_check "${KERNEL_MAKEOPTS[@]}" } src_install() { From 69e669d3a80144b26f9284fd0d7e4c8c1eec2c26 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:22:06 +0000 Subject: [PATCH 37/41] sys-libs/libcap: Sync with Gentoo It's from Gentoo commit de9bbc107499ed1a843ce5e7597890aadbbff3e4. --- .../portage-stable/sys-libs/libcap/Manifest | 1 + .../sys-libs/libcap/libcap-2.67.ebuild | 96 +++++++++++++++++++ .../sys-libs/libcap/libcap-9999.ebuild | 6 +- 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.67.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/Manifest index 361498a897..bd826b4b31 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/Manifest @@ -1 +1,2 @@ DIST libcap-2.66.tar.xz 181592 BLAKE2B e79bf10c6a3dbffe96dc97aad0bed67caa0b3805d9dcaff1e4a8a833396ee5c6da4f7f0d321b254e99a00073bc39021b9f3a4b350d93094d0df4d74889b3ca56 SHA512 ac005b622f6e065f30ce282a5c87240e7b9da75366ee537aa4835bc501b44bc242c10a4ba4dc070e2415fc7f635d1c3c4e45fbeeaf962cf7973dda82bf6377f0 +DIST libcap-2.67.tar.xz 186864 BLAKE2B bd9be22e439397a3c1726093cfee2410df93773b3139d50a1cdc10daecb666ddb9b64daded6e0ec9f2fd6defd16ea156dbd66bd55360ea266131f31ea0f0e989 SHA512 2e52c5a571cc1565e6829b0889f63216af10dfd9a86485f8ae7d0fcf4cc0db96aa21eb2ddea29e8dadf41a1194e91fb5961fe84ba07beb2ce950b6131be099d4 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.67.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.67.ebuild new file mode 100644 index 0000000000..2072f83214 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-2.67.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal toolchain-funcs pam usr-ldscript + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libcap/libcap.git" +else + SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="POSIX 1003.1e capabilities" +HOMEPAGE="https://sites.google.com/site/fullycapable/" + +# it's available under either of the licenses +LICENSE="|| ( GPL-2 BSD )" +SLOT="0" +IUSE="pam static-libs tools" + +# While the build system optionally uses gperf, we don't DEPEND on it because +# the build automatically falls back when it's unavailable. #604802 +PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )" +DEPEND="${PDEPEND} + sys-kernel/linux-headers" +BDEPEND=" + sys-apps/diffutils + tools? ( dev-lang/go )" + +QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS + +PATCHES=( + "${FILESDIR}"/${PN}-2.62-ignore-RAISE_SETFCAP-install-failures.patch +) + +src_prepare() { + default + multilib_copy_sources +} + +run_emake() { + local args=( + AR="$(tc-getAR)" + CC="$(tc-getCC)" + OBJCOPY="$(tc-getOBJCOPY)" + RANLIB="$(tc-getRANLIB)" + exec_prefix="${EPREFIX}" + lib_prefix="${EPREFIX}/usr" + lib="$(get_libdir)" + prefix="${EPREFIX}/usr" + PAM_CAP="$(usex pam yes no)" + DYNAMIC=yes + GOLANG="$(multilib_native_usex tools yes no)" + ) + emake "${args[@]}" "$@" +} + +src_configure() { + tc-export_build_env BUILD_CC + multilib-minimal_src_configure +} + +multilib_src_compile() { + run_emake +} + +multilib_src_test() { + run_emake test +} + +multilib_src_install() { + # no configure, needs explicit install line #444724#c3 + run_emake DESTDIR="${D}" install + + gen_usr_ldscript -a cap + gen_usr_ldscript -a psx + if ! use static-libs ; then + rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die + fi + + # install pam plugins ourselves + rm -rf "${ED}"/usr/$(get_libdir)/security || die + + if use pam ; then + dopammod pam_cap/pam_cap.so + dopamsecurity '' pam_cap/capability.conf + fi +} + +multilib_src_install_all() { + dodoc CHANGELOG README doc/capability.notes +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-9999.ebuild index b155f38464..2072f83214 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libcap/libcap-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,6 +33,10 @@ BDEPEND=" QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS +PATCHES=( + "${FILESDIR}"/${PN}-2.62-ignore-RAISE_SETFCAP-install-failures.patch +) + src_prepare() { default multilib_copy_sources From 98b6ad1d9c156c81579ecfc7cef5e4bfd63fce89 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 8 Feb 2023 12:22:09 +0000 Subject: [PATCH 38/41] virtual/libelf: Sync with Gentoo It's from Gentoo commit 46e1c0d450726ebc2fe4cc724e70fc213d978d87. --- .../third_party/portage-stable/virtual/libelf/metadata.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/virtual/libelf/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/libelf/metadata.xml index 8a95717b1d..d65b2dff50 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libelf/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/virtual/libelf/metadata.xml @@ -1,9 +1,9 @@ - - blueness@gentoo.org - Anthony G. Basile + + toolchain@gentoo.org + Gentoo Toolchain Project From c5eff83353af60f1798d2eba650d96da51c8d9c6 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 21 Feb 2023 13:57:18 +0530 Subject: [PATCH 39/41] dev-libs/libuv: Sync with Gentoo It's from Gentoo commit 0ee230b800453fe60225f424f14e717a28a9bdc9. --- .../portage-stable/dev-libs/libuv/Manifest | 4 +- .../dev-libs/libuv/libuv-1.41.1.ebuild | 58 ------------------- .../dev-libs/libuv/libuv-1.42.0.ebuild | 58 ------------------- ...v-1.41.0.ebuild => libuv-1.44.2-r1.ebuild} | 21 +++---- .../dev-libs/libuv/libuv-9999.ebuild | 21 +++---- .../dev-libs/libuv/metadata.xml | 6 +- 6 files changed, 20 insertions(+), 148 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.41.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.42.0.ebuild rename sdk_container/src/third_party/portage-stable/dev-libs/libuv/{libuv-1.41.0.ebuild => libuv-1.44.2-r1.ebuild} (59%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/Manifest index a3c6e0d94a..6103274ae2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/Manifest @@ -1,3 +1 @@ -DIST libuv-1.41.0.tar.gz 1281268 BLAKE2B 6d6fef33953c4d03835adfdd66e9a44c61071440ceeea48d88bcf6593e2a35c7d0878369c87b38a92f66ead2ab0f799d4b7476ced3707ca7f41e39f93875bdc4 SHA512 bb08a1970a10e8d9571ffea3d021643de30ec212cd51317b98d6cf0cfe55d6877992921fb01d1188a6d466687335b77885685d924f8cb7200a0bec30eee05c65 -DIST libuv-1.41.1.tar.gz 1281506 BLAKE2B 4102df9559724c4f6bab090c57c8c976b7784bdc28243047c6c4cb2d61ce97deeb6f02e322238b98e9900575c981e8a586db852d5d34f0fd222a0091fc391a5b SHA512 dfd4996a2e8d6cc1ffe141921b2472070c8678cbbb8f0cf333dba7e7a36be0dee7fc3515152a27253252bbe48a9b29766d654f7f77137dd6f6bf0a8330c90fc4 -DIST libuv-1.42.0.tar.gz 1293478 BLAKE2B c2b46492167d759fd781b704dd256de100ca5bed62b0afe74fd8c46d5ecce15c53c4158d2e938314c578f26978e9be0bc69c4ffd0f40b2cd8419fa120df5dc2e SHA512 29982c975fccb99dcf28c8cc0f9fe9f15a0c546778b0723596a790021441b8be1ccece17f63319b5a1f0ccda8a846c0b544f9259d3482e84e14138461a0d882b +DIST libuv-1.44.2.tar.gz 1309062 BLAKE2B 883a1fbffcd8f55bf28ea5a79ed18aa3e2f2fac126285e8aca2ef9370eafc62f69f95ddb8bf27d4159e038bfb0a01abafdf0dadbc4309e5d31f0e77057ee84ac SHA512 d21c890787b0b364fafa5fc0cbbff296bc2ca269e1991d2f7f35fcb37b8634da377466f5af5a4245425fcf876ae6870d100ab32b12bce64f8e0b01fd25a1bc83 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.41.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.41.1.ebuild deleted file mode 100644 index 15969ea173..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.41.1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal - -DESCRIPTION="Cross-platform asychronous I/O" -HOMEPAGE="https://github.com/libuv/libuv" - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/libuv/libuv.git" - inherit git-r3 -else - SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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="BSD BSD-2 ISC MIT" -SLOT="0/1" - -BDEPEND=" - sys-devel/libtool - virtual/pkgconfig -" - -src_prepare() { - default - - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ - > m4/libuv-extra-automake-flags.m4 || die - - if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then - eapply "${FILESDIR}"/${PN}-1.41.0-darwin.patch - fi - - # upstream fails to ship a configure script - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --disable-static - cc_cv_cflags__g=no - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die - default -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.42.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.42.0.ebuild deleted file mode 100644 index f1d10ed56e..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.42.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal - -DESCRIPTION="Cross-platform asychronous I/O" -HOMEPAGE="https://github.com/libuv/libuv" - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/libuv/libuv.git" - inherit git-r3 -else - SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="BSD BSD-2 ISC MIT" -SLOT="0/1" - -BDEPEND=" - sys-devel/libtool - virtual/pkgconfig -" - -src_prepare() { - default - - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ - > m4/libuv-extra-automake-flags.m4 || die - - if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then - eapply "${FILESDIR}"/${PN}-1.41.0-darwin.patch - fi - - # upstream fails to ship a configure script - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - --disable-static - cc_cv_cflags__g=no - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die - default -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.41.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild similarity index 59% rename from sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.41.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild index 082ca53423..a994456d83 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.41.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools multilib-minimal +inherit autotools DESCRIPTION="Cross-platform asychronous I/O" HOMEPAGE="https://github.com/libuv/libuv" @@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="BSD BSD-2 ISC MIT" @@ -34,25 +34,20 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-1.41.0-darwin.patch fi - # upstream fails to ship a configure script + # Upstream fails to ship a configure script eautoreconf } -multilib_src_configure() { +src_configure() { local myeconfargs=( - --disable-static cc_cv_cflags__g=no ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + econf "${myeconfargs[@]}" } -multilib_src_test() { - cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die +src_install() { default -} -multilib_src_install_all() { - einstalldocs find "${ED}" -name '*.la' -delete || die } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild index f1d10ed56e..0898d659c8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools multilib-minimal +inherit autotools DESCRIPTION="Cross-platform asychronous I/O" HOMEPAGE="https://github.com/libuv/libuv" @@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="BSD BSD-2 ISC MIT" @@ -34,25 +34,20 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-1.41.0-darwin.patch fi - # upstream fails to ship a configure script + # Upstream fails to ship a configure script eautoreconf } -multilib_src_configure() { +src_configure() { local myeconfargs=( - --disable-static cc_cv_cflags__g=no ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + econf "${myeconfargs[@]}" } -multilib_src_test() { - cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die +src_install() { default -} -multilib_src_install_all() { - einstalldocs find "${ED}" -name '*.la' -delete || die } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/metadata.xml index 1c0c407888..718fde52d3 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/metadata.xml @@ -1,13 +1,13 @@ - + kde@gentoo.org Gentoo KDE Project - jakov.smolic@sartura.hr - Jakov Smolic + jsmolic@gentoo.org + Jakov Smolić libuv is a platform layer for node.js. Its purpose is to abstract From 6b9994a41aa2d33f6c011455a8991e874f498a5f Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 21 Feb 2023 13:58:11 +0530 Subject: [PATCH 40/41] .github: Add dev-libs/libuv to the package-list Signed-off-by: Sayan Chowdhury --- .../third_party/portage-stable/.github/workflows/packages-list | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/portage-stable/.github/workflows/packages-list b/sdk_container/src/third_party/portage-stable/.github/workflows/packages-list index b86d90f5c1..614350286b 100644 --- a/sdk_container/src/third_party/portage-stable/.github/workflows/packages-list +++ b/sdk_container/src/third_party/portage-stable/.github/workflows/packages-list @@ -121,6 +121,7 @@ dev-libs/libltdl dev-libs/libnl dev-libs/libpcre2 dev-libs/libtasn1 +dev-libs/libuv dev-libs/libxml2 dev-libs/libxslt dev-libs/nettle From 9afe95bc200745797806a5d6fa7037a1dbcf7689 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Wed, 22 Feb 2023 18:11:06 +0530 Subject: [PATCH 41/41] changelog: Add the changelog entries for the weekly updated packages Signed-off-by: Sayan Chowdhury --- .../changelog/updates/2023-02-22-weekly-updates.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/changelog/updates/2023-02-22-weekly-updates.md diff --git a/sdk_container/src/third_party/portage-stable/changelog/updates/2023-02-22-weekly-updates.md b/sdk_container/src/third_party/portage-stable/changelog/updates/2023-02-22-weekly-updates.md new file mode 100644 index 0000000000..04e599d515 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/updates/2023-02-22-weekly-updates.md @@ -0,0 +1,4 @@ +- SDK: cmake ([3.25.2](https://cmake.org/cmake/help/v3.25/release/3.25.html)) +- iputils ([20221126](https://github.com/iputils/iputils/releases/tag/20221126)) +- libpcre2 ([10.42](https://github.com/PCRE2Project/pcre2/blob/pcre2-10.42/NEWS)) +- strace ([6.1](https://github.com/strace/strace/releases/tag/v6.1))