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

[Amy Liffey]

commit:     4e8ff830c254550978fa4956dec76086712d6306
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  9 20:28:44 2021 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Sep  9 20:30:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e8ff830

app-crypt/eid-mw: fix sandbox issue, bump 5.0.28

Closes: https://bugs.gentoo.org/811270
Submitted-by: Vincent Hardy <vincent.hardy.be <AT> gmail.com>
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>

 app-crypt/eid-mw/Manifest                              |  1 +
 .../{eid-mw-9999.ebuild => eid-mw-5.0.28.ebuild}       | 18 ++++++++++++++++--
 app-crypt/eid-mw/eid-mw-9999.ebuild                    |  8 ++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 61ef6b68174..e0c3eb7c79a 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
 DIST eid-mw-5.0.23.tar.gz 13614039 BLAKE2B 5df1ad1cfd658586352800119eca17b2c57f642678cb131bd46af7b3cd3e4599e4d84b91c139d47082f07a1a80d6719f352151982085c6a577b01a75b6875782 SHA512 35be133c81cd5824dcffd9d74dae2aaf4cecffc56cf0e106832ea930d7d8a9a7ae115aab19d21cc79d011fe98108b0d67a3a69e5cb27ff3ec0ec059a9d9e0035
+DIST eid-mw-5.0.28.tar.gz 13615312 BLAKE2B 1dbc39267688ad322059009ee0aecdd52e7133d3029285255d019819075249755153b7bf10acd775cee7fef86603de4440ff4e47338a28ff9a1ddfce79ff7adc SHA512 05705180f69cb68617660a793baf314486407557f40a223e474047e2f7f9ca8e125feb60f6b0cd47cba6e84653cfe02cdbf48c7169fe78b39b08ec621e3a7898

diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-5.0.28.ebuild
similarity index 81%
copy from app-crypt/eid-mw/eid-mw-9999.ebuild
copy to app-crypt/eid-mw/eid-mw-5.0.28.ebuild
index 9d56a10ca2b..97045c329e8 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.0.28.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
@@ -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
@@ -56,6 +62,14 @@ src_prepare() {
 	# See bug #751472
 	eapply "${FILESDIR}/use-printf-in-Makefile.patch"
 
+	# See bug #811270 (remove uml build)
+	sed -i \
+		-e 's:cardlayer/uml::' \
+		cardcomm/pkcs11/src/Makefile.am || die
+	sed -i \
+		-e 's:uml::' \
+		plugins_tools/eid-viewer/Makefile.am || die
+
 	eautoreconf
 }
 

diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 9d56a10ca2b..cce8d5f2d95 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -56,6 +56,14 @@ src_prepare() {
 	# See bug #751472
 	eapply "${FILESDIR}/use-printf-in-Makefile.patch"
 
+	# See bug #811270 (remove uml build)
+	sed -i \
+		-e 's:cardlayer/uml::' \
+		cardcomm/pkcs11/src/Makefile.am || die
+	sed -i \
+		-e 's:uml::' \
+		plugins_tools/eid-viewer/Makefile.am || die
+
 	eautoreconf
 }