gentoo auto-resync : 07:08:2024 - 12:37:20

16 files changed, 266 insertions, 17 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index ea71c1090c75..915473b648bd 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 cff02ff9b7b2..d2dff00ccb30 100644
--- a/net-vpn/eduvpn-client/Manifest
+++ b/net-vpn/eduvpn-client/Manifest
@@ -4,7 +4,10 @@ DIST python-eduvpn-client-4.2.1.tar.xz 973220 BLAKE2B 4ab4233ae31ad8b60ac1256699
 DIST python-eduvpn-client-4.2.1.tar.xz.asc 228 BLAKE2B 4f41b358e38ba0f488fc4f1ef4f4ff82ec094308455178978ed33f98fb660c867350624e49cd414ca73ededb7599f689aba1f92ee4416e57c90e19e703ebfbb9 SHA512 d141c1227cf7b5f3425085c42842408d7ed4cb55904dfe22fa9a220e520050c6fbdd3e943876845b1ded95f56eeef3a211f3e33c75c547adfe081f83041a0647
 DIST python-eduvpn-client-4.3.1.tar.xz 977296 BLAKE2B b4d75fa119c11350ee7fd84886bb1e822342f67e683eae3a53319e9b52bd42a62fca3988eec263e29cf4313219d85ed6915fe81e578b399d12647d25cf4d1259 SHA512 a9cb8ff72f4fc9a54cb8f29a0729d1c50b45dacb707e1e02147a06ef9e4eb0c27f6d18871eec8bc4ad9e3ae90e5d2c2009e1c6835602a468b65daacf195b7a13
 DIST python-eduvpn-client-4.3.1.tar.xz.asc 228 BLAKE2B 04686da2736888200ae43c594c5927e470cd957458859603282beedb1dd2df418759132650552fb48a9d6438203f40c797a094c5246010603076ee99376517b4 SHA512 672d2e7b35458b74aac96596cdc7ae73194cf6ed9960b3257c849d17e02f3add1249f82488eae5c8b51a0511c203b68e0d71550f968a2ac01da2b9ebf3317847
+DIST python-eduvpn-client-4.4.0.tar.xz 978136 BLAKE2B b00c5ce16a478774b53ad85302829ff9da867170118286114a31c2a50c1777e3ffd89ec85c9be1457e79bb5590b13cf15dca844840463645a8605cf4af86b519 SHA512 4e52cdf4fc164942cee577a1c464f62de9e44ec245795430bdb998528ef885576f9e4155e7cf7a76a3e6b6abaa759b2c10dc293a23d902e23f4f32ba08322f59
+DIST python-eduvpn-client-4.4.0.tar.xz.asc 228 BLAKE2B 0dde550e81c8e3942e77b5418724ea80d18c99eb325ca186fd6bc9b5e73467b7c0542ed6e22cddc1e5417244eb4a4007f883ffa7b2bf14dc92f803092a5f33f7 SHA512 819f478a061ce487270cc950b1f90fb5887ed2d967f034b580861da8bf241bf6c5619c71252a27a32daf4655da416ffe1a38471a810e3acd42fab18433af3e0e
 EBUILD eduvpn-client-4.2.1-r1.ebuild 1418 BLAKE2B 41f1e47959826402ee43ec6dcb30ec697e8173d6b2b11cc84b515546baa881360a7ac3e301e38ab4bd0d7ec0dc5a7d65b271de6c2c3ef32b42c9c28d50495e65 SHA512 ea8dae55540d0d84fd44fc08fdcb0e988ac3cc4d861e20e41baf149d8777f861cefe9cbfa7b3a91d974a2ff68c0b523b7378b2a5d633774b8dd0e929448a115a
