gentoo resync : 06.04.2022

3 files changed, 2 insertions, 70 deletions

diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index b29172129f8e..e974ab0567d5 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -1,8 +1,6 @@
 AUX ofono.initd 418 BLAKE2B 0a0f8894ec52b7213e46c8a1474f1a6061324f6e31842910e241e40e88fdb92c15560f9a8744922fea9cf83114a242315de910fe849918e9e26f7b8ce63831ad SHA512 ef86f8e4d3b30d98eee5849c85fd8fd1bed0d8ac9c76bcce91440483439dbaea36e1ff3529fe8f5c1b0255a91917ab67d98513cafcae8f0031cce1bf3f133704
-DIST ofono-1.31.tar.xz 1049252 BLAKE2B f7b40d3aa7854369a7886a4b64bb66044e8f016682665935f7727bf219c084d266d8fd7f80c97e58234d845f7db3dc52133298697274745d115cf14c62769d82 SHA512 377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8ad29d07e96d0f0480bb51554b284afb6bc2b9da586cc30dc0c1440612b20
 DIST ofono-1.33.tar.xz 1060408 BLAKE2B 646a96c0926ea032fef0357aabe6a4be6da88f4ccbdff59bb86b5de73a9b469362151b212a05234619f5d616b534343137c66e923782c7d50dfe13d2bf66558c SHA512 8d88226aa2b43eca840c6330045ee7a96c91f6003b06fca5ea55b74fc229f0e0ba0c8d98f7945f8c23ec5a8e7057bffef6335c61842e245686e0ed7c5feda589
 DIST ofono-1.34.tar.xz 1060828 BLAKE2B be0d3787ca9226763fb2bff46f1c3cec813d702730d6231986ec5aa43e2d96e08385fa3f64ccff97cf15844e41a33d6c37d1d35c8b0c5fcf3765848e258e3372 SHA512 79ebf0bc795288f07b58eeaa1a0aa3309b4afecae3abdd26c0749e22a4c2e74b65e93cbcfdfd1738dbcb2d0cfb8c687d182d706696a7c1cd5b4ed3bcec059489
-EBUILD ofono-1.31.ebuild 1635 BLAKE2B 45b6875cd3e99ff72d5bde84c7f17f14bb74e75676afb68f006f5befce85c1221fa8249d5c3cb294ce3c2e4eb441b7d80d90af56f26973a3396f59aef6d17711 SHA512 9518abf4fa61f8812f7e5dda459565e3ee5168e3777522256301227152e3e03f6293e39ad41e6c1b7fc946b55997c937cc1193363808c54101ea01a4125a1bb8
-EBUILD ofono-1.33.ebuild 1636 BLAKE2B 6c60822a95dddc6f6e017cdfd43a875976984d2d89cad8681aabb46fc259201ed011864aea94b94100de9c27cd358af5ac923dd18e32063770760af10bd95d82 SHA512 b994465fd5043299589d09644225a4a11589ffa6d507cf41a01a686d3603dffcdedc2dfad47d3ebfcb55ae393892d18919646e537feae3831974ff93caaf4289
+EBUILD ofono-1.33.ebuild 1635 BLAKE2B 2ec579c72af17add304ccd2b4945a21c9fd5725907e93e3457d3f9504ef9d6ecd868a2b7a43c49c5ee6411de12266677d14ce51f31d9808573c453cb98211303 SHA512 bcaeb56d9a37cc0bb35d45f553b1c930c9a7d1cbca604a0ce862769dcd298ee784be9f885f59a009bf1c35baf1b79b7723208d99050b99767e07ca9e871c872d
 EBUILD ofono-1.34.ebuild 1642 BLAKE2B 4fec94e65e7f613febb35e118ef6670b3cba3dffd7961002079239ff54054a59cd71248ec6409f415abc45a1dafb9aa858ed8e3e7234c5848dad823d0cb3f160 SHA512 beb1c80eae1dcbc666c86157e8499c8f7570da72aa8456cf8a14da5353b33a47756c6df835d475287dee034ba887a19741310ffc9632a0c90eb33f7b0dd0db10
 MISC metadata.xml 952 BLAKE2B 9980756397330c03bd0f21db6d44e4af119135b9a864d4cdc97a697e7f0013051985c7db3c48d8d17bd592cfaf185a81add398d3e0a3ddc64aa61979a1603d5e SHA512 a745e9cf9a89e3c989cd950651c3d914ffe17e34f32f9623c468127011c6faa35942484d24c34c217b614b295743120a035a56aa30ae79343a72ba5cfbc462f0
diff --git a/net-misc/ofono/ofono-1.31.ebuild b/net-misc/ofono/ofono-1.31.ebuild
deleted file mode 100644
index 7ae12935361e..000000000000
--- a/net-misc/ofono/ofono-1.31.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
-HOMEPAGE="https://01.org/ofono"
-SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
-
-REQUIRED_USE="dundee? ( bluetooth )"
-
-RDEPEND=">=sys-apps/dbus-1.4
-	>=dev-libs/glib-2.32
-	net-misc/mobile-broadband-provider-info
-	bluetooth? ( >=net-wireless/bluez-4.99 )
-	udev? ( virtual/udev )
-	examples? ( dev-python/dbus-python )
-	tools? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS )
-
-src_configure() {
-	econf \
-		$(use_enable udev) \
-		$(use_enable isimodem) \
-		$(use_enable atmodem) \
-		$(use_enable cdmamodem) \
-		$(use_enable datafiles) \
-		$(use_enable dundee) \
-		$(use_enable bluetooth) \
-		$(use_enable phonesim) \
-		$(use_enable provision) \
-		$(use_enable qmimodem) \
-		$(use_enable tools) \
-		$(use_enable examples test) \
-		$(use_enable upower) \
-		--disable-maintainer-mode \
-		--disable-rilmodem
-		--localstatedir=/var \
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-
-	if use tools ; then
-		dobin tools/auto-enable \
-			tools/huawei-audio \
-			tools/lookup-provider-name \
-			tools/lookup-apn \
-			tools/get-location \
-			tools/tty-redirector
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use doc && dodoc doc/*.txt
-}
diff --git a/net-misc/ofono/ofono-1.33.ebuild b/net-misc/ofono/ofono-1.33.ebuild
index 522dbe691596..22a7d7241f42 100644
--- a/net-misc/ofono/ofono-1.33.ebuild
+++ b/net-misc/ofono/ofono-1.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
 
 REQUIRED_USE="dundee? ( bluetooth )"