6 files changed, 53 insertions, 80 deletions
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 0e154438b722..0d6bab6984e3 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,9 +1,9 @@
 AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38fce6781dcd86b926e03b245de05b148d8df9034f5c7470dcf5823bd4a080cbb011a1a32fc0b96d8a8a5d950d SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163
 AUX xca-2.1.2-bug-733000.patch 1027 BLAKE2B 2bdd30afcfd0f2bf49c2f259ae3f08ea2caba5efbbd19c931aaa3905dd9a4eb7c2937b7b7789a342ff5010a1ffb90abc0aaf6caa61e1ac13355c1d056a55e7ea SHA512 c9feddb9978fbcb2c146fd57ee056fc78904f59e98585a648e7e12b8238d8c499c6c3505731aff0a18b136352bd62d3464110985816f2d88bed77bcf34fa11fd
 AUX xca-2.3.0-bug-733000.patch 949 BLAKE2B 32444301ee1a3e4cd9e31e0911df6fbb99866b3d81ebb880ae46816c9939f8ccf6f3e13bb2052c6619e567f2beb34e903ba438ba6815bbcca03f0cd5a38e4bca SHA512 515e1d1333e722bc22750ef084e0c01056687b28e4b3e78695da2273be3e1e5cb7dc56c5dbf4fb5a6f46bc1835b44a7697d5548223fe9e93c3ad183f1c333d70
-DIST xca-2.1.2.tar.gz 1086563 BLAKE2B d48727fffad16d840633af6e0ee38a279978a5b865eb6f391a3d852a0105817254ea0a4780875f2956e1f7e9931e6930c6ffbe82b117dbf8ad0058ec9d6f5c88 SHA512 1f104a22b83b802576b4820b7139971da50f9b3dd70aca8e1199e996bad4379b8681bb31b197b84a3dfa49cef4ae093f6622d15fac9667547ff47af43c1e5f07
+AUX xca-2.4.0-bug-733000.patch 873 BLAKE2B f63029bf31f69058728db74cb798f641be7210e54a93ee0caaa039cd8bf468106f2d79cab8c8af4891cba6a674b415f75cdb7e4acf74196809138b0fd3a91e4a SHA512 d50ca729596370d3e696f6eebdfad11df6ff1da452b4125b0ccfaa10a0e11b79bc82a2adb576524f6c3bdbb418aaf86ccabe3e7735ddece54f0ca1e88eb30678
 DIST xca-2.3.0.tar.gz 1354154 BLAKE2B 31a4ac96819e8d2f7e5f623cc343f0cbff18c931ed0699dbe093dcb963c3431a3943c4dcd8f3d727896104c05a565d062b9678169bf2a8d3f7cf7748c311b53b SHA512 35522aa308e1022a739f3255f13fcf63f481000f9b7411027a009a185e33ddceeb5cf9b55406a4899d2393c7e5ace10354ff24b3b2b0c3045d110f679756b0b8
