gentoo resync : 20.03.2022

3 files changed, 2 insertions, 72 deletions

diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index e5ef4fa4b970..a7ec7f7538e0 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -1,5 +1,3 @@
-DIST libnma-1.8.32.tar.xz 1368492 BLAKE2B e91317259f79140803d5b99b23bafddebcb46a72b80c1fec912341aee377920ada3688864ede2aa3d492ef994de9b8f02e391fef98e0bbb61f296541338ad0cd SHA512 65244a8901322bc17d48c9cb809080790d5af0195b79becf0317da77b6c6a0fde3f8d3b752f5d7e59a5dba0970f4499077c5d9d6776912a72748290b8ac98e11
 DIST libnma-1.8.34.tar.xz 1342040 BLAKE2B e81004cf97832bdd010869fd7a801ceda42b96a70a0bd0aa50f821f7e3c361716f8075ec8ae82a224b6f617ee9b3f177239a53dd9eb982dd49da409d97671fd9 SHA512 aca1e24a852072e65d1fba910613981373bb7bb7869b2e44abc9e41c527d234273f034215d62889a265aa3327ad2cce0cea7368b025df97dab12bff098310aaf
-EBUILD libnma-1.8.32.ebuild 1635 BLAKE2B fd9303968c9a11ebe42c78e3a7051551846a4fbbe8c008958dfea309a00f68df84e0087b254a8d6119e327af9b4345b39ba4f7857ca205e08c11bcc13896a6af SHA512 eb8e17dda8ea25810992607c873d6d32a79096767ae454b2c71d75f127e6057464f1a4d7143c33617a024ae2e7eefd7ba98891baa178092f5e29d541f0cdea73
-EBUILD libnma-1.8.34.ebuild 1640 BLAKE2B 50e22a9de30ef8d9e13f453ceddd1dfc8764e2678186ba34ce4877b7592b4c7099262002987012c69a913089292b47c775eace74ea7fd33ceb5f7768a9f6c429 SHA512 8c01885d515825aa1ed8b32ae852089a14ad0bd037ff7518e5ac855704cc8133bfcd948772714b200f7737d64719a7e1a65ce447d2044376a6652eafe8c723a2
+EBUILD libnma-1.8.34.ebuild 1635 BLAKE2B cede76686b07adc20c43c8234dfb123e4243205425689466317de7765c18d2d2469ac5526bfeee49c7d8ac8fd733af5220ceb876ee6242086d921563cabf2358 SHA512 7f41e954b1c1c55ff2f6f67f4d7c6b22fa73d844e79fde990e0f9cf7d011b3ac480b2d18b1c8a3c0633860e632ddc9cfafaa36b6c9ac19a39dea6deeb12b27b3
 MISC metadata.xml 373 BLAKE2B 4107438e2ffa5c0e8a276745f518001ab71a5322ac3136fa2b23b1a767958f76c775ea551dd587877512ef18520926cbe74ebad8b36f9c2d4263645990ea3781 SHA512 488b3102778233f87a8fd06bf516ba31d62df2edd22dd9d556e7090483707c00ff12db7d2d372f396d9e5dda9d2f48a77415cf6de0e08c6279a541f43221d68d
diff --git a/net-libs/libnma/libnma-1.8.32.ebuild b/net-libs/libnma/libnma-1.8.32.ebuild
deleted file mode 100644
index 833172369816..000000000000
--- a/net-libs/libnma/libnma-1.8.32.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg vala
-
-DESCRIPTION="NetworkManager GUI library"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
-IUSE="gtk-doc +introspection +pkcs11 vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-DEPEND="
-	app-text/iso-codes
-	net-misc/mobile-broadband-provider-info
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.10:3[introspection?]
-	>=net-misc/networkmanager-1.7[introspection?]
-	pkcs11? ( >=app-crypt/gcr-3.14:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-RDEPEND="${DEPEND}
-	!<gnome-extra/nm-applet-1.16.0" # gschema moved to here before nm-applet-1.16.0
-BDEPEND="
-	dev-libs/libxml2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	vala? ( $(vala_depend)
-		net-misc/networkmanager[vala]
-	)
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dlibnma_gtk4=false
-		$(meson_use pkcs11 gcr)
-		-Dmore_asserts=0
-		-Diso_codes=true
-		-Dmobile_broadband_provider_info=true
-		-Dld_gc=false
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-libs/libnma/libnma-1.8.34.ebuild b/net-libs/libnma/libnma-1.8.34.ebuild
index 0942796ba7f6..5cfe6178ffac 100644
--- a/net-libs/libnma/libnma-1.8.34.ebuild
+++ b/net-libs/libnma/libnma-1.8.34.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 # pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
 IUSE="gtk-doc +introspection +pkcs11 vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	app-text/iso-codes