18 files changed, 359 insertions, 154 deletions
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 5a3aac5d2ad0..ee6c41113de2 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/eduvpn-client/Manifest b/net-vpn/eduvpn-client/Manifest
index 0c0b7f02c63d..fea6cd74db97 100644
--- a/net-vpn/eduvpn-client/Manifest
+++ b/net-vpn/eduvpn-client/Manifest
@@ -5,7 +5,7 @@ DIST python-eduvpn-client-4.2.1.tar.xz.asc 228 BLAKE2B 4f41b358e38ba0f488fc4f1ef
 DIST python-eduvpn-client-4.2.99.0.tar.xz 978228 BLAKE2B f79fef5528cebd88ab7c4d31e92d950d12f766204b2a1cdb8a9293683a99361c48934182e9eee9f1310d9de80fb4d64d6064e058fd02c3d6635b86e73f2b5a5f SHA512 a6add23820e5ed0da3c6dac01e5f0b98d6cfd3d29903513d6dde21fe4d1975c5d8861e1e758ae8f502a9d932316fabbe3fdfb3f22ca4bfafe8230124c8a9bbe3
 DIST python-eduvpn-client-4.2.99.0.tar.xz.asc 228 BLAKE2B 311f3e451c3c2791fee799aa20bb8e2211871c34d9700959068e9023160237876553c17229d4cc987f93be073b069d5e267c3166caf0e791a00e6a4cc8e17b1a SHA512 375970d41a00aaaf0167baa785d54eeb953481088d4f5516c8590d5320f93242a73e89260704b37db34c47423eaae20d320e919540d397b6f00704c737c8c2fb
 EBUILD eduvpn-client-4.1.3-r2.ebuild 1137 BLAKE2B 3ec51bf095d8c98a7537e412c468d222c27efd20ee0fc6177c7026028d18b3bb23dba1683c5201ea348bee910e02a4160521f6f71d819ad8d4da6d71cdb8d9a4 SHA512 7b57d8f10357f876457774fc798cb1e2f56ff185dbc7ced42f8a18fc413ff24aba3865952715cca69fd23723a23040e82e89b9c94d2d42010e232eb442c6e996
-EBUILD eduvpn-client-4.2.1-r1.ebuild 1414 BLAKE2B b8f2f564b092ee808ccabf4645d44b935ec51cc1eb96877cb42392d75789d8e3f3de3f98fd1ab68c34710b3782db457feab57ea389ea8fab81b66f3ef5bfc2f4 SHA512 a96476628be2857154597280a8cfc3e136ddc7b3628a294f67c5ff71d7903619a08030f4af891530b08c2016392ada35bf10d66d7c3e3cf173c026cbe6e9cce6
+EBUILD eduvpn-client-4.2.1-r1.ebuild 1412 BLAKE2B bd87800159b73bcb5f1760f32624bd5dd47fae37f079fd6e2267b8b70cc1f543056c074e37dff25e9b0fef051fe27614d21d6480aa498e6c74f8d6cc4c06a2be SHA512 26f7e18ff1b3142855cabca008c549f9b1e3ac8424ea8e65d250ecfc125e6219671369b524b595ef1ca2fe800ed6d015b4a5234df851496be824e17f712e0cb5
 EBUILD eduvpn-client-4.2.99.0.ebuild 1624 BLAKE2B 523e3b0a5a12c2221bccb55fb780198a109f3393cb6f49e3661218924f3fbdce971663b968660f8f081a192edb5256c247a814239e8d2913ed0474f2b2b1879b SHA512 58a7ca7c44cc8e31596fbae13513e3b7e08a040a603e8a9d97e0dd86a1c9a2182062948d6ac191688014ee88415bf6a0d8bda5ca3c02af96a4ec27761e93b0f8
 EBUILD eduvpn-client-9999.ebuild 1624 BLAKE2B 523e3b0a5a12c2221bccb55fb780198a109f3393cb6f49e3661218924f3fbdce971663b968660f8f081a192edb5256c247a814239e8d2913ed0474f2b2b1879b SHA512 58a7ca7c44cc8e31596fbae13513e3b7e08a040a603e8a9d97e0dd86a1c9a2182062948d6ac191688014ee88415bf6a0d8bda5ca3c02af96a4ec27761e93b0f8
 MISC metadata.xml 856 BLAKE2B 5ffc1c4ebc7429ef744cdcab2424fe68ada060c875c4b42666daff942bc3f9666a3ce4e981c90b4996df11f22b22e86b34df63da734d9bb64e7181a278110a8a SHA512 eab0db175a2e567c6b928b8b0ddd95b42bdf84a60f9297fb04666268539d5e288ab40d5ef38b36d1e6eced5f73e90f1fbda0c1978818952de2d34c75383d949a
