summaryrefslogtreecommitdiff
path: root/net-vpn
diff options
context:
space:
mode:
Diffstat (limited to 'net-vpn')
-rw-r--r--net-vpn/Manifest.gzbin4718 -> 4535 bytes
-rw-r--r--net-vpn/i2pd/Manifest4
-rw-r--r--net-vpn/i2pd/i2pd-2.20.0.ebuild (renamed from net-vpn/i2pd/i2pd-2.17.0.ebuild)3
-rw-r--r--net-vpn/libreswan/Manifest6
-rw-r--r--net-vpn/libreswan/libreswan-3.22.ebuild2
-rw-r--r--net-vpn/libreswan/libreswan-3.23-r1.ebuild2
-rw-r--r--net-vpn/libreswan/libreswan-3.25.ebuild2
-rw-r--r--net-vpn/miredo/Manifest9
-rw-r--r--net-vpn/miredo/files/miredo-1.2.5-configure-libcap.diff33
-rw-r--r--net-vpn/miredo/files/miredo-1.2.5-ip-path.patch28
-rw-r--r--net-vpn/miredo/files/miredo.conf.22
-rw-r--r--net-vpn/miredo/files/miredo.rc.213
-rw-r--r--net-vpn/miredo/metadata.xml14
-rw-r--r--net-vpn/miredo/miredo-1.2.5-r2.ebuild60
-rw-r--r--net-vpn/miredo/miredo-1.2.6.ebuild60
-rw-r--r--net-vpn/strongswan/Manifest10
-rw-r--r--net-vpn/strongswan/strongswan-5.5.3.ebuild4
-rw-r--r--net-vpn/strongswan/strongswan-5.6.0-r1.ebuild2
-rw-r--r--net-vpn/strongswan/strongswan-5.6.0.ebuild4
-rw-r--r--net-vpn/strongswan/strongswan-5.6.2.ebuild2
-rw-r--r--net-vpn/strongswan/strongswan-5.6.3.ebuild2
-rw-r--r--net-vpn/tor/Manifest6
-rw-r--r--net-vpn/tor/tor-0.3.4.7_rc.ebuild4
-rw-r--r--net-vpn/tor/tor-0.3.4.8.ebuild (renamed from net-vpn/tor/tor-0.3.3.9.ebuild)6
-rw-r--r--net-vpn/wireguard/Manifest4
-rw-r--r--net-vpn/wireguard/wireguard-0.0.20180910.ebuild (renamed from net-vpn/wireguard/wireguard-0.0.20180904.ebuild)0
26 files changed, 31 insertions, 251 deletions
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index acefe7def16a..c30fe756a941 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
Binary files differ
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 489b7c51251f..0ce1e65a5757 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -4,10 +4,10 @@ AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d
AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5
AUX i2pd-2.6.0-r3.logrotate 215 BLAKE2B 07cd3e250996ae2d4632795174750779a199c31107ed82a561b3f1dca84c6a81b6bac178ea06256325a2946876b9e75f9f6c453e5836a23911d5ecd802dc8b59 SHA512 e6080b719cb1616a96b4e4e9ff7074881f88dc699147fd5a201861c5836cf4807a00767a2c370f36e847b0d4ddb2129d8c3c3fc8043325fb8f3d0bc27feca2a3
AUX i2pd-2.6.0-r3.service 638 BLAKE2B 881b5e680af0dbb674766b4cc0a234e0a49db66f1f4a8ce762326f9bb8fb7437177d9c80988f514c34dd2ba2bab1909a10ee5ef912eee4711ea4ed9c5a6a4423 SHA512 8e35123ea30325e9f1de3d488d96a35b6e983e006084e983ab116aa5febd64feacb7643f3d9c3c7c7865375518e1acef060b4b02e9b052036f8d42f9dcc47a87
-DIST i2pd-2.17.0.tar.gz 1874984 BLAKE2B 0fd265bbd007009196d2a8202885a016092e9abd016e8dd184d8cd61597ba2bb122698bca2bc073c9393b7d7ead3c59e0dcd5145144afdb5b487b4712936b22d SHA512 ea962b8c52bfbfe211aec9e6d73bf630d7680745c915eaf12e468dc02c8c492edf95ac55b4c131e1391cf0d97ba08d58f05e9652d5b2594b839730317b4c8f6e
DIST i2pd-2.18.0.tar.gz 1868440 BLAKE2B a5c65c379b38735bc43c81553416ac1dfd7064da33ff282de2ab7567aaeed1e49edbafb48c03f372f72e70bc4fe0e922036cd08538bf0b6c07e00c2c2f328dd9 SHA512 dc8e0f4df25188e4d72ea6ffa2c36e48a7d2103d025730b40e226ab631724a9a07a4dc03a1a3d08328972c98020c44535661820add80374f1dabdf3fc848ef84
DIST i2pd-2.19.0.tar.gz 1982459 BLAKE2B b05f7a3018091e9c0008ca7037e44b6f5a4416be57054df5f9af72bd664b7d4fc7673e5d3eb1b8bb1ddfb61e81145eb0a847b301a580ef971d181ed00a4c960a SHA512 4c3d2408962f3e55e1a22491b0844ce44cacc7aa631541a86e94554da88e42234576fe221e1398c88e7e68d267bbf9e73cbea9cd74981c354e46ba82d62bb32f
-EBUILD i2pd-2.17.0.ebuild 3100 BLAKE2B 27284f8510bfdf37c3d576fa1f4718134d5f948ee1f614272ae86b94cb2f68acb3f9ad59898f8a2b94280c3aa40e1f4c9410dd20d4ebd02e379099fbbad9db52 SHA512 809418d598459849a6d42322b1fa749f5eabcef3f0f3731ce44d74d5744716b5f3fdf979b1288f88b7667fe4e5aea5c83e73bdf5ff769e22b4d3dfb68306cbf6
+DIST i2pd-2.20.0.tar.gz 1991174 BLAKE2B 37b85dc37299cd6d2f64050eb096ecc11d75ccdcdba845f34c908e6467cbcb9fa7cea9243415bafd7c9167f5e8ea06c8729bcb885e78f45e37680f8001b69237 SHA512 affade889d32fdf20fc0bc4c7bb809fb511794421a80a93334707e26c72eecc83715d756d79ce7924d43ef44dc9f655925de860b5b392b6c4fe815eb873c1864
EBUILD i2pd-2.18.0.ebuild 3100 BLAKE2B 27284f8510bfdf37c3d576fa1f4718134d5f948ee1f614272ae86b94cb2f68acb3f9ad59898f8a2b94280c3aa40e1f4c9410dd20d4ebd02e379099fbbad9db52 SHA512 809418d598459849a6d42322b1fa749f5eabcef3f0f3731ce44d74d5744716b5f3fdf979b1288f88b7667fe4e5aea5c83e73bdf5ff769e22b4d3dfb68306cbf6
EBUILD i2pd-2.19.0.ebuild 3100 BLAKE2B 27284f8510bfdf37c3d576fa1f4718134d5f948ee1f614272ae86b94cb2f68acb3f9ad59898f8a2b94280c3aa40e1f4c9410dd20d4ebd02e379099fbbad9db52 SHA512 809418d598459849a6d42322b1fa749f5eabcef3f0f3731ce44d74d5744716b5f3fdf979b1288f88b7667fe4e5aea5c83e73bdf5ff769e22b4d3dfb68306cbf6
+EBUILD i2pd-2.20.0.ebuild 3164 BLAKE2B a85df4f576fe3b82a49fd2083a8d910b9d9058ec6de930da06c5a4f58d494484b5737ffb368c80f72bb719f7db5a035e8abcf102cc5898e7d7a7d1ca57909000 SHA512 f5a4df46f7e0ec657c9132fe3ae5f6eda09d4869fc42d0fb22af8f821967cb3b7f5bc9a7f6b091e9cd81a89fd1b84c00bfa6c33fccb837d4144c62709f387125
MISC metadata.xml 742 BLAKE2B 81ae213b17776466f9d33a4798bff20494ab8c09872d1a65fcb0ab4d05cbf2a0858c1c7538a205bbefa491a21d0b3deb613a362d7e5493e5c6ac074b1dacbe53 SHA512 ca6b5eea5aeb685632ed742144cf8a3fc19e7b0b1c213ea6fdf62a07a4f7727e8f001189e09daa201563bfbb79539cee0050c739a23320baa4b4d95a4279b553
diff --git a/net-vpn/i2pd/i2pd-2.17.0.ebuild b/net-vpn/i2pd/i2pd-2.20.0.ebuild
index 454dd172bd22..6e3dffbd6c17 100644
--- a/net-vpn/i2pd/i2pd-2.17.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.20.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening libressl static +upnp websocket"
+IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening libressl static +upnp websocket"
# if using libressl, require >=boost-1.65, see #597798
RDEPEND="!static? ( dev-libs/boost[threads]
@@ -51,6 +51,7 @@ pkg_pretend() {
src_configure() {
mycmakeargs=(
-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
+ -DWITH_AVX=$(usex cpu_flags_x86_avx ON OFF)
-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
-DWITH_PCH=OFF
-DWITH_STATIC=$(usex static ON OFF)
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 73f1d340de43..dc19f1dd05b2 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -3,7 +3,7 @@ AUX libreswan-3.25-no-curl.patch 706 BLAKE2B 2d1f74b6b1d65f2e3ddad8646e2e5ea8a4a
DIST libreswan-3.22.tar.gz 6910418 BLAKE2B c06134fa2d1096231797f1ea93de8ed61121472b10ae30ee9a843250dce4ef9f21e7d3bf63f38daf53fbfd8d1e435cfdc704743d0fdcbde8ecac137d9becac48 SHA512 93868327394527750590e1297443d3eb1c9a528d680348098fd2913123dac52c9fecd73b855ee00586c2516b8aa00f7f0d158d8e9b19d7487b5fb26432b86aff
DIST libreswan-3.23.tar.gz 3836073 BLAKE2B ffb27ed75618afcf39c36b7326bb1e4b70ea8337bb4b13951bef95dc13989613c226fe83e031eeba080f55f98262df432b776c3ac5b7b4fb740506f918172ed3 SHA512 3645af522ea9ac868c55bfadfd2cf27dc5acb247543f43290cbe677a90cd00316be6520ca2128b9aaecce2b0293710ae6a2bd710a7d93198b8cb81e32276ced8
DIST libreswan-3.25.tar.gz 3988630 BLAKE2B 8479b5b0d7d49055b7dcefa6c3b2f469b0aa60005e05446d5c1c6f73a32c904835422248c6ead2a1c2dc83b63794fd50f7461fd22c4206414b5890c01b99b722 SHA512 246649cb5bef1d0690217d1080f3f6f175a0d7a5f27e5a7affdf291b2f418a11937e96b64716a33e6312530409a2c1b10b90e2fa5ec339a27c94c990d86ed517
-EBUILD libreswan-3.22.ebuild 2812 BLAKE2B 55b89a58724b02cafcf997295f117a084c1f7e16a65f1adfb0efc783772d3a68be867b24ff038aa8017412b2e4fb716a3aa101d080eda2c9e8a11dfd117c3544 SHA512 23136de2f2a1442318bc692456c32d0675515b508ef6281b33b2f8760bafbbe09ab39d233d552214aecc3e965c22f9fc67bad93902a6be5696117308bf1190cf
-EBUILD libreswan-3.23-r1.ebuild 2867 BLAKE2B f4fb5ffb508732e268199c92ff69d43c14620915bc0b6aa3fb867b56e4c3713a8e2b8dc25ec0e01fd80efad853afb38e54155b0c1a4455b81f0dbb69131c0d79 SHA512 00c4c5399dc14afa872c9b81202bce9d9d1cf5c4eb6a3a34ce2b96f9be5af008edc799fdc7c3c7af8aa36bae2b518f40686e08dc813ba7040e9351c69fcff0bf
-EBUILD libreswan-3.25.ebuild 2854 BLAKE2B 63400801ca0b41f69da5b928f0c42111b574be20279aaf6086aafe78fc683663aa1fc81aace1288016c6f8fee62b56c22e469c26c00d866954f3019312a58b4d SHA512 3ae9ffd9a108948ef5c3d950e4695a174412acd3e97e051441f0c4a972519cf0f5aa7c91c59d4973ce1d00ba43c642530871fba7742036700144b21294d7630e
+EBUILD libreswan-3.22.ebuild 2814 BLAKE2B 566683ee612fd84a0fe4cf49cd90bb2c8f67e9aa151461c0c0e68a9179ce5741203764ac520f9f434d8f02d0a30129d3e39059329ca5f991bed74437be4c117a SHA512 e337d3895fd3fe3a803b7e137407dff4ee5e6c4e9928c157715c1f87a6c877f2be4498d884254379c03d63b95f75e71df01a2d839535bb75bcbee7c770956654
+EBUILD libreswan-3.23-r1.ebuild 2869 BLAKE2B 4b1f18568296d62d907b1f1b2cfdc46d7e9ef98ec14718f1a6783828456b8248a1b879c261f8fff25f28176bf5600de8d5b70d6630ba111b00b1a38b31384625 SHA512 1967acab4b4c72135e7346d6a5bea67a2e62a13164463889e6e66bd646fc61fa61a9100331022f65b003da8071d541e30319c34a6c4fb35b8d464d9a0c2d59e8
+EBUILD libreswan-3.25.ebuild 2856 BLAKE2B 0e2573d71d4f96d6cf271e6d71ad7efffd336877ede43f5ed2f7e35103d8cd67194df195c7bab7d9be513c2ee85c869af8778a8f9fefaf2087e0114b4d052a90 SHA512 be841c666376e6b410b9bd5f15d84c23f3bfa5848ea382b29108ce104cdb22627af145bdaa9b5d5447560705859cc5726643562a109b8b9d126967251c8e0db8
MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.22.ebuild b/net-vpn/libreswan/libreswan-3.22.ebuild
index d770c08f7cee..5b4e7f960e6e 100644
--- a/net-vpn/libreswan/libreswan-3.22.ebuild
+++ b/net-vpn/libreswan/libreswan-3.22.ebuild
@@ -21,7 +21,7 @@ COMMON_DEPEND="
dev-libs/nspr
caps? ( sys-libs/libcap-ng )
curl? ( net-misc/curl )
- dnssec? ( net-dns/unbound net-libs/ldns )
+ dnssec? ( net-dns/unbound:= net-libs/ldns )
ldap? ( net-nds/openldap )
pam? ( sys-libs/pam )
seccomp? ( sys-libs/libseccomp )
diff --git a/net-vpn/libreswan/libreswan-3.23-r1.ebuild b/net-vpn/libreswan/libreswan-3.23-r1.ebuild
index 3a6e2002c930..ccb0c700a84e 100644
--- a/net-vpn/libreswan/libreswan-3.23-r1.ebuild
+++ b/net-vpn/libreswan/libreswan-3.23-r1.ebuild
@@ -21,7 +21,7 @@ COMMON_DEPEND="
dev-libs/nspr
caps? ( sys-libs/libcap-ng )
curl? ( net-misc/curl )
- dnssec? ( net-dns/unbound net-libs/ldns )
+ dnssec? ( net-dns/unbound:= net-libs/ldns )
ldap? ( net-nds/openldap )
pam? ( sys-libs/pam )
seccomp? ( sys-libs/libseccomp )
diff --git a/net-vpn/libreswan/libreswan-3.25.ebuild b/net-vpn/libreswan/libreswan-3.25.ebuild
index 7d073e163347..a8085009764a 100644
--- a/net-vpn/libreswan/libreswan-3.25.ebuild
+++ b/net-vpn/libreswan/libreswan-3.25.ebuild
@@ -21,7 +21,7 @@ COMMON_DEPEND="
dev-libs/nspr
caps? ( sys-libs/libcap-ng )
curl? ( net-misc/curl )
- dnssec? ( net-dns/unbound net-libs/ldns )
+ dnssec? ( net-dns/unbound:= net-libs/ldns )
ldap? ( net-nds/openldap )
pam? ( sys-libs/pam )
seccomp? ( sys-libs/libseccomp )
diff --git a/net-vpn/miredo/Manifest b/net-vpn/miredo/Manifest
deleted file mode 100644
index 5e689a6f5fc3..000000000000
--- a/net-vpn/miredo/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX miredo-1.2.5-configure-libcap.diff 918 BLAKE2B e0689e51949eb79d9ba2121757a0de3fdd04f00809ec3594f8b868723d32b8b7d9d03b084d5716facfa259b4a1db9e379e6f973b14a0ec7801a1719626582c23 SHA512 151a5edc97c021b8d54dfb4664321c1774ce703bf9eaebb0079ba04100e5af1f632218172f674b781f8d1df64993761435c78a26cb0c4158929cdf9e0ba27523
-AUX miredo-1.2.5-ip-path.patch 802 BLAKE2B 254137cc103c6c9cb7e65214b8bcf3e661b5d567623a7756d0f17f6c9b574df00b2a98c1a1f116554dc887e0f226968c15509ca4e0140dfcb47e87d36986bd4f SHA512 dba30cebdc245f623b75cfcf018508af31619eeb3f1830bb767cd4d6d5aeeb8988948f57d454cc96bcbaae793374e83645dbb4782c717b60ab3738cfd4e804ab
-AUX miredo.conf.2 46 BLAKE2B efdbb9bb6d5d4ea6fb2a8edfd92ccfb09afa96296350a1faa68c3aa333e91c640248ba4e2855790fc5ae4dbbce2b66722af6d31ed2f959878e02f4105632e54e SHA512 a0257aee71f0aa476bc5876854e1a08387812ea7b5048a8f5d67d4202d27e8d76c0826720b8a84f4bbaed3ed209e94bf723123b8dcfc8a953fc6abdb831235c3
-AUX miredo.rc.2 284 BLAKE2B 09401e8eb64238fc304bad2967b1b4089ccd8d6155b0c52116f5fa59a85b5eb3456429b84576c18e459c1f876fe00837d0b537832a47d7e816abccf4fed19717 SHA512 f4bcb55570edddf9ca1346687287f89d35d0240098f561a8415f2bdf4a2b3f3806be17be9f09223535bbda2cb77478c64c1b973f2e80384a70a947e07538ce89
-DIST miredo-1.2.5.tar.xz 474236 BLAKE2B 8766771c950ada7b172287595a93a4a14aec75d256d0b4e862097edad06faf805423de99ade00e796d3e91c130d6e069fa381abe7a49db80e5f8ed16fbfdf9c1 SHA512 94bc71b7093783ad103a0aceb95ad3de1739e4ec1d763b3c6cea9bb1768f55359448957f623ee3f966955c555bb9f71ff0216d9d4e8d2ff244bb058731702c70
-DIST miredo-1.2.6.tar.xz 477668 BLAKE2B ca6ddc90badcaed16e3925c4e67c0770bdcb909a97ddf48d8f6ee3c27ad6a7078c33edf94f6e491a4d7bab02b7b35a6006a778248fa0fd86efec973e56695c5d SHA512 9cbc604aecde566f921834a220be7675981e1c603cbcc81c3e2e9c58fdcdae2e78ec6ffc180939d5b8f6d7598ba3967270532b2c0c04de8b688a86c436719caf
-EBUILD miredo-1.2.5-r2.ebuild 1263 BLAKE2B ff01d06a359d3799f545d6abedcf01f6ea326ff3664b6ffccf686a223f595c8057f968d6f3f7b390f4b50f5386225c9d554bd881874a2c18c2511d82eafb839f SHA512 f140c1a01dee2c164464cfc27fa724800e502e399b2d7f3224dab76ae1db30a7a15e87054ab38126a1913869e66d79f98f0bea55eec348e356d09b855f09d863
-EBUILD miredo-1.2.6.ebuild 1277 BLAKE2B 0ebb9ba9ecd9a4fb890b1476352b2dbddb9d9170f3705a54cab749ebd2c744d5a6f4af705bd23bec9cd30cf46df7a9368a0699bf2bb5dc3d1a254ede7367ef35 SHA512 1a89d26cbcdeda906044d65683643fa82c6b220b26cdab22e7ae948c6e7a10eddb8660496262d9814a379dd52249e47354c9b286fdff5f336af1c7ffaa3bd332
-MISC metadata.xml 573 BLAKE2B 442d6eb15c5ff7119e81f2bc9071d0e52ce8688ab174bbafd8b84a4a1f2ad1b3a3dfcf10ab471b74504467dc3048219b17049525f6e75a369db60582bebe00ba SHA512 892d41bc3f167540f3e8d6df838386b6e6a63ac1104c45be0aced34d4bebbc7a07b4f420709adbf94bfdb52e74b25df686b65ac1303f0fee3cefe89e622c1911
diff --git a/net-vpn/miredo/files/miredo-1.2.5-configure-libcap.diff b/net-vpn/miredo/files/miredo-1.2.5-configure-libcap.diff
deleted file mode 100644
index cffdbf1e562e..000000000000
--- a/net-vpn/miredo/files/miredo-1.2.5-configure-libcap.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure.ac.ori 2012-06-14 21:55:13.756603416 +0200
-+++ configure.ac 2012-06-14 23:12:01.425399836 +0200
-@@ -150,16 +150,23 @@
-
- # POSIX capabilities
- LIBCAP=""
--AC_CHECK_HEADERS([sys/capability.h], [
-- AC_CHECK_LIB(cap, cap_set_proc, [
-- LIBCAP="-lcap"
-- AC_DEFINE(HAVE_LIBCAP, 1,
-- [Define to 1 if you have the `cap' library (-lcap).])
-- ])
-+AC_ARG_WITH(libcap,
-+ AS_HELP_STRING([--with-libcap], [enable POSIX 1003.1e capabilities]),
-+ with_libcap=$withval,
-+ with_libcap=auto)
-+AC_MSG_CHECKING([whether to enable POSIX 1003.1e capabilities])
-+AC_MSG_RESULT($with_libcap)
-+
-+AS_IF([test "x$with_libcap" != "xno"], [
-+ AC_CHECK_HEADERS([sys/capability.h])
-+ AC_CHECK_LIB(cap, cap_set_proc, [
-+ LIBCAP="-lcap"
-+ AC_DEFINE(HAVE_LIBCAP, 1,
-+ [Define to 1 if you have the cap library (-lcap).])
-+ ])
- ])
- AC_SUBST(LIBCAP)
-
--
- # Judy
- AC_ARG_WITH(Judy,
- [AS_HELP_STRING(--with-Judy,
diff --git a/net-vpn/miredo/files/miredo-1.2.5-ip-path.patch b/net-vpn/miredo/files/miredo-1.2.5-ip-path.patch
deleted file mode 100644
index 1d7b0fc39f6e..000000000000
--- a/net-vpn/miredo/files/miredo-1.2.5-ip-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: miredo-1.2.5/misc/client-hook.iproute
-===================================================================
---- miredo-1.2.5.orig/misc/client-hook.iproute
-+++ miredo-1.2.5/misc/client-hook.iproute
-@@ -5,7 +5,10 @@
- # Distributed under the terms of the GNU General Public License version 2.
-
- # Linux iproute2 path:
--IP="/sbin/ip"
-+IP="ip"
-+
-+test -x "/sbin/ip" && IP=/sbin/ip
-+test -x "/bin/ip" && IP=/bin/ip
-
- # Linux default route default metric is 1024
- # (we put 1029 so that Teredo is used as a last resort):
-@@ -23,11 +26,6 @@ PRIO=32765
- # (default: specified by the Teredo server, or 1280)
- #MTU=1400
-
--if ! test -x "$IP"; then
-- echo "$0: iproute2 is required! Please install it." >&2
-- exit 1
--fi
--
- # Nothing to do with destroy event
- if test "$STATE" = "destroy"; then exit 0; fi
-
diff --git a/net-vpn/miredo/files/miredo.conf.2 b/net-vpn/miredo/files/miredo.conf.2
deleted file mode 100644
index f4ef08a23112..000000000000
--- a/net-vpn/miredo/files/miredo.conf.2
+++ /dev/null
@@ -1,2 +0,0 @@
-# Options to pass to the daemon
-EXTRA_OPTS=""
diff --git a/net-vpn/miredo/files/miredo.rc.2 b/net-vpn/miredo/files/miredo.rc.2
deleted file mode 100644
index c0ae6d0d1495..000000000000
--- a/net-vpn/miredo/files/miredo.rc.2
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need localmount
- after net modules
- use dns logger
-}
-
-command=/usr/sbin/${SVCNAME}
-command_args="${MIREDO_OPTS}"
-pidfile=/var/run/${SVCNAME}.pid
diff --git a/net-vpn/miredo/metadata.xml b/net-vpn/miredo/metadata.xml
deleted file mode 100644
index 52ee8970cb99..000000000000
--- a/net-vpn/miredo/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <email>xmw@gentoo.org</email>
- <name>Michael Weber</name>
-</maintainer>
-<longdescription lang="en">
-Miredo is an open-source Teredo IPv6 tunneling software, for Linux and the
-BSD operating systems. It includes functional implementations of all
-components of the Teredo specification (client, relay and server). It is
-meant to provide IPv6 connectivity even from behind NAT devices.
-</longdescription>
-</pkgmetadata>
diff --git a/net-vpn/miredo/miredo-1.2.5-r2.ebuild b/net-vpn/miredo/miredo-1.2.5-r2.ebuild
deleted file mode 100644
index 74773d853de8..000000000000
--- a/net-vpn/miredo/miredo-1.2.5-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils linux-info user
-
-DESCRIPTION="Miredo is an open-source Teredo IPv6 tunneling software"
-HOMEPAGE="http://www.remlab.net/miredo/"
-SRC_URI="http://www.remlab.net/files/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+caps"
-
-RDEPEND="sys-apps/iproute2
- dev-libs/judy
- caps? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils"
-
-CONFIG_CHECK="~IPV6" #318777
-
-#tries to connect to external networks (#339180)
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO THANKS )
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-configure-libcap.diff
- epatch "${FILESDIR}"/${P}-ip-path.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-static \
- --enable-miredo-user \
- --localstatedir=/var \
- $(use_with caps libcap)
-}
-
-src_install() {
- default
- prune_libtool_files
-
- newinitd "${FILESDIR}"/miredo.rc.2 miredo
- newconfd "${FILESDIR}"/miredo.conf.2 miredo
- newinitd "${FILESDIR}"/miredo.rc.2 miredo-server
- newconfd "${FILESDIR}"/miredo.conf.2 miredo-server
-
- insinto /etc/miredo
- doins misc/miredo-server.conf
-}
-
-pkg_preinst() {
- enewgroup miredo
- enewuser miredo -1 -1 /var/empty miredo
-}
diff --git a/net-vpn/miredo/miredo-1.2.6.ebuild b/net-vpn/miredo/miredo-1.2.6.ebuild
deleted file mode 100644
index 63494b5abd31..000000000000
--- a/net-vpn/miredo/miredo-1.2.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils linux-info user
-
-DESCRIPTION="Miredo is an open-source Teredo IPv6 tunneling software"
-HOMEPAGE="http://www.remlab.net/miredo/"
-SRC_URI="http://www.remlab.net/files/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+caps"
-
-RDEPEND="sys-apps/iproute2
- dev-libs/judy
- caps? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils"
-
-CONFIG_CHECK="~IPV6" #318777
-
-#tries to connect to external networks (#339180)
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO THANKS )
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.2.5-configure-libcap.diff
- epatch "${FILESDIR}"/${PN}-1.2.5-ip-path.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-static \
- --enable-miredo-user \
- --localstatedir=/var \
- $(use_with caps libcap)
-}
-
-src_install() {
- default
- prune_libtool_files
-
- newinitd "${FILESDIR}"/miredo.rc.2 miredo
- newconfd "${FILESDIR}"/miredo.conf.2 miredo
- newinitd "${FILESDIR}"/miredo.rc.2 miredo-server
- newconfd "${FILESDIR}"/miredo.conf.2 miredo-server
-
- insinto /etc/miredo
- doins misc/miredo-server.conf
-}
-
-pkg_preinst() {
- enewgroup miredo
- enewuser miredo -1 -1 /var/empty miredo
-}
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index a490f3f72b47..b2c688e64ee7 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -3,9 +3,9 @@ DIST strongswan-5.5.3.tar.bz2 4768820 BLAKE2B 9f9da6c2ef27cec7f6a07f1cd5a7ecc8a9
DIST strongswan-5.6.0.tar.bz2 4850722 BLAKE2B edb9f2b277cd8bccf886a824e4b3fb3c06af7510d9e21283fcb8d8ba9cf234f38182fcd1ca0c350b4039945ab10888406986d9a0b8edac24fe09faf0b8967fb2 SHA512 9362069a01c3642e62864d88fdb409a3c7514bf7c92cbe36e552c6a80915119cf5bb91c39592aab2d15b562684a0628a764e4fa7636d3b5fd2ebaf165c0ce649
DIST strongswan-5.6.2.tar.bz2 4977859 BLAKE2B 83943ec95e6b95724e9fc130a09f7c7364147d0ce50528ac8b64452db53516b143e92c7dcb746c0c25aaac9182dda14d55e5c267fbdcd5bb9a63cbf48801274b SHA512 cf2d5cb6c45d991fe0ad8eed4ea8628f95a1871e9728ddf0985aa26e78d1e6da1c92c961772aafd3e55cfcfa84516204a15561389d373f78140f05607b248c52
DIST strongswan-5.6.3.tar.bz2 4961579 BLAKE2B 177d9ca9a730c8ccb3293c9f1c1397429879177aef60c90a3561fffed64cd4fe18cdf1c74bd52956c576e061ce33935b7dc34864576edeac7d4824841b0ee3e0 SHA512 080402640952b1a08e95bfe9c7f33c6a7dd01ac401b5e7e2e78257c0f2bf0a4d6078141232ac62abfacef892c493f6824948b3165d54d72b4e436ed564fd2609
-EBUILD strongswan-5.5.3.ebuild 9280 BLAKE2B b6c402f593f7f7d7b15c5d0fe9dcf05aaddd4a86152e788cfdf62f7a26a93ae98a2f947b3ae5de554aa008fdc369ef4cdf1f9fb73532b2d1ab05becf6526ffc3 SHA512 0131f9d5a852379941bfae1259b3962eb6e1676510e798215b4859277deedc9c6adbce7c6aafc5e07cfc5546663cf036394c27c6a166b8cc098bb9afddc51bbf
-EBUILD strongswan-5.6.0-r1.ebuild 9314 BLAKE2B 526b99054b055536ab9956c6650fa9d0dad0e28150a5e1b3e871de20c7472826fc4b0115609180463eed81b76e0acc995a62024c83f74466aeadfd910cc592e4 SHA512 d9ee1657e33d7a2cc9c863ba7968e1766c0e565840c95f730fe35acb45e4aaa60d438f0a30e553806a1924c1440fb2607e7d1a5d552d23260a10fe10876bdff0
-EBUILD strongswan-5.6.0.ebuild 9284 BLAKE2B 3f4da75ec2607a58c1e163010c2be07d71433392d741ab2d9b045df8873d2965936dec7f457615aadc00085809dba08c3a1fd339275e9d1d4f3a3346fe5662eb SHA512 c3f51e481bd8df4fd5f573a54214a1cd5a9098c5432c8e5926ad371d6bd9105391d2c658d61237ecf651f356dc5dd5f46d6fb91af0e347419c66e9ac48ab4494
-EBUILD strongswan-5.6.2.ebuild 9318 BLAKE2B f69307282c88a473ca7da3b15d58036863a4bb117ce6dea4066facb3cdd56df45a3222d42badaa598d734d3576d76dbff14cf0cfe2c77219244088c8606f4ae4 SHA512 ead13610287054356ccc76003112e45fce574578b8f4bcc6657938f7c472e2bcfc7c7e0f52ff09383ef3b94df79a7533ceb59a4842a19b73eba9c744393cad60
-EBUILD strongswan-5.6.3.ebuild 9418 BLAKE2B 82da0e70c5996431f27495bd4839b8f08cc28e8316c0cd9a6f0e4c55c0191b566f1c654ac831c145f25ab1d2c9b640e0726ad1426e21e9e6670c5ce5d4d1df7d SHA512 74be972d938e05253d7bfc574b160913b8ff582e59ecc7af0ec00fae9c772492ad3d60cd502326bc769371c63517f4da38a4ee7eb666d4fd532006d043000398
+EBUILD strongswan-5.5.3.ebuild 9282 BLAKE2B 5532076749ccebd15e4b8442e5c674fed8fcea88b86cf9d2d60c69764763d3d5320aace805a7a8c8bea5d9d9be645f55aeca8d080212cea313ccd5e296b53061 SHA512 e2042e4aad5d7a3525eeba9164690a9c6563bb7e975ab4887ac17445da5050a57522f9621f576b14f2f871ff22e92cee8e8aebf537e65cfeb649ec94155a47ee
+EBUILD strongswan-5.6.0-r1.ebuild 9316 BLAKE2B de030a9ae26d83c6f2aa2bdfadf3c6f29acebaa53b4e3b88389398c0ec8552f9107828afa0a5639471885e83cdf5b982373e9975ecb2567fb79adf3f3b9c6f7a SHA512 d2e6b7a8ce68033203d854429234e5a4600501d3d17db4b3f0b2e7f6c428aac5acbd74b48a88583464a5936467e180f126f269b5b046ebac047c547fa791222e
+EBUILD strongswan-5.6.0.ebuild 9286 BLAKE2B d0d7d0beb3d8a23f2b7594708f02c6eb79f07b3f73ac9f98202a97d3e51aef54f68df2575029db919f5d296e32cf08800ce8f7b904feae2f2e0acfa404c08749 SHA512 8c20bc8946c4b2f405afe37e05ca65bec82346b5eb96d444d0cd2cb8431551241482087799d0929f4fadc0511f2a723f431a254934866119d0ae3060513011d8
+EBUILD strongswan-5.6.2.ebuild 9320 BLAKE2B 3d760c087b443d75046c6db3e6dc079d401592588308379716781e25d5310844ec10464ba7791381fa7a6009a8af9217b6f64b442322320fb7cdd2b51ef87c3a SHA512 398534ef23686b54751f238c45a81d53990076eb3e7ff6c4591d5ddaadfb83808c0ad58d0ed46b467562f3c72693a414f4ad9645f51e9129758fcf8d255df8d9
+EBUILD strongswan-5.6.3.ebuild 9420 BLAKE2B b05e471c1a11f2a258a3f062c26a80a8a8426f798f09604c78926b2475ea63fc496da910286d94c1989330c7930680efc3cea8a0b97d484532d7e2acb79cbabb SHA512 6f2af391b174d5466e0d315a78884ea642aab521c3ddf1265acbdf28e802eb4c57695ecd612a6ea7f285e7e4245f2498d567079e949373d59db0979b3c54445e
MISC metadata.xml 4135 BLAKE2B 13739675c455765d7ce73df9744779636d36d3f93eee4567c931fb40e528e56d34912e26a82bd35e377fbd34613c0b7044841ff6c2dc26694187d0de355f8b86 SHA512 e09ef1afdf5002dab542312753cbce56e830b906aa5c5ac8fd5c7b57cbaf021eb0c466241cf810f446693b8dedd90f185f3e2c7a53a0b9a43e14913dcdd83b23
diff --git a/net-vpn/strongswan/strongswan-5.5.3.ebuild b/net-vpn/strongswan/strongswan-5.5.3.ebuild
index 7ec9a3ae14f3..7cf43b5ece0e 100644
--- a/net-vpn/strongswan/strongswan-5.5.3.ebuild
+++ b/net-vpn/strongswan/strongswan-5.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -34,7 +34,7 @@ COMMON_DEPEND="!net-misc/openswan
sqlite? ( >=dev-db/sqlite-3.3.1 )
networkmanager? ( net-misc/networkmanager )
pam? ( sys-libs/pam )
- strongswan_plugins_unbound? ( net-dns/unbound net-libs/ldns )"
+ strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns )"
DEPEND="${COMMON_DEPEND}
virtual/linux-sources
sys-kernel/linux-headers"
diff --git a/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild b/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild
index 9b671947ef28..7682afd92ad3 100644
--- a/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild
+++ b/net-vpn/strongswan/strongswan-5.6.0-r1.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="!net-misc/openswan
sqlite? ( >=dev-db/sqlite-3.3.1 )
networkmanager? ( net-misc/networkmanager )
pam? ( sys-libs/pam )
- strongswan_plugins_unbound? ( net-dns/unbound net-libs/ldns )"
+ strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns )"
DEPEND="${COMMON_DEPEND}
virtual/linux-sources
sys-kernel/linux-headers"
diff --git a/net-vpn/strongswan/strongswan-5.6.0.ebuild b/net-vpn/strongswan/strongswan-5.6.0.ebuild
index d7477edc1686..c4736a962302 100644
--- a/net-vpn/strongswan/strongswan-5.6.0.ebuild
+++ b/net-vpn/strongswan/strongswan-5.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -34,7 +34,7 @@ COMMON_DEPEND="!net-misc/openswan
sqlite? ( >=dev-db/sqlite-3.3.1 )
networkmanager? ( net-misc/networkmanager )
pam? ( sys-libs/pam )
- strongswan_plugins_unbound? ( net-dns/unbound net-libs/ldns )"
+ strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns )"
DEPEND="${COMMON_DEPEND}
virtual/linux-sources
sys-kernel/linux-headers"
diff --git a/net-vpn/strongswan/strongswan-5.6.2.ebuild b/net-vpn/strongswan/strongswan-5.6.2.ebuild
index a4895259f778..c7dbeeac3bec 100644
--- a/net-vpn/strongswan/strongswan-5.6.2.ebuild
+++ b/net-vpn/strongswan/strongswan-5.6.2.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="!net-misc/openswan
sqlite? ( >=dev-db/sqlite-3.3.1 )
networkmanager? ( net-misc/networkmanager )
pam? ( sys-libs/pam )
- strongswan_plugins_unbound? ( net-dns/unbound net-libs/ldns )"
+ strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns )"
DEPEND="${COMMON_DEPEND}
virtual/linux-sources
sys-kernel/linux-headers"
diff --git a/net-vpn/strongswan/strongswan-5.6.3.ebuild b/net-vpn/strongswan/strongswan-5.6.3.ebuild
index 906869df80cb..a9486f5cba78 100644
--- a/net-vpn/strongswan/strongswan-5.6.3.ebuild
+++ b/net-vpn/strongswan/strongswan-5.6.3.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="!net-misc/openswan
systemd? ( sys-apps/systemd )
networkmanager? ( net-misc/networkmanager )
pam? ( sys-libs/pam )
- strongswan_plugins_unbound? ( net-dns/unbound net-libs/ldns )"
+ strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns )"
DEPEND="${COMMON_DEPEND}
virtual/linux-sources
sys-kernel/linux-headers"
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 29df55529b6c..1f5f5b589626 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -5,9 +5,9 @@ AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c19
AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07e347308523caad1a1e0255e5597bdfb818257ab6db03da0f07622707ff60c62926f91d9d7d6e8 SHA512 4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730
AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
DIST tor-0.3.1.10.tar.gz 6192183 BLAKE2B 4c1b57a3b19d18d735bb7362a08e4c2330350f2e31d52a8eb6d837cebc45ad6e64f3364e368f72d59bb8f51f652d4029a3e237a26efe580551811f5812e8dac4 SHA512 92af34a96bea2a99ab51d766d932da697409e404da4318ba6b3360ff0c2e9369b9afa652445a1651940f5a0502f4137141cc87cff14eba180539ea81be0c21a3
-DIST tor-0.3.3.9.tar.gz 6563091 BLAKE2B 9bb2009c309005ad913aa8f3e175ef8500a571de6210ecaa1a17947633e201092dd819e30e95a55918dff54858b8c420039e960113e9096b2b4f43ca596bb3bd SHA512 3b1fd9926988233c605996281510cd966a08bc1008e1e4bf7e0ed76b40c1820b7789a85555d5a4d9c0b58db992366d7a62d5d3b20e818a0d68df3b2286d0df3d
DIST tor-0.3.4.7-rc.tar.gz 6668322 BLAKE2B 863d24d04ba7919d08b3c69bca2edf3ee46af6aa074812f76067199670b17bb8538233c7631cb17e1cada4b2b4527b0db4b3b7a7b945ae7ca7a03e52685fce00 SHA512 664211ffd6adcdb325cf669fed9fb7c70b1416da3df046c35622b5104a4b63d9a3123eb40744bc070d29ff97472adf31b1aaecea5b91c07059d0cdad79569b58
+DIST tor-0.3.4.8.tar.gz 6679385 BLAKE2B 9cb65442effd1cfceb34f3483a0e96de5e59e9ce1bd2241533dd8eb62e4428a6c0f9decd816dda49515fc92acd8c77e69f7d39133a67fb5053a858dc78464791 SHA512 bfedc29253cb8fdbe1864ea5992ad33184577d88ab806a249a544f3b3142a7bc1453892955df335185aff72508095fb2a2a07ac6b96c99668e5e8d593d7aea6d
EBUILD tor-0.3.1.10.ebuild 2018 BLAKE2B 5c001ed0ad1fd3f0d6a3dee6bcc53bc3590a90a5c0aa931c0e67e0cbceb000ef710fa33fe11b06fc08798c6286ffa877376ef6ebf2cbd426e7a26c94311e19c2 SHA512 65f6054ac7b50c46679d88ed1a5b556f5e3c40fe44e784e6b4de324bd317e3d118a8d0d4574ac62bcd17131412c3ad1cbdd0c27f4afd53568091ce400b171244
-EBUILD tor-0.3.3.9.ebuild 2272 BLAKE2B b6ba3a975eabf3f25d353d19fbbed13d59ae1bbf7822af539110c9ab11483c015fd1b939ebef7c02a83713a01da03cdca0b2d51b6c8d202a0fb19658c371629c SHA512 93b2d767456fc3560c37f0238c055c7ed52f1da9e2355384e158e398b18975deccd27d1c5bfc55d1748ffcd9759311ba66e320e4b2a661f46d933fd6d2d1fd19
-EBUILD tor-0.3.4.7_rc.ebuild 2337 BLAKE2B d439d935972c3d17186256543fe76a4fc3cd315dd8685864e74a32778c9ed60bb7c5a8e9a2f7790207597e3a44610f7372e21e855e58e66d55c7814c2553d21a SHA512 129cb237802568280aa5a5c528e288a8c05a3f0e0f655d96d9499d253be459851a2a34a01df6be46b2822f83be01add55a0dc0e82c90c61cbb6db9dbd65e9324
+EBUILD tor-0.3.4.7_rc.ebuild 2233 BLAKE2B ddebd2fb89e2af106e1c2dcf66cb3f15f870eccab4258425e056b609f7baa0d82c1813c71c60f8f811e89bc0920e384d513707d374961b2e27cbe74f5e82e6e2 SHA512 2614bd244399582f59558e82ba53465d8215eb8dbb1b7e9ccd58a77bff0256b3a957c86261585e9dc87d8e1c36cb18f75b762607b70663daf7261b26e652cec0
+EBUILD tor-0.3.4.8.ebuild 2237 BLAKE2B 2d21116f6249afbc98dc16881219fe689fec38c392e253d0b9661edf28d0fffb357c10c04fcf259368b66d0a25b7e2e558134cee404040b3bab78104985afad0 SHA512 64ed20c1dcd0486883729a8f90f89e80e9be5b499f17d3309313ea5aeaf29027ea82db0aa4ae00c107c3af123d4f1de5af003fbbee25cd188c2ea7cae398cb80
MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.4.7_rc.ebuild b/net-vpn/tor/tor-0.3.4.7_rc.ebuild
index 83799f4c977d..a1e437a32f9a 100644
--- a/net-vpn/tor/tor-0.3.4.7_rc.ebuild
+++ b/net-vpn/tor/tor-0.3.4.7_rc.ebuild
@@ -15,9 +15,7 @@ S="${WORKDIR}/${MY_PF}"
LICENSE="BSD GPL-2"
SLOT="0"
-# We need to keyword app-arch/zstd
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86 ~ppc-macos"
IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
DEPEND="
diff --git a/net-vpn/tor/tor-0.3.3.9.ebuild b/net-vpn/tor/tor-0.3.4.8.ebuild
index 78e9cb1945b5..79adcd87bfe6 100644
--- a/net-vpn/tor/tor-0.3.3.9.ebuild
+++ b/net-vpn/tor/tor-0.3.4.8.ebuild
@@ -15,9 +15,7 @@ S="${WORKDIR}/${MY_PF}"
LICENSE="BSD GPL-2"
SLOT="0"
-# We need to keyword app-arch/zstd
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-KEYWORDS="~amd64 ~arm ~mips ppc ppc64 ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
IUSE="caps libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
DEPEND="
@@ -55,8 +53,10 @@ src_configure() {
--enable-asciidoc \
--disable-android \
--disable-libfuzzer \
+ --disable-module-dirauth \
--disable-rust \
--disable-restart-debugging \
+ --disable-zstd-advanced-apis \
$(use_enable lzma) \
$(use_enable scrypt libscrypt) \
$(use_enable seccomp) \
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 4c6d9f6badd6..e4742a5f9d0c 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,4 +1,4 @@
-DIST WireGuard-0.0.20180904.tar.xz 272012 BLAKE2B e279f85374f880d69e4a4dc5b8442520abe4e3141a69133ea012e1c613dd1b9cb6f7b31d38ffd3f5e1f453dcad8cec847df2fd6bf1e46e66dc42f94da3516cb6 SHA512 5eba275fd7bc96a81d7c07f92920bf4e562910756bb7980d1381b204efda184ee93fa710f2ccb0c14667c8647c2fac1cc51fa95be3a51ac25a0567c6204c9018
-EBUILD wireguard-0.0.20180904.ebuild 5145 BLAKE2B af179f6e992bc0df635ac391fed3d0178395bb9f3de8b7180d24c990140ba2ae5c4fbed0eb673443ab2e7e8de2d4477af26ea0819c9cf07ef532804ad4b4c7b3 SHA512 beff711ea1ec42806f780144b48f53fb02d1fb001f84f484c6d5bdf11384e78fe1bf77cdf07b0c971c4163927cac3b68c4f70211c5aa2b352009c6ab866c1fb9
+DIST WireGuard-0.0.20180910.tar.xz 271596 BLAKE2B b9da34caed7d5b01ebd9796aeed509becafa5006e53a852e8ff2e391607ef8abf6fd2b2b6e7e147a5d2e6f8d401d09319188b80d15dd1ebe2478602ee77b831c SHA512 644d617d9d53f688c93cafb438d46075b642805b4ddfc328a8c1046a4a2baef3048a5a5af7f71986d753868ad8da8546ea7063572ef56c50bfcd07f3c147899f
+EBUILD wireguard-0.0.20180910.ebuild 5145 BLAKE2B af179f6e992bc0df635ac391fed3d0178395bb9f3de8b7180d24c990140ba2ae5c4fbed0eb673443ab2e7e8de2d4477af26ea0819c9cf07ef532804ad4b4c7b3 SHA512 beff711ea1ec42806f780144b48f53fb02d1fb001f84f484c6d5bdf11384e78fe1bf77cdf07b0c971c4163927cac3b68c4f70211c5aa2b352009c6ab866c1fb9
EBUILD wireguard-9999.ebuild 4720 BLAKE2B 4de715d72ccd551ee68eeab051ff9905323fe57d475e6c17ad39542c3c50416d0ff6cfa27c994afe1edf6277bdbd6bab9b3351d74cfcae5921f24c2c93f0cb36 SHA512 e71251e953b6046149d69b1168af47e20ae705c3822f8c80542388571e8677ddfe299eb46808ec462c8a13764fc939eafe7f51dcfa0d7e3aca7c6e153ba14c7b
MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/wireguard-0.0.20180904.ebuild b/net-vpn/wireguard/wireguard-0.0.20180910.ebuild
index 332e52b44d29..332e52b44d29 100644
--- a/net-vpn/wireguard/wireguard-0.0.20180904.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20180910.ebuild