gentoo resync : 17.06.2021

6 files changed, 8 insertions, 6 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 3945dbec2642..687ca5968409 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 6b8690a4123b..70031ed5a36a 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -1,9 +1,9 @@
 AUX 99i2pd 44 BLAKE2B d7a2d45f79ecb34f50eaddc09f318339eedfb2444d0a96d97691c6f3950e63f8f827ec3697ec52f60e29c3e01f232d6c12cf776883672203f01645e5e2d5d994 SHA512 0bd08ff5b1b2ad8d91572efee848a760e2fb46d9c1a5ead3fbdde91d679d832d985905952b393eb523ec9d8f1815bf1512ae61fbc059d10f0773991ac097c23f
 AUX i2pd-2.25.0-lib-path.patch 725 BLAKE2B ad87fbfae2cb78945d0e0f62ea9d0ab45e1676908ebb11d6c4844a6160e0eb2714fa1221e886d158454a7ba3c19af7d1bb672035195993fb4633162a761e3bcb SHA512 1e1942c8c424ecefb0b62ee96973b2b238553a887a42cb5d9206cbea31e3136b7b3ad0b8ff1f290cbb507f1cc404e8a6e3c1a52551ac0aa719fbadbcf5ccc43b
+AUX i2pd-2.38.0-r1.logrotate 294 BLAKE2B 183e9d0a88a3ff4b1116d4f8475862ed110cf2bad43a1858b55fb6b502bf0c7fc975958e7a88fe9cf2bb331330e7aa70f13a3d9ce64fb525060bd84e965af5f2 SHA512 d2460d1d1b65222a0e3b89e464e75b2fd94fc65a49afe78a26c19e7a3c097b2334c02d58faad5f4ff06e3e4847425ed383f1963be2dbb9282a77c5b287a30fe2
 AUX i2pd-2.38.0.service 906 BLAKE2B 583c1856ceada5e60b7f595452afbe3e254616185d641e63f7931ccc972a52123745f72f1fffaf122be6fd3d4dadb311d58f4d639e0d2ba2187bde21f5340d2d SHA512 233722990f5e9934558b05a0aee5e0ef6af9bcd0b5f9c38cb9d1e61ffa37a4d80f403047dc15ec706bc03185d2e1ca27015210b6757a71786ad0bb4b75662981
 AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d21ef4d83620c064838d0e27f89f287a97404276490b848bd1372a40b915d4830b7755d801c4bda551099 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9
 AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5
-AUX i2pd-2.6.0-r3.logrotate 215 BLAKE2B 07cd3e250996ae2d4632795174750779a199c31107ed82a561b3f1dca84c6a81b6bac178ea06256325a2946876b9e75f9f6c453e5836a23911d5ecd802dc8b59 SHA512 e6080b719cb1616a96b4e4e9ff7074881f88dc699147fd5a201861c5836cf4807a00767a2c370f36e847b0d4ddb2129d8c3c3fc8043325fb8f3d0bc27feca2a3
 DIST i2pd-2.38.0.tar.gz 555543 BLAKE2B a47c4b77e3a1d4c88cfd18b288b53592a8096509e0bed01bbf57f8d81b715699f822059cd9eecc0deb8fc82d98c23a8c0f6a67ac71654da528f81785338bfe54 SHA512 01e160394dc07621b3d236fcc13d78b46e109290f59dbb77f282c05f4d80fdfa01c9b062de5ca91d6d6e739beb8a5b6f731508b48d9483f1a132a93a71d88e6f
-EBUILD i2pd-2.38.0.ebuild 2214 BLAKE2B bb70fe86af18f70cd99fe0447ecdf1409787a2b756312164daa9c71b4e3d1fb4cf70cc57ceb97697d572b89e5219aa67fe7b18fe7cf06f69e4feff756ef0c5c8 SHA512 866c8ba29e4191e8ae7d3174763efbb81653d2505275e132fd78071d943a25660a8d4bf91d7f1e278cc49788a2e4835907cb97c5a756b7ce3b9394faa0c8506d
+EBUILD i2pd-2.38.0-r1.ebuild 2215 BLAKE2B 573602917de4a854582de366a8d00e6f7ac9e3cbe9aacc262acb3697ef351e20a50a495a3857f1ebf1789276462211edcaf13194d4dab50cfe80a6fb613ca26d SHA512 550ea1400297f7c44142504c2635af1e9f98acceab266f0604e4271b37291db8d747f54dc304136d8b4b1dc7d9bbab479e0ebb43688e628d31f317370f389fea
 MISC metadata.xml 727 BLAKE2B 2956a473062444342fb7436a09686b9774210105445288152df0e024fdf81b93b86782a1e3e5348ce8d4a2d71383db3ed63dd51dde00abadcfdce5f84819b37f SHA512 0362e22d09aa7735d12b66da01cc717704429750a57dc2cc625c2907525c935764ede0a83ef4908417542bc0afe24cb21ada71ee3100dffdb3d3b2ab3999da38
diff --git a/net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate b/net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate
index 251128b7be78..9245bca8c48e 100644
--- a/net-vpn/i2pd/files/i2pd-2.6.0-r3.logrotate
+++ b/net-vpn/i2pd/files/i2pd-2.38.0-r1.logrotate
@@ -5,7 +5,9 @@
         notifempty
         create 640 i2pd i2pd
         postrotate
