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

3 files changed, 98 insertions, 2 deletions

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}
+}