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 afbb7fec10..5a3da1defe 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,3 +1,3 @@ -DIST talloc-2.3.4.tar.gz 674196 BLAKE2B 1fac0a45a4ba16c7741e6d810e1a1e56352c04f266b99de62770177c1218a8c8253be2d5d1793aae67ce61e6a1159cbcd4888a49702822e6817b86eb7a1fea31 SHA512 c46488deda99753fd79566d42cae88899b71196513a127813be2cb855e7f36b77132f0552297ee4153ba4d8f177cea3bb0dc93340caabf321c026657744684d9 DIST talloc-2.4.0.tar.gz 676054 BLAKE2B 71b3f21fa7cd114579e1dc064aadda447c0d196beaa27a5919acebdce668f6b768dd7c293c056ae4c096f31d8e931255ee2b71728c4b7b0bbb7818169380e9ca SHA512 810d92a614d0b9e0ac6fe403c1643c4dda435f79c4627d3c3be228f94b4b2ee8e528efbbed07f7d1a16043d6e55bdf4f10826f31fb8ca1c649c4126ea09a3aff DIST talloc-2.4.1.tar.gz 679160 BLAKE2B a7913b25930c77da53c17c2e0d71386402b1059f93c751084037c5068a035bd543c2d7e24a2d8dc989bb4eea13fa1a3c7a362e4d6c14af0b2030fbfb2f513801 SHA512 4de3b66d7cd1ff3f53e28e86bf9e89528635465c67868e1262aab6946106c228b2c184e988561361c3194fb260d83e016477254c9dbea7abff40c4dc0d31c76c +DIST talloc-2.4.2.tar.gz 679750 BLAKE2B 1f836d6b11e096e399ad7b99ad4abd3c140e75ee307695659c35b89eca600de247e5432bce523a299334f20ca2dad4c726b783a94c546b67fe25b2b7199b2915 SHA512 fb91665ffbe0cce96b1359940ff3ed21330c81c5331140788a26aa94f82b50492176e6000ff54b31d1a434bb1cb53a6a2c7894153545252a1fd91bda7c05a213 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.0.ebuild index b261d2c9ac..72b9421fc0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="threads(+)" inherit waf-utils python-single-r1 multilib-minimal diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.1.ebuild index adea9688ba..47470a52c6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="threads(+)" inherit waf-utils python-single-r1 multilib-minimal diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.3.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.2.ebuild similarity index 78% rename from sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.3.4.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.2.ebuild index dc1416135c..47470a52c6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.3.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/talloc/talloc-2.4.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="threads(+)" inherit waf-utils python-single-r1 multilib-minimal @@ -13,11 +13,11 @@ 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~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 test valgrind" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="test" +RESTRICT="!test? ( test )" RDEPEND=" !elibc_SunOS? ( @@ -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-debug/valgrind ) +" +BDEPEND=" + ${PYTHON_DEPS} dev-libs/libxslt sys-devel/gettext " @@ -41,10 +46,9 @@ MULTILIB_WRAPPED_HEADERS=( ) pkg_setup() { - # try to turn off distcc and ccache for people that have a problem with it + # 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 } @@ -59,16 +63,26 @@ src_prepare() { sed -i "s/name = bld.pyembed_libname('pytalloc-util')/name = 'pytalloc-util'/" wscript || die fi - # what would you expect of waf? i won't even waste time trying. + if use test ; then + # TODO: Fix python tests to run w/ USE=python. + truncate -s0 test_pytalloc.py || die + fi + + # WAF multilib_copy_sources } 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[@]}" }