gentoo auto-resync : 17:08:2023 - 03:31:10

8 files changed, 20 insertions, 141 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index f96c41fe876b..550180499f69 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-openconnect/Manifest b/net-vpn/networkmanager-openconnect/Manifest
index 52aeca524c42..c57a51e84a99 100644
--- a/net-vpn/networkmanager-openconnect/Manifest
+++ b/net-vpn/networkmanager-openconnect/Manifest
@@ -1,6 +1,4 @@
 AUX networkmanager-openconnect-1.2.10-check-webkit-if-gtk.patch 1060 BLAKE2B e6d380e9040dcb8737f59c3302e51d31faffb85a0779ad149c620075a1e1b80a03cc67aa14b8065d079974011c56361e078821fd86bcbe372106c365790365a9 SHA512 d8c243914b5d53570f50064d0e13a675f2c0baf0605615a858b809d9cab27552f346137dd82e0528156f475adb6c948a6bc1a3572807fc4364fa5c2613d7b576
 DIST NetworkManager-openconnect-1.2.10.tar.xz 920560 BLAKE2B 8e631bacf7ac99bf3abec6eeea9bfda070dfeac4572280b74771746942bf9700f8d943501fc63933052bf07735751f5353fcc6ccd6654b57a893ed87a442650f SHA512 c61f5edee04475b013afbb91ba11e102cf4c925a0b2e16477473e0de9528d793121c1324f2c4d5ae03e0c8fb00dd9de444130c22e681f7a3408bc9a179ad7509
-DIST NetworkManager-openconnect-1.2.8.tar.xz 857808 BLAKE2B b9dd1f75eb34b3149b1d8520fa34caec9547c581affd8065116376f5ee9b0332dc8791af63a88b918445b17b9fd5655b5c154a32c150da62a015ae94221c4634 SHA512 5209fb15ce22511f9b9ccde5e19c86136c3236490c4793afcc2d4081ad87dc4c5fde7f6335db1f50cbbb674b1afc7c42a8c89a6d046ba3945691b2dfb3691d38
 EBUILD networkmanager-openconnect-1.2.10-r1.ebuild 1207 BLAKE2B 5a8fb2563a42342c1136b891ee46728ba4e4b6a7f4923f5ace8a7dc26831fbbbe7c8d5258948829564ed9df97ce39ad1ff3910016ce19cf63bbd34a0bd4d55ac SHA512 3db5f13e184f22792ca38783816abb69075749b80e5d7db26685d0be0060aea4290f886589dd6eac15d567120fbbc3b5769cd166eb607a40cd8b9fde113d3ce4
-EBUILD networkmanager-openconnect-1.2.8-r1.ebuild 1171 BLAKE2B 263f7923455bcc4e000c1f1a1e0a6c2baaa74a60e743f72211ac6f7c0cb54fc80d22a5a2575d93c241bca7ee722e0f8698b84518b7fcbaa1a797d4fe81507263 SHA512 c4331a332b158e0f5ae609564e0621908ce9feca06b29ab1a0f2a10988c31744eb8287d7ad6ec7811977c922084679c0d802f8f10341568c6947dea6c476f8af
 MISC metadata.xml 367 BLAKE2B 8c8ffe5ee3afd7b5ed558d27e396416f66fcd42e981a4e40ba737e96baa94ef41c8cda9a3f46efece9acc4ce724233dcafa7106722e461601a58f1b3e40411e5 SHA512 6ec9eda5753bf693fc162bb70cba3d4a2065d293c250bc4c4c04d40446597039b9ad5406919c489c4a02eed5ee17d81ebac41867b328660794dfa71a39b9291e
