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

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

commit:     0cf87b70d683bb210882ef7f171bbd8b44123d63
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 20:50:57 2021 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Jan  3 20:54:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf87b70

app-crypt/eid-mw: version bump 5.0.11, fix bug #751472

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

Package-Manager: Portage-3.0.9, Repoman-2.3.23
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>

 app-crypt/eid-mw/Manifest                           |  1 +
 .../{eid-mw-9999.ebuild => eid-mw-5.0.11.ebuild}    | 15 ++++++++++++---
 app-crypt/eid-mw/eid-mw-9999.ebuild                 |  5 ++++-
 app-crypt/eid-mw/files/use-printf-in-Makefile.patch | 21 +++++++++++++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 466fd851283..43ea89c2253 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1,3 @@
 DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b SHA512 c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1
+DIST eid-mw-5.0.11.tar.gz 8928406 BLAKE2B 36358b758e1e865a7a99099f548b8e7acc045df73ab6290dc5ebf7e82c8b03566137340498e815cdb3458c63961233ef0e8530f75dfeed18e714b6fb4fcfbbcd SHA512 2753739797dbfe5b01c4538fca02f5a0833a3850a2b62cd4e7179a148b0459c9217311f44d1f03b9b9655187af7d90cbe53dd1e4a8318a0cba864d346f8c9324
 DIST eid-mw-5.0.8.tar.gz 8782476 BLAKE2B ece43bff5de108f4d92534aeda3d88c1109fbf54f99c4de0442c02958a9b0edef3e34d94015b9f3a865317d88c2bd21d1adbbf15010cd1fbd99787985190dee5 SHA512 dc9eaaec419082bc6e1f6cd11063c79c5aac0e7910027d9cbb34dbe8ede9d600c93b7b38a7e4491c5eb9a0068e537d78854b3fc3b2581d464dd4939185469e46

diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-5.0.11.ebuild
similarity index 83%
copy from app-crypt/eid-mw/eid-mw-9999.ebuild
copy to app-crypt/eid-mw/eid-mw-5.0.11.ebuild
index 19055f55bc5..b0e0654fd5b 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.0.11.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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 +p11v220 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
@@ -53,6 +59,9 @@ src_prepare() {
 		-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
 		configure.ac || die
 
+	# See bug #751472
+	eapply "${FILESDIR}/use-printf-in-Makefile.patch"
+
 	eautoreconf
 }
 

diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 19055f55bc5..5b107133261 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -53,6 +53,9 @@ src_prepare() {
 		-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
 		configure.ac || die
 
+	# See bug #751472
+	eapply "${FILESDIR}/use-printf-in-Makefile.patch"
+
 	eautoreconf
 }
 

diff --git a/app-crypt/eid-mw/files/use-printf-in-Makefile.patch b/app-crypt/eid-mw/files/use-printf-in-Makefile.patch
new file mode 100644
index 00000000000..5b4ef2adc07
--- /dev/null
+++ b/app-crypt/eid-mw/files/use-printf-in-Makefile.patch
@@ -0,0 +1,21 @@
+diff -ur a/plugins_tools/eid-viewer/Makefile.am b/plugins_tools/eid-viewer/Makefile.am
+--- a/plugins_tools/eid-viewer/Makefile.am	2020-08-19 15:32:50.000000000 +0200
++++ b/plugins_tools/eid-viewer/Makefile.am	2020-12-21 23:07:49.980421703 +0200
+@@ -125,13 +125,13 @@
+ SUBDIRS = . gtk/po test uml
+ 
+ resources/%.c: resources/%.png
+-	echo -e "#include <gdk-pixbuf/gdk-pixdata.h>\n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@
++	printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@
+ 	gdk-pixbuf-csource --struct --extern --name `basename $^ .png` $^ >> $@
+-	echo -e "#pragma GCC diagnostic pop\n" >> $@
++	printf '%s\n' '#pragma GCC diagnostic pop' >> $@
+ resources/%.c: resources/%.jpg
+-	echo -e "#include <gdk-pixbuf/gdk-pixdata.h>\n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@
++	printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@
+ 	gdk-pixbuf-csource --struct --extern --name `basename $^ .jpg` $^ >> $@
+-	echo -e "#pragma GCC diagnostic pop\n" >> $@
++	printf '%s\n' '#pragma GCC diagnostic pop' >> $@
+ 
+ BUILT_SOURCES = gtk/viewer_glade.h \
+ 		resources/coat_of_arms_nl.c \