From a947327a603b623adc62f85d870bd33e043a1e40 Mon Sep 17 00:00:00 2001
From: Theo Anderson <telans@posteo.de>
Date: Sun, 11 Apr 2021 21:44:20 +1200
Subject: [PATCH] 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>
---
 .../gnome-passwordsafe-4.1-meson-install.patch     | 14 ++++++++++++++
 .../gnome-passwordsafe-4.1.ebuild                  | 11 ++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 app-admin/gnome-passwordsafe/files/gnome-passwordsafe-4.1-meson-install.patch

diff --git a/app-admin/gnome-passwordsafe/files/gnome-passwordsafe-4.1-meson-install.patch b/app-admin/gnome-passwordsafe/files/gnome-passwordsafe-4.1-meson-install.patch
new file mode 100644
index 0000000000..b70deea6d7
--- /dev/null
+++ b/app-admin/gnome-passwordsafe/files/gnome-passwordsafe-4.1-meson-install.patch
@@ -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')
diff --git a/app-admin/gnome-passwordsafe/gnome-passwordsafe-4.1.ebuild b/app-admin/gnome-passwordsafe/gnome-passwordsafe-4.1.ebuild
index 23f236269e..5b86c6df70 100644
--- a/app-admin/gnome-passwordsafe/gnome-passwordsafe-4.1.ebuild
+++ b/app-admin/gnome-passwordsafe/gnome-passwordsafe-4.1.ebuild
@@ -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
 }