From 6dafc466476ae8febbb8d53f3e576e89aefdd7fe Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:15:04 +0000 Subject: [PATCH 01/26] app-arch/unzip: Sync with Gentoo It's from Gentoo commit 5ed7ef1c1f72418e5e4cd71eb5bcc7c84bd7bd64. --- .../portage-stable/app-arch/unzip/unzip-6.0_p26.ebuild | 2 +- .../portage-stable/app-arch/unzip/unzip-6.0_p27-r1.ebuild | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p26.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p26.ebuild index 78e5c99af6..d53d771fa9 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p26.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p26.ebuild @@ -10,7 +10,7 @@ MY_PV="${MY_PV%_p*}" MY_P="${PN}${MY_PV}" DESCRIPTION="unzipper for pkzip-compressed files" -HOMEPAGE="http://www.info-zip.org/" +HOMEPAGE="https://infozip.sourceforge.net/UnZip.html" SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p27-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p27-r1.ebuild index c466394b30..126a4a35e2 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p27-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/unzip/unzip-6.0_p27-r1.ebuild @@ -10,13 +10,13 @@ MY_PV="${MY_PV%_p*}" MY_P="${PN}${MY_PV}" DESCRIPTION="unzipper for pkzip-compressed files" -HOMEPAGE="http://www.info-zip.org/" +HOMEPAGE="https://infozip.sourceforge.net/UnZip.html" SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" LICENSE="Info-ZIP" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 ) @@ -73,6 +73,7 @@ src_configure() { *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; esac + # Needed for Clang 16 append-flags -std=gnu89 [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD From d3c71001287f8e636ce5a50ec4bf19db3ae496db Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:15:04 +0000 Subject: [PATCH 02/26] app-arch/xz-utils: Sync with Gentoo It's from Gentoo commit e8bd5f703fe4b3daab6ff133f921a845da3cf503. --- .../src/third_party/portage-stable/app-arch/xz-utils/Manifest | 4 ++-- ...z-utils-5.3.3_alpha.ebuild => xz-utils-5.3.4_alpha.ebuild} | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/portage-stable/app-arch/xz-utils/{xz-utils-5.3.3_alpha.ebuild => xz-utils-5.3.4_alpha.ebuild} (95%) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest index 17158fbbc9..94f1389265 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest @@ -2,5 +2,5 @@ DIST xz-5.2.7.tar.gz 2105803 BLAKE2B 5363c5d0403e041c6d2e35b5d3321feeb8e63b85564 DIST xz-5.2.7.tar.gz.sig 566 BLAKE2B 00702dff24d655ebf30f2bf8bee94406e002164408b9eabb4f461a789482584c2b9c90675b8d1d5e030913e674946aa7392b73fcedf6ac62e3b1e3bc05bf92e6 SHA512 556e05107437fae2c75cc1a93465fce04426707e979403f41c6ee5b748fe7c3f985812a4e3b07785a84f68ef9d9f362ded470af1cceb9f4e8c80620a2699163f DIST xz-5.2.8.tar.gz 2118089 BLAKE2B 28d4ede071ebd04fe6ce6b9ba88245aca432c7b3077a4857a14310001cbd1230026888d1813b5c163b86de3ec78c92418d9cb35f867f1a8ea65e5de593091676 SHA512 aaba9e4dfabc1ccb66b92f5930ca07219089c7c02396be80bd727073f90c824d2698f7aaaf156b881fdc6750da993e8a6289929d71225df8327bc3beed5cdee1 DIST xz-5.2.8.tar.gz.sig 566 BLAKE2B c3f20d6fabd42839c0265b9c5a308b43392705f4923f83e9aba808d5d2b03814b1af566c1ff078dc0a69143420a47e5ee0a0f8dcc6773595d1ee2a8e3922a88a SHA512 253c0877357cd7305f4c852cc2b946b196a4007b48b58824446729f8f2390f6465d6d2bb9087d1147a40a707940142a5eb7ada91f0323b95482b92eff05904f2 -DIST xz-5.3.3alpha.tar.gz 2119150 BLAKE2B 031e1a1556cbbd49565c2b72676e46a22c00e0e25bca2938c21d56f2d7f585c294d2a3a5712a3ae5d62fe8fef6e7b2f411fcc3c0ccac4714786209599b599d25 SHA512 c780c6854cb7599ed97629dbf923f5c6802b48e12aa25638c863e2403e56557abffb2b501823d4d53c852b7d09360b9ede355989756fef1daa1fa8cd9395da8d -DIST xz-5.3.3alpha.tar.gz.sig 566 BLAKE2B 2a02fd8a84c27967384021aa879efdf598b40ca9ff552080be2d057f402b3aace13bb0d98574e0185edd6ee3084793767f9941d4c1f21f5c5d55f886025cb845 SHA512 e6a849f2dd6f67ad3d51f50fe5f3e7f2a57e97e9d89499e2f88b94ab9716f1db5de34c3bb6f17b6fd55498ee5f4653d3d25e1a495b9c682b3200b2603a85479f +DIST xz-5.3.4alpha.tar.gz 2216390 BLAKE2B 0ed5828645b665bd5b18187ac051419258cf3790ffc1868ddd0989bf722c844c7acc3acfd75fa49ba2a4a03da6d105e09e35287ff518a57af5e18b61046ff901 SHA512 5b81d16d2a4547a638421147ec1018fb2a1f413c6ad73e82def47a371c8a3959a382c58296789a9c5ea1efe6e763bbe559c10d10d1d2cc2ebbc06298b8136cf7 +DIST xz-5.3.4alpha.tar.gz.sig 566 BLAKE2B ddb49538c1a2e1eee2166b07cdd828dd58934d39f08a9631d2370d61c6ad34ae1be32038f0e9fd8f39e68fc291c07657b04e80b50ade86c3feb589e623662081 SHA512 b44ccb8ccac7082410156b04f8dafb07a619b4f246ea3cbd1a51564330d3cf497f4caf5afe730102cb382d6bad0cdd859ab032e048e8f0ee395940400b5c85ce diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.3.3_alpha.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.3.4_alpha.ebuild similarity index 95% rename from sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.3.3_alpha.ebuild rename to sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.3.4_alpha.ebuild index 3072f038b6..650633ad35 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.3.3_alpha.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.3.4_alpha.ebuild @@ -6,7 +6,6 @@ EAPI=7 -QA_PKGCONFIG_VERSION=${PV/_/} inherit libtool multilib multilib-minimal preserve-libs usr-ldscript if [[ ${PV} == 9999 ]] ; then @@ -42,9 +41,6 @@ if [[ ${PV} != 9999 ]] ; then BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )" fi -# Tests currently do not account for smaller feature set -RESTRICT="!extra-filters? ( test )" - src_prepare() { default From b7b81d2facf0b21aac81693cf44417a8a38edaf4 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:15:07 +0000 Subject: [PATCH 03/26] dev-libs/glib: Sync with Gentoo It's from Gentoo commit 226753674ad9e72e74b27593c367ebc855c979cd. --- .../portage-stable/dev-libs/glib/glib-2.74.1-r1.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.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.1-r1.ebuild index 7c677d9449..0ab9007ca2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.74.1-r1.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 48764b7910771ef85c81f41e45264ff627ae199f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:15:07 +0000 Subject: [PATCH 04/26] dev-libs/gobject-introspection: Sync with Gentoo It's from Gentoo commit ad68a615a582b889b6e4c12be2affaa2313b6178. --- .../gobject-introspection/gobject-introspection-1.74.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.74.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.74.0.ebuild index f1285af7d4..16e09b0f1f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.74.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection/gobject-introspection-1.74.0.ebuild @@ -15,7 +15,7 @@ SLOT="0" IUSE="doctool gtk-doc test" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # virtual/pkgconfig needed at runtime, bug #505408 RDEPEND=" From 3095256ee76e8f3d4694a4a0150e6391a78149b9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:15:07 +0000 Subject: [PATCH 05/26] dev-libs/gobject-introspection-common: Sync with Gentoo It's from Gentoo commit 26b4d97fd62734ddc72426511d1ec38b8f49ce9e. --- .../gobject-introspection-common-1.74.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.74.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.74.0.ebuild index b77fc5c734..8a873e82dd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.74.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/gobject-introspection-common/gobject-introspection-common-1.74.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection" LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}" # Use !<${PV} because mixing gobject-introspection with different version of -common can cause issues like: From 3c0fbe09b2399c3fb80e211793c6307d0fdb5a8e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:15:13 +0000 Subject: [PATCH 06/26] dev-util/cmake: Sync with Gentoo It's from Gentoo commit ba5807bd908d9f78dbd76f08d8429a29061626ad. --- .../portage-stable/dev-util/cmake/Manifest | 4 + .../dev-util/cmake/cmake-3.24.3.ebuild | 2 +- .../dev-util/cmake/cmake-3.25.0.ebuild | 293 ++++++++++++++++++ 3 files changed, 298 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.0.ebuild 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 5b53baffa7..e8b0ff12b5 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 @@ -9,3 +9,7 @@ DIST cmake-3.24.3-SHA-256.txt 1646 BLAKE2B 739503a16c2e333c9b05a3232e2dcc56105f6 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.0-SHA-256.txt 1646 BLAKE2B 0408c43f36777473c0df229059d6508990a01535f5b3b8d3ae3b1cda221abab5cc2d37dc655de44a581a4b18b3ef73e920c20921d649a9149b7307b9d548ba6a SHA512 8b73a55837e86fa2e166a12041558cc45d1910514c9a1d63398758a99d76687f13f0c8b5244b89297bd890776a5c286a20e278361eefa0bf8db136744ba76515 +DIST cmake-3.25.0-SHA-256.txt.asc 833 BLAKE2B 1424ff89c7ae68352daddbdb810e818020bdd0979fac32de98839cea510ffb8d30a517327f1853d59bf83f846ccde528d07ed624e55c1b1f185551e4f7bc47d6 SHA512 354f7fbb3597eed8f0d94a496cac13b8d9301576b23bf85fcd5d14b84f2848d96534e2c827f7311a00043da789b4160adad805717f110cfc4677d585691e7e55 +DIST cmake-3.25.0-docs.tar.xz 499744 BLAKE2B d6bfb6f58bab66e0b444206c93a03c10e084f7326c9ecdc7a1a2c5ccd79e4d6403eff92989e05883e5985782dd93e9daea19e773a7fefdfb3808deda0546288b SHA512 7c382bd837f808fbfe3c665c2294ba935f20f62acf24c46c760d79f252b3e26f7ff70c75cdd802bfe9fc65ef73a560ce686caa53a4516c1071800f1ce2285285 +DIST cmake-3.25.0.tar.gz 10560389 BLAKE2B 182983a7fc2eedcbd369fef1b1cd118044abcd1679870ca301f3aa8c0ddebd7cb509ae843d0f7a9847b2b54f79235c3407efd47b6a4684c010b6a3b030e1db4b SHA512 f6e527161b8501c72b71a95ff7a0cf304ae02a214086ff58dd686543243d939e83faf94780cda477b19e4d42e4b8f1ff96c52f98e8f7f717e102a5229f4dd44c diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.24.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.24.3.ebuild index 9491df325a..835f3a198d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.24.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.24.3.ebuild @@ -47,7 +47,7 @@ else https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.0.ebuild new file mode 100644 index 0000000000..9491df325a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.25.0.ebuild @@ -0,0 +1,293 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs +# Set to 1 if prebuilt, 0 if not +# (the construct below is to allow overriding from env for script) +: ${CMAKE_DOCS_PREBUILT:=1} + +CMAKE_DOCS_PREBUILT_DEV=sam +CMAKE_DOCS_VERSION=$(ver_cut 1-3) +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +# See bug #784815 +CMAKE_DOCS_USEFLAG="+doc" + +# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja +# ... but seems fine as of 3.22.3? +# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. +CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_REMOVE_MODULES_LIST=( none ) +inherit bash-completion-r1 cmake 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 + CMAKE_DOCS_PREBUILT=0 + + EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" + inherit git-r3 +else + SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" + + if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" + fi + + if [[ ${PV} != *_rc* ]] ; then + VERIFY_SIG_OPENPGP_KEY_PATH="${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 + +[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc" + +S="${WORKDIR}/${MY_P}" + +LICENSE="CMake" +SLOT="0" +IUSE="${CMAKE_DOCS_USEFLAG} 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] ) +" + +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 + + # ODR warnings, bug #858335 + # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 + filter-lto + + 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=doc, there'll be newly generated docs which we install instead. + if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] + fi + + 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 +} From 0f27f78b51435b4c5c053a7d9a7edb68c23de39e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:15:16 +0000 Subject: [PATCH 07/26] dev-util/gdbus-codegen: Sync with Gentoo It's from Gentoo commit dd107e18e58f954a738e8608912783787ca6d9c7. --- .../dev-util/gdbus-codegen/gdbus-codegen-2.74.1.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.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.1.ebuild index 36ec330a73..13e4f6328c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/gdbus-codegen/gdbus-codegen-2.74.1.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 92c0336b6154b74ac1de5fc4be59879f6492e305 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:15:16 +0000 Subject: [PATCH 08/26] dev-util/glib-utils: Sync with Gentoo It's from Gentoo commit 34553dcf5c5611e01e53683c3f6d904c046aac89. --- .../portage-stable/dev-util/glib-utils/glib-utils-2.74.1.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.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.1.ebuild index 4156f5dae0..9a907a69e5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/glib-utils/glib-utils-2.74.1.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 7dfd57e21f277898c135b9a21f9b8bd20fe44cab Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:15:19 +0000 Subject: [PATCH 09/26] dev-util/patchelf: Sync with Gentoo It's from Gentoo commit b0ff99ced46ecf03f52581c3425998dc9921e1e2. --- .../portage-stable/dev-util/patchelf/patchelf-0.17.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.17.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.17.0.ebuild index 45b8be9544..4192dd06a2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.17.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/patchelf/patchelf-0.17.0.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executa HOMEPAGE="https://github.com/NixOS/patchelf" SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux" LICENSE="GPL-3" src_prepare() { From d1adf8e06152c97018e0c4102dc0adf869847195 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:15:21 +0000 Subject: [PATCH 10/26] dev-util/perf: Sync with Gentoo It's from Gentoo commit 41355d5ee50bb0cb7af9058f0af753a7cf73d602. --- .../portage-stable/dev-util/perf/Manifest | 4 - .../dev-util/perf/files/perf-5.15-clang.patch | 231 --------------- .../perf/files/perf-5.17.1-clang.patch | 61 ---- .../dev-util/perf/perf-5.15-r1.ebuild | 266 ------------------ .../dev-util/perf/perf-5.17.1.ebuild | 264 ----------------- .../dev-util/perf/perf-5.18.ebuild | 264 ----------------- .../dev-util/perf/perf-5.19.ebuild | 2 +- 7 files changed, 1 insertion(+), 1091 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.15-clang.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.17.1-clang.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.17.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.18.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest index e5f10036be..076d2671e1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/Manifest @@ -1,7 +1,3 @@ -DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a -DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b -DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714 -DIST patch-5.17.1.xz 15244 BLAKE2B f340b8a103754122153dd381fe210b18ba37b7262dae4fc7a1f99c5a62868c9bdb178e83865b35f00b82bd2d67ae127c440515d1740093825f7ec7fa4c4a490d SHA512 fb9a28ce7c68daeca82586e7631dc0be00a1a8393b4cef4c659fc1f9dac6e1f941bd60671c0350d1dea9cb035f56d627f64a394a9acb00b2b5dea8a1d44c065f 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/perf/files/perf-5.15-clang.patch b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.15-clang.patch deleted file mode 100644 index 5ea0c75f27..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.15-clang.patch +++ /dev/null @@ -1,231 +0,0 @@ -From e1f1cbfe812e4a019034105ab5e81fd9f0742353 Mon Sep 17 00:00:00 2001 -From: Ian Rogers -Date: Mon, 11 Oct 2021 19:13:20 -0700 -Subject: [PATCH 1/3] tools: Bump minimum LLVM C++ std to GNU++14 - -LLVM 9 (current release is LLVM 13) moved the minimum C++ version to -GNU++14. Bump the version numbers in the feature test and perf build. - -Reviewed-by: Fangrui Song -Signed-off-by: Ian Rogers -Cc: Alexander Shishkin -Cc: Daniel Borkmann -Cc: Ingo Molnar -Cc: Jiri Olsa -Cc: Leo Yan -Cc: Mark Rutland -Cc: Michael Petlan -Cc: Namhyung Kim -Cc: Nathan Chancellor -Cc: Nick Desaulniers -Cc: Peter Zijlstra -Cc: Sedat Dilek -Cc: llvm@lists.linux.dev -Link: https://lore.kernel.org/r/20211012021321.291635-1-irogers@google.com -Signed-off-by: Arnaldo Carvalho de Melo ---- - tools/build/feature/Makefile | 6 +++--- - tools/perf/Makefile.config | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile -index eff55d287db1..9756e589e4ae 100644 ---- a/tools/build/feature/Makefile -+++ b/tools/build/feature/Makefile -@@ -296,7 +296,7 @@ $(OUTPUT)test-jvmti-cmlr.bin: - $(BUILD) - - $(OUTPUT)test-llvm.bin: -- $(BUILDXX) -std=gnu++11 \ -+ $(BUILDXX) -std=gnu++14 \ - -I$(shell $(LLVM_CONFIG) --includedir) \ - -L$(shell $(LLVM_CONFIG) --libdir) \ - $(shell $(LLVM_CONFIG) --libs Core BPF) \ -@@ -304,12 +304,12 @@ $(OUTPUT)test-llvm.bin: - > $(@:.bin=.make.output) 2>&1 - - $(OUTPUT)test-llvm-version.bin: -- $(BUILDXX) -std=gnu++11 \ -+ $(BUILDXX) -std=gnu++14 \ - -I$(shell $(LLVM_CONFIG) --includedir) \ - > $(@:.bin=.make.output) 2>&1 - - $(OUTPUT)test-clang.bin: -- $(BUILDXX) -std=gnu++11 \ -+ $(BUILDXX) -std=gnu++14 \ - -I$(shell $(LLVM_CONFIG) --includedir) \ - -L$(shell $(LLVM_CONFIG) --libdir) \ - -Wl,--start-group -lclangBasic -lclangDriver \ -diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config -index 14e3e8d702a0..ddbe86defe39 100644 ---- a/tools/perf/Makefile.config -+++ b/tools/perf/Makefile.config -@@ -285,7 +285,7 @@ CORE_CFLAGS += -Wall - CORE_CFLAGS += -Wextra - CORE_CFLAGS += -std=gnu99 - --CXXFLAGS += -std=gnu++11 -fno-exceptions -fno-rtti -+CXXFLAGS += -std=gnu++14 -fno-exceptions -fno-rtti - CXXFLAGS += -Wall - CXXFLAGS += -fno-omit-frame-pointer - CXXFLAGS += -ggdb3 --- -2.33.1 - - -From 3e5c11995e04a9e3351330c34c4c802ce50df46c Mon Sep 17 00:00:00 2001 -From: Ian Rogers -Date: Mon, 11 Oct 2021 19:13:21 -0700 -Subject: [PATCH 2/3] perf clang: Fixes for more recent LLVM/clang - -The parameters to two functions and the location of a variable have -changed in more recent LLVM/clang releases. - -Remove the unneecessary -fmessage-length and -ferror-limit flags, the -former causes failures like: - - 58: builtin clang support : - 58.1: builtin clang compile C source to IR : - --- start --- - test child forked, pid 279307 - error: unknown argument: '-fmessage-length' - 1 error generated. - test child finished with -1 - -Tested with LLVM 6, 8, 9, 10 and 11. - -Reviewed-by: Fangrui Song -Signed-off-by: Ian Rogers -Cc: Alexander Shishkin -Cc: Daniel Borkmann -Cc: Ingo Molnar -Cc: Jiri Olsa -Cc: Leo Yan -Cc: Mark Rutland -Cc: Michael Petlan -Cc: Namhyung Kim -Cc: Nathan Chancellor -Cc: Nick Desaulniers -Cc: Peter Zijlstra -Cc: Sedat Dilek , -Cc: llvm@lists.linux.dev -Signed-off-by: Arnaldo Carvalho de Melo ---- - tools/perf/util/c++/clang.cpp | 21 +++++++++++++-------- - 1 file changed, 13 insertions(+), 8 deletions(-) - -diff --git a/tools/perf/util/c++/clang.cpp b/tools/perf/util/c++/clang.cpp -index c8885dfa3667..df7b18fb6b6e 100644 ---- a/tools/perf/util/c++/clang.cpp -+++ b/tools/perf/util/c++/clang.cpp -@@ -43,8 +43,6 @@ createCompilerInvocation(llvm::opt::ArgStringList CFlags, StringRef& Path, - "-cc1", - "-triple", "bpf-pc-linux", - "-fsyntax-only", -- "-ferror-limit", "19", -- "-fmessage-length", "127", - "-O2", - "-nostdsysteminc", - "-nobuiltininc", -@@ -55,7 +53,11 @@ createCompilerInvocation(llvm::opt::ArgStringList CFlags, StringRef& Path, - "-x", "c"}; - - CCArgs.append(CFlags.begin(), CFlags.end()); -- CompilerInvocation *CI = tooling::newInvocation(&Diags, CCArgs); -+ CompilerInvocation *CI = tooling::newInvocation(&Diags, CCArgs -+#if CLANG_VERSION_MAJOR >= 11 -+ ,/*BinaryName=*/nullptr -+#endif -+ ); - - FrontendOptions& Opts = CI->getFrontendOpts(); - Opts.Inputs.clear(); -@@ -151,13 +153,16 @@ getBPFObjectFromModule(llvm::Module *Module) - - legacy::PassManager PM; - bool NotAdded; --#if CLANG_VERSION_MAJOR < 7 -- NotAdded = TargetMachine->addPassesToEmitFile(PM, ostream, -- TargetMachine::CGFT_ObjectFile); -+ NotAdded = TargetMachine->addPassesToEmitFile(PM, ostream -+#if CLANG_VERSION_MAJOR >= 7 -+ , /*DwoOut=*/nullptr -+#endif -+#if CLANG_VERSION_MAJOR < 10 -+ , TargetMachine::CGFT_ObjectFile - #else -- NotAdded = TargetMachine->addPassesToEmitFile(PM, ostream, nullptr, -- TargetMachine::CGFT_ObjectFile); -+ , llvm::CGFT_ObjectFile - #endif -+ ); - if (NotAdded) { - llvm::errs() << "TargetMachine can't emit a file of this type\n"; - return std::unique_ptr>(nullptr); --- -2.33.1 - - -From aa2b4e5e920cbaadc0fed9b8aa7c4498feee3dd5 Mon Sep 17 00:00:00 2001 -From: Guilherme Amadio -Date: Thu, 29 Apr 2021 13:44:48 +0200 -Subject: [PATCH 3/3] tools feature: update LLVM/Clang detection - -Since LLVM/Clang 10, individual libraries have been merged into -monolithic libraries libLLVM.so, libclang.so, and libclang-cpp.so. ---- - tools/build/feature/Makefile | 8 +++----- - tools/perf/Makefile.perf | 7 ++----- - 2 files changed, 5 insertions(+), 10 deletions(-) - -diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile -index 9756e589e4ae..23478bd06093 100644 ---- a/tools/build/feature/Makefile -+++ b/tools/build/feature/Makefile -@@ -299,7 +299,7 @@ $(OUTPUT)test-llvm.bin: - $(BUILDXX) -std=gnu++14 \ - -I$(shell $(LLVM_CONFIG) --includedir) \ - -L$(shell $(LLVM_CONFIG) --libdir) \ -- $(shell $(LLVM_CONFIG) --libs Core BPF) \ -+ $(shell $(LLVM_CONFIG) --libs) \ - $(shell $(LLVM_CONFIG) --system-libs) \ - > $(@:.bin=.make.output) 2>&1 - -@@ -312,11 +312,9 @@ $(OUTPUT)test-clang.bin: - $(BUILDXX) -std=gnu++14 \ - -I$(shell $(LLVM_CONFIG) --includedir) \ - -L$(shell $(LLVM_CONFIG) --libdir) \ -- -Wl,--start-group -lclangBasic -lclangDriver \ -- -lclangFrontend -lclangEdit -lclangLex \ -- -lclangAST -Wl,--end-group \ -- $(shell $(LLVM_CONFIG) --libs Core option) \ -+ $(shell $(LLVM_CONFIG) --libs) \ - $(shell $(LLVM_CONFIG) --system-libs) \ -+ -lclang-cpp \ - > $(@:.bin=.make.output) 2>&1 - - -include $(OUTPUT)*.d -diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf -index b856afa6eb52..d0ff0ddf9c18 100644 ---- a/tools/perf/Makefile.perf -+++ b/tools/perf/Makefile.perf -@@ -410,14 +410,11 @@ EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS)) - LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group - - ifeq ($(USE_CLANG), 1) -- CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization -- CLANGLIBS_NOEXT_LIST = $(foreach l,$(CLANGLIBS_LIST),$(shell $(LLVM_CONFIG) --libdir)/libclang$(l)) -- LIBCLANG = $(foreach l,$(CLANGLIBS_NOEXT_LIST),$(wildcard $(l).a $(l).so)) -- LIBS += -Wl,--start-group $(LIBCLANG) -Wl,--end-group -+ LIBS += -lclang-cpp - endif - - ifeq ($(USE_LLVM), 1) -- LIBLLVM = $(shell $(LLVM_CONFIG) --libs all) $(shell $(LLVM_CONFIG) --system-libs) -+ LIBLLVM = $(shell $(LLVM_CONFIG) --libs) $(shell $(LLVM_CONFIG) --system-libs) - LIBS += -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM) - endif - --- -2.33.1 - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.17.1-clang.patch b/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.17.1-clang.patch deleted file mode 100644 index 73d4506146..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/files/perf-5.17.1-clang.patch +++ /dev/null @@ -1,61 +0,0 @@ - -Fix building against LLVM/Clang with monolithic libraries and -adjust header includes for Clang >= 14. - ---- a/tools/build/feature/Makefile -+++ b/tools/build/feature/Makefile -@@ -299,7 +299,7 @@ $(OUTPUT)test-llvm.bin: - $(BUILDXX) -std=gnu++14 \ - -I$(shell $(LLVM_CONFIG) --includedir) \ - -L$(shell $(LLVM_CONFIG) --libdir) \ -- $(shell $(LLVM_CONFIG) --libs Core BPF) \ -+ $(shell $(LLVM_CONFIG) --libs) \ - $(shell $(LLVM_CONFIG) --system-libs) \ - > $(@:.bin=.make.output) 2>&1 - -@@ -312,10 +312,7 @@ $(OUTPUT)test-clang.bin: - $(BUILDXX) -std=gnu++14 \ - -I$(shell $(LLVM_CONFIG) --includedir) \ - -L$(shell $(LLVM_CONFIG) --libdir) \ -- -Wl,--start-group -lclangBasic -lclangDriver \ -- -lclangFrontend -lclangEdit -lclangLex \ -- -lclangAST -Wl,--end-group \ -- $(shell $(LLVM_CONFIG) --libs Core option) \ -+ -lclang-cpp $(shell $(LLVM_CONFIG) --libs) \ - $(shell $(LLVM_CONFIG) --system-libs) \ - > $(@:.bin=.make.output) 2>&1 - ---- a/tools/perf/Makefile.perf -+++ b/tools/perf/Makefile.perf -@@ -417,14 +417,11 @@ EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS)) - LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group - - ifeq ($(USE_CLANG), 1) -- CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization -- CLANGLIBS_NOEXT_LIST = $(foreach l,$(CLANGLIBS_LIST),$(shell $(LLVM_CONFIG) --libdir)/libclang$(l)) -- LIBCLANG = $(foreach l,$(CLANGLIBS_NOEXT_LIST),$(wildcard $(l).a $(l).so)) -- LIBS += -Wl,--start-group $(LIBCLANG) -Wl,--end-group -+ LIBS += -lclang-cpp - endif - - ifeq ($(USE_LLVM), 1) -- LIBLLVM = $(shell $(LLVM_CONFIG) --libs all) $(shell $(LLVM_CONFIG) --system-libs) -+ LIBLLVM = $(shell $(LLVM_CONFIG) --libs) $(shell $(LLVM_CONFIG) --system-libs) - LIBS += -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM) - endif - ---- a/tools/perf/util/c++/clang.cpp -+++ b/tools/perf/util/c++/clang.cpp -@@ -20,7 +20,11 @@ - #include "llvm/Option/Option.h" - #include "llvm/Support/FileSystem.h" - #include "llvm/Support/ManagedStatic.h" -+#if CLANG_VERSION_MAJOR >= 14 -+#include "llvm/MC/TargetRegistry.h" -+#else - #include "llvm/Support/TargetRegistry.h" -+#endif - #include "llvm/Support/TargetSelect.h" - #include "llvm/Target/TargetMachine.h" - #include "llvm/Target/TargetOptions.h" - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild deleted file mode 100644 index 9f1e523876..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.15-r1.ebuild +++ /dev/null @@ -1,266 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) -inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info - -DESCRIPTION="Userland tools for Linux Performance Counters" -HOMEPAGE="https://perf.wiki.kernel.org/" - -LINUX_V="${PV:0:1}.x" -if [[ ${PV} == *_rc* ]] ; then - LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1)) - PATCH_VERSION=$(ver_cut 1-3) - LINUX_PATCH=patch-${PV//_/-}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH} - https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}" -elif [[ ${PV} == *.*.* ]] ; then - # stable-release series - 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}" -else - LINUX_VER=${PV} - SRC_URI="" -fi - -LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" -SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" -IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - ${LINUX_PATCH+dev-util/patchutils} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-text/asciidoc - app-text/sgml-common - app-text/xmlto - sys-process/time - ) - ${PYTHON_DEPS} -" - -RDEPEND="audit? ( sys-process/audit ) - babeltrace? ( dev-util/babeltrace ) - crypt? ( virtual/libcrypt:= ) - clang? ( - =sys-kernel/linux-headers-5.10 - java? ( virtual/jdk ) -" - -S_K="${WORKDIR}/linux-${LINUX_VER}" -S="${S_K}/tools/perf" - -CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" - -QA_FLAGS_IGNORED=( - usr/bin/perf-read-vdso32 # not linked with anything except for libc - usr/libexec/perf-core/dlfilters/dlfilter-test-api-v0.so # not installed -) - -pkg_pretend() { - if ! use doc ; then - ewarn "Without the doc USE flag you won't get any documentation nor man pages." - ewarn "And without man pages, you won't get any --help output for perf and its" - ewarn "sub-tools." - fi -} - -pkg_setup() { - use clang && LLVM_MAX_SLOT=13 llvm_pkg_setup - # We enable python unconditionally as libbpf always generates - # API headers using python script - python_setup -} - -# src_unpack and src_prepare are copied to dev-util/bpftool since -# it's building from the same tarball, please keep it in sync with bpftool -src_unpack() { - local paths=( - tools/arch tools/build tools/include tools/lib tools/perf tools/scripts - scripts include lib "arch/*/lib" - ) - - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). - echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --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 - - if use clang; then - pushd "${S_K}" >/dev/null || die - eapply "${FILESDIR}"/${P}-clang.patch - popd || die - fi - - # Drop some upstream too-developer-oriented flags and fix the - # Makefile in general - sed -i \ - -e "s@\$(sysconfdir_SQ)/bash_completion.d@$(get_bashcompdir)@" \ - "${S}"/Makefile.perf || die - # A few places still use -Werror w/out $(WERROR) protection. - sed -i -e 's@-Werror@@' \ - "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die - - # Avoid the call to make kernelversion - sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die - echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE - - # The code likes to compile local assembly files which lack ELF markings. - find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} + -} - -puse() { usex $1 "" no; } -perf_make() { - # The arch parsing is a bit funky. The perf tools package is integrated - # into the kernel, so it wants an ARCH that looks like the kernel arch, - # but it also wants to know about the split value -- i386/x86_64 vs just - # x86. We can get that by telling the func to use an older linux version. - # It's kind of a hack, but not that bad ... - - # LIBDIR sets a search path of perf-gtk.so. Bug 515954 - - local arch=$(tc-arch-kernel) - local java_dir - use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm" - # FIXME: NO_CORESIGHT - emake V=1 VF=1 \ - HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - prefix="${EPREFIX}/usr" bindir_relative="bin" \ - tipdir="share/doc/${PF}" \ - EXTRA_CFLAGS="${CFLAGS}" \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - ARCH="${arch}" \ - JDIR="${java_dir}" \ - LIBCLANGLLVM=$(usex clang 1 "") \ - LIBPFM4=$(usex libpfm 1 "") \ - NO_AUXTRACE="" \ - NO_BACKTRACE="" \ - NO_CORESIGHT=1 \ - NO_DEMANGLE= \ - GTK2=$(usex gtk 1 "") \ - feature-gtk2-infobar=$(usex gtk 1 "") \ - NO_JVMTI=$(puse java) \ - NO_LIBAUDIT=$(puse audit) \ - NO_LIBBABELTRACE=$(puse babeltrace) \ - NO_LIBBIONIC=1 \ - NO_LIBBPF= \ - NO_LIBCRYPTO=$(puse crypt) \ - NO_LIBDW_DWARF_UNWIND= \ - NO_LIBELF= \ - NO_LIBNUMA=$(puse numa) \ - NO_LIBPERL=$(puse perl) \ - NO_LIBPYTHON=$(puse python) \ - NO_LIBUNWIND=$(puse unwind) \ - NO_LIBZSTD=$(puse zstd) \ - NO_SDT=$(puse systemtap) \ - NO_SLANG=$(puse slang) \ - NO_LZMA=$(puse lzma) \ - NO_ZLIB=$(puse zlib) \ - WERROR=0 \ - LIBDIR="/usr/libexec/perf-core" \ - libdir="${EPREFIX}/usr/$(get_libdir)" \ - plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \ - "$@" -} - -src_compile() { - # test-clang.bin not build with g++ - if use clang; then - make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die - fi - perf_make -f Makefile.perf - use doc && perf_make -C Documentation man -} - -src_test() { - : -} - -src_install() { - _install_python_ext() { - perf_make -f Makefile.perf install-python_ext DESTDIR="${D}" - } - - perf_make -f Makefile.perf install DESTDIR="${D}" - - if use python; then - python_foreach_impl _install_python_ext - fi - - if use gtk; then - local libdir - libdir="$(get_libdir)" - # on some arches it ends up in lib even on 64bit, ppc64 for instance. - [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib" - mv "${ED}"/usr/${libdir}/libperf-gtk.so \ - "${ED}"/usr/libexec/perf-core || die - fi - - dodoc CREDITS - - dodoc *txt Documentation/*.txt - - # perf needs this decompressed to print out tips for users - docompress -x /usr/share/doc/${PF}/tips.txt - - if use doc ; then - doman Documentation/*.1 - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.17.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.17.1.ebuild deleted file mode 100644 index 773d205044..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.17.1.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info - -DESCRIPTION="Userland tools for Linux Performance Counters" -HOMEPAGE="https://perf.wiki.kernel.org/" - -LINUX_V="${PV:0:1}.x" -if [[ ${PV} == *_rc* ]] ; then - LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1)) - PATCH_VERSION=$(ver_cut 1-3) - LINUX_PATCH=patch-${PV//_/-}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH} - https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}" -elif [[ ${PV} == *.*.* ]] ; then - # stable-release series - 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}" -else - LINUX_VER=${PV} - SRC_URI="" -fi - -LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" -SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - ${LINUX_PATCH+dev-util/patchutils} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-text/asciidoc - app-text/sgml-common - app-text/xmlto - sys-process/time - ) - ${PYTHON_DEPS} -" - -RDEPEND="audit? ( sys-process/audit ) - babeltrace? ( dev-util/babeltrace ) - crypt? ( virtual/libcrypt:= ) - clang? ( - sys-devel/clang:= - sys-devel/llvm:= - ) - gtk? ( x11-libs/gtk+:2 ) - java? ( virtual/jre:* ) - libpfm? ( dev-libs/libpfm ) - lzma? ( app-arch/xz-utils ) - numa? ( sys-process/numactl ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - slang? ( sys-libs/slang ) - systemtap? ( dev-util/systemtap ) - unwind? ( sys-libs/libunwind ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd ) - dev-libs/elfutils - sys-libs/binutils-libs:=" - -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-5.10 - java? ( virtual/jdk ) -" - -S_K="${WORKDIR}/linux-${LINUX_VER}" -S="${S_K}/tools/perf" - -CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" - -QA_FLAGS_IGNORED=( - 'usr/bin/perf-read-vdso32' # not linked with anything except for libc - 'usr/libexec/perf-core/dlfilters/.*' # plugins -) - -pkg_pretend() { - if ! use doc ; then - ewarn "Without the doc USE flag you won't get any documentation nor man pages." - ewarn "And without man pages, you won't get any --help output for perf and its" - ewarn "sub-tools." - fi -} - -pkg_setup() { - use clang && llvm_pkg_setup - # We enable python unconditionally as libbpf always generates - # API headers using python script - python_setup -} - -# src_unpack and src_prepare are copied to dev-util/bpftool since -# it's building from the same tarball, please keep it in sync with bpftool -src_unpack() { - local paths=( - tools/arch tools/build tools/include tools/lib tools/perf tools/scripts - scripts include lib "arch/*/lib" - ) - - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). - echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --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 - eapply "${FILESDIR}"/${P}-clang.patch - popd || die - - # Drop some upstream too-developer-oriented flags and fix the - # Makefile in general - sed -i \ - -e "s@\$(sysconfdir_SQ)/bash_completion.d@$(get_bashcompdir)@" \ - "${S}"/Makefile.perf || die - # A few places still use -Werror w/out $(WERROR) protection. - sed -i -e 's@-Werror@@' \ - "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die - - # Avoid the call to make kernelversion - sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die - echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE - - # The code likes to compile local assembly files which lack ELF markings. - find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} + -} - -puse() { usex $1 "" no; } -perf_make() { - # The arch parsing is a bit funky. The perf tools package is integrated - # into the kernel, so it wants an ARCH that looks like the kernel arch, - # but it also wants to know about the split value -- i386/x86_64 vs just - # x86. We can get that by telling the func to use an older linux version. - # It's kind of a hack, but not that bad ... - - # LIBDIR sets a search path of perf-gtk.so. Bug 515954 - - local arch=$(tc-arch-kernel) - local java_dir - use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm" - # FIXME: NO_CORESIGHT - emake V=1 VF=1 \ - HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - prefix="${EPREFIX}/usr" bindir_relative="bin" \ - tipdir="share/doc/${PF}" \ - EXTRA_CFLAGS="${CFLAGS}" \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - ARCH="${arch}" \ - JDIR="${java_dir}" \ - LIBCLANGLLVM=$(usex clang 1 "") \ - LIBPFM4=$(usex libpfm 1 "") \ - NO_AUXTRACE="" \ - NO_BACKTRACE="" \ - NO_CORESIGHT=1 \ - NO_DEMANGLE= \ - GTK2=$(usex gtk 1 "") \ - feature-gtk2-infobar=$(usex gtk 1 "") \ - NO_JVMTI=$(puse java) \ - NO_LIBAUDIT=$(puse audit) \ - NO_LIBBABELTRACE=$(puse babeltrace) \ - NO_LIBBIONIC=1 \ - NO_LIBBPF= \ - NO_LIBCRYPTO=$(puse crypt) \ - NO_LIBDW_DWARF_UNWIND= \ - NO_LIBELF= \ - NO_LIBNUMA=$(puse numa) \ - NO_LIBPERL=$(puse perl) \ - NO_LIBPYTHON=$(puse python) \ - NO_LIBUNWIND=$(puse unwind) \ - NO_LIBZSTD=$(puse zstd) \ - NO_SDT=$(puse systemtap) \ - NO_SLANG=$(puse slang) \ - NO_LZMA=$(puse lzma) \ - NO_ZLIB=$(puse zlib) \ - WERROR=0 \ - LIBDIR="/usr/libexec/perf-core" \ - libdir="${EPREFIX}/usr/$(get_libdir)" \ - plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \ - "$@" -} - -src_compile() { - # test-clang.bin not build with g++ - if use clang; then - make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die - fi - perf_make -f Makefile.perf - use doc && perf_make -C Documentation man -} - -src_test() { - : -} - -src_install() { - _install_python_ext() { - perf_make -f Makefile.perf install-python_ext DESTDIR="${D}" - } - - perf_make -f Makefile.perf install DESTDIR="${D}" - - if use python; then - python_foreach_impl _install_python_ext - fi - - if use gtk; then - local libdir - libdir="$(get_libdir)" - # on some arches it ends up in lib even on 64bit, ppc64 for instance. - [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib" - mv "${ED}"/usr/${libdir}/libperf-gtk.so \ - "${ED}"/usr/libexec/perf-core || die - fi - - dodoc CREDITS - - dodoc *txt Documentation/*.txt - - # perf needs this decompressed to print out tips for users - docompress -x /usr/share/doc/${PF}/tips.txt - - if use doc ; then - doman Documentation/*.1 - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.18.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.18.ebuild deleted file mode 100644 index 773d205044..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.18.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit bash-completion-r1 estack llvm toolchain-funcs python-r1 linux-info - -DESCRIPTION="Userland tools for Linux Performance Counters" -HOMEPAGE="https://perf.wiki.kernel.org/" - -LINUX_V="${PV:0:1}.x" -if [[ ${PV} == *_rc* ]] ; then - LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1)) - PATCH_VERSION=$(ver_cut 1-3) - LINUX_PATCH=patch-${PV//_/-}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH} - https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}" -elif [[ ${PV} == *.*.* ]] ; then - # stable-release series - 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}" -else - LINUX_VER=${PV} - SRC_URI="" -fi - -LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" -SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - ${LINUX_PATCH+dev-util/patchutils} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-text/asciidoc - app-text/sgml-common - app-text/xmlto - sys-process/time - ) - ${PYTHON_DEPS} -" - -RDEPEND="audit? ( sys-process/audit ) - babeltrace? ( dev-util/babeltrace ) - crypt? ( virtual/libcrypt:= ) - clang? ( - sys-devel/clang:= - sys-devel/llvm:= - ) - gtk? ( x11-libs/gtk+:2 ) - java? ( virtual/jre:* ) - libpfm? ( dev-libs/libpfm ) - lzma? ( app-arch/xz-utils ) - numa? ( sys-process/numactl ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - slang? ( sys-libs/slang ) - systemtap? ( dev-util/systemtap ) - unwind? ( sys-libs/libunwind ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd ) - dev-libs/elfutils - sys-libs/binutils-libs:=" - -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-5.10 - java? ( virtual/jdk ) -" - -S_K="${WORKDIR}/linux-${LINUX_VER}" -S="${S_K}/tools/perf" - -CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" - -QA_FLAGS_IGNORED=( - 'usr/bin/perf-read-vdso32' # not linked with anything except for libc - 'usr/libexec/perf-core/dlfilters/.*' # plugins -) - -pkg_pretend() { - if ! use doc ; then - ewarn "Without the doc USE flag you won't get any documentation nor man pages." - ewarn "And without man pages, you won't get any --help output for perf and its" - ewarn "sub-tools." - fi -} - -pkg_setup() { - use clang && llvm_pkg_setup - # We enable python unconditionally as libbpf always generates - # API headers using python script - python_setup -} - -# src_unpack and src_prepare are copied to dev-util/bpftool since -# it's building from the same tarball, please keep it in sync with bpftool -src_unpack() { - local paths=( - tools/arch tools/build tools/include tools/lib tools/perf tools/scripts - scripts include lib "arch/*/lib" - ) - - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). - echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --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 - eapply "${FILESDIR}"/${P}-clang.patch - popd || die - - # Drop some upstream too-developer-oriented flags and fix the - # Makefile in general - sed -i \ - -e "s@\$(sysconfdir_SQ)/bash_completion.d@$(get_bashcompdir)@" \ - "${S}"/Makefile.perf || die - # A few places still use -Werror w/out $(WERROR) protection. - sed -i -e 's@-Werror@@' \ - "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die - - # Avoid the call to make kernelversion - sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die - echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE - - # The code likes to compile local assembly files which lack ELF markings. - find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} + -} - -puse() { usex $1 "" no; } -perf_make() { - # The arch parsing is a bit funky. The perf tools package is integrated - # into the kernel, so it wants an ARCH that looks like the kernel arch, - # but it also wants to know about the split value -- i386/x86_64 vs just - # x86. We can get that by telling the func to use an older linux version. - # It's kind of a hack, but not that bad ... - - # LIBDIR sets a search path of perf-gtk.so. Bug 515954 - - local arch=$(tc-arch-kernel) - local java_dir - use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm" - # FIXME: NO_CORESIGHT - emake V=1 VF=1 \ - HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ - CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - prefix="${EPREFIX}/usr" bindir_relative="bin" \ - tipdir="share/doc/${PF}" \ - EXTRA_CFLAGS="${CFLAGS}" \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - ARCH="${arch}" \ - JDIR="${java_dir}" \ - LIBCLANGLLVM=$(usex clang 1 "") \ - LIBPFM4=$(usex libpfm 1 "") \ - NO_AUXTRACE="" \ - NO_BACKTRACE="" \ - NO_CORESIGHT=1 \ - NO_DEMANGLE= \ - GTK2=$(usex gtk 1 "") \ - feature-gtk2-infobar=$(usex gtk 1 "") \ - NO_JVMTI=$(puse java) \ - NO_LIBAUDIT=$(puse audit) \ - NO_LIBBABELTRACE=$(puse babeltrace) \ - NO_LIBBIONIC=1 \ - NO_LIBBPF= \ - NO_LIBCRYPTO=$(puse crypt) \ - NO_LIBDW_DWARF_UNWIND= \ - NO_LIBELF= \ - NO_LIBNUMA=$(puse numa) \ - NO_LIBPERL=$(puse perl) \ - NO_LIBPYTHON=$(puse python) \ - NO_LIBUNWIND=$(puse unwind) \ - NO_LIBZSTD=$(puse zstd) \ - NO_SDT=$(puse systemtap) \ - NO_SLANG=$(puse slang) \ - NO_LZMA=$(puse lzma) \ - NO_ZLIB=$(puse zlib) \ - WERROR=0 \ - LIBDIR="/usr/libexec/perf-core" \ - libdir="${EPREFIX}/usr/$(get_libdir)" \ - plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" \ - "$@" -} - -src_compile() { - # test-clang.bin not build with g++ - if use clang; then - make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die - fi - perf_make -f Makefile.perf - use doc && perf_make -C Documentation man -} - -src_test() { - : -} - -src_install() { - _install_python_ext() { - perf_make -f Makefile.perf install-python_ext DESTDIR="${D}" - } - - perf_make -f Makefile.perf install DESTDIR="${D}" - - if use python; then - python_foreach_impl _install_python_ext - fi - - if use gtk; then - local libdir - libdir="$(get_libdir)" - # on some arches it ends up in lib even on 64bit, ppc64 for instance. - [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib" - mv "${ED}"/usr/${libdir}/libperf-gtk.so \ - "${ED}"/usr/libexec/perf-core || die - fi - - dodoc CREDITS - - dodoc *txt Documentation/*.txt - - # perf needs this decompressed to print out tips for users - docompress -x /usr/share/doc/${PF}/tips.txt - - if use doc ; then - doman Documentation/*.1 - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19.ebuild index c0b17711b7..a1b75fd9e5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/perf/perf-5.19.ebuild @@ -32,7 +32,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd" REQUIRED_USE="${PYTHON_REQUIRED_USE}" From 358316ef7592dc1af4d135e6f43c044e084ec53c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:15:24 +0000 Subject: [PATCH 11/26] dev-vcs/git: Sync with Gentoo It's from Gentoo commit 5ac28ff4f72910a07074752dd3c3a954738bf400. --- .../third_party/portage-stable/dev-vcs/git/git-2.37.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.37.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.37.3.ebuild index ac00d04d0a..a406c1e82c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.37.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.37.3.ebuild @@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" From 4957a542d2a8e4ba909b1e9df57a999bd78c43a2 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:16:09 +0000 Subject: [PATCH 12/26] licenses: Sync with Gentoo It's from Gentoo commit 1ec6328bd09c77fafee1658f625f435bc896aba8. --- .../portage-stable/licenses/PUEL-11 | 168 +++++++ .../portage-stable/licenses/gSOAP-1.3b | 425 ++++++++++++++++++ 2 files changed, 593 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/licenses/PUEL-11 create mode 100644 sdk_container/src/third_party/portage-stable/licenses/gSOAP-1.3b diff --git a/sdk_container/src/third_party/portage-stable/licenses/PUEL-11 b/sdk_container/src/third_party/portage-stable/licenses/PUEL-11 new file mode 100644 index 0000000000..fe0231ed96 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/licenses/PUEL-11 @@ -0,0 +1,168 @@ +VirtualBox Extension Pack Personal Use and Evaluation License (PUEL) + +License version 11, 21 May 2020 + +PLEASE READ THE FOLLOWING ORACLE VM VIRTUALBOX EXTENSION PACK PERSONAL +USE AND EVALUATION LICENSE CAREFULLY BEFORE DOWNLOADING OR USING THE +ORACLE SOFTWARE. THESE TERMS AND CONDITIONS CONSTITUTE A LEGAL AGREEMENT +BETWEEN YOU AND ORACLE. + +ORACLE AMERICA, INC. ("ORACLE") IS WILLING TO LICENSE THE PRODUCT DEFINED +IN SECTION 1 BELOW ONLY ON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS +CONTAINED IN THIS VIRTUALBOX EXTENSION PACK PERSONAL USE AND EVALUATION +LICENSE AGREEMENT ("AGREEMENT"). + +IF YOU ARE AGREEING TO THIS LICENSE ON BEHALF OF AN ENTITY (RATHER THAN +AS AN INDIVIDUAL HUMAN BEING), YOU REPRESENT THAT YOU HAVE THE APPROPRIATE +AUTHORITY TO ACCEPT THESE TERMS AND CONDITIONS ON BEHALF OF SUCH ENTITY. + +1 SUBJECT OF AGREEMENT. This Agreement governs your use of the binary +software package called "Oracle VM VirtualBox Extension Pack" (the +"Product"), which contains a set of additional features for "Oracle +VM VirtualBox" that enhance the operation of multiple virtual machines +("Guest Computers") on a single physical computer ("Host Computer"). The +Product consists of executable files in machine code, script files, +data files, and all documentation and updates provided to You by Oracle. + +2 GRANT OF LICENSE. Oracle grants you a personal, non-exclusive, +non-transferable, limited license without fees to reproduce, install, +execute, and use internally the Product on Host Computers for +your Personal Use, Educational Use, or Evaluation. "Personal Use" +is noncommercial use solely by the person downloading the Product +from Oracle on a single Host Computer, provided that no more than one +client or remote computer is connected to that Host Computer and that +client or remote computer is used solely to remotely view the Guest +Computer(s). "Educational Use" is any use by teachers or students in +an academic institution (schools, colleges and universities) as part of +the institution's educational curriculum. "Evaluation" means testing the +Product for up to thirty (30) days; after expiry of that term, you are +no longer permitted to use the Product. Personal Use and/or Educational +Use expressly exclude any use of the Product for commercial purposes or +to operate, run, or act on behalf of or for the benefit of a business, +organization, governmental organization, or educational institution. + +Oracle reserves all rights not expressly granted in this license. + +3 RESTRICTIONS AND RESERVATION OF RIGHTS. + +(1) The Product and copies thereof provided to you under this Agreement +are copyrighted and licensed, not sold, to you by Oracle. + +(2) You may not do any of the following: (a) modify any part of the +Product, except to the extent allowed in the documentation accompanying +the Product; (b) rent, lease, lend, re-distribute, or encumber the +Product; (c) remove or alter any proprietary legends or notices contained +in the Product; or (d) decompile, or reverse engineer the Product +(except to the extent permitted by applicable law). + +(3) The Product is not designed, licensed or intended for use in the +design, construction, operation or maintenance of any nuclear facility +and Oracle and its licensors disclaim any express or implied warranty +of fitness for such uses. + +(4) No right, title or interest in or to any trademark, service mark, logo +or trade name of Oracle or its licensors is granted under this Agreement. + +4 TERMINATION. The Agreement is effective on the date you receive the +Product and remains effective until terminated. Your rights under this +Agreement will terminate immediately without notice from Oracle if +you materially breach it or take any action in derogation of Oracle's +and/or its licensors' rights to the Product. Oracle may terminate this +Agreement immediately should any part of the Product become or in Oracle's +reasonable opinion likely to become the subject of a claim of intellectual +property infringement or trade secret misappropriation. Upon termination, +you will cease use of and destroy all copies of the Product under your +control and confirm compliance in writing to Oracle. Neither termination +of this Agreement nor any deletion or removal of the Product shall limit +any obligations you may have to Oracle, or any rights and/or remedies that +Oracle may have with respect to any past or future infringing use of the +Product (including but not limited to any use of the Product outside the +scope of the license provided in the Agreement). Sections 3-9, inclusive, +will survive termination of the Agreement. + +5 DISCLAIMER OF WARRANTY. TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW, +ORACLE PROVIDES THE PRODUCT "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER +EXPRESS OR IMPLIED. WITHOUT LIMITING THE FOREGOING, ORACLE SPECIFICALLY +DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT. The entire risk as +to the quality and performance of the Product is with you. Should it +prove defective, you assume the cost of all necessary servicing, repair, +or correction. + +6 LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW, +IN NO EVENT WILL ORACLE OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, +PROFIT, DATA, OR DATA USE, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, +INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY +OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO +USE THE PRODUCT, EVEN IF ORACLE HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. In no event will Oracle's liability to you, whether in +contract, tort (including negligence), or otherwise, exceed the amount +paid by you for the Product under this Agreement. + +7 SEPARATELY LICENSED THIRD PARTY TECHNOLOGY. The Product may contain +or require the use of third party technology that is provided with +the Product. Oracle may provide certain notices to you in the Product's +documentation, readmes or notice files in connection with such third party +technology. Third party technology will be licensed to you either under +the terms of this Agreement or, if specified in the documentation, readmes +or notice files, under Separate Terms. Your rights to use Separately +Licensed Third Party Technology under Separate Terms are not restricted +in any way by this Agreement. However, for clarity, notwithstanding the +existence of a notice, third party technology that is not Separately +Licensed Third Party Technology shall be deemed part of the Product and +is licensed to You under the terms of this Agreement. "Separate Terms" +refers to separate license terms that are specified in the Product's +documentation, readmes or notice files and that apply to Separately +Licensed Third Party Technology. "Separately Licensed Third Party +Technology" refers to third party technology that is licensed under +Separate Terms and not under the terms of this Agreement. + +8 EXPORT. Export laws and regulations of the United States and any other +relevant local export laws and regulations apply to the Product. You +agree that such export laws govern your use of the Product (including +technical data) provided under this Agreement, and you agree to comply +with all such export laws and regulations (including "deemed export" and +"deemed re-export" regulations). You agree that no data, information, +and/or Product (or direct product thereof) will be exported, directly or +indirectly, in violation of these laws, or will be used for any purpose +prohibited by these laws including, without limitation, nuclear, chemical, +or biological weapons proliferation, or development of missile technology. + +9 U.S. GOVERNMENT END USERS. Oracle programs, including the Product, +any operating system, integrated software, any programs installed on +hardware, and/or documentation, delivered to U.S. Government end users +are "commercial computer software" pursuant to the applicable Federal +Acquisition Regulation and agency-specific supplemental regulations. As +such, use, duplication, disclosure, modification, and adaptation of +the programs, including any operating system, integrated software, +any programs installed on the hardware, and/or documentation, shall +be subject to license terms and license restrictions applicable to the +programs. No other rights are granted to the U.S. Government. + +10 MISCELLANEOUS. This Agreement is the entire agreement between you +and Oracle relating to its subject matter. It supersedes all prior or +contemporaneous oral or written communications, proposals, representations +and warranties and prevails over any conflicting or additional terms +of any quote, order, acknowledgment, or other communication between +the parties relating to its subject matter during the term of this +Agreement. No modification of this Agreement will be binding, unless in +writing and signed by an authorized representative of each party. If any +provision of this Agreement is held to be unenforceable, this Agreement +will remain in effect with the provision omitted, unless omission would +frustrate the intent of the parties, in which case this Agreement will +immediately terminate. This Agreement is governed by the laws of the +State of California, USA, and you and Oracle agree to submit to the +exclusive jurisdiction of, and venue in, the courts of San Francisco +or Santa Clara counties in California in any dispute arising out of or +relating to this Agreement. Upon 45 days written notice, Oracle may +audit your use of the Product to confirm that you are in compliance +with the terms of this Agreement. You agree to cooperate with Oracle's +audit and provide reasonable assistance and access to information. Any +such audit shall not unreasonably interfere with your normal business +operations. You agree to pay within 30 days of written notification +any fees applicable to your unlicensed use of the Product. You agree +that Oracle shall not be responsible for any of your costs incurred in +cooperating with the audit. If a legal action or proceeding is commenced +by either party in connection with the enforcement of this Agreement, +the prevailing party shall be entitled to its costs and attorneys' +fees actually incurred in connection with such action or proceeding. diff --git a/sdk_container/src/third_party/portage-stable/licenses/gSOAP-1.3b b/sdk_container/src/third_party/portage-stable/licenses/gSOAP-1.3b new file mode 100644 index 0000000000..2813c0c97f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/licenses/gSOAP-1.3b @@ -0,0 +1,425 @@ + gSOAP Public License + + Version 1.3b + +The gSOAP public license is derived from the Mozilla Public License +(MPL1.1). The sections that were deleted from the original MPL1.1 text are +1.0.1, 2.1.(c),(d), 2.2.(c),(d), 8.2.(b), 10, and 11. Section 3.8 was +added. The modified sections are 2.1.(b), 2.2.(b), 3.2 (simplified), 3.5 +(deleted the last sentence), and 3.6 (simplified). + +THIS LICENSE COVERS limited parts of the gSOAP software package, +specifically the gSOAP engine stdsoap, the engine plugins, and most of the +examples. +THIS LICENSE DOES NOT COVER the gSOAP tools soapcpp2 and wsdl2h located in +gsoap/src and gsoap/wsdl, all code generated by the tools soapcpp2 and +wsdl2h, the UDDI source code gsoap/uddi2, and the Web server sample source +code samples/webserver. To use the gSOAP tools and their components +commercially without defaulting to the GNU Public License v2 for gSOAP, a +commercial license is required and can be obtained from www.genivia.com. + +1 DEFINITIONS. + + 1.0.1. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code, or Modifications or the + combination of the Original Code, and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code, or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2 SOURCE CODE LICENSE. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under patents now or hereafter owned or controlled by Initial + Developer, to make, have made, use and sell ("offer to sell and + import") the Original Code, Modifications, or portions thereof, + but solely to the extent that any such patent is reasonably + necessary to enable You to utilize, alone or in combination with + other software, the Original Code, Modifications, or any + combination or portions thereof. + + (c) + + (d) + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under patents now or hereafter owned or controlled by + Contributor, to make, have made, use and sell ("offer to sell and + import") the Contributor Version (or portions thereof), but + solely to the extent that any such patent is reasonably necessary + to enable You to utilize, alone or in combination with other + software, the Contributor Version (or portions thereof). + + (c) + + (d) + +3 DISTRIBUTION OBLIGATIONS. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification created by You shall be provided to the Initial + Developer in Source Code form and are subject to the terms of the + License. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters. + + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code. + You may distribute the Executable version of Covered Code or ownership + rights under a license of Your choice, which may contain terms + different from this License, provided that You are in compliance with + the terms of this License and that the license for the Executable + version does not attempt to limit or alter the recipient's rights in + the Source Code version from the rights set forth in this License. If + You distribute the Executable version under a different license You + must make it absolutely clear that any terms which differ from this + License are offered by You alone, not by the Initial Developer or any + Contributor. If you distribute executable versions containing Covered + Code as part of a product, you must reproduce the notice in Exhibit B + in the documentation and/or other materials provided with the product. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + + 3.8. Restrictions. + You may not remove any product identification, copyright, proprietary + notices or labels from gSOAP. + +4 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5 APPLICATION OF THIS LICENSE. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6 VERSIONS OF THE LICENSE. + + 6.1. New Versions. + Grantor may publish revised and/or new versions of the License from + time to time. Each version will be given a distinguishing version + number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrase "gSOAP" or any confusingly similar phrase do not appear in + your license (except to note that your license differs from this + License) and (b) otherwise make it clear that Your version of the + license contains terms which differ from the gSOAP Public License. + (Filling in the name of the Initial Developer, Original Code or + Contributor in the notice described in Exhibit A shall not of + themselves be deemed to be modifications of this License.) + +7 DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, WHETHER EXPRESS, IMPLIED OR STATUTORY, + INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT + OF THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, AND ANY WARRANTY THAT MAY + ARISE BY REASON OF TRADE USAGE, CUSTOM, OR COURSE OF DEALING. WITHOUT + LIMITING THE FOREGOING, YOU ACKNOWLEDGE THAT THE SOFTWARE IS PROVIDED + "AS IS" AND THAT THE AUTHORS DO NOT WARRANT THE SOFTWARE WILL RUN + UNINTERRUPTED OR ERROR FREE. LIMITED LIABILITY THE ENTIRE RISK AS TO + RESULTS AND PERFORMANCE OF THE SOFTWARE IS ASSUMED BY YOU. UNDER NO + CIRCUMSTANCES WILL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT, + INCIDENTAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES OF ANY KIND OR NATURE + WHATSOEVER, WHETHER BASED ON CONTRACT, WARRANTY, TORT (INCLUDING + NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, ARISING OUT OF OR IN ANY + WAY RELATED TO THE SOFTWARE, EVEN IF THE AUTHORS HAVE BEEN ADVISED ON + THE POSSIBILITY OF SUCH DAMAGE OR IF SUCH DAMAGE COULD HAVE BEEN + REASONABLY FORESEEN, AND NOTWITHSTANDING ANY FAILURE OF ESSENTIAL + PURPOSE OF ANY EXCLUSIVE REMEDY PROVIDED. SUCH LIMITATION ON DAMAGES + INCLUDES, BUT IS NOT LIMITED TO, DAMAGES FOR LOSS OF GOODWILL, LOST + PROFITS, LOSS OF DATA OR SOFTWARE, WORK STOPPAGE, COMPUTER FAILURE OR + MALFUNCTION OR IMPAIRMENT OF OTHER GOODS. IN NO EVENT WILL THE AUTHORS + BE LIABLE FOR THE COSTS OF PROCUREMENT OF SUBSTITUTE SOFTWARE OR + SERVICES. YOU ACKNOWLEDGE THAT THIS SOFTWARE IS NOT DESIGNED FOR USE + IN ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS SUCH AS OPERATION OF + NUCLEAR FACILITIES, AIRCRAFT NAVIGATION OR CONTROL, OR LIFE-CRITICAL + APPLICATIONS. THE AUTHORS EXPRESSLY DISCLAIM ANY LIABILITY RESULTING + FROM USE OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT IN HAZARDOUS + ENVIRONMENTS AND ACCEPTS NO LIABILITY IN RESPECT OF ANY ACTIONS OR + CLAIMS BASED ON THE USE OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT + IN HAZARDOUS ENVIRONMENTS BY YOU. FOR PURPOSES OF THIS PARAGRAPH, THE + TERM "LIFE-CRITICAL APPLICATION" MEANS AN APPLICATION IN WHICH THE + FUNCTIONING OR MALFUNCTIONING OF THE SOFTWARE MAY RESULT DIRECTLY OR + INDIRECTLY IN PHYSICAL INJURY OR LOSS OF HUMAN LIFE. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8 TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9 LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10 U.S. GOVERNMENT END USERS. + +11 MISCELLANEOUS. + +12 RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +EXHIBIT A. + + "The contents of this file are subject to the gSOAP Public License + Version 1.3 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.cs.fsu.edu/ engelen/soaplicense.html + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + The Original Code of the gSOAP Software is: stdsoap.h, stdsoap2.h, + stdsoap.c, stdsoap2.c, stdsoap.cpp, stdsoap2.cpp, soapcpp2.h, + soapcpp2.c, soapcpp2 lex.l, soapcpp2 yacc.y, error2.h, error2.c, + symbol2.c, init2.c, soapdoc2.html, and soapdoc2.pdf, httpget.h, + httpget.c, stl.h, stldeque.h, stllist.h, stlvector.h, stlset.h. + The Initial Developer of the Original Code is Robert A. van Engelen. + Portions created by Robert A. van Engelen are Copyright (C) 2001-2004 + Robert A. van Engelen, Genivia inc. All Rights Reserved. + Contributor(s): + "________________________." + + [Note: The text of this Exhibit A may differ slightly form the text of + the notices in the Source Code files of the Original code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + +EXHIBIT B. + + "Part of the software embedded in this product is gSOAP software. + Portions created by gSOAP are Copyright (C) 2001-2009 Robert A. van + Engelen, Genivia inc. All Rights Reserved. THE SOFTWARE IN THIS + PRODUCT WAS IN PART PROVIDED BY GENIVIA INC AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE." From 8b460493b2ec18aae6525f49663fcc53e6c00d77 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:16:11 +0000 Subject: [PATCH 13/26] net-dns/bind-tools: Sync with Gentoo It's from Gentoo commit c42c6e7e345f5f5146af2c965fff98576a67248d. --- .../portage-stable/net-dns/bind-tools/bind-tools-9.16.33.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.ebuild index 013e0effc4..9fac2b5c98 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.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 )" From f2628ae573a968f768b6cc7e6b12a976f29691fe Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:16:13 +0000 Subject: [PATCH 14/26] net-misc/curl: Sync with Gentoo It's from Gentoo commit 91d61efd7851b7c912c7ce0b45bc10889f2cf61e. --- ...7.86.0-r1.ebuild => curl-7.86.0-r2.ebuild} | 2 +- ...rl-7.86.0.ebuild => curl-7.86.0-r3.ebuild} | 7 +- ...tailmatch-like-in-7.85.0-and-earlier.patch | 84 +++++++++++++++++++ 3 files changed, 91 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/portage-stable/net-misc/curl/{curl-7.86.0-r1.ebuild => curl-7.86.0-r2.ebuild} (99%) rename sdk_container/src/third_party/portage-stable/net-misc/curl/{curl-7.86.0.ebuild => curl-7.86.0-r3.ebuild} (96%) create mode 100644 sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-7.86.0-noproxy-tailmatch-like-in-7.85.0-and-earlier.patch diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r2.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r1.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r2.ebuild index d83faa8a09..8342595fcd 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r2.ebuild @@ -115,7 +115,7 @@ multilib_src_configure() { 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 ) + myconf+=( --without-gnutls --without-mbedtls --without-nss ) if use gnutls || use curl_ssl_gnutls; then einfo "SSL provided by gnutls" diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild similarity index 96% rename from sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0.ebuild rename to sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild index 4dbd6a99bb..cd08376dee 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/curl-7.86.0-r3.ebuild @@ -95,6 +95,9 @@ MULTILIB_CHOST_TOOLS=( 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() { @@ -110,10 +113,11 @@ multilib_src_configure() { # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) local myconf=() - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl ) 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 ) + if use gnutls || use curl_ssl_gnutls; then einfo "SSL provided by gnutls" myconf+=( --with-gnutls --with-nettle ) @@ -148,6 +152,7 @@ multilib_src_configure() { fi else + myconf+=( --without-ssl ) einfo "SSL disabled" fi diff --git a/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-7.86.0-noproxy-tailmatch-like-in-7.85.0-and-earlier.patch b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-7.86.0-noproxy-tailmatch-like-in-7.85.0-and-earlier.patch new file mode 100644 index 0000000000..1f04f22f9b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-misc/curl/files/curl-7.86.0-noproxy-tailmatch-like-in-7.85.0-and-earlier.patch @@ -0,0 +1,84 @@ +https://github.com/curl/curl/issues/9842 +https://github.com/curl/curl/commit/b1953c1933b369b1217ef0f16053e26da63488c3 + +From b1953c1933b369b1217ef0f16053e26da63488c3 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Sun, 6 Nov 2022 23:19:51 +0100 +Subject: [PATCH] noproxy: tailmatch like in 7.85.0 and earlier + +A regfression in 7.86.0 (via 1e9a538e05c010) made the tailmatch work +differently than before. This restores the logic to how it used to work: + +All names listed in NO_PROXY are tailmatched against the used domain +name, if the lengths are identical it needs a full match. + +Update the docs, update test 1614. + +Reported-by: Stuart Henderson +Fixes #9842 +Closes #9858 +--- + docs/libcurl/opts/CURLOPT_NOPROXY.3 | 4 ---- + lib/noproxy.c | 32 +++++++++++++++-------------- + tests/unit/unit1614.c | 3 ++- + 3 files changed, 19 insertions(+), 20 deletions(-) + +diff --git a/docs/libcurl/opts/CURLOPT_NOPROXY.3 b/docs/libcurl/opts/CURLOPT_NOPROXY.3 +index 5e4c32130431..dc3cf7c10833 100644 +--- a/docs/libcurl/opts/CURLOPT_NOPROXY.3 ++++ b/docs/libcurl/opts/CURLOPT_NOPROXY.3 +@@ -40,10 +40,6 @@ list is matched as either a domain which contains the hostname, or the + hostname itself. For example, "ample.com" would match ample.com, ample.com:80, + and www.ample.com, but not www.example.com or ample.com.org. + +-If the name in the \fInoproxy\fP list has a leading period, it is a domain +-match against the provided host name. This way ".example.com" will switch off +-proxy use for both "www.example.com" as well as for "foo.example.com". +- + Setting the \fInoproxy\fP string to "" (an empty string) will explicitly + enable the proxy for all host names, even if there is an environment variable + set for it. +diff --git a/lib/noproxy.c b/lib/noproxy.c +index 2832ae166a5b..fb856e4faa72 100644 +--- a/lib/noproxy.c ++++ b/lib/noproxy.c +@@ -187,22 +187,24 @@ bool Curl_check_noproxy(const char *name, const char *no_proxy) + tokenlen--; + + if(tokenlen && (*token == '.')) { +- /* A: example.com matches '.example.com' +- B: www.example.com matches '.example.com' +- C: nonexample.com DOES NOT match '.example.com' +- */ +- if((tokenlen - 1) == namelen) +- /* case A, exact match without leading dot */ +- match = strncasecompare(token + 1, name, namelen); +- else if(tokenlen < namelen) +- /* case B, tailmatch with leading dot */ +- match = strncasecompare(token, name + (namelen - tokenlen), +- tokenlen); +- /* case C passes through, not a match */ ++ /* ignore leading token dot as well */ ++ token++; ++ tokenlen--; + } +- else +- match = (tokenlen == namelen) && +- strncasecompare(token, name, namelen); ++ /* A: example.com matches 'example.com' ++ B: www.example.com matches 'example.com' ++ C: nonexample.com DOES NOT match 'example.com' ++ */ ++ if(tokenlen == namelen) ++ /* case A, exact match */ ++ match = strncasecompare(token, name, namelen); ++ else if(tokenlen < namelen) { ++ /* case B, tailmatch domain */ ++ match = (name[namelen - tokenlen - 1] == '.') && ++ strncasecompare(token, name + (namelen - tokenlen), ++ tokenlen); ++ } ++ /* case C passes through, not a match */ + break; + case TYPE_IPV4: + /* FALLTHROUGH */ From 89333ea24437ab22e6dbd73018308eb1a5f15d02 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:16:17 +0000 Subject: [PATCH 15/26] net-misc/wget: Sync with Gentoo It's from Gentoo commit 7c6deb877943d16495c908f338b23cc2fb04f22b. --- .../portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild index 8a4581afe9..70e211e48b 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.21.3-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.gz.sig )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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="cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )" RESTRICT="!test? ( test )" From 2d3eeb423a2664a28b699ecb608ee49e01b1d854 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:16:18 +0000 Subject: [PATCH 16/26] net-misc/whois: Sync with Gentoo It's from Gentoo commit ac82c2ef7508169844632e059b2cb319bf187a81. --- .../portage-stable/net-misc/whois/whois-5.5.14.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.14.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.14.ebuild index 4c1dfcda83..a0d9e810ec 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.14.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/whois/whois-5.5.14.ebuild @@ -17,7 +17,7 @@ else #SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/${PN} - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" From c1aa5bf2ec63a8fb2bbc38bebf062e33a88e18ff Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:16:20 +0000 Subject: [PATCH 17/26] profiles: Sync with Gentoo It's from Gentoo commit d0e673c6f516fdffe8b43c77c1f13dbddde4fdb3. --- .../profiles/arch/hppa/use.mask | 4 + .../profiles/arch/loong/package.use.mask | 7 +- .../profiles/arch/loong/use.mask | 4 + .../arch/powerpc/ppc32/package.use.mask | 4 + .../powerpc/ppc32/package.use.stable.mask | 5 + .../profiles/arch/x86/package.use.mask | 4 + .../profiles/base/make.defaults | 4 +- .../profiles/base/package.use.mask | 34 +++ .../profiles/features/wd40/package.mask | 1 + .../profiles/features/wd40/package.use.mask | 11 + .../portage-stable/profiles/license_groups | 2 +- .../profiles/package.deprecated | 2 + .../portage-stable/profiles/package.mask | 240 +++++++++++++----- .../portage-stable/profiles/use.desc | 1 + 14 files changed, 253 insertions(+), 70 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask index 83ae1d1951..171fb2e333 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/hppa/use.mask @@ -7,6 +7,10 @@ # NOTE: When masking a USE flag due to missing keywords, please file a keyword # request bug for the hppa arch. +# Sam James (2022-10-15) +# x11-apps/fonttosfnt is not keyworded here +opentype-compat + # Matt Turner (2022-02-21) # app-crypt/tpm2-tss is not keyworded here tpm diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask index 29f4d02ab8..a11fe7068f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask @@ -1,9 +1,10 @@ # Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Ionen Wolkens (2022-11-04) -# media-libs/libffado is not keyworded here yet. -media-sound/jack2 ieee1394 +# WANG Xuerui (2022-11-18) +# net-libs/webkit-gtk is not available on loong yet. +app-text/atril epub +mate-base/mate help # WANG Xuerui (2022-10-04) # Sanitizers partially supported on this architecture. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/use.mask index 6a42ac4a2a..1440498b9f 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/use.mask @@ -1,6 +1,10 @@ # Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# WANG Xuerui (2022-11-18) +# net-libs/webkit-gtk is not available on loong yet. +webkit + # WANG Xuerui (2022-11-01) # qtwebengine isn't available on loong yet webengine diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask index 58aaa24e15..4a5fa9330d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2022-11-19) +# Fails to compile because of size, bug #829602. +sys-devel/clang extra + # Andrew Ammerlaan (2022-09-23) # The corresponding Qt5 modules are not keyworded on ppc, and we don't want to # keyword them solely because of PyQt5 while there are no other in-tree users. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask index e3c5fea5de..98dba266b7 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc32/package.use.stable.mask @@ -17,6 +17,11 @@ #--- END OF EXAMPLES --- +# Sam James (2022-11-19) +# Deps not stable on ppc +sys-devel/clang-common default-lld +sys-devel/llvm binutils-plugin z3 xar + # Michał Górny (2022-11-06) # Unmask the target on python-exec while it's masked elsewhere. dev-lang/python-exec -python_targets_python3_11 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 2e5749c532..80f4f0d954 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Michał Górny (2022-11-16) +# spirv-llvm-translator is not keyworded x86. +dev-libs/libclc spirv + # Ionen Wolkens (2022-11-07) # media-libs/libplacebo is keyworded here and vulkan is usable media-video/mpv -libplacebo -vulkan diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults index 1117b529b3..332b189ec6 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/base/make.defaults @@ -172,10 +172,10 @@ POSTGRES_TARGETS="postgres12 postgres13" # PHP_TARGETS="php7-4 php8-0" -# Alfredo Tupone (2019-09-03) +# Alfredo Tupone (2022-11-16) # # Default ADA target -ADA_TARGET="gnat_2020" +ADA_TARGET="gnat_2021" # Marek Szuba (2020-10-15) # Default targets for lua{,-single}.eclass 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 3a3c6d81ae..19ccff06c4 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,40 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Sam James (2022-11-19) +# Needs long-EOL dev-lang/spidermonkey:60 (which also needs python:2.7). +media-libs/coin javascript + +# Michał Górny (2022-11-19) +# Requires packages masked for removal. +mail-mta/netqmail authcram +mail-mta/notqmail authcram + +# Michał Górny (2022-11-17) +# Require packages masked for removal. +net-analyzer/netdata kinesis + +# Michał Górny (2022-11-17) +# Requires dev-python/gevent that is masked for removal. +x11-misc/py3status gevent +dev-python/rpyc gevent +mail-filter/pyzor gevent +www-servers/uwsgi python-gevent + +# Michał Górny (2022-11-17) +# Requires net-misc/pyhoca-cli that is masked for removal. +net-misc/remmina x2go + +# Matt Turner (2022-11-16) +# tracker-miners depends on libsoup:3.0 but USE=rss depends on net-libs/libgrss +# which has not been ported to libsoup:3.0. +>=app-misc/tracker-miners-3.4.0-r1 rss + +# Marek Szuba (2022-11-14) +# Incomplete dependency tree, no qmake6 instrumentation in either +# qmake-utils.eclass nor the ebuilds yet. +dev-python/pyotherside qt6 + # Sam James (2022-10-08) # Older versions of libvirt need a vulnerable version of wireshark =media-gfx/libimagequant-4 media-libs/libavif >=media-libs/libopenraw-0.3.2 +media-video/ogmrip media-video/rav1e >=net-irc/polari-3.37 net-libs/quiche diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask index f0d379744e..7a8ede783d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask @@ -1,6 +1,17 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2022-11-19) +# GNOME packages pulling in e.g. gjs which then needs Rust. +dev-util/glade gjs +gnome-base/gnome-menus test +gnome-base/gnome-settings-daemon modemmanager +gnome-base/nautilus previewer +net-vpn/networkmanager-openconnect gtk +net-vpn/networkmanager-openvpn gtk +net-vpn/networkmanager-pptp gtk +net-vpn/networkmanager-vpnc gtk + # Michał Górny (2022-07-29) # More packages requiring dev-python/cryptography or its revdeps. app-admin/salt keyring neutron 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 12f4be7c01..bb239d02fa 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/license_groups +++ b/sdk_container/src/third_party/portage-stable/profiles/license_groups @@ -73,7 +73,7 @@ BINARY-REDISTRIBUTABLE @FREE Amazon Atmel AVASYS bh-luxi bonnie Broadcom freedis # License agreements that try to take away your rights. These are more # restrictive than "all-rights-reserved" or require explicit approval. -EULA 2dboy-EULA AMD-GPU-PRO-EULA android AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Intel-SDP Introversion JoyPixels LOKI-EULA MakeMKV-EULA Microsemi microsoft-edge Microsoft-vscode Mojang ms-teams-pre MTA-0.5 NVIDIA-CUDA NVIDIA-SDK OPERA-2018 PAPERS-PLEASE PassMark-EULA PICO-8 Primate-Plunge PUEL Q3AEULA-20000111 QUAKE4 RAR sfpg Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone +EULA 2dboy-EULA AMD-GPU-PRO-EULA android AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Intel-SDP Introversion JoyPixels LOKI-EULA MakeMKV-EULA Microsemi microsoft-edge Microsoft-vscode Mojang ms-teams-pre MTA-0.5 NVIDIA-CUDA NVIDIA-SDK OPERA-2018 PAPERS-PLEASE PassMark-EULA PICO-8 Primate-Plunge PUEL PUEL-11 Q3AEULA-20000111 QUAKE4 RAR sfpg Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone # Deprecated license labels, used by repoman and pkgcheck #DEPRECATED (currently none) 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 ccf0240faa..ca26d490fc 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/package.deprecated +++ b/sdk_container/src/third_party/portage-stable/profiles/package.deprecated @@ -45,6 +45,8 @@ virtual/imap-c-client # Matt Turner (2022-10-02) # Dummy packages, now merged into app-accessibility/at-spi2-core. +# When possible, replace dependencies on these packages with a dependency on +# >=app-accessibility/at-spi2-core-2.46.0 app-accessibility/at-spi2-atk dev-libs/atk 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 58bdd09465..472326f9fd 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,181 @@ #--- END OF EXAMPLES --- +# Ionen Wolkens (2022-11-21) +# Was added only for dev-python/pytest-bdd which no longer needs it. +# If using, migrate to stdlib glob which supports `**` since python-3.5. +# Removal: 2022-12-21. +dev-python/glob2 + +# David Seifert (2022-11-21) +# Release more than 30 years (!) old, K&R C, full of implicit function +# declarations, EAPI 6, problematic license. Bug #729536, #854879, #870736. +# Removal on 2022-12-21. +app-text/agrep + +# Michał Górny (2022-11-19) +# Fails to build. Last bumped in 2017. Library with no revdeps. +# Removal on 2022-12-19. Bug #630396. +dev-cpp/pstreams + +# Michał Górny (2022-11-19) +# Packages with no maintainer and major bugs reported. They are either +# inactive upstream, or have not been bumped for a long time. +# +# app-emulation/aqemu: bug #806421, last bumped in 2016 +# app-forensics/ovaldi: revdep of dev-libs/xalan-c, last bumped in 2017 +# app-misc/glimpse: bug #684096, last bumped in 2013 +# dev-db/cpp-driver: bug #685936, last bumped in 2019 +# dev-erlang/riakc: bug #722688, last bumped in 2016 +# dev-libs/xalan-c: bug #734190, last bumped in 2011 +# dev-util/stubgen: bug #839927, last bumped in 2011 +# media-gfx/xzgv: bug #831252, last bumped in 2009 +# net-dns/dnssec-check: bug #571350, last bumped in 2016 +# net-mail/cmd5checkpw: bug #833292, last bumped in 2005 +# net-ftp/gproftpd: bug #550524, last bumped in 2007 +# sys-apps/intel-performance-counter-monitor: bug #728564, +# last bumped in 2016 +# +# Removal on 2022-12-19. +acct-group/cmd5checkpw +acct-user/cmd5checkpw +app-emulation/aqemu +app-forensics/ovaldi +app-misc/glimpse +dev-db/cpp-driver +dev-erlang/riakc +dev-libs/xalan-c +dev-util/stubgen +media-gfx/xzgv +net-dns/dnssec-check +net-mail/cmd5checkpw +net-ftp/gproftpd +sys-apps/intel-performance-counter-monitor + +# Michał Górny (2022-11-19) +# Packages with reported failures and no maintainer activity. +# +# media-sound/retrovol: bug #624136, last bumped in 2013, homepage dead +# media-sound/umix: bug #726076, last release in 2003 (!) +# +# Removal on 2022-12-19. +media-sound/retrovol +media-sound/umix + +# Michał Górny (2022-11-19) +# Agavi and its dependencies that are unmaintained and have no other +# reverse dependencies. It has received no activity since 2016, +# and at least PEAR-VersionControl_SVN has reported test failures. +# Removal on 2022-12-19. Bug #737854. +dev-php/agavi +dev-php/phing +dev-php/PEAR-PEAR_PackageFileManager +dev-php/PEAR-VersionControl_SVN +dev-php/phpmd +dev-php/simpletest + +# Michał Górny (2022-11-18) +# These packages still lack support for Python 3.10. In general, they +# did not see any activity recently and either have no maintainer +# or their respective maintainers did not reply to the bug. Many +# of them do not have tests enabled or have unresolved test failures. +# Removal on 2022-12-18. Tracker bug #823185. +app-admin/ansible-cmdb +app-arch/bloscpack +app-backup/borgweb +app-i18n/fcitx-sunpinyin +app-i18n/ibus-kkc +app-i18n/ibus-sunpinyin +app-i18n/libkkc +app-i18n/libkkc-data +app-i18n/sunpinyin +app-i18n/sunpinyin-data +app-i18n/xsunpinyin +app-portage/distpatch +app-text/q-text-as-data +app-vim/pydiction +app-vim/vimoutliner +dev-libs/aws-sdk-cpp +dev-python/Rx +dev-python/bert +dev-python/flask-assets +dev-python/libpy_simdjson +dev-python/parallax +dev-python/pytest-salt +dev-python/requests_pkcs12 +dev-python/slackclient +dev-python/tvdb_api +dev-python/webassets +dev-python/ws4py +dev-util/comparator +dev-util/rosinstall_generator +games-util/pyfa +mate-extra/caja-hide +media-gfx/netpaint +media-plugins/mythplugins +media-sound/marrie +media-tv/tvnamer +net-analyzer/carl +net-im/skype-dbus-mock +sci-libs/bmrblib +sci-mathematics/relational +sys-cluster/crmsh + +# Michał Górny (2022-11-17) +# Rarely used package with very high maintenance cost. Hacky, requires +# explicit support code for every architecture, effectively preventing +# it from being keyworded on some of the Gentoo architectures. The test +# suite is problematic. The current release blocks dev-python/greenlet +# upgrade, the new release fails many tests again. +# Removal on 2022-12-17. Bug #879011. +dev-python/gevent +dev-python/geventhttpclient + +# Michał Górny (2022-11-17) +# Requires dev-python/gevent that is going to be masked for removal. +# net-misc/x2goclient remains as a replacement. +# Removal on 2022-12-17. Bug #879011. +net-misc/pyhoca-cli +net-misc/pyhoca-gui +net-misc/python-x2go + +# Matthew Smith (2022-11-17) +# libnet:1.0's remaining rdeps. Dead upstreams. +# Removal on 2022-12-17. Bug #881677 +net-libs/libnet:1.0 +net-analyzer/angst +net-analyzer/egressor +net-analyzer/thcrut +net-dns/dnshijacker +net-misc/selfdhcp + +# Michał Górny (2022-11-17) +# No maintainer. No upstream activity since 2020. Multiple bugs +# reported. +# Removal on 2022-12-17. Bug #881673. +app-admin/prelude-manager +dev-libs/libprelude +dev-libs/libpreludedb +net-analyzer/prelude-correlator +net-analyzer/prelude-lml-rules +net-analyzer/prelude-lml +sec-policy/selinux-prelude +www-apps/prewikka + +# Michał Górny (2022-11-15) +# Test-restricted since its introduction in 2016. Not receiving package +# maintainer's attention. No revdeps left. +# Removal on 2022-12-15. Bug #759931. +dev-python/pytest-html + +# Matt Turner (2022-11-14) +# Unmaintained in Gentoo since at least the transition to git. Last release in +# 2014. Depends on x11-libs/gtk+:2 and gnome-base/gconf. Fails to build with +# (1) clang-16, (2) with LTO, (3) with -fno-common. +# Bugs #812137, #864763, #871405, #873886 +# Removal on 2022-12-14 +x11-misc/xnee + # Jonas Stein (2022-11-13) # Dead upstream # Removal after 2023-01-01. Bug #881249. @@ -176,13 +351,6 @@ dev-libs/cloog # Removal in 30 days dev-python/pweave -# Michał Górny (2022-10-28) -# Originally last rited in Aug 2020 due to lack of Python 3 support. -# The last rites were undone, however this package never got fixed. -# Instead, it has been covered by incorrect "downgrade" mask since then. -# Removal on 2022-11-11. Bug #695010. -app-i18n/scim-sunpinyin - # Jonas Stein (2022-10-26) # Dead upstream, open bugs. # Removal after 2022-12-24. Bug #878337. @@ -218,12 +386,6 @@ dev-ruby/ruby-sdl # Removal on 2022-11-20. Bug #845723. dev-python/eventlet -# David Seifert (2022-10-18) -# Dead package, use dev-util/nvidia-cuda-toolkit instead. Examples were -# removed in 11.6, no revdeps left. Removal on 2022-11-17. -# Bug #722092, #749900, #762169, #840656, #845381, #858392, #866701. -dev-util/nvidia-cuda-sdk - # Michał Górny (2022-10-17) # Unmaintained since 2018. Requires dev-python/nose. No revdeps left. # Removal on 2022-11-16. Bug #877375. @@ -239,43 +401,6 @@ dev-python/nose_warnings_filters # migrate to a newer branch. (2022-10-14) -# Last upstream release in 2013. Last upstream commit in 2019. No maintainer in -# Gentoo. No reverse dependencies. EAPI=6. -# Depends on unmaintained packages: -# - x11-libs/vte:0 -# Bug #811540. -# Removal on 2022-11-14 -x11-terms/lilyterm - -# Matt Turner (2022-10-14) -# Unmaintained upstream. Last release in 2008. Only reverse dependency is -# gnome-mud, which is masked for removal. -# Bugs #349301, #713152, #802723, #808435, #870730, #877079. -# Removal on 2022-11-14 -net-libs/gnet - -# Matt Turner (2022-10-14) -# Needs upstream work to modernize codebase. Depends on lots of unmaintained -# packages: -# - app-text/rarian -# - gnome-base/gconf -# - gnome-base/libglade -# - net-libs/gnet:2 -# - x11-libs/gtk+:2 -# - x11-libs/vte:0 -# Bugs #670904, #873859 -# Removal on 2022-11-14 -games-mud/gnome-mud - -# Joshua Kinard (2022-10-13) -# Difficult-to-resolve build issues on modern toolchains, -# not publicly maintained, developer contact is difficult, -# and project website has SSL certificate issues. -# Bug #838109. -# Removal on 2022-11-13 -net-misc/spread - # Sam James (2022-10-12) # Upstream has withdrawn these releases because of a (yet unexplained) # "significant regression". @@ -367,22 +492,11 @@ virtual/httpd-php:8.2 # Unfixed root privilege escalation, bug #631552 sys-cluster/slurm -# Mike Gilbert (2022-09-12) -# repoman is no longer maintained and has been removed from the portage -# git repository. Please use dev-util/pkgcheck and dev-util/pkgdev instead. -# Removal on 2022-11-11. Bug #835013. -app-portage/repoman - # Matthias Schwarzott (2022-09-08) # Breaks kernel builds with BTF enabled. # Bug #868762. =dev-util/pahole-1.24 -# Mike Gilbert (2022-09-05) -# Crash due to double-free. -# https://bugs.gentoo.org/868567 -=sys-apps/gawk-5.2.0 - # hololeap (2022-08-21) # doctest-parallel does not currently work with Setup.hs (used internally by # haskell-cabal.eclass) @@ -595,15 +709,12 @@ sys-devel/automake:1.11 >=mail-client/evolution-3.46 >=mail-client/geary-43 >=media-gfx/gnome-photos-43 -media-libs/libshumate >=net-irc/polari-43 net-libs/dleyna >=net-libs/gnome-online-accounts-3.46 >=net-libs/gssdp-1.6 >=net-libs/gupnp-1.6 -net-libs/libsoup:3.0 net-libs/phodav:3.0 -net-libs/rest:1.0 net-libs/uhttpmock:1.0 net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:5 @@ -611,6 +722,7 @@ net-libs/webkit-gtk:5 >=net-misc/rygel-0.42 >=net-misc/spice-gtk-0.41-r1 sci-geosciences/geocode-glib:2 +>=sci-geosciences/geocode-glib-3.26.4-r1:0 >=sci-geosciences/gnome-maps-43 >=sys-apps/osinfo-db-tools-1.10.0-r1 >=sys-libs/libosinfo-1.10.0-r1 diff --git a/sdk_container/src/third_party/portage-stable/profiles/use.desc b/sdk_container/src/third_party/portage-stable/profiles/use.desc index d7e841f80d..e82b7295be 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/use.desc +++ b/sdk_container/src/third_party/portage-stable/profiles/use.desc @@ -227,6 +227,7 @@ openal - Add support for the Open Audio Library openexr - Support for the OpenEXR graphics file format opengl - Add support for OpenGL (3D graphics) openmp - Build support for the OpenMP (support parallel computing), requires >=sys-devel/gcc-4.2 built with USE="openmp" +opentype-compat - Convert BDF and PCF bitmap fonts to OTB wrapper format opus - Enable Opus audio codec support oracle - Enable Oracle Database support orc - Use dev-lang/orc for just-in-time optimization of array operations From 26e8436314a049ff7249bd518d176fd5d6c46e30 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:16:22 +0000 Subject: [PATCH 18/26] sys-devel/autoconf: Sync with Gentoo It's from Gentoo commit 541ccf270b9b9b5631072a654cd3add5ccd433e7. --- ...2.69-r7.ebuild => autoconf-2.69-r8.ebuild} | 0 ...2.71-r4.ebuild => autoconf-2.71-r5.ebuild} | 1 + .../files/autoconf-2.13-K-R-decls-clang.patch | 2 +- .../files/autoconf-2.69-K-R-decls-clang.patch | 29 ++++++ .../autoconf-2.71-K-R-decls-clang-deux.patch | 94 +++++++++++++++++++ .../files/autoconf-2.71-K-R-decls-clang.patch | 2 +- 6 files changed, 126 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-devel/autoconf/{autoconf-2.69-r7.ebuild => autoconf-2.69-r8.ebuild} (100%) rename sdk_container/src/third_party/portage-stable/sys-devel/autoconf/{autoconf-2.71-r4.ebuild => autoconf-2.71-r5.ebuild} (98%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang-deux.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r7.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r8.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r7.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.69-r8.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r5.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r4.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r5.ebuild index 225cfc50a5..3ecf3ddc59 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/autoconf-2.71-r5.ebuild @@ -47,6 +47,7 @@ PATCHES=( "${FILESDIR}"/${P}-AC_C_BIGENDIAN-lto.patch "${FILESDIR}"/${P}-K-R-decls-clang.patch "${FILESDIR}"/${P}-make-4.4.patch + "${FILESDIR}"/${P}-K-R-decls-clang-deux.patch ) src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-K-R-decls-clang.patch b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-K-R-decls-clang.patch index 874712cea1..42c3018aea 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-K-R-decls-clang.patch +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.13-K-R-decls-clang.patch @@ -1,7 +1,7 @@ https://bugs.gentoo.org/870412 https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=8b5e2016c7ed2d67f31b03a3d2e361858ff5299b -Backport the K&R decls fix to 2.69 to avoid configure tests +Backport the K&R decls fix to 2.13 to avoid configure tests failing (often "silently", i.e. doesn't fail the build of the package overall, just leads to wrong results) with newer compilers like the upcoming Clang 16. diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.69-K-R-decls-clang.patch b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.69-K-R-decls-clang.patch index 9f16bc93ad..77444ebc5b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.69-K-R-decls-clang.patch +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.69-K-R-decls-clang.patch @@ -1,5 +1,6 @@ https://bugs.gentoo.org/870412 https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=8b5e2016c7ed2d67f31b03a3d2e361858ff5299b +(and contains a backport of https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=bf5a75953b6d504f0405b1ca33b039b8dd39eef4) Backport the K&R decls fix to 2.69 to avoid configure tests failing (often "silently", i.e. doesn't fail the build of @@ -363,3 +364,31 @@ Subject: [PATCH] backport K&R decl fixes #define mymacro1(arg) arg #define mymacro2]]) # The difference in space-before-open-paren is intentional. +--- a/lib/autoconf/c.m4 ++++ b/lib/autoconf/c.m4 +@@ -1106,9 +1106,7 @@ struct stat; + /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ + struct buf { int x; }; + FILE * (*rcsopen) (struct buf *, struct stat *, int); +-static char *e (p, i) +- char **p; +- int i; ++static char *e (char **p, int i) + { + return p[i]; + } +--- a/lib/autoconf/specific.m4 ++++ b/lib/autoconf/specific.m4 +@@ -251,10 +251,9 @@ AC_INCLUDES_DEFAULT + /* Some platforms explicitly require an extern "C" signal handler + when using C++. */ + #ifdef __cplusplus +-extern "C" void ucatch (int dummy) { } +-#else +-void ucatch (dummy) int dummy; { } ++extern "C" + #endif ++void ucatch (int dummy) { } + + int + main (void) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang-deux.patch b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang-deux.patch new file mode 100644 index 0000000000..6a3d6580a3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang-deux.patch @@ -0,0 +1,94 @@ +https://bugs.gentoo.org/870412 +https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=bf5a75953b6d504f0405b1ca33b039b8dd39eef4 + +Backport the K&R decls fix to 2.71 to avoid configure tests +failing (often "silently", i.e. doesn't fail the build of +the package overall, just leads to wrong results) with +newer compilers like the upcoming Clang 16. + +From bf5a75953b6d504f0405b1ca33b039b8dd39eef4 Mon Sep 17 00:00:00 2001 +From: Zack Weinberg +Date: Thu, 10 Nov 2022 12:05:30 -0500 +Subject: More fixes for compilers that reject K&R function definitions. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes all of the remaining failures exposed by running the +testsuite with GCC 12 and +CC='cc -Wimplicit-function-declaration -Wold-style-definition + -Wimplicit-int -Werror' +. + +* lib/autoconf/c.m4 (_AC_C_C89_TEST_GLOBALS): Don’t use K&R function + definitions. +* lib/autoconf/specific.m4 (AC_SYS_RESTARTABLE_SYSCALLS): Likewise. + (AC_FUNC_MKTIME): Declare functions taking no arguments as ‘fn (void)’ + not ‘fn ()’. +* lib/autoconf/c.m4 (_AC_C_C99_TEST_GLOBALS): Declare free(). +--- a/lib/autoconf/c.m4 ++++ b/lib/autoconf/c.m4 +@@ -1153,9 +1153,7 @@ struct stat; + /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ + struct buf { int x; }; + struct buf * (*rcsopen) (struct buf *, struct stat *, int); +-static char *e (p, i) +- char **p; +- int i; ++static char *e (char **p, int i) + { + return p[i]; + } +@@ -1212,6 +1210,7 @@ extern int puts (const char *); + extern int printf (const char *, ...); + extern int dprintf (int, const char *, ...); + extern void *malloc (size_t); ++extern void free (void *); + + // Check varargs macros. These examples are taken from C99 6.10.3.5. + // dprintf is used instead of fprintf to avoid needing to declare +--- a/lib/autoconf/functions.m4 ++++ b/lib/autoconf/functions.m4 +@@ -1091,7 +1091,7 @@ static const char *tz_strings[] = { + /* Return 0 if mktime fails to convert a date in the spring-forward gap. + Based on a problem report from Andreas Jaeger. */ + static int +-spring_forward_gap () ++spring_forward_gap (void) + { + /* glibc (up to about 1998-10-07) failed this test. */ + struct tm tm; +@@ -1128,7 +1128,7 @@ mktime_test (time_t now) + } + + static int +-irix_6_4_bug () ++irix_6_4_bug (void) + { + /* Based on code from Ariel Faigon. */ + struct tm tm; +@@ -1170,7 +1170,7 @@ bigtime_test (int j) + } + + static int +-year_2050_test () ++year_2050_test (void) + { + /* The correct answer for 2050-02-01 00:00:00 in Pacific time, + ignoring leap seconds. */ +--- a/lib/autoconf/specific.m4 ++++ b/lib/autoconf/specific.m4 +@@ -361,10 +361,9 @@ AC_INCLUDES_DEFAULT + /* Some platforms explicitly require an extern "C" signal handler + when using C++. */ + #ifdef __cplusplus +-extern "C" void ucatch (int dummy) { } +-#else +-void ucatch (dummy) int dummy; { } ++extern "C" + #endif ++void ucatch (int dummy) { } + + int + main (void) +cgit v1.1 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang.patch b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang.patch index 33cb728695..e2e451e869 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang.patch +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf/files/autoconf-2.71-K-R-decls-clang.patch @@ -1,7 +1,7 @@ https://bugs.gentoo.org/870412 https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=8b5e2016c7ed2d67f31b03a3d2e361858ff5299b -Backport the K&R decls fix to 2.69 to avoid configure tests +Backport the K&R decls fix to 2.71 to avoid configure tests failing (often "silently", i.e. doesn't fail the build of the package overall, just leads to wrong results) with newer compilers like the upcoming Clang 16. From 139509a60662cc1caa3d2df33558820768a9af20 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:16:22 +0000 Subject: [PATCH 19/26] sys-devel/autoconf-wrapper: Sync with Gentoo It's from Gentoo commit f49bcd6145161142a76f91a38ddccbdce8039902. --- .../sys-devel/autoconf-wrapper/Manifest | 1 + .../autoconf-wrapper-20221118.ebuild | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221118.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/Manifest index 72082a2b2d..92ba4e2d8d 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/Manifest @@ -1 +1,2 @@ DIST autotools-wrappers-at-20220130.tar.gz 3625 BLAKE2B c587d778a0c3331d14498308ae720dabdbcf27349ef0a3a2d5db56bb0ef597a5b1ab43388f1456e7888b40f043d68b0d89b420ac7404008f9a813ef78ae7e96f SHA512 700204b6024636dc808339aac15fb19bb645b654d4777ba8bf0febded5eb6af98659d04ed23819a8a638b6ee905e62292995bf2f838c30dedacb1a6bc0d04f1a +DIST autotools-wrappers-at-20221118.tar.gz 3625 BLAKE2B 713e4b581baf6b5c0756f8bd026566e113eb6e8f54a594f132aa952277f68c7a9da28c93a191b8ad4279952ebcfcf7a5d679d4bb7a831b14af208ff2172ee15c SHA512 1409c890fa3450195868536bb8c1bdcfb52c11f412ab0b99652e39b7ea4eeec1807611e4fa89c8289c162c7de8ff5c2864a86d6637ea24088b3125f8db895663 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221118.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221118.ebuild new file mode 100644 index 0000000000..b3df473d9d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/autoconf-wrapper/autoconf-wrapper-20221118.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +MY_P="autotools-wrappers-at-${PV}" + +DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions" +HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git" +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" + +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" + +S="${WORKDIR}/${MY_P}" + +src_install() { + exeinto /usr/$(get_libdir)/misc + newexe ac-wrapper.sh ac-wrapper.sh + + dodir /usr/bin + local x= + for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do + dosym ../$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x} + done +} From 4b97feb5d4c52c4a8599e8e1d9e8fbc2b86343d9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:16:28 +0000 Subject: [PATCH 20/26] sys-devel/crossdev: Sync with Gentoo It's from Gentoo commit c39920e08570c4a771905ca7a7b63b95ecdad756. --- .../portage-stable/sys-devel/crossdev/crossdev-20220909.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7e1f57b0dc..62e271684d 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 @@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="Gentoo Cross-toolchain generator" From b02a6639a32cd25fec735638dcce70c12124973f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:16:28 +0000 Subject: [PATCH 21/26] sys-devel/flex: Sync with Gentoo It's from Gentoo commit 37ebd2afe651c59457d2040bda4bbdd786ea689d. --- .../portage-stable/sys-devel/flex/flex-2.6.4-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/flex/flex-2.6.4-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/flex/flex-2.6.4-r4.ebuild index 14ad4c2ba6..d588701fdf 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/flex/flex-2.6.4-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/flex/flex-2.6.4-r4.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool LICENSE="FLEX" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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="nls static test" RESTRICT="!test? ( test )" From f36c1973175915238ef50dce54061e43cbe913e3 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:16:28 +0000 Subject: [PATCH 22/26] sys-devel/gcc: Sync with Gentoo It's from Gentoo commit 38b43372af28e9046c17f1c82359f046edb9cbdd. --- .../portage-stable/sys-devel/gcc/Manifest | 14 ++--- .../sys-devel/gcc/gcc-10.4.1_p20221103.ebuild | 58 ------------------- ...027.ebuild => gcc-10.4.1_p20221117.ebuild} | 2 +- .../sys-devel/gcc/gcc-11.3.1_p20221104.ebuild | 52 ----------------- ...028.ebuild => gcc-11.3.1_p20221118.ebuild} | 2 +- .../sys-devel/gcc/gcc-12.2.1_p20221105.ebuild | 52 ----------------- ...029.ebuild => gcc-12.2.1_p20221119.ebuild} | 2 +- ...3.ebuild => gcc-13.0.0_pre20221120.ebuild} | 15 +++-- .../sys-devel/gcc/gcc-13.0.9999.ebuild | 1 - 9 files changed, 17 insertions(+), 181 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221103.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-10.4.1_p20221027.ebuild => gcc-10.4.1_p20221117.ebuild} (99%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221104.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-11.3.1_p20221028.ebuild => gcc-11.3.1_p20221118.ebuild} (98%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221105.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-12.2.1_p20221029.ebuild => gcc-12.2.1_p20221119.ebuild} (99%) rename sdk_container/src/third_party/portage-stable/sys-devel/gcc/{gcc-13.0.0_pre20221023.ebuild => gcc-13.0.0_pre20221120.ebuild} (81%) 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 3bca474b38..fc2bee6336 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/Manifest @@ -1,32 +1,32 @@ DIST gcc-10-20221006.tar.xz 71755692 BLAKE2B 0099821e5fcd5e1a069369a72f105607cb7f20fbef3d627a598d8c7a6439491e050533d6577b4f7953aabb52daf926ffc8eb9cecd8853833a14c90bd878e1ad9 SHA512 3fc1dceff31ec8a84babe31d88a312d9d3d30450ff0c42730b9a9fe45c0fc9509216fb95cd84df7477faebe2b9b7d8f7e269c9e76cecc05417dc6192e3b96c67 -DIST gcc-10-20221027.tar.xz 71769420 BLAKE2B e7e6cb023e950eac7ea143deaca30bf182ffdf3ec8fad3c5b6088233d1faea7bf9f43ea8a37ccc989c539be01b510f0708cfe586adae992d9265bc5612793238 SHA512 eada43f30355b417bd45b45886f6d33c29509f5dff32bb264b9a41cb03c61d83fd4c7e517136b1bd3877bff04946fad0dfd26b85b7f7bb5ada24b1fa23f660f6 -DIST gcc-10-20221103.tar.xz 71766176 BLAKE2B 5bd5ca13bee2605f6a77b59182012d605d14ab915505f5267ac59c5d6ce6a422f0720838f80825478372223cad08b4c03ff79d4d945b80452e2d7d59e11e41eb SHA512 a49f471cd9188851d5052a28e6d48d31d4788ebf62c00b3891ff193d8b8f4637fbcf0e2c681538202c2398a4a1082f073bc456a4712cdf53b0a5353b09d645cc DIST gcc-10-20221110.tar.xz 71760032 BLAKE2B 75f0f18c83021fb9ce5ed2501cefcda53463ee2256b6e594412020e8a27880f562880c5ae1e65a68b3da19e04de723fbaf8beee2fbbd5871eae5f4e05404b8de SHA512 3b836c26e4cf6896db3bd41d2140ac7b790fb9cd83a379dee832e4b38f92b56b88476bb86dbbece1bc3e2b348a912cbcaed0379f35994554a57689fb9b71f5d0 +DIST gcc-10-20221117.tar.xz 71762756 BLAKE2B d6b1d87d3b09dfe479f2fe21225d94f9f2aa310dba22b4f7f41a212e6d88378765dc2c244cf953394e5eabbd7e17f3d205b9933f7546023a875822120a2fbd83 SHA512 85ceff6524eb4f21e192a8213a75b127b911e01bfd4c9f1f7d1d6c8a6409608bccc009278152060213341b1c114f2330d54ad7b1d9bb7ed9213c1369ae434cef 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-patches-0.tar.xz 16188 BLAKE2B 3fe3163c4960ff02eb792b2d00b9b20e1c2b44ad2d2e79661ffa0a5795b1bb631bce83c506f485765a7b971e6d391ebc1803c327f0d8d06e457610f5d6074c90 SHA512 fde1fec92df535416221827d48daf7d498f675da5697bc15bb4e17ccfedf6e6705dd28f57a3c9ebc8065b49328246fa5aa1fd90bd88bc27fe2b7b3e924f0df15 +DIST gcc-10.5.0-patches-1.tar.xz 17180 BLAKE2B d8ecc7cc15fa1ab420fa9eff11173a1d5544b369720e8c54fc59375e591ebd0a429b7e81a2a3df86bd2eaf19e4b8148bf2e1b0c8410de3944d4801ce412016b2 SHA512 5855aa23ee0b262c20a1b6fd2d4a947180c079dc00e0fa675043edceee0c822eec0dc752f5fcb281b70c04e50c6fcaf6c5d5160ab15d3f0c51fa030eb2d79d26 DIST gcc-11-20221007.tar.xz 75790520 BLAKE2B de52f7fc5c7f5f82d9cbaeaa13b216e149a4aac8162188c628007c17ddb40aa838d19f2ca18216e8bfe5df2d21438f10c8e87298b53cbde4359f72c9cff87589 SHA512 b785236a00647041c9ea4552e5ea82a09e23a801b029773ba77bfc03675c530369ad0b5fc279330f3d8dd4b9b40aeaa9de84a39b6397f73984b7e2fdf8f0bad2 -DIST gcc-11-20221028.tar.xz 75809048 BLAKE2B 4b3796028379e594de0e750239bcb94131ef3170e6cacc8095b27cd8f148264c9c1e7271d17d38bfea8d9d6514dcf1e5ea56bf31c5cc30b0f6107b580da44002 SHA512 0dc7733abdc9d68fdab94f21b3d07a6881fd73f9df73be57ac0c129f9287771de8c93e2f287e84081186e66000ea29c1b338719eec96edb526b4ae7e27daca38 -DIST gcc-11-20221104.tar.xz 75796112 BLAKE2B c86d9308eda05c9bb724531308bac6d819d2b450eb4a13713f0b07873eb976077f7d5561835c516aac06f53508b18b2f56ccb4d75c61f3f72ff24468191b8ad6 SHA512 f13fc31f638df3ab401feb11d4b68fdab6643f56c3dea5ca07184e0b5cc29199a40fa21ce3c0298ad58e7952804b14131c24aa66b3f40db0ae997245af5f84bd DIST gcc-11-20221111.tar.xz 75802080 BLAKE2B 7e49eefb17f3905b587d6de489820dd6aa6a8315b665872a5acad9a35b5431ab459bad426acafad5e0f9634b1bcd39db05726662f7577d0f4fcd49e2944df455 SHA512 bd9fad5e8ca94b5e1c3855141418c5067d27cb9bfde624c0a0c32131f837507e5c896238636d9ac4b0447eb368d80522d1dc1a2ea6f7b2f8259c729b61a4e879 +DIST gcc-11-20221118.tar.xz 75811664 BLAKE2B 97cdbbe114a46f149c89da8190ccb7c98bf8888540459ac50432dd461178d36a5f203bb89a1205fb89a5a8d80c3518b6b05b882f0c29cd1a88e3ca3a6d1a59d2 SHA512 6634ae0929c41541696684dd2809f7fd6cb3428aecb32e149b9ed26aff487c8f3ec089865ccb015281dd814f064875282cb360963bdd90b2eff0db27897602a7 DIST gcc-11.3.0-musl-patches-1.tar.xz 3856 BLAKE2B f511f8b4c0696771d906beee9645b5d009ea4b673602baa1ca562d6f23c5b0caf2012aae93578671624617c4286e3937d79a7383d6a03bb438c5b774a06fe8e6 SHA512 cd375ff2affb213475acaabf02989b1f05d719d972970ea0304d20a816986807390893d1401826f3b497787642f35d90a244195f8e466db41e8d768366057334 DIST gcc-11.3.0-patches-7.tar.xz 15184 BLAKE2B 426f00feaa982a35d2c459e7a2c2e9d29b4b467ac3625ebd72bb31077c75bbf0c028137df03921c52ddc97a14d92c49777bd3f27b47a7b47d8a05e2d106b6bdb SHA512 bec8bf26b3e50633a5a2e0bb75ffeaba86becb704c14365ff3342e8d651ab75bb3ceec7808d88a25989b8c7182398184b95b6d1267aaef9aa828f687e4895e9d DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7 DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a85e13368279849f6f3ab89ad7abe505316afacf5084846c0cb133bdcb5c918244644242c194e6ce55455a26e67b3983d73ef SHA512 a81db52d21de364137461dcff7e1af696df4a02fa26452f90439ae4af14ccbffe68eb4ee93ae56257490ab8aa36b4bff37c4e1f2cf4dd4624b3a6fb4cb50b7ac DIST gcc-11.4.0-patches-2.tar.xz 14224 BLAKE2B d3030c19a7bd8bd082fd39b35c3e80883ae541ab28232513ba60095fe81f5fe1fbdc54829a1556b2d278328033f6eb8a81e9ee268a6020b554388a60842b02e6 SHA512 60aa19f00fb29b7c8a68c73de274e24559dc896f551d47153ea511b202941caa950c0aff62ad28d057a8ed16f2aec2c06e681e7286d65ab3610b6948d7bb840a +DIST gcc-11.4.0-patches-3.tar.xz 15200 BLAKE2B a393df941a2a31164f477d6bc0032e28319e8f0bd87200eb453708f85aa8c0bf5d67e733ee7b75cf6d14743e18cc941cee1b77a8247f8c5683d17a98cbeb280f SHA512 6f6096d95c7c62780d1070097739882393a8df5172c3a5ae811a8d4d1c98a0cd14a34f3f7e95410c8f210aec434330ac3b8876c688faeb130d7bb8fa3333ece9 DIST gcc-12-20221008.tar.xz 79145884 BLAKE2B ff3d684d887e282c79fe95952a449ed5770d4bd74077553baf31c34dbd77177e680b19ac741c04aab26ac2c9bb2b89924f51f63e2f22b440decf2c65274a7640 SHA512 a35a6207e7f4375abca3ae57376c98b082846a88e83522c322d713e759367ceb2b3ad68488bed6f1645e47a106b0bbb2efbca6cb14b077672289acb4373e616f -DIST gcc-12-20221029.tar.xz 79160816 BLAKE2B 3e2f724f9802a83b518e90e840b21121c3e736aff65f447ba37a71495be0aefbd31785154631c21396780433cb674dc20e35bca7125de7f6cce07babe1107984 SHA512 3ca5593dafc530108f2d61af2185601dcbc26d610e9f7ec1f6bf5c91d1ffe6d40558280b26e52f48079a6d71846076a3e92e8aa9f9d503e3b06f3d8098882b00 -DIST gcc-12-20221105.tar.xz 79154324 BLAKE2B b57f5ff5f606a59ca83b01ea98ab931c5fb7da741b161186224f6cd460214194e6fa3c5a8701bd3ffd1a9b38c16d29c4e68a8ddd2e9d34a56ec187aedf667bdf SHA512 e185d06408dd36f66a2f65b7e8a216d314024cf9a5072ad9196e95a279a91b9890a2ec5d870b62c7367a1d7b5cf2dbcccbebda0c5a5eff2c7a3cd1bbffda45c5 DIST gcc-12-20221112.tar.xz 79163888 BLAKE2B 996e72ea0aa592701d628b78a0b0637d4a0dad799aece4d6a5b84d6aefee983b153782cafa5a3f4580ddcb90d78bd89b27f7191fddbc6d778933642a917781d5 SHA512 3901c2c96f25884b6f329558bd044051ca6daa0bcaccd85a9bb1079a07bca08d782374b396b5c7e7d2e2da6595b9860507807d141c9cc86f504e7e288ce8da06 +DIST gcc-12-20221119.tar.xz 79163968 BLAKE2B 76eaf75958b332a21fcb185c045c994eee76caeae2abfc7d2a3656a0d0871c2ba346278e9c2c926b1d5f211798a106a983c3fe8a598d3c46384586a72369008b SHA512 9ce92bd2042f32d2a650f0e4f102202ff2f6b7592fdeeeabf0c1beb1b9b96312f9cb216b5d912e68bc8ff4c943be03a0fc200fcd00bc4fa210ee8e49e15c2a50 DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258 +DIST gcc-12.2.0-patches-2.tar.xz 13952 BLAKE2B a9e798911acaf45c3f585f69721130cfbecec016727a50ac0f4767b37a2ab9df39e0828abb07f1e429619cc102808f81af8422fef0265415c287d303d9d97fc0 SHA512 1808a05e98094577099d115ff5f3e136e3fc8f39fbe35c5183fd7775383f94439212e5e4174ab8d0ae8c0874e227ff84a958ffdfa1c99c9a8306a9842d126ef9 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 -DIST gcc-13-20221023.tar.xz 80060928 BLAKE2B f35bcaf6a3243875aca6b74a77bdc3e97c68e004818366e0d48fcd830e7bfe1da243cdfe498b7c8f540426e880aeb7ef5466d410ce6f51778887bb6c10896a82 SHA512 d827e42ba0d1399b225cf8177def3efaaa5ff582c154af960d5da8a474cc8950db7d4412a758b941b477230629fad15700e3bbac1342e7c866073d3ba4b2273f DIST gcc-13-20221030.tar.xz 80108908 BLAKE2B 53ea6d13e5cf747d6dae515db5c07ba53580218dc0e5c4ce9dad48ce8ab968bc0fc51309169d991ad701beab3cf1bc2c15438d38f69dd642edf6d1f186e381cf SHA512 036034a1fa7883f9f9c224a3b4cf0a8e369d06882bff17c40a38a275f14928f546686b093b50e6c01664b90ee81addf24b4a513bf072a72e0f59f7f890ff1cca DIST gcc-13-20221106.tar.xz 80001320 BLAKE2B 4a86b5aedf67725b577a69112ab241b22b3b0eed6c86e2d9ed06e5045a1de1c4bc6f2e7a281f1a034b9b227e5ef72954d17900369bed6015e064f303c89e6cf2 SHA512 bd3160d23bdebd0e423800736212e340eab0a71891d579145d85931fe8fa3c9e196a3422d70a98e17d1990759bf57b3e4eb08b25544db5e4fec8448d1a33ee20 DIST gcc-13-20221113.tar.xz 79983288 BLAKE2B 85f4c47067b3e9a02804b75e8d5031c8a1fd3ebd815d864ed226f3aebc9499928cf7683e2d0aac273f4f9f17fda6084bac4bb8e1fc193441c87c1382450a0a8b SHA512 cf13f619ee586a7964a6e3e40d64fadd7c5f2b468b403dcf01a05687e60307175bc116277b64363bf799d3dfe53f37de6b129bd871238a6d600d035bd0d18a2d +DIST gcc-13-20221120.tar.xz 80199576 BLAKE2B 7f7f19feabfcc57684141c540d4a95f6cff96d2f68824cdf9b1e8351058740d999a3865f5b5ad893bb34f59399980416a772e94fddbca813f12ec4339e0b9871 SHA512 5e4fce946a2c815e41e28120eb0fb8f1f6003f6c1ec9000baae2143f343bacb3aeb3b9034ccb67b18bd519ef98953305de7d643e1b25c4908de635491fae48d9 DIST gcc-13.0.0-patches-1.tar.xz 11064 BLAKE2B 82a7ad193dac00475931840bcee82ef7a51718a74af224b03a41f8349e34c2a64a3eb29985b4e2bffde958c58782242eccaedaa54d950e8d51d8bb6f45868e0e SHA512 e04b510f529dd3187a08ae9cb9a894a3d3d30af81f13c43cc082fda7d26c44a3bf19d36ec02024b2ade8b8c193e9730246abeadee603c41b5873c5b785709921 DIST gcc-13.1.0-patches-2.tar.xz 9924 BLAKE2B 568f8b9e31974f4991bd922436373320118a6fe07b7e9fe0127952894bdebc5e8684f66e645a3a5684717c687e9bb6074508972b61a3eb692c6e5f23e46359cf SHA512 9fed795ce3aa423e223864b750e50419343bbb36f53e938a691f189e954acb3a4efec4aafe466bafb3556a04c78bf68d19e3e60ffd0a2be490ea821d98e92dc9 DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb SHA512 b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221103.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221103.ebuild deleted file mode 100644 index bb60337891..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221103.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_SUFFIX="xz" -TOOLCHAIN_PATCH_DEV="sam" -#TOOLCHAIN_GCC_RC=1 -PATCH_GCC_VER="10.5.0" -PATCH_VER="0" -MUSL_VER="1" -MUSL_GCC_VER="10.5.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) -elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then - # Cheesy hack for RCs - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" - TOOLCHAIN_SET_S=no - S="${WORKDIR}"/${MY_P} -fi - -inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi - -RDEPEND="" -BDEPEND="${CATEGORY}/binutils" - -src_prepare() { - local p upstreamed_patches=( - # add them here - ) - for p in "${upstreamed_patches[@]}"; do - rm -v "${WORKDIR}/patch/${p}" || die - done - - if has_version '>=sys-libs/glibc-2.32-r1'; then - rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die - fi - - toolchain_src_prepare -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221027.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221117.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221027.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221117.ebuild index bb60337891..1fa3a36015 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221027.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-10.4.1_p20221117.ebuild @@ -7,7 +7,7 @@ TOOLCHAIN_PATCH_SUFFIX="xz" TOOLCHAIN_PATCH_DEV="sam" #TOOLCHAIN_GCC_RC=1 PATCH_GCC_VER="10.5.0" -PATCH_VER="0" +PATCH_VER="1" MUSL_VER="1" MUSL_GCC_VER="10.5.0" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221104.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221104.ebuild deleted file mode 100644 index 4c05022129..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221104.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_SUFFIX="xz" -TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="2" -PATCH_GCC_VER="11.4.0" -MUSL_VER="0" -MUSL_GCC_VER="11.4.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - 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_p20221028.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221118.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221028.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221118.ebuild index 4c05022129..d6ead8b3a5 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221028.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-11.3.1_p20221118.ebuild @@ -5,7 +5,7 @@ EAPI=8 TOOLCHAIN_PATCH_SUFFIX="xz" TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="2" +PATCH_VER="3" PATCH_GCC_VER="11.4.0" MUSL_VER="0" MUSL_GCC_VER="11.4.0" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221105.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221105.ebuild deleted file mode 100644 index 97d104a847..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221105.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="1" -PATCH_GCC_VER="12.2.0" -MUSL_VER="1" -MUSL_GCC_VER="12.2.0" - -if [[ $(ver_cut 3) == 9999 ]] ; then - MY_PV_2=$(ver_cut 2) - if [[ ${MY_PV_2} == 0 ]] ; then - MY_PV_2=0 - else - MY_PV_2=$(($(ver_cut 2) - 1)) - fi - - # e.g. 12.2.9999 -> 12.1.1 - TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) -elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then - # Cheesy hack for RCs - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_P=${PN}-${MY_PV} - GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" - TOOLCHAIN_SET_S=no - S="${WORKDIR}"/${MY_P} -fi - -inherit toolchain - -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi - -# Technically only if USE=hardened *too* right now, but no point in complicating it further. -# If GCC is enabling CET by default, we need glibc to be built with support for it. -# bug #830454 -RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" -DEPEND="${RDEPEND}" -BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" - -src_prepare() { - toolchain_src_prepare - - eapply_user -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221029.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221119.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221029.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221119.ebuild index 97d104a847..28a10fb471 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221029.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-12.2.1_p20221119.ebuild @@ -4,7 +4,7 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="1" +PATCH_VER="2" PATCH_GCC_VER="12.2.0" MUSL_VER="1" MUSL_GCC_VER="12.2.0" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221023.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221120.ebuild similarity index 81% rename from sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221023.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221120.ebuild index 641ab05e81..f432668836 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221023.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.0_pre20221120.ebuild @@ -3,10 +3,10 @@ EAPI=8 -TOOLCHAIN_PATCH_DEV="xen0n" -PATCH_VER="1" -PATCH_GCC_VER="13.0.0" -MUSL_GCC_VER="13.0.0" +TOOLCHAIN_PATCH_DEV="sam" +TOOLCHAIN_SPHINX_BUILD=1 +PATCH_GCC_VER="13.1.0" +MUSL_GCC_VER="13.1.0" if [[ $(ver_cut 3) == 9999 ]] ; then MY_PV_2=$(ver_cut 2) @@ -27,10 +27,9 @@ inherit toolchain 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 +#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +#fi # Technically only if USE=hardened *too* right now, but no point in complicating it further. # If GCC is enabling CET by default, we need glibc to be built with support for it. diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.9999.ebuild index 2ac47a5de6..1210755732 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc/gcc-13.0.9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" -TOOLCHAIN_SPHINX_BUILD=1 PATCH_GCC_VER="13.1.0" MUSL_GCC_VER="13.1.0" From a2e414bb9e02e724d8df79adc5d3af66e44bcb2d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:16:28 +0000 Subject: [PATCH 23/26] sys-devel/gettext: Sync with Gentoo It's from Gentoo commit 729ab751290c5da1da3a93fcddaa22647b1db352. --- .../portage-stable/sys-devel/gettext/gettext-0.21-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21-r4.ebuild index 2c4391ddd2..18627670fa 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.21-r4.ebuild @@ -21,7 +21,7 @@ if [[ ${PV} == *_rc* ]] ; then else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~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 # Only libasprintf is under the LGPL (and libintl is in a sep package), # so put that license behind USE=cxx. From 8728c4ff94bd43a263792f2d8f0897e62c61b779 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:16:31 +0000 Subject: [PATCH 24/26] sys-libs/binutils-libs: Sync with Gentoo It's from Gentoo commit a67d952c82a327f1e8cae7ac83ce96d9e0b25e64. --- .../sys-libs/binutils-libs/Manifest | 1 - .../binutils-libs-2.39-r1.ebuild | 153 ------------------ ...r3.ebuild => binutils-libs-2.39-r4.ebuild} | 0 3 files changed, 154 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r1.ebuild rename sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/{binutils-libs-2.39-r3.ebuild => binutils-libs-2.39-r4.ebuild} (100%) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/Manifest index 2ecbd6b1a7..bcf9f223b8 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/Manifest @@ -8,6 +8,5 @@ DIST binutils-2.37_p1-patches-2.tar.xz 31956 BLAKE2B 39c48628d0e2d7f3a8cf11be391 DIST binutils-2.37_p1.tar.xz 22992196 BLAKE2B a8aa0f386d03a5b1466166ac7c40989c228351ccf0949a9b462b4d4615d70ab7e1a45351299140a42baf39c317b8007733c253eb547ee1dfadb612addde11621 SHA512 46c297ec2a7a5b81d1c6e3f16486a6dc2860a07520fe2dd8871d1eb5160065bbe2cc6b0415d5352bf12284133e5817a4e429e6077182d615e969bd1a8f52ed28 DIST binutils-2.38-patches-4.tar.xz 193852 BLAKE2B 5a83e20008e58464ed563a6817a367e50684c59d08c47345cc546054269c42463d1651441720f865851e4e182e917df1a095c68e64226e0351b64e975d524096 SHA512 6657e547bb02898632cc45a8f1894be098aa7472b6725b65f95393e621abb127e468b4e50310720bf03f7e8d0a68bc2c47af76fc43aaa8f32b2e4a149c0c6290 DIST binutils-2.38.tar.xz 23651408 BLAKE2B 19ede396ec97b88e632aded2f69f4684cc5053109e06c3c4a1934944e3f0ceaa9e4a2604528a440189771f778cb5d75edd510163970eeea31afba87fa256feba SHA512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d -DIST binutils-2.39-patches-4.tar.xz 62880 BLAKE2B 5cc335769d9c88417583ce059c61d0d7655f3ab9ac69647e6e2f65bd3a9dd143fe34c50bb68ab81d4226ddd0e4ef405d7102f67375a672eedc3d01b92b8ef497 SHA512 ef81350979af64cf35800b39982c84657a5c01362c01d221164a43d8f0dd80276c9f052c55d24516fad457e6671a58d467d71b5edd6c1f53fddbdb31172a21ee DIST binutils-2.39-patches-5.tar.xz 82924 BLAKE2B 2cf75f661989f22270d6afe5f3c543814eb6a331be4493016fa2871e1f10a84a123c1c51e77a19b35e46680b9fe77390cb1532ca40d470a6041fa768fed3ccd7 SHA512 4b5811b4822b3a06f590fc7d082dc0ddf18a6058ac23887254e2ee9bd63c7f06f1636e446152115c7e0b01a6c5298a0d9df6904bd1582e66504ccde80dd1ecbd DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r1.ebuild deleted file mode 100644 index 9d8c9427c4..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PATCH_VER=4 -PATCH_DEV=dilfridge - -inherit libtool toolchain-funcs multilib-minimal - -MY_PN="binutils" -MY_P="${MY_PN}-${PV}" -PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} -PATCH_DEV=${PATCH_DEV:-dilfridge} - -DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages" -HOMEPAGE="https://sourceware.org/binutils/" -SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz - https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_P}.tar.xz - https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" - -LICENSE="|| ( GPL-3 LGPL-3 )" -SLOT="0/${PV%_p?}" -IUSE="64-bit-bfd cet multitarget nls static-libs" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -BDEPEND="nls? ( sys-devel/gettext )" -DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]" -# Need a newer binutils-config that'll reset include/lib symlinks for us. -RDEPEND="${DEPEND} - >=sys-devel/binutils-config-5 -" - -S="${WORKDIR}/${MY_P%_p?}" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/bfd.h -) - -src_prepare() { - if [[ -n ${PATCH_VER} ]] ; then - einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}" - eapply "${WORKDIR}/patch"/*.patch - fi - - # Fix cross-compile relinking issue, bug #626402 - elibtoolize - - if [[ ${CHOST} == *-darwin* ]] ; then - # somehow libtool/configure is messed up and (custom patch at - # upstream?) and misdetects (basically assumes) nm can be called - # with -B arg -- can't run eautoreconf (fails), so patch up - # manually, this would break any target that needs -B to nm - sed -i -e 's/lt_cv_path_NM="$tmp_nm -B"/lt_cv_path_NM="$tmp_nm"/' \ - libctf/configure || die - fi - - # See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html - # Avoid really confusing logs from subconfigure spam, makes logs far - # more legible. - MAKEOPTS="--output-sync=line ${MAKEOPTS}" - - default -} - -pkgversion() { - printf "Gentoo ${PVR}" - [[ -n ${PATCHVER} ]] && printf " p${PATCHVER}" -} - -multilib_src_configure() { - local myconf=( - --enable-obsolete - --enable-shared - --enable-threads - # Newer versions (>=2.24) make this an explicit option. #497268 - --enable-install-libiberty - --disable-werror - --with-bugurl="https://bugs.gentoo.org/" - --with-pkgversion="$(pkgversion)" - $(use_enable static-libs static) - # The binutils eclass enables this flag for all bi-arch builds, - # but other tools often don't care about that support. Put it - # beyond a flag if people really want it, but otherwise leave - # it disabled as it can slow things down on 32bit arches. #438522 - $(use_enable 64-bit-bfd) - # This only disables building in the zlib subdir. - # For binutils itself, it'll use the system version. #591516 - --without-zlib - --with-system-zlib - # We only care about the libs, so disable programs. #528088 - --disable-{binutils,etc,ld,gas,gold,gprof,gprofng} - # Disable modules that are in a combined binutils/gdb tree. #490566 - --disable-{gdb,libdecnumber,readline,sim} - # Strip out broken static link flags. - # https://gcc.gnu.org/PR56750 - --without-stage1-ldflags - # We pull in all USE-flags that change ABI in an incompatible - # way. #666100 - # USE=multitarget change size of global arrays - # USE=64-bit-bfd changes data structures of exported API - --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def) - - # avoid automagic dependency on (currently prefix) systems - # systems with debuginfod library, bug #754753 - --without-debuginfod - - # Allow user to opt into CET for host libraries. - # Ideally we would like automagic-or-disabled here. - # But the check does not quite work on i686: bug #760926. - $(use_enable cet) - ) - - # mips can't do hash-style=gnu ... - if [[ $(tc-arch) != mips ]] ; then - myconf+=( --enable-default-hash-style=gnu ) - fi - - use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd ) - - use nls \ - && myconf+=( --without-included-gettext ) \ - || myconf+=( --disable-nls ) - - if [[ ${CHOST} == *-darwin* ]] && use nls ; then - # fix underlinking in opcodes - sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \ - "${S}"/opcodes/Makefile.in || die - fi - - ECONF_SOURCE="${S}" econf "${myconf[@]}" - - # Prevent makeinfo from running as we don't build docs here. - # bug #622652 - sed -i \ - -e '/^MAKEINFO/s:=.*:= true:' \ - Makefile || die -} - -multilib_src_compile() { - emake V=1 -} - -multilib_src_install() { - emake V=1 DESTDIR="${D}" install - - # Provide libiberty.h directly. - dosym libiberty/libiberty.h /usr/include/libiberty.h -} - -multilib_src_install_all() { - use static-libs || find "${ED}"/usr -name '*.la' -delete -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r3.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r4.ebuild From 92c0043f5ef163797bb326237ea665bd55412d4e Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Nov 2022 07:16:32 +0000 Subject: [PATCH 25/26] sys-libs/zlib: Sync with Gentoo It's from Gentoo commit 2b667b0352e47d2bbcf928df1b32fd94c59ad3da. --- .../portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild index ff55afcd11..60ae606dde 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/zlib/zlib-1.2.13-r1.ebuild @@ -23,7 +23,7 @@ SRC_URI="https://zlib.net/${P}.tar.xz LICENSE="ZLIB" SLOT="0/1" # subslot = SONAME -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="minizip static-libs" RDEPEND="!sys-libs/zlib-ng[compat]" From f6083bb7dbad03f430a4e5176cd5e11b54094cfe Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 22 Nov 2022 13:40:26 +0100 Subject: [PATCH 26/26] changelog: Add an entry --- .../changelog/updates/2022-11-22-weekly-package-updates.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 sdk_container/src/third_party/portage-stable/changelog/updates/2022-11-22-weekly-package-updates.md diff --git a/sdk_container/src/third_party/portage-stable/changelog/updates/2022-11-22-weekly-package-updates.md b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-11-22-weekly-package-updates.md new file mode 100644 index 0000000000..8e341ec66f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-11-22-weekly-package-updates.md @@ -0,0 +1 @@ +- whois ([5.5.14](https://github.com/rfc1036/whois/commit/ab10466cf2e1ec4887f6a44375c3e29c1720157f))