[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/

["Amy Liffey" <amynka@gentoo.org>]

commit:     c3d5198f3cb06003085c650168cdaf546e69c9fe
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 21 11:55:47 2023 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Sep 21 11:58:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d5198f

app-crypt/eid-mw: fix bug 913727

Closes: https://bugs.gentoo.org/913727
Submitted-by: Vincent Hardy <vincent.hardy.be <AT> gmail.com>

Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>

 .../{eid-mw-9999.ebuild => eid-mw-5.1.11-r1.ebuild}     | 17 ++++++++++++++---
 app-crypt/eid-mw/eid-mw-9999.ebuild                     |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-5.1.11-r1.ebuild
similarity index 83%
copy from app-crypt/eid-mw/eid-mw-9999.ebuild
copy to app-crypt/eid-mw/eid-mw-5.1.11-r1.ebuild
index b94eb12ffc53..4316ad5bec68 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.1.11-r1.ebuild
@@ -3,14 +3,15 @@
 
 EAPI=8
 
-inherit autotools desktop gnome2-utils git-r3
+inherit autotools desktop gnome2-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 ~arm64 ~x86"
 IUSE="+dialogs +gtk p11-kit"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.2.9
@@ -32,6 +33,16 @@ 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
+
+	# See bug #862306
+	sed -i \
+		-e 's:PACKAGE_VERSION:MAINVERSION:' \
+		cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+
 	# 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
@@ -79,7 +90,7 @@ src_configure() {
 
 src_install() {
 	default
-	rm -r "${ED}"/usr/$(get_libdir)/*.la || die
+	find "${ED}" -type f -name '*.la' -delete || die
 	if use gtk; then
 		domenu plugins_tools/eid-viewer/eid-viewer.desktop
 		doicon plugins_tools/eid-viewer/gtk/eid-viewer.png

diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index b94eb12ffc53..567bbb9a1cd9 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -79,7 +79,7 @@ src_configure() {
 
 src_install() {
 	default
-	rm -r "${ED}"/usr/$(get_libdir)/*.la || die
+	find "${ED}" -type f -name '*.la' -delete || die
 	if use gtk; then
 		domenu plugins_tools/eid-viewer/eid-viewer.desktop
 		doicon plugins_tools/eid-viewer/gtk/eid-viewer.png