diff --git a/net-vpn/eduvpn-client/eduvpn-client-4.2.1-r1.ebuild b/net-vpn/eduvpn-client/eduvpn-client-4.2.1-r1.ebuild
index ae67c2d1589b..7d59373c03b4 100644
--- a/net-vpn/eduvpn-client/eduvpn-client-4.2.1-r1.ebuild
+++ b/net-vpn/eduvpn-client/eduvpn-client-4.2.1-r1.ebuild
@@ -24,7 +24,7 @@ else
 		https://github.com/eduvpn/python-eduvpn-client/releases/download/${PV}/${MY_P}.tar.xz
 		verify-sig? ( https://github.com/eduvpn/python-eduvpn-client/releases/download/${PV}/${MY_P}.tar.xz.asc )
 	"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-vpn/eduvpn-common/Manifest b/net-vpn/eduvpn-common/Manifest
index d8e0f35e08fc..a4e9a4977a16 100644
--- a/net-vpn/eduvpn-common/Manifest
+++ b/net-vpn/eduvpn-common/Manifest
@@ -7,6 +7,6 @@ DIST eduvpn-common-1.99.1-deps.tar.xz 24548260 BLAKE2B 59065c553899cbabd1a867e77
 DIST eduvpn-common-1.99.1.tar.xz 843316 BLAKE2B 53ff3518d7450f8c414d94291c22479464dbe810de4d5971aca61462782a615a82133e461f688b2975763f867464eac6a70bd946a75ab4085322ba5289717571 SHA512 757f05f391bde1be0b1d57a92d21138d96659052bee2922814d612950b0d3e8c8ebf21178b8d8d27263765870328057b69ca58db7629c5c092b3637957060be7
 DIST eduvpn-common-1.99.1.tar.xz.asc 228 BLAKE2B 9af5f284ca4e096cd291e7b387be302282e841fb9beb0b0715d781f38ebb5dc66f23b98f502610dcc23dc4faf24cf158a8e9ebb90ad06113fc83b8756cf70452 SHA512 24561e484fd3b66e2bb2ce4e275db9a125370dbd7113f2c8a1a6a267b016c2d793701b2e89f6c8835e662cec6a2ceb11e5d287312b30c93e57d2104b67beb2ed
 EBUILD eduvpn-common-1.1.2.ebuild 1421 BLAKE2B ef5534f84867f5ca4bb8cc85bc8c96268d5de0307ee520180f7654f3f74fab6e3a5619b4664bdadab67a5035e46f85c7a34c87b4a9167c6267cfca8cb18932a8 SHA512 573fe8c374474e58a3460d23aa3b5cbe6ffb7005ff3c530f46abc14650a4ba8f81ed34a338782e6675f279df222fdca2f0c21233895e605838b50219f61a6fb5
-EBUILD eduvpn-common-1.2.0.ebuild 1932 BLAKE2B 300c0e94e691af907c23d63e2c3ac4752681f884f0243f8a5c094e726092c05fa2413a61ad9f85b9160c5925ab92b49e454a4cc72a31f779030ab95ccc222518 SHA512 3180ed28db22986ea3e185293473857f7996b8d1ec9454dff8be9d3f1c52339b3e8407d521af8ee172191e8ff5ccf9c44cd51cd0c9d7d6243fe3670c44ccdf24
+EBUILD eduvpn-common-1.2.0.ebuild 1930 BLAKE2B 5d2e8eb49ad048b1e642c6c62a5d8328894d9795fbe7ddeb6f280161f390a8f8357c4b708df513ffe5e4ed55ffa772a8deb6fde8718e23e90f6837c6cf5a4f38 SHA512 155f73a05849cdfa250de843eb944b830ae35a9410c9cbd592dbd81a90e7e406f140b1a1b6cbbe7574aefff9119e950009a5e15cbc88046552d03bc1bd513e38
 EBUILD eduvpn-common-1.99.1.ebuild 2141 BLAKE2B 6a71a681bb4f108de26fdd1521dcb9f6d758259a464ae57325e753c35edb54240f85a9315b78800a330ba26bdd4a3da1c87129250c9c3bed6bfc2c12ad7712b9 SHA512 e7903f8843ec89cabe11b63af87e698dba006cd5c4cd28cd02f834dec6b233254f9294f1e67d0661086543a325e85e1c7f1a49f2cf99ade8d25e373b10296ecb
 MISC metadata.xml 999 BLAKE2B 258c481ed43a5d388677aa7a5029201a01364059045c4285ba8b8da49c8c105832d59aa357a3a2dcaa36474ee206c8c1e7855ad7d8b0e402722c6cb50d6175ef SHA512 73b524373d8268083d9e5c979a8dee7fb52e54fbe27cac54219bd14a3851755e2c5aced686ff08e24d5cf08330cc6485a97734aea89d2de2b45bbe682a1e2f8a
diff --git a/net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild b/net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild
index a152206411e0..05c0f5b2dc9c 100644
--- a/net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild
+++ b/net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild
@@ -23,7 +23,7 @@ else
 		verify-sig? ( https://github.com/eduvpn/eduvpn-common/releases/download/${PV}/eduvpn-common-${PV}.tar.xz.asc )
 		https://www-user.tu-chemnitz.de/~hamari/eduvpn/${P}-deps.tar.xz
 	"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index a60e2c892552..ffecf9850541 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -3,10 +3,12 @@ AUX i2pd-2.38.0-r1.logrotate 294 BLAKE2B 183e9d0a88a3ff4b1116d4f8475862ed110cf2b
 AUX i2pd-2.38.0.service 906 BLAKE2B 583c1856ceada5e60b7f595452afbe3e254616185d641e63f7931ccc972a52123745f72f1fffaf122be6fd3d4dadb311d58f4d639e0d2ba2187bde21f5340d2d SHA512 233722990f5e9934558b05a0aee5e0ef6af9bcd0b5f9c38cb9d1e61ffa37a4d80f403047dc15ec706bc03185d2e1ca27015210b6757a71786ad0bb4b75662981
 AUX i2pd-2.39.0.initd 1437 BLAKE2B 6f4e7b585e2acbabdb58999387954cac0ac5edd8bc7c3cec686f3ecb6e3b7b04a13c1de57ba081da7dee4c35b72bc65f2a1ac3c4dccf3a57c22b24eba248664f SHA512 58f28b38a39e3e7a1bf378e17dad1c0879c641d6c479db887f33e2689dde29f4f2fa1b9d3dc9a6ab03eb35d2e834b5691de2bc7d9c97c9a8523ebea1e9cd637e
 AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d21ef4d83620c064838d0e27f89f287a97404276490b848bd1372a40b915d4830b7755d801c4bda551099 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9
-DIST i2pd-2.48.0.tar.gz 654495 BLAKE2B c16e27cf46266b346ab490140cf491e8866ad1df97f0a60a81c1902f5f9cb932b1c73fb52e1c4f1164ddc2813a9be0381d46405650b06c2e00eafc6073b0c869 SHA512 51c2057e96ec87ec0885cc6de4f4ff1d4d898ce0785f58c1a028677247743d44fa1980aa13b7746a0af76d600f2b4cc3bf3408bd199c82efcb432242f5b24b80
 DIST i2pd-2.49.0.tar.gz 654406 BLAKE2B 93b1bba73d308a7a6163b0b51ea59a3e11ea2d635d7275d71338ecd06d8d1dfb430e3e177aad0b3ae35f7e0e0bd95acb4e7750cbba70a4ded97fcc7596a1912b SHA512 f2461bf6e1ec2f1b581c8528de57c92350133642cd34ed9a6b2f4c8e8199aa9e5b9ff76d967c60350606f1ab5359f8a7dbbcaa58284e8769cdfa7e0a29a384af
 DIST i2pd-2.50.2.tar.gz 663010 BLAKE2B 671a294f1b4de3a71031c071330adad378e8fa418c95dbaeaba824071d38bc579d12113e899f00873e3a9a0a365f7ddc52ec9b728ffb19f254ffd8cacd9c945b SHA512 7df7a578711a959feee4326060829cf87c0d1669e473934549cb59d868a7aef7300ecd2d7a6b92a2295aa7e97964cc16d0e44a334db917e22b0b59573a9052de
-EBUILD i2pd-2.48.0.ebuild 1968 BLAKE2B 61c9f54682583b7009490642b4321dde59402e3647590c33dff7cbf048f2dd0ceb5360894138a540a7fbb01e82ebe33de8b3db21f14b3a9d102e810fa5f12a72 SHA512 c34ce08e21d4451cd7dcb6a219e0fb6d47193981a03f28ebfd90667b63331091e93aa8a93e9599486827d38d273db76c74e539c478c6e4c3c5ba12b04c147e51
+DIST i2pd-2.51.0.tar.gz 670699 BLAKE2B 363829d983a7b98416d8d4aa73af91514c82e446dd5a0c45c2ed10e5779b288fe50df2a89159de0efce8d84796fbddee33d886efab8fc8fffff6ead044d11145 SHA512 71e5751a283e10673138da55e3b16caa78ef92f4572b447d095d934e75d04ff11fb22e1c0372b141e26867f0c40af2ec9ad8b4b33b32e8d6b7323aa785b3b9c2
+DIST i2pd-2.52.0.tar.gz 677023 BLAKE2B 785eeb074df3e8a046ae3c6aa1204b52275ced56560addb3d4829d098b22d37582a41de29042bb3b2d48b6616f606c200b16ae10b26608d4bb6b74f237a4c9da SHA512 54272b23dcb62b8b7523038a9c1fc71b87bb9042f22bd12d6ebc62cfa47da07e2df47d88d706f285e9d88f9cace0564546632c10161f83f5c57b9ea17f5bde5f
 EBUILD i2pd-2.49.0.ebuild 1951 BLAKE2B 1cc165406b9fc798fb0954971781e242d8aa05bd20543f35316a996acbdaaad95ff5d5d3a0185004d765b4d6abfdfe1e23eb0a32d4d47aeef0cf5c429f73c988 SHA512 7c0c8e4933d9a005eb4bf4ac5b17aa82ccf49a898100165464f4e347759f69d5fabd4fad216ae6a5d623312ef1806995a50e11380756e698c01973f046651c83
 EBUILD i2pd-2.50.2.ebuild 1950 BLAKE2B e157516f805383504a9f5ef62da27a5fa0e05e5c887e8e3d8425b040236e3636aa6ece75ee33a04f2580a66df4ceb3266c3e0fb1749e48c97f2541f873c511db SHA512 f168aeb061b1a8401e3511b0f530934b2205f01b98ed217743f5e88790decdcae3c0dbc4c83cc6d6044f3092a6a4e25c47cb49371ab3a474116833e0234b13cf
+EBUILD i2pd-2.51.0.ebuild 1951 BLAKE2B b1e91ce459c30546a424386278ede00e1a6375fb75b69d4223c65896f574f9634e544301b0b7538170f3ada2f2f016c6025dad222968f10d100e3ae7cfb5cff0 SHA512 6011682fdf5ec09d8537a3c6f20cb9951655ae293bb476b0e1f30a14f923627d69def4c86f8a96bceb3156ffa296773fafff01f1308f34029c3c3054aa7636c7
+EBUILD i2pd-2.52.0.ebuild 1951 BLAKE2B b1e91ce459c30546a424386278ede00e1a6375fb75b69d4223c65896f574f9634e544301b0b7538170f3ada2f2f016c6025dad222968f10d100e3ae7cfb5cff0 SHA512 6011682fdf5ec09d8537a3c6f20cb9951655ae293bb476b0e1f30a14f923627d69def4c86f8a96bceb3156ffa296773fafff01f1308f34029c3c3054aa7636c7
 MISC metadata.xml 588 BLAKE2B a7a342599b07b88c0fc192386a7722eeb864b8f1debc4f30d6825e829b9c684d085edc6ef0b4e7d8e5bf3e04e93629df2925341784b2221d591084098a8a2d3e SHA512 86ca6c50c7eb8f06269a3e0b84f1189f4be57f40ea92b9cae3b9299b02c63d5a89fbb9ca6f16588a682ea1bb193c6395b55f67799c07e4bbf60f046185fb5d0e
diff --git a/net-vpn/i2pd/i2pd-2.48.0.ebuild b/net-vpn/i2pd/i2pd-2.51.0.ebuild
index 07752940c7e2..0346c80cb527 100644
--- a/net-vpn/i2pd/i2pd-2.48.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.51.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,8 +11,8 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes cpu_flags_x86_avx i2p-hardening +upnp"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes i2p-hardening +upnp"
 
 RDEPEND="
 	acct-user/i2pd
diff --git a/net-vpn/i2pd/i2pd-2.52.0.ebuild b/net-vpn/i2pd/i2pd-2.52.0.ebuild
new file mode 100644
index 000000000000..0346c80cb527
--- /dev/null
+++ b/net-vpn/i2pd/i2pd-2.52.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs systemd
+
+DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
+HOMEPAGE="https://github.com/PurpleI2P/i2pd"
+SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes i2p-hardening +upnp"
+
+RDEPEND="
+	acct-user/i2pd
+	acct-group/i2pd
+	dev-libs/boost:=
+	dev-libs/openssl:0=[-bindist(-)]
+	sys-libs/zlib
+	upnp? ( net-libs/miniupnpc:= )"
+DEPEND="${RDEPEND}"
+
+CMAKE_USE_DIR="${WORKDIR}/${P}/build"
+
+DOCS=( ../README.md ../contrib/i2pd.conf ../contrib/tunnels.conf )
+
+pkg_pretend() {
+	if use i2p-hardening && ! tc-is-gcc; then
+		die "i2p-hardening requires gcc"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
+		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+		-DWITH_STATIC=OFF
+		-DWITH_UPNP=$(usex upnp ON OFF)
+		-DWITH_LIBRARY=ON
+		-DWITH_BINARY=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# config
+	insinto /etc/i2pd
+	doins contrib/i2pd.conf
+	doins contrib/tunnels.conf
+
+	# working directory
+	insinto /var/lib/i2pd
+	doins -r contrib/certificates
+
+	# add /var/lib/i2pd/certificates to CONFIG_PROTECT
+	doenvd "${FILESDIR}/99i2pd"
+
+	# openrc and systemd daemon routines
+	newconfd "${FILESDIR}/i2pd-2.6.0-r3.confd" i2pd
+	newinitd "${FILESDIR}/i2pd-2.39.0.initd" i2pd
+	systemd_newunit "${FILESDIR}/i2pd-2.38.0.service" i2pd.service
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/i2pd-2.38.0-r1.logrotate" i2pd
+}
+
+pkg_postinst() {
+	if [[ -f ${EROOT}/etc/i2pd/subscriptions.txt ]]; then
+		ewarn
+		ewarn "Configuration of the subscriptions has been moved from"
+		ewarn "subscriptions.txt to i2pd.conf. We recommend updating"
+		ewarn "i2pd.conf accordingly and deleting subscriptions.txt."
+	fi
+}
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 3d8d5941cb0c..7a821fefda5d 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,8 +1,6 @@
 AUX libreswan-4.2-ip-path.patch 679 BLAKE2B 1af9dab7911ce25dff6f31437ced5ba5291701ed39a9852ff541c8d6e5523eeb317a5b25d5385c68bb9d5aa239570e11ec9118631e45af710e855b7ab9224575 SHA512 8035c77c1f3c927ccfcc2b7dfa84d9e095aaaa0e3274933c52a9de0726c83318b214118033a353be7b99a57f3cacb3ff9a83e8584a385304b599c6ce6fecb17f
-DIST libreswan-4.14.tar.gz 3721106 BLAKE2B 29c0beb8bb1d1fc3bc4fe5d229dd24ac74ca3f173c24bdf6982813f06aa1bad4572c8c472a414d58bdd5699b4fba33499ab5db7c55870c78314b39c213fc0e89 SHA512 fb4c4dc426530614d308a7c4f5d21123a166b1ad652f66393b45d4987a3e2be8e8bc135e7eedfe1c014db962b70f08108757f876e27cd9e7739a79764c6d4f2d
 DIST libreswan-4.15.tar.gz 3728498 BLAKE2B f2fd0955c73fb7278f4b2dbce3c1fa483406502c12340746426c77faa39143252e9b5f0b2c0cb60e238a962789b22b1f5b33a5bf5a42e79bb7e513fb2f12855f SHA512 49a60688bb4a5241dbd791bdde0c71ae80cfb7383bb841ea0788a9d0237569d7ad79e59985c700526e3807817ddae77ebd57521897526fbb8fb93ffbea631efe
 DIST libreswan-5.0.tar.gz 3957806 BLAKE2B c7ff493c332ac63d416651e9a85254bfe3c749dc812ff682b8aa99c35887cc6976d23fb5a5013196e0973681a2d7054167d06d29b33ca6d93809e35a130e4bb0 SHA512 b1c7cebe1ffc21aeaae76f2562764195d535ff5d51fb6ad570046678df19387df68f2d52586eb290844019cbdc17e6192773f9110531a26cf1583e2c016289c6
-EBUILD libreswan-4.14.ebuild 3586 BLAKE2B 959c608b98ee1b84d6159b14d42faa5c2afbff89e6065a1907425d7ee60c1cb17052c084bb22c2f9c51c1fdf4dfa7e2f82414c7b211ccac554d9a8f4d38eac2a SHA512 cd6f241e70e39f62382fc90d4a5308bb7a16e7d61f3e68d4c52bcf0844eec3608949bc2d6dd883515e913676497563ca70adf86fbbac6fa37bcdbe6147fdf571
 EBUILD libreswan-4.15.ebuild 3586 BLAKE2B 959c608b98ee1b84d6159b14d42faa5c2afbff89e6065a1907425d7ee60c1cb17052c084bb22c2f9c51c1fdf4dfa7e2f82414c7b211ccac554d9a8f4d38eac2a SHA512 cd6f241e70e39f62382fc90d4a5308bb7a16e7d61f3e68d4c52bcf0844eec3608949bc2d6dd883515e913676497563ca70adf86fbbac6fa37bcdbe6147fdf571
 EBUILD libreswan-5.0.ebuild 3585 BLAKE2B ca5b12930242adb893c2cd477bedbef3dce4c0f4d936ba46474b6ed0b7f4fe2578db2072698c1ae53c452a04cc6072d7d78a3e251075fecb3c0d811eb54878c7 SHA512 40c2b646becfe2841905dd7519442de622c8253090afea2916bc223a16b1b1123dd69878d19cff2214e435b5a698e698c6641c194a572002ed2bb2019d55bda5
 MISC metadata.xml 472 BLAKE2B 4e17159bafff8a30ddc9388ff6068458ef948b9854f78f7f03fd8b0fa78ee9b9e2bf21a2cead24381702c0513a39a375df77eb42bc74389069dc41f5c0522749 SHA512 1f27565366ef12eafe4a8aa548fba67ddee5b662ccba672c9d3cdb1463e1b944040ab11c455d8bb8459b911aa00cc4cff82dcd7e26404c6867c6eb4ec94402ff
diff --git a/net-vpn/libreswan/libreswan-4.14.ebuild b/net-vpn/libreswan/libreswan-4.14.ebuild
deleted file mode 100644
index c06292894782..000000000000
--- a/net-vpn/libreswan/libreswan-4.14.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd flag-o-matic toolchain-funcs tmpfiles
-
-DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
-HOMEPAGE="https://libreswan.org/"
-SRC_URI="https://download.libreswan.org/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD-4 RSA DES"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libevent:0=
-	dev-libs/nspr
-	>=dev-libs/nss-3.42
-	>=sys-kernel/linux-headers-4.19
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap-ng )
-	curl? ( net-misc/curl )
-	dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= net-dns/dnssec-root )
-	ldap? ( net-nds/openldap:= )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( sys-apps/systemd:0= )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-libs/nss
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-python/setproctitle )
-"
-RDEPEND="${DEPEND}
-	dev-libs/nss[utils(+)]
-	sys-apps/iproute2
-	!net-vpn/strongswan
-	selinux? ( sec-policy/selinux-ipsec )
-"
-DEPEND+=" elibc_musl? ( sys-libs/queue-standalone )"
-
-usetf() {
-	usex "$1" true false
-}
-
-PATCHES=( "${FILESDIR}/${PN}-4.2-ip-path.patch" )
-
-src_prepare() {
-	sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
-	sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
-	default
-}
-
-src_configure() {
-	tc-export AR CC
-
-	use elibc_musl && append-cflags -DGLIBC_KERN_FLIP_HEADERS
-
-	export PREFIX=/usr
-	export DEFAULT_DNSSEC_ROOTKEY_FILE=/etc/dnssec/icannbundle.pem
-	export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
-	export FINALDOCDIR=/usr/share/doc/${PF}/html
-	export INITSYSTEM=$(usex systemd systemd openrc)
-	export INITDDIRS=
-	export INITDDIR_DEFAULT=/etc/init.d
-	export USERCOMPILE=${CFLAGS}
-	export USERLINK=${LDFLAGS}
-	export USE_DNSSEC=$(usetf dnssec)
-	export USE_LABELED_IPSEC=$(usetf selinux)
-	export USE_LIBCAP_NG=$(usetf caps)
-	export USE_LIBCURL=$(usetf curl)
-	export USE_LINUX_AUDIT=$(usetf selinux)
-	export USE_LDAP=$(usetf ldap)
-	export USE_NM=$(usetf networkmanager)
-	export USE_SECCOMP=$(usetf seccomp)
-	export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
-	export SD_WATCHDOGSEC=$(usex systemd 200 0)
-	export USE_AUTHPAM=$(usetf pam)
-	export DEBUG_CFLAGS=
-	export OPTIMIZE_CFLAGS=
-	export WERROR_CFLAGS=
-}
-
-src_compile() {
-	emake all
-	emake -C initsystems \
-		INITSYSTEM=systemd \
-		SYSTEMUNITDIR="$(systemd_get_systemunitdir)" \
-		SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" \
-		all
-}
-
-src_test() {
-	: # integration tests only that require set of kvms to be set up
-}
-
-src_install() {
-	default
-	emake -C initsystems \
-		  INITSYSTEM=systemd \
-		  SYSTEMUNITDIR="$(systemd_get_systemunitdir)" \
-		  SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" \
-		  DESTDIR="${D}" \
-		  install
-
-	echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
-	fperms 0600 /etc/ipsec.secrets
-
-	keepdir /var/lib/ipsec/nss
-	fperms 0700 /var/lib/ipsec/nss
-
-	dodoc -r docs
-
-	find "${D}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process libreswan.conf
-
-	local IPSEC_CONFDIR=${ROOT}/var/lib/ipsec/nss
-	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
-		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
-		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
-		eend $?
-		einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
-	fi
-}
diff --git a/net-vpn/ocserv/Manifest b/net-vpn/ocserv/Manifest
index 1dd4ad49579c..cd81556dccbf 100644
--- a/net-vpn/ocserv/Manifest
+++ b/net-vpn/ocserv/Manifest
@@ -3,7 +3,10 @@ DIST ocserv-1.1.6.tar.xz 839744 BLAKE2B 3b3591588d9a5be4e723df739a5d8b4c33d78d53
 DIST ocserv-1.1.6.tar.xz.sig 442 BLAKE2B d24c46783f273bd329267cb3ba4effe0280655867e619bf0a3e4191386fa8851541fcd8768b0b1068e594caaf510ceeccfc30641169679ec394706fdf1ebe319 SHA512 2a87768ad63d40053732fa011bbeb3532c9673296b9be299bf8f7d8dd3dd35571eee96c0b4fa9bf5a30633b4c844337ab3d562d6ea2b6ad8efca084eb5e6f502
 DIST ocserv-1.1.7.tar.xz 844140 BLAKE2B 0b89937ce74fcf83d6423458462b3a419f9604407c80e2fc4a732b3e481dfd98cc76f062e112bf93ee392b3f4cdf5fdd271997c878bbe4165f11fa282852ff90 SHA512 5b6182b98c0406a27dae7121ec0d8771b158e0d8ce2056bd35451c8ed087a8b7f7d40035f9db5c19aa9a9a3b2c6b07be8f0bad4b6b96569584815a5358202ba4
 DIST ocserv-1.1.7.tar.xz.sig 442 BLAKE2B f5c40ef16f3bd4fb3dadff0459a6ecf8fadae01733a3d718ec00f35980b08860f7947c04a99386209a391185590edaedc349e9cb6684159178cd91caaf2f11fd SHA512 96d2562fdf918f2b6ea829d747330a3be2e015ab25897e01bd0d387cb69ef3592aacabbeec9612e95eca1fbce6178a176dbf76d553b7626c09d453d216ddd63d
