gentoo resync : 31.05.2021

4 files changed, 2 insertions, 266 deletions

diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 68d1f385ac3b..b3b620b764a0 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,9 +1,5 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4
-DIST ModemManager-1.14.8.tar.xz 2255964 BLAKE2B 8f0e4e4747b3603795b533c41949ef7180922e92b7b26348145e18ffaa38f23cccbcb6662ac912216d33b4aef805c5f7ad10aef8029ffd16eb30b331fc2ca88e SHA512 2457214fecd7d4d9fef291f756ef19973b98a05d07721cd57bdaee704cd6b9e96d27f6741bd8d245a0495f1d338e65db12f19b2d9a8dd6a5cddfb050614381c6
-DIST ModemManager-1.16.2.tar.xz 2447936 BLAKE2B aafd2bde9fe72ec837a34987a698d82f4ba2aedf778c350263f8fe937ccd4b5b9b78fc66c58a39a8729c371788ab7b7782073726dc132b8f08bd2df0a9bc2da4 SHA512 c0b095972eba6e0f3a1ad22e425b412f17d8b60f0af4d423a92fdebcb6d2801f87e6af98758f8c2dc4db3586a3a15530a318805fda312443fa6abe2265ebd6b6
 DIST ModemManager-1.16.4.tar.xz 2335908 BLAKE2B dfd3293e9b685d3b01fa3deec111aafca6f11dc27be0a69e0496036e537eecb6f51f592ce1996f47c86b5d9db2abf3c9b9a26e66e9f058ba59982caf38b28ef9 SHA512 5fb7625c9d41ce0179b4e59745b00b815038239552a5438d71ff36b019b398fc3dc6bef709e91a186f5f7427fcb59d79c0b1c3ca9c3dca867f0d5677fd979506
