gentoo resync : 16.01.2018

3 files changed, 0 insertions, 75 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 080ef986b9e0..4670a45df93d 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 3911cc8290f9..fe149ee10310 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,5 +1,4 @@
 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.5.tar.gz 7751526 BLAKE2B 4836dc3a5ba4d781b8c342231cbbe74411fc6f0bf4b32eaa42ac28ea7688815361f74a1def371a05e250d3249af7ff58d24a66062fe169717872d6789ffb54f1 SHA512 cf00f6aa295c3d057e77faddde31ba6b00ce44402bc0ad141c773fb58067d7cf2e107fc5f3a294be8731de592cb0895537cd29ad4e69f6721e6c77fa99c12075
 DIST eid-mw-4.2.8.tar.gz 7076407 BLAKE2B e1d9b375adb326cb710da9eb5cd125086cb40b6ee37ce2ac3912ac4b5fa9c92d66c8af002a47c9ce73ff98ad2306e96529e1c87486eb0f36e61a1f4eb2231b9f SHA512 bf910e8b5bad40fe65765524af20cf18e2c615b6b7bddfdd3024309d90767952875f1c264ea8bd8dfc73621a41683fce02501febe71c016816ccc0f75d88d8cb
diff --git a/app-crypt/eid-mw/files/gtk_not_required_4_2.patch b/app-crypt/eid-mw/files/gtk_not_required_4_2.patch
deleted file mode 100644
index 7990acaebdd2..000000000000
--- a/app-crypt/eid-mw/files/gtk_not_required_4_2.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index de5416f..8e55277 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath  debian rpm doc
- 
--SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi 
- 
- xpipackage:
- 	$(MAKE) -C plugins_tools/xpi xpipackage
-diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index 6e33315..fce4494 100644
---- a/cardcomm/pkcs11/src/Makefile.am
-+++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,8 +165,6 @@ libbeidpkcs11_la_SOURCES += \
- 	dialogs/dialogsgtk/single_dialog.c
- endif
- 
--libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
--
- if P11KIT
- dist_p11kitcf_DATA = beid.module
- install-exec-hook:
-@@ -176,28 +174,4 @@ install-exec-hook:
- 		$(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
- endif
- 
--beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
--beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
--beid_askpin_LDADD = @GTK_LIBS@
--
--beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
--beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_changepin_LDADD = @GTK_LIBS@
--
--beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
--beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_badpin_LDADD = @GTK_LIBS@
--
--beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
--beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_askaccess_LDADD = @GTK_LIBS@
--
--beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
--beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_spr_askpin_LDADD = @GTK_LIBS@
--
--beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
--beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_spr_changepin_LDADD = @GTK_LIBS@
--
- pkgconfig_DATA=libbeidpkcs11.pc
-diff --git a/configure.ac b/configure.ac
-index 92bbb3b..a47e7c2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -59,14 +59,6 @@ fi
- 
- AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
- 
--if test "$have_gtk" = "no"
--then
--	AC_MSG_ERROR([At least one version of GTK is required.])
--fi
--
--PKG_CHECK_MODULES([XML2], [libxml-2.0])
--PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
--
- ###########################################################################
- ####### read user-specific requests from --enable directives         ######
- ###########################################################################