gentoo auto-resync : 20:02:2025 - 00:15:26

10 files changed, 44 insertions, 139 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 45662b69ad99..2a951d31799c 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 7fb3ad18166e..3266827d24e6 100644
--- a/net-vpn/eduvpn-client/Manifest
+++ b/net-vpn/eduvpn-client/Manifest
@@ -1,13 +1,11 @@
 AUX eduvpn-client-4.2.1-desktop.patch 574 BLAKE2B d236bc0690693e0266c61b85418bb6b0fc081154d12d70ebd7f6c18c517aa670a2729b5911516fc0321ee02c295c013beaea26429812e51c84f06013f7de3c4b SHA512 20ac1ed79e48f79e1170e94d4fd59c9759ed885e0fe20e9bbbeab4ede72052fe952adacb8c5efd16d1040f97ce767db1d544fb90af92367ec3eb30eb8c79fb5d
 AUX eduvpn-client-4.3.1-desktop.patch 660 BLAKE2B a39e2f0d698dce298aa00f619ff020576b409d64eb0f101d062ad5ab7e3768b9970fabff4d1ba2b63510f6aa28e5bbbf35d2beeb8121780b3a1e7c34bd04a938 SHA512 f6a27df6106992bd824874784e8a474cf3bd85f2b41648dbc11073eee227a33bace9f5484b0a0ee34301179cc0efe122c3fd15165eb3f457f9b63e4890808c54
-DIST python-eduvpn-client-4.2.1.tar.xz 973220 BLAKE2B 4ab4233ae31ad8b60ac12566995b9340d5e908a5f5146403491389e51ca72714ff2dbb4353f2cf17938c5bb036bfc39159f2bb8acab832a3981b2ad431d5156e SHA512 ae1b537b0f89b9bda32c4f46d67eade2bb96d17fdcb1c79eb1cac52754f715fdaf2953de6c2875cd0339fcbbbb1221b95c654958a9a1788865da71f0b29e657a
-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 eduvpn-client-4.4.99.0.tar.xz 981564 BLAKE2B 35f22b83574784c5ec5a121f84c49790bd42169febbe898d54bd8500a4f1bf75669725365ee5a529ff4e513280f6c6ffb655c622672276dcfb6580d786df9875 SHA512 cc48f50ed9c4c9a691818b5a061f9b0b59625e486177601fba95ca979b4c3ebe9af12237e4592494e38d3e97be909843ed341c5bfc9d47ca564d3f6130cfd85b
+DIST eduvpn-client-4.4.99.0.tar.xz.asc 228 BLAKE2B 4cb4d9054a4a91b1414442e2c8ccf0f9997c7f0b34374d92f589f30a4ef617d2f38b5e6093b5ecb56a5d71b4fe9795233dce0bb1be03c7546c48cf1feba90a53 SHA512 fe53bd76007a4ea365360cd8fcd3f1ecf921370ee4ae67d0d2220121cc7b2dbdf317b8884fbede917316122166da14c7cb1eb7e58ffac0ad5dc0764d185f0f5f
 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 1623 BLAKE2B 616c40fb461a893c5e2bb7290626b638ebce02a25d9aff816ea75914d85a518d5b19b33b9a7753d43b38b36b0519f4e2e2265c291538d92d17dc78ebe3d9b1c8 SHA512 8c998fe08ff17dc6b094f85c50c8ca900be07ad262dc1d16002eba162d8f2abbd3fccd019568b06890a18dccfff676b89ac8daa0748aba49e150df9f6924cfa2
