gentoo resync : 25.08.2020

5 files changed, 26 insertions, 211 deletions

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index da31055d9802..86e0f6710010 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,9 +1,5 @@
 AUX eid-sign-test-4.4.19.patch 8320 BLAKE2B c2295a64a5353f79ea44703b7256f667b5c6dc21eb74b0cfb6945572d0323d751ca8104ae981ae83759267081b6a16509cde3e8f5ad35b1a6613855461880c18 SHA512 01efa77441982a631e717a1bf720155bd38144cbe9e5b9cc192bdfa7ea3966b787e31a25a7e3c7d560fec30b19edeb662f6ab1db2d68b0a5b996af3c91342ec4
-DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e SHA512 9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc
-DIST eid-mw-4.4.19.tar.gz 7941144 BLAKE2B c02f975081eacf7803839461ae91e3c6a24c3e2fc60064a981cc71f629925679b0df997e8acbe2da2f1e58dcc665b8633e3c9bf28b07be90ac8cdd0448e80848 SHA512 21530111461302123be662dd60f3fbd56ffd8a0537cac88c99d5a6bcd9163a27bc34e05beaf7502dd5ada247ca324d21590a866907b5a7a02ce3d8d78fcac634
-DIST eid-mw-4.4.23.tar.gz 7502185 BLAKE2B ab223c2d860f44806a6043a40891d89ab3418dd232bba1d60bd9b0b6871a77e6e24bc73c49afcffabc8ae7f16c235aabfb17efb8af7543b0e2bd3fe76ba655f7 SHA512 7c90d7ca08dcd2ba4d0c918b5ba6305da6107de457209acb9a0cc3243891c9b654b1c12fe4da53ec8bad65617198c0caffdb0482e343a8d807f00762e6672310
-EBUILD eid-mw-4.4.1.ebuild 2108 BLAKE2B 470147b6b68b7a07a6b8cde6be249ea31cd2398e19c1b0a907ed99bc9b4fb0483c3b20bd1a4c210c44d2579c21ade7d052c525d7424d8f07d1f9cf90f7399998 SHA512 6df5ec722a76b27ec6d7e5a4c376b56db319cddeae9b35a4f055171d2b82c808ee8992ca78ad62d33d1595cca3b4511638d6322c9613cd5e303c67ece89bd9a4
-EBUILD eid-mw-4.4.19.ebuild 2435 BLAKE2B a30208a4d272202e15fe06ad98a576659bfde03154a5777fe9e1735dae67cf8cd033bf473cd789154e58037a255e6833519baa1f07b7a5849b17312bbbcd9a14 SHA512 c5e88ddcb80365f9b12ad02c12023be271ee75cdea4053483b91a5bb1e41f1d32d25524a1577ed605de02e3764129fc7c52c2d1046832fc5a484e308b326680e
-EBUILD eid-mw-4.4.23.ebuild 2436 BLAKE2B e7e84d3a8438cfaa24136b3da49a540d959855de635cf18e90820af30fbf8800ac0894ae52aba3b4acf44770d2412cb809bfed47472a08f9203824979992b77f SHA512 fbe9c66ac6dc51f7b682c55d62c4a4f3fcebd50a29bb09295a9b5e72e69e728266961d8433fa7947ad6a2aec89fc4f504912112be43e62d9a10f8fe643473007
-EBUILD eid-mw-9999.ebuild 1834 BLAKE2B db2a93efedb7039567f01c7d9418b48e3b97957d7ee154b9dbd199f77e07e5f78fbd1994d556562672955aae464cb71dfb2a5d08e802c879dacab2eb2f887093 SHA512 2b3e97dd5010b73b737e79faf8ec40e787b91e626b11a15932bac5153d37267676c3d51f2e88880e96a1fa530442589a3340a35a1d8be4503c41eeaf19db7101
+DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b SHA512 c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1
+EBUILD eid-mw-4.4.27.ebuild 2531 BLAKE2B 405338910850fab6119b7deb09c0b494dc294a661538173307976cc556e906d64bbd2f7a058545ef35ae22b461334d8df03cb0e21443629b2653a955cfeee97e SHA512 71e909609ed65bb8160a32030a6fb3c550a09f3a1db06015cf224c7a5ca41a76de30cdbe1fe016c3839508503ab711e0c8926a147cf8de4569b221d8138e35f3
+EBUILD eid-mw-9999.ebuild 2002 BLAKE2B 344e1c3d8b55cb5b0c7395bc3e32cd210e47dc61042ecd3a91cb083d279ed812a706b0074e91e89b5832b472d1a5371894370991832dd7ccaca932f380395032 SHA512 f2ec99a3a7e493c9fc439051a27847991cd430ec9ad956162cc5840b027cd885d57b3d08d41f410c270aac3e5be0eba21282ea013bb8ddcfd3787d3a9e5fc464
 MISC metadata.xml 1445 BLAKE2B f402be7a768b67e34a736cdfaafc0df9f29301ba2d4b50f4ff27b9b08085826a67e452bb239893ef79d10eebb8981488cc71ca7f7015152783ad939e64df6d85 SHA512 b3934c2c2be9adc2f4d4d8ab654b8b21056bcbf29a67751ead9c8f1be4339a651a6d315c6ee1c182c3e8a32ad630c73f0990bd4fce4d34afa948055f0447ea98