diff --git a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.8-r1.ebuild b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.8-r1.ebuild
deleted file mode 100644
index e6cd875366c5..000000000000
--- a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.8-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager OpenConnect plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager https://gitlab.gnome.org/GNOME/NetworkManager-openconnect"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="gtk"
-
-DEPEND="
-	>=net-misc/networkmanager-1.2:=
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/dbus-glib-0.74
-	dev-libs/libxml2:2
-	>=net-vpn/openconnect-3.02:=
-	gtk? (
-		>=app-crypt/libsecret-0.18
-
-		>=app-crypt/gcr-3.4:0=
-		>=x11-libs/gtk+-3.12:3
-
-		>=gui-libs/gtk-4.0:4
-		>=net-libs/libnma-1.8.36
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/nm-openconnect
-	acct-user/nm-openconnect
-"
-
-BDEPEND="
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Bug #830257
-	sed -i 's|/appdata|/metainfo|g' Makefile.{in,am} || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--without-libnm-glib \
-		$(use_with gtk gnome) \
-		$(use_with gtk authdlg) \
-		$(use_with gtk gtk4)
-}
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index 2df23aaf7053..175ec7307353 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,5 +1,4 @@
 AUX networkmanager-openvpn-1.10.2-openvpn-2.6-compat.patch 1982 BLAKE2B 5446a16571eb482d542798476255fbd28209ae32e821eb275e255a5915c59f3c6798ed24e7c0163bed46c5c5f04fd40398ebc5ac072daa497b16f7f6b995eefb SHA512 99838460deb18a82f0ee8b4c4e7b0d88cbff958423cde82c29a89f7c276eeddfc8624c790ec1cee93913c89d5415cafb810fdcf14eea104667c3da93a9e6d5ab
 DIST NetworkManager-openvpn-1.10.2.tar.xz 701652 BLAKE2B c6cef27e57320dc68c168248981f54d2a8eb0a2b19524e11b2c25da04dc98f2a4e00e07b9b83d92d1654c26685d46d8f152c95462e4d73f853872fa3553735bb SHA512 469aa4eeab169ccabd04b18b425ab2f8ad095e19c80dfca528855e1c66314e3ac129145ce5e62f5ccbb7a01cd7ba7f657571c3f4ec57b15ecb95aeaa765f5c4a
 EBUILD networkmanager-openvpn-1.10.2-r1.ebuild 1051 BLAKE2B 0dd6244c7f0c7956ced8f5eb517fb0f466524feafdee307340401635d838255e2514c19fbda857e8aecf2657664618873687b26f98bdb56a20275d6b32ea9d3e SHA512 059f52b643536150f5fcae0996d5cb00048d5992cdcbbc6430070624e6a3eebd642f8f851d4c3bf1f4d15b561d3a6adc1e504aca9a9997359a6d410e175c9f60
-EBUILD networkmanager-openvpn-1.10.2.ebuild 993 BLAKE2B 12d6e1c4a985bb5890c50e9e3c958a2e313b12a55ac074484157bc3b6d21029efd1e46b96bfe92ba42e3663c57ffe0adef243de0eadfd1b12f39fc2eebbc9cd0 SHA512 32a2d972794d5f70984d6d279ce3aa4bbca0e6a9797b22dac35e4fa29b41681151cd820423b762fae0af6302ddab4ca9e2d22dd1dd5437b0bf31074790f45358
 MISC metadata.xml 363 BLAKE2B 2ff0b1a3948001faad595b1e106a906aee729c0f576a6f7b66f766bcb309f4ef1f12ba3d24af1cf130db8e734d913402f74e9a12adef51bfcd77cdb532ab81ae SHA512 6b05e736c4c25efc495d219779f29c570a1e45ab6f259751c44e28a6c7fc94dae1b8d7ebd21d4297e11f64a591f8e72576e20711f52f3364e9fdbc727cf133e9
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.10.2.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.10.2.ebuild
deleted file mode 100644
index c05945d34a29..000000000000
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.10.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/NetworkManager-openvpn"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="gtk test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.34:2
-	>=net-misc/networkmanager-1.7.0
-	>=net-vpn/openvpn-2.1
-	gtk? (
-		>=app-crypt/libsecret-0.18
-
-		>=net-libs/libnma-1.8.0
-		>=x11-libs/gtk+-3.4:3
-
-		>=gui-libs/gtk-4.0:4
-		>=net-libs/libnma-1.8.36
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/nm-openvpn
-	acct-user/nm-openvpn
-"
-
-BDEPEND="
-	>=sys-devel/gettext-0.19
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome) \
-		$(use_with gtk gtk4)
-}
diff --git a/net-vpn/ovpn-dco/Manifest b/net-vpn/ovpn-dco/Manifest
index 07007cda9e2c..4555dde24e80 100644
--- a/net-vpn/ovpn-dco/Manifest
+++ b/net-vpn/ovpn-dco/Manifest
@@ -1,4 +1,4 @@
 DIST ovpn-dco-0.2.20230426.tar.gz 70341 BLAKE2B 95d468212a161f13659185d7e96b11afac63a8dd40aaf42a41463927a7f75b1d1ab2388bab5749c0127a07a8bf5d4a5a97626c0d782595f3d0561be4063d931c SHA512 929333fd0668008be77b57b3a0955c260770d91402e02d93a460569b8b17763ebe23eb6159bfefe04fa16fad2672d6a6c76e2f3c2e6b864593bef59ef3cfa29f
