commit: cf9c9af46fbc95833c3c2a7bab002ca77f498a4d Author: Mike Auty <ikelos <AT> gentoo <DOT> org> AuthorDate: Sat Feb 27 19:06:22 2021 +0000 Commit: Mike Auty <ikelos <AT> gentoo <DOT> org> CommitDate: Sat Feb 27 19:07:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9c9af4
app-crypt/xca: Fix documentation issue Bug: https://bugs.gentoo.org/733000 Signed-off-by: Mike Auty <ikelos <AT> gentoo.org> app-crypt/xca/Manifest | 1 - app-crypt/xca/files/xca-bug-733000.patch | 28 ++++++++++++++ app-crypt/xca/xca-2.2.1.ebuild | 65 -------------------------------- app-crypt/xca/xca-2.3.0.ebuild | 1 + 4 files changed, 29 insertions(+), 66 deletions(-) diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest index 7771e5c89ed..d08bc8bc9be 100644 --- a/app-crypt/xca/Manifest +++ b/app-crypt/xca/Manifest @@ -1,3 +1,2 @@ DIST xca-2.1.2.tar.gz 1086563 BLAKE2B d48727fffad16d840633af6e0ee38a279978a5b865eb6f391a3d852a0105817254ea0a4780875f2956e1f7e9931e6930c6ffbe82b117dbf8ad0058ec9d6f5c88 SHA512 1f104a22b83b802576b4820b7139971da50f9b3dd70aca8e1199e996bad4379b8681bb31b197b84a3dfa49cef4ae093f6622d15fac9667547ff47af43c1e5f07 -DIST xca-2.2.1.tar.gz 1339412 BLAKE2B 5d3e33a711919d85bc3457ddd596f2272f0136d96290aeb31e6d03ea86faff00be3590862e4c96d9214542db1bd536d0d22c6c04cd5071b253bbefe3ab3f4f56 SHA512 90eaf4a859779d57a4c0201dc403d67e005bd540145b9f543e13b8d5c42199f2ea05543de24b071d19a0db8e5b1e9f3bef2aea4bfe9f71f81007a5f5bb3ba406 DIST xca-2.3.0.tar.gz 1354154 BLAKE2B 31a4ac96819e8d2f7e5f623cc343f0cbff18c931ed0699dbe093dcb963c3431a3943c4dcd8f3d727896104c05a565d062b9678169bf2a8d3f7cf7748c311b53b SHA512 35522aa308e1022a739f3255f13fcf63f481000f9b7411027a009a185e33ddceeb5cf9b55406a4899d2393c7e5ace10354ff24b3b2b0c3045d110f679756b0b8 diff --git a/app-crypt/xca/files/xca-bug-733000.patch b/app-crypt/xca/files/xca-bug-733000.patch new file mode 100644 index 00000000000..044575475c8 --- /dev/null +++ b/app-crypt/xca/files/xca-bug-733000.patch @@ -0,0 +1,28 @@ +diff --git a/doc/Makefile b/doc/Makefile +index d481c5a..dc5b49a 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -5,13 +5,9 @@ endif + + DELFILES=xca*.html xca.1.gz changelog.html database_schema.html + +-doc: xca.1.gz xca.html changelog.html database_schema.html ++doc: xca.1 xca.html changelog.html database_schema.html + include $(TOPDIR)/Rules.mak + +-%.1.gz: %.1 +- @$(PRINT) " MAN [$(BASENAME)] $@" +- gzip -9 <$^ >$@ +- + xca.html: xca.sgml + rm -f xca*.html + echo 'The documentation for XCA can be viewed online at: <a href="http://hohnstaedt.de/documentation";>http://hohnstaedt.de/documentation</a>.' > $@ +@@ -23,7 +19,7 @@ install: $(doc) + $(ENABLE_DOC)install -m 755 -d $(DESTDIR)$(htmldir) + $(ENABLE_DOC)install -m 644 xca*.html $(DESTDIR)$(htmldir) + install -m 755 -d $(DESTDIR)$(mandir)/man1 +- install -m 644 *.1.gz $(DESTDIR)/$(mandir)/man1 ++ install -m 644 *.1 $(DESTDIR)/$(mandir)/man1 + + app: xca.html + mkdir -p $(APPDIR)/Resources diff --git a/app-crypt/xca/xca-2.2.1.ebuild b/app-crypt/xca/xca-2.2.1.ebuild deleted file mode 100644 index 321c828980a..00000000000 --- a/app-crypt/xca/xca-2.2.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit xdg-utils - -DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc" -HOMEPAGE="https://hohnstaedt.de/xca/"; -SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="bindist doc libressl" - -RDEPEND=" - dev-libs/libltdl:0= - dev-qt/qtgui:5 - dev-qt/qtsql:5[sqlite] - dev-qt/qtwidgets:5 - !libressl? ( dev-libs/openssl:0=[bindist=] ) - libressl? ( >=dev-libs/libressl-2.7.0:0= ) - doc? ( app-text/linuxdoc-tools )" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-desktop.patch" -) - -src_configure() { - econf \ - --with-qt-version=5 \ - $(use_enable doc) \ - STRIP=true -} - -src_compile() { - # enforce all to avoid the automatic silent rules - emake all -} - -src_install() { - # non standard destdir - emake install destdir="${ED}" - einstalldocs - - insinto /etc/xca - doins misc/*.txt - - ewarn "Make a backup copy of your database!" - ewarn "Version 2 completely changes the database format to SQL(ite)" - ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database." -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/app-crypt/xca/xca-2.3.0.ebuild b/app-crypt/xca/xca-2.3.0.ebuild index c13f1050b14..556779ccf8e 100644 --- a/app-crypt/xca/xca-2.3.0.ebuild +++ b/app-crypt/xca/xca-2.3.0.ebuild @@ -27,6 +27,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-1.0.0-desktop.patch" + "${FILESDIR}/${PN}-bug-73300.patch" ) src_configure() {