+DIST ocserv-1.3.0.tar.xz 770596 BLAKE2B b45c528ca0d12602ae05cebf469a4be2efa846a49540375b258901620a9b95135297fdbb6553cec2cf63b506bcfc9355df8b519bcd6d52684b3b7432dbe66380 SHA512 24c3129b389fa767ad14f158580d8abd6830e697162b8fcfe3df6a4d21d543460c1955c3e0c63fecb8b4b01bd2492254d3eea8d5ba60d864cea314325badda7e
+DIST ocserv-1.3.0.tar.xz.sig 442 BLAKE2B f73b98c71a0c3fe18bf540e84871a51d28b8993ba9ae719f89fa345412a609d062b2041cd9b0e4b6aae8eecf8a117c68d408153b0ea15c7b1277f3d2ebcec567 SHA512 dd6a2e6f28a512bda19e758b32149cfe7951151edab8c34ac371dbcd17eed4a8b10fdfee306629c1d42c2a3e22bcfe523ee2aafb84d59181d5be719c399cfb7d
 EBUILD ocserv-1.1.6.ebuild 2205 BLAKE2B ee79d90e9277d6fdba6e090f91203fec92642e1c216bcdc9f920209fe4e4f3a494f054b3a39d6c87789492703f819fc3d2ccfe9ee3951acfdfa5fa8226af5e07 SHA512 ed2063b5059198983b045524b774d3701f5c460c4401ddf3219d6ff4f3e982a0bfdc0540913c505a2997dbadb74baa3d7b758ceaf892b852472581796a8c8b18
