Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-crypt/xca
diff options
context:
space:
mode:
Diffstat (limited to 'app-crypt/xca')
-rw-r--r--app-crypt/xca/Manifest4
-rw-r--r--app-crypt/xca/files/xca-2.3.0-bug-733000.patch28
-rw-r--r--app-crypt/xca/files/xca-2.4.0-bug-733000.patch29
-rw-r--r--app-crypt/xca/files/xca-2.4.0-man-page.patch24
-rw-r--r--app-crypt/xca/xca-2.5.0.ebuild (renamed from app-crypt/xca/xca-2.3.0-r1.ebuild)43
-rw-r--r--app-crypt/xca/xca-2.6.0.ebuild (renamed from app-crypt/xca/xca-2.4.0-r1.ebuild)41
6 files changed, 64 insertions, 105 deletions
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 3a07aa90136a..5a4928531739 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,2 +1,2 @@
-DIST xca-2.3.0.tar.gz 1354154 BLAKE2B 31a4ac96819e8d2f7e5f623cc343f0cbff18c931ed0699dbe093dcb963c3431a3943c4dcd8f3d727896104c05a565d062b9678169bf2a8d3f7cf7748c311b53b SHA512 35522aa308e1022a739f3255f13fcf63f481000f9b7411027a009a185e33ddceeb5cf9b55406a4899d2393c7e5ace10354ff24b3b2b0c3045d110f679756b0b8
-DIST xca-2.4.0.tar.gz 1778572 BLAKE2B 2e90ef264dc53019cc37700b37d5eb0c48904ca371ae1ce0cfe2ad61be8765951ea918d356c1f2764e73d846693a66c903cba1381df5d1a588aae8bb45f8c195 SHA512 e93e2cf9dc48ed43ee9b51e977f825d81ff08835eb4d77fcbe8f9dc8ce31c77c1da879b48c25ab535717542d1fe84faa6e46c410c116edbee02072040c59667c
+DIST xca-2.5.0.tar.gz 1850445 BLAKE2B e12666fc0513cd04bd61d4e182851c055c120425ad8d2fb2698396429b7afb4cc57c77be6d6cc3f63f9d49d5a179123b336d43dde57ef4a3274e7ba1a06f22f7 SHA512 8b283509849c9ac34d5250c780dc0c7a6319eb3201ae892fc2c38e5257d7db4e565e88167a687ffc1ca436068a41cd48fad59d3ecc8235678d46cf026280bd5e
+DIST xca-2.6.0.tar.gz 1874590 BLAKE2B a6a83df88209d6c929bfd5781f6d56b01498d3b9d296a66f4e513f279fc3c14749e1af1f765e863b26e49807a00f5c11e40f8e16f965e23025d835b58eaf4dfc SHA512 4797445e818545c92ded8f611e53f36cab85b527772a531d7a3fae5c5fdb87e1be34139ffeb906239bc3a02221807e2d7c286990ce68f92c1964545cb8fd7986
diff --git a/app-crypt/xca/files/xca-2.3.0-bug-733000.patch b/app-crypt/xca/files/xca-2.3.0-bug-733000.patch
deleted file mode 100644
index 044575475c89..000000000000
--- a/app-crypt/xca/files/xca-2.3.0-bug-733000.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/files/xca-2.4.0-bug-733000.patch b/app-crypt/xca/files/xca-2.4.0-bug-733000.patch
deleted file mode 100644
index 0863c906957e..000000000000
--- a/app-crypt/xca/files/xca-2.4.0-bug-733000.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/doc/Makefile 2021-05-07 22:40:29.000000000 +0200
-+++ b/doc/Makefile 2021-08-11 07:29:33.794844656 +0200
-@@ -12,16 +12,12 @@
-
- SPHINX_FILES=$(patsubst %,sphinx/%.rst,$(RST_FILES))
-
--.build-stamp doc: xca.1.gz html/index.html qthelp/xca.qhc
-+.build-stamp doc: xca.1 html/index.html qthelp/xca.qhc
- qthelpfiles=qthelp/*.html qthelp/xca.qhc qthelp/xca.qch
- .install-stamp: doc
-
- include $(TOPDIR)/Rules.mak
-
--%.1.gz: %.1
-- @$(PRINT) " MAN [$(BASENAME)] $@"
-- gzip -9 <$^ >$@
--
- xca.1: xca.1.head xca.1.options xca.1.tail
- cat $^ > $@
-
-@@ -43,7 +39,7 @@
- $(ENABLE_DOC)install -m 755 -d $(DESTDIR)$(htmldir)
- $(ENABLE_DOC)install -m 644 $(qthelpfiles) $(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: $(doc)
- mkdir -p $(APPDIR)/Resources
diff --git a/app-crypt/xca/files/xca-2.4.0-man-page.patch b/app-crypt/xca/files/xca-2.4.0-man-page.patch
new file mode 100644
index 000000000000..a5b52176418d
--- /dev/null
+++ b/app-crypt/xca/files/xca-2.4.0-man-page.patch
@@ -0,0 +1,24 @@
+--- a/doc/CMakeLists.txt 2023-09-09 11:10:22.671031619 +0200
++++ b/doc/CMakeLists.txt 2023-09-09 11:17:15.398798825 +0200
+@@ -138,7 +138,7 @@
+ if (NOT WIN32)
+ add_custom_command(
+- OUTPUT "${D}/xca.1.gz"
++ OUTPUT "${D}/xca.1"
+- COMMAND cat "${S}/xca.1.head" "${D}/xca.1.options" "${S}/xca.1.tail" | gzip -n9 > "${D}/xca.1.gz"
++ COMMAND cat "${S}/xca.1.head" "${D}/xca.1.options" "${S}/xca.1.tail" | cat > "${D}/xca.1"
+ DEPENDS "${S}/xca.1.head" "${S}/xca.1.tail"
+ "${D}/xca.1.options"
+ COMMENT "Compiling man page"
+@@ -148,9 +148,9 @@
+ COMMAND xcadoc man "${D}/xca.1.options"
+ COMMENT "Generate 'man' commandline documentation"
+ )
+- add_custom_target(manpage ALL DEPENDS ${D}/xca.1.gz)
++ add_custom_target(manpage ALL DEPENDS ${D}/xca.1)
+ if (NOT APPLE)
+- install(FILES "${D}/xca.1.gz"
++ install(FILES "${D}/xca.1"
+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
+ )
+ endif()
diff --git a/app-crypt/xca/xca-2.3.0-r1.ebuild b/app-crypt/xca/xca-2.5.0.ebuild
index e0b579e762e2..95beaa18b556 100644
--- a/app-crypt/xca/xca-2.3.0-r1.ebuild
+++ b/app-crypt/xca/xca-2.5.0.ebuild
@@ -1,60 +1,55 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI="8"
-inherit xdg-utils
+inherit cmake 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"
+#SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/chris2511/xca/archive/refs/tags/RELEASE.${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/xca-RELEASE.${PV}"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bindist doc"
+IUSE="doc"
RDEPEND="
dev-libs/libltdl:0=
+ dev-qt/qthelp:5
dev-qt/qtgui:5
dev-qt/qtsql:5[sqlite]
dev-qt/qtwidgets:5
- dev-libs/openssl:0=[bindist(-)=]
+ dev-libs/openssl:*
doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5 doc? ( dev-python/sphinx dev-python/sphinxcontrib-htmlhelp dev-python/sphinxcontrib-qthelp )"
PATCHES=(
"${FILESDIR}/${PN}-1.0.0-desktop.patch"
- "${FILESDIR}/${P}-bug-733000.patch"
+ "${FILESDIR}/${PN}-2.4.0-man-page.patch"
)
src_configure() {
- econf \
- --with-qt-version=5 \
- $(use_enable doc) \
- STRIP=true
-}
-
-src_prepare() {
- sed '/^CFLAGS/s@-O2 -ggdb@@' -i Local.mak.in || die
- default
+ local mycmakeargs=(
+ -DQTFIXEDVERSION=Qt5
+ )
+ cmake_src_configure
}
src_compile() {
- # enforce all to avoid the automatic silent rules
- emake all
+ cmake_src_compile
}
src_install() {
- default
+ cmake_src_install
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."
+ dosym xca /usr/bin/xca-console
}
pkg_postinst() {
diff --git a/app-crypt/xca/xca-2.4.0-r1.ebuild b/app-crypt/xca/xca-2.6.0.ebuild
index 7043f4793b74..c9e4d8aa423b 100644
--- a/app-crypt/xca/xca-2.4.0-r1.ebuild
+++ b/app-crypt/xca/xca-2.6.0.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-inherit xdg-utils
+inherit cmake virtualx 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"
+SRC_URI="https://github.com/chris2511/xca/archive/refs/tags/RELEASE.${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/xca-RELEASE.${PV}"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bindist doc"
+IUSE="doc"
RDEPEND="
dev-libs/libltdl:0=
@@ -20,42 +21,38 @@ RDEPEND="
dev-qt/qtgui:5
dev-qt/qtsql:5[sqlite]
dev-qt/qtwidgets:5
- >=dev-libs/openssl-1.1.0:0=[bindist(-)=]
+ dev-libs/openssl:*
doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5 doc? ( dev-python/sphinx dev-python/sphinxcontrib-htmlhelp dev-python/sphinxcontrib-qthelp )"
PATCHES=(
"${FILESDIR}/${PN}-1.0.0-desktop.patch"
- "${FILESDIR}/${P}-bug-733000.patch"
+ "${FILESDIR}/${PN}-2.4.0-man-page.patch"
)
src_configure() {
- econf \
- --with-qt-version=5 \
- $(use_enable doc) \
- STRIP=true
+ local mycmakeargs=(
+ -DQTFIXEDVERSION=Qt5
+ )
+ cmake_src_configure
}
-src_prepare() {
- sed '/^CFLAGS/s@-O2 -ggdb@@' -i Local.mak.in || die
- default
+src_compile() {
+ cmake_src_compile
}
-src_compile() {
- # enforce all to avoid the automatic silent rules
- emake all
+src_test() {
+ virtx default
}
src_install() {
- default
+ cmake_src_install
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."
+ dosym xca /usr/bin/xca-console
}
pkg_postinst() {