From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 633C71581C1 for ; Mon, 8 Jul 2024 18:22:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EBD8E2ABD; Mon, 8 Jul 2024 18:22:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30E5FE2ABB for ; Mon, 8 Jul 2024 18:22:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A1DC342FF7 for ; Mon, 8 Jul 2024 18:22:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B0C51D23 for ; Mon, 8 Jul 2024 18:22:50 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1720462964.8d3309d2110f1e81bfb2f8734ee1b2a6af00d9a9.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/golly/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/golly/golly-4.3-r1.ebuild app-misc/golly/golly-4.3.ebuild X-VCS-Directories: app-misc/golly/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 8d3309d2110f1e81bfb2f8734ee1b2a6af00d9a9 X-VCS-Branch: master Date: Mon, 8 Jul 2024 18:22:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fd23d087-c165-4fe5-877f-8bbd4e581b68 X-Archives-Hash: bb9947dcde0bdd43da4d11bb892d842f commit: 8d3309d2110f1e81bfb2f8734ee1b2a6af00d9a9 Author: Maciej Barć gentoo org> AuthorDate: Mon Jul 8 17:50:07 2024 +0000 Commit: Maciej Barć gentoo 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ć 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)"