-EBUILD eduvpn-client-4.3.1.ebuild 1625 BLAKE2B 880bc49110e62b5b5c34e393707450cb6bfbcf377e546be3acbd6ea1355f682e7b5220077e2785eb77346c55998ff5da939311cae5fb150ba4b77c28367bdacf SHA512 88a5a098829ada270599c097b1f23776ebe756e633ab4490babee39e51f63e5d3afa7e40f7bba4751b7eb7a93edf920a30878d2224e7b6cb8a0416226dbba884
-EBUILD eduvpn-client-9999.ebuild 1571 BLAKE2B 2cfb154f25ca51770b591d61dfe36cc6b18d8bc24919a5f4a3f6d249ea95d8c2997aaee7fc6fcbb934026d15f442226e7b19ea870265d1e7b6f91e3821e70882 SHA512 c04b6aebb0067470b0e8111240a9a1ce6d9cc5a25e870a3a71a9866cd125293a22aafca3faa93e1705e4cedefa9567e1f72b4d472a4129b7fb03746f9892a9cd
+EBUILD eduvpn-client-4.3.1.ebuild 1623 BLAKE2B 616c40fb461a893c5e2bb7290626b638ebce02a25d9aff816ea75914d85a518d5b19b33b9a7753d43b38b36b0519f4e2e2265c291538d92d17dc78ebe3d9b1c8 SHA512 8c998fe08ff17dc6b094f85c50c8ca900be07ad262dc1d16002eba162d8f2abbd3fccd019568b06890a18dccfff676b89ac8daa0748aba49e150df9f6924cfa2
+EBUILD eduvpn-client-4.4.0.ebuild 1617 BLAKE2B bb753a068cfc9b283bf3081c6e4d97bbc15e2010e6f1316c42905464188aa7a06947f6a2d7c1e684ca2997add9117d1a208d9d36629420cfd076a0b58d74f059 SHA512 8475a9d60eb7981f98893e9150c6c6ffa8d8d817dcb8c7f42ace1483556dbcbf140d76098281109ecb502424f5b33b0240000254cbb33f99d1b25bec95c38d7b
+EBUILD eduvpn-client-9999.ebuild 1573 BLAKE2B 80c614c7e41551a76a54f4509fb290832cdbf3c8c1aeaf8619c3e3eb13b19038dd887a027b91c66f52118cbe5c59e627e39120594889dc1102e8b7ae46bf8190 SHA512 12b14b293562204965a7be247117ec5a72d8e8c2df1991c9faa7512e4571cf05940cf2d6606fb4700779a46cd4df8756a054f7160659a794d3c75ecc1900292f
 MISC metadata.xml 856 BLAKE2B 5ffc1c4ebc7429ef744cdcab2424fe68ada060c875c4b42666daff942bc3f9666a3ce4e981c90b4996df11f22b22e86b34df63da734d9bb64e7181a278110a8a SHA512 eab0db175a2e567c6b928b8b0ddd95b42bdf84a60f9297fb04666268539d5e288ab40d5ef38b36d1e6eced5f73e90f1fbda0c1978818952de2d34c75383d949a
diff --git a/net-vpn/eduvpn-client/eduvpn-client-4.3.1.ebuild b/net-vpn/eduvpn-client/eduvpn-client-4.3.1.ebuild
index 13d420d01b3e..0b1c6969801e 100644
--- a/net-vpn/eduvpn-client/eduvpn-client-4.3.1.ebuild
+++ b/net-vpn/eduvpn-client/eduvpn-client-4.3.1.ebuild
@@ -29,7 +29,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-client/eduvpn-client-4.4.0.ebuild b/net-vpn/eduvpn-client/eduvpn-client-4.4.0.ebuild
new file mode 100644
index 000000000000..6a4dd8a1e71b
--- /dev/null
+++ b/net-vpn/eduvpn-client/eduvpn-client-4.4.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="dev-python/mkdocs-material"
+DOCS_DIR="doc"
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 docs xdg-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/eduvpn/python-${PN}.git"
+	S="${WORKDIR}/${P}"
+else
+	# Development Versions use a different release signing key
+	if [[ $(ver_cut 2) == 99 || $(ver_cut 3) == 99 ]] ; then
+		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eduvpn-dev.asc
+	else
+		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eduvpn.asc
+	fi
+	inherit verify-sig
+	MY_P="python-${P}"
+	SRC_URI="
+		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"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Linux client and Python client API for eduVPN"
+HOMEPAGE="https://www.eduvpn.org/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+# Test suite involves adding NetworkManager configuration entries,
+# disable for now.
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	net-misc/networkmanager
+	>=net-vpn/eduvpn-common-2.1[${PYTHON_USEDEP}]
+	<net-vpn/eduvpn-common-3[${PYTHON_USEDEP}]
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-eduvpn-20240307 )"
+fi
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-vpn/eduvpn-client/eduvpn-client-9999.ebuild b/net-vpn/eduvpn-client/eduvpn-client-9999.ebuild
index dec0743cc294..cee3b2010cb7 100644
--- a/net-vpn/eduvpn-client/eduvpn-client-9999.ebuild
+++ b/net-vpn/eduvpn-client/eduvpn-client-9999.ebuild
@@ -7,7 +7,7 @@ DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="dev-python/mkdocs-material"
 DOCS_DIR="doc"
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 docs xdg-utils
@@ -47,7 +47,7 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	net-misc/networkmanager
-	=net-vpn/eduvpn-common-2*[${PYTHON_USEDEP}]
+	>=net-vpn/eduvpn-common-2.1[${PYTHON_USEDEP}]
 "
 
 if [[ ${PV} != *9999* ]] ; then
