gentoo auto-resync : 04:07:2024 - 08:06:07

11 files changed, 42 insertions, 165 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 9171b8bbd598..4e37b2e9a931 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 fea6cd74db97..cff02ff9b7b2 100644
--- a/net-vpn/eduvpn-client/Manifest
+++ b/net-vpn/eduvpn-client/Manifest
@@ -1,11 +1,10 @@
-AUX eduvpn-client-desktop.patch 574 BLAKE2B d236bc0690693e0266c61b85418bb6b0fc081154d12d70ebd7f6c18c517aa670a2729b5911516fc0321ee02c295c013beaea26429812e51c84f06013f7de3c4b SHA512 20ac1ed79e48f79e1170e94d4fd59c9759ed885e0fe20e9bbbeab4ede72052fe952adacb8c5efd16d1040f97ce767db1d544fb90af92367ec3eb30eb8c79fb5d
-DIST eduvpn-client-4.1.3.gh.tar.gz 1163669 BLAKE2B 75184f21ecf24466e1496ced1295cb95a42e35f80d070a90dc9a2e2ed46272604703c0f56ebbc9a53b78f09a9ed685e64f578539502ef93b384d779d2a69af8c SHA512 2f180b238fc22dd19ae07a5e9e0518e51b302ecb1413a2d7f4fdb551f9cee5ef82ecf74498b63abb86745b8f9719a075b8d9758104cf124f88d65767944bc839
+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.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 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
+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
+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
 MISC metadata.xml 856 BLAKE2B 5ffc1c4ebc7429ef744cdcab2424fe68ada060c875c4b42666daff942bc3f9666a3ce4e981c90b4996df11f22b22e86b34df63da734d9bb64e7181a278110a8a SHA512 eab0db175a2e567c6b928b8b0ddd95b42bdf84a60f9297fb04666268539d5e288ab40d5ef38b36d1e6eced5f73e90f1fbda0c1978818952de2d34c75383d949a
