| 1 |
commit: f716edb5328be368ff494084d02f59c59b6f41c5 |
| 2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 4 18:36:58 2020 +0000 |
| 4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 4 18:36:58 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f716edb5 |
| 7 |
|
| 8 |
app-crypt/eid-mw: Update live ebuild to latest |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/732994 |
| 11 |
Submitted-by: Vincent Hardy <vincent.hardy.be <AT> gmail.com> |
| 12 |
Package-Manager: Portage-2.3.99, Repoman-2.3.20 |
| 13 |
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> |
| 14 |
|
| 15 |
app-crypt/eid-mw/eid-mw-9999.ebuild | 22 +++++++++++++++++----- |
| 16 |
1 file changed, 17 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild |
| 19 |
index 023f52ee56b..2535311a44f 100644 |
| 20 |
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild |
| 21 |
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild |
| 22 |
@@ -1,9 +1,9 @@ |
| 23 |
# Copyright 1999-2020 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
-EAPI=6 |
| 27 |
+EAPI=7 |
| 28 |
|
| 29 |
-inherit autotools gnome2-utils git-r3 |
| 30 |
+inherit autotools desktop gnome2-utils xdg-utils git-r3 |
| 31 |
|
| 32 |
DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government" |
| 33 |
HOMEPAGE="https://eid.belgium.be" |
| 34 |
@@ -16,7 +16,7 @@ IUSE="+dialogs +gtk +p11v220 p11-kit" |
| 35 |
RDEPEND=">=sys-apps/pcsc-lite-1.2.9 |
| 36 |
gtk? ( |
| 37 |
x11-libs/gdk-pixbuf[jpeg] |
| 38 |
- x11-libs/gtk+:* |
| 39 |
+ x11-libs/gtk+:3 |
| 40 |
dev-libs/libxml2 |
| 41 |
net-misc/curl[ssl] |
| 42 |
net-libs/libproxy |
| 43 |
@@ -46,6 +46,16 @@ src_prepare() { |
| 44 |
-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \ |
| 45 |
plugins_tools/aboutmw/gtk/about-main.c || die |
| 46 |
|
| 47 |
+ # Fix libdir for pkcs11_manifestdir |
| 48 |
+ sed -i \ |
| 49 |
+ -e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \ |
| 50 |
+ cardcomm/pkcs11/src/Makefile.am || die |
| 51 |
+ |
| 52 |
+ # See bug #732994 |
| 53 |
+ sed -i \ |
| 54 |
+ -e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \ |
| 55 |
+ configure.ac || die |
| 56 |
+ |
| 57 |
eautoreconf |
| 58 |
} |
| 59 |
|
| 60 |
@@ -71,13 +81,15 @@ src_install() { |
| 61 |
pkg_postinst() { |
| 62 |
if use gtk; then |
| 63 |
gnome2_schemas_update |
| 64 |
- gnome2_icon_cache_update |
| 65 |
+ xdg_desktop_database_update |
| 66 |
+ xdg_icon_cache_update |
| 67 |
fi |
| 68 |
} |
| 69 |
|
| 70 |
pkg_postrm() { |
| 71 |
if use gtk; then |
| 72 |
gnome2_schemas_update |
| 73 |
- gnome2_icon_cache_update |
| 74 |
+ xdg_desktop_database_update |
| 75 |
+ xdg_icon_cache_update |
| 76 |
fi |
| 77 |
} |
Archives