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

["Ian Delaney" <idella4@gentoo.org>]

commit:     5785246ea4ed856768181f6bbc5550be6950ef2d
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  8 07:38:05 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Nov  9 02:54:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5785246e

app-crypt/eid-mw: add gtk_not_required_4.1.4.patch addressing issue in gentoo bug

Submitted by proxy maintainer via the gentoo bug

Gentoo bug: #564582

Package-Manager: portage-2.2.23

 app-crypt/eid-mw/eid-mw-9999.ebuild                |  4 +-
 .../eid-mw/files/gtk_not_required_4.1.4.patch      | 48 ++++++++++++----------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 06e154c..b6a8553 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	MY_P="${P}-v${PV}"
-	SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz -> ${MY_P}.tar.gz"
+	SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz"
 	KEYWORDS="~x86 ~amd64 ~arm"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch
+	use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.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 137ef8e..ba4d4b1 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,11 +1,24 @@
-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 \
+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 += \
  	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
@@ -31,10 +44,13 @@ diff -ur eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am eid-mw-4.1.4-v4.1
 -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@
-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 @@
+-
+ 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
  	fi
  fi
  
@@ -46,15 +62,3 @@ diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac eid-mw-4.1.4-v4.1.4-b/configure.ac
  ###########################################################################
  ####### 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