gentoo resync : 13.01.2018

3 files changed, 70 insertions, 60 deletions

diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 1c3463436e8b..3911cc8290f9 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,11 +1,11 @@
 AUX fix_libressl_check.patch 1623 BLAKE2B da42629b930ecb956f8cc48b60ccbf4fe2f250cbd66a6cc93e0bf88bbd634c3d7bb8be40f1c9f19d011aadebc5cba60f3ca6fcbbaf2a7312d7daaa0e56e9c302 SHA512 0d834c62623e312b37e5908dbe6738efc726ae036bb7576cd25cb88156519dee17e35711ae4d583aeb4ea17e7220ff3210334c78d1e314fa0b972025250194fd
 AUX gtk_not_required_4_2.patch 3247 BLAKE2B d96e525bb14de06231e9bf5f124c52bf7db21ebef272d20356e7160940a168e35db241fb2ecbe97e49a550c455dfe8827d80f151934e8a3c6a4e27d0385aab3c SHA512 32e2da278c1fc8fdaf479a575daf65a1a3ed49475568556fba91cdca081b39fe6e7533f98aba4774f7eb00a04911fec3cf55fb2a75c57465d992801d3a4ee11f
 AUX gtk_not_required_4_2_5.patch 3495 BLAKE2B fa99e1ad8695795dd1c8d1a1fc0041fa7138d82fee98d98ef359141dc03d18cbeeaae4f1ad151f19b15ed1de37c387aeadcb3d69b6f79791a650e243faf2710d SHA512 9c5e1b614bb4230b67e1c11fed3693c1aae0b982ca7c5a26678ee6af7da48d0ef2eef479335d498ea5f75408a2a957763a611367aa39585c50ed2556aa09232b
-DIST eid-mw-4.2.0.tar.gz 8508064 BLAKE2B bccca84b2ec08e4237816f61c0f2416325f4c34c66756f87c72208f5b79ebafffe91062f9fd3109562f0150793c1b849a5b57bd08533fbf4a8d0e78441131435 SHA512 c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f
 DIST eid-mw-4.2.5.tar.gz 7751526 BLAKE2B 4836dc3a5ba4d781b8c342231cbbe74411fc6f0bf4b32eaa42ac28ea7688815361f74a1def371a05e250d3249af7ff58d24a66062fe169717872d6789ffb54f1 SHA512 cf00f6aa295c3d057e77faddde31ba6b00ce44402bc0ad141c773fb58067d7cf2e107fc5f3a294be8731de592cb0895537cd29ad4e69f6721e6c77fa99c12075
 DIST eid-mw-4.2.8.tar.gz 7076407 BLAKE2B e1d9b375adb326cb710da9eb5cd125086cb40b6ee37ce2ac3912ac4b5fa9c92d66c8af002a47c9ce73ff98ad2306e96529e1c87486eb0f36e61a1f4eb2231b9f SHA512 bf910e8b5bad40fe65765524af20cf18e2c615b6b7bddfdd3024309d90767952875f1c264ea8bd8dfc73621a41683fce02501febe71c016816ccc0f75d88d8cb
-EBUILD eid-mw-4.2.0.ebuild 2490 BLAKE2B 0ab93c439d494ff10765ad22bf5ea3e81a6d6999ecd3ed8b70dd5a6dc8088181edcb6324e4344b3191fc39292926f5b0db6289f1de7e2ce6bf9ca55f1cd0b74a SHA512 77e4b91adaae7953444ad2d6ec196978d29c06261ff0ab0a29eba330986adfb77e11fc48e826b3e35b928b60e46d24f93f1907692f80573a22b1e57c14ecbf5e
+DIST eid-mw-4.3.6.tar.gz 7515482 BLAKE2B 8895564736be83ad2f9797a6cfcbc6cb50a928c36508b9ddcf8e9032d7b4de9284745d711a7664edba106ad005a63eb1fddb5c1e639305b4af12f49ab8dbc61c SHA512 336181c21896bec0e7a0a67f5bc739fdc63ca7b17eb6fefa98b6d468810fcdb52ecb6a64f267cdcfc063a2ef599d033064ec90b6bb41ec7ceccc2ca8e829a82b
 EBUILD eid-mw-4.2.5.ebuild 2492 BLAKE2B 0db010e2fd0b62aac2d65baa55c3d83f1e4e2f59ddf7905f6b0ffb199c345c94119161d15947637439479b274e859d5e21e926ccb1745bcb37b1f554a489ad0f SHA512 6b8c30204dccfed98dcbd77d914503691579788b86d45803a8c43b18c77a3aea71cb41f320db344cb054d3ea02b11d356d59199f79d1b38ff303c054693c041a
 EBUILD eid-mw-4.2.8.ebuild 2433 BLAKE2B e0aeb4a498db7c2cc7c4644506a4f1dba21ce1c459f7ed1f0ad698927a437e7284cde130e26539b12e1ede36785b749280f38ba0ee89ca80a62e7001580dbac7 SHA512 b1157739db92af6d0b69fd373104578e4e40b13713e37f24600113fcb6ad710e151450a1207c4a18b7c1dfaaccb4317171d2fc1ea02c4b3042a37adc9a0ca589