-EBUILD ovpn-dco-0.2.20230426.ebuild 1190 BLAKE2B 7a6dc43c0e52c7fd14edc29076f1c251cd442d1b3a8a9fcbf31d3180d2c7af4f60626eb7fc2a0b46e51e6cb25e5f343264ce6a21e63b33bccfd8f718404034c2 SHA512 8a88c8ed6b04ea5d722ce8a09cbb9d816494d0f3482982d0a5fdead811adcfb818951874a178b097a01eb36b9f5fc49565667232430284d09765625ea378e86a
-EBUILD ovpn-dco-9999.ebuild 1249 BLAKE2B d129cbed8ee245cd9b924d573952c5c6782e68202c1611bdeba2a0ae58feb50e57f7a175236c61711e202b4a2fc9dc53f46200afb4bcdde6b93f67aa86b5d041 SHA512 db6f7e7eaf805ec563b97bc778c9a0a23cacb7efae0f2b054e3d405dfe6b76c8c849fc7748a83b970d1f2d09958372ba81b9f50f0487adb652911e1c444cbdf6
+EBUILD ovpn-dco-0.2.20230426.ebuild 1180 BLAKE2B 8b4423d894df36566fe9b3246ead573a618026f8d3216fc2234453c73b72484490464ddeab69f93333e941899fec6ff44cc9bee15b073683a93ad8f088a91130 SHA512 4697ee4e2733e156aa36b793930096e6b9d3589350703c312a235d454407b35e6a51385959f4fc993bef50d5ed25c940d80f807612625a06ca095a38e7345beb
+EBUILD ovpn-dco-9999.ebuild 1239 BLAKE2B 066dca27a9b5dffd5b5557e2d66b6e177177d4cacecb60b39994092689491b626be6f2ec69394f9725fb059f45d05f1257872e861451070920d30d023b45e647 SHA512 b29b49fbc6701fb836314628dd23bc1a1dd31327761e49e7f57d2cb38e761e5214ca9dbae4f62b5200eabc2fd2d60023aaa59cf8177dedc16fdec8157d040ecb
 MISC metadata.xml 686 BLAKE2B c667b8740abf00a436a4043878ded6a9420298f21c38af2aef9d6336075df4c56ec3f99fdd71c6d53f2c66947f838af154f3f84258782c623f81b389b6289458 SHA512 d500104d1853b953cc3433e7185db707da162a5322f8e0433ead46211f95aea0a809f30a08d340c942b4844d5f1310873ea6d018112712eb2f3e6a2c59228dae
diff --git a/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild b/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild
index bdbf08846d5c..b98d189c7b99 100644
--- a/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild
+++ b/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic linux-mod
+inherit flag-o-matic linux-mod-r1
 
 DESCRIPTION="OpenVPN Data Channel Offload in the linux kernel"
 HOMEPAGE="https://github.com/OpenVPN/ovpn-dco"
@@ -20,9 +20,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug"
 
-MODULE_NAMES="ovpn-dco-v2(updates:.:drivers/net/ovpn-dco)"
-BUILD_TARGETS="all"
-
 pkg_setup() {
 	CONFIG_CHECK="
 		INET
@@ -34,7 +31,7 @@ pkg_setup() {
 		CRYPTO_GCM
 		CRYPTO_CHACHA20POLY1305"
 
-	linux-mod_pkg_setup
+	linux-mod-r1_pkg_setup
 }
 
 src_configure() {
@@ -45,14 +42,16 @@ src_configure() {
 }
 
 src_compile() {
-	BUILD_PARAMS+=" KERNEL_SRC='${KERNEL_DIR}'"
-	[[ ${PV} != 9999 ]] && BUILD_PARAMS+=" REVISION='${PV}'"
-	use debug && BUILD_PARAMS+=" DEBUG=1"
-	linux-mod_src_compile
+	local modlist=( "ovpn-dco-v2=updates:.:drivers/net/ovpn-dco" )
+	local modargs=( KERNEL_SRC="${KERNEL_DIR}" )
+	[[ ${PV} != 9999 ]] && modargs+=( REVISION="${PV}" )
+	use debug && modargs+=( DEBUG=1 )
+
+	linux-mod-r1_src_compile
 }
 
 src_install() {
-	linux-mod_src_install
+	linux-mod-r1_src_install
 
 	insinto /usr/share/${PN}
 	doins -r include
diff --git a/net-vpn/ovpn-dco/ovpn-dco-9999.ebuild b/net-vpn/ovpn-dco/ovpn-dco-9999.ebuild
index 074eb2f33488..3d07f86aeabc 100644
--- a/net-vpn/ovpn-dco/ovpn-dco-9999.ebuild
+++ b/net-vpn/ovpn-dco/ovpn-dco-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic linux-mod
+inherit flag-o-matic linux-mod-r1
 
 DESCRIPTION="OpenVPN Data Channel Offload in the linux kernel"
 HOMEPAGE="https://github.com/OpenVPN/ovpn-dco"
@@ -20,9 +20,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug"
 
-MODULE_NAMES="ovpn-dco-v2(updates:.:drivers/net/ovpn-dco)"
-BUILD_TARGETS="all"
-
 pkg_setup() {
 	CONFIG_CHECK="
 		INET
@@ -34,7 +31,7 @@ pkg_setup() {
 		CRYPTO_GCM
 		CRYPTO_CHACHA20POLY1305"
 
-	linux-mod_pkg_setup
+	linux-mod-r1_pkg_setup
 }
 
 src_configure() {
@@ -45,14 +42,16 @@ src_configure() {
 }
 
 src_compile() {
-	BUILD_PARAMS+=" KERNEL_SRC='${KERNEL_DIR}'"
-	[[ ${PV} != 9999 ]] && BUILD_PARAMS+=" REVISION='${PV}'"
-	use debug && BUILD_PARAMS+=" DEBUG=1"
-	linux-mod_src_compile
+	local modlist=( "ovpn-dco-v2=updates:.:drivers/net/ovpn-dco" )
+	local modargs=( KERNEL_SRC="${KERNEL_DIR}" )
+	[[ ${PV} != 9999 ]] && modargs+=( REVISION="${PV}" )
+	use debug && modargs+=( DEBUG=1 )
+
+	linux-mod-r1_src_compile
 }
 
 src_install() {
-	linux-mod_src_install
+	linux-mod-r1_src_install
 
 	insinto /usr/share/${PN}
 	doins -r include