diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 5a224f4299f..4e88e30ca8a 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -86,6 +86,7 @@ app-arch/zstd app-cdr/cdrtools app-crypt/adcli +app-crypt/libb2 app-crypt/libmd app-crypt/mit-krb5 app-crypt/pinentry @@ -101,9 +102,11 @@ app-eselect/eselect-iptables app-misc/c_rehash app-misc/editor-wrapper +app-misc/pax-utils app-portage/elt-patches app-portage/portage-utils +app-portage/gentoolkit app-shells/bash app-shells/bash-completion @@ -116,6 +119,8 @@ app-text/docbook-xsl-stylesheets app-text/manpager app-text/sgml-common +dev-cpp/gtest + dev-db/sqlite dev-lang/duktape @@ -423,10 +428,14 @@ sys-fs/multipath-tools sys-kernel/linux-headers sys-libs/binutils-libs +sys-libs/ldb sys-libs/libcap sys-libs/libcap-ng sys-libs/libseccomp sys-libs/readline +sys-libs/talloc +sys-libs/tdb +sys-libs/tevent sys-libs/zlib sys-process/tini @@ -442,4 +451,6 @@ virtual/perl-Getopt-Long virtual/perl-IO virtual/pkgconfig +x11-base/xorg-proto + x11-libs/pixman diff --git a/changelog/updates/2023-07-07-python3.11.md b/changelog/updates/2023-07-07-python3.11.md new file mode 100644 index 00000000000..7fb780bb617 --- /dev/null +++ b/changelog/updates/2023-07-07-python3.11.md @@ -0,0 +1,6 @@ +- pax-utils ([1.3.7](https://gitweb.gentoo.org/proj/pax-utils.git/log/?h=v1.3.7)) +- python ([3.11.3](https://www.python.org/downloads/release/python-3113/)) +- ldb ([2.4.4](https://gitlab.com/samba-team/samba/-/commit/b686ef00da46d4a0c0aba0c61b1866cbc9b462b6) (includes [2.4.3](https://gitlab.com/samba-team/samba/-/commit/604f94704f30e90ef960aa2be62a14d2e614a002), [2.4.2](https://gitlab.com/samba-team/samba/-/commit/d93892d2e8ed69758c15ab18bc03bba09e715bc6))) +- talloc ([2.4.0](https://gitlab.com/samba-team/samba/-/commit/5224ed98eeba43f22b5f5f87de5947fbb1c1c7c1) (includes [2.3.4](https://gitlab.com/samba-team/samba/-/commit/0189ccf9fc3d2a77cc83cffe180e307bcdccebb4))) +- tdb ([1.4.8](https://gitlab.com/samba-team/samba/-/commit/eab796a4f9172e602dc262f3c99ead35b35929e7) (includes [1.4.7](https://gitlab.com/samba-team/samba/-/commit/27ceb1c3ad786386e746a5e2968780d791393b9e), [1.4.6](https://gitlab.com/samba-team/samba/-/commit/1c776e54cf33b46b2ed73263f093d596a0cdbb2f))) +- tevent ([0.14.1](https://gitlab.com/samba-team/samba/-/commit/d80f28b081e515e32a480daf80b42cf782447a9c) (includes [0.14.0](https://gitlab.com/samba-team/samba/-/commit/3c6d28ebae27dba8e40558ae37ae8138ea0b4bdc), [0.13.0](https://gitlab.com/samba-team/samba/-/commit/63d4db63feda920c8020f8484a8b31065b7f1380), [0.12.1](https://gitlab.com/samba-team/samba/-/commit/53692735c733d01acbd953641f831a1f5e0cf6c5), 0.12.0)) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r2.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r2.ebuild index 3e52034a5dd..69914b39af8 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/xenstore/xenstore-4.14.2-r2.ebuild @@ -4,7 +4,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) inherit multilib python-any-r1 systemd toolchain-funcs diff --git a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.91.ebuild b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.91-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.91.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.91-r1.ebuild index ccf8d89c08f..a03dd258b2e 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.91.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-misc/ca-certificates/ca-certificates-3.91-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) TMPFILES_OPTIONAL=1 inherit python-any-r1 systemd tmpfiles diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r182.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r183.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r182.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r183.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index d823f38bcc7..99662f96c16 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -14,7 +14,7 @@ else KEYWORDS="amd64 arm arm64 x86" fi -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) inherit cros-workon systemd python-any-r1 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/files/manglefs.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/files/manglefs.sh index ac499577bb4..eab042ad0de 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/files/manglefs.sh +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-oem-gce/files/manglefs.sh @@ -52,3 +52,6 @@ EOF # Don't bundle these paths, since they are useless to us. mv usr/lib/systemd/lib*.so* usr/lib64/ rm -fr boot etc/* usr/lib/systemd var/db/pkg + +# Remove test stuff from python - it's quite large. +rm -rf usr/lib/python*/test diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r590.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r591.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r590.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r591.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild index 25fe078a254..5aba366d839 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild @@ -14,7 +14,7 @@ else KEYWORDS="amd64 arm arm64 x86" fi -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) inherit cros-workon python-single-r1 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/app-portage/gentoolkit/0001-profile-Default-to-main-repo-name.patch b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/app-portage/gentoolkit/0001-profile-Default-to-main-repo-name.patch index 4bb48fea1d2..2483329d48e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/app-portage/gentoolkit/0001-profile-Default-to-main-repo-name.patch +++ b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/app-portage/gentoolkit/0001-profile-Default-to-main-repo-name.patch @@ -1,4 +1,4 @@ -From e40cd8c76bee4f7c108c1066d60aaf5d8c3adede Mon Sep 17 00:00:00 2001 +From b8396c72055ecc90b1a0e824b517a50cee9a843c Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 8 Dec 2022 16:25:39 +0100 Subject: [PATCH] profile: Default to main repo name @@ -11,42 +11,44 @@ Signed-off-by: Krzesimir Nowak Closes: https://github.com/gentoo/gentoolkit/pull/24 Signed-off-by: Sam James --- - pym/gentoolkit/profile.py | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) + pym/gentoolkit/profile.py | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pym/gentoolkit/profile.py b/pym/gentoolkit/profile.py -index dcd02cc..c880137 100644 +index f6943be..7469138 100644 --- a/pym/gentoolkit/profile.py +++ b/pym/gentoolkit/profile.py -@@ -23,19 +23,26 @@ def warning(msg): - print('warning: %s' % msg, file=sys.stderr) +@@ -21,21 +21,26 @@ def warning(msg): + print("warning: %s" % msg, file=sys.stderr) --def load_profile_data(portdir=None, repo='gentoo'): -+def load_profile_data(portdir=None, repo=''): - """Load the list of known arches from the tree +-def load_profile_data(portdir=None, repo="gentoo"): ++def load_profile_data(portdir=None, repo=""): + """Load the list of known arches from the tree - Args: - portdir: The repository to load all data from (and ignore |repo|) -- repo: Look up this repository by name to locate profile data -+ repo: Look up this repository by name to locate profile data (if empty, uses main repo name) + Args: + portdir: The repository to load all data from (and ignore |repo|) +- repo: Look up this repository by name to locate profile data ++ repo: Look up this repository by name to locate profile data (if empty, uses main repo name) - Returns: - A dict mapping the keyword to its preferred state: - {'x86': ('stable', 'arch'), 'mips': ('dev', '~arch'), ...} - """ - if portdir is None: -- portdir = portage.db[portage.root]['vartree'].settings.repositories[repo].location -+ repos = portage.db[portage.root]["vartree"].settings.repositories -+ if repo == "": -+ main_repo = repos.mainRepo() -+ if main_repo is None: -+ repo = "gentoo" -+ else: -+ repo = main_repo.name -+ portdir = repos[repo].location + Returns: + A dict mapping the keyword to its preferred state: + {'x86': ('stable', 'arch'), 'mips': ('dev', '~arch'), ...} + """ + if portdir is None: +- portdir = ( +- portage.db[portage.root]["vartree"].settings.repositories[repo].location +- ) ++ repos = portage.db[portage.root]["vartree"].settings.repositories ++ if repo == "": ++ main_repo = repos.mainRepo() ++ if main_repo is None: ++ repo = "gentoo" ++ else: ++ repo = main_repo.name ++ portdir = repos[repo].location - arch_status = {} + arch_status = {} -- 2.25.1 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.70.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.70.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.70.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.70.0-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/net-firewall/nftables/nftables-0.9.9-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-firewall/nftables/nftables-0.9.9-r2.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/net-firewall/nftables/nftables-0.9.9-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-firewall/nftables/nftables-0.9.9-r2.ebuild index 528373f724d..ce56aed8200 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-firewall/nftables/nftables-0.9.9-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-firewall/nftables/nftables-0.9.9-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) inherit autotools linux-info python-r1 systemd diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.15.4-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.15.4-r4.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.15.4-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.15.4-r4.ebuild index 46c11daf01e..b0fa91bbdc5 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.15.4-r3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/samba/samba-4.15.4-r4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) PYTHON_REQ_USE="threads(+),xml(+)" TMPFILES_OPTIONAL=1 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r3.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r3.ebuild index 854ee948e3f..224311acb3e 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/google-cloud-sdk/google-cloud-sdk-355.0.0-r3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) inherit bash-completion-r1 python-single-r1 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index 7fa69a8ee43..36c9779cc09 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -18,12 +18,13 @@ LUA_SINGLE_TARGET="lua5-3" LUA_TARGETS="lua5-3" # Use Python 3 as the default version -USE="${USE} -python_single_target_python2_7 python_single_target_python3_10" -USE="${USE} -python_targets_python2_7 python_targets_python3_10" +USE="${USE} -python_single_target_python2_7 python_single_target_python3_11" +USE="${USE} -python_targets_python2_7 python_targets_python3_11" # Use Python 3 as the default version -BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_single_target_python2_7 python_single_target_python3_10" -BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_targets_python2_7 python_targets_python3_10" +BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_single_target_python2_7 python_single_target_python3_11" +BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_targets_python2_7 python_targets_python3_11" + # Never install cron or cron jobs USE="${USE} -cron" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index aa93149afdd..f7782b9f15c 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -12,6 +12,9 @@ =app-crypt/rhash-1.4.2 ~arm64 =app-emulation/open-vmdk-1.0 * +# Keep versions on both arches in sync. +=app-misc/pax-utils-1.3.7 ~amd64 + # Required for addressing CVE-2022-3715. =app-shells/bash-5.2_p15-r3 ~amd64 ~arm64 @@ -26,7 +29,7 @@ =dev-lang/python-3.10.12 ~amd64 # Accept unstable host Rust compilers -=dev-lang/rust-1.70.0 ~amd64 ~arm64 +=dev-lang/rust-1.70.0-r1 ~amd64 ~arm64 # Needed by arm64-native SDK. =dev-lang/yasm-1.3.0-r1 ~arm64 @@ -50,14 +53,14 @@ =net-misc/curl-8.1.2 ~amd64 ~arm64 # Keep versions on both arches in sync. -=sec-policy/selinux-base-2.20200818-r2 ~arm64 -=sec-policy/selinux-base-policy-2.20200818-r2 ~arm64 +=sec-policy/selinux-base-2.20200818-r3 ~arm64 +=sec-policy/selinux-base-policy-2.20200818-r3 ~arm64 =sec-policy/selinux-unconfined-2.20200818-r2 ~arm64 =sec-policy/selinux-virt-2.20200818-r2 ~arm64 =sys-apps/checkpolicy-3.1 ~arm64 =sys-apps/coreutils-9.3-r2 ~arm64 =sys-apps/kexec-tools-2.0.24 ~arm64 -=sys-apps/policycoreutils-3.1-r3 ~arm64 +=sys-apps/policycoreutils-3.1-r4 ~arm64 =sys-apps/sandbox-2.30-r1 ~arm64 =sys-apps/semodule-utils-3.1 ~arm64 @@ -72,8 +75,8 @@ # Keep versions on both arches in sync. =sys-fs/multipath-tools-0.9.5 ~amd64 -=sys-libs/libselinux-3.1-r2 ~arm64 -=sys-libs/libsemanage-3.1-r1 ~arm64 +=sys-libs/libselinux-3.1-r3 ~arm64 +=sys-libs/libsemanage-3.1-r2 ~arm64 =sys-libs/libsepol-3.1 ~arm64 # A dependency of app-shells/bash version that we need for security @@ -85,3 +88,6 @@ # Accept unstable host Rust compilers. =virtual/rust-1.70.0 ~amd64 ~arm64 + +# Keep versions on both arches in sync. +=x11-base/xorg-proto-2023.2 ~amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask index 04124822ce2..97238158c13 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask @@ -17,6 +17,6 @@ # libxcrypt -> glibc -> python). >=virtual/libcrypt-2 -# Python 3.11 is stable in portage-stable, so avoid picking it +# Python 3.12 is in portage-stable (currently testing), so avoid picking it # up. Update this to mask later versions when we switch to 3.11. ->=dev-lang/python-3.11 +>=dev-lang/python-3.12 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask index 56ea60f1a8a..51a4c4441ad 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask @@ -1,15 +1,17 @@ # Never enable experimental code kdbus -# We default to python 3.10 for now +# We default to python 3.11 for now python_targets_python2_7 python_single_target_python2_7 python_targets_python3_8 python_single_target_python3_8 python_targets_python3_9 python_single_target_python3_9 -python_targets_python3_11 -python_single_target_python3_11 +python_targets_python3_10 +python_single_target_python3_10 +python_targets_python3_12 +python_single_target_python3_12 # Unmask selinux so it can be enabled selectively in package.use -selinux diff --git a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r3.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r3.ebuild index cd986fdb294..7f1a7a6d494 100644 --- a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base-policy/selinux-base-policy-2.20200818-r3.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2 - https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2" + https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PV}-r2.tar.bz2" KEYWORDS="amd64 -arm ~arm64 ~mips x86" fi diff --git a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r3.ebuild similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r3.ebuild index f17de9ee5be..bc58b54ab50 100644 --- a/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sec-policy/selinux-base/selinux-base-2.20200818-r3.ebuild @@ -4,8 +4,8 @@ EAPI="7" # flatcar changes -PYTHON_COMPAT=( python3_{8,9,10} ) -PYTHON_REQ_USE="xml" +PYTHON_COMPAT=( python3_{8,9,10,11} ) +PYTHON_REQ_USE="xml(+)" TMPFILES_OPTIONAL=1 inherit systemd tmpfiles python-any-r1 @@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2 - https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2" + https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PV}-r2.tar.bz2" KEYWORDS="amd64 -arm ~arm64 ~mips x86" fi diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r1.ebuild index ac7ebdfa297..71a4c75bba0 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) TMPFILES_OPTIONAL=1 # At least at the moment, while a CMake port exists, it's not recommended diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-3.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-3.1-r4.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-3.1-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-3.1-r4.ebuild index 36158efe119..9b71258245a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-3.1-r3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/policycoreutils/policycoreutils-3.1-r4.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{6..10} ) -PYTHON_REQ_USE="xml" +PYTHON_COMPAT=( python3_{6..11} ) +PYTHON_REQ_USE="xml(+)" inherit multilib python-r1 toolchain-funcs bash-completion-r1 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r5.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r5.ebuild index 03d0a0476af..ea87f1b4ba8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/sssd/sssd-2.3.1-r5.ebuild @@ -8,7 +8,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) TMPFILES_OPTIONAL=1 inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs tmpfiles diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r10.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r9.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-2.02-r10.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild index 3d976f29b51..9e7b79cc918 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/grub/grub-9999.ebuild @@ -16,7 +16,7 @@ fi inherit cros-workon if [[ -n ${GRUB_AUTOGEN} ]]; then - PYTHON_COMPAT=( python3_{6..10} ) + PYTHON_COMPAT=( python3_{6..11} ) WANT_LIBTOOL=none inherit autotools python-any-r1 fi diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/btrfs-progs-6.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/btrfs-progs-6.0.2-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/btrfs-progs-6.0.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/btrfs-progs-6.0.2-r1.ebuild index ad755870427..9ce447f7450 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/btrfs-progs-6.0.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/btrfs-progs/btrfs-progs-6.0.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit bash-completion-r1 python-single-r1 udev diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r3.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r3.ebuild index 11993cce17e..94c25dfda6a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/libselinux/libselinux-3.1-r3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) USE_RUBY="ruby25 ruby26 ruby27" # No, I am not calling ruby-ng diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r2.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r2.ebuild index c75996eed8a..f01673d1fd8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/libsemanage/libsemanage-3.1-r2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) # flatcar changes TMPFILES_OPTIONAL=1 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-process/audit/audit-3.0.6.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-process/audit/audit-3.0.6-r1.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-process/audit/audit-3.0.6.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-process/audit/audit-3.0.6-r1.ebuild index bdc585b9f28..846a0db4910 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-process/audit/audit-3.0.6.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-process/audit/audit-3.0.6-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 # Flatcar: Support python 3.6. -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{6..11} ) TMPFILES_OPTIONAL=1 inherit autotools multilib-minimal toolchain-funcs python-r1 linux-info systemd usr-ldscript tmpfiles diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/libb2/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/libb2/Manifest new file mode 100644 index 00000000000..bb6333e12e9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/libb2/Manifest @@ -0,0 +1 @@ +DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/libb2/files/libb2-0.98.1-distcc.patch b/sdk_container/src/third_party/portage-stable/app-crypt/libb2/files/libb2-0.98.1-distcc.patch new file mode 100644 index 00000000000..2e6a1671781 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/libb2/files/libb2-0.98.1-distcc.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/704044#c8 + +Patch by Alexey + +--- a/src/Makefile.am 2020-04-26 11:16:22.354103351 +0100 ++++ b/src/Makefile.am 2020-04-26 11:16:31.584080899 +0100 +@@ -18,8 +18,7 @@ LDFLAGS += -version-info $(B2_LIBRARY_VE + lib_LTLIBRARIES = libb2.la + libb2_la_LIBADD = # -lgomp -lpthread + libb2_la_CPPFLAGS = -DSUFFIX= \ +- $(LTDLINCL) \ +- ${top_builddir}/src/ ++ $(LTDLINCL) + + include_HEADERS = blake2.h + diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/libb2/libb2-0.98.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/libb2/libb2-0.98.1-r2.ebuild new file mode 100644 index 00000000000..2b1d540995b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/libb2/libb2-0.98.1-r2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal toolchain-funcs + +DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp" +HOMEPAGE="https://github.com/BLAKE2/libb2" +GITHASH="73d41c8255a991ed2adea41c108b388d9d14b449" +SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC0-1.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="static-libs native-cflags openmp" + +DEPEND=" + openmp? ( + || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) + ) +" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${PN}-${GITHASH} + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + # fix bashism + sed -i -e 's/ == / = /' configure.ac || die + # https://github.com/BLAKE2/libb2/pull/28 + echo 'libb2_la_LDFLAGS = -no-undefined' >> src/Makefile.am || die + eautoreconf # upstream doesn't make releases +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + econf \ + $(use_enable static-libs static) \ + $(use_enable native-cflags native) \ + $(use_enable openmp) +} + +do_make() { + # respect our CFLAGS when native-cflags is not in effect + local openmp=$(use openmp && echo -fopenmp) + emake $(use native-cflags && echo no)CFLAGS="${CFLAGS} ${openmp}" "$@" +} + +multilib_src_compile() { + do_make +} + +multilib_src_test() { + do_make check +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name '*.la' -type f -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/libb2/libb2-0.98.1-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/libb2/libb2-0.98.1-r3.ebuild new file mode 100644 index 00000000000..f810cc600ec --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/libb2/libb2-0.98.1-r3.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal toolchain-funcs + +DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp" +HOMEPAGE="https://github.com/BLAKE2/libb2" +GITHASH="73d41c8255a991ed2adea41c108b388d9d14b449" +SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC0-1.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="static-libs native-cflags openmp" + +DEPEND=" + openmp? ( + || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) + ) +" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${PN}-${GITHASH} + +PATCHES=( "${FILESDIR}"/${P}-distcc.patch ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + # fix bashism + sed -i -e 's/ == / = /' configure.ac || die + # https://github.com/BLAKE2/libb2/pull/28 + echo 'libb2_la_LDFLAGS = -no-undefined' >> src/Makefile.am || die + eautoreconf # upstream doesn't make releases +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + econf \ + $(use_enable static-libs static) \ + $(use_enable native-cflags native) \ + $(use_enable openmp) +} + +do_make() { + # respect our CFLAGS when native-cflags is not in effect + local openmp=$(use openmp && echo -fopenmp) + emake $(use native-cflags && echo no)CFLAGS="${CFLAGS} ${openmp}" "$@" +} + +multilib_src_compile() { + do_make +} + +multilib_src_test() { + do_make check +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name '*.la' -type f -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/libb2/metadata.xml b/sdk_container/src/third_party/portage-stable/app-crypt/libb2/metadata.xml new file mode 100644 index 00000000000..1b45c3a4d19 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/libb2/metadata.xml @@ -0,0 +1,24 @@ + + + + + grobian@gentoo.org + Fabian Groffen + + + C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp + + Official implementations from BLAKE2 project. + + + + Use CFLAGS as determined by configure script. These flags will + enable all CPU specific features it find available, to further + optimise the implementation. This discards any existing CFLAGS + set in make.conf or similar. + + + + BLAKE2/libb2 + + diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/Manifest b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/Manifest index 7999254b286..40dd6f42a79 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/Manifest @@ -1,3 +1,2 @@ -DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d6c5d8c14f7f4bd8506040f0abdcf1a7bd52c643092faa74d991f22ed48c96924572a50c556aaf879dd411569457 SHA512 1a3a463f3864a420b4dcdd8e5736fbee785ed7cb19545966819493cc98d3cea670eb44592c7f100188b2d45b58908bc1f8e2e010f8842c51b70495b260a03102 -DIST pax-utils-1.3.2.tar.xz 725916 BLAKE2B ff792288b22c185501123d3e152ebae891585d5fbbbb1957f62c68fca3b342b8ca986d53611677aff4566ad4483afb3c69f40738be4cf5d653ca469e72b5661a SHA512 50330a34d9b7b33c67be079eb871e6dafe29c72f2fc42fec0e51aa9a2e0c1eb95e6d27a4dc1affe6647cdf4c9357545336d48c9e27a7e0106d57532a0f53cdcc -DIST pax-utils-1.3.3.tar.xz 725900 BLAKE2B 17004a4fe57f05e80e0c51a156931975cbaf73e20d96fa50dedf6bd1538ff3f8383591f4b5fd0df926a6a6b75cb083724aaf92b1a4d4ebc67290500520919c29 SHA512 bb0d03371cf8f0cc26a83cbee888a6d91e70416dedc740476cd5549ddaef67048c6802e30e469ab1aced0fd7f63f84e9644744602b2d483ef7af37191505f72e +DIST pax-utils-1.3.5.tar.xz 119764 BLAKE2B 13bd4dbdadefb382133bf42a2b1e740e84ac11661595b082346c80ff05fc7423f5d75cc01ff8a651d921310ae66c2b39a862d0b9db5d7f18e11d393360627fcf SHA512 f2b1753e15907461cc395abffe033d7f7ab8eb15e296b874e2c9d00507458672347b32d7f2f05d3a8625fc3afbdbf0721543f84e062afce7181a726d967e4836 +DIST pax-utils-1.3.7.tar.xz 113740 BLAKE2B d801df9c426f318c871655f238fe27b53e656c2789ef8508019997c98bbc540987b611642d87e76ae9f76a95f6cce1acd0b10e3491a146d1e3b3f727a6f96bdc SHA512 f1b87a564573da838a02c4cc10e0d5f9754c3b004ecb172a6290b48a8179b30695ae556942457dfac3caf07b91dd56eb1d801475c35e9708e4d671aa507f9576 diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/files/pax-utils-1.3.5-man-reorder-xmlto-arguments.patch b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/files/pax-utils-1.3.5-man-reorder-xmlto-arguments.patch new file mode 100644 index 00000000000..909c69e096c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/files/pax-utils-1.3.5-man-reorder-xmlto-arguments.patch @@ -0,0 +1,30 @@ +From 2d981305b117b669c60bede076557c2d765cf198 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Wed, 7 Sep 2022 20:13:00 -0400 +Subject: [PATCH] man: reorder xmlto arguments + +Bug: https://bugs.gentoo.org/869110 +Thanks-to: Fabian Groffen +Signed-off-by: Mike Gilbert +--- + man/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/man/meson.build b/man/meson.build +index fc8d183..2e346ec 100644 +--- a/man/meson.build ++++ b/man/meson.build +@@ -25,8 +25,8 @@ endforeach + + custom_target('docbook_to_man', + command : [ +- xmlto, 'man', '-x', files('custom.xsl'), '--skip-validation', book, +- '-o', meson.current_build_dir() ++ xmlto, '-x', files('custom.xsl'), '--skip-validation', ++ '-o', meson.current_build_dir(), 'man', book + ], + input : [ + 'pax-utils.docbook.in', 'custom.xsl', 'fragment/reftail', +-- +2.37.3 + diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/metadata.xml b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/metadata.xml index 9d076f898de..a010034ad15 100644 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/metadata.xml @@ -1,15 +1,20 @@ - - toolchain@gentoo.org - Gentoo Toolchain Project - - A suite of ELF tools to aid auditing systems. Contains various ELF related utils for ELF32, ELF64 binaries useful for displaying PaX and security info on a large groups of binary files. - - Install a more powerful/faster version of lddtree - - - cpe:/a:gentoo:pax-utils - + + toolchain@gentoo.org + Gentoo Toolchain Project + + + A suite of ELF tools to aid auditing systems. + Contains various ELF related utils for ELF32, ELF64 binaries useful for displaying PaX and security info on a large groups of binary files. + + + Install a more powerful/faster version of lddtree + + + cpe:/a:gentoo:pax-utils + proj/pax-utils + gentoo/pax-utils + diff --git a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.1.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.1.ebuild deleted file mode 100644 index 0811930618d..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-misc/pax-utils/pax-utils-1.3.1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{8,9,10} ) - -inherit python-single-r1 toolchain-funcs - -DESCRIPTION="ELF utils that can check files for security relevant properties" -HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities" -SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz - https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps debug kernel_linux python seccomp" - -RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pyelftools[${PYTHON_USEDEP}] - ') - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - caps? ( virtual/pkgconfig ) -" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -_emake() { - emake \ - USE_CAP=$(usex caps) \ - USE_DEBUG=$(usex debug) \ - USE_PYTHON=$(usex python) \ - USE_SECCOMP=$(usex seccomp) \ - "$@" -} - -pkg_setup() { - if use python; then - python-single-r1_pkg_setup - fi -} - -src_configure() { - # Avoid slow configure+gnulib+make if on an up-to-date Linux system - if use prefix || ! use kernel_linux || - has_version ' -Date: Tue, 13 Oct 2020 10:04:07 -0400 -Subject: [PATCH] metadata.py: Fix duplicated use flag text bug 748129 - -Regression from commit: 517581df206766 -link: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=517581df206766fabf10273cde565e0a6dc62829 -Gentoo bug: https://bugs.gentoo.org/748129 -Signed-off-by: Brian Dolbec ---- - pym/gentoolkit/metadata.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py -index c3dba98..0b58392 100644 ---- a/pym/gentoolkit/metadata.py -+++ b/pym/gentoolkit/metadata.py -@@ -101,8 +101,11 @@ class _Useflag(object): - if node.text: - _desc = node.text - for child in node.iter(): -- _desc += child.text if child.text else '' -- _desc += child.tail if child.tail else '' -+ # prevent duplicate text -+ if child.text and child.text not in _desc: -+ _desc += child.text -+ if child.tail and not child.tail in _desc: -+ _desc += child.tail - # This takes care of tabs and newlines left from the file - self.description = re.sub(r'\s+', ' ', _desc) - --- -libgit2 1.0.1 - diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch new file mode 100644 index 00000000000..8039864d69f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/files/gentoolkit-0.6.1-data_files.patch @@ -0,0 +1,47 @@ +From 5b52ee6c6efab68111d128d45f386ac21eaf84f6 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +Date: Sun, 10 Jul 2022 13:41:36 -0700 +Subject: [PATCH] Revert "setup.py: migrate to setuptools" + +This reverts commit bbbde97b5e625a49a1a66e307931548cb33f260b. +setuptools only installs data files to the python pkg directory +--- + setup.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/setup.py b/setup.py +index 36995de..23e9b36 100755 +--- a/setup.py ++++ b/setup.py +@@ -3,8 +3,8 @@ + import re + import sys + import subprocess +- +-from setuptools import setup, Command ++from distutils import core ++from distutils.cmd import Command + from glob import glob + + import os +@@ -67,7 +67,7 @@ manpages = [ + ] + + +-class set_version(Command): ++class set_version(core.Command): + """Set python __version__ and bash VERSION to our __version__.""" + + description = "hardcode scripts' version using VERSION from environment" +@@ -130,7 +130,7 @@ test_data = { + ] + } + +-setup( ++core.setup( + name="gentoolkit", + version=__version__, + description="Set of tools that work with and enhance portage.", +-- +libgit2 1.4.3 + diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch new file mode 100644 index 00000000000..193eacc2db8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/files/gentoolkit-0.6.1-pkgindex.patch @@ -0,0 +1,45 @@ +From bf3eb16e451fd1bdee8ef03a0d22e0040e033f19 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec +Date: Sun, 10 Jul 2022 23:41:33 -0700 +Subject: [PATCH] eclean/pkgindex.py: Fix typo in function call + + File "/usr/lib/python3.10/site-packages/gentoolkit/eclean/pkgindex.py", line +60, in clean_pkgs_index + if self.get_emaint_binhost(): +AttributeError: 'PkgIndex' object has no attribute 'get_emaint_binhost'. Did +you mean: '_get_emaint_binhost'? + +Also fix too many parameters in line 68 for the self.controller() call + +Bug: https://bugs.gentoo.org/857555 + +Signed-off-by: Brian Dolbec +--- + pym/gentoolkit/eclean/pkgindex.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pym/gentoolkit/eclean/pkgindex.py b/pym/gentoolkit/eclean/pkgindex.py +index d0878a1..7d6fade 100644 +--- a/pym/gentoolkit/eclean/pkgindex.py ++++ b/pym/gentoolkit/eclean/pkgindex.py +@@ -57,15 +57,15 @@ class PkgIndex: + statinfo = os.stat(file_) + size1 = statinfo.st_size + show_progress = not quiet +- if self.get_emaint_binhost(): ++ if self._get_emaint_binhost(): + self.taskmaster = TaskHandler(show_progress_bar=show_progress) + tasks = [self.binhost] + self.taskmaster.run_tasks(tasks) + else: + self.call_emaint() + statinfo = os.stat(file_) + clean_size = size1 - statinfo.st_size +- self.controller("\n", clean_size, "Packages Index", file_, "Index") ++ self.controller(clean_size, "Packages Index", file_, "Index") + return clean_size + + def call_emaint(self): +-- +libgit2 1.4.3 + diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild deleted file mode 100644 index 436222faf8f..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.0-r3.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) -PYTHON_REQ_USE="xml(+),threads(+)" - -inherit distutils-r1 tmpfiles - -DESCRIPTION="Collection of administration scripts for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" -SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -DEPEND=" - sys-apps/portage[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - sys-apps/gawk - sys-apps/gentoo-functions" - -distutils_enable_tests setup.py - -PATCHES=( - "${FILESDIR}"/${PN}-0.5.0-python3_9.patch - "${FILESDIR}"/${PN}-0.5.0-r1-python3_9.patch -) - -python_prepare_all() { - python_setup - echo VERSION="${PVR}" "${PYTHON}" setup.py set_version - VERSION="${PVR}" "${PYTHON}" setup.py set_version - distutils-r1_python_prepare_all - - if use prefix-guest ; then - # use correct repo name, bug #632223 - sed -i \ - -e "/load_profile_data/s/repo='gentoo'/repo='gentoo_prefix'/" \ - pym/gentoolkit/profile.py || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.4.0"; then - SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1 - fi -} - -pkg_postinst() { - tmpfiles_process revdep-rebuild.conf - - if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then - elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now" - elog "part of the gentoolkit package." - elog "The gentoolkit-dev package is now deprecated in favor of a single" - elog "gentoolkit package. The remaining tools from gentoolkit-dev" - elog "are now obsolete/unused with the git based tree." - fi - - # Only show the elog information on a new install - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog - elog "For further information on gentoolkit, please read the gentoolkit" - elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit" - elog - elog "Another alternative to equery is app-portage/portage-utils" - elog - elog "Additional tools that may be of interest:" - elog - elog " app-admin/eclean-kernel" - elog " app-portage/diffmask" - elog " app-portage/flaggie" - elog " app-portage/portpeek" - elog " app-portage/smart-live-rebuild" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild similarity index 76% rename from sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild rename to sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild index bb95e6309cc..7cd0e33034b 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.5.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-0.6.1-r3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7..10} pypy3 ) +PYTHON_COMPAT=( python3_{9..11} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)" inherit distutils-r1 tmpfiles @@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="Collection of administration scripts for Gentoo" @@ -23,12 +23,18 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" LICENSE="GPL-2" SLOT="0" +# Need newer Portage for XML fix, bug #857537 DEPEND=" - sys-apps/portage[${PYTHON_USEDEP}]" + >=sys-apps/portage-3.0.32[${PYTHON_USEDEP}]" RDEPEND="${DEPEND} - sys-apps/gawk + app-alternatives/awk sys-apps/gentoo-functions" +PATCHES=( + "${FILESDIR}/gentoolkit-0.6.1-data_files.patch" + "${FILESDIR}/gentoolkit-0.6.1-pkgindex.patch" +) + distutils_enable_tests setup.py python_prepare_all() { diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild index db0fa476bfa..e2493824dad 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/gentoolkit-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{7..10} pypy3 ) +PYTHON_COMPAT=( python3_{9..11} pypy3 ) PYTHON_REQ_USE="xml(+),threads(+)" inherit distutils-r1 tmpfiles @@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="Collection of administration scripts for Gentoo" @@ -23,10 +23,11 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools" LICENSE="GPL-2" SLOT="0" +# Need newer Portage for XML fix, bug #857537 DEPEND=" - sys-apps/portage[${PYTHON_USEDEP}]" + >=sys-apps/portage-3.0.32[${PYTHON_USEDEP}]" RDEPEND="${DEPEND} - sys-apps/gawk + app-alternatives/awk sys-apps/gentoo-functions" distutils_enable_tests setup.py diff --git a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/metadata.xml b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/metadata.xml index 38eac3c59b7..030cf9c14f4 100644 --- a/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-portage/gentoolkit/metadata.xml @@ -5,10 +5,15 @@ tools-portage@gentoo.org Gentoo Portage tools team + -Gentoolkit is a collection of useful adminstration scripts particular to -the Gentoo Linux distribution. It contains rough drafts and -implementations of features that may in time make it into Portage, or -into full-fledged tools in their own right. - + Gentoolkit is a collection of useful adminstration scripts particular to + the Gentoo Linux distribution. It contains rough drafts and + implementations of features that may in time make it into Portage, or + into full-fledged tools in their own right. + + + proj/gentoolkit + gentoo/gentoolkit + diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/Manifest b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/Manifest index 3b3e722caa7..69d7577bf63 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/Manifest @@ -1,2 +1,2 @@ -DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b DIST gtest-1.11.0.tar.gz 886330 BLAKE2B d11fdd485f292d96508cbc27a9a444ab69b86571cc594298fd3f0e6d4bd8d6ec20dea848fe11be165d34054b2251ad377f0930f852914feaa1416ff156986a9c SHA512 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28 +DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch index 3e06777ac9a..0c47681ba34 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch @@ -1,4 +1,5 @@ Bug: https://bugs.gentoo.org/692464 + https://bugs.gentoo.org/834068 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -7,7 +8,7 @@ Bug: https://bugs.gentoo.org/692464 if (!use_fork) { static const bool stack_grows_down = StackGrowsDown(); - const auto stack_size = static_cast(getpagesize() * 2); -+ const auto stack_size = static_cast(getpagesize() * 10); ++ const auto stack_size = static_cast(getpagesize() * 12); // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead. void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0); diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.11.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.11.0.ebuild index 89518bffd1d..0881eaf88cf 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.11.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.11.0.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Python is required for tests and some build tasks. -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) -CMAKE_ECLASS=cmake inherit cmake-multilib python-any-r1 if [[ ${PV} == "9999" ]]; then @@ -22,7 +21,7 @@ else -> ${P}.tar.gz" S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT} fi - 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 ~x64-solaris" fi DESCRIPTION="Google C++ Testing Framework" diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.13.0.ebuild similarity index 58% rename from sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild rename to sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.13.0.ebuild index 58067c7a096..6ed984c0151 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-1.13.0.ebuild @@ -1,28 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # Python is required for tests and some build tasks. -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) -CMAKE_ECLASS=cmake inherit cmake-multilib python-any-r1 -GOOGLETEST_COMMIT=aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e - if [[ ${PV} == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/google/googletest" else if [[ -z ${GOOGLETEST_COMMIT} ]]; then - URI_PV=v${MY_PV:-${PV}} + SRC_URI="https://github.com/google/googletest/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}"/googletest-${PV} else - URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}} + SRC_URI="https://github.com/google/googletest/archive/${GOOGLETEST_COMMIT}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT} fi - SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz" - 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" - S="${WORKDIR}"/googletest-${MY_PV} + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="Google C++ Testing Framework" @@ -35,10 +34,6 @@ RESTRICT="!test? ( test )" BDEPEND="test? ( ${PYTHON_DEPS} )" -PATCHES=( - "${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch -) - pkg_setup() { use test && python-any-r1_pkg_setup } @@ -63,15 +58,18 @@ multilib_src_configure() { cmake_src_configure } +multilib_src_test() { + # Exclude tests that fail with FEATURES="usersandbox" + cmake_src_test -E "googletest-(death-test|port)-test" +} + multilib_src_install_all() { einstalldocs - if use doc; then - docinto googletest - dodoc -r googletest/docs/. - docinto googlemock - dodoc -r googlemock/docs/. - fi + newdoc googletest/README.md README.googletest.md + newdoc googlemock/README.md README.googlemock.md + + use doc && dodoc -r docs/. if use examples; then docinto examples diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-9999.ebuild index 89518bffd1d..1e958926faa 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/gtest-9999.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Python is required for tests and some build tasks. -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) -CMAKE_ECLASS=cmake inherit cmake-multilib python-any-r1 if [[ ${PV} == "9999" ]]; then @@ -14,15 +13,15 @@ if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/google/googletest" else if [[ -z ${GOOGLETEST_COMMIT} ]]; then - SRC_URI="https://github.com/google/googletest/archive/refs/tags/release-${PV}.tar.gz + SRC_URI="https://github.com/google/googletest/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/googletest-release-${PV} + S="${WORKDIR}"/googletest-${PV} else SRC_URI="https://github.com/google/googletest/archive/${GOOGLETEST_COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT} fi - 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 ~x64-solaris" fi DESCRIPTION="Google C++ Testing Framework" @@ -35,10 +34,6 @@ RESTRICT="!test? ( test )" BDEPEND="test? ( ${PYTHON_DEPS} )" -PATCHES=( - "${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch -) - pkg_setup() { use test && python-any-r1_pkg_setup } @@ -63,6 +58,11 @@ multilib_src_configure() { cmake_src_configure } +multilib_src_test() { + # Exclude tests that fail with FEATURES="usersandbox" + cmake_src_test -E "googletest-(death-test|port)-test" +} + multilib_src_install_all() { einstalldocs diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/metadata.xml index c870874aadc..2a73b6d6508 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/gtest/metadata.xml @@ -10,7 +10,7 @@ Proxy Maintainers - https://github.com/google/googletest/tree/master/googletest/docs + https://github.com/google/googletest/tree/HEAD/docs google/googletest diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/Manifest index 72acf664f1c..7fba8685ac4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/Manifest @@ -1,5 +1,5 @@ -DIST ldb-2.3.2.tar.gz 1718583 BLAKE2B 48b9fb77e414af0f9fffe0cda9cf49971d79ed8b66213b01b73f53a61969e03f9e6426a04a33ff70da906c814470d8fa356902a68aa1169d969cc597e8c234d7 SHA512 be324e8f20db50529634548451dbc5f95f26a701e124bfb40ae2b0a5069de78b7c5c1a66222097209ea24ef6077373d996e67c00257a5a05198f1b81bf0ed53e -DIST ldb-2.3.3.tar.gz 1719542 BLAKE2B 2a5cfe3ddac2054d167c2857e0cd92e0f88d2c196f9285c029b2a525d781025a956a296bd6d793b65f848188cf7adf70f99542999061a85be473b3fc3b2856f1 SHA512 ffb50208fe971afd544a431b79905ec8fce67d78d20c3fcfb8345a56f3b278fb664bc48079d7239a8ca5b70aae8b32076b6007cb63e080cd536e9fe458efeccd -DIST ldb-2.4.1.tar.gz 1719769 BLAKE2B 868d3dcc51bd8272d99f2335ed1af2e37506b6a175254f1aca37f758488ba0997e37419a7d8c81def77698128307df97de26d4807ac78c34088f7a623f8d9e68 SHA512 14ab5397d28c369142b2ccf55a2ab4e678a3fe6e018541cfce46241f8226400bc169360bbef254fae4410a6e15024ae986f02298d3d324e3d3a8b88801bf76d7 -DIST ldb-2.4.2.tar.gz 1720169 BLAKE2B d144218bf62dde57560df8b8a641e9f58bee001fdfa7b1527d9eb9a1a55e428662db81912173cbcdb9f993c0b316faab7d758a4878beeff1daadd487e9aa44a9 SHA512 77705ad284eed9105c9aba0459d2e48cd66ca19b657a55f7513e10281dd2e96540d24d1c8df53adc84109a918900687dc75b635cda05c4e788424ed71b5ff989 -DIST ldb-2.5.0.tar.gz 1722847 BLAKE2B 880a5a516b0b423854f8a3f9c54da89e4640f8462ccc54a7b147c70c3a9eb073dc9e914d1906ab914a9ddd9b9aa0e7d177ef3ecb4c0b506f5417db931b017849 SHA512 f16a235f1409e06266c51735ac645cf2708d31dd731ee7b95d6778498b115f4252b0a528952e620767d1616a4e1e7c5f2cdc69f3fa32d79288cf14da2f52a010 +DIST ldb-2.4.4.tar.gz 1726595 BLAKE2B c01440e7032dbd3f7b735cb8d2078d7e1dbb56370bd1defe5f170eff006d3979daa654698e6e046c0583288dacd2cda9a5cde249fd6382db52c4aadb83f55e34 SHA512 2e4c762525eee9db40083b21e2a23f9cdfad5d2969cc628b3ea5414f9ec1be2c12d0aa65137cd8d8a5395c0414166ba14fc3dd57d53c533596762d80b9c561f4 +DIST ldb-2.5.2.tar.gz 1730347 BLAKE2B a0d3a9ae02f79c27b396314b804195ecd37b8bcd843fb94f9813a69fb15773db94ed2210f4102e395333562c2dccebabde1c2dcc0c2fceac97dfa31b2ad97e3d SHA512 02ae1246f99d9b6d6b33c5030488aa46c6abb535b4da4b13799a62b49d32c490b7c088ef41c0bc5a1b2f7263c680faceb8033827834cb6f66916adcdb5be421c +DIST ldb-2.5.3.tar.gz 1736354 BLAKE2B dcd4d33f7a0ce3583bc96762b274d195c20e868337a29fd7793d6edf092069632f5c4f7f805693e3b330bbda1cc24540a989e2937f6325ac68bacf15d0f12db4 SHA512 b6f62dfb4887927514a98f01771b2178ac781886fc361600be0f59e513fc5762e3a421e48f452b1dd4452795f04b5c7c95e4dd4a9cc97573e563f5f528af4a35 +DIST ldb-2.6.2.tar.gz 1738908 BLAKE2B 44998efdff46486f94deb115225119cb3f6f23e15192672a5ac59c27e06c074fbcf2e1dba7d89d5ce273748cf08bc2261a10f7818cc2d02c4b25fd5403b158a9 SHA512 091111b8cf6cd93d662737890dacb64439e930b287d29299d2fc2cb18709f61d1e8a8c17d44f7224d8370dda6dc89af91e4ce8959816903ad5363388d8e37d8f +DIST ldb-2.7.2.tar.gz 1737849 BLAKE2B 0aa70d8a4827448e41874db97130f18d17683c800b8f03f9940b4852e24fd6092052f6e70aae845c587939b9be16c80d7a920f6b874a746f923c4513b73d2afc SHA512 beb2cd83a8f128713e0b43ec6e80d0f87ab0883c6c8f0cefbbf5bf49e29dfa327b245b78467d1906917cb5f3f11e01cb76cc6bcca58a47c5deac4f05c2e9dfbd diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/files/ldb-2.5.2-skip-waf-tevent-check.patch b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/files/ldb-2.5.2-skip-waf-tevent-check.patch new file mode 100644 index 00000000000..4578435064b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/files/ldb-2.5.2-skip-waf-tevent-check.patch @@ -0,0 +1,12 @@ +--- ldb-1.3.6/lib/tevent/wscript ++++ ldb-1.3.6/lib/tevent/wscript +@@ -34,8 +34,7 @@ + if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION, + onlyif='talloc', implied_deps='replace talloc'): + conf.define('USING_SYSTEM_TEVENT', 1) +- if not conf.env.disable_python and \ +- conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION): ++ if not conf.env.disable_python: + conf.define('USING_SYSTEM_PYTEVENT', 1) + + if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'): diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.3.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.3.2-r1.ebuild deleted file mode 100644 index 49ea629050b..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.3.2-r1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE="threads(+)" -inherit python-single-r1 waf-utils multilib-minimal - -DESCRIPTION="LDAP-like embedded database" -HOMEPAGE="https://ldb.samba.org" -SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="doc ldap +lmdb python test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( python )" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/popt[${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - >=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}] - ldap? ( net-nds/openldap:= ) - lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] - sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] - sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] - ) -" -DEPEND="${RDEPEND} - virtual/libcrypt -" -BDEPEND="${PYTHON_DEPS} - dev-libs/libxslt - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -WAF_BINARY="${S}/buildtools/bin/waf" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch - "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch -) - -pkg_setup() { - # Package fails to build with distcc - export DISTCC_DISABLE=1 - - # waf requires a python interpreter - python-single-r1_pkg_setup -} - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - $(usex ldap '' --disable-ldap) - $(usex lmdb '' --without-ldb-lmdb) - --disable-rpath - --disable-rpath-install --bundled-libraries=NONE - --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba - --builtin-libraries=NONE - ) - if ! multilib_is_native_abi; then - myconf+=( --disable-python ) - else - use python || myconf+=( --disable-python ) - fi - waf-utils_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - waf-utils_src_compile - multilib_is_native_abi && use doc && doxygen Doxyfile -} - -multilib_src_test() { - if multilib_is_native_abi; then - WAF_MAKE=1 \ - PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \ - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \ - waf test || die - fi -} - -multilib_src_install() { - waf-utils_src_install - - if multilib_is_native_abi && use doc; then - doman apidocs/man/man3/*.3 - docinto html - dodoc -r apidocs/html/. - fi - - use python && python_optimize #726454 -} - -pkg_postinst() { - if has_version sys-auth/sssd; then - ewarn "You have sssd installed. It is known to break after ldb upgrades," - ewarn "so please try to rebuild it before reporting bugs." - ewarn "See https://bugs.gentoo.org/404281" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.3.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.3.3.ebuild deleted file mode 100644 index 99aa75a74e3..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.3.3.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE="threads(+)" -inherit python-single-r1 waf-utils multilib-minimal - -DESCRIPTION="LDAP-like embedded database" -HOMEPAGE="https://ldb.samba.org" -SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="doc ldap +lmdb python test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( python )" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libbsd[${MULTILIB_USEDEP}] - dev-libs/popt[${MULTILIB_USEDEP}] - >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - >=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}] - ldap? ( net-nds/openldap:= ) - lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] - sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] - sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] - ) -" -DEPEND="${RDEPEND} - virtual/libcrypt -" -BDEPEND="${PYTHON_DEPS} - dev-libs/libxslt - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -WAF_BINARY="${S}/buildtools/bin/waf" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch - "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch -) - -pkg_setup() { - # Package fails to build with distcc - export DISTCC_DISABLE=1 - - # waf requires a python interpreter - python-single-r1_pkg_setup -} - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - $(usex ldap '' --disable-ldap) - $(usex lmdb '' --without-ldb-lmdb) - --disable-rpath - --disable-rpath-install --bundled-libraries=NONE - --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba - --builtin-libraries=NONE - ) - if ! multilib_is_native_abi; then - myconf+=( --disable-python ) - else - use python || myconf+=( --disable-python ) - fi - waf-utils_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - waf-utils_src_compile - multilib_is_native_abi && use doc && doxygen Doxyfile -} - -multilib_src_test() { - if multilib_is_native_abi; then - WAF_MAKE=1 \ - PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \ - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \ - waf test || die - fi -} - -multilib_src_install() { - waf-utils_src_install - - if multilib_is_native_abi && use doc; then - doman apidocs/man/man3/*.3 - docinto html - dodoc -r apidocs/html/. - fi - - use python && python_optimize #726454 -} - -pkg_postinst() { - if has_version sys-auth/sssd; then - ewarn "You have sssd installed. It is known to break after ldb upgrades," - ewarn "so please try to rebuild it before reporting bugs." - ewarn "See https://bugs.gentoo.org/404281" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.4.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.4.4.ebuild similarity index 93% rename from sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.4.1-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.4.4.ebuild index eae27480975..e0599519597 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.4.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.4.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="threads(+)" inherit python-single-r1 waf-utils multilib-minimal @@ -17,7 +17,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc IUSE="doc ldap +lmdb python test" REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( python )" + test? ( lmdb python )" RESTRICT="!test? ( test )" @@ -53,6 +53,8 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) PATCHES=( "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch + "${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch + "${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch ) pkg_setup() { diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.2.ebuild similarity index 90% rename from sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.0-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.2.ebuild index 4b4ed4c7fa5..bce94cbb005 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="threads(+)" inherit python-single-r1 waf-utils multilib-minimal @@ -13,11 +13,11 @@ SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="doc ldap +lmdb python test" REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( python )" + test? ( lmdb python )" RESTRICT="!test? ( test )" @@ -26,7 +26,7 @@ RDEPEND=" dev-libs/popt[${MULTILIB_USEDEP}] >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.4.5[${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.4.6[${MULTILIB_USEDEP}] >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) @@ -54,6 +54,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch "${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch + "${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch ) pkg_setup() { diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.4.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.3.ebuild similarity index 90% rename from sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.4.2-r1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.3.ebuild index 54d9456e59c..fdd94222164 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.4.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.5.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="threads(+)" inherit python-single-r1 waf-utils multilib-minimal @@ -13,11 +13,11 @@ SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="doc ldap +lmdb python test" REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( python )" + test? ( lmdb python )" RESTRICT="!test? ( test )" @@ -26,7 +26,7 @@ RDEPEND=" dev-libs/popt[${MULTILIB_USEDEP}] >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.4.6[${MULTILIB_USEDEP}] >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}] ldap? ( net-nds/openldap:= ) lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) @@ -54,6 +54,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch "${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch + "${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch ) pkg_setup() { diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.6.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.6.2.ebuild new file mode 100644 index 00000000000..318abf8bb39 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.6.2.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="threads(+)" +inherit python-single-r1 waf-utils multilib-minimal + +DESCRIPTION="LDAP-like embedded database" +HOMEPAGE="https://ldb.samba.org" +SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="doc ldap +lmdb python test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + test? ( lmdb python )" + +RESTRICT="!test? ( test )" + +TALLOC_VERSION="2.3.4" +TDB_VERSION="1.4.7" +TEVENT_VERSION="0.13.0" + +RDEPEND=" + dev-libs/libbsd[${MULTILIB_USEDEP}] + dev-libs/popt[${MULTILIB_USEDEP}] + >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] + ldap? ( net-nds/openldap:= ) + lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} + virtual/libcrypt + test? ( >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] ) +" +BDEPEND="${PYTHON_DEPS} + dev-libs/libxslt + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +WAF_BINARY="${S}/buildtools/bin/waf" + +MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch + "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch + "${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch + "${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch +) + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + export PYTHONHASHSEED=1 + + # waf requires a python interpreter + python-single-r1_pkg_setup +} + +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + +src_prepare() { + default + + check_samba_dep_versions + + multilib_copy_sources +} + +multilib_src_configure() { + # When specifying libs for samba build you must append NONE to the end to + # stop it automatically including things + local bundled_libs="NONE" + + # We "use" bundled cmocka when we're not running tests as we're + # not using it anyway. Means we avoid making users install it for + # no reason. bug #802531 + if ! use test; then + bundled_libs="cmocka,${bundled_libs}" + fi + + local myconf=( + $(usex ldap '' --disable-ldap) + $(usex lmdb '' --without-ldb-lmdb) + --disable-rpath + --disable-rpath-install + --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba + --bundled-libraries="${bundled_libs}" + --builtin-libraries=NONE + ) + + if ! use python || ! multilib_is_native_abi; then + myconf+=( --disable-python ) + fi + + waf-utils_src_configure "${myconf[@]}" +} + +multilib_src_compile() { + waf-utils_src_compile + multilib_is_native_abi && use doc && doxygen Doxyfile +} + +multilib_src_test() { + if multilib_is_native_abi; then + WAF_MAKE=1 \ + PATH=buildtools/bin:../../../buildtools/bin:${PATH}:"${BUILD_DIR}"/bin/shared/private/ \ + LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \ + waf test || die + fi +} + +multilib_src_install() { + waf-utils_src_install + + if multilib_is_native_abi && use doc; then + doman apidocs/man/man3/*.3 + docinto html + dodoc -r apidocs/html/. + fi + + # bug #726454 + use python && python_optimize +} + +pkg_postinst() { + if has_version sys-auth/sssd; then + ewarn "You have sssd installed. It is known to break after ldb upgrades," + ewarn "so please try to rebuild it before reporting bugs." + ewarn "See https://bugs.gentoo.org/404281" + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.7.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.7.2.ebuild new file mode 100644 index 00000000000..7a780a61842 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/ldb/ldb-2.7.2.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="threads(+)" +inherit python-single-r1 waf-utils multilib-minimal + +DESCRIPTION="LDAP-like embedded database" +HOMEPAGE="https://ldb.samba.org" +SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="doc ldap +lmdb python test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + test? ( lmdb python )" + +RESTRICT="!test? ( test )" + +TALLOC_VERSION="2.4.0" +TDB_VERSION="1.4.8" +TEVENT_VERSION="0.14.1" + +RDEPEND=" + dev-libs/libbsd[${MULTILIB_USEDEP}] + dev-libs/popt[${MULTILIB_USEDEP}] + >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] + ldap? ( net-nds/openldap:= ) + lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}] + sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} + virtual/libcrypt + test? ( >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] ) +" +BDEPEND="${PYTHON_DEPS} + dev-libs/libxslt + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +WAF_BINARY="${S}/buildtools/bin/waf" + +MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.2-optional_packages.patch + "${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch + "${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch + "${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch +) + +pkg_setup() { + # Package fails to build with distcc + export DISTCC_DISABLE=1 + export PYTHONHASHSEED=1 + + # waf requires a python interpreter + python-single-r1_pkg_setup +} + +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + +src_prepare() { + default + + check_samba_dep_versions + + multilib_copy_sources +} + +multilib_src_configure() { + # When specifying libs for samba build you must append NONE to the end to + # stop it automatically including things + local bundled_libs="NONE" + + # We "use" bundled cmocka when we're not running tests as we're + # not using it anyway. Means we avoid making users install it for + # no reason. bug #802531 + if ! use test; then + bundled_libs="cmocka,${bundled_libs}" + fi + + local myconf=( + $(usex ldap '' --disable-ldap) + $(usex lmdb '' --without-ldb-lmdb) + --disable-rpath + --disable-rpath-install + --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba + --bundled-libraries="${bundled_libs}" + --builtin-libraries=NONE + ) + + if ! use python || ! multilib_is_native_abi; then + myconf+=( --disable-python ) + fi + + waf-utils_src_configure "${myconf[@]}" +} + +multilib_src_compile() { + waf-utils_src_compile + multilib_is_native_abi && use doc && doxygen Doxyfile +} + +multilib_src_test() { + if multilib_is_native_abi; then + WAF_MAKE=1 \ + PATH=buildtools/bin:../../../buildtools/bin:${PATH}:"${BUILD_DIR}"/bin/shared/private/ \ + LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \ + waf test || die + fi +} + +multilib_src_install() { + waf-utils_src_install + + if multilib_is_native_abi && use doc; then + doman apidocs/man/man3/*.3 + docinto html + dodoc -r apidocs/html/. + fi + + # bug #726454 + use python && python_optimize +} + +pkg_postinst() { + if has_version sys-auth/sssd; then + ewarn "You have sssd installed. It is known to break after ldb upgrades," + ewarn "so please try to rebuild it before reporting bugs." + ewarn "See https://bugs.gentoo.org/404281" + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/Manifest index ae0afae278e..8c545249609 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/Manifest @@ -1,2 +1,2 @@ -DIST talloc-2.3.2.tar.gz 661344 BLAKE2B 957eedc4a367051cb99fa4d2edb8e778de8e0187bb5c0d84a1afef20aab122a8b7310d10c694e15ddd6a0a45194889fe3d26dae0ceb8e406d51512af95a23014 SHA512 c851a6f43025720453a3bff8734bfcfff0e29fb7cf2ffcc6c03b6ab8589098daf01d668deec61aa2f238d4df3eb3c47bd080e26eec760cf04a70e1afcad5c5e1 -DIST talloc-2.3.3.tar.gz 650493 BLAKE2B 4312d8bbd54da2cb8917946e46bb77dae1c6fdfeb72bd85d86ef8d5900f2132a36c5f0075608116a9bf036a2f02671472d389eed704f8e2923f8320d29aa12bd SHA512 1e4b90769b9be72421d76bf9149fd0736f43d034b1573ab2dfb5cd613b4fb3fdf67d575f81789851787e1cbbc7353cdfc114cefbccb15fc0f39e222f40aff65f +DIST talloc-2.3.4.tar.gz 674196 BLAKE2B 1fac0a45a4ba16c7741e6d810e1a1e56352c04f266b99de62770177c1218a8c8253be2d5d1793aae67ce61e6a1159cbcd4888a49702822e6817b86eb7a1fea31 SHA512 c46488deda99753fd79566d42cae88899b71196513a127813be2cb855e7f36b77132f0552297ee4153ba4d8f177cea3bb0dc93340caabf321c026657744684d9 +DIST talloc-2.4.0.tar.gz 676054 BLAKE2B 71b3f21fa7cd114579e1dc064aadda447c0d196beaa27a5919acebdce668f6b768dd7c293c056ae4c096f31d8e931255ee2b71728c4b7b0bbb7818169380e9ca SHA512 810d92a614d0b9e0ac6fe403c1643c4dda435f79c4627d3c3be228f94b4b2ee8e528efbbed07f7d1a16043d6e55bdf4f10826f31fb8ca1c649c4126ea09a3aff diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.3.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.3.4.ebuild similarity index 92% rename from sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.3.2.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.3.4.ebuild index 6d991fb9085..dc1416135c6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.3.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.3.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="threads(+)" inherit waf-utils python-single-r1 multilib-minimal @@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz" LICENSE="GPL-3 LGPL-3+ LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" IUSE="compat +python" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -44,6 +44,7 @@ pkg_setup() { # try to turn off distcc and ccache for people that have a problem with it export DISTCC_DISABLE=1 export CCACHE_DISABLE=1 + export PYTHONHASHSEED=1 python-single-r1_pkg_setup } diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.3.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.0.ebuild similarity index 84% rename from sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.3.3.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.0.ebuild index d3735e02a94..a9a819cb523 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.3.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="threads(+)" inherit waf-utils python-single-r1 multilib-minimal @@ -13,8 +13,8 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz" LICENSE="GPL-3 LGPL-3+ LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris" -IUSE="compat +python" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +IUSE="compat +python valgrind" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" @@ -27,8 +27,13 @@ RDEPEND=" ) python? ( ${PYTHON_DEPS} ) " -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} +# Valgrind is automagic here but it's a build-only dep so it's not so bad. +DEPEND=" + ${RDEPEND} + valgrind? ( dev-util/valgrind ) +" +BDEPEND=" + ${PYTHON_DEPS} dev-libs/libxslt sys-devel/gettext " @@ -64,10 +69,15 @@ src_prepare() { multilib_src_configure() { local extra_opts=( - $(usex compat --enable-talloc-compat1 '') + --libdir="${EPREFIX}/usr/$(get_libdir)" + --disable-dependency-tracking + --disable-warnings-as-errors + + $(usev compat --enable-talloc-compat1) $(multilib_native_usex python '' --disable-python) $([[ ${CHOST} == *-solaris* ]] && echo '--disable-symbol-versions') ) + waf-utils_src_configure "${extra_opts[@]}" } diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest index 9b21a02b58d..56b9d8f6cad 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/Manifest @@ -1,2 +1,2 @@ -DIST tdb-1.4.5.tar.gz 729650 BLAKE2B 5d8a226cf251268d70f68759fb792628559fa3b10e7843d1a53914ea24f0ceca61fe0c3f348d704ebc8df4c56fe2365690b585b1c96cf53d63ecae1960aca58a SHA512 373b2ce5b2c68fbc28b7679f0e7531115b91ddc6a68b27acada39b995f66b508b19f24d712fc4388654199abd69857e53ebd435d1ed47e3a69ba85ff667fed56 -DIST tdb-1.4.6.tar.gz 736747 BLAKE2B 53b989955993e970f3ca0874ade4d7404e180fedaac94d409753b209ea9dfa5136f2cdce4eb6d67a44b208731466eb0557c4dfcd9db20ea5806c5da1a3917e50 SHA512 8af549867fdf2e0daf073c26933ae0d475ea64efaca23d3d7b0eb20839376e817f4c0a0ba2504f60f9e27a2b35d3b6ae7c329d88a5c2c0408e98ad9dfde84712 +DIST tdb-1.4.7.tar.gz 741714 BLAKE2B ec2f991bbaa61d46f16b7a68a4e47a2f690cda261dd0e9fd9708e51ad64eefeb54ac8b1102cde6935916f840d3c89d7a2903f58175cceb78ea4ef889e82ddbc6 SHA512 2b5b20c299b60545943f106d854b6e0d4a559e16f08a7ed62fe57ee962bebc888c2e663bd5fef907aace05b316826fe8fbbf3f323b6d3427531e59ffe47d48e4 +DIST tdb-1.4.8.tar.gz 742791 BLAKE2B dc2705cb16ee59f4d5bf25602032b25fd5338caa890db19939996a40cd19c4c999f9a74786d5754dbbd1de54d818541cf56844beeb33008aaee507d5dfcdba85 SHA512 763beebe923aa04303cbb91ce5970e6bbd13546888cff75ea9ab025afff3ef88fee539ae173fc2fb7ec661b6c337b0c2da361ce3d318f51ef6627bdb3fe6ca63 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch new file mode 100644 index 00000000000..9d3e485da57 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/files/tdb-1.4.7-configure-clang16.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/870043 +https://gitlab.com/samba-team/samba/-/merge_requests/2807 +https://src.fedoraproject.org/rpms/libtdb/blob/rawhide/f/libtdb-waf18-c99.patch + +Avoid calling lib_func without a prototype. + +This commit mirrors the change in commit f4c0a750d4adebcf2342a44e85f04526c34 +("WAF: Fix detection of linker features") +to buildtools/wafsamba/samba_conftests.py. It fixes the check for rpath +support with compilers in strict C99 mode. + +Submitted upstream: + +--- a/buildtools/wafsamba/samba_waf18.py ++++ b/buildtools/wafsamba/samba_waf18.py +@@ -209,7 +209,8 @@ def CHECK_LIBRARY_SUPPORT(conf, rpath=False, version_script=False, msg=None): + lib_node.parent.mkdir() + lib_node.write('int lib_func(void) { return 42; }\n', 'w') + main_node = bld.srcnode.make_node('main.c') +- main_node.write('int main(void) {return !(lib_func() == 42);}', 'w') ++ main_node.write('int lib_func(void);\n' ++ 'int main(void) {return !(lib_func() == 42);}', 'w') + linkflags = [] + if version_script: + script = bld.srcnode.make_node('ldscript') + diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.6.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.7-r1.ebuild similarity index 68% rename from sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.6.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.7-r1.ebuild index ffa7d21d3ba..55c2e984493 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.7-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="threads(+)" inherit waf-utils multilib-minimal python-single-r1 @@ -13,21 +13,35 @@ SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" RDEPEND=" dev-libs/libbsd[${MULTILIB_USEDEP}] - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - virtual/libcrypt" -BDEPEND="${PYTHON_DEPS} - app-text/docbook-xml-dtd:4.2" + python? ( ${PYTHON_DEPS} ) +" +DEPEND=" + ${RDEPEND} + virtual/libcrypt +" +BDEPEND=" + ${PYTHON_DEPS} + app-text/docbook-xml-dtd:4.2 +" WAF_BINARY="${S}/buildtools/bin/waf" +PATCHES=( + "${FILESDIR}"/${PN}-1.4.7-configure-clang16.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + export PYTHONHASHSEED=1 +} + src_prepare() { default python_fix_shebang . diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.5.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.8.ebuild similarity index 62% rename from sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.5.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.8.ebuild index 79954ea15f5..367f845e970 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tdb/tdb-1.4.8.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="threads(+)" inherit waf-utils multilib-minimal python-single-r1 @@ -13,18 +13,23 @@ SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" RDEPEND=" dev-libs/libbsd[${MULTILIB_USEDEP}] - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - virtual/libcrypt" -BDEPEND="${PYTHON_DEPS} - app-text/docbook-xml-dtd:4.2" + python? ( ${PYTHON_DEPS} ) +" +DEPEND=" + ${RDEPEND} + virtual/libcrypt +" +BDEPEND=" + ${PYTHON_DEPS} + app-text/docbook-xml-dtd:4.2 +" WAF_BINARY="${S}/buildtools/bin/waf" @@ -35,7 +40,14 @@ src_prepare() { } multilib_src_configure() { - local extra_opts=() + MAKEOPTS+=" -j1" + + local extra_opts=( + --libdir="${EPREFIX}/usr/$(get_libdir)" + --disable-dependency-tracking + --disable-warnings-as-errors + ) + if ! multilib_is_native_abi || ! use python ; then extra_opts+=( --disable-python ) fi @@ -44,8 +56,6 @@ multilib_src_configure() { } multilib_src_compile() { - # need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses - unset MAKEOPTS waf-utils_src_compile } @@ -57,4 +67,5 @@ multilib_src_test() { multilib_src_install() { waf-utils_src_install + use python && python_optimize } diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tevent/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/tevent/Manifest index 03e6359da59..5d24c61a6c3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tevent/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/tevent/Manifest @@ -1,3 +1,4 @@ -DIST tevent-0.10.2.tar.gz 800731 BLAKE2B 5ea6b83378b04dbe1666432db0dbd4c0df2e6b0bf5ebcc8ec4ec9bdeb834efec75c87b2019dc78c691aba6c4f6467394101febd6010f106046a1fb8848e27405 SHA512 1da8f28898f35daab515892b880d1de601062cc3e2b2570cd62e6913df17b0195a05acb7b484c628cddc0eb8b0cde893105ede3feb32bc5764e7d25684f332ba -DIST tevent-0.11.0.tar.gz 866327 BLAKE2B 9e6e958597e21c0d228346aa102987f89bb6630a5661cef21b908735469a59e7b4f46bc4473e9c25fe636913a1eebc1f26234448c09739ad812cd3ce97bf5048 SHA512 740346b19bf290ff31b0c1b36e232021b8ad107c3ce27e0e8b1ec1a77485214b07a9b7837ba57f3650a50e4c04f530674e486b5fa4d118a1778259be63b49790 -DIST tevent-0.12.0.tar.gz 877767 BLAKE2B cbfb823f9a8ce8a9a88964c9daa15643c077163c03a792468836e5bbc7e7500c745e1fc1203063ed01f899cf598794764c6d465afc3ed31cd711f420ebc6ce55 SHA512 ae955b64a683bc6aaba66592ca5d205eb48f62a70bd2674b5b3a0e3b0f4de30c93f400bf183d3bef5993845a3281716584b24cf8a93c849ba4fa7d1fcfb9cc99 +DIST tevent-0.12.1.tar.gz 879683 BLAKE2B 51521aa26dc3ac38dcf69cdb77a7ad33fede88947e3a91cc5917fae9746951643a70615db24449437e133b575ca41d961ed63c23a0b4f1a01edf090952672032 SHA512 ab70262702d70ce00e8b3aef41930c674b04c147fdbf0006e57cfa057d82f6049ba6da4b2c2b7b53aa191dd4f0f3d55e72b0666ae8f5b6948eeb9fde1988c938 +DIST tevent-0.13.0.tar.gz 880601 BLAKE2B 4e2a2c055bac28cecae1a95b7ddab349ed780f44427e74709eca497d6242bc4f46a91878d3d253c1af4819887ce7df522fe41f88f6059ec5f6c706c7e071ee35 SHA512 7aa05c09e3c708769e31cda88b319cee3629c88c51bda559193a85d4ab32204a8b4ba11f142861dbca06b578bf54953f2aca1ad847e99995a4fc40bf08618a93 +DIST tevent-0.14.0.tar.gz 878142 BLAKE2B 8c1c2b4cb683a3ca2630181904566c3cf9d0151c7e280f86e0ce24febfc5d0a1e85757e3ad9d635205bbcbe3e0d0a060dedb3207fb4e91ea76f36246f0a2704a SHA512 5e9525b2f8f8014d1147244dcccd6cf5ac49e383c49b19480ac1256dc7ccf60705960e87b8f63348fca3f4f496861f3d307ee5e0fde8189d93a596c5e689f2b1 +DIST tevent-0.14.1.tar.gz 881979 BLAKE2B 272b7d0029061dfd172a39135d806b937ee6f5bb9eb4c9c8d68a6e5cb3d9eca01582f7ddf5a15d7f033d3322c7fd4d6e87d697f76e4d44565c8e757398a5f0f8 SHA512 0bcc87c10f84e947edad8f8c31f3923253c599b7a69a1db1c21ab292e02937ccb8bad9f0f70e27420ead687aaed1a9b3830b6daa903b8a9bd48cc035a6e5f4ec diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tevent/files/tevent-0.11.0-missing-include.patch b/sdk_container/src/third_party/portage-stable/sys-libs/tevent/files/tevent-0.11.0-missing-include.patch deleted file mode 100644 index c88550e54e6..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tevent/files/tevent-0.11.0-missing-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -pid_t requires -Bug: https://bugs.gentoo.org/828720 - ---- a/tevent.h -+++ b/tevent.h -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - - /* for old gcc releases that don't have the feature test macro __has_attribute */ diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/tevent/tevent-0.10.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/tevent/tevent-0.10.2.ebuild deleted file mode 100644 index 1d14cd94327..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/tevent/tevent-0.10.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE="threads(+)" -inherit waf-utils multilib-minimal python-single-r1 - -DESCRIPTION="Samba tevent library" -HOMEPAGE="https://tevent.samba.org/" -SRC_URI="https://samba.org/ftp/tevent/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" -IUSE="python" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="test" - -RDEPEND=" - dev-libs/libbsd[${MULTILIB_USEDEP}] - >=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}] - python? ( - ${PYTHON_DEPS} - sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}] - ) -" -DEPEND="${RDEPEND} - elibc_glibc? ( - net-libs/libtirpc[${MULTILIB_USEDEP}] - || ( - net-libs/rpcsvc-proto - - - x11@gentoo.org - X11 - + + x11@gentoo.org + X11 + + + xorg/proto/xorgproto + diff --git a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2021.5.ebuild b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2022.2.ebuild similarity index 72% rename from sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2021.5.ebuild rename to sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2022.2.ebuild index 6bd2e9b7da1..6c7649b6fd9 100644 --- a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2021.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2022.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) MY_PN="${PN/xorg-/xorg}" MY_P="${MY_PN}-${PV}" @@ -20,8 +20,8 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" if [[ ${PV} = 9999* ]]; then SRC_URI="" else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" fi @@ -30,17 +30,16 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -DEPEND=" +BDEPEND=" test? ( $(python_gen_any_dep ' dev-python/python-libevdev[${PYTHON_USEDEP}] ') ) " -RDEPEND="" python_check_deps() { - has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" + python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]" } pkg_setup() { diff --git a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2023.1.ebuild b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2023.1.ebuild new file mode 100644 index 00000000000..5e165a925d0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2023.1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) + +MY_PN="${PN/xorg-/xorg}" +MY_P="${MY_PN}-${PV}" + +EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi + +inherit ${GIT_ECLASS} meson python-any-r1 + +DESCRIPTION="X.Org combined protocol headers" +HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" +if [[ ${PV} = 9999* ]]; then + SRC_URI="" +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + $(python_gen_any_dep ' + dev-python/python-libevdev[${PYTHON_USEDEP}] + ') + ) +" + +python_check_deps() { + python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_install() { + meson_src_install + + mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die +} diff --git a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2023.2.ebuild b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2023.2.ebuild new file mode 100644 index 00000000000..e7f87e6509f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2023.2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) + +MY_PN="${PN/xorg-/xorg}" +MY_P="${MY_PN}-${PV}" + +EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi + +inherit ${GIT_ECLASS} meson python-any-r1 + +DESCRIPTION="X.Org combined protocol headers" +HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" +if [[ ${PV} = 9999* ]]; then + SRC_URI="" +else + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + $(python_gen_any_dep ' + dev-python/python-libevdev[${PYTHON_USEDEP}] + ') + ) +" + +python_check_deps() { + python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_install() { + meson_src_install + + mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die +} diff --git a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-9999.ebuild b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-9999.ebuild index 865b171e534..e8ac7166da8 100644 --- a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) MY_PN="${PN/xorg-/xorg}" MY_P="${MY_PN}-${PV}" @@ -20,8 +20,8 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" if [[ ${PV} = 9999* ]]; then SRC_URI="" else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" fi @@ -30,7 +30,7 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -DEPEND=" +BDEPEND=" test? ( $(python_gen_any_dep ' dev-python/python-libevdev[${PYTHON_USEDEP}] @@ -40,7 +40,7 @@ DEPEND=" RDEPEND="" python_check_deps() { - has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" + python_has_version "dev-python/python-libevdev[${PYTHON_USEDEP}]" } pkg_setup() {