| 1 |
commit: e90698c633420aeeffe3b365383b189f2d771838 |
| 2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 28 08:10:35 2017 +0000 |
| 4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 28 08:15:08 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90698c6 |
| 7 |
|
| 8 |
app-crypt/eid-mw: update live ebuild. Vincent Hardy |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
app-crypt/eid-mw/eid-mw-9999.ebuild | 7 +- |
| 13 |
app-crypt/eid-mw/files/gtk_not_required_9999.patch | 75 ---------------------- |
| 14 |
2 files changed, 1 insertion(+), 81 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild |
| 17 |
index 0f64029e0d8..4ccf556d280 100644 |
| 18 |
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild |
| 19 |
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild |
| 20 |
@@ -56,12 +56,6 @@ src_prepare() { |
| 21 |
-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \ |
| 22 |
plugins_tools/aboutmw/gtk/about-main.c || die |
| 23 |
|
| 24 |
- if [[ ${PV} == "9999" ]] ; then |
| 25 |
- use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch |
| 26 |
- else |
| 27 |
- use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch |
| 28 |
- fi |
| 29 |
- |
| 30 |
eautoreconf |
| 31 |
} |
| 32 |
|
| 33 |
@@ -69,6 +63,7 @@ src_configure() { |
| 34 |
econf \ |
| 35 |
$(use_enable dialogs) \ |
| 36 |
$(use_enable p11-kit p11kit) \ |
| 37 |
+ $(use_with gtk gtkvers)$(use gtk && echo =detect) \ |
| 38 |
--with-gnu-ld \ |
| 39 |
--disable-static \ |
| 40 |
--disable-signed |
| 41 |
|
| 42 |
diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch |
| 43 |
deleted file mode 100644 |
| 44 |
index a1680c2353d..00000000000 |
| 45 |
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch |
| 46 |
+++ /dev/null |
| 47 |
@@ -1,75 +0,0 @@ |
| 48 |
-diff --git a/Makefile.am b/Makefile.am |
| 49 |
-index 393ecb3..0e14661 100644 |
| 50 |
---- a/Makefile.am |
| 51 |
-+++ b/Makefile.am |
| 52 |
-@@ -1,7 +1,7 @@ |
| 53 |
- ACLOCAL_AMFLAGS = -I scripts/m4 |
| 54 |
- EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh .version debian rpm doc |
| 55 |
- |
| 56 |
--SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer |
| 57 |
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi |
| 58 |
- |
| 59 |
- xpipackage: |
| 60 |
- $(MAKE) -C plugins_tools/xpi xpipackage |
| 61 |
-diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am |
| 62 |
-index 02e4e36..86d607b 100644 |
| 63 |
---- a/cardcomm/pkcs11/src/Makefile.am |
| 64 |
-+++ b/cardcomm/pkcs11/src/Makefile.am |
| 65 |
-@@ -165,7 +165,6 @@ libbeidpkcs11_la_SOURCES += \ |
| 66 |
- dialogs/dialogsgtk/single_dialog.c |
| 67 |
- endif |
| 68 |
- |
| 69 |
--libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin |
| 70 |
- |
| 71 |
- if P11KIT |
| 72 |
- dist_p11kitcf_DATA = beid.module |
| 73 |
-@@ -176,30 +175,4 @@ install-exec-hook: |
| 74 |
- $(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so |
| 75 |
- endif |
| 76 |
- |
| 77 |
--beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c |
| 78 |
--beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
| 79 |
--beid_askpin_LDADD = @GTK_LIBS@ |
| 80 |
-- |
| 81 |
--beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c |
| 82 |
--beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
| 83 |
--beid_changepin_LDADD = @GTK_LIBS@ |
| 84 |
-- |
| 85 |
--beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c |
| 86 |
--beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
| 87 |
--beid_badpin_LDADD = @GTK_LIBS@ |
| 88 |
-- |
| 89 |
--beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c |
| 90 |
--beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
| 91 |
--beid_askaccess_LDADD = @GTK_LIBS@ |
| 92 |
-- |
| 93 |
--beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c |
| 94 |
--beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
| 95 |
--beid_spr_askpin_LDADD = @GTK_LIBS@ |
| 96 |
-- |
| 97 |
--beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c |
| 98 |
--beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
| 99 |
--beid_spr_changepin_LDADD = @GTK_LIBS@ |
| 100 |
-- |
| 101 |
- pkgconfig_DATA=libbeidpkcs11.pc |
| 102 |
-- |
| 103 |
--SUBDIRS = dialogs/dialogsgtk/po |
| 104 |
-diff --git a/configure.ac b/configure.ac |
| 105 |
-index 9bf10f9..f0120b1 100644 |
| 106 |
---- a/configure.ac |
| 107 |
-+++ b/configure.ac |
| 108 |
-@@ -59,14 +59,6 @@ fi |
| 109 |
- |
| 110 |
- AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk]) |
| 111 |
- |
| 112 |
--if test "$have_gtk" = "no" |
| 113 |
--then |
| 114 |
-- AC_MSG_ERROR([At least one version of GTK is required.]) |
| 115 |
--fi |
| 116 |
-- |
| 117 |
--PKG_CHECK_MODULES([XML2], [libxml-2.0]) |
| 118 |
--PKG_CHECK_MODULES([libproxy], [libproxy-1.0]) |
| 119 |
-- |
| 120 |
- ########################################################################### |
| 121 |
- ####### read user-specific requests from --enable directives ###### |
| 122 |
- ########################################################################### |
Archives