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 54E9A158041 for ; Tue, 12 Mar 2024 00:18:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74738E2A31; Tue, 12 Mar 2024 00:18:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 452E4E2A31 for ; Tue, 12 Mar 2024 00:18:44 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E6E06342FFC for ; Tue, 12 Mar 2024 00:18:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBF5B7E7 for ; Tue, 12 Mar 2024 00:18:40 +0000 (UTC) From: "Julien Roy" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julien Roy" Message-ID: <1710187107.8fd3dfb68a9bc5b378c722874b572185e26c916e.julien@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-irc/thelounge/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-irc/thelounge/thelounge-4.4.1.ebuild net-irc/thelounge/thelounge-4.4.2_rc1.ebuild X-VCS-Directories: net-irc/thelounge/ X-VCS-Committer: julien X-VCS-Committer-Name: Julien Roy X-VCS-Revision: 8fd3dfb68a9bc5b378c722874b572185e26c916e X-VCS-Branch: master Date: Tue, 12 Mar 2024 00:18:40 +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: a03903aa-ca29-4c5e-bdf1-8776abf5ec1d X-Archives-Hash: 5d4245a5f5bef0d945223b1f4ecc200f commit: 8fd3dfb68a9bc5b378c722874b572185e26c916e Author: Rahil Bhimjiani rahil rocks> AuthorDate: Mon Mar 11 19:36:23 2024 +0000 Commit: Julien Roy jroy ca> CommitDate: Mon Mar 11 19:58:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8fd3dfb6 net-irc/thelounge: use specific python version Instead of just executing `python` or `python3` which are just symlinks and considered bad practice, execute specific python executable (i.e. /usr/bin/python3.11) This also fixes failing build with python-exec[-native-symlinks] Closes: https://bugs.gentoo.org/926719 Signed-off-by: Rahil Bhimjiani rahil.rocks> net-irc/thelounge/thelounge-4.4.1.ebuild | 12 ++++++++++-- net-irc/thelounge/thelounge-4.4.2_rc1.ebuild | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/net-irc/thelounge/thelounge-4.4.1.ebuild b/net-irc/thelounge/thelounge-4.4.1.ebuild index 1f86cc3737..93cca19219 100644 --- a/net-irc/thelounge/thelounge-4.4.1.ebuild +++ b/net-irc/thelounge/thelounge-4.4.1.ebuild @@ -3,7 +3,9 @@ EAPI=8 -inherit readme.gentoo-r1 systemd tmpfiles +PYTHON_COMPAT=( python3_{10..12} ) + +inherit python-single-r1 readme.gentoo-r1 systemd tmpfiles DESCRIPTION="‎Modern, responsive, cross-platform, self-hosted web IRC client" HOMEPAGE="https://thelounge.chat/" @@ -19,6 +21,7 @@ LICENSE="BSD MIT" SLOT="0" KEYWORDS="~amd64" IUSE="+sqlite" +REQUIRED_USE="sqlite? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" acct-user/${PN} @@ -28,6 +31,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" + sqlite? ( ${PYTHON_DEPS} ) >=net-libs/nodejs-16[npm] sys-apps/yarn " @@ -67,7 +71,11 @@ src_compile() { if use sqlite; then # sqlite3 build pushd node_modules/sqlite3 || die - export npm_config_cache="${WORKDIR}"/npm-cache npm_config_nodedir="${EPREFIX}"/usr || die + export \ + npm_config_cache="${WORKDIR}"/npm-cache \ + npm_config_nodedir="${EPREFIX}"/usr \ + NODE_GYP_FORCE_PYTHON="$(command -v ${PYTHON_SINGLE_TARGET/_/.})" \ + || die npm --verbose --offline install --build-from-source --sqlite="${EPREFIX}"/usr || die # sqlite3 cleanup rm -rf node_modules || die diff --git a/net-irc/thelounge/thelounge-4.4.2_rc1.ebuild b/net-irc/thelounge/thelounge-4.4.2_rc1.ebuild index 475c04eae3..588c79dce6 100644 --- a/net-irc/thelounge/thelounge-4.4.2_rc1.ebuild +++ b/net-irc/thelounge/thelounge-4.4.2_rc1.ebuild @@ -3,7 +3,9 @@ EAPI=8 -inherit readme.gentoo-r1 systemd tmpfiles +PYTHON_COMPAT=( python3_{10..12} ) + +inherit python-single-r1 readme.gentoo-r1 systemd tmpfiles DESCRIPTION="‎Modern, responsive, cross-platform, self-hosted web IRC client" HOMEPAGE="https://thelounge.chat/" @@ -19,6 +21,7 @@ LICENSE="BSD MIT" SLOT="0" KEYWORDS="~amd64" IUSE="+sqlite" +REQUIRED_USE="sqlite? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" acct-user/${PN} @@ -28,6 +31,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" + sqlite? ( ${PYTHON_DEPS} ) >=net-libs/nodejs-18[npm] sys-apps/yarn " @@ -67,7 +71,11 @@ src_compile() { if use sqlite; then # sqlite3 build pushd node_modules/sqlite3 || die - export npm_config_cache="${WORKDIR}"/npm-cache npm_config_nodedir="${EPREFIX}"/usr || die + export \ + npm_config_cache="${WORKDIR}"/npm-cache \ + npm_config_nodedir="${EPREFIX}"/usr \ + NODE_GYP_FORCE_PYTHON="$(command -v ${PYTHON_SINGLE_TARGET/_/.})" \ + || die npm --verbose --offline install --build-from-source --sqlite="${EPREFIX}"/usr || die # sqlite3 cleanup rm -rf node_modules || die