-EBUILD xca-2.1.2-r2.ebuild 1379 BLAKE2B 7f0d20eaf5f098647b45f0cf8cd43ff37ff9e76b6633cd15fc413b8cbf94b511cc6255f131d1a8081c12acb5260932160bedd66465fa04e99dccc2b4c51bfd59 SHA512 d7dea551a70ae27cd1ab99b8a7c4f735f8d8a92e657ab7a201bbf23cfd1674ad8bc4a574936d911fc13a93452ad7d8e6d03acccdb6e2d254761fa6f006271d46
-EBUILD xca-2.1.2-r3.ebuild 1419 BLAKE2B 37fa552a88d1db76433fcb624e365a37722c91efd67320388ce9ed960ae42f258396bc023243e517ecfbc719b39c462563eb7e5b1cfe7b0a332a5c46132cfc24 SHA512 48273a493bac493f51edbf7fcec68445a90c6a862f1448a5161c87bdfd000dceb620a5e1a630dda348b8efeb83822f48b891d64a44888c2e532161c460dea0cb
-EBUILD xca-2.3.0-r1.ebuild 1481 BLAKE2B 89311266c3109ceeb84a49cd8cb7846f84bcb7e171dfd040e46dd42b356219103e6891ed3d88d56924b75f08112e8cd70511657ad7ee2ad807c0b69e154ac3e7 SHA512 1078d6b020b1d2a88c890f7c90db1e2e1307cc1e4a4f223bf6c7d6d10e4e20342d0b73beba32688561251e9f7fea379c7bd874cff9babf9d013a1422d82ecac8
-MISC metadata.xml 260 BLAKE2B 2acf7ad333bcf144a2dfee1d3e0e200eb0d89d97d18737c7fb3a99418f8af18dee8fdc45405287dc32592923ad0097bfbd4c8084de9a3543fef33561e91ac688 SHA512 fa99c4854b35dddf320085f07fa0b4382e74cc786bd47726e62c8ad489ee2d32375f1b0515c1119af345f85da7f4167845566ab9f363f4a17c037aedb1bf56d7
+DIST xca-2.4.0.tar.gz 1778572 BLAKE2B 2e90ef264dc53019cc37700b37d5eb0c48904ca371ae1ce0cfe2ad61be8765951ea918d356c1f2764e73d846693a66c903cba1381df5d1a588aae8bb45f8c195 SHA512 e93e2cf9dc48ed43ee9b51e977f825d81ff08835eb4d77fcbe8f9dc8ce31c77c1da879b48c25ab535717542d1fe84faa6e46c410c116edbee02072040c59667c
+EBUILD xca-2.3.0-r1.ebuild 1480 BLAKE2B a87a7c58d35d2d027e86da61fe682956fb0e20d6905e4fa97f3c2d7a8148c625c8fab62a96d0421b8719921dd1cf878a88c1249d28ef40243beb0ba010b43743 SHA512 c2c21337ae03998a759fcd7601b1f788547766bab9e0d467df71bd467b2294702799638bccf86f018f6558d9b57ef00821dc31e89294c710dfc19e7f0c09c76c
+EBUILD xca-2.4.0-r1.ebuild 1508 BLAKE2B 727ba52d8fe71c28a1e92e2ef583b6e17d62e7eb759a37c5011846fa491cff2e2d39797c6cee948fcf80df9f6b227b7f54b462206f66156b21530c2c0e60880f SHA512 7b4ecdd8e4d98ad23742237b3c43126b6d92f5aae2402ec906ae34109b1379ddd1723b3a29b31f505f5e50008381bddeeb70cbf7b7e846be6d6e7534405514a6
+MISC metadata.xml 303 BLAKE2B 1e9088c88eb766bb66741d3b3b457cfee5078e1630b0ad4a535324458d3640e7824f2640116804789f1edd0fae7e2057f74457e09846db667df877903f63a4c9 SHA512 cedc4821882cc90a80ab9584443e3fe97b5a60f79a78b572d04553af1ed30da865225d771e3665145ac6cb07a15c32332d31d6d070558d24380ece2b22835186
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
new file mode 100644
index 000000000000..0863c906957e
--- /dev/null
+++ b/app-crypt/xca/files/xca-2.4.0-bug-733000.patch
@@ -0,0 +1,29 @@
+--- 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/metadata.xml b/app-crypt/xca/metadata.xml
index 33bb01cf6387..848985b07a47 100644
--- a/app-crypt/xca/metadata.xml
+++ b/app-crypt/xca/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <!-- maintainer-needed -->
-    <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-r2.ebuild b/app-crypt/xca/xca-2.1.2-r2.ebuild
deleted file mode 100644
index d8d670c194fb..000000000000
--- a/app-crypt/xca/xca-2.1.2-r2.ebuild
+++ /dev/null
@@ -1,64 +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"
-
-RDEPEND="
-	dev-libs/libltdl:0=
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-libs/openssl:0=[bindist(-)=]
-	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.3.0-r1.ebuild b/app-crypt/xca/xca-2.3.0-r1.ebuild
index bcbc019ab4a3..e0b579e762e2 100644
--- a/app-crypt/xca/xca-2.3.0-r1.ebuild
+++ b/app-crypt/xca/xca-2.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bindist doc"
 
 RDEPEND="
diff --git a/app-crypt/xca/xca-2.1.2-r3.ebuild b/app-crypt/xca/xca-2.4.0-r1.ebuild
index 6e2db7804634..7043f4793b74 100644
--- a/app-crypt/xca/xca-2.1.2-r3.ebuild
+++ b/app-crypt/xca/xca-2.4.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit xdg-utils
 
@@ -16,10 +16,11 @@ IUSE="bindist 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-1.1.0:0=[bindist(-)=]
 	doc? ( app-text/linuxdoc-tools )"
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
@@ -36,30 +37,35 @@ src_configure() {
 		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() {
-	# non standard destdir
-	emake install destdir="${ED}"
-	einstalldocs
+	default
 
 	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 "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
 }