Gentoo Archives: gentoo-commits

From: Amy Liffey <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/, app-crypt/eid-mw/files/
Date: Sat, 04 Feb 2017 16:50:52
Message-Id: 1486227028.4da08d060ef1009569798c3d29ff94e7b56e62ae.amynka@gentoo
1 commit: 4da08d060ef1009569798c3d29ff94e7b56e62ae
2 Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 4 16:47:43 2017 +0000
4 Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 4 16:50:28 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da08d06
7
8 app-crypt/eid-mw: remove old. Vincent Hardy
9
10 Package-Manager: portage-2.3.0
11
12 app-crypt/eid-mw/Manifest | 3 -
13 app-crypt/eid-mw/eid-mw-4.1.18.ebuild | 83 ----------------------
14 app-crypt/eid-mw/eid-mw-4.1.4.ebuild | 79 --------------------
15 app-crypt/eid-mw/eid-mw-4.1.9.ebuild | 79 --------------------
16 .../eid-mw/files/gtk_not_required_4.1.4.patch | 60 ----------------
17 app-crypt/eid-mw/files/not_zip_xpi_plugin.patch | 27 -------
18 6 files changed, 331 deletions(-)
19
20 diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
21 index 0bea827..d6c0500 100644
22 --- a/app-crypt/eid-mw/Manifest
23 +++ b/app-crypt/eid-mw/Manifest
24 @@ -1,4 +1 @@
25 -DIST eid-mw-4.1.18-v4.1.18.tar.gz 3480541 SHA256 abc9d3194008f05b2589ddd9a29c45d22d89716bdc8689fcec42b2aa8450ddbf SHA512 18825a06007f7c07609cee034896ebf64b589200e04b72fece2bd65004a738c01cf64475d59f2c94b7242aa1adfc433bf4af6cf8b5d809746f3e9357ac27b98c WHIRLPOOL 584817aff81a1e0b1af24e5b259fa7e40b5a43b27be701242430cdc480d8ba57205faeba6fb787f1321e02916e6f3efa722e01609151fa3798b8e37b13cb159e
26 -DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
27 -DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c WHIRLPOOL 06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9
28 DIST eid-mw-4.2.0.tar.gz 8508064 SHA256 4d86f4750f973a8dcf700544b92ffc3069a85ff93086538b9f334d76dd5c9747 SHA512 c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f WHIRLPOOL b1dee0c0a1800b81a7f392bc0e13d070a1cbc7fa6eb2f26e9c50903e058f322ff0b2da69469f90bd38240f49520be29bb548ca6954bc052ef5b23bdb4cad2643
29
30 diff --git a/app-crypt/eid-mw/eid-mw-4.1.18.ebuild b/app-crypt/eid-mw/eid-mw-4.1.18.ebuild
31 deleted file mode 100644
32 index 815d376..00000000
33 --- a/app-crypt/eid-mw/eid-mw-4.1.18.ebuild
34 +++ /dev/null
35 @@ -1,83 +0,0 @@
36 -# Copyright 1999-2016 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -# $Id$
39 -
40 -EAPI=5
41 -
42 -inherit eutils autotools mozextension multilib
43 -
44 -if [[ ${PV} == "9999" ]] ; then
45 - EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
46 - https://github.com/Fedict/${PN}.git"
47 - inherit git-2
48 - SRC_URI=""
49 -else
50 - MY_P="${P}-v${PV}"
51 - SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz"
52 - KEYWORDS="~x86 ~amd64 ~arm"
53 - S="${WORKDIR}/${MY_P}"
54 -fi
55 -
56 -SLOT="0"
57 -LICENSE="LGPL-3"
58 -DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
59 -
60 -HOMEPAGE="http://eid.belgium.be"
61 -
62 -IUSE="+gtk +xpi +dialogs"
63 -
64 -REQUIRED_USE="
65 - dialogs? ( gtk )"
66 -
67 -RDEPEND="gtk? ( x11-libs/gtk+:= )
68 - >=sys-apps/pcsc-lite-1.2.9
69 - xpi? ( || ( >=www-client/firefox-bin-3.6.24
70 - >=www-client/firefox-3.6.20 ) )
71 - !app-misc/beid-runtime"
72 -
73 -DEPEND="${RDEPEND}
74 - virtual/pkgconfig"
75 -
76 -src_prepare() {
77 - use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
78 -
79 - if [[ ${PV} == "9999" ]] ; then
80 - # Only in current git. Hopefully, in next release.
81 - sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
82 - sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
83 - fi
84 -
85 - if [[ ${PV} == "9999" ]] || ! use gtk ; then
86 - eautoreconf
87 - fi
88 -}
89 -
90 -src_configure() {
91 - econf \
92 - $(use_enable dialogs) \
93 - --with-gnu-ld \
94 - --disable-static \
95 - --disable-signed
96 -}
97 -
98 -src_install() {
99 - emake DESTDIR="${D}" install
100 -
101 - if [[ ${PV} != "9999" ]] ; then
102 - # Automatically done in current git. Hopefully, in next release.
103 - rm doc/sdk/include/rsaref220/win32.h || die
104 - doheader -r doc/sdk/include/*
105 - fi
106 - if use xpi; then
107 - declare MOZILLA_FIVE_HOME
108 - if has_version '>=www-client/firefox-3.6.20'; then
109 - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
110 - xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be"
111 - fi
112 - if has_version '>=www-client/firefox-bin-3.6.24'; then
113 - MOZILLA_FIVE_HOME="/opt/firefox"
114 - xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be"
115 - fi
116 - fi
117 - rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
118 -}
119
120 diff --git a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
121 deleted file mode 100644
122 index 2cf391e..00000000
123 --- a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
124 +++ /dev/null
125 @@ -1,79 +0,0 @@
126 -# Copyright 1999-2016 Gentoo Foundation
127 -# Distributed under the terms of the GNU General Public License v2
128 -# $Id$
129 -
130 -EAPI=5
131 -
132 -inherit eutils autotools mozextension multilib
133 -
134 -if [[ ${PV} == "9999" ]] ; then
135 - EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
136 - https://github.com/Fedict/${PN}.git"
137 - inherit git-2
138 - SRC_URI=""
139 -else
140 - MY_P="${P}-v${PV}"
141 - SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz -> ${MY_P}.tar.gz"
142 - KEYWORDS="~x86 ~amd64 ~arm"
143 - S="${WORKDIR}/${MY_P}"
144 -fi
145 -
146 -SLOT="0"
147 -LICENSE="LGPL-3"
148 -DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
149 -
150 -HOMEPAGE="http://eid.belgium.be"
151 -
152 -IUSE="+gtk +xpi +dialogs"
153 -
154 -REQUIRED_USE="
155 - dialogs? ( gtk )"
156 -
157 -RDEPEND="gtk? ( x11-libs/gtk+:= )
158 - >=sys-apps/pcsc-lite-1.2.9
159 - xpi? ( || ( >=www-client/firefox-bin-3.6.24
160 - >=www-client/firefox-3.6.20 ) )
161 - !app-misc/beid-runtime"
162 -
163 -DEPEND="${RDEPEND}
164 - virtual/pkgconfig"
165 -
166 -src_prepare() {
167 - use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch
168 -
169 - if [[ ${PV} == "9999" ]] ; then
170 - # Only in current git. Hopefully, in next release.
171 - sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
172 - sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
173 - fi
174 -
175 - if [[ ${PV} == "9999" ]] || ! use gtk ; then
176 - eautoreconf
177 - fi
178 -}
179 -
180 -src_configure() {
181 - econf $(use_enable dialogs) --disable-static
182 -}
183 -
184 -src_install() {
185 - emake DESTDIR="${D}" install
186 -
187 - if [[ ${PV} != "9999" ]] ; then
188 - # Automatically done in current git. Hopefully, in next release.
189 - rm doc/sdk/include/rsaref220/win32.h || die
190 - doheader -r doc/sdk/include/*
191 - fi
192 - if use xpi; then
193 - declare MOZILLA_FIVE_HOME
194 - if has_version '>=www-client/firefox-3.6.20'; then
195 - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
196 - xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be"
197 - fi
198 - if has_version '>=www-client/firefox-bin-3.6.24'; then
199 - MOZILLA_FIVE_HOME="/opt/firefox"
200 - xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be"
201 - fi
202 - fi
203 - rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
204 -}
205
206 diff --git a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
207 deleted file mode 100644
208 index aa57f80..00000000
209 --- a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
210 +++ /dev/null
211 @@ -1,79 +0,0 @@
212 -# Copyright 1999-2016 Gentoo Foundation
213 -# Distributed under the terms of the GNU General Public License v2
214 -# $Id$
215 -
216 -EAPI=5
217 -
218 -inherit eutils autotools mozextension multilib
219 -
220 -if [[ ${PV} == "9999" ]] ; then
221 - EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
222 - https://github.com/Fedict/${PN}.git"
223 - inherit git-2
224 - SRC_URI=""
225 -else
226 - MY_P="${P}-v${PV}"
227 - SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz"
228 - KEYWORDS="~x86 ~amd64 ~arm"
229 - S="${WORKDIR}/${MY_P}"
230 -fi
231 -
232 -SLOT="0"
233 -LICENSE="LGPL-3"
234 -DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
235 -
236 -HOMEPAGE="http://eid.belgium.be"
237 -
238 -IUSE="+gtk +xpi +dialogs"
239 -
240 -REQUIRED_USE="
241 - dialogs? ( gtk )"
242 -
243 -RDEPEND="gtk? ( x11-libs/gtk+:= )
244 - >=sys-apps/pcsc-lite-1.2.9
245 - xpi? ( || ( >=www-client/firefox-bin-3.6.24
246 - >=www-client/firefox-3.6.20 ) )
247 - !app-misc/beid-runtime"
248 -
249 -DEPEND="${RDEPEND}
250 - virtual/pkgconfig"
251 -
252 -src_prepare() {
253 - use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
254 -
255 - if [[ ${PV} == "9999" ]] ; then
256 - # Only in current git. Hopefully, in next release.
257 - sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
258 - sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
259 - fi
260 -
261 - if [[ ${PV} == "9999" ]] || ! use gtk ; then
262 - eautoreconf
263 - fi
264 -}
265 -
266 -src_configure() {
267 - econf $(use_enable dialogs) --disable-static
268 -}
269 -
270 -src_install() {
271 - emake DESTDIR="${D}" install
272 -
273 - if [[ ${PV} != "9999" ]] ; then
274 - # Automatically done in current git. Hopefully, in next release.
275 - rm doc/sdk/include/rsaref220/win32.h || die
276 - doheader -r doc/sdk/include/*
277 - fi
278 - if use xpi; then
279 - declare MOZILLA_FIVE_HOME
280 - if has_version '>=www-client/firefox-3.6.20'; then
281 - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
282 - xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be"
283 - fi
284 - if has_version '>=www-client/firefox-bin-3.6.24'; then
285 - MOZILLA_FIVE_HOME="/opt/firefox"
286 - xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be"
287 - fi
288 - fi
289 - rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
290 -}
291
292 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
293 deleted file mode 100644
294 index 137ef8e..00000000
295 --- a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
296 +++ /dev/null
297 @@ -1,60 +0,0 @@
298 -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
299 ---- eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am 2015-07-27 10:30:34.638418958 +0200
300 -+++ eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am 2015-08-13 14:12:43.827586821 +0200
301 -@@ -164,29 +164,3 @@
302 - dialogs/dialogsgtk/dlgs_gtk.cpp \
303 - dialogs/dialogsgtk/single_dialog.c
304 - endif
305 --
306 --libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
307 --
308 --beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
309 --beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
310 --beid_askpin_LDADD = @GTK_LIBS@
311 --
312 --beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
313 --beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
314 --beid_changepin_LDADD = @GTK_LIBS@
315 --
316 --beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
317 --beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
318 --beid_badpin_LDADD = @GTK_LIBS@
319 --
320 --beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
321 --beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
322 --beid_askaccess_LDADD = @GTK_LIBS@
323 --
324 --beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
325 --beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
326 --beid_spr_askpin_LDADD = @GTK_LIBS@
327 --
328 --beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
329 --beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
330 --beid_spr_changepin_LDADD = @GTK_LIBS@
331 -diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac eid-mw-4.1.4-v4.1.4-b/configure.ac
332 ---- eid-mw-4.1.4-v4.1.4-a/configure.ac 2015-07-27 10:30:34.641752294 +0200
333 -+++ eid-mw-4.1.4-v4.1.4-b/configure.ac 2015-08-13 14:13:51.456736608 +0200
334 -@@ -55,11 +55,6 @@
335 - fi
336 - fi
337 -
338 --if test x"$have_gtk" = "xno"
339 --then
340 -- AC_MSG_ERROR([At least one version of GTK is required.])
341 --fi
342 --
343 - ###########################################################################
344 - ####### read user-specific requests from --enable directives ######
345 - ###########################################################################
346 -diff -ur eid-mw-4.1.4-v4.1.4-a/Makefile.am eid-mw-4.1.4-v4.1.4-b/Makefile.am
347 ---- eid-mw-4.1.4-v4.1.4-a/Makefile.am 2015-07-27 10:30:34.638418958 +0200
348 -+++ eid-mw-4.1.4-v4.1.4-b/Makefile.am 2015-08-13 14:11:43.878340486 +0200
349 -@@ -1,7 +1,7 @@
350 - ACLOCAL_AMFLAGS = -I scripts/m4
351 - EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc
352 -
353 --SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
354 -+SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi
355 -
356 - xpipackage:
357 - $(MAKE) -C plugins_tools/xpi xpipackage
358
359 diff --git a/app-crypt/eid-mw/files/not_zip_xpi_plugin.patch b/app-crypt/eid-mw/files/not_zip_xpi_plugin.patch
360 deleted file mode 100644
361 index 4295543..00000000
362 --- a/app-crypt/eid-mw/files/not_zip_xpi_plugin.patch
363 +++ /dev/null
364 @@ -1,27 +0,0 @@
365 ---- eid-mw-4.1.18-v4.1.18-a/plugins_tools/xpi/src/Makefile.in 2016-05-20 12:58:46.184002742 +0200
366 -+++ eid-mw-4.1.18-v4.1.18-b/plugins_tools/xpi/src/Makefile.in 2016-06-18 16:18:57.467199895 +0200
367 -@@ -724,24 +724,6 @@
368 - @SIGNED_TRUE@ cp $(srcdir)/belgiumeid-1.0.18.1-signed.1-signed.xpi $(XPI_ID).xpi
369 -
370 - @SIGNED_FALSE@xpipackage: $(xpi_files)
371 --# Create a temporary directory $tmp in $TMPDIR (default /tmp).
372 --# Use mktemp if possible; otherwise fall back on mkdir,
373 --# with $RANDOM to make collisions less likely.
374 --@SIGNED_FALSE@ { \
375 --@SIGNED_FALSE@ tmp=` \
376 --@SIGNED_FALSE@ (umask 077 && mktemp -t -d "xpiXXXXXX") 2>/dev/null \
377 --@SIGNED_FALSE@ ` && \
378 --@SIGNED_FALSE@ test -n "$$tmp" && test -d "$$tmp"; \
379 --@SIGNED_FALSE@ } || { \
380 --@SIGNED_FALSE@ tmp=$$TMPDIR/xpi$$RANDOM; \
381 --@SIGNED_FALSE@ umask 077 && $(mkinstalldirs) "$$tmp"; \
382 --@SIGNED_FALSE@ } || exit $$?; \
383 --@SIGNED_FALSE@ $(MAKE) DESTDIR=$$tmp extensionrootdir=/ install; \
384 --@SIGNED_FALSE@ cd $$tmp; \
385 --@SIGNED_FALSE@ rm -f $(abs_builddir)/$(XPI_NAME); \
386 --@SIGNED_FALSE@ @ZIP@ -rq $(abs_builddir)/$(XPI_NAME) .; \
387 --@SIGNED_FALSE@ cd -; \
388 --@SIGNED_FALSE@ rm -rf $$tmp;
389 -
390 - # Tell versions [3.59,3.63) of GNU make to not export all variables.
391 - # Otherwise a system limit (for SysV at least) may be exceeded.