diff --git a/net-vpn/eduvpn-common/Manifest b/net-vpn/eduvpn-common/Manifest
index 88fc60383819..90d36d3155a6 100644
--- a/net-vpn/eduvpn-common/Manifest
+++ b/net-vpn/eduvpn-common/Manifest
@@ -4,6 +4,10 @@ DIST eduvpn-common-1.2.0.tar.xz.asc 228 BLAKE2B 6b9de0767b9f755235556ab15447a639
 DIST eduvpn-common-2.0.2-deps.tar.xz 24632288 BLAKE2B 9796543c814e0a01dd06813d9a0fec2f78e4ce8f04260058842cb8626d3bcc5ae7d47621f5b9670969cd1a4428066e592fdb3753ebc82a2a8074ee6b9e962382 SHA512 d66043e2c68906b08c8d805f88d6bab30ee611a5c01756aa7d130ccf09e259d91c1ce1818a1b9413ba37138f1f871169925f56d010248d39d75330efc41522ec
 DIST eduvpn-common-2.0.2.tar.xz 992676 BLAKE2B 0fa633dcd6e8c0e1153f928187e988806a08e5591704763251759c373581eeee70c46eef82f12e709e479f219483185ff670b18e502f8b1b2d18028054217195 SHA512 566b113752b72e59c40f704f69c8a39e0af65a3c25639d56119ee9c1c5640f75a4d1f25f5d3a899d2a95fa222bd5943e502cb81d81346d568ffa4c58325d44cb
 DIST eduvpn-common-2.0.2.tar.xz.asc 228 BLAKE2B 7fd6f4b95137c5bd309352add49c1c6f2e82a19e0067d46423aadb06915fcd08789b63ac3719e78703916163cd18eaa395943596a0fb864cee051264407b7729 SHA512 bb8a2b17b8b4feb834df0b584fbe1cbb40bbb9a33eef2d8bf5d083d8c901d5c519b065c4c8f97ed3df2a943af9a8eb26ef3b1801ad159e11952129f87724b889
+DIST eduvpn-common-2.1.0-deps.tar.xz 24538240 BLAKE2B 669184809f8aefdd7f1015c3c4ee3d6f932842a44be1c2d585840f46cff80054cf795959498f14222322495f90a8c07f7f597659c372f91e836ad51db4927790 SHA512 6c215ac2806b97da12fdaff8a317d66ec1b2a8a96b23cad67d65d0fdaba464d4003a0ae0115e6b898a8d61c874e0116f425009a3560e0b9b7d8aceae2398afdc
+DIST eduvpn-common-2.1.0.tar.xz 993108 BLAKE2B 80dd41db49a4c3d334ca7112204cdbf709bd3020285f168c411dad4b3fcbef2968a3b6a4de95849537e1dfbfdbb81e42d07c9531804472781eacd10590d2cbe9 SHA512 40ee1f5ab99b1b743c0fcf647fa2973b2abceb3fde46305c091409e24cf1b87d9159e90e4839d42f4f186c37663e61f494f461343959eddf3bba8606e5bd1112
+DIST eduvpn-common-2.1.0.tar.xz.asc 228 BLAKE2B b0bb3b74b19b9274b4bc08cfa108b693f79c30ba2ae3a567e57b673a41c72fc920afc16cce6a1c173634e0f5e82016efcecb9dd71ba397723df82e0193efd814 SHA512 26eff9c19896176bb65afc1596bbb0d74e9a71e4cd756b284ae296203fe9db2952b9a778e9d558b1e390f35c5639e59c04a004927375e964bfe888ad019ebf11
 EBUILD eduvpn-common-1.2.0.ebuild 1930 BLAKE2B 5d2e8eb49ad048b1e642c6c62a5d8328894d9795fbe7ddeb6f280161f390a8f8357c4b708df513ffe5e4ed55ffa772a8deb6fde8718e23e90f6837c6cf5a4f38 SHA512 155f73a05849cdfa250de843eb944b830ae35a9410c9cbd592dbd81a90e7e406f140b1a1b6cbbe7574aefff9119e950009a5e15cbc88046552d03bc1bd513e38
-EBUILD eduvpn-common-2.0.2.ebuild 2067 BLAKE2B 6096021e16ee698b0f2e8bb32b1aa30aaa4e35920812b1a0d1703172175fe8e3364d01bbffce0c0921265b58e630277d2e1935923f1f1f59e9e4d0a0cd086450 SHA512 4e0c468b2d258f9b1a9e96b96a472a2173d49700d2ddd415c4ae4a30a4ce51ccda4f5596a257e648455d98d96601512fd2e6c420286a62ea4f9b3d3030131bae
+EBUILD eduvpn-common-2.0.2.ebuild 2065 BLAKE2B 024b3b19789cb021a7ef5147eda77e5a1d2cb46cff8e7b23ef5732d8bdcbf9f3d96a1c9d58337bcf0cf1a175c4aeb41f3511c0cbaa48c1fdeab5340c963b87fd SHA512 e287cf6d36281de95a18c15d45c3422e597e48b06843e6cadb87e10210d9d2802b77e83a522530572513b1d6155a96bc154d6102e75e2436f519996cfb46d808
+EBUILD eduvpn-common-2.1.0.ebuild 2067 BLAKE2B 6096021e16ee698b0f2e8bb32b1aa30aaa4e35920812b1a0d1703172175fe8e3364d01bbffce0c0921265b58e630277d2e1935923f1f1f59e9e4d0a0cd086450 SHA512 4e0c468b2d258f9b1a9e96b96a472a2173d49700d2ddd415c4ae4a30a4ce51ccda4f5596a257e648455d98d96601512fd2e6c420286a62ea4f9b3d3030131bae
 MISC metadata.xml 999 BLAKE2B 258c481ed43a5d388677aa7a5029201a01364059045c4285ba8b8da49c8c105832d59aa357a3a2dcaa36474ee206c8c1e7855ad7d8b0e402722c6cb50d6175ef SHA512 73b524373d8268083d9e5c979a8dee7fb52e54fbe27cac54219bd14a3851755e2c5aced686ff08e24d5cf08330cc6485a97734aea89d2de2b45bbe682a1e2f8a
diff --git a/net-vpn/eduvpn-common/eduvpn-common-2.0.2.ebuild b/net-vpn/eduvpn-common/eduvpn-common-2.0.2.ebuild
index 84ff41be06c6..9612e2b38c22 100644
--- a/net-vpn/eduvpn-common/eduvpn-common-2.0.2.ebuild
+++ b/net-vpn/eduvpn-common/eduvpn-common-2.0.2.ebuild
@@ -28,7 +28,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/eduvpn-common/eduvpn-common-2.1.0.ebuild b/net-vpn/eduvpn-common/eduvpn-common-2.1.0.ebuild
new file mode 100644
index 000000000000..84ff41be06c6
--- /dev/null
+++ b/net-vpn/eduvpn-common/eduvpn-common-2.1.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
+inherit distutils-r1 go-module linux-info
+
+DESCRIPTION="Linux client and Python client API for eduVPN"
+HOMEPAGE="https://www.eduvpn.org/"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/eduvpn/eduvpn-common.git"
+else
+	# Development Versions use a different release signing key
+	if [[ $(ver_cut 2) == 99 || $(ver_cut 3) == 99 ]] ; then
+		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eduvpn-dev.asc
+	else
+		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eduvpn.asc
+	fi
+	inherit verify-sig
+	SRC_URI="
+		https://github.com/eduvpn/eduvpn-common/releases/download/${PV}/eduvpn-common-${PV}.tar.xz
+		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"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="openvpn"
+RESTRICT="test"
+
+RDEPEND="
+	openvpn? ( net-vpn/openvpn )
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-eduvpn-20240307 )"
+fi
+
+wrap_python() {
+	local phase=$1
+	shift
+
+	pushd wrappers/python >/dev/null || die
+	distutils-r1_${phase} "$@"
+	popd >/dev/null || die
+}
+
+pkg_pretend() {
+	CONFIG_CHECK="~WIREGUARD"
+	WARNING_WIREGUARD="You must enable WIREGUARD to use wireguard."
+	check_extra_config
+}
+
+src_unpack() {
+	# go dependencies are not signed
+	if use verify-sig; then
+		pushd "${DISTDIR}" > /dev/null || die
+		verify-sig_verify_detached \
+			${P}.tar.xz{,.asc}
+		popd > /dev/null || die
+	fi
+	default_src_unpack
+}
+
+src_compile() {
+	default
+
+	# Install shared library into the python directory so the python packaging
+	# magic can find it.
+	pushd wrappers/python >/dev/null || die
+	emake install-lib
+	popd >/dev/null || die
+
+	wrap_python ${FUNCNAME}
+}
+
+src_test() {
+	default
+	wrap_python ${FUNCNAME}
+}
+
+src_install() {
+	wrap_python ${FUNCNAME}
+}
diff --git a/net-vpn/fp-multiuser/Manifest b/net-vpn/fp-multiuser/Manifest
index eadcc87a67f2..133795d82e22 100644
--- a/net-vpn/fp-multiuser/Manifest
+++ b/net-vpn/fp-multiuser/Manifest
@@ -4,5 +4,5 @@ AUX initd 742 BLAKE2B 7420c9cbd891c038acbfc6286a4cb31d917b6eb4f5c813f48f19cbb334
 AUX logrotated 46 BLAKE2B d2c046d047040127d197e197688e6acd88d8586d1c1e67ea82ca538342adf8b4e354ce82db8450313c35fbde673efd78cbfc50dfa62eb562dce297027fdee63b SHA512 67d2445d5f3a44cb8a89e27b02f2b2faf0dfada021da72d200e84bf06fe701ddac83316908f1a7cf3a4c508b298ba885f0f5df8d717db1f02c8ff5766c05d97a
 DIST fp-multiuser-0.0.2-deps.tar.xz 12749212 BLAKE2B 8fd0f16a8b58eec4094a6ea3d21b297ec7b3d111cc7d13acf1263ccb8d93724bc6a14172caafdff2f4e13e96f73cf2e22110c4c1aa19971172f85efce6a74468 SHA512 2513d61b3818e9c4a21aaaac36d65a5309fa87eb361c989366c09ce795fabfdb16ab7fb7bb30a112f37d9244b2ac2f54e43605c1f11ce1352b188c38848cc37d
 DIST fp-multiuser-0.0.2.tar.gz 19162 BLAKE2B 90f84ae8411ce08a817e50782690bfa5736059cd1f28ecd83d8a4b0fb72208dbd46986f5c863fe6e63647785f4cad18e7e3b291462c9a62117aae593a43defb2 SHA512 7eb5556134aaec3246d5849af76408195a8037e5ca382fedeaf19a94e049a45e560d396ae63cfb9e96b9088a6f83bb7c34d0214233013e41a0fd378f04cfae29
-EBUILD fp-multiuser-0.0.2.ebuild 852 BLAKE2B 7a4282d12cdf5506b12333e3a23aa1c18debbe8e345b9d901c35daf74530021316a882474c4cb6abb85c6eb40934fcd65581b55d1659af730a40be14b58f642c SHA512 6b1cbafe448276cdac7dd2ca41abef6678b8ff656482f69d1a53c95b8fc03d072734468567682b9957699a556f4605d6fad4d4c36edd2308e90ce68daa44a972
+EBUILD fp-multiuser-0.0.2.ebuild 850 BLAKE2B af9dcb89f43bcbb213436ee2df08085814b1a331637954e79f250dbad4200a5ee892a68e7db2f103a020cd5695d239550f8f56c377fba096efe18b4a62fde936 SHA512 ce1d0ed545df00485fa0f69741fe499f0aaabb5acb0ec70a6794823d7b57766d44b8a5d079654983f2e630a04304311583b59c8276afbf666c1e5241a49b7309
 MISC metadata.xml 328 BLAKE2B 02dd281d55a8b3c84c5cf1cae5ad95f9229e1ed215a05cf1c005c184ceaf1e0a3d4f9ef55e0088a8a9c4df081edff11004405b48912825b399a93e051ce61ce7 SHA512 c299180b018c6b9b6bf80c6bed7d1146e4c6114ad22b1943efdd7fcf66c05bf13f90d5a5b45de7f9510ca828b51564f5775696099d1f064f9d7183039abf53f2
diff --git a/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild b/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
index bc98553b747e..358f00f4c30e 100644
--- a/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
+++ b/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gofrp/fp-multiuser/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+
 RDEPEND="
 	acct-user/fp-multiuser
 	acct-group/fp-multiuser"
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 0f06d6bd8197..194f4cfaec7d 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -5,5 +5,7 @@ AUX i2pd-2.39.0.initd 1437 BLAKE2B 6f4e7b585e2acbabdb58999387954cac0ac5edd8bc7c3
 AUX i2pd-2.52.0-miniupnp.patch 1198 BLAKE2B 3448fb24ca2c41cf37b15a4c45e8245d0c5dbf535e3945b9f7093585f438b48319dbfd810268690aa4a49a5946a50681842baff63afebdda4dcd2d1f85959130 SHA512 c215df5e32142732f405534ad0fa874e8fa15f18513423f833c60f3d2bc4d143e5cf3065a0602b43636988331175062304996aa47ec0e0aead36a897b7383baa
 AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d21ef4d83620c064838d0e27f89f287a97404276490b848bd1372a40b915d4830b7755d801c4bda551099 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9
 DIST i2pd-2.52.0.tar.gz 677023 BLAKE2B 785eeb074df3e8a046ae3c6aa1204b52275ced56560addb3d4829d098b22d37582a41de29042bb3b2d48b6616f606c200b16ae10b26608d4bb6b74f237a4c9da SHA512 54272b23dcb62b8b7523038a9c1fc71b87bb9042f22bd12d6ebc62cfa47da07e2df47d88d706f285e9d88f9cace0564546632c10161f83f5c57b9ea17f5bde5f
+DIST i2pd-2.53.0.tar.gz 675583 BLAKE2B e1ebcc4a629bceda276c85c048f4b8048f89ef166045f9b24a4909f96774a4a162475f88466c3e346f0c76ed2151185754a6dd39be693a1850f076905fa2aa8f SHA512 54aaf96e5c1b0536247ed9644b2d5269df770e723307b4538f153de4a301479c5ef40fbfae097a3796f1114d89d7e9bb53715f408b6d32b15f6b31e1a1fdb7df
 EBUILD i2pd-2.52.0.ebuild 1997 BLAKE2B fc2b2d9deb7c80d78a53c79801319c962887caf04e1d8b1b8087c243fe060f8dab06cae4339b8c2b467a3918a772c7a80543727f64e97ca5e71a9c6624d1400b SHA512 03a313d13f7bec68c088740fc828e8bc9c33d20d135c87eec103b0c6100a66e219e1d0a8ad52a65b00b8c0236e709e27e76f4353707a93cd5e640f402f730df0
+EBUILD i2pd-2.53.0.ebuild 1954 BLAKE2B 47fc79773f9c76eb391bb3f040a18a9beb66712ae72636ef8c54db836c2a31567579065abbd5aff186a407549c9137b8bc575b61c6e366138ad05f2fba589c4b SHA512 9197177fd3202dad5a9f3f86fd33cf362c10d28c47703d8d22e5e4964d72ffd7da86c309086517bf914dd3ca93b118ed2d4694cb7840a11dbb9a29bd20fef80d
 MISC metadata.xml 588 BLAKE2B a7a342599b07b88c0fc192386a7722eeb864b8f1debc4f30d6825e829b9c684d085edc6ef0b4e7d8e5bf3e04e93629df2925341784b2221d591084098a8a2d3e SHA512 86ca6c50c7eb8f06269a3e0b84f1189f4be57f40ea92b9cae3b9299b02c63d5a89fbb9ca6f16588a682ea1bb193c6395b55f67799c07e4bbf60f046185fb5d0e
diff --git a/net-vpn/i2pd/i2pd-2.53.0.ebuild b/net-vpn/i2pd/i2pd-2.53.0.ebuild
new file mode 100644
index 000000000000..cb442b9d45f9
--- /dev/null
+++ b/net-vpn/i2pd/i2pd-2.53.0.ebuild
@@ -0,0 +1,83 @@
+# 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"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/openssl:0=[-bindist(-)]
+	sys-libs/zlib
+	upnp? ( net-libs/miniupnpc:= )
+"
+RDEPEND="
+	acct-user/i2pd
+	acct-group/i2pd
+	${DEPEND}
+"
+
+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/networkmanager-l2tp/Manifest b/net-vpn/networkmanager-l2tp/Manifest
index ac2b267520d8..d638976bd615 100644
--- a/net-vpn/networkmanager-l2tp/Manifest
+++ b/net-vpn/networkmanager-l2tp/Manifest
@@ -1,7 +1,8 @@
 AUX networkmanager-l2tp-1.20.8-bashism-configure.patch 1232 BLAKE2B 49b51a8dccedd5c8e3bfb226f8f0c48cff3e5b4ed0a0e2725eb61ad9ae452e1545546c58d7ab601fdbb4359aaa2470aba45ce78c8584d47c62d99c5e2a5a5b92 SHA512 f92643f64a7299bda2c7923d1e25c449f5075976b333facd024fed44782ba87ab71351dc7cadf84e8dd31d5d68a5d01585f870e42ab213f5c281e7820c394730
 AUX networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch 5219 BLAKE2B 076b69c7cf2bde7168f5de5ef01eb96c71763478dea57bd5d0aa610f3ebc1bb6a0ff3fafcd0679a39a0461b4a75df4e2d0b9305b220ed162cfe1b45223ef0a5e SHA512 58908a05ad75a80fbbacd81165b7c475cf94e018dc9ae4cc3340219433e9cc5b67715336eca0359e374a49fb47b05210a5adda9c94ea8faf1c0db7adfec56e7f
 AUX networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch 5472 BLAKE2B 9b4b3351262d258aaefd8cb3990bff432d089b3c72d98146b2efb4f6a4e18654f801660bf8f15f4a44c2637f5c52b82e08bbc3eed29b4906bdc7d63d5ad37e60 SHA512 7a1fd967e025eec21e2fc5f0c4f86d86111d018628a52c2e2899b9ab8ec8f50dc5f389ba7f235aea8cdf386c7f85af843f1caef1db79fbfc75af5a5899dab7dc
+DIST NetworkManager-l2tp-1.20.16.tar.xz 498140 BLAKE2B 0990a2b8a99e602302725f81e08a134779df1e0fbccd96cf2b7626c112578bb8ff8a4421d2641ec659a11482d20ade3fee87fc0c32acbf7bc3d598507a4640ef SHA512 d1a8364bae0116d556e1b554846df4efa415c0b84fa667181daae50ea706f7f62fa016290c35985667e9bda7ac237198575083dc816c05f16d6ac997da02aa7d
 DIST NetworkManager-l2tp-1.20.8.tar.xz 487316 BLAKE2B 97a0b13a56babee47c2fd57b4bb655b79b96206eb3a51dacef642812fdf9059483fb7176f2be6ba86fc286cb6d1efdbada2c3dc8564e89598670781786e76011 SHA512 6ed2ab401821878bf775a27d43e540acce0ea6504a1a4bac436164776ef9e0eacef7963f0362691ef4ad7304e30e2c3199ba4fb41e24918b83aab88b34f7bb6a
+EBUILD networkmanager-l2tp-1.20.16.ebuild 1457 BLAKE2B 5cc2f8dedd0173b5d79a60957dedd0751740ed531e7557963c9f35a63ff145db64149d07e960542b20b7d7b2ea273338377284c4142a46f4335c965b0547be3f SHA512 ba8580755df5f18a210b960411780aeb79cd0b2b2c4abecc919a5b5286d81b49ac367e3e5c8765c571edcfc6c864846eabe92eb5f4dc60b5130e94ed54ba8d06
 EBUILD networkmanager-l2tp-1.20.8-r3.ebuild 1654 BLAKE2B a55b8c73ce7ce6d288115b3f5f204e6a9445ccc6e739634ffb55b0b60461ec2aefaf6d3a6b0af8fde961204ede1faa95b91a36ef80d633845c8dafd9ed0bf0b0 SHA512 e3344e1c3ee9d9849ca6c2ced1542897d337c8b90794628959deae650c754ede9cf58cf8d2d6cad7c081e6472b0a332836cdcf897d3ee2cc51cbff3d700fc551
