mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-17 19:13:13 -04:00
app-admin/gnome-passwordsafe: use python-single-r1
* don't run provided install script * fix "No Python implementation set (EPYTHON is null)" Closes: https://bugs.gentoo.org/779118 Signed-off-by: Theo Anderson <telans@posteo.de>
This commit is contained in:
@@ -0,0 +1,14 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 9eb076b..dfc8eee 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -95,8 +95,5 @@ message('Preparing init file')
|
||||
configure_file(
|
||||
input: 'passwordsafe.in',
|
||||
output: 'gnome-passwordsafe',
|
||||
- configuration: conf,
|
||||
- install_dir: bindir
|
||||
+ configuration: conf
|
||||
)
|
||||
-
|
||||
-meson.add_install_script('meson_post_install.py')
|
||||
@@ -5,7 +5,7 @@ EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
|
||||
inherit gnome2-utils meson xdg python-r1
|
||||
inherit gnome2-utils meson xdg python-single-r1
|
||||
|
||||
DESCRIPTION="A password manager for GNOME"
|
||||
HOMEPAGE="https://gitlab.gnome.org/World/PasswordSafe"
|
||||
@@ -14,14 +14,13 @@ SRC_URI="https://gitlab.gnome.org/World/PasswordSafe/-/archive/${PV}/PasswordSaf
|
||||
LICENSE="GPL-2+"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SLOT="0"
|
||||
|
||||
IUSE="debug +introspection"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
S="${WORKDIR}/PasswordSafe-${PV}"
|
||||
|
||||
DEPEND="
|
||||
$(python_gen_any_dep '
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/pycryptodome[${PYTHON_USEDEP}]
|
||||
>=dev-python/pykeepass-3.2.0[${PYTHON_USEDEP}]
|
||||
')
|
||||
@@ -35,10 +34,10 @@ RDEPEND="
|
||||
${DEPEND}
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-4.1-meson-install.patch" )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
# Use python from PATH instead of binary found during install
|
||||
sed -i "s:@PYTHON@:/usr/bin/env python:" passwordsafe.in || die
|
||||
# pycryptodomex to pycryptodome conversion
|
||||
sed -i 's/Cryptodome/Crypto/g' passwordsafe/keyfile_generator.py || die
|
||||
}
|
||||
@@ -47,11 +46,13 @@ src_configure() {
|
||||
local emesonargs=(
|
||||
-Dprofile=$(usex debug development default)
|
||||
)
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
python_doscript /usr/bin/gnome-passwordsafe
|
||||
python_optimize
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user