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 ae0afae278..8c54524960 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 6d991fb908..dc1416135c 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 d3735e02a9..a9a819cb52 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[@]}" }