gentoo resync : 03.03.2021

5 files changed, 66 insertions, 4 deletions

diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index d875a0bdd169..96243ae4185f 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,8 +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
-DIST xca-2.2.1.tar.gz 1339412 BLAKE2B 5d3e33a711919d85bc3457ddd596f2272f0136d96290aeb31e6d03ea86faff00be3590862e4c96d9214542db1bd536d0d22c6c04cd5071b253bbefe3ab3f4f56 SHA512 90eaf4a859779d57a4c0201dc403d67e005bd540145b9f543e13b8d5c42199f2ea05543de24b071d19a0db8e5b1e9f3bef2aea4bfe9f71f81007a5f5bb3ba406
 DIST xca-2.3.0.tar.gz 1354154 BLAKE2B 31a4ac96819e8d2f7e5f623cc343f0cbff18c931ed0699dbe093dcb963c3431a3943c4dcd8f3d727896104c05a565d062b9678169bf2a8d3f7cf7748c311b53b SHA512 35522aa308e1022a739f3255f13fcf63f481000f9b7411027a009a185e33ddceeb5cf9b55406a4899d2393c7e5ace10354ff24b3b2b0c3045d110f679756b0b8
+EBUILD xca-2.1.2-r1.ebuild 1484 BLAKE2B 11e7c94703b86123a93b7fa7f76f76c8bff680f15307206aec81f00beb26f8eb159eb0ce11eb4064d6a96fcca8298aefb4fc9dd483c998af8f6d818e2836002e SHA512 6d1f1a34562bbd093d99812e5e663b09061d2e5f4619fcc372c0fd524db97651a65da2c48159913b05d580339ab4625e6d4646433645da00090fe42d85a481f5
 EBUILD xca-2.1.2.ebuild 1444 BLAKE2B b349a5611dfffcd352eb3382cc731059424a37c553c5a859eb32c27bce8de5375f96ba4537d2945d96cecd2b0603200f45f8139a512c36dd1e9ab83ff3e25a3d SHA512 a87593bd09dab9e2afb41340f6e8d4383ae68a1ba9f8d5d122246b09c148efb62e25719823409b34d3d48103d4dc45e4d0b66aa3f87390b45d8ab25f5f72cabb
-EBUILD xca-2.2.1.ebuild 1444 BLAKE2B d10ee7eb680077f40b7ba85a39c3f3d835171058d74d3b16f78f84caa588bebe2b7c7b1f483d5903f0d251349ec38fa03888eec6cc80626246375bb1926eaf9f SHA512 c6650b27b3fda7337e3a298eb84a9d0a2cb59e50f9ebcae6f8d08f582f10edccec400bf71cb842a1a4a93a8d7fbb9febd77ced3749480dcd25feb769fe37007b
-EBUILD xca-2.3.0.ebuild 1511 BLAKE2B d1b2054d3a81c62aaa718faaae9f0109fd277f4387691f364b1f9d2dfd501508394aec536b905d4ee99e04ca61ba001593ac50cea9a202a80d0677e85ad990bc SHA512 9f89e3e30481472796403ac8567b87ba4203828d24cc1b329e426cd7e79f3a61c2a5888d75faf71830c758130f47f59afd313dad9df9370a4e38458dfb322601
+EBUILD xca-2.3.0.ebuild 1548 BLAKE2B dcbbccbb3bf824f1024d914fc4f7af8cdb15e34a4da9c6044a159d9a4295bcd0e2f0257380aef995a782b5440171b80aebc9e6414579ca67b2e5e352474bd526 SHA512 d897a1ec8fb0904032b3de376b8b6fb5061e5eb6f5d0df90751d80c06b9e316a8d2c4b8b6a1ca3e02e291afc463bb2c263623c816e488a239b4eb1d631486f81
 MISC metadata.xml 350 BLAKE2B 825e045b03a40c1b9a3c5af631d1748532ad4c84e83d0efd1d4866c5cc1284afab67f1e3e00a2c31a376a19d4e4608404a5830ab1a8a738079a3b6128f5c9bad SHA512 fd4e95bcd679b22bdfa620896e81e0a63bc6f084c60bf42caa853f9dcef2c797ff640801f206caceb6969ee4e347492200b37af4920c50c9764a3bac48910cf3
diff --git a/app-crypt/xca/files/xca-2.1.2-bug-733000.patch b/app-crypt/xca/files/xca-2.1.2-bug-733000.patch
new file mode 100644
index 000000000000..3e17a8aa9a91
--- /dev/null
+++ b/app-crypt/xca/files/xca-2.1.2-bug-733000.patch
@@ -0,0 +1,31 @@
+diff --git a/doc/Makefile b/doc/Makefile
+index 7c9a643..f88c209 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -3,15 +3,11 @@ TOPDIR=..
+ BUILD=..
+ endif
+ 
+-DELFILES=xca*.html xca.1.gz changelog.html database_schema.html
++DELFILES=xca*.html 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.3.0-bug-733000.patch b/app-crypt/xca/files/xca-2.3.0-bug-733000.patch
new file mode 100644
index 000000000000..044575475c89
--- /dev/null
+++ b/app-crypt/xca/files/xca-2.3.0-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.1.2-r1.ebuild
index 321c828980ab..28e0f2da477f 100644
--- a/app-crypt/xca/xca-2.2.1.ebuild
+++ b/app-crypt/xca/xca-2.1.2-r1.ebuild
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
+	"${FILESDIR}/${P}-bug-733000.patch"
 )
 
 src_configure() {
@@ -50,7 +51,7 @@ src_install() {
 	doins misc/*.txt
 
 	ewarn "Make a backup copy of your database!"
-	ewarn "Version 2 completely changes the database format to SQL(ite)"
+	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."
 }
 
diff --git a/app-crypt/xca/xca-2.3.0.ebuild b/app-crypt/xca/xca-2.3.0.ebuild
index c13f1050b141..c7ef3f20b62d 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}/${P}-bug-733000.patch"
 )
 
 src_configure() {