[gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/

["Amy Liffey" <amynka@gentoo.org>]

commit:     e90698c633420aeeffe3b365383b189f2d771838
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 08:10:35 2017 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 08:15:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90698c6

app-crypt/eid-mw: update live ebuild. Vincent Hardy

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-crypt/eid-mw/eid-mw-9999.ebuild                |  7 +-
 app-crypt/eid-mw/files/gtk_not_required_9999.patch | 75 ----------------------
 2 files changed, 1 insertion(+), 81 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 0f64029e0d8..4ccf556d280 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -56,12 +56,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
 }
 
@@ -69,6 +63,7 @@ src_configure() {
 	econf \
 		$(use_enable dialogs) \
 		$(use_enable p11-kit p11kit) \
+		$(use_with gtk gtkvers)$(use gtk && echo =detect) \
 		--with-gnu-ld \
 		--disable-static \
 		--disable-signed

diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
deleted file mode 100644
index a1680c2353d..00000000000
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 393ecb3..0e14661 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh .version 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 02e4e36..86d607b 100644
---- a/cardcomm/pkcs11/src/Makefile.am
-+++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,7 +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
-@@ -176,30 +175,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@ -DDATAROOTDIR='"$(datarootdir)"'
--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@ -DDATAROOTDIR='"$(datarootdir)"'
--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@ -DDATAROOTDIR='"$(datarootdir)"'
--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@ -DDATAROOTDIR='"$(datarootdir)"'
--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@ -DDATAROOTDIR='"$(datarootdir)"'
--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@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_spr_changepin_LDADD = @GTK_LIBS@
--
- pkgconfig_DATA=libbeidpkcs11.pc
--
--SUBDIRS = dialogs/dialogsgtk/po
-diff --git a/configure.ac b/configure.ac
-index 9bf10f9..f0120b1 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         ######
- ###########################################################################