8 files changed, 166 insertions, 211 deletions
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 7771e5c89ed7..5a4928531739 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
+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.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/metadata.xml b/app-crypt/xca/metadata.xml
index d1bb33e0aab1..3332a003a6ef 100644
--- a/app-crypt/xca/metadata.xml
+++ b/app-crypt/xca/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>ikelos@gentoo.org</email>
-        <name>Mike Auty</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">chris2511/xca</remote-id>
-    </upstream>
+  <maintainer type="person">
+    <email>graaff@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">chris2511/xca</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-crypt/xca/xca-2.1.2.ebuild b/app-crypt/xca/xca-2.1.2.ebuild
deleted file mode 100644
index ed4c28eb1c00..000000000000
--- a/app-crypt/xca/xca-2.1.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 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 ~x86-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 "This version 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.2.1.ebuild b/app-crypt/xca/xca-2.2.1.ebuild
deleted file mode 100644
index e8d94c254cf3..000000000000
--- a/app-crypt/xca/xca-2.2.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 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 ~x86-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
deleted file mode 100644
index 0473f9f3358c..000000000000
--- a/app-crypt/xca/xca-2.3.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 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 ~x86-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_prepare() {
-	sed '/^CFLAGS/s@-O2 -ggdb@@' -i Local.mak.in || die
-	default
-}
-
-src_compile() {
-	# enforce all to avoid the automatic silent rules
-	emake all
-}
-
-src_install() {
-	default
-
-	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_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-crypt/xca/xca-2.5.0.ebuild b/app-crypt/xca/xca-2.5.0.ebuild
new file mode 100644
index 000000000000..95beaa18b556
--- /dev/null
+++ b/app-crypt/xca/xca-2.5.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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/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="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:*
+	doc? ( app-text/linuxdoc-tools )"
+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}/${PN}-2.4.0-man-page.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DQTFIXEDVERSION=Qt5
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc/xca
+	doins misc/*.txt
+
+	dosym xca /usr/bin/xca-console
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-crypt/xca/xca-2.6.0.ebuild b/app-crypt/xca/xca-2.6.0.ebuild
new file mode 100644
index 000000000000..c9e4d8aa423b
--- /dev/null
+++ b/app-crypt/xca/xca-2.6.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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/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="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:*
+	doc? ( app-text/linuxdoc-tools )"
+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}/${PN}-2.4.0-man-page.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DQTFIXEDVERSION=Qt5
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	virtx default
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /etc/xca
+	doins misc/*.txt
+
+	dosym xca /usr/bin/xca-console
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}