| 1 |
commit: 897bb891e5485145b13db1c7a850fa3d122e0a77 |
| 2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 1 19:13:23 2021 +0000 |
| 4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 1 19:16:42 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=897bb891 |
| 7 |
|
| 8 |
app-crypt/eid-mw: Fix Target pinentry-gtk-2 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/778353 |
| 11 |
Submitted-by: Vincent Hardy <vincent.hardy.be <AT> gmail.com> |
| 12 |
Package-Manager: Portage-3.0.13, Repoman-3.0.2 |
| 13 |
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> |
| 14 |
|
| 15 |
.../{eid-mw-9999.ebuild => eid-mw-5.0.14-r1.ebuild} | 18 ++++++++++++------ |
| 16 |
app-crypt/eid-mw/eid-mw-9999.ebuild | 8 ++++---- |
| 17 |
2 files changed, 16 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild |
| 20 |
similarity index 80% |
| 21 |
copy from app-crypt/eid-mw/eid-mw-9999.ebuild |
| 22 |
copy to app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild |
| 23 |
index f121b904909..364d7111264 100644 |
| 24 |
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild |
| 25 |
+++ b/app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild |
| 26 |
@@ -3,14 +3,15 @@ |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
|
| 30 |
-inherit autotools desktop gnome2-utils xdg-utils git-r3 |
| 31 |
+inherit autotools desktop gnome2-utils xdg-utils |
| 32 |
|
| 33 |
DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government" |
| 34 |
HOMEPAGE="https://eid.belgium.be" |
| 35 |
-EGIT_REPO_URI="https://github.com/Fedict/${PN}.git" |
| 36 |
+SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" |
| 37 |
|
| 38 |
LICENSE="LGPL-3" |
| 39 |
SLOT="0" |
| 40 |
+KEYWORDS="~amd64 ~arm ~x86" |
| 41 |
IUSE="+dialogs +gtk p11-kit" |
| 42 |
|
| 43 |
RDEPEND=">=sys-apps/pcsc-lite-1.2.9 |
| 44 |
@@ -20,7 +21,7 @@ RDEPEND=">=sys-apps/pcsc-lite-1.2.9 |
| 45 |
dev-libs/libxml2 |
| 46 |
net-misc/curl[ssl] |
| 47 |
net-libs/libproxy |
| 48 |
- app-crypt/pinentry[gtk] |
| 49 |
+ >=app-crypt/pinentry-1.1.0-r4[gtk] |
| 50 |
) |
| 51 |
p11-kit? ( app-crypt/p11-kit )" |
| 52 |
|
| 53 |
@@ -32,6 +33,11 @@ REQUIRED_USE="dialogs? ( gtk )" |
| 54 |
src_prepare() { |
| 55 |
default |
| 56 |
|
| 57 |
+ # Buggy internal versioning when autoreconf a tarball release. |
| 58 |
+ # Weird numbering is required otherwise we get a seg fault in |
| 59 |
+ # about-eid-mw program. |
| 60 |
+ echo "${PV}-v${PV}" > .version |
| 61 |
+ |
| 62 |
# xpi module : we don't want it anymore |
| 63 |
sed -i -e '/SUBDIRS/ s:plugins_tools/xpi ::' Makefile.am || die |
| 64 |
sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die |
| 65 |
@@ -85,11 +91,11 @@ pkg_postinst() { |
| 66 |
|
| 67 |
local peimpl=$(eselect --brief --colour=no pinentry show) |
| 68 |
case "${peimpl}" in |
| 69 |
- *gtk*) ;; |
| 70 |
+ *gnome*|*qt*) ;; |
| 71 |
*) ewarn "The pinentry front-end currently selected is not supported by eid-mw." |
| 72 |
ewarn "You may be prompted for your pin code in an inaccessible shell!!" |
| 73 |
- ewarn "Please select pinentry-gtk-2 as default pinentry provider:" |
| 74 |
- ewarn " # eselect pinentry set pinentry-gtk-2" |
| 75 |
+ ewarn "Please select pinentry-gnome3 as default pinentry provider:" |
| 76 |
+ ewarn " # eselect pinentry set pinentry-gnome3" |
| 77 |
;; |
| 78 |
esac |
| 79 |
fi |
| 80 |
|
| 81 |
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild |
| 82 |
index f121b904909..9d56a10ca2b 100644 |
| 83 |
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild |
| 84 |
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild |
| 85 |
@@ -20,7 +20,7 @@ RDEPEND=">=sys-apps/pcsc-lite-1.2.9 |
| 86 |
dev-libs/libxml2 |
| 87 |
net-misc/curl[ssl] |
| 88 |
net-libs/libproxy |
| 89 |
- app-crypt/pinentry[gtk] |
| 90 |
+ >=app-crypt/pinentry-1.1.0-r4[gtk] |
| 91 |
) |
| 92 |
p11-kit? ( app-crypt/p11-kit )" |
| 93 |
|
| 94 |
@@ -85,11 +85,11 @@ pkg_postinst() { |
| 95 |
|
| 96 |
local peimpl=$(eselect --brief --colour=no pinentry show) |
| 97 |
case "${peimpl}" in |
| 98 |
- *gtk*) ;; |
| 99 |
+ *gnome*|*qt*) ;; |
| 100 |
*) ewarn "The pinentry front-end currently selected is not supported by eid-mw." |
| 101 |
ewarn "You may be prompted for your pin code in an inaccessible shell!!" |
| 102 |
- ewarn "Please select pinentry-gtk-2 as default pinentry provider:" |
| 103 |
- ewarn " # eselect pinentry set pinentry-gtk-2" |
| 104 |
+ ewarn "Please select pinentry-gnome3 as default pinentry provider:" |
| 105 |
+ ewarn " # eselect pinentry set pinentry-gnome3" |
| 106 |
;; |
| 107 |
esac |
| 108 |
fi |
Archives