Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/yubioath-desktop/files/, app-crypt/yubioath-desktop/
Date: Tue, 23 Nov 2021 12:53:23
Message-Id: 1637671985.17a2413ac177eb44ec991ba0007bb28227c7ddc9.soap@gentoo
1 commit: 17a2413ac177eb44ec991ba0007bb28227c7ddc9
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 23 12:53:05 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 23 12:53:05 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a2413a
7
8 app-crypt/yubioath-desktop: fix install location
9
10 Closes: https://bugs.gentoo.org/825390
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 .../yubioath-desktop-5.1.0-bin-installdir.patch | 22 ++++++++++++++++++++++
14 ...1.0.ebuild => yubioath-desktop-5.1.0-r1.ebuild} | 6 ++----
15 2 files changed, 24 insertions(+), 4 deletions(-)
16
17 diff --git a/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch b/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch
18 new file mode 100644
19 index 000000000000..749533ba31ba
20 --- /dev/null
21 +++ b/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch
22 @@ -0,0 +1,22 @@
23 +From 9ae1ef710d5b070e128597a0fad3bd4ffa94b0aa Mon Sep 17 00:00:00 2001
24 +From: Dennis Fokin <Dennis.Fokin@××××××.com>
25 +Date: Thu, 7 Oct 2021 10:18:33 +0200
26 +Subject: [PATCH] Set correct install path
27 +
28 +---
29 + yubioath-desktop.pro | 2 ++
30 + 1 file changed, 2 insertions(+)
31 +
32 +diff --git a/yubioath-desktop.pro b/yubioath-desktop.pro
33 +index 551416ae..c0ef9bb1 100644
34 +--- a/yubioath-desktop.pro
35 ++++ b/yubioath-desktop.pro
36 +@@ -75,6 +75,8 @@ lupdate_only {
37 + qml/slot/*.qml
38 + }
39 +
40 ++# Set correct install path
41 ++target.path = $$PREFIX/bin
42 +
43 + DISTFILES += \
44 + py/* \
45
46 diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r1.ebuild
47 similarity index 92%
48 rename from app-crypt/yubioath-desktop/yubioath-desktop-5.1.0.ebuild
49 rename to app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r1.ebuild
50 index e2f85896c574..c2f7b927166a 100644
51 --- a/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0.ebuild
52 +++ b/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r1.ebuild
53 @@ -34,12 +34,10 @@ RDEPEND="${DEPEND}
54 $(python_gen_cond_dep '>=app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]')
55 dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]"
56
57 +PATCHES=( "${FILESDIR}"/${P}-bin-installdir.patch )
58 +
59 src_prepare() {
60 default
61 - sed -i \
62 - -e "s:python build_qrc.py:${PYTHON} build_qrc.py:" \
63 - yubioath-desktop.pro || die
64 -
65 python_fix_shebang "${S}"
66 }