+EBUILD eduvpn-client-4.4.0-r1.ebuild 1635 BLAKE2B 72ce041722484b486228707ef41ceedb9fef1a1018d00e2a3c92b4139438ced1e049eb33b2c86071b69287a605c7478c6bc18d61d80c0ebcf89bef5653861049 SHA512 62209a088c6e7a191f37bb9c243011255449893475e5a2062b11793df018f86e1de24ad5c16e0195ba3cf1af46b5f5d0a1e67914822f83a9882b43d65204d79d
 EBUILD eduvpn-client-4.4.0.ebuild 1615 BLAKE2B 004088ec63c0b9ae17379463b8ab673be0ee77a2b7919b3b148c033f7a4a76334ed94f2fac7f347ea270e243be5c8214dd0f005b87d34c85db3cc11c7f1c2af5 SHA512 5c9b2003e67a97fc04a677e1e0a4926a43fbde343eb5a655ff01c0bbd1f6f1a8bbeab7beb57d8bc4a8f4545c3ce952dc54c1ea56e4e6ab06419013d9b2f76322
-EBUILD eduvpn-client-9999.ebuild 1573 BLAKE2B 80c614c7e41551a76a54f4509fb290832cdbf3c8c1aeaf8619c3e3eb13b19038dd887a027b91c66f52118cbe5c59e627e39120594889dc1102e8b7ae46bf8190 SHA512 12b14b293562204965a7be247117ec5a72d8e8c2df1991c9faa7512e4571cf05940cf2d6606fb4700779a46cd4df8756a054f7160659a794d3c75ecc1900292f
-MISC metadata.xml 856 BLAKE2B 5ffc1c4ebc7429ef744cdcab2424fe68ada060c875c4b42666daff942bc3f9666a3ce4e981c90b4996df11f22b22e86b34df63da734d9bb64e7181a278110a8a SHA512 eab0db175a2e567c6b928b8b0ddd95b42bdf84a60f9297fb04666268539d5e288ab40d5ef38b36d1e6eced5f73e90f1fbda0c1978818952de2d34c75383d949a
+EBUILD eduvpn-client-4.4.99.0.ebuild 1658 BLAKE2B 88add062cc57a3348af337967e801be8401a85f223c911aafa0dab695a518bba20b44942eb52c64ed412d7fac6ba0348ba0cb7aabedf7df6cc5d7b8a6250edb0 SHA512 07b05c15bf29f51338bce4951f5a9f7ec1debf326eead8320871933910956f78c7a70baa5d1c82d883309fdd10de2c54e0832f835d4be856e9be443ebbbac87b
+EBUILD eduvpn-client-9999.ebuild 1614 BLAKE2B 45140d67b5bc4b8488acb2dabca77003a2b107af62b24546dc7f5b58201184ca45c60dcf6887fe72ca976354983a7401ab7351634a5cf86b023450d7e25c8522 SHA512 4c6cb844edcdee962d05e95814dbcec5a63fd639456e1a940fc4dac6cb02d00c202b58dceb2f78fb139400eb1f0398364bda9cbeaf8483679ac04912e2488de1
+MISC metadata.xml 914 BLAKE2B 157a47164dc897773b7612c1162c8f4cfa00cd711af9aca250e2b10ece4678518839ca310cefd0ff0b6970da63c93a425923dfa863c7e78249f9ab6154a38ff1 SHA512 daf1adb50071759d0c879baf850151ae5d7d3ea1811729c80cc6b7f59bd1d4ed56aa5369d3f336ab3e0b09709b4675034ef742d424b480fcb7cf62f462749a77
diff --git a/net-vpn/eduvpn-client/eduvpn-client-4.3.1.ebuild b/net-vpn/eduvpn-client/eduvpn-client-4.4.0-r1.ebuild
index 0b1c6969801e..db855c8aa88a 100644
--- a/net-vpn/eduvpn-client/eduvpn-client-4.3.1.ebuild
+++ b/net-vpn/eduvpn-client/eduvpn-client-4.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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,17 +47,15 @@ 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}]
+	<net-vpn/eduvpn-common-3[${PYTHON_USEDEP}]
+	x11-libs/libnotify
 "
 
 if [[ ${PV} != *9999* ]] ; then
 	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-eduvpn-20240307 )"
 fi
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3.1-desktop.patch"
-)
-
 pkg_postinst() {
 	xdg_icon_cache_update
 }
