1 |
commit: 209f44991bab243a5643b669da87ed9bbc752992 |
2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 2 15:23:44 2017 +0000 |
4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 2 15:30:32 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209f4499 |
7 |
|
8 |
app-crypt/eid-mw: update live ebuild #607488. Vincent Hardy |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
app-crypt/eid-mw/eid-mw-9999.ebuild | 67 ++++++++++++---------- |
13 |
app-crypt/eid-mw/files/gtk_not_required_9999.patch | 19 +++--- |
14 |
2 files changed, 48 insertions(+), 38 deletions(-) |
15 |
|
16 |
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild |
17 |
index 57bb7b8..c5f5f8f 100644 |
18 |
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild |
19 |
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild |
20 |
@@ -1,10 +1,10 @@ |
21 |
-# Copyright 1999-2016 Gentoo Foundation |
22 |
+# Copyright 1999-2017 Gentoo Foundation |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
# $Id$ |
25 |
|
26 |
EAPI=6 |
27 |
|
28 |
-inherit autotools mozextension |
29 |
+inherit eutils autotools mozextension multilib |
30 |
|
31 |
if [[ ${PV} == "9999" ]] ; then |
32 |
EGIT_REPO_URI="git://github.com/Fedict/${PN}.git |
33 |
@@ -12,10 +12,9 @@ if [[ ${PV} == "9999" ]] ; then |
34 |
inherit git-r3 |
35 |
SRC_URI="" |
36 |
else |
37 |
- MY_P="${P}-v${PV}" |
38 |
- SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz" |
39 |
+ SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> |
40 |
+ ${P}.tar.gz" |
41 |
KEYWORDS="~x86 ~amd64 ~arm" |
42 |
- S="${WORKDIR}/${MY_P}" |
43 |
fi |
44 |
|
45 |
SLOT="0" |
46 |
@@ -24,17 +23,22 @@ DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal |
47 |
|
48 |
HOMEPAGE="http://eid.belgium.be" |
49 |
|
50 |
-IUSE="+gtk +xpi +dialogs" |
51 |
+IUSE="+dialogs +gtk p11-kit +xpi" |
52 |
|
53 |
REQUIRED_USE=" |
54 |
dialogs? ( gtk )" |
55 |
|
56 |
-RDEPEND="gtk? ( x11-libs/gtk+:= ) |
57 |
+RDEPEND="gtk? ( |
58 |
+ x11-libs/gtk+:* |
59 |
+ dev-libs/libxml2 |
60 |
+ net-misc/curl[ssl] |
61 |
+ net-libs/libproxy |
62 |
+ !app-misc/eid-viewer-bin |
63 |
+ ) |
64 |
>=sys-apps/pcsc-lite-1.2.9 |
65 |
- net-libs/libproxy |
66 |
+ p11-kit? ( app-crypt/p11-kit ) |
67 |
xpi? ( || ( >=www-client/firefox-bin-3.6.24 |
68 |
- >=www-client/firefox-3.6.20 ) ) |
69 |
- !app-misc/beid-runtime" |
70 |
+ >=www-client/firefox-3.6.20 ) )" |
71 |
|
72 |
DEPEND="${RDEPEND} |
73 |
virtual/pkgconfig" |
74 |
@@ -42,28 +46,30 @@ DEPEND="${RDEPEND} |
75 |
src_prepare() { |
76 |
eapply_user |
77 |
|
78 |
+ sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die |
79 |
+ sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die |
80 |
+ |
81 |
+ # hardcoded lsb_info |
82 |
+ sed -i \ |
83 |
+ -e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \ |
84 |
+ -e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \ |
85 |
+ -e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \ |
86 |
+ plugins_tools/aboutmw/gtk/about-main.c || die |
87 |
+ |
88 |
if [[ ${PV} == "9999" ]] ; then |
89 |
use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch |
90 |
- |
91 |
- # Only in current git. Hopefully, in next release. |
92 |
- sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die |
93 |
- sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die |
94 |
else |
95 |
- use gtk || eapply "${FILESDIR}"/gtk_not_required_4.1.4.patch |
96 |
- fi |
97 |
- |
98 |
- if [[ ${PV} == "9999" ]] || ! use gtk ; then |
99 |
- eautoreconf |
100 |
+ use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch |
101 |
fi |
102 |
|
103 |
- # Do that after autoreconf (if autoreconf is required) |
104 |
- # This patch is not mandatory, it's just to do things properly :-) |
105 |
- eapply "${FILESDIR}"/not_zip_xpi_plugin.patch |
106 |
+ eautoreconf |
107 |
} |
108 |
|
109 |
src_configure() { |
110 |
econf \ |
111 |
$(use_enable dialogs) \ |
112 |
+ $(use_enable p11-kit p11kit) \ |
113 |
+ --with-gnu-ld \ |
114 |
--disable-static \ |
115 |
--disable-signed |
116 |
} |
117 |
@@ -71,21 +77,22 @@ src_configure() { |
118 |
src_install() { |
119 |
emake DESTDIR="${D}" install |
120 |
|
121 |
- if [[ ${PV} != "9999" ]] ; then |
122 |
- # Automatically done in current git. Hopefully, in next release. |
123 |
- rm doc/sdk/include/rsaref220/win32.h || die |
124 |
- doheader -r doc/sdk/include/* |
125 |
- fi |
126 |
if use xpi; then |
127 |
declare MOZILLA_FIVE_HOME |
128 |
if has_version '>=www-client/firefox-3.6.20'; then |
129 |
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox" |
130 |
- xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be" |
131 |
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be" |
132 |
fi |
133 |
if has_version '>=www-client/firefox-bin-3.6.24'; then |
134 |
MOZILLA_FIVE_HOME="/opt/firefox" |
135 |
- xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be" |
136 |
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be" |
137 |
fi |
138 |
fi |
139 |
- rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die |
140 |
+ rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die |
141 |
+ use gtk || rm -r "${D}/usr/include/eid-util" || die |
142 |
+} |
143 |
+ |
144 |
+pkg_postinst() |
145 |
+{ |
146 |
+ use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/ |
147 |
} |
148 |
|
149 |
diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch |
150 |
index f66ec18..7990aca 100644 |
151 |
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch |
152 |
+++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch |
153 |
@@ -1,13 +1,13 @@ |
154 |
diff --git a/Makefile.am b/Makefile.am |
155 |
-index 65baf07..c264576 100644 |
156 |
+index de5416f..8e55277 100644 |
157 |
--- a/Makefile.am |
158 |
+++ b/Makefile.am |
159 |
@@ -1,7 +1,7 @@ |
160 |
ACLOCAL_AMFLAGS = -I scripts/m4 |
161 |
- EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc |
162 |
+ EXTRA_DIST = scripts/build-aux/config.rpath debian rpm doc |
163 |
|
164 |
-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer |
165 |
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi |
166 |
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi |
167 |
|
168 |
xpipackage: |
169 |
$(MAKE) -C plugins_tools/xpi xpipackage |
170 |
@@ -54,10 +54,10 @@ index 6e33315..fce4494 100644 |
171 |
- |
172 |
pkgconfig_DATA=libbeidpkcs11.pc |
173 |
diff --git a/configure.ac b/configure.ac |
174 |
-index 6485b23..a1f9c93 100644 |
175 |
+index 92bbb3b..a47e7c2 100644 |
176 |
--- a/configure.ac |
177 |
+++ b/configure.ac |
178 |
-@@ -59,11 +59,6 @@ fi |
179 |
+@@ -59,14 +59,6 @@ fi |
180 |
|
181 |
AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk]) |
182 |
|
183 |
@@ -66,6 +66,9 @@ index 6485b23..a1f9c93 100644 |
184 |
- AC_MSG_ERROR([At least one version of GTK is required.]) |
185 |
-fi |
186 |
- |
187 |
- PKG_CHECK_MODULES([XML2], [libxml-2.0]) |
188 |
- PKG_CHECK_MODULES([libproxy], [libproxy-1.0]) |
189 |
- |
190 |
+-PKG_CHECK_MODULES([XML2], [libxml-2.0]) |
191 |
+-PKG_CHECK_MODULES([libproxy], [libproxy-1.0]) |
192 |
+- |
193 |
+ ########################################################################### |
194 |
+ ####### read user-specific requests from --enable directives ###### |
195 |
+ ########################################################################### |