-EBUILD networkmanager-l2tp-1.20.8.ebuild 1457 BLAKE2B 7e650be93b810d277587a85120fc4666417316187c85985a71554117ca8d61e908c7f6d016eb7d347287f35db4324f62b631a47c6cc5ef7b27ac5e0bfdb8e13c SHA512 684a0bd9aa7ecb66f848dc8ebf86e0bd7fab5bbbe7e84ef12929b415d9ea06b1b05ca748b3313302dae3d4bc352001626d32a53c856bcce6ee511a9e8e2cf68c
 MISC metadata.xml 265 BLAKE2B 39644ede9957536ee9d058b398c84eb25da50a448547726479d94943e32a2d688421bf9eb591864ff027f2f47b28f6bc0443f63c9f6c5ccdd0e76d6caa433015 SHA512 a8820c1f5c2c61b51328871182b50294c52f508140cb306556c11cce5301c5b3ae98cd5ddb4355393fa821db2564c5889a74d41553ae5ace27a6242a9906c3da
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.16.ebuild
index c4c3ee77c566..4bdc18405f6a 100644
--- a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8.ebuild
+++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.16.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 MY_PN="NetworkManager-l2tp"
 MY_P="${MY_PN}-${PV}"
-
 inherit gnome.org
 
 DESCRIPTION="NetworkManager L2TP plugin"
 HOMEPAGE="https://github.com/nm-l2tp/NetworkManager-l2tp"
 SRC_URI="https://github.com/nm-l2tp/${MY_PN}/releases/download/${PV}/${MY_P}.tar.xz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
 IUSE="gtk"
 
 COMMON_DEPEND="dev-libs/glib:2
@@ -47,8 +49,6 @@ BDEPEND="dev-util/gdbus-codegen
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
 src_configure() {
 	local PPPD_VER=$(best_version net-dialup/ppp)
 	PPPD_VER=${PPPD_VER#*/*-} # reduce it to ${PV}-${PR}
diff --git a/net-vpn/ocserv/Manifest b/net-vpn/ocserv/Manifest
index d7a50e871bcc..29326ec8b99f 100644
--- a/net-vpn/ocserv/Manifest
+++ b/net-vpn/ocserv/Manifest
@@ -7,6 +7,6 @@ DIST ocserv-1.3.0.tar.xz 770596 BLAKE2B b45c528ca0d12602ae05cebf469a4be2efa846a4
 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 2235 BLAKE2B c326b55e1c51469107c3b96f3d49dc61a53288211bbc64a3fa3131beef35d5b817cf96923a118db56156a2e9ca74ec5d4e3b4687fae6cfb83c8e21be6bce0bcc SHA512 f0844cfa90cf0a22d0ad566f55de32cff0a73549c2f0467be457be7501252201bc879a33431a6b09418fc60543e8e9c77a35742461a39890b22fe14494cf4094
-EBUILD ocserv-1.3.0.ebuild 2237 BLAKE2B 349fe0596b22f605453efc72d2c5a2e9bd4d392107b0d96ebe4bd92ec225fc50da8b2c52b7a7ed78bbe07e2642c06889a34d3a8e24af42c75d18b3f2fd240c6e SHA512 1b457d8f5bec7eabdcee30ee7eaa520a3b559c44ce5e423f134475303fcc1753f3f89cc06a054fa73354f2b66c93b2768e893f8a9f3704b13e22bac27e081d82
+EBUILD ocserv-1.3.0.ebuild 2234 BLAKE2B a2b9a6c2cf2344802f0df9435d8c4e182df076c29baf3cfb02dff78bc0c1a6b6fbc9b177eaf8b3af4fd6e73d9d8fb19744cb3591b25e20c6324fe81720b78529 SHA512 b1476e45c593e8520607495d3c9c2246141790a8433480867d48363d08191dd912806568e7bd615c2b743a963a93655b4e048c8a67ce0a9f6dda55e38f923ff0
 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.3.0.ebuild b/net-vpn/ocserv/ocserv-1.3.0.ebuild
index 44ddeac84fcd..5a5c8a445ee1 100644
--- a/net-vpn/ocserv/ocserv-1.3.0.ebuild
+++ b/net-vpn/ocserv/ocserv-1.3.0.ebuild
@@ -14,7 +14,7 @@ else
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Openconnect SSL VPN server"