3 files changed, 6 insertions, 121 deletions
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index b822bcda78fb..e452b632bc62 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,7 +1,5 @@
 AUX use-printf-in-Makefile.patch 1439 BLAKE2B 829b93431a8dddd957ef2deef60dfd3ff13fc2a0faab5c5327cea2f53ccc1bcc0e805166de93d2de8a52e8c344bdab64dae5671f238b49ecedebb657afca0823 SHA512 8207e9eb534fed58712b805df0e90bcf8406fe1c2907f91cd54500babcc49d0a72dc1d039d9fdb8077967058aaafb6c37336c1b0fcd041edfb3c4604c7cea4c2
-DIST eid-mw-5.0.28.tar.gz 13615312 BLAKE2B 1dbc39267688ad322059009ee0aecdd52e7133d3029285255d019819075249755153b7bf10acd775cee7fef86603de4440ff4e47338a28ff9a1ddfce79ff7adc SHA512 05705180f69cb68617660a793baf314486407557f40a223e474047e2f7f9ca8e125feb60f6b0cd47cba6e84653cfe02cdbf48c7169fe78b39b08ec621e3a7898
 DIST eid-mw-5.1.4.tar.gz 13646645 BLAKE2B 3d1ede2078e4293a082bbdc19b942f4aa5a71cf5b852edb68a18cfa78f2d5b53a609b1190bc9b81dc87938de4619e99c9d4b19b4980e62631910e30683bf983b SHA512 903ca2dd7566e760badfb9fb1ea40e7cada42173d7d8f3795c1df16643f082c1cb8dd1ee3cd9e031b6306ca2dd2118df179f547a6b1f5f1a7ba05a45f247cc1d
-EBUILD eid-mw-5.0.28.ebuild 2867 BLAKE2B 47131bfb0df05f30f2578d3b2544d6cd6fd1d48c371cb11ba50b6bdf069c3556decdfcd924c4afdceb9af587d72d53a113dbf7d291b142b6d40ef69e27fa4277 SHA512 5b4b983bb3243a8631fd9a2f103dc1c652db80917db9f4d11fa355951688477036d3832040b4ef66ae1092f6dd89a577c8ba963535c1524a46aeb42235239e1a
-EBUILD eid-mw-5.1.4.ebuild 2867 BLAKE2B eea4c01faa9f7adf4c3235d3c75170c77d03b58822f5562357aca25d1f5d7851f4f6df363f955a6e2049668b90656752ad80c1a450658b8531308c847649c683 SHA512 f5e03ed772c0d019993444f68837fa0d3bb5e67d2526206af9150b811ba73268e444a2cbb46487c765a08a2f54fff7df880ee660f573b0fd1eb0c40af52b1d4a
+EBUILD eid-mw-5.1.4-r1.ebuild 2986 BLAKE2B 265e9199172f9a5c32be76e673c4d74eba48b540121ca6d5504927c89791ff49aa31db0fb3b8d2a04a2eea3055d9c552a1737f820f9b849e3303637b04df58ce SHA512 7474c3774a91844114f4fb10185b2902f77d2c1fcfa472b06d3c181d4259db2c5f671b0e4a383ead581d9c4fb3eb6bc638b391f4e0880d080b446faa39d7d179
 EBUILD eid-mw-9999.ebuild 2633 BLAKE2B 0d109c1acd44750de8a2444f995e8a675a50ec59d5c04c81b0eec97add7ed7ec3b3f5f493ca036cb332b3193f19e9d3e560c0fdabfb45fc64701eb84e38b6dca SHA512 483d80741db63a07e965151884e58902f8bdf7947f4f4c27274417048a2514220b5e2386253629fede31be56a7d3ba0b69c9e30bac255f4e9c9cc3eeb8cef2e6
 MISC metadata.xml 1436 BLAKE2B 0c727b14a272275fbd9f898f4254500aa16653dadd5929d3d27cd1f50d576b4782b0817b3cf2a66b1d1b3dd7f0b0468e71a3cdce8dcc5d0a70a81e5bbd8698a5 SHA512 3c1a21c95620c845ac722b9b6b8574d50bdca3e0525fe5058bcc316949d95a9fb14e990b1d19d71db6cef40156a2e40dc1125f074a1f6b8c93bd13ff26755c09
diff --git a/app-crypt/eid-mw/eid-mw-5.0.28.ebuild b/app-crypt/eid-mw/eid-mw-5.0.28.ebuild
deleted file mode 100644
index 97045c329e89..000000000000
--- a/app-crypt/eid-mw/eid-mw-5.0.28.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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
-
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
-HOMEPAGE="https://eid.belgium.be"
-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
-	gtk? (
-		x11-libs/gdk-pixbuf[jpeg]
-		x11-libs/gtk+:3
-		dev-libs/libxml2
-		net-misc/curl[ssl]
-		net-libs/libproxy
-		>=app-crypt/pinentry-1.1.0-r4[gtk]
-	)
-	p11-kit? ( app-crypt/p11-kit )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-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
-
-	# hardcoded lsb_info
-	sed -i \
-		-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
-		-e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
-		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
-		plugins_tools/aboutmw/gtk/about-main.c || die
-
-	# Fix libdir for pkcs11_manifestdir
-	sed -i \
-		-e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
-		cardcomm/pkcs11/src/Makefile.am || die
-
-	# See bug #732994
-	sed -i \
-		-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
-		configure.ac || die
-
-	# 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
-}
-
-src_configure() {
-	econf \
-		$(use_enable dialogs) \
-		$(use_enable p11-kit p11kit) \
-		$(use_with gtk gtkvers 'detect') \
-		--with-gnu-ld \
-		--disable-static
-}
-
-src_install() {
-	default
-	rm -r "${ED}"/usr/$(get_libdir)/*.la || die
-	if use gtk; then
-		domenu plugins_tools/eid-viewer/eid-viewer.desktop
-		doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
-	fi
-}
-
-pkg_postinst() {
-	if use gtk; then
-		gnome2_schemas_update
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-
-		local peimpl=$(eselect --brief --colour=no pinentry show)
-		case "${peimpl}" in
-		*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-gnome3 as default pinentry provider:"
-			ewarn " # eselect pinentry set pinentry-gnome3"
-		;;
-		esac
-	fi
-}
-
-pkg_postrm() {
-	if use gtk; then
-		gnome2_schemas_update
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
diff --git a/app-crypt/eid-mw/eid-mw-5.1.4.ebuild b/app-crypt/eid-mw/eid-mw-5.1.4-r1.ebuild
index cb218b605e07..0d4cefdf0e1d 100644
--- a/app-crypt/eid-mw/eid-mw-5.1.4.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.1.4-r1.ebuild
@@ -38,6 +38,11 @@ src_prepare() {
 	# 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