diff --git a/net-vpn/eduvpn-client/eduvpn-client-4.2.1-r1.ebuild b/net-vpn/eduvpn-client/eduvpn-client-4.4.99.0.ebuild
index a97d7cf6edbc..4109e9cd7def 100644
--- a/net-vpn/eduvpn-client/eduvpn-client-4.2.1-r1.ebuild
+++ b/net-vpn/eduvpn-client/eduvpn-client-4.4.99.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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
@@ -17,14 +17,19 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/eduvpn/python-${PN}.git"
 	S="${WORKDIR}/${P}"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eduvpn.asc
+	# 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}"
+	MY_P="linux-app-${PV}"
 	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 )
+		https://codeberg.org/eduVPN/linux-app/releases/download/${PV}/${MY_P}.tar.xz -> ${P}.tar.xz
+		verify-sig? ( https://codeberg.org/eduVPN/linux-app/releases/download/${PV}/${MY_P}.tar.xz.asc -> ${P}.tar.xz.asc )
 	"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -42,17 +47,15 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	net-misc/networkmanager
-	>=net-vpn/eduvpn-common-1.2.0[${PYTHON_USEDEP}]
+	>=net-vpn/eduvpn-common-2.99[${PYTHON_USEDEP}]
+	<net-vpn/eduvpn-common-3[${PYTHON_USEDEP}]
+	x11-libs/libnotify
 "
 
 if [[ ${PV} != *9999* ]] ; then
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-eduvpn )"
+	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-eduvpn-20240307 )"
 fi
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.1-desktop.patch"
-)
-
 pkg_postinst() {
 	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 cee3b2010cb7..0daf18c1c20a 100644
--- a/net-vpn/eduvpn-client/eduvpn-client-9999.ebuild
+++ b/net-vpn/eduvpn-client/eduvpn-client-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,10 +24,10 @@ else
 		VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eduvpn.asc
 	fi
 	inherit verify-sig
-	MY_P="python-${P}"
+	MY_P="linux-app-${PV}"
 	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 )
