commit: 7f9ea004e09fbf082532931934f87a6e8e0493bf Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> AuthorDate: Sat Nov 14 14:58:33 2015 +0000 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> CommitDate: Sat Nov 14 14:59:28 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9ea004
app-crypt/eid-mw: revise and correct patches Patches apply to versions 4.1.4, 4.1.9 and the live ebuild, supplied by proxy maintainer sourced from the gentoo bug Gentoo bug: #564582 Package-Manager: portage-2.2.24 app-crypt/eid-mw/eid-mw-4.1.4.ebuild | 2 +- app-crypt/eid-mw/eid-mw-4.1.9.ebuild | 2 +- app-crypt/eid-mw/eid-mw-9999.ebuild | 4 +- .../eid-mw/files/gtk_not_required_4.1.4.patch | 48 ++++++++++------------ app-crypt/eid-mw/files/gtk_not_required_9999.patch | 36 ++++++++++++---- 5 files changed, 54 insertions(+), 38 deletions(-) diff --git a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild index 5b16967..0e40e87 100644 --- a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild +++ b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild @@ -20,7 +20,7 @@ fi SLOT="0" LICENSE="LGPL-3" -DESCRIPTION="Belgian Electronic Identity Card middleware by the Belgian Federal Government" +DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government" HOMEPAGE="http://eid.belgium.be"; diff --git a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild index 6055c30..f748be3 100644 --- a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild +++ b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild @@ -20,7 +20,7 @@ fi SLOT="0" LICENSE="LGPL-3" -DESCRIPTION="Belgian Electronic Identity Card middleware by the Belgian Federal Government" +DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government" HOMEPAGE="http://eid.belgium.be"; diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild index b6a8553..2424341 100644 --- a/app-crypt/eid-mw/eid-mw-9999.ebuild +++ b/app-crypt/eid-mw/eid-mw-9999.ebuild @@ -20,7 +20,7 @@ fi SLOT="0" LICENSE="LGPL-3" -DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government" +DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government" HOMEPAGE="http://eid.belgium.be"; @@ -39,7 +39,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { - use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch + use gtk || epatch "${FILESDIR}"/gtk_not_required_9999.patch if [[ ${PV} == "9999" ]] ; then # Only in current git. Hopefully, in next release. diff --git a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch index ba4d4b1..137ef8e 100644 --- a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch +++ b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch @@ -1,24 +1,11 @@ -diff --git a/Makefile.am b/Makefile.am -index 1a605f7..6475886 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,7 @@ - ACLOCAL_AMFLAGS = -I scripts/m4 - EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc - --SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk -+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 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 b70e7f2..ac38944 100644 ---- a/cardcomm/pkcs11/src/Makefile.am -+++ b/cardcomm/pkcs11/src/Makefile.am -@@ -165,30 +165,4 @@ libbeidpkcs11_la_SOURCES += \ +diff -ur eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am +--- eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am 2015-07-27 10:30:34.638418958 +0200 ++++ eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am 2015-08-13 14:12:43.827586821 +0200 +@@ -164,29 +164,3 @@ + dialogs/dialogsgtk/dlgs_gtk.cpp \ dialogs/dialogsgtk/single_dialog.c endif - +- -libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin - -beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c @@ -44,13 +31,10 @@ index b70e7f2..ac38944 100644 -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 102c1c7..efdf0e2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -56,11 +56,6 @@ then +diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac eid-mw-4.1.4-v4.1.4-b/configure.ac +--- eid-mw-4.1.4-v4.1.4-a/configure.ac 2015-07-27 10:30:34.641752294 +0200 ++++ eid-mw-4.1.4-v4.1.4-b/configure.ac 2015-08-13 14:13:51.456736608 +0200 +@@ -55,11 +55,6 @@ fi fi @@ -62,3 +46,15 @@ index 102c1c7..efdf0e2 100644 ########################################################################### ####### read user-specific requests from --enable directives ###### ########################################################################### +diff -ur eid-mw-4.1.4-v4.1.4-a/Makefile.am eid-mw-4.1.4-v4.1.4-b/Makefile.am +--- eid-mw-4.1.4-v4.1.4-a/Makefile.am 2015-07-27 10:30:34.638418958 +0200 ++++ eid-mw-4.1.4-v4.1.4-b/Makefile.am 2015-08-13 14:11:43.878340486 +0200 +@@ -1,7 +1,7 @@ + ACLOCAL_AMFLAGS = -I scripts/m4 + EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc + +-SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk ++SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi + + xpipackage: + $(MAKE) -C plugins_tools/xpi xpipackage diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch index ba4d4b1..93ddc67 100644 --- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch +++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch @@ -12,31 +12,48 @@ index 1a605f7..6475886 100644 xpipackage: $(MAKE) -C plugins_tools/xpi xpipackage diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am -index b70e7f2..ac38944 100644 +index b70e7f2..066c348 100644 --- a/cardcomm/pkcs11/src/Makefile.am +++ b/cardcomm/pkcs11/src/Makefile.am -@@ -165,30 +165,4 @@ libbeidpkcs11_la_SOURCES += \ +@@ -165,30 +165,30 @@ 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 -- ++#libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin + -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_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_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_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_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_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@ @@ -44,7 +61,10 @@ index b70e7f2..ac38944 100644 -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@ -- ++#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 102c1c7..efdf0e2 100644