-EBUILD ocserv-1.1.7.ebuild 2251 BLAKE2B e8167910a102bbc0a120bfa04b163110f81cba0c899d4b413616af03ae0b6fa9607178b56928d4724d18607b4caf6ddf852feb36b32b74cb4acadc0970cfd904 SHA512 38d03e783e16d6375bc73cdb394a8121fd1abb346c5b78dc19a5c1996598f6d3f86c39b6d5025477a5909a506051257331cc02159f10d41080877ab325600543
-EBUILD ocserv-9999.ebuild 2210 BLAKE2B 3d718516f2a59330a82154fb263e83061d3c74bb903ed59836240f31328bbdbf5de8938a35a9655091b3fbe281437201a068d990bf8a892e1a3e3ea4855cb433 SHA512 c74d4a39ee5868cf09e231d6bbf458b2c4b05a5b2689cdde32aff890561feae4bb36f34cd8f79b7acd7e63442f2f51482df2de9d766c160ba4ef4df447e26939
+EBUILD ocserv-1.1.7.ebuild 2240 BLAKE2B 4226309b0e3e9975f53acce2a3896b3c8bbc62f7049f98936922b6901cc1b031aeb1da38d6b412381bc1b5d2422c2c744d7eb90f12ee9db309761fefbccc613b SHA512 b8ac24bd5a4904801eeb1e7e37bbb93f6996813efd3532ce354795221527f25ccfd12b0060651a06ebae62d367dd49eee5feccc6dcb61d8b7cf7591d9ed7eedf
+EBUILD ocserv-1.3.0.ebuild 2237 BLAKE2B 349fe0596b22f605453efc72d2c5a2e9bd4d392107b0d96ebe4bd92ec225fc50da8b2c52b7a7ed78bbe07e2642c06889a34d3a8e24af42c75d18b3f2fd240c6e SHA512 1b457d8f5bec7eabdcee30ee7eaa520a3b559c44ce5e423f134475303fcc1753f3f89cc06a054fa73354f2b66c93b2768e893f8a9f3704b13e22bac27e081d82
+EBUILD ocserv-9999.ebuild 2237 BLAKE2B 349fe0596b22f605453efc72d2c5a2e9bd4d392107b0d96ebe4bd92ec225fc50da8b2c52b7a7ed78bbe07e2642c06889a34d3a8e24af42c75d18b3f2fd240c6e SHA512 1b457d8f5bec7eabdcee30ee7eaa520a3b559c44ce5e423f134475303fcc1753f3f89cc06a054fa73354f2b66c93b2768e893f8a9f3704b13e22bac27e081d82
 MISC metadata.xml 326 BLAKE2B 72d04a451a052190079aaceb838f59191053f6c62bc8b39cc6d914f2b6f1083e6192235865d1ac9afd2569fb71441db028534abbf74666ccf063be2fd55522d0 SHA512 2a0ad00196df1cf38f02bf6de7232ac6d8886a85592c712e255bc4f7ec100ec1712c22f29f52c7b9b6c1d8f7473c5a4ab94e1f0e74c6eca0aa4563c3597a1798
