my_src_configure() { local version version=$(ver_cut 1) if use "abi$(( version + 1 ))-compat"; then version=$(( version + 1 )) elif use "abi$(( version - 1 ))-compat"; then version=$(( version - 1 )) elif use "abi$(( version - 2 ))-compat"; then version=$(( version - 2 )) fi local mycmakeargs=( -DCMAKE_FIND_PACKAGE_PREFER_CONFIG="yes" -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/" -DOPENVDB_ABI_VERSION_NUMBER="${version}" ... "-DOPENVDB_USE_FUTURE_ABI_$(( version + 1 ))=$(usex "abi$(( version + 1 ))-compat")" "-DOPENVDB_USE_DEPRECATED_ABI_$(( version - 1 ))=$(usex "abi$(( version - 1 ))-compat")" "-DOPENVDB_USE_DEPRECATED_ABI_$(( version - 2 ))=$(usex "abi$(( version - 2 ))-compat")" )
Created attachment 890728 [details] ebuild log
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2983664d141cbf6ccd9f6e54d83aacbe5eccacb8 commit 2983664d141cbf6ccd9f6e54d83aacbe5eccacb8 Author: Paul Zander <negril.nx+gentoo@gmail.com> AuthorDate: 2024-04-13 16:14:04 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-04-13 17:35:37 +0000 media-gfx/openvdb: 11.0.0 fix abi-compat USE The values for `-DOPENVDB_USE_*_ABI` are derived from the initial value of `version`. By changing the value of `version` depending on the abi*-compat USE-flag they are instead derived from the modified value for any USE="!abi11-compat". That results in `usex abi*-compat`-queries on values outside of the supported +1/-2 range. Closes: https://bugs.gentoo.org/929926 Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/36239 Signed-off-by: Sam James <sam@gentoo.org> media-gfx/openvdb/openvdb-11.0.0.ebuild | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