-                /bin/kill -HUP $(cat /run/i2pd/i2pd.pid)
+                if [ -f /run/i2pd/i2pd.pid ]; then
+                    /bin/kill -HUP $(/bin/cat /run/i2pd/i2pd.pid)
+                fi
         endscript
 }
 
diff --git a/net-vpn/i2pd/i2pd-2.38.0.ebuild b/net-vpn/i2pd/i2pd-2.38.0-r1.ebuild
index 847dab8ce292..b77a5dab495a 100644
--- a/net-vpn/i2pd/i2pd-2.38.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.38.0-r1.ebuild
@@ -79,7 +79,7 @@ src_install() {
 
 	# logrotate
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/i2pd-2.6.0-r3.logrotate" i2pd
+	newins "${FILESDIR}/i2pd-2.38.0-r1.logrotate" i2pd
 }
 
 pkg_postinst() {
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 474e6da63729..883996fd5755 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -16,6 +16,6 @@ DIST tor-0.4.6.5.tar.gz 7754823 BLAKE2B bdff61863f8b48381cc52d66c54f417e90177118
 DIST tor-0.4.6.5.tar.gz.asc 833 BLAKE2B 966ab724e37dd341c3ef45f2aeb7e1c928270831ea790cb6cb0e77084a0c813d66ce35c5d31d49bf9d1e9a6ecfb3d4fb6ee4424fd83183d654016d22fcb90d7e SHA512 1cf9111ba08594c716874a2b6f35a7959c5c391518ec1e5b1491d84454f3fe1c705e06dfcfd23f30e0eb619063304c430cbebc9827190df0b03ec09cecd1773c
 EBUILD tor-0.4.4.9.ebuild 2794 BLAKE2B 561a2af6b4e64dd50cd04f30a8fb5a67e56d6759a5d6144c19db21b914e9d5be44947d897769a4f8f3d2b6ba7faa73e9d0f36caff73ff14e10934014f0481059 SHA512 3b6b96b82ba712d4258818cce58a51baaa097ac2c249ba51ed53e9c689ccc85fa7e43ee44c62919911c8474eb106ea1ae5384272e2751cb6331954b315221dfc
 EBUILD tor-0.4.5.7.ebuild 2785 BLAKE2B 806c5ed6f41d3f7e792127dfdd92d7d015a6f5b9cfdf182523896503ef86bc72a239abfd20f2badca408254a04e8b440e4d1f405794c02385a5ffcd9270bcbe5 SHA512 42a07d094edff6560f6b20c588ae6ec41ccbf20a5bc8dd3255badbfe2f09c07bb739356120ea4b6d4287b4b03652c17d32f46a511111d6040b6a8d8074676f18
-EBUILD tor-0.4.5.9.ebuild 2547 BLAKE2B c92a1e8d85cee22ca2f23781c433154fe7b2276e506adacb5213ba0262ab997b6d2c5b261895c1da3dba21c805483e475ce320f6c3cbd7ea627130aa9f4f4b3e SHA512 7d225ab54bce43b0d1028129141aae604092ec3a2a6f35ac4bf6a4ac107067a0c4b68266b3df75134065cdf38778a95b6c277175ea3074b727f15fc6ed1a546b
+EBUILD tor-0.4.5.9.ebuild 2541 BLAKE2B ae1d9127c828b13a877e7d620c70863f473daf722ff0cecc26b4bd2fc0120c24183c930fbc1d24f3cd0be7e3269644473bc75ad910d7e56e22093cf1f0ef908c SHA512 45a469f5e22244d2d5138bba4994c60fc889d19d3cdbe02c3e6d4a105d1d773467a7411ef2e073e7230756c054e9bbc03991fe9b7f844764270737ded22490e6
 EBUILD tor-0.4.6.5.ebuild 2739 BLAKE2B e9f1b852aed9b3124be411c407f4c5686ed8645957b31acf1aedc349b3290cb0a745b7c28801fe19415c2a5531064fa596af50e3db0e0143aa0a883cb983ac31 SHA512 ae8ca192172d72aa4829a4760a6d4734e0895153eeb6fc785a98aea4fdbd77c094af1b288f3b5feec6db8a897a1d23cc59a5e842488bb3678c91b6e8175e864a
 MISC metadata.xml 549 BLAKE2B af6257c0e04c7487b23edb1f5c6fce91fbb76aedf9c0357bb4f214ff4af9d6055e0c6bb32fef5c9906f461f34b5631891a681a039612c73feecff8ff77a0a3c2 SHA512 2b9d9c20a9691dd67cb5ef98e386bea8cff9ba79208373922c5a379ca8c96e021e94748d7b85e860a24063f1fc439a3adee59b3dde70cf6b35401d18518b5689
diff --git a/net-vpn/tor/tor-0.4.5.9.ebuild b/net-vpn/tor/tor-0.4.5.9.ebuild
index b89880165801..5616d54e5b3c 100644
--- a/net-vpn/tor/tor-0.4.5.9.ebuild
+++ b/net-vpn/tor/tor-0.4.5.9.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PF}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86 ~ppc-macos"
 IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc