gentoo auto-resync : 26:02:2024 - 17:40:44

8 files changed, 147 insertions, 14 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index dab5c72e1c09..8560d909aff5 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 abf31acc3960..9217eaf7d69b 100644
--- a/net-vpn/eduvpn-client/Manifest
+++ b/net-vpn/eduvpn-client/Manifest
@@ -1,5 +1,8 @@
+AUX eduvpn-client-desktop.patch 574 BLAKE2B d236bc0690693e0266c61b85418bb6b0fc081154d12d70ebd7f6c18c517aa670a2729b5911516fc0321ee02c295c013beaea26429812e51c84f06013f7de3c4b SHA512 20ac1ed79e48f79e1170e94d4fd59c9759ed885e0fe20e9bbbeab4ede72052fe952adacb8c5efd16d1040f97ce767db1d544fb90af92367ec3eb30eb8c79fb5d
 DIST eduvpn-client-4.1.3.gh.tar.gz 1163669 BLAKE2B 75184f21ecf24466e1496ced1295cb95a42e35f80d070a90dc9a2e2ed46272604703c0f56ebbc9a53b78f09a9ed685e64f578539502ef93b384d779d2a69af8c SHA512 2f180b238fc22dd19ae07a5e9e0518e51b302ecb1413a2d7f4fdb551f9cee5ef82ecf74498b63abb86745b8f9719a075b8d9758104cf124f88d65767944bc839
-DIST eduvpn-client-4.1.99.0.gh.tar.gz 1023712 BLAKE2B 5aabb6b1ade2b14299d107f4c666dc4d1f4858ac4f1cbdae0b1a0064fb943a685fe74181ac3301af4b3e1da8ec920c3cb8be9ac554387de018f9dafb3be1ec4a SHA512 29ee7feb7c7a5b23cb2d75f85b028c8830907b7b803ac8c03967e45bd8ed0bb4c1d0969bd543f9c369cbfc27b73c6c023a5d28df26681450a6242b83331f31f1
-EBUILD eduvpn-client-4.1.3.ebuild 939 BLAKE2B 6f2ae3b23aca95283783bc2926ffda375e7e9ab2b8e02f4228130d856e08ecf97b479c7385d24d22125176d10da7064adaee083be6ba6df7117e46bfaa1e0827 SHA512 3c6d66c216e4ea2aad4dd0b1cef359c263354aa6dddc3fc0001926672445c82a6bd169f92afd8adb4a664aae8dc131a2624b496aa684c8880d08c5c76d2267f8
-EBUILD eduvpn-client-4.1.99.0.ebuild 931 BLAKE2B 10010fa7247f6b64676a90189ede9f8d972c53caf7d08cf128cf7c90cf139841a596e4e6496adda19d7e3bad3d9a498de32a7ad15fe2f5436c46f32cf0debcfd SHA512 918998b8bd48a41562730a4f335ae2070b73e2351cad3bbfd05a01868420f3655419700057b9360be0640e01d22692c49a3ef204ab5bdfc892c0bbd46a642c27
+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
+EBUILD eduvpn-client-4.1.3-r1.ebuild 1112 BLAKE2B 130f06b89d38225910ab2e164c113c58740fbdfa002d360e1dd524a170e9adec7d50a0dfd9595bf8f5329b773808d64b69cc2b41cae411ae9b9198846ede5ac9 SHA512 b12673e0172645ec85d0e34148b63a6d00f70c36cbf9fbb20fb3d8fe0ddbfdae36072f470ed14c7f49e2507985d9d004e67b512821639defb1cc7807c72e2632
+EBUILD eduvpn-client-4.2.1.ebuild 1365 BLAKE2B ef9cdaea4885eeb3dc28917e7927e09d51f41779f531f83e6950448a76121115d5210a6861c3b4eff5a11196c21e7da203063f73380b62794b38c4f0fb7e8c9c SHA512 60f871a25fc9af44476ecf767b3506e17b5cdc9ba9049ebe9a395fd241c0d87fa70f8257b37a5bfc3cc2fd8faa69d409a354e007e6d3356461c4dec823a6258b
+EBUILD eduvpn-client-9999.ebuild 1365 BLAKE2B c8adfc24198fe9e00c472b637f5439a4e668ed84abedf0c6d93f16cbbae67de072458246e7ff9ffdee4561166c1f2dcc7e9b45ffa973bdcba82020641b89facf SHA512 dfa595988c930993975130bd95668a4e71386bdf9afa5ddac1b4d6614b9dadea3406b665bf8510838d1e07ca126d4e0dee548439b6ed5130a49a73a9aec3b7bf
 MISC metadata.xml 856 BLAKE2B 5ffc1c4ebc7429ef744cdcab2424fe68ada060c875c4b42666daff942bc3f9666a3ce4e981c90b4996df11f22b22e86b34df63da734d9bb64e7181a278110a8a SHA512 eab0db175a2e567c6b928b8b0ddd95b42bdf84a60f9297fb04666268539d5e288ab40d5ef38b36d1e6eced5f73e90f1fbda0c1978818952de2d34c75383d949a
diff --git a/net-vpn/eduvpn-client/eduvpn-client-4.1.3.ebuild b/net-vpn/eduvpn-client/eduvpn-client-4.1.3-r1.ebuild
index 58124218aa8c..2861e3026ced 100644
--- a/net-vpn/eduvpn-client/eduvpn-client-4.1.3.ebuild
+++ b/net-vpn/eduvpn-client/eduvpn-client-4.1.3-r1.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
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{10..12} )
 
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
+inherit distutils-r1 xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
@@ -35,4 +35,17 @@ RDEPEND="
 	>=net-vpn/eduvpn-common-1.1.2[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx doc
+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.ebuild b/net-vpn/eduvpn-client/eduvpn-client-4.2.1.ebuild
new file mode 100644
index 000000000000..0b30b821346b
--- /dev/null
+++ b/net-vpn/eduvpn-client/eduvpn-client-4.2.1.ebuild
@@ -0,0 +1,60 @@
+# 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..12} )
+
+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
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eduvpn.asc
+	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 )
+	"
+	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-vpn/eduvpn-common-1.2.0[${PYTHON_USEDEP}]
+"
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-eduvpn )"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-desktop.patch"
+)
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-vpn/eduvpn-client/eduvpn-client-4.1.99.0.ebuild b/net-vpn/eduvpn-client/eduvpn-client-9999.ebuild
index c5909a9568a4..6e6179988a41 100644
--- a/net-vpn/eduvpn-client/eduvpn-client-4.1.99.0.ebuild
+++ b/net-vpn/eduvpn-client/eduvpn-client-9999.ebuild
@@ -10,15 +10,21 @@ DOCS_DIR="doc"
 PYTHON_COMPAT=( python3_{10..12} )
 
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 docs
+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
-	SRC_URI="https://github.com/eduvpn/python-eduvpn-client/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-	S="${WORKDIR}/python-${P}"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eduvpn.asc
+	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 )
+	"
+	S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="Linux client and Python client API for eduVPN"
@@ -34,5 +40,21 @@ RESTRICT="test"
 RDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=net-vpn/eduvpn-common-1.1.99.0[${PYTHON_USEDEP}]
+	>=net-vpn/eduvpn-common-1.2.0[${PYTHON_USEDEP}]
 "
+
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-eduvpn )"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-desktop.patch"
+)
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-vpn/eduvpn-client/files/eduvpn-client-desktop.patch b/net-vpn/eduvpn-client/files/eduvpn-client-desktop.patch
new file mode 100644
index 000000000000..69c5d03d2b97
--- /dev/null
+++ b/net-vpn/eduvpn-client/files/eduvpn-client-desktop.patch
@@ -0,0 +1,16 @@
+--- a/share/applications/org.eduvpn.client.desktop
++++ b/share/applications/org.eduvpn.client.desktop
+@@ -6,4 +6,4 @@ Comment=a GUI to connect to eduVPN using OpenVPN and WireGuard
+ Exec=eduvpn-gui
+ Icon=org.eduvpn.client
+ Terminal=false
+-
++Categories=Network;Dialup
+--- a/share/applications/org.letsconnect-vpn.client.desktop
++++ b/share/applications/org.letsconnect-vpn.client.desktop
+@@ -6,4 +6,4 @@ Comment=a GUI to connect to Let's Connect! using OpenVPN and WireGuard
+ Exec=letsconnect-gui
+ Icon=org.letsconnect-vpn.client
+ Terminal=false
+-
++Categories=Network;Dialup
diff --git a/net-vpn/eduvpn-common/Manifest b/net-vpn/eduvpn-common/Manifest
index c7cbcfabcf0f..5a62087a3b05 100644
--- a/net-vpn/eduvpn-common/Manifest
+++ b/net-vpn/eduvpn-common/Manifest
@@ -1,7 +1,8 @@
 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.1.99.0-deps.tar.xz 7581560 BLAKE2B faa8a91a3eaff9a49e2c39059687d3e2264dd2f0dfcd711b301776a90df34e5f85aa1f5b724771a7b0e6c5f2ee3ec62fe72ddfdb6c35cb4cd664069fe189f26c SHA512 05d8f9785d0b967f7e2d64ec735b8e1dbf251b895ea7b860471128cb13d66ae6ffbb8507d831d7e2a7a4d0cf585bdd3f4514f74ff14202fa604d7a36a2d7d540
-DIST eduvpn-common-1.1.99.0.gh.tar.gz 209972 BLAKE2B 3547be10495bed8dd7ac185bf711d32cfdedee44b4acd7e1ef3ac7d56a7d4ca335deea34d8c9744738ef104d2f1ffe30b4623b0abb3589d7d3380ba00d6cf09d SHA512 f4e2ef80a1c4736bbfc30d0c8d439f993ccde87c93daa5d1f7179494938513123afeb44f23bbc4287d0309da10d5a0aeddfb77eae51933bbe6e5c57d461b1d5f
+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
 EBUILD eduvpn-common-1.1.2.ebuild 1421 BLAKE2B ef5534f84867f5ca4bb8cc85bc8c96268d5de0307ee520180f7654f3f74fab6e3a5619b4664bdadab67a5035e46f85c7a34c87b4a9167c6267cfca8cb18932a8 SHA512 573fe8c374474e58a3460d23aa3b5cbe6ffb7005ff3c530f46abc14650a4ba8f81ed34a338782e6675f279df222fdca2f0c21233895e605838b50219f61a6fb5
-EBUILD eduvpn-common-1.1.99.0.ebuild 1397 BLAKE2B 2d69521491fd271fd11417fb668b64ab6b741e6b8b4e44e46ea616f1e96cc12193e173d3e8fc694a9ca0226a58ddd223a8e763153dcbfdbedf8211f32922f010 SHA512 020db438e43d2b9b086beed2e972448bdf4f9a7d64bc5dee8366a52af4927a31dcdcbe3947a37e812c2ac4f3bf369dca0c8328f98ec4d44c3032849089e8de47
+EBUILD eduvpn-common-1.2.0.ebuild 1908 BLAKE2B eb19410ddccc234e79a9a305a650bf3e5064e556be0789d108034b7e995c8a6f640376d5fc9f08132ae8ea4dd448400e4b74e24434acc7aecb97d8ccd52537af SHA512 b9356aaa4c261e3075d5a708eace5907feb95c29e5918cda11875134715c1fb64349fff415b25fb2eb83662826f7ee187a21a17516d47d04e06715854103a293
 MISC metadata.xml 999 BLAKE2B 258c481ed43a5d388677aa7a5029201a01364059045c4285ba8b8da49c8c105832d59aa357a3a2dcaa36474ee206c8c1e7855ad7d8b0e402722c6cb50d6175ef SHA512 73b524373d8268083d9e5c979a8dee7fb52e54fbe27cac54219bd14a3851755e2c5aced686ff08e24d5cf08330cc6485a97734aea89d2de2b45bbe682a1e2f8a
diff --git a/net-vpn/eduvpn-common/eduvpn-common-1.1.99.0.ebuild b/net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild
index 3545e366925a..3aae9a36bd55 100644
--- a/net-vpn/eduvpn-common/eduvpn-common-1.1.99.0.ebuild
+++ b/net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild
@@ -16,8 +16,11 @@ 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/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
+		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
 	"
 fi
@@ -31,6 +34,10 @@ RDEPEND="
 	openvpn? ( net-vpn/openvpn )
 "
 
+if [[ ${PV} != *9999* ]] ; then
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-eduvpn )"
+fi
+
 wrap_python() {
 	local phase=$1
 	shift
@@ -48,6 +55,17 @@ pkg_pretend() {
 	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