-EBUILD eid-mw-9999.ebuild 2386 BLAKE2B 84563d7efffcda2b6d9eb7d4cce5ae1c9110f294413bcde7bb9ae6715d7cacde275ecb7e3f5acc32f9a17d74f25be19ffd8e254f82401a535bd11a7b7ab81b0f SHA512 5874bbc8ada17f8e0e6a5a48e9af15c56274fcc544fddb9ca3180bda83f72b0931309f12be6faa8ed670baf14b40d518a5b7d3b45ffa6df6e95dd426cfad90c9
+EBUILD eid-mw-4.3.6.ebuild 2386 BLAKE2B fabacdb4f311a8772f59a3475ad77df9ebe17ab741d5edeffb4ff25d6525cf302b98dbd47d2334d4e88c055e5d88fd0e3d8663d0b94483326c33ed2014f00256 SHA512 e8076f40b1a448d375287f9532aa2ce76783e72666272971c0b83e3f2aee2c826b9f15d4d67813a440137d5a6a1022dc942061459a1df37d5051a16e87efc402
+EBUILD eid-mw-9999.ebuild 2510 BLAKE2B 225ad487b6b273c71c6d1e2696c91b297655b3ed673a64840eea24e65cb702438c852fef822a5146609e1c587268daeb8e189f60bda9e5f0bcc87457b43e530f SHA512 6c936aff892d9e25ca4d0aef462a446599e63663a033c82b703a7f0c1ae5f4bd2205c74681923589964fc5bb51b3ad6b09d4a81b3e5831697115238ac7582cf1
 MISC metadata.xml 1464 BLAKE2B 6f179b170658fc6b084e4ef8c6a89443b1dc39307b9d52083214d75fdb386ec3c3c9f0a6522e6a52eb6c33c792216db27115f017eff6ad922254d1ffcb671c0b SHA512 ed78298a9b246f9f8f9591dbb9fe54ab311d525db86166bcf66574c9e365f1476234d5bac3180226dfbdb5c4014dd5dae4598b670cd7c6c9538282940a0fa9eb
