diff options
| author |   Rahil Bhimjiani <me@rahil.rocks> | 2024-03-12 01:06:23 +0530 |
|---|---|---|
| committer | Rahil Bhimjiani <me@rahil.rocks> | 2024-03-12 01:28:27 +0530 |
| commit | 8fd3dfb68a9bc5b378c722874b572185e26c916e (patch) | |
| tree | 018fb5142144543f78531f09d9c2cb3590f263f6 | |
| parent | app-admin/pulumi-bin: add 3.109.0, drop 3.106.0 (diff) | |
| download | guru-8fd3dfb68a9bc5b378c722874b572185e26c916e.tar.gz guru-8fd3dfb68a9bc5b378c722874b572185e26c916e.tar.bz2 guru-8fd3dfb68a9bc5b378c722874b572185e26c916e.zip | |
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 <me@rahil.rocks>
| -rw-r--r-- | net-irc/thelounge/thelounge-4.4.1.ebuild | 12 | ||||
| -rw-r--r-- | 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 1f86cc373..93cca1921 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 475c04eae..588c79dce 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 |