1 |
commit: 7ddb1664d1b0617b80daefb967d3a7764798e677 |
2 |
Author: Amy Winston <amynka <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 1 17:12:19 2016 +0000 |
4 |
Commit: Amy Winston <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 1 17:12:19 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ddb1664 |
7 |
|
8 |
app-crypt/eid-mw: add missing dies |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
app-crypt/eid-mw/eid-mw-4.1.4.ebuild | 12 ++++++------ |
13 |
app-crypt/eid-mw/eid-mw-4.1.9.ebuild | 12 ++++++------ |
14 |
2 files changed, 12 insertions(+), 12 deletions(-) |
15 |
|
16 |
diff --git a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild |
17 |
index 0e40e87..2cf391e 100644 |
18 |
--- a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild |
19 |
+++ b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild |
20 |
@@ -1,4 +1,4 @@ |
21 |
-# Copyright 1999-2015 Gentoo Foundation |
22 |
+# Copyright 1999-2016 Gentoo Foundation |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
# $Id$ |
25 |
|
26 |
@@ -29,7 +29,7 @@ IUSE="+gtk +xpi +dialogs" |
27 |
REQUIRED_USE=" |
28 |
dialogs? ( gtk )" |
29 |
|
30 |
-RDEPEND="gtk? ( x11-libs/gtk+:* ) |
31 |
+RDEPEND="gtk? ( x11-libs/gtk+:= ) |
32 |
>=sys-apps/pcsc-lite-1.2.9 |
33 |
xpi? ( || ( >=www-client/firefox-bin-3.6.24 |
34 |
>=www-client/firefox-3.6.20 ) ) |
35 |
@@ -43,8 +43,8 @@ src_prepare() { |
36 |
|
37 |
if [[ ${PV} == "9999" ]] ; then |
38 |
# Only in current git. Hopefully, in next release. |
39 |
- sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac |
40 |
- sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in |
41 |
+ sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die |
42 |
+ sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die |
43 |
fi |
44 |
|
45 |
if [[ ${PV} == "9999" ]] || ! use gtk ; then |
46 |
@@ -61,7 +61,7 @@ src_install() { |
47 |
|
48 |
if [[ ${PV} != "9999" ]] ; then |
49 |
# Automatically done in current git. Hopefully, in next release. |
50 |
- rm doc/sdk/include/rsaref220/win32.h |
51 |
+ rm doc/sdk/include/rsaref220/win32.h || die |
52 |
doheader -r doc/sdk/include/* |
53 |
fi |
54 |
if use xpi; then |
55 |
@@ -75,5 +75,5 @@ src_install() { |
56 |
xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be" |
57 |
fi |
58 |
fi |
59 |
- rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la |
60 |
+ rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die |
61 |
} |
62 |
|
63 |
diff --git a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild |
64 |
index f748be3..aa57f80 100644 |
65 |
--- a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild |
66 |
+++ b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild |
67 |
@@ -1,4 +1,4 @@ |
68 |
-# Copyright 1999-2015 Gentoo Foundation |
69 |
+# Copyright 1999-2016 Gentoo Foundation |
70 |
# Distributed under the terms of the GNU General Public License v2 |
71 |
# $Id$ |
72 |
|
73 |
@@ -29,7 +29,7 @@ IUSE="+gtk +xpi +dialogs" |
74 |
REQUIRED_USE=" |
75 |
dialogs? ( gtk )" |
76 |
|
77 |
-RDEPEND="gtk? ( x11-libs/gtk+:* ) |
78 |
+RDEPEND="gtk? ( x11-libs/gtk+:= ) |
79 |
>=sys-apps/pcsc-lite-1.2.9 |
80 |
xpi? ( || ( >=www-client/firefox-bin-3.6.24 |
81 |
>=www-client/firefox-3.6.20 ) ) |
82 |
@@ -43,8 +43,8 @@ src_prepare() { |
83 |
|
84 |
if [[ ${PV} == "9999" ]] ; then |
85 |
# Only in current git. Hopefully, in next release. |
86 |
- sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac |
87 |
- sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in |
88 |
+ sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die |
89 |
+ sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die |
90 |
fi |
91 |
|
92 |
if [[ ${PV} == "9999" ]] || ! use gtk ; then |
93 |
@@ -61,7 +61,7 @@ src_install() { |
94 |
|
95 |
if [[ ${PV} != "9999" ]] ; then |
96 |
# Automatically done in current git. Hopefully, in next release. |
97 |
- rm doc/sdk/include/rsaref220/win32.h |
98 |
+ rm doc/sdk/include/rsaref220/win32.h || die |
99 |
doheader -r doc/sdk/include/* |
100 |
fi |
101 |
if use xpi; then |
102 |
@@ -75,5 +75,5 @@ src_install() { |
103 |
xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@×××××××××××.be" |
104 |
fi |
105 |
fi |
106 |
- rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la |
107 |
+ rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die |
108 |
} |