commit: 209f44991bab243a5643b669da87ed9bbc752992
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 2 15:23:44 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Feb 2 15:30:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209f4499
app-crypt/eid-mw: update live ebuild #607488. Vincent Hardy
Package-Manager: portage-2.3.0
app-crypt/eid-mw/eid-mw-9999.ebuild | 67 ++++++++++++----------
app-crypt/eid-mw/files/gtk_not_required_9999.patch | 19 +++---
2 files changed, 48 insertions(+), 38 deletions(-)
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild
b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 57bb7b8..c5f5f8f 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
-inherit autotools mozextension
+inherit eutils autotools mozextension multilib
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
@@ -12,10 +12,9 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
SRC_URI=""
else
- MY_P="${P}-v${PV}"
- SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz";
+ SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} ->
+ ${P}.tar.gz"
KEYWORDS="~x86 ~amd64 ~arm"
- S="${WORKDIR}/${MY_P}"
fi
SLOT="0"
@@ -24,17 +23,22 @@ DESCRIPTION="Electronic Identity Card middleware supplied
by the Belgian Federal
HOMEPAGE="http://eid.belgium.be";
-IUSE="+gtk +xpi +dialogs"
+IUSE="+dialogs +gtk p11-kit +xpi"
REQUIRED_USE="
dialogs? ( gtk )"
-RDEPEND="gtk? ( x11-libs/gtk+:= )
+RDEPEND="gtk? (
+ x11-libs/gtk+:*
+ dev-libs/libxml2
+ net-misc/curl[ssl]
+ net-libs/libproxy
+ !app-misc/eid-viewer-bin
+ )
>=sys-apps/pcsc-lite-1.2.9
- net-libs/libproxy
+ p11-kit? ( app-crypt/p11-kit )
xpi? ( || ( >=www-client/firefox-bin-3.6.24
- >=www-client/firefox-3.6.20 ) )
- !app-misc/beid-runtime"
+ >=www-client/firefox-3.6.20 ) )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -42,28 +46,30 @@ DEPEND="${RDEPEND}
src_prepare() {
eapply_user
+ sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+ sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+
+ # hardcoded lsb_info
+ sed -i \
+ -e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+ -e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+ -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
-
- # Only in current git. Hopefully, in next release.
- sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
- sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in
|| die
else
- use gtk || eapply "${FILESDIR}"/gtk_not_required_4.1.4.patch
- fi
-
- if [[ ${PV} == "9999" ]] || ! use gtk ; then
- eautoreconf
+ use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch
fi
- # Do that after autoreconf (if autoreconf is required)
- # This patch is not mandatory, it's just to do things properly :-)
- eapply "${FILESDIR}"/not_zip_xpi_plugin.patch
+ eautoreconf
}
src_configure() {
econf \
$(use_enable dialogs) \
+ $(use_enable p11-kit p11kit) \
+ --with-gnu-ld \
--disable-static \
--disable-signed
}
@@ -71,21 +77,22 @@ src_configure() {
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 || die
- 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}/[email protected]"
+ xpi_install
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/[email protected]"
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}/[email protected]"
+ xpi_install
"${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/[email protected]"
fi
fi
- rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
+ rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
+ use gtk || rm -r "${D}/usr/include/eid-util" || die
+}
+
+pkg_postinst()
+{
+ use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
}
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 f66ec18..7990aca 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
@@ -1,13 +1,13 @@
diff --git a/Makefile.am b/Makefile.am
-index 65baf07..c264576 100644
+index de5416f..8e55277 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
+ EXTRA_DIST = scripts/build-aux/config.rpath 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
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util
tests/unit plugins_tools/xpi
xpipackage:
$(MAKE) -C plugins_tools/xpi xpipackage
@@ -54,10 +54,10 @@ index 6e33315..fce4494 100644
-
pkgconfig_DATA=libbeidpkcs11.pc
diff --git a/configure.ac b/configure.ac
-index 6485b23..a1f9c93 100644
+index 92bbb3b..a47e7c2 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -59,11 +59,6 @@ fi
+@@ -59,14 +59,6 @@ fi
AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
@@ -66,6 +66,9 @@ index 6485b23..a1f9c93 100644
- 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])
-
+-PKG_CHECK_MODULES([XML2], [libxml-2.0])
+-PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
+-
+ ###########################################################################
+ ####### read user-specific requests from --enable directives ######
+ ###########################################################################
