commit: 7765a0573c8f6214bee764ef6c200d86017ba201 Author: Amy Liffey <amynka <AT> gentoo <DOT> org> AuthorDate: Mon Feb 12 11:46:20 2024 +0000 Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> CommitDate: Mon Feb 12 11:46:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7765a057
app-crypt/eid-mw: update 5.1.15 Closes: https://bugs.gentoo.org/923375 Submitted-by: Vincent Hardy <vincent.hardy.be <AT> gmail.com> Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> app-crypt/eid-mw/Manifest | 1 + .../{eid-mw-9999.ebuild => eid-mw-5.1.15.ebuild} | 22 +++++++++++++++++++--- app-crypt/eid-mw/eid-mw-9999.ebuild | 7 ++++++- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest index c331d5100830..4ec5af4820bf 100644 --- a/app-crypt/eid-mw/Manifest +++ b/app-crypt/eid-mw/Manifest @@ -1 +1,2 @@ DIST eid-mw-5.1.13.tar.gz 15369717 BLAKE2B 99c70445abddd85ae7df917380a91d64ccefb7e3b73db4d2a5887a1dfc7d54e575ca0df5cbccdab41ce7ffb0648d6cb6c456da4f65ae2b0f0c4844ed2d5b343e SHA512 b7c024163d1eedb3cf5558be130fbe7fb3045c31bda541ed3402ac11514308c2ed9dd692972c8ddbe81a4923f67fb8205f761a0834abf65927991dade30e4ea4 +DIST eid-mw-5.1.15.tar.gz 16296281 BLAKE2B 12efbc884ff250d5497ace6b9670e4dac934a8aa87e2e77d4c083d3e0325c7b0a57dd137506f62a6e3ada57459b5b23e7d5e0d86a80616a64e05948560ce265b SHA512 4cf352ba912db6252f864430bacc895d29b478d3ec13ef3716089e5cb6019b2db2de08a99775dcd71a4ac9f13f3e3c6e1013f36bb2d458bbb0e851f7b45451e5 diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-5.1.15.ebuild similarity index 80% copy from app-crypt/eid-mw/eid-mw-9999.ebuild copy to app-crypt/eid-mw/eid-mw-5.1.15.ebuild index 567bbb9a1cd9..1c782e3b1ce9 100644 --- a/app-crypt/eid-mw/eid-mw-9999.ebuild +++ b/app-crypt/eid-mw/eid-mw-5.1.15.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 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 @@ -65,6 +76,11 @@ src_prepare() { -e 's:uml::' \ plugins_tools/eid-viewer/Makefile.am || die + # See bug #923375 + sed -i \ + -e 's:C_Sign(NULL,:C_Sign(NULL_PTR,:' \ + tests/unit/sign_state.c || die + eautoreconf } diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild index 567bbb9a1cd9..f514363c71c1 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-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -65,6 +65,11 @@ src_prepare() { -e 's:uml::' \ plugins_tools/eid-viewer/Makefile.am || die + # See bug #923375 + sed -i \ + -e 's:C_Sign(NULL,:C_Sign(NULL_PTR,:' \ + tests/unit/sign_state.c || die + eautoreconf }