-EBUILD modemmanager-1.14.8-r1.ebuild 3722 BLAKE2B 375cb72e7b4ff273c548817a14043b6552f74fd56a1b60432f1903616f591d039460effc0d64684d3b49ef289f1846ad3a185b323c7d2e30a1680417cc82b40d SHA512 875516a545420aa782059ec04a4b90a778fdcefa42b17b9d704126db08277235ca7251c8bf83970885844ae044cd830672a35fc898fe91ad30784d3f0bb4b17e
-EBUILD modemmanager-1.16.2.ebuild 3573 BLAKE2B 3e3bafe15765b85cbb78d4e92413438bc9d2f0e7bd4a2026287425de5dde139e7e727cdd90e33b5e3031af8351780cef25deb44f613c9622a2ba674ca1fbf466 SHA512 70ca7487c3cab6b2b7ee48a07ece32d055a99b4010505482f0f04248c14e2dfdd5811ee00d2470f90d7c0ffce43639ec31c0a9656106656f44db915050f4b87b
-EBUILD modemmanager-1.16.4.ebuild 3573 BLAKE2B 3e3bafe15765b85cbb78d4e92413438bc9d2f0e7bd4a2026287425de5dde139e7e727cdd90e33b5e3031af8351780cef25deb44f613c9622a2ba674ca1fbf466 SHA512 70ca7487c3cab6b2b7ee48a07ece32d055a99b4010505482f0f04248c14e2dfdd5811ee00d2470f90d7c0ffce43639ec31c0a9656106656f44db915050f4b87b
+EBUILD modemmanager-1.16.4.ebuild 3567 BLAKE2B 9e5825b5df612ecc0da6ef056a58fe12e62700be0a215fd67f5f31c9de377930ac15317ed689cda7d0a88f6d027c1757ecc52c5583cd3db8083dbe39d75f1dcd SHA512 f4456cd7b40dc0ba85ba6fa2f3ec8ed3ef9b370cb9b7ee64dfb66034caf9afb33997ea8215a661439533035f62590e98601830256b2fc7780fb775d717349aab
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild b/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild
deleted file mode 100644
index 677d74b3a719..000000000000
--- a/net-misc/modemmanager/modemmanager-1.14.8-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
-SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
-REQUIRED_USE="
-	?? ( elogind systemd )
-	vala? ( introspection )
-"
-
-DEPEND="
-	>=dev-libs/glib-2.48.0:2
-	udev? ( >=dev-libs/libgudev-230:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	mbim? ( >=net-libs/libmbim-1.24.0 )
-	policykit? ( >=sys-auth/polkit-0.106[introspection] )
-	qmi? ( >=net-libs/libqmi-1.26.0:= )
-	elogind? ( sys-auth/elogind )
-	systemd? ( >=sys-apps/systemd-209 )
-"
-RDEPEND="${DEPEND}
-	policykit? ( acct-group/plugdev )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
-	DOC_CONTENTS="
-		If your USB modem shows up only as a storage device when you plug it in,
-		then you should install sys-apps/usb_modeswitch, which will automatically
-		switch it over to USB modem mode whenever you plug it in.\n"
-
-	if use policykit; then
-		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
-			add your user account to the 'plugdev' group."
-	fi
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		--disable-Werror
-		--disable-static
-		--with-dist-version=${PVR}
-		--with-udev-base-dir="$(get_udevdir)"
-		$(use_with udev)
-		$(use_enable introspection)
-		$(use_with mbim)
-		$(use_with policykit polkit)
-		$(use_with systemd systemd-suspend-resume)
-		$(use_with systemd systemd-journal)
-		$(use_with qmi)
-		$(use_enable vala)
-	)
-	if use elogind; then
-		local pkgconfig="$(tc-getPKG_CONFIG)"
-		myconf+=(
-			--with-systemd-suspend-resume
-			LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
-			LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")"
-		)
-	fi
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Allow users in plugdev group full control over their modem
-	if use policykit; then
-		insinto /usr/share/polkit-1/rules.d/
-		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
-	fi
-
-	readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/modemmanager.initd" modemmanager
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	if ! use udev; then
-		ewarn "You have built ModemManager without udev support. You may have to teach it"
-		ewarn "about your modem port manually."
-	fi
-
-	systemd_reenable ModemManager.service
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/modemmanager/modemmanager-1.16.2.ebuild b/net-misc/modemmanager/modemmanager-1.16.2.ebuild
deleted file mode 100644
index 5642c599e4ed..000000000000
--- a/net-misc/modemmanager/modemmanager-1.16.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
-SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
-REQUIRED_USE="
-	?? ( elogind systemd )
-	vala? ( introspection )
-"
-
-DEPEND="
-	>=dev-libs/glib-2.48.0:2
-	udev? ( >=dev-libs/libgudev-230:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	mbim? ( >=net-libs/libmbim-1.24.0 )
-	policykit? ( >=sys-auth/polkit-0.106[introspection?] )
-	qmi? ( >=net-libs/libqmi-1.28.0:= )
-	elogind? ( sys-auth/elogind )
-	systemd? ( >=sys-apps/systemd-209 )
-"
-RDEPEND="${DEPEND}
-	policykit? ( acct-group/plugdev )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
-	DOC_CONTENTS="
-		If your USB modem shows up only as a storage device when you plug it in,
-		then you should install sys-apps/usb_modeswitch, which will automatically
-		switch it over to USB modem mode whenever you plug it in.\n"
-
-	if use policykit; then
-		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
-			add your user account to the 'plugdev' group."
-	fi
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		--disable-Werror
-		--disable-static
-		--with-dist-version=${PVR}
-		--with-udev-base-dir="$(get_udevdir)"
-		$(use_with udev)
-		$(use_enable introspection)
-		$(use_with mbim)
-		$(use_with policykit polkit)
-		$(use_with systemd systemd-journal)
-		$(use_with qmi)
-		$(use_enable vala)
-	)
-	if use systemd || use elogind; then
-		myconf+=(--with-systemd-suspend-resume)
-	else
-		myconf+=(--without-systemd-suspend-resume)
-	fi
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Allow users in plugdev group full control over their modem
-	if use policykit; then
-		insinto /usr/share/polkit-1/rules.d/
-		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
-	fi
-
-	readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/modemmanager.initd" modemmanager
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	if ! use udev; then
-		ewarn "You have built ModemManager without udev support. You may have to teach it"
-		ewarn "about your modem port manually."
-	fi
-
-	systemd_reenable ModemManager.service
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/modemmanager/modemmanager-1.16.4.ebuild b/net-misc/modemmanager/modemmanager-1.16.4.ebuild
index 5642c599e4ed..da2524401b41 100644
--- a/net-misc/modemmanager/modemmanager-1.16.4.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.16.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
 REQUIRED_USE="