Gentoo Archives: gentoo-commits

From: Mike Auty <ikelos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/xca/files/, app-crypt/xca/
Date: Sat, 27 Feb 2021 19:08:50
Message-Id: 1614452857.cf9c9af46fbc95833c3c2a7bab002ca77f498a4d.ikelos@gentoo
1 commit: cf9c9af46fbc95833c3c2a7bab002ca77f498a4d
2 Author: Mike Auty <ikelos <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 27 19:06:22 2021 +0000
4 Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 27 19:07:37 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9c9af4
7
8 app-crypt/xca: Fix documentation issue
9
10 Bug: https://bugs.gentoo.org/733000
11 Signed-off-by: Mike Auty <ikelos <AT> gentoo.org>
12
13 app-crypt/xca/Manifest | 1 -
14 app-crypt/xca/files/xca-bug-733000.patch | 28 ++++++++++++++
15 app-crypt/xca/xca-2.2.1.ebuild | 65 --------------------------------
16 app-crypt/xca/xca-2.3.0.ebuild | 1 +
17 4 files changed, 29 insertions(+), 66 deletions(-)
18
19 diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
20 index 7771e5c89ed..d08bc8bc9be 100644
21 --- a/app-crypt/xca/Manifest
22 +++ b/app-crypt/xca/Manifest
23 @@ -1,3 +1,2 @@
24 DIST xca-2.1.2.tar.gz 1086563 BLAKE2B d48727fffad16d840633af6e0ee38a279978a5b865eb6f391a3d852a0105817254ea0a4780875f2956e1f7e9931e6930c6ffbe82b117dbf8ad0058ec9d6f5c88 SHA512 1f104a22b83b802576b4820b7139971da50f9b3dd70aca8e1199e996bad4379b8681bb31b197b84a3dfa49cef4ae093f6622d15fac9667547ff47af43c1e5f07
25 -DIST xca-2.2.1.tar.gz 1339412 BLAKE2B 5d3e33a711919d85bc3457ddd596f2272f0136d96290aeb31e6d03ea86faff00be3590862e4c96d9214542db1bd536d0d22c6c04cd5071b253bbefe3ab3f4f56 SHA512 90eaf4a859779d57a4c0201dc403d67e005bd540145b9f543e13b8d5c42199f2ea05543de24b071d19a0db8e5b1e9f3bef2aea4bfe9f71f81007a5f5bb3ba406
26 DIST xca-2.3.0.tar.gz 1354154 BLAKE2B 31a4ac96819e8d2f7e5f623cc343f0cbff18c931ed0699dbe093dcb963c3431a3943c4dcd8f3d727896104c05a565d062b9678169bf2a8d3f7cf7748c311b53b SHA512 35522aa308e1022a739f3255f13fcf63f481000f9b7411027a009a185e33ddceeb5cf9b55406a4899d2393c7e5ace10354ff24b3b2b0c3045d110f679756b0b8
27
28 diff --git a/app-crypt/xca/files/xca-bug-733000.patch b/app-crypt/xca/files/xca-bug-733000.patch
29 new file mode 100644
30 index 00000000000..044575475c8
31 --- /dev/null
32 +++ b/app-crypt/xca/files/xca-bug-733000.patch
33 @@ -0,0 +1,28 @@
34 +diff --git a/doc/Makefile b/doc/Makefile
35 +index d481c5a..dc5b49a 100644
36 +--- a/doc/Makefile
37 ++++ b/doc/Makefile
38 +@@ -5,13 +5,9 @@ endif
39 +
40 + DELFILES=xca*.html xca.1.gz changelog.html database_schema.html
41 +
42 +-doc: xca.1.gz xca.html changelog.html database_schema.html
43 ++doc: xca.1 xca.html changelog.html database_schema.html
44 + include $(TOPDIR)/Rules.mak
45 +
46 +-%.1.gz: %.1
47 +- @$(PRINT) " MAN [$(BASENAME)] $@"
48 +- gzip -9 <$^ >$@
49 +-
50 + xca.html: xca.sgml
51 + rm -f xca*.html
52 + echo 'The documentation for XCA can be viewed online at: <a href="http://hohnstaedt.de/documentation">http://hohnstaedt.de/documentation</a>.' > $@
53 +@@ -23,7 +19,7 @@ install: $(doc)
54 + $(ENABLE_DOC)install -m 755 -d $(DESTDIR)$(htmldir)
55 + $(ENABLE_DOC)install -m 644 xca*.html $(DESTDIR)$(htmldir)
56 + install -m 755 -d $(DESTDIR)$(mandir)/man1
57 +- install -m 644 *.1.gz $(DESTDIR)/$(mandir)/man1
58 ++ install -m 644 *.1 $(DESTDIR)/$(mandir)/man1
59 +
60 + app: xca.html
61 + mkdir -p $(APPDIR)/Resources
62
63 diff --git a/app-crypt/xca/xca-2.2.1.ebuild b/app-crypt/xca/xca-2.2.1.ebuild
64 deleted file mode 100644
65 index 321c828980a..00000000000
66 --- a/app-crypt/xca/xca-2.2.1.ebuild
67 +++ /dev/null
68 @@ -1,65 +0,0 @@
69 -# Copyright 1999-2021 Gentoo Authors
70 -# Distributed under the terms of the GNU General Public License v2
71 -
72 -EAPI="7"
73 -
74 -inherit xdg-utils
75 -
76 -DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
77 -HOMEPAGE="https://hohnstaedt.de/xca/"
78 -SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
79 -
80 -LICENSE="BSD"
81 -SLOT="0"
82 -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
83 -IUSE="bindist doc libressl"
84 -
85 -RDEPEND="
86 - dev-libs/libltdl:0=
87 - dev-qt/qtgui:5
88 - dev-qt/qtsql:5[sqlite]
89 - dev-qt/qtwidgets:5
90 - !libressl? ( dev-libs/openssl:0=[bindist=] )
91 - libressl? ( >=dev-libs/libressl-2.7.0:0= )
92 - doc? ( app-text/linuxdoc-tools )"
93 -DEPEND="${RDEPEND}
94 - dev-qt/linguist-tools:5"
95 -
96 -PATCHES=(
97 - "${FILESDIR}/${PN}-1.0.0-desktop.patch"
98 -)
99 -
100 -src_configure() {
101 - econf \
102 - --with-qt-version=5 \
103 - $(use_enable doc) \
104 - STRIP=true
105 -}
106 -
107 -src_compile() {
108 - # enforce all to avoid the automatic silent rules
109 - emake all
110 -}
111 -
112 -src_install() {
113 - # non standard destdir
114 - emake install destdir="${ED}"
115 - einstalldocs
116 -
117 - insinto /etc/xca
118 - doins misc/*.txt
119 -
120 - ewarn "Make a backup copy of your database!"
121 - ewarn "Version 2 completely changes the database format to SQL(ite)"
122 - ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
123 -}
124 -
125 -pkg_postinst() {
126 - xdg_desktop_database_update
127 - xdg_mimeinfo_database_update
128 -}
129 -
130 -pkg_postrm() {
131 - xdg_desktop_database_update
132 - xdg_mimeinfo_database_update
133 -}
134
135 diff --git a/app-crypt/xca/xca-2.3.0.ebuild b/app-crypt/xca/xca-2.3.0.ebuild
136 index c13f1050b14..556779ccf8e 100644
137 --- a/app-crypt/xca/xca-2.3.0.ebuild
138 +++ b/app-crypt/xca/xca-2.3.0.ebuild
139 @@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
140
141 PATCHES=(
142 "${FILESDIR}/${PN}-1.0.0-desktop.patch"
143 + "${FILESDIR}/${PN}-bug-73300.patch"
144 )
145
146 src_configure() {