1 |
commit: a07dff4601a03692c787571b75a108774daeda2c |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 31 18:43:49 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 31 18:43:49 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a07dff46 |
7 |
|
8 |
app-crypt/gnupg: [QA] Fix various QA violations |
9 |
|
10 |
* Sort metadata vars into canonical order |
11 |
set by skel.ebuild |
12 |
* All I/O operations require '|| die' |
13 |
* Repoman warnings about metadata.xml mixing |
14 |
tabs and spaces: |
15 |
|
16 |
metadata.warning 1 |
17 |
app-crypt/gnupg/metadata.xml: inconsistent use of tabs and spaces in indentation |
18 |
|
19 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
20 |
|
21 |
app-crypt/gnupg/gnupg-2.1.22.ebuild | 14 +++---- |
22 |
app-crypt/gnupg/metadata.xml | 73 +++++++++++++++++-------------------- |
23 |
2 files changed, 41 insertions(+), 46 deletions(-) |
24 |
|
25 |
diff --git a/app-crypt/gnupg/gnupg-2.1.22.ebuild b/app-crypt/gnupg/gnupg-2.1.22.ebuild |
26 |
index 39ab6caaf11..03363e490f1 100644 |
27 |
--- a/app-crypt/gnupg/gnupg-2.1.22.ebuild |
28 |
+++ b/app-crypt/gnupg/gnupg-2.1.22.ebuild |
29 |
@@ -5,15 +5,15 @@ EAPI="6" |
30 |
|
31 |
inherit systemd toolchain-funcs |
32 |
|
33 |
+MY_P="${P/_/-}" |
34 |
+ |
35 |
DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" |
36 |
HOMEPAGE="http://www.gnupg.org/" |
37 |
-LICENSE="GPL-3" |
38 |
- |
39 |
-MY_P="${P/_/-}" |
40 |
SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" |
41 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
42 |
|
43 |
+LICENSE="GPL-3" |
44 |
SLOT="0" |
45 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
46 |
IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server" |
47 |
|
48 |
COMMON_DEPEND_LIBS=" |
49 |
@@ -110,11 +110,11 @@ src_install() { |
50 |
|
51 |
dosym gpg2 /usr/bin/gpg |
52 |
dosym gpgv2 /usr/bin/gpgv |
53 |
- echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1 |
54 |
- echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1 |
55 |
+ echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1 || die |
56 |
+ echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1 || die |
57 |
|
58 |
dodir /etc/env.d |
59 |
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg |
60 |
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die |
61 |
|
62 |
use doc && dodoc doc/gnupg.html/* doc/*.png |
63 |
|
64 |
|
65 |
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml |
66 |
index afd452c2173..d9ae4079527 100644 |
67 |
--- a/app-crypt/gnupg/metadata.xml |
68 |
+++ b/app-crypt/gnupg/metadata.xml |
69 |
@@ -1,43 +1,38 @@ |
70 |
<?xml version="1.0" encoding="UTF-8"?> |
71 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
72 |
<pkgmetadata> |
73 |
- <maintainer type="person"> |
74 |
- <email>k_f@g.o</email> |
75 |
- <name>Kristian Fiskerstrand</name> |
76 |
- </maintainer> |
77 |
- <maintainer type="project"> |
78 |
- <email>crypto@g.o</email> |
79 |
- <name>Crypto</name> |
80 |
- </maintainer> |
81 |
- <longdescription> |
82 |
- GnuPG is a complete and free implementation of the OpenPGP standard as |
83 |
- defined by RFC4880. |
84 |
- </longdescription> |
85 |
- <use> |
86 |
- <flag name="smartcard"> |
87 |
- Build scdaemon software. Enables usage of OpenPGP cards. For |
88 |
- other type of smartcards, try |
89 |
- <pkg>app-crypt/gnupg-pkcs11-scd</pkg>. |
90 |
- Bring in <pkg>dev-libs/libusb</pkg> as a dependency; enable |
91 |
- scdaemon. |
92 |
- </flag> |
93 |
- <flag name="usb"> |
94 |
- Build direct CCID access for scdaemon; requires |
95 |
- <pkg>dev-libs/libusb</pkg>. |
96 |
- </flag> |
97 |
- <flag name="mta"> |
98 |
- Build mta support using |
99 |
- <pkg>virtual/mta</pkg>. |
100 |
- </flag> |
101 |
- <flag name="tofu"> |
102 |
- Enable support for Trust of First use trust model; requires |
103 |
- <pkg>dev-db/sqlite</pkg>. |
104 |
- </flag> |
105 |
- <flag name="tools"> |
106 |
- Install extra tools (including gpgsplit and gpg-zip). |
107 |
- </flag> |
108 |
- <flag name="wks-server"> |
109 |
- Install the wks-server |
110 |
- </flag> |
111 |
- </use> |
112 |
+ <maintainer type="person"> |
113 |
+ <email>k_f@g.o</email> |
114 |
+ <name>Kristian Fiskerstrand</name> |
115 |
+ </maintainer> |
116 |
+ <maintainer type="project"> |
117 |
+ <email>crypto@g.o</email> |
118 |
+ <name>Crypto</name> |
119 |
+ </maintainer> |
120 |
+ <longdescription> |
121 |
+ GnuPG is a complete and free implementation of the OpenPGP standard as |
122 |
+ defined by RFC4880. |
123 |
+ </longdescription> |
124 |
+ <use> |
125 |
+ <flag name="smartcard"> |
126 |
+ Build scdaemon software. Enables usage of OpenPGP cards. For |
127 |
+ other type of smartcards, try <pkg>app-crypt/gnupg-pkcs11-scd</pkg>. |
128 |
+ Bring in <pkg>dev-libs/libusb</pkg> as a dependency; enable scdaemon. |
129 |
+ </flag> |
130 |
+ <flag name="usb"> |
131 |
+ Build direct CCID access for scdaemon; requires <pkg>dev-libs/libusb</pkg>. |
132 |
+ </flag> |
133 |
+ <flag name="mta"> |
134 |
+ Build mta support using <pkg>virtual/mta</pkg>. |
135 |
+ </flag> |
136 |
+ <flag name="tofu"> |
137 |
+ Enable support for Trust on First use trust model; requires <pkg>dev-db/sqlite</pkg>. |
138 |
+ </flag> |
139 |
+ <flag name="tools"> |
140 |
+ Install extra tools (including gpgsplit and gpg-zip). |
141 |
+ </flag> |
142 |
+ <flag name="wks-server"> |
143 |
+ Install the wks-server |
144 |
+ </flag> |
145 |
+ </use> |
146 |
</pkgmetadata> |