gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-util/uncrustify: require python always; correctly find it

Browse Source 
The build uses several python code generators. The package worked anyway
despite pkg_setup only running for USE=test, because it always found the
latest version, ignoring PYTHON_COMPAT entirely. This occurs because
cmake.eclass no longer forces the python_setup executable to be found.

Bug: https://bugs.gentoo.org/959154
Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
This commit is contained in:
Eli Schwartz
2025-07-30 00:48:11 -04:00
parent f82121a6e3
commit e7e87eeca3
3 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dev-util/uncrustify/uncrustify-0.76.0.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,11 +21,13 @@ HOMEPAGE="https://uncrustify.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
BDEPEND="test? ( ${PYTHON_DEPS} )"
BDEPEND="${PYTHON_DEPS}"
pkg_setup() {
use test && python-any-r1_pkg_setup
src_configure() {
local mycmakeargs=(
-DPython3_FIND_STRATEGY=LOCATION
)
cmake_src_configure
}

14
dev-util/uncrustify/uncrustify-0.81.0.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,11 +21,13 @@ HOMEPAGE="https://uncrustify.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
BDEPEND="test? ( ${PYTHON_DEPS} )"
BDEPEND="${PYTHON_DEPS}"
pkg_setup() {
use test && python-any-r1_pkg_setup
src_configure() {
local mycmakeargs=(
-DPython3_FIND_STRATEGY=LOCATION
)
cmake_src_configure
}

18
dev-util/uncrustify/uncrustify-9999.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,22 +12,22 @@ else
S=${WORKDIR}/${PN}-${P}
fi
inherit cmake ${scm_eclass}
PYTHON_COMPAT=( python3_{9..12} )
inherit python-any-r1
inherit cmake python-any-r1 ${scm_eclass}
DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
HOMEPAGE="https://uncrustify.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
BDEPEND="test? ( ${PYTHON_DEPS} )"
BDEPEND="${PYTHON_DEPS}"
pkg_setup() {
use test && python-any-r1_pkg_setup
src_configure() {
local mycmakeargs=(
-DPython3_FIND_STRATEGY=LOCATION
)
cmake_src_configure
}