commit: 897bb891e5485145b13db1c7a850fa3d122e0a77 Author: Amy Liffey <amynka <AT> gentoo <DOT> org> AuthorDate: Thu Apr 1 19:13:23 2021 +0000 Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> CommitDate: Thu Apr 1 19:16:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=897bb891
app-crypt/eid-mw: Fix Target pinentry-gtk-2 Closes: https://bugs.gentoo.org/778353 Submitted-by: Vincent Hardy <vincent.hardy.be <AT> gmail.com> Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> .../{eid-mw-9999.ebuild => eid-mw-5.0.14-r1.ebuild} | 18 ++++++++++++------ app-crypt/eid-mw/eid-mw-9999.ebuild | 8 ++++---- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild similarity index 80% copy from app-crypt/eid-mw/eid-mw-9999.ebuild copy to app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild index f121b904909..364d7111264 100644 --- a/app-crypt/eid-mw/eid-mw-9999.ebuild +++ b/app-crypt/eid-mw/eid-mw-5.0.14-r1.ebuild @@ -3,14 +3,15 @@ EAPI=7 -inherit autotools desktop gnome2-utils xdg-utils git-r3 +inherit autotools desktop gnome2-utils xdg-utils DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government" HOMEPAGE="https://eid.belgium.be"; -EGIT_REPO_URI="https://github.com/Fedict/${PN}.git"; +SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" LICENSE="LGPL-3" SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" IUSE="+dialogs +gtk p11-kit" RDEPEND=">=sys-apps/pcsc-lite-1.2.9 @@ -20,7 +21,7 @@ RDEPEND=">=sys-apps/pcsc-lite-1.2.9 dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy - app-crypt/pinentry[gtk] + >=app-crypt/pinentry-1.1.0-r4[gtk] ) p11-kit? ( app-crypt/p11-kit )" @@ -32,6 +33,11 @@ REQUIRED_USE="dialogs? ( gtk )" src_prepare() { default + # Buggy internal versioning when autoreconf a tarball release. + # Weird numbering is required otherwise we get a seg fault in + # about-eid-mw program. + echo "${PV}-v${PV}" > .version + # xpi module : we don't want it anymore sed -i -e '/SUBDIRS/ s:plugins_tools/xpi ::' Makefile.am || die sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die @@ -85,11 +91,11 @@ pkg_postinst() { local peimpl=$(eselect --brief --colour=no pinentry show) case "${peimpl}" in - *gtk*) ;; + *gnome*|*qt*) ;; *) ewarn "The pinentry front-end currently selected is not supported by eid-mw." ewarn "You may be prompted for your pin code in an inaccessible shell!!" - ewarn "Please select pinentry-gtk-2 as default pinentry provider:" - ewarn " # eselect pinentry set pinentry-gtk-2" + ewarn "Please select pinentry-gnome3 as default pinentry provider:" + ewarn " # eselect pinentry set pinentry-gnome3" ;; esac fi diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild index f121b904909..9d56a10ca2b 100644 --- a/app-crypt/eid-mw/eid-mw-9999.ebuild +++ b/app-crypt/eid-mw/eid-mw-9999.ebuild @@ -20,7 +20,7 @@ RDEPEND=">=sys-apps/pcsc-lite-1.2.9 dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy - app-crypt/pinentry[gtk] + >=app-crypt/pinentry-1.1.0-r4[gtk] ) p11-kit? ( app-crypt/p11-kit )" @@ -85,11 +85,11 @@ pkg_postinst() { local peimpl=$(eselect --brief --colour=no pinentry show) case "${peimpl}" in - *gtk*) ;; + *gnome*|*qt*) ;; *) ewarn "The pinentry front-end currently selected is not supported by eid-mw." ewarn "You may be prompted for your pin code in an inaccessible shell!!" - ewarn "Please select pinentry-gtk-2 as default pinentry provider:" - ewarn " # eselect pinentry set pinentry-gtk-2" + ewarn "Please select pinentry-gnome3 as default pinentry provider:" + ewarn " # eselect pinentry set pinentry-gnome3" ;; esac fi
