gentoo resync : 28.04.2021

4 files changed, 39 insertions, 41 deletions

diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index 3ca48924d389..b5d4b6f3b668 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,5 +1,5 @@
-DIST libmbim-1.18.0.tar.xz 474768 BLAKE2B 3dce8e1fa0e57cdf75174d0145006b38213fcd2de9166589f2d3ddd7a17dae3b308ce7a7338d388543c8ba83b6a9d2bf12051cbde1666fc43580314d9906704b SHA512 510af324563a6a4f9a9d656d6724398cf5c5ba07424962d5407dd05867ef36da40e1ee6c8be8040c6a67e764bc059d24282db45ce3d47075fcf4d7416245b28d
 DIST libmbim-1.24.4.tar.xz 512524 BLAKE2B 4f91d1fd4d993b3e28f7508f4fbc3d6f4467db1c27307a3c4bd006ad9cdb40800513641fabf37deb673f5926d7a0f0d4806e3bd62a3ad8825227631d35c67d5b SHA512 bb0b82c64213e5b382a807c5c4c36751138c343419dc6abf1605573c91620af1a6de45587eab7341265f950548924fa65fa4bfedba0659b2f9eb80fa23ae88bc
-EBUILD libmbim-1.18.0.ebuild 819 BLAKE2B d3b37644e4b06d321f51a145f0d23d6cb36232744bb766fb6beb0c738a7dcada12d733eb27b50622f6c4a5eae0392ce606b67a6f7f6668fc0b6a6f46d0252f24 SHA512 45ab3fbb709839c8834d5ce305ca358ad9ee6bce593b086a60b40d31998b1083e27336ba310e8d2d7b3cb2a99006059f77b601d140ed9c9eaeec54ba32149708
-EBUILD libmbim-1.24.4.ebuild 837 BLAKE2B 2d9c7ba727896518e4199014bdc792096a85e47714cfa12dd03b6a5f5144674e8b660a98ba68236ab3cb01676ef69f5c36a886d438563b0e77ec5adc77f7cce6 SHA512 eb25b94b6d01446ab6dc1e75d7e22406bdc3dff92e4bd46980be0b0435961e3f79628cdbf1d82406831deaa3e4189c0d1c7b6537e54191d613806763a2def220
+DIST libmbim-1.24.6.tar.xz 511468 BLAKE2B 89c4fa25573d4e58ec993e4fa24e0ff3ab6146c905fd3110240d2dbd3ba20af8c135e5eb552b2c48b1166444e52023e314d70d4fe5904ede5e2c6d3d05724955 SHA512 b0b15aa5ffdc65e9d7af211df771f85021488258f7c50638ad109173a61ef38872b9ab42005cd972fd3cb24e617bd3fe7b0b79d335e2144558daa218fb2c4653
+EBUILD libmbim-1.24.4.ebuild 816 BLAKE2B 6e6acbed86786d0efbe24b0f81ba57ec47868f8d318ed423ec72558f32c0614cd9a0a5f8a558d17f267020565c47ab86e1830adb39c6ed2d3eb0d83e6d122f35 SHA512 11855df9ce1e52596dc81bc504ff0a3a1f1da182db49c2c6f39b0338b7d3f87e8c3c837827a217fec68c654efcfcafb75da26d86a6c6b9fff69760a603bdb8e3
+EBUILD libmbim-1.24.6.ebuild 822 BLAKE2B 0f7231820b6ac4497a1e70c1ae5ab473cb6b81022aa4e55e007899369115d59ac59fed6381da6024891700a1bed1d1fd26c45d021ae2d177ff4aecf5ed19a29b SHA512 e9882fd9e6fe5442924e87aa19ba803c5f4d808e8543a177114d471a1b734b64bff9db06d16ce83d414d46a6382bddc9ccee3ec3bc62de1226de345a76f448b1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libmbim/libmbim-1.18.0.ebuild b/net-libs/libmbim/libmbim-1.18.0.ebuild
deleted file mode 100644
index 75d6ea792a6f..000000000000
--- a/net-libs/libmbim/libmbim-1.18.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib
-
-DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libmbim/"
-SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 x86"
-IUSE="static-libs udev"
-
-RDEPEND=">=dev-libs/glib-2.36:2
-	udev? ( dev-libs/libgudev:= )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-BDEPEND="dev-util/glib-utils"
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--disable-gtk-doc \
-		$(use_with udev) \
-		$(use_enable static{-libs,})
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libmbim/libmbim-1.24.4.ebuild b/net-libs/libmbim/libmbim-1.24.4.ebuild
index 7b8777e5076d..bbdba255bb73 100644
--- a/net-libs/libmbim/libmbim-1.24.4.ebuild
+++ b/net-libs/libmbim/libmbim-1.24.4.ebuild
@@ -3,15 +3,13 @@
 
 EAPI=7
 
-inherit multilib
-
 DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim"
 SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="udev"
 
 RDEPEND=">=dev-libs/glib-2.48:2
diff --git a/net-libs/libmbim/libmbim-1.24.6.ebuild b/net-libs/libmbim/libmbim-1.24.6.ebuild
new file mode 100644
index 000000000000..322e88fb7990
--- /dev/null
+++ b/net-libs/libmbim/libmbim-1.24.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Mobile Broadband Interface Model (MBIM) modem protocol helper library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim"
+SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="udev"
+
+RDEPEND=">=dev-libs/glib-2.48:2
+	udev? ( dev-libs/libgudev:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--disable-Werror \
+		--disable-static \
+		--disable-gtk-doc \
+		$(use_with udev)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}