diff --git a/app-crypt/eid-mw/eid-mw-4.2.0.ebuild b/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
index 3ca653162f92..b75d2070e209 100644
--- a/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.3.6.ebuild
@@ -1,32 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils autotools mozextension
+inherit autotools mozextension gnome2-utils
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Fedict/${PN}.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} ->
-	${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64 ~arm"
-fi
-
-SLOT="0"
-LICENSE="LGPL-3"
 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="~x86 ~amd64 ~arm"
 IUSE="+dialogs +gtk p11-kit +xpi"
 
-REQUIRED_USE="
-	dialogs? ( gtk )"
-
-RDEPEND="gtk? (
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9
+	gtk? (
 		x11-libs/gdk-pixbuf[jpeg]
 		x11-libs/gtk+:*
 		dev-libs/libxml2
@@ -34,7 +23,6 @@ RDEPEND="gtk? (
 		net-libs/libproxy
 		!app-misc/eid-viewer-bin
 	)
-	>=sys-apps/pcsc-lite-1.2.9
 	p11-kit? ( app-crypt/p11-kit )
 	xpi? ( || ( >=www-client/firefox-bin-3.6.24
 		>=www-client/firefox-3.6.20 ) )"
@@ -42,8 +30,10 @@ RDEPEND="gtk? (
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+REQUIRED_USE="dialogs? ( gtk )"
+
 src_prepare() {
-	eapply_user
+	default
 
 	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
 	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
@@ -55,12 +45,6 @@ src_prepare() {
 		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
 		plugins_tools/aboutmw/gtk/about-main.c || die
 
-	if [[ ${PV} == "9999" ]] ; then
-		use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch
-	else
-		use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch
-	fi
-
 	eautoreconf
 }
 
@@ -68,30 +52,45 @@ src_configure() {
 	econf \
 		$(use_enable dialogs) \
 		$(use_enable p11-kit p11kit) \
+		$(use_with gtk gtkvers 'detect') \
 		--with-gnu-ld \
 		--disable-static \
 		--disable-signed
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	if use xpi; then
 		declare MOZILLA_FIVE_HOME
 		if has_version '>=www-client/firefox-3.6.20'; then
 			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+			xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
 		fi
 		if has_version '>=www-client/firefox-bin-3.6.24'; then
 			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+			xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
 		fi
+	else
+		rm -r "${ED}"/usr/$(get_libdir)/mozilla || die
+	fi
+	rm -r "${ED}/usr/share/mozilla" "${ED}"/usr/$(get_libdir)/*.la || die
+
+	if use gtk; then
+		rm -r "${ED}/usr/include/eid-util" || die
 	fi
-	rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
-	use gtk || rm -r "${D}/usr/include/eid-util" || die
 }
 
-pkg_postinst()
-{
-	use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
+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-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 4b7c9eadb75d..2b7c0eb2f88f 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,32 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils autotools mozextension multilib
+inherit autotools mozextension gnome2-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Fedict/${PN}.git"
 	inherit git-r3
 	SRC_URI=""
 else
-	SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} ->
-	${P}.tar.gz"
+	SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
 	KEYWORDS="~x86 ~amd64 ~arm"
 fi
 
-SLOT="0"
-LICENSE="LGPL-3"
 DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
-
 HOMEPAGE="https://eid.belgium.be"
 
+LICENSE="LGPL-3"
+SLOT="0"
 IUSE="+dialogs +gtk p11-kit +xpi"
 
-REQUIRED_USE="
-	dialogs? ( gtk )"
-
-RDEPEND="gtk? (
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9
+	gtk? (
 		x11-libs/gdk-pixbuf[jpeg]
 		x11-libs/gtk+:*
 		dev-libs/libxml2
@@ -34,7 +30,6 @@ RDEPEND="gtk? (
 		net-libs/libproxy
 		!app-misc/eid-viewer-bin
 	)
-	>=sys-apps/pcsc-lite-1.2.9
 	p11-kit? ( app-crypt/p11-kit )
 	xpi? ( || ( >=www-client/firefox-bin-3.6.24
 		>=www-client/firefox-3.6.20 ) )"
@@ -42,8 +37,10 @@ RDEPEND="gtk? (
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+REQUIRED_USE="dialogs? ( gtk )"
+
 src_prepare() {
-	eapply_user
+	default
 
 	sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
 	sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
@@ -62,31 +59,45 @@ src_configure() {
 	econf \
 		$(use_enable dialogs) \
 		$(use_enable p11-kit p11kit) \
-		$(use_with gtk gtkvers)$(use gtk && echo =detect) \
+		$(use_with gtk gtkvers 'detect') \
 		--with-gnu-ld \
 		--disable-static \
 		--disable-signed
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	if use xpi; then
 		declare MOZILLA_FIVE_HOME
 		if has_version '>=www-client/firefox-3.6.20'; then
 			MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
-			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+			xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
 		fi
 		if has_version '>=www-client/firefox-bin-3.6.24'; then
 			MOZILLA_FIVE_HOME="/opt/firefox"
-			xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+			xpi_install "${ED}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
 		fi
+	else
+		rm -r "${ED}"/usr/$(get_libdir)/mozilla || die
+	fi
+	rm -r "${ED}/usr/share/mozilla" "${ED}"/usr/$(get_libdir)/*.la || die
+
+	if use gtk; then
+		rm -r "${ED}/usr/include/eid-util" || die
+	fi
+}
+
+pkg_postinst(){
+	if use gtk; then
+		gnome2_schemas_update
+		gnome2_icon_cache_update
 	fi
-	rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
-	use gtk || rm -r "${D}/usr/include/eid-util" || die
 }
 
-pkg_postinst()
-{
-	use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
+pkg_postrm(){
+	if use gtk; then
+		gnome2_schemas_update
+		gnome2_icon_cache_update
+	fi
 }