From 1bfbafda280c28e50b577c835d9fdb42376d1021 Mon Sep 17 00:00:00 2001 From: Sven Vermeulen Date: Sun, 16 Aug 2015 20:10:57 +0200 Subject: app-crypt/eid-mw: Version bump to 4.1.4 As provided by Vincent Hardy, this brings eid-mw to version 4.1.4 Gentoo-Bug: 557604 Package-Manager: portage-2.2.20.1 --- app-crypt/eid-mw/Manifest | 1 + app-crypt/eid-mw/eid-mw-4.1.4.ebuild | 79 ++++++++++++++++++++++ .../eid-mw/files/gtk_not_required_4.1.4.patch | 60 ++++++++++++++++ 3 files changed, 140 insertions(+) create mode 100644 app-crypt/eid-mw/eid-mw-4.1.4.ebuild create mode 100644 app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch (limited to 'app-crypt') diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest index b5b1c58bfc28..9f67898ee6e7 100644 --- a/app-crypt/eid-mw/Manifest +++ b/app-crypt/eid-mw/Manifest @@ -1,2 +1,3 @@ DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b WHIRLPOOL cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22 DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104 WHIRLPOOL b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867 +DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398 diff --git a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild new file mode 100644 index 000000000000..06e154cbea82 --- /dev/null +++ b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils autotools mozextension multilib + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://github.com/Fedict/${PN}.git + https://github.com/Fedict/${PN}.git" + inherit git-2 + 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" + KEYWORDS="~x86 ~amd64 ~arm" + S="${WORKDIR}/${MY_P}" +fi + +SLOT="0" +LICENSE="LGPL-3" +DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government" + +HOMEPAGE="http://eid.belgium.be" + +IUSE="+gtk +xpi +dialogs" + +REQUIRED_USE=" + dialogs? ( gtk )" + +RDEPEND="gtk? ( x11-libs/gtk+:* ) + >=sys-apps/pcsc-lite-1.2.9 + xpi? ( || ( >=www-client/firefox-bin-3.6.24 + >=www-client/firefox-3.6.20 ) ) + !app-misc/beid-runtime" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch + + if [[ ${PV} == "9999" ]] ; then + # Only in current git. Hopefully, in next release. + sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac + sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in + fi + + if [[ ${PV} == "9999" ]] || ! use gtk ; then + eautoreconf + fi +} + +src_configure() { + econf $(use_enable dialogs) --disable-static +} + +src_install() { + emake DESTDIR="${D}" install + + if [[ ${PV} != "9999" ]] ; then + # Automatically done in current git. Hopefully, in next release. + rm doc/sdk/include/rsaref220/win32.h + doheader -r doc/sdk/include/* + fi + if use xpi; then + declare MOZILLA_FIVE_HOME + if has_version '>=www-client/firefox-3.6.20'; then + MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox" + xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be" + fi + if has_version '>=www-client/firefox-bin-3.6.24'; then + MOZILLA_FIVE_HOME="/opt/firefox" + xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be" + fi + fi + rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la +} 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 new file mode 100644 index 000000000000..137ef8e4ad1b --- /dev/null +++ b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch @@ -0,0 +1,60 @@ +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 +-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@ +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 + +-if test x"$have_gtk" = "xno" +-then +- AC_MSG_ERROR([At least one version of GTK is required.]) +-fi +- + ########################################################################### + ####### 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 -- cgit v1.2.3-65-gdbad