commit: 8d3309d2110f1e81bfb2f8734ee1b2a6af00d9a9 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Mon Jul 8 17:50:07 2024 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Mon Jul 8 18:22:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d3309d2
app-misc/golly: call setup-wxwidgets in src_configure; bump python compat Closes: https://bugs.gentoo.org/935467 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> app-misc/golly/{golly-4.3.ebuild => golly-4.3-r1.ebuild} | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app-misc/golly/golly-4.3.ebuild b/app-misc/golly/golly-4.3-r1.ebuild similarity index 90% rename from app-misc/golly/golly-4.3.ebuild rename to app-misc/golly/golly-4.3-r1.ebuild index 7ea33367f690..26ed848979da 100644 --- a/app-misc/golly/golly-4.3.ebuild +++ b/app-misc/golly/golly-4.3-r1.ebuild @@ -3,8 +3,8 @@ EAPI=8 -WX_GTK_VER=3.2-gtk3 -PYTHON_COMPAT=( python3_{10..12} ) +WX_GTK_VER="3.2-gtk3" +PYTHON_COMPAT=( python3_{10..13} ) inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg @@ -31,8 +31,7 @@ DEPEND=" PATCHES=( "${FILESDIR}/${PN}-4.0-CFLAGS.patch" ) -pkg_setup() { - python-single-r1_pkg_setup +src_configure() { setup-wxwidgets } @@ -40,8 +39,8 @@ src_compile() { local -a mymakeopts=( ENABLE_SOUND=yes GOLLYDIR="${EPREFIX}/usr/share/${PN}" - PYTHON=${EPYTHON} - WX_CONFIG=${WX_CONFIG} + PYTHON="${EPYTHON}" + WX_CONFIG="${WX_CONFIG}" AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