+		https://codeberg.org/eduVPN/linux-app/releases/download/${PV}/${MY_P}.tar.xz -> ${P}.tar.xz
+		verify-sig? ( https://codeberg.org/eduVPN/linux-app/releases/download/${PV}/${MY_P}.tar.xz.asc -> ${P}.tar.xz.asc )
 	"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
@@ -47,7 +47,8 @@ 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-2.99[${PYTHON_USEDEP}]
+	x11-libs/libnotify
 "
 
 if [[ ${PV} != *9999* ]] ; then
diff --git a/net-vpn/eduvpn-client/metadata.xml b/net-vpn/eduvpn-client/metadata.xml
index 9eb729cd0bdd..350c7522d51e 100644
--- a/net-vpn/eduvpn-client/metadata.xml
+++ b/net-vpn/eduvpn-client/metadata.xml
@@ -20,5 +20,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">eduvpn/python-eduvpn-client</remote-id>
+		<remote-id type="codeberg">eduVPN/linux-app</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-vpn/eduvpn-common/Manifest b/net-vpn/eduvpn-common/Manifest
index 840a00830d29..c9ac18609388 100644
--- a/net-vpn/eduvpn-common/Manifest
+++ b/net-vpn/eduvpn-common/Manifest
@@ -1,13 +1,9 @@
-DIST eduvpn-common-1.2.0-deps.tar.xz 7583176 BLAKE2B af35dd134a77753448fc9e7f91bde9d52fe05c20339eea637d0d0c5e9564f19cae6e294723adf1ef6c516ae05bc0495be2f316b2560b9d1860d9ce509517e04b SHA512 83e88038a6b5cb39917f9b892ac8783ef273c9e606173aad68125702a70a70dc9c61f54f0078d92214d6e1ec3e92cbdff3d10f18caf889cd603a2d75fa70c209
-DIST eduvpn-common-1.2.0.tar.xz 738836 BLAKE2B 85a10cee1a18e88a8f19bae8c8273cc2993b4dfa29106804342079739c5549e517194f2f4b52225e7f557cce45cffbc74b110f82c4cfd9d8141096d97445938d SHA512 8858e85b1422340a87ee8df2a8392bdf910fb282c6a80c171a89cd535bb119958c46576a17c57cf9a02bf9946ed749e01bacdbd9c45fa8623c7d6dfa9272aa36
-DIST eduvpn-common-1.2.0.tar.xz.asc 228 BLAKE2B 6b9de0767b9f755235556ab15447a639930447bea91c7880b9248844eac7600ad22ff2828a3e73176c65fb824a0b870604d53e68964850b5e8239dbd5ffd1fff SHA512 6d54112f22ba6272ca56cea3ad82d0de1b24365a9d61f8ac9f1708741d491ff3184b47bc86845f8ace0a5f44fb5ad7614535ce665b71dd56510445c1d4777d34
-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 2065 BLAKE2B 024b3b19789cb021a7ef5147eda77e5a1d2cb46cff8e7b23ef5732d8bdcbf9f3d96a1c9d58337bcf0cf1a175c4aeb41f3511c0cbaa48c1fdeab5340c963b87fd SHA512 e287cf6d36281de95a18c15d45c3422e597e48b06843e6cadb87e10210d9d2802b77e83a522530572513b1d6155a96bc154d6102e75e2436f519996cfb46d808
+DIST eduvpn-common-2.99.0-deps.tar.xz 24595948 BLAKE2B 0bc6eff73ecbd827c7855c29f94e8624095295e4178d5510f2510ee8c3d478eb4af8c3cdfec3318bc22fec9f2b3e24f4899795a78a832035a41ee99d9e3f794a SHA512 2f858978d2cf591125338617c39b81da7ab227af913e6c41725ef5b9746c9051006c4c1f3944032edffb499a92e0cfdd50bfa79d0139a759874e6775b4758bd9
+DIST eduvpn-common-2.99.0.tar.xz 1940324 BLAKE2B 33062cebe8c2d5090c5685aa7ebab8aa9f7bbdda37d4ed423e4ae790eccc989d026b52c0c521f2f057fe647fb423aa585e08c4f40fdfa3ec40edfac607644635 SHA512 1cd2bdd34c3f822b00047d19957c41dd646ecf4c0164033e7d18e1a17b9505775510ac83f0f23c92a2064ae0a5b10d692b53836f434e1e76569a71d879d20408
+DIST eduvpn-common-2.99.0.tar.xz.asc 228 BLAKE2B 2ac570fb365cbd004319101a13279f1a652a9e989a53952c60a5036ff5f45bc3e238d3c1865b950ecdd5921a40deb1e48602255028588d2f8ab81437960f508a SHA512 7616e164136448a3ce1e23f889ef44bf0913574ec38550860d0dca26039dec4e59151bbc827674c1571f6ce39f3cad18ea55c0365d8e8c33018ed93643ec8a0e
 EBUILD eduvpn-common-2.1.0.ebuild 2065 BLAKE2B 024b3b19789cb021a7ef5147eda77e5a1d2cb46cff8e7b23ef5732d8bdcbf9f3d96a1c9d58337bcf0cf1a175c4aeb41f3511c0cbaa48c1fdeab5340c963b87fd SHA512 e287cf6d36281de95a18c15d45c3422e597e48b06843e6cadb87e10210d9d2802b77e83a522530572513b1d6155a96bc154d6102e75e2436f519996cfb46d808
-MISC metadata.xml 999 BLAKE2B 258c481ed43a5d388677aa7a5029201a01364059045c4285ba8b8da49c8c105832d59aa357a3a2dcaa36474ee206c8c1e7855ad7d8b0e402722c6cb50d6175ef SHA512 73b524373d8268083d9e5c979a8dee7fb52e54fbe27cac54219bd14a3851755e2c5aced686ff08e24d5cf08330cc6485a97734aea89d2de2b45bbe682a1e2f8a
+EBUILD eduvpn-common-2.99.0.ebuild 2041 BLAKE2B ccf325bc1c1809d0d3dfda2c9823188f1406b261f9822796a1e6e1e6e6303ff093196dc17557d52e3680e0c3899f2a0de064b2c947e3039f78e3951d51d4b976 SHA512 ec3b0b2a911cc37839c52fc6b605b5f4534f9af4302f2d35bef2a2447d3e8248915362a39e30f37e5481ff04e8e51b4482edda2a6c2216cbfd36eaa93bb99b7e
+MISC metadata.xml 1000 BLAKE2B f2eaa221fc47e6e034749b7a4485ad6b2c882b944e91a02f5f0fd6a997b85495364ca1ed3d262b84e96a8160ebb8a901924ae12b65f8a0ab8a8b032d0bfca88a SHA512 0ac13f6ab7e6fb40db2c9b21744624b805de01dc715683978f742770d417cbeebbe637792d321816a94ee388a63e4a6f6bea30bc2f6c4bf2487d76cd46439e5d
diff --git a/net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild b/net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild
deleted file mode 100644
index 05c0f5b2dc9c..000000000000
--- a/net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-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
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eduvpn.asc
-	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 wireguard"
-RESTRICT="test"
-
-RDEPEND="
-	openvpn? ( net-vpn/openvpn )
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-eduvpn )"
-fi
-
-wrap_python() {
-	local phase=$1
-	shift
-
-	pushd wrappers/python >/dev/null || die
-	distutils-r1_${phase} "$@"
-	popd >/dev/null || die
-}
-
-pkg_pretend() {
-	if use wireguard; then
-		CONFIG_CHECK="~WIREGUARD"
-		WARNING_WIREGUARD="You must enable WIREGUARD to use wireguard."
-		check_extra_config
-	fi
-}
-
-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_prepare() {
-	default
-
-	mkdir -p wrappers/python/eduvpn_common/lib || die
-
-	wrap_python ${FUNCNAME}
-}
-
-src_compile() {
-	default
-	wrap_python ${FUNCNAME}
-}
-
-src_test() {
-	default
-	wrap_python ${FUNCNAME}
-}
-
-src_install() {
-	# The shared library is installed within the python package. There is no
-	# need to call the default routine.
-	wrap_python ${FUNCNAME}
-}
diff --git a/net-vpn/eduvpn-common/eduvpn-common-2.0.2.ebuild b/net-vpn/eduvpn-common/eduvpn-common-2.99.0.ebuild
index 9612e2b38c22..5859f13c4510 100644
--- a/net-vpn/eduvpn-common/eduvpn-common-2.0.2.ebuild
+++ b/net-vpn/eduvpn-common/eduvpn-common-2.99.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,11 +24,11 @@ else
 	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://codeberg.org/eduVPN/eduvpn-common/releases/download/${PV}/${P}.tar.xz
+		verify-sig? ( https://codeberg.org/eduVPN/eduvpn-common/releases/download/${PV}/${P}.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/metadata.xml b/net-vpn/eduvpn-common/metadata.xml
index 26731a22c57e..2586b330b98c 100644
--- a/net-vpn/eduvpn-common/metadata.xml
+++ b/net-vpn/eduvpn-common/metadata.xml
@@ -20,9 +20,9 @@
 	</longdescription>
 	<use>
 		<flag name="openvpn">enable support for OpenVPN</flag>
-		<flag name="wireguard">enable support for WireGuard</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">eduvpn/eduvpn-common</remote-id>
+		<remote-id type="codeberg">eduvpn/eduvpn-common</remote-id>
 	</upstream>
 </pkgmetadata>