diff --git a/net-vpn/ocserv/ocserv-1.1.7.ebuild b/net-vpn/ocserv/ocserv-1.1.7.ebuild
index 1b35605dac3b..9255a9952a09 100644
--- a/net-vpn/ocserv/ocserv-1.1.7.ebuild
+++ b/net-vpn/ocserv/ocserv-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ HOMEPAGE="https://ocserv.gitlab.io/www/index.html"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test"
-RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 BDEPEND+="
 	virtual/pkgconfig
diff --git a/net-vpn/ocserv/ocserv-1.3.0.ebuild b/net-vpn/ocserv/ocserv-1.3.0.ebuild
new file mode 100644
index 000000000000..44ddeac84fcd
--- /dev/null
+++ b/net-vpn/ocserv/ocserv-1.3.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+if [[ ${PV} == 9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitlab.com/openconnect/ocserv.git"
+else
+	inherit verify-sig
+	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/ocserv.asc"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ocserv )"
+	SRC_URI="https://www.infradead.org/ocserv/download/${P}.tar.xz
+		verify-sig? ( https://www.infradead.org/ocserv/download/${P}.tar.xz.sig )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Openconnect SSL VPN server"
+HOMEPAGE="https://ocserv.gitlab.io/www/index.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test"
+RESTRICT="!test? ( test )"
+
+BDEPEND+="
+	net-misc/ipcalc
+	virtual/pkgconfig
+	test? (
+		net-libs/gnutls[tools(+)]
+		net-libs/socket_wrapper
+		net-vpn/openconnect
+		sys-libs/nss_wrapper
+		sys-libs/uid_wrapper
+		pam? ( sys-libs/pam_wrapper )
+	)
+"
+DEPEND="
+	dev-libs/libnl:3=
+	dev-libs/libev:0=
+	>=dev-libs/nettle-2.7:0=
+	dev-libs/pcl:0=
+	dev-libs/protobuf-c:0=
+	>=net-libs/gnutls-3.3.0:0=
+	sys-libs/readline:0=
+	sys-libs/talloc:0=
+	virtual/libcrypt:=
+	geoip? ( dev-libs/geoip:0= )
+	kerberos? ( virtual/krb5 )
+	lz4? ( app-arch/lz4:0= )
+	otp? ( sys-auth/oath-toolkit:0= )
+	pam? ( sys-libs/pam:0= )
+	radius? ( net-dialup/freeradius-client:0= )
+	seccomp? ( sys-libs/libseccomp:0= )
+	systemd? ( sys-apps/systemd:0= )
+	tcpd? ( sys-apps/tcp-wrappers:0= )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--without-root-tests
+
+		$(use_enable seccomp)
+		$(use_enable systemd)
+
+		$(use_with geoip)
+		$(use_with kerberos gssapi)
+		--without-llhttp
+		$(use_with lz4)
+		$(use_with otp liboath)
+		$(use_with radius)
+		$(use_with tcpd libwrap)
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	addwrite /proc
+	default
+}
+
+src_install() {
+	default
+
+	dodoc doc/sample.{config,passwd}
+	use otp && dodoc doc/sample.otp
+
+	doinitd "${FILESDIR}"/ocserv
+
+	if use systemd; then
+		systemd_dounit doc/systemd/socket-activated/ocserv.{service,socket}
+	else
+		systemd_dounit doc/systemd/standalone/ocserv.service
+	fi
+}
diff --git a/net-vpn/ocserv/ocserv-9999.ebuild b/net-vpn/ocserv/ocserv-9999.ebuild
index 9ff9e3fd75a7..44ddeac84fcd 100644
--- a/net-vpn/ocserv/ocserv-9999.ebuild
+++ b/net-vpn/ocserv/ocserv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,6 +26,7 @@ IUSE="geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test"
 RESTRICT="!test? ( test )"
 
 BDEPEND+="
+	net-misc/ipcalc
 	virtual/pkgconfig
 	test? (
 		net-libs/gnutls[tools(+)]
@@ -43,7 +44,6 @@ DEPEND="
 	dev-libs/pcl:0=
 	dev-libs/protobuf-c:0=
 	>=net-libs/gnutls-3.3.0:0=
-	net-libs/http-parser:0=
 	sys-libs/readline:0=
 	sys-libs/talloc:0=
 	virtual/libcrypt:=
@@ -69,13 +69,13 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--without-root-tests
-		--without-nuttcp-tests
 
 		$(use_enable seccomp)
 		$(use_enable systemd)
 
 		$(use_with geoip)
 		$(use_with kerberos gssapi)
+		--without-llhttp
 		$(use_with lz4)
 		$(use_with otp liboath)
 		$(use_with radius)
@@ -84,6 +84,11 @@ src_configure() {
 	econf "${myconf[@]}"
 }
 
+src_test() {
+	addwrite /proc
+	default
+}
+
 src_install() {
 	default
 
diff --git a/net-vpn/riseup-vpn/Manifest b/net-vpn/riseup-vpn/Manifest
index 1a7dd6744cc5..3a16db92dea6 100644
--- a/net-vpn/riseup-vpn/Manifest
+++ b/net-vpn/riseup-vpn/Manifest
@@ -1,4 +1,7 @@
 DIST riseup-vpn-0.24.3-deps.tar.xz 35335684 BLAKE2B 85774c35593e59009b8b8ae3ada8542d2df6206bbd0662f01b6798907246097b847c1fc894e50d912f5a2e66abb74f7fe2e7458762ba09a6ddba8d9f1aa6b2b4 SHA512 febba844bfa5b35e99cce586207320dafc393648904aa543293af941012f17164710b72eb7ca0bc7a7d5025bf67958340606cf6c7ce43ddf4dcf2a59ca98e87e
 DIST riseup-vpn-0.24.3.tar.gz 12270357 BLAKE2B a28d5fe1920614717f7c4a276fbddd24523b7a0a4776bfb7ef49256984e1348b5821854c5547c8a1a72a4c5a07f28c3fd3b5866ed13cb1b3606ec398e4b41478 SHA512 03e916fd3e019b62a09b673aab14f7de9554d2ab5affd793c607f392ed8411c2081db8c223232572fe9b629a4bd68e9994e59c00c4d5ef67b0c8705c11981409
+DIST riseup-vpn-0.24.5-deps.tar.xz 33109948 BLAKE2B 2149f395c5f29ef63044b6e968a835d359522f013b78d167cb6a441e27728daf104c77037d6d3acc51794ded4d7224e12af84ec33cfca9911bdd236e70080e14 SHA512 1ea3b50ab742fb5fdb1d1a91469815be2c00b01760dbfed29de985ee3dab91be8a596b7694ff8da4bea6e6c707d5c03f5a4fdb03826ad1c9e2e36a55f757af88
+DIST riseup-vpn-0.24.5.tar.gz 9415881 BLAKE2B 9cf9c0db485de2c6cb3c09d0cda5f1cb1ce31d0c4686e0721cdac04d51e882c3b65fd282430c53da84242c2bfd6bbd20b58dfc9ee7d2844aa512656a28d439b9 SHA512 d3295ca6dd78dd761eafbd24fcaaec7970fbd5ef272e7d0f02502652a7c4a6bcf385c3ccbf29907aa28665f437824aff50a804853c9e6e979fd924c0407c6e25
 EBUILD riseup-vpn-0.24.3.ebuild 1787 BLAKE2B d847215657996c4ecd2a32a37af5ec6450f6b5232d7f54a8efd2bda9e4dd43ab2d00f313945a2b4586056b7382c42df75efbc5c57d5959fd02e081b0a0a92f56 SHA512 f616e1ff10503ad7921bb4d138924a7a3a95eb3252ce91fdcd316258acd0c5d14826e24edbd81846345d4139091f3d4e035f144b627fb42e3a5e6894fce9a3f2
+EBUILD riseup-vpn-0.24.5.ebuild 1793 BLAKE2B f0d95fcc01b0ca9c324eb72851cf085ecdd98caf1be9209548243c87c19b58e4326a326404a9ee5bf9236818cf07519fe723f4943615d433120e721ef4558cf3 SHA512 1609278e2314382638106350a55ae56fc11a0d2798313066dced2b3694ae11b7bdf1c6584bece29c492e6a4d5390e803cb6226087fc2454e6a8116c24a56d38f
 MISC metadata.xml 1044 BLAKE2B 28fd241b8a0a7cf97f52b56f854a1337272ddb652ed782448ccd71a3be6df07e4791cf1fcf21ee1750f6b498e1d9cd30e35c778427c04af2e4f60b709de7c8a9 SHA512 fc8e0f86bfbb7dd808f145284c81de8670341ec1ca8ce62e8dc4b9ef3aff0a8ff5c1bc72ea6946b0ec742adbd49d977e9a442dd7f075b3649ddf5304fc7fc735
diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.24.5.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.24.5.ebuild
new file mode 100644
index 000000000000..fd915cb57255
--- /dev/null
+++ b/net-vpn/riseup-vpn/riseup-vpn-0.24.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit desktop python-single-r1 go-module qmake-utils virtualx xdg
+
+DESCRIPTION="Anonymous encrypted VPN client powered by Bitmask"
+HOMEPAGE="https://riseup.net/en/vpn https://0xacab.org/leap/bitmask-vpn https://bitmask.net"
+SRC_URI="
+	https://0xacab.org/leap/bitmask-vpn/-/archive/${PV}/bitmask-vpn-${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~andrewammerlaan/${P}-deps.tar.xz
+"
+S="${WORKDIR}/bitmask-vpn-${PV}"
+
+# Generated with dev-go/golicense
+LICENSE="GPL-3 BSD-2 CC0-1.0 MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="test"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+# The tests require internet access to connect to Riseup Networks
+
+BDEPEND="
+	virtual/pkgconfig
+	dev-qt/qttools[linguist]
+"
+
+DEPEND="
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtdeclarative:6[widgets]
+	dev-qt/qtsvg:6
+	media-libs/libglvnd
+"
+
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	net-vpn/openvpn
+	sys-auth/polkit
+"
+
+src_prepare() {
+	default
+
+	# do not pre-strip
+	sed -i -e '/strip $RELEASE\/$TARGET/d' gui/build.sh || die
+
+	# We need qmake and lrelease from  qt6 bin dir
+	export PATH="${PATH}:$(qt6_get_bindir)" || die
+}
+
+src_compile() {
+	emake build
+}
+
+src_test() {
+	emake test
+	virtx emake test_ui
+}
+
+src_install() {
+	einstalldocs
+
+	newbin "build/qt/release/bitmask-vpn" riseup-vpn
+
+	python_scriptinto /usr/sbin
+	python_doscript "pkg/pickle/helpers/bitmask-root"
+
+	insinto /usr/share/polkit-1/actions
+	newins "pkg/pickle/helpers/se.leap.bitmask.policy" se.leap.bitmask.riseupvpn.policy
+
+	newicon -s scalable "providers/riseup/assets/icon.svg" riseup.svg
+	make_desktop_entry "${PN}" RiseupVPN riseup Network
+
+	dodoc -r docs/*
+}
diff --git a/net-vpn/tailscale/Manifest b/net-vpn/tailscale/Manifest
index ac3f605c9f2d..67700327f881 100644
--- a/net-vpn/tailscale/Manifest
+++ b/net-vpn/tailscale/Manifest
@@ -9,8 +9,11 @@ DIST tailscale-1.58.2-deps.tar.xz 397235964 BLAKE2B 3273320edb277d8f6527b6048f62
 DIST tailscale-1.58.2.tar.gz 2361679 BLAKE2B 1aa66710677ba7c648782db9f67ce8cf565812b08610bb078bcd78ee2d695601fcb2f681102eb7a1232b6c4057ba5e1fed1d26b375cec793f0fbce65aff38755 SHA512 3370af3c0214544d15196063f798e17e7c35566cf4d01628faa1e26ba1a5885834b0f3d2862e3009a81ff9f4298cdd3f826fc5d09f23568c30c64bc6f0400f6b
 DIST tailscale-1.60.0-deps.tar.xz 382250200 BLAKE2B 199d78fdccd0502dbf2d7e9e3cb50660a83d1187e35e50cd5f648970927fdf5c1df98682e8366d108603a1163df32fdc523041b8fe36dabfb2d13f0951357b16 SHA512 7fa1f21d42ddc85a98ad420104e17183b9c615010e8f13ca971f3488d382c6b7a8595006062e09f6438eeeaa6559a4e35eab3b053e85a66c5dfa9924d1aa5258
 DIST tailscale-1.60.0.tar.gz 2440764 BLAKE2B f6c6ee3e378ddc37dbe67a74b1ff2b1cf5b9cbe720f6a38b3292f6fc7874b2712f00d7ba2e647a12c7b29edb2ca131605226af5fd56200b8fa7c6005e6eba778 SHA512 81c96c6f64d4141894673be7d524bacae7485f9c1d63fde5dcea952573daafc87c9f5b5fa17ceabe8e88a4d61b4f939822228fb2a310bd8522ca15f7cb9c3a60
+DIST tailscale-1.66.1-deps.tar.xz 166468968 BLAKE2B ff69b69cfb9e46ea9a8b0267f5c14068cf715dff04167d9994630b03813790a8d305362508d6d77501eb6b41d0b44a68b5c447e29f0fc41ae343e303068ed584 SHA512 d923ab191c7986f90c78e85a8399910f1a94225223778fb92c11207ae144d149cf583f5c2fd5fb006802fc916ab73cc48f657c65960d570d9f98a7ddd47e32c6
+DIST tailscale-1.66.1.tar.gz 2634211 BLAKE2B cbf90ee36545fa8ba302f872948dc92e735bfe690451428540bee10399d1db1cdbf050949a5f3dbc69a77596b6a6d94724eb43bf9a4ee78a5cee9ada03889a3e SHA512 46e226c651abd5dee248e49fcf40a0cea9de72fe9e330015299acd9ec1fc83e1f192948c26b803f0fe3404558471b374391f3cf9155ecb2257a2563f79f3278b
 EBUILD tailscale-1.50.1.ebuild 1551 BLAKE2B 87483dfe54e5d589bfca3467a24ebb6a956b8446d05c3f4f0dac4d57a21ab6e209dd4cdea9f923d5f7fc9cf17e1016367e87759316b9f448d39156aa1e3f0d43 SHA512 e51d9d3ea303f9d90e103af15588b570ede86239b8e8f85de79f4a22d8564cad1ee811e0c6a77b439c56b08e97de69ee7b85000664679f77df393162ddbeeda6
 EBUILD tailscale-1.56.1.ebuild 1551 BLAKE2B b7f44982af569dad290f4a39d476ad8fc6d65fb6ee12d8e9843fb60fba81716c6b118a3a6f099531bac56094324a7aef32b984b97e7ff701884a98eb13f94539 SHA512 aaff749ea4b4f4947ce3e4eb27b11e32e26c240243ef5c260d2be56dc517df1357ace6401fd1995946a631cc382c2ab2accdc8517a52f71f31ff125b67a2d919
 EBUILD tailscale-1.58.2.ebuild 1551 BLAKE2B 8cfeb5ec4c3a68a9b65e19f21a0f1fe0e48745c3aea6845120e110b41ed0bec6818e9f809c29df5875ea862e9acce1ad5c2e961d7cf85dab998f0910e6ffd7d7 SHA512 05d247699c49cad64f35e5d4e9096122510b366b1b5550f51855736b02143b3ad6a623235de43604ca5fc957a0db162becba7a4195175af2de323c6c938d0286
 EBUILD tailscale-1.60.0.ebuild 1551 BLAKE2B ab684e62784270ea8788eebd62fd994228e80fa17b56abcf41a921670bb02667c5e7799b821c863b0c47546b10b36b9f17fe9f8a70815755cf14f77ea61eda5b SHA512 da66978ef2b237f5a7a607871319ab2e33d9e28f757c1f41bdf68b9f8b6859ed2147786c10750ba54862db29b73e0fbfb4b9d812da9982f77e531c41efa4c179
+EBUILD tailscale-1.66.1.ebuild 1551 BLAKE2B 35a7848d70835a044e033d337a936f837d09edaeeb473b7e280c5fbd1440e321dfced51436274983c88699011213d840b93cf29facf3f99a41c2ec64336f72ea SHA512 829bed30d96cc7ffa379f201f7a6117945573f75ade34fe6945bcfe493846f88a2b8e5a1dc6b1c1a8551c0cd22b16b3d6bf86e7f6dd96309a9ed8f2a57f12d19
 MISC metadata.xml 443 BLAKE2B cf358afa2cc9812ac53161e65f352e923c3488a65ce2a06cd32e5165bb2835886e40c467bcae62c61aa80ed3f22c89572c89441ac663d15cb67923b1602b2470 SHA512 970d9a92b21304ba6d15dfce4858ac297fe35e272aadbaf4f0eed2a704745391d3f33748961c3d3838da509164d24a81744f86988af9a971f8bb8b2f871b4619
diff --git a/net-vpn/tailscale/tailscale-1.66.1.ebuild b/net-vpn/tailscale/tailscale-1.66.1.ebuild
new file mode 100644
index 000000000000..a11d49b98146
--- /dev/null
+++ b/net-vpn/tailscale/tailscale-1.66.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+
+# These settings are obtained by running ./build_dist.sh shellvars` in
+# the upstream repo.
+VERSION_MINOR="66"
+VERSION_SHORT="1.66.1"
+VERSION_LONG="1.66.1-t88e23b6cf"
+VERSION_GIT_HASH="88e23b6cfd4b9a9cad5ce858b73ece1f07970fee"
+
+DESCRIPTION="Tailscale vpn client"
+HOMEPAGE="https://tailscale.com"
+SRC_URI="https://github.com/tailscale/tailscale/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="net-firewall/iptables"
+BDEPEND=">=dev-lang/go-1.22"
+
+RESTRICT="test"
+
+# This translates the build command from upstream's build_dist.sh to an
+# ebuild equivalent.
+build_dist() {
+	ego build -tags xversion -ldflags "
+		-X tailscale.com/version.Long=${VERSION_LONG}
+		-X tailscale.com/version.Short=${VERSION_SHORT}
+		-X tailscale.com/version.GitCommit=${VERSION_GIT_HASH}" "$@"
+}
+
+src_compile() {
+	build_dist ./cmd/tailscale
+	build_dist ./cmd/tailscaled
+}
+
+src_install() {
+	dosbin tailscaled
+	dobin tailscale
+
+	systemd_dounit cmd/tailscaled/tailscaled.service
+	insinto /etc/default
+	newins cmd/tailscaled/tailscaled.defaults tailscaled
+	keepdir /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+
+	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" ${PN}.conf
+
+	newinitd "${FILESDIR}/${PN}d.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}d.confd" ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}