app-admin/gnome-passwordsafe: move sed into patch, fix python_doscript

Signed-off-by: Theo Anderson <telans@posteo.de>

app-admin/gnome-passwordsafe/files/gnome-passwordsafe-4.1-meson-install.patch

@@ -1,14 +0,0 @@
-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')

app-admin/gnome-passwordsafe/files/gnome-passwordsafe-4.1.patch

@@ -0,0 +1,34 @@
+diff --git a/meson.build b/meson.build
+index 9eb076b..f16419d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -98,5 +98,3 @@ configure_file(
+   configuration: conf,
+   install_dir: bindir
+ )
+-
+-meson.add_install_script('meson_post_install.py')
+diff --git a/passwordsafe.in b/passwordsafe.in
+index acc8b3a..de801bb 100755
+--- a/passwordsafe.in
++++ b/passwordsafe.in
+@@ -1,4 +1,4 @@
+-#!@PYTHON@
++#! /usr/bin/env python
+ 
+ import sys
+ import os
+diff --git a/passwordsafe/keyfile_generator.py b/passwordsafe/keyfile_generator.py
+index 02582fc..e29b25a 100644
+--- a/passwordsafe/keyfile_generator.py
++++ b/passwordsafe/keyfile_generator.py
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: GPL-3.0-only
+ import secrets
+-from Cryptodome.Cipher import AES
+-from Cryptodome.Random import get_random_bytes
++from Crypto.Cipher import AES
++from Crypto.Random import get_random_bytes
+ from gi.repository import GLib
+ 
+ 

app-admin/gnome-passwordsafe/gnome-passwordsafe-4.1.ebuild

@@ -34,13 +34,7 @@ RDEPEND="
 	${DEPEND}
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.1-meson-install.patch" )
-
-src_prepare() {
-	default
-	# pycryptodomex to pycryptodome conversion
-	sed -i 's/Cryptodome/Crypto/g' passwordsafe/keyfile_generator.py || die
-}
+PATCHES=( "${FILESDIR}/${PN}-4.1.patch" )
 
 src_configure() {
 	local emesonargs=(
@@ -52,7 +46,7 @@ src_configure() {
 
 src_install() {
 	meson_src_install
-	python_doscript /usr/bin/gnome-passwordsafe
+	python_doscript "${ED}"/usr/bin/gnome-passwordsafe
 	python_optimize
 }