diff --git a/net-vpn/eduvpn-client/eduvpn-client-4.1.3-r2.ebuild b/net-vpn/eduvpn-client/eduvpn-client-4.1.3-r2.ebuild
deleted file mode 100644
index 89df137c6094..000000000000
--- a/net-vpn/eduvpn-client/eduvpn-client-4.1.3-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-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
-inherit distutils-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/eduvpn/python-${PN}.git"
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="https://github.com/eduvpn/python-eduvpn-client/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/python-${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/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	net-misc/networkmanager
-	>=net-vpn/eduvpn-common-1.1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-desktop.patch"
-)
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx-rtd-theme
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	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.2.1-r1.ebuild
index 7d59373c03b4..a97d7cf6edbc 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
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999* ]] ; then
 fi
 
 PATCHES=(
-	"${FILESDIR}/${PN}-desktop.patch"
+	"${FILESDIR}/${PN}-4.2.1-desktop.patch"
 )
 
 pkg_postinst() {
diff --git a/net-vpn/eduvpn-client/eduvpn-client-4.2.99.0.ebuild b/net-vpn/eduvpn-client/eduvpn-client-4.3.1.ebuild
index 9b8f13bf2170..13d420d01b3e 100644
--- a/net-vpn/eduvpn-client/eduvpn-client-4.2.99.0.ebuild
+++ b/net-vpn/eduvpn-client/eduvpn-client-4.3.1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	net-misc/networkmanager
-	>=net-vpn/eduvpn-common-1.99.0[${PYTHON_USEDEP}]
+	=net-vpn/eduvpn-common-2*[${PYTHON_USEDEP}]
 "
 
 if [[ ${PV} != *9999* ]] ; then
@@ -55,7 +55,7 @@ if [[ ${PV} != *9999* ]] ; then
 fi
 
 PATCHES=(
-	"${FILESDIR}/${PN}-desktop.patch"
+	"${FILESDIR}/${PN}-4.3.1-desktop.patch"
 )
 
 pkg_postinst() {
diff --git a/net-vpn/eduvpn-client/eduvpn-client-9999.ebuild b/net-vpn/eduvpn-client/eduvpn-client-9999.ebuild
index 9b8f13bf2170..dec0743cc294 100644
--- a/net-vpn/eduvpn-client/eduvpn-client-9999.ebuild
+++ b/net-vpn/eduvpn-client/eduvpn-client-9999.ebuild
@@ -47,17 +47,13 @@ RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	net-misc/networkmanager
-	>=net-vpn/eduvpn-common-1.99.0[${PYTHON_USEDEP}]
+	=net-vpn/eduvpn-common-2*[${PYTHON_USEDEP}]
 "
 
 if [[ ${PV} != *9999* ]] ; then
 	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-eduvpn-20240307 )"
 fi
 
-PATCHES=(
-	"${FILESDIR}/${PN}-desktop.patch"
-)
-
 pkg_postinst() {
 	xdg_icon_cache_update
 }
diff --git a/net-vpn/eduvpn-client/files/eduvpn-client-desktop.patch b/net-vpn/eduvpn-client/files/eduvpn-client-4.2.1-desktop.patch
index 69c5d03d2b97..69c5d03d2b97 100644
--- a/net-vpn/eduvpn-client/files/eduvpn-client-desktop.patch
+++ b/net-vpn/eduvpn-client/files/eduvpn-client-4.2.1-desktop.patch
diff --git a/net-vpn/eduvpn-client/files/eduvpn-client-4.3.1-desktop.patch b/net-vpn/eduvpn-client/files/eduvpn-client-4.3.1-desktop.patch
new file mode 100644
index 000000000000..2d765b9a002f
--- /dev/null
+++ b/net-vpn/eduvpn-client/files/eduvpn-client-4.3.1-desktop.patch
@@ -0,0 +1,16 @@
+--- a/eduvpn/data/share/applications/org.eduvpn.client.desktop
++++ b/eduvpn/data/share/applications/org.eduvpn.client.desktop
+@@ -7,4 +7,4 @@ Comment=a GUI to connect to eduVPN using OpenVPN and WireGuard
+ Icon=org.eduvpn.client
+ Terminal=false
+ StartupWMClass=org.eduvpn.client
+-
++Categories=Network;Dialup
+--- a/eduvpn/data/share/applications/org.letsconnect-vpn.client.desktop
++++ b/eduvpn/data/share/applications/org.letsconnect-vpn.client.desktop
+@@ -7,4 +7,4 @@ Comment=a GUI to connect to Let's Connect! using OpenVPN and WireGuard
+ Icon=org.letsconnect-vpn.client
+ Terminal=false
+ StartupWMClass=org.letsconnect-vpn.client
+-
++Categories=Network;Dialup
diff --git a/net-vpn/eduvpn-common/Manifest b/net-vpn/eduvpn-common/Manifest
index a4e9a4977a16..88fc60383819 100644
--- a/net-vpn/eduvpn-common/Manifest
+++ b/net-vpn/eduvpn-common/Manifest
@@ -1,12 +1,9 @@
-DIST eduvpn-common-1.1.2-deps.tar.xz 7517364 BLAKE2B a6bd2c11d5056170d88ca8c35d054cd6d529462af6595fe31c535640cdf59a25ae4811c04bc738832fa4c28d2d3308ca5615170547b0c93edf7c4dd3f475978b SHA512 ce167298a76df4e22b23e3cfb7640f0272ea546dc5767f66baab900029c2a4850b383521d2f74ae0d77c53f47ba6eb51d80ab122362e4a7470e69a1fc3ac423f
-DIST eduvpn-common-1.1.2.gh.tar.gz 208300 BLAKE2B 8cb7e96d4a6a5032a1696aa57a6322f6a861aebba8b1f653d8be98e0044eacb3f23dc400ac9a8598dd83f30ca2140394ee2aa5733a27547f2a0378ad03ab422d SHA512 dbc290e48bc045456ad83e58e63c223cef5a7e1c7178537a44ed306a423276e644fb0f5607a7d8ddc5014b48ae11b57e365068d72887062277f8ab4f6f1ae660
 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-1.99.1-deps.tar.xz 24548260 BLAKE2B 59065c553899cbabd1a867e77d907489deecaea4c279c24e0390ce7cf9e8b067ab972e390d9df3d7fb85a6057319002db20c7a3b2370835fb24994691ef803e3 SHA512 d1cbc8ab1823b51d5e1ea8ebe24cf94efcd431cc068569dd9dbf27e649e790662374600fdb9144fa4321c655d96ee3260de37edaa3870049c508630cc3208aa0
-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
+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
 EBUILD eduvpn-common-1.2.0.ebuild 1930 BLAKE2B 5d2e8eb49ad048b1e642c6c62a5d8328894d9795fbe7ddeb6f280161f390a8f8357c4b708df513ffe5e4ed55ffa772a8deb6fde8718e23e90f6837c6cf5a4f38 SHA512 155f73a05849cdfa250de843eb944b830ae35a9410c9cbd592dbd81a90e7e406f140b1a1b6cbbe7574aefff9119e950009a5e15cbc88046552d03bc1bd513e38
-EBUILD eduvpn-common-1.99.1.ebuild 2141 BLAKE2B 6a71a681bb4f108de26fdd1521dcb9f6d758259a464ae57325e753c35edb54240f85a9315b78800a330ba26bdd4a3da1c87129250c9c3bed6bfc2c12ad7712b9 SHA512 e7903f8843ec89cabe11b63af87e698dba006cd5c4cd28cd02f834dec6b233254f9294f1e67d0661086543a325e85e1c7f1a49f2cf99ade8d25e373b10296ecb
+EBUILD eduvpn-common-2.0.2.ebuild 2067 BLAKE2B 6096021e16ee698b0f2e8bb32b1aa30aaa4e35920812b1a0d1703172175fe8e3364d01bbffce0c0921265b58e630277d2e1935923f1f1f59e9e4d0a0cd086450 SHA512 4e0c468b2d258f9b1a9e96b96a472a2173d49700d2ddd415c4ae4a30a4ce51ccda4f5596a257e648455d98d96601512fd2e6c420286a62ea4f9b3d3030131bae
 MISC metadata.xml 999 BLAKE2B 258c481ed43a5d388677aa7a5029201a01364059045c4285ba8b8da49c8c105832d59aa357a3a2dcaa36474ee206c8c1e7855ad7d8b0e402722c6cb50d6175ef SHA512 73b524373d8268083d9e5c979a8dee7fb52e54fbe27cac54219bd14a3851755e2c5aced686ff08e24d5cf08330cc6485a97734aea89d2de2b45bbe682a1e2f8a
diff --git a/net-vpn/eduvpn-common/eduvpn-common-1.1.2.ebuild b/net-vpn/eduvpn-common/eduvpn-common-1.1.2.ebuild
deleted file mode 100644
index 21519b3a39d0..000000000000
--- a/net-vpn/eduvpn-common/eduvpn-common-1.1.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2021-2023 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
-	SRC_URI="
-		https://github.com/eduvpn/eduvpn-common/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
-		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 )
-"
-
-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_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-1.99.1.ebuild b/net-vpn/eduvpn-common/eduvpn-common-2.0.2.ebuild
index 55b6e50c9900..84ff41be06c6 100644
--- a/net-vpn/eduvpn-common/eduvpn-common-1.99.1.ebuild
+++ b/net-vpn/eduvpn-common/eduvpn-common-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_EXT=1
@@ -33,7 +33,7 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="openvpn wireguard"
+IUSE="openvpn"
 RESTRICT="test"
 
 RDEPEND="
@@ -54,11 +54,9 @@ wrap_python() {
 }
 
 pkg_pretend() {
-	if use wireguard; then
-		CONFIG_CHECK="~WIREGUARD"
-		WARNING_WIREGUARD="You must enable WIREGUARD to use wireguard."
-		check_extra_config
-	fi
+	CONFIG_CHECK="~WIREGUARD"
+	WARNING_WIREGUARD="You must enable WIREGUARD to use wireguard."
+	check_extra_config
 }
 
 src_unpack() {
@@ -72,16 +70,15 @@ src_unpack() {
 	default_src_unpack
 }
 
-src_prepare() {
+src_compile() {
 	default
 
-	mkdir -p wrappers/python/eduvpn_common/lib || die
-
-	wrap_python ${FUNCNAME}
-}
+	# 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
 
-src_compile() {
-	default
 	wrap_python ${FUNCNAME}
 }
 
@@ -91,7 +88,5 @@ src_test() {
 }
 
 src_install() {
-	# The shared library is installed within the python package. There is no
-	# need to call the default routine.
 	wrap_python ${FUNCNAME}
 }