diff --git a/app-crypt/eid-mw/eid-mw-4.4.1.ebuild b/app-crypt/eid-mw/eid-mw-4.4.1.ebuild
deleted file mode 100644
index f446179c580b..000000000000
--- a/app-crypt/eid-mw/eid-mw-4.4.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-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+:*
-		dev-libs/libxml2
-		net-misc/curl[ssl]
-		net-libs/libproxy
-		!app-misc/eid-viewer-bin
-	)
-	p11-kit? ( app-crypt/p11-kit )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="dialogs? ( gtk )"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-
-	# 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
-	sed -i \
-		-e '/^GITDESC/ d' \
-		-e '/^VERCLEAN/ d' \
-		scripts/build-aux/genver.sh
-
-	# legacy xpi module : we don't want it anymore
-	sed -i -e '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
-
-	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
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gtk; then
-		gnome2_schemas_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-crypt/eid-mw/eid-mw-4.4.19.ebuild b/app-crypt/eid-mw/eid-mw-4.4.19.ebuild
deleted file mode 100644
index a73a18dec69e..000000000000
--- a/app-crypt/eid-mw/eid-mw-4.4.19.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 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 +p11v220 p11-kit"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.2.9
-	gtk? (
-		x11-libs/gdk-pixbuf[jpeg]
-		x11-libs/gtk+:*
-		dev-libs/libxml2
-		net-misc/curl[ssl]
-		net-libs/libproxy
-		!app-misc/eid-viewer-bin
-	)
-	p11-kit? ( app-crypt/p11-kit )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="dialogs? ( gtk )"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-
-	# 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
-	sed -i \
-		-e '/^GITDESC/ d' \
-		-e '/^VERCLEAN/ d' \
-		scripts/build-aux/genver.sh
-
-	# legacy 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 #691308
-	eapply "${FILESDIR}/eid-sign-test-${PV}.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable dialogs) \
-		$(use_enable p11v220) \
-		$(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
-	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-4.4.23.ebuild b/app-crypt/eid-mw/eid-mw-4.4.27.ebuild
index 6dc98d418711..38d7672f996b 100644
--- a/app-crypt/eid-mw/eid-mw-4.4.23.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.4.27.ebuild
@@ -64,6 +64,11 @@ src_prepare() {
 	# See bug #691308
 	eapply "${FILESDIR}/eid-sign-test-4.4.19.patch"
 
+	# See bug #732994
+	sed -i \
+		-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
+		configure.ac || die
+
 	eautoreconf
 }
 
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 023f52ee56b0..c7f49603d0a1 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools gnome2-utils git-r3
+inherit autotools desktop gnome2-utils xdg-utils git-r3
 
 DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
 HOMEPAGE="https://eid.belgium.be"
@@ -16,7 +16,7 @@ IUSE="+dialogs +gtk +p11v220 p11-kit"
 RDEPEND=">=sys-apps/pcsc-lite-1.2.9
 	gtk? (
 		x11-libs/gdk-pixbuf[jpeg]
-		x11-libs/gtk+:*
+		x11-libs/gtk+:3
 		dev-libs/libxml2
 		net-misc/curl[ssl]
 		net-libs/libproxy
@@ -32,10 +32,7 @@ REQUIRED_USE="dialogs? ( gtk )"
 src_prepare() {
 	default
 
-	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
-	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-
-	# legacy xpi module : we don't want it anymore
+	# 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
 
@@ -46,6 +43,16 @@ src_prepare() {
 		-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
+
 	eautoreconf
 }
 
@@ -71,13 +78,15 @@ src_install() {
 pkg_postinst() {
 	if use gtk; then
 		gnome2_schemas_update
-		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
 	fi
 }
 
 pkg_postrm() {
 	if use gtk; then
 		gnome2_schemas_update
-		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
 	fi
 }