gentoo resync : 08.01.2021

12 files changed, 69 insertions, 440 deletions

diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index ba9de8fcb27c..59edf8cecbbb 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,22 +1,6 @@
-DIST libqmi-1.12.6.tar.xz 710564 BLAKE2B b7e16b1f8da62815788355a4ad54bb819e53ad891d82ac3c9eb4c824082732b8ce8357d68a30474ca9bddd605e5d25bc62d5b7c2dad468129dda6d7661f81853 SHA512 7001f61dbe2be431867a504dbfc634ed5e7c3f3b1740aef7833fb8163d1a6bdffb57793f09062f49c0b8eeff5a011a2a057a938d618f3547ff5942021b3e8a9d
-DIST libqmi-1.14.0.tar.xz 759472 BLAKE2B 4826105830037fe9dc6e6b3341060e3821a7b586641156bf2db7d5fbec27ae03a0a354e928a51f087c4b7722400fb5dd3503fdcb97e031d5435eddfe33182f87 SHA512 d5b4affe479e4704a9d94232bbef096533322413de8ea3c27d3ab7d6fd077fbbae779b49633fa22833ab1ce25f76cf341bfb84ec81d75fdc477f2a355ac298bd
-DIST libqmi-1.16.0.tar.xz 734280 BLAKE2B dd8614ef16e8de2bde0babbb487130b3dc13da776238d4e2aae100a150c7f05a20ca24e682f7a160ae56fad3a7ee4e8b8f4ff31971e1ac5e1cb22a9960ecf99b SHA512 e8ac10b72a15ab3d102ab5dd45ed2960f552d37c291b7ef2818f41d5a46121a5c25e60bb549f96d4982468607a11f33866632c13b0454c5cbe0d61aa95992996
-DIST libqmi-1.16.2.tar.xz 735124 BLAKE2B e99aa20e8030610b1958cab3ed7f91a3f4a3cad76fcad3bf25ea6cf82176a8571660e0fb301ed6b7cc27fbb7243d8437f16485275fcb2c42644acadf12ffe791 SHA512 7d0977d1904efb76adcdde0ca52cef864fc66a065e641f1d2b905d74fa5d314e6eae5b6ef58a508725f631823308fc8ddcc67a0547bd0e4c87dc8e3eb39b4cfb
-DIST libqmi-1.16.4.tar.xz 735220 BLAKE2B 52651eb4dc886b3b56ee0e6c47da930be2547c491748664a24dc7f012ad999377800a2d410bf1b605c40784756bfce15231fdc430419993b58e330cc8abbc968 SHA512 1cd3df8602e4ed7a8e0e068146490a0cd2581244ab5d1dd961129c1a58fa384a8d3bb6bbf715f799660f44ab3b1d20ae744c4eee3972b7392e2ac560cee6e75c
-DIST libqmi-1.18.0.tar.xz 873176 BLAKE2B ff60e3616d2ac94576df993f8f03020e19b8745541287ac069a1d15ff166f37a661f4778c1a92921791ab43ccd583a8162564e87507511a5faa85e536493f976 SHA512 3890501fa2299ce5ac8fda732363e39738c95ffb153708d8f727e88c082014018463c569a0d9666385f6394d060ec41052dec400f3f6c733e78748ca7ee56b76
-DIST libqmi-1.18.2.tar.xz 845560 BLAKE2B 732c7385d149073a9cf89a58f0e2977fff593b00ca86f4d1abfbbc1a4521a257f57d56fc73ba5e46bfc902b9aa882eed6e3e63ac00cab2649ab35b8a547c844c SHA512 769e67534e0eeb7454849b69be72674ba07f65ec26adec668c0a0cf91c22c11bb6d91546606a33036d2a05fcd290efe05dcc1d4ab0740d625756628a7a7d3428
-DIST libqmi-1.20.0.tar.xz 859464 BLAKE2B 146b07b47aa5d40d93ce381aca107ec554918a909aef85b28751228fdcb3a518ffa9479a88b1f17a94f9251a1cff1cb606c4cfd4689e8d5e813a6467f078e5cb SHA512 fceec9aff22942fa64f7a568527033354dc379f347b96c9b37844bbdfb7bfa0936f554402b855c4b191fd63ca488776b94ee69e84502a460e941caddbd648b63
-DIST libqmi-1.20.2.tar.xz 860408 BLAKE2B d6f757c7eb7d93101763714f32dee1bfc4de1f4b58fe2b6f457b938e42175da12ba6070395f06542f4edb9c6b3264ad74a718f7fc58ac25de4f4d5f2692ee123 SHA512 2d1ceda25ad995b27dc20d9b5d85ee23a841c43f33aa68b3543df10cc1da72062e648c1136a2706740659ae2cf8c17373d7c6c6f5f8d075864f47e4fb89d7b50
 DIST libqmi-1.22.2.tar.xz 947124 BLAKE2B 662cf58cb3fe48b5bbe167ac552b12ecff2944d1098e47b5a8c216a65c42c5e5c462f16625c4572e0e27e69a55cdfad76777468a42f8887f5b3984313c70747b SHA512 5785b56a60db8fb2566b6a712a18ec2ae74ce1da257473ab6b7cdea3163298ebee6c60a3158a7041aa759bd717eee4b16d9eeaa6b15d9b6e911bc8c8c44bd3d8
-EBUILD libqmi-1.12.6.ebuild 936 BLAKE2B e292e687296175fc85b3c357aa810b4a17ae477d3bd59b083f2d22f01b4e8360e23ddc9749af97d0c95afaa3acf7b98bb92c5d9d83229a7d71e6def926b46036 SHA512 46a02f498c46266ec7b6c2cb155ce5adeda72e97d82a57376adc48f6ac67bab6ab9840c34a5b20ee88324f75b60a049550524fe405900f1a3afd1cf779d1d69d
-EBUILD libqmi-1.14.0.ebuild 939 BLAKE2B 92e709ac26f9e53b52bf4dcd1cdb4a1dc574c2dc585c91e0c8bbd3e7f2d08728fe7b59683650d6288f12047a5eb0cef00f2abbab871d8170067006a65f83e72b SHA512 b7a1ef6349c65602ba2117a211345850681bb9166118cd9f96bdb8d24cc64751f3d2654c7bbae3c08797ea1378457e852512a73d2b35162f888282d52b8476bd
-EBUILD libqmi-1.16.0.ebuild 1033 BLAKE2B 41776532f8d59524b9e15c5ffba94d39c6e164a90224b4e6091bbb3c5e8725a38f159816a7db31f85d9da4cb4f39d2cf230a6a31f19f012861211d6712c0b1b0 SHA512 18dca52d046cfb903f792a6d0b3b1bb668a249ea531db723481c8e0665640b85a911edebe62164865e9c865f8ee7a923cc23da07879cf81d741fe379141ede4b
-EBUILD libqmi-1.16.2.ebuild 1104 BLAKE2B d1c6fc14d1089b229d32c103b1737428eeac0d150614e752b1c517122cfaca9ee515ab0ac60fbccd39af17953bd425d6f0e32db3640664a9db466c71bd8052ac SHA512 1167f68f0a0d6edd26a8d66443c05c4bf7c4feced8ee7cbce1a1a7afc8a65e21eb2b7b02d8e79685d89a74f075b50e6852da6dfe6254a9a64677041112c9b3f6
-EBUILD libqmi-1.16.4.ebuild 1108 BLAKE2B d2be43c1b65dc95941f1aa6c63472f7edaf627892bfb2d53a986fac98aa59a2ee43d2f83f152456bc021c8fa10c3dc7ae25827cf28c52b795896bb19622b6262 SHA512 1263e89c91947b5385a7e9e744dca9a992bc6fccf72b8e85d651a638ce7cda232764f8a3efdb1863f26ab99da5d035d65b2b46f3dc40ada3597decfdb98b182e
-EBUILD libqmi-1.18.0.ebuild 1126 BLAKE2B 9a08c6478acd306753d8388b48b4032021cbb322e7f71d5e3105b0106bf569a9e99cf85142dafbc4a1c93c541220caf61c2e1928df741bd0e63cdb959ded7590 SHA512 d0a226e69f6590d0c15f49128a8bbd7dc42b353a83f0296d3555b3fc1baab5463dfe6f6ca84408ac65c59307515baba8ced4b61b003534496db7faef929a35ee
-EBUILD libqmi-1.18.2.ebuild 1126 BLAKE2B 9a08c6478acd306753d8388b48b4032021cbb322e7f71d5e3105b0106bf569a9e99cf85142dafbc4a1c93c541220caf61c2e1928df741bd0e63cdb959ded7590 SHA512 d0a226e69f6590d0c15f49128a8bbd7dc42b353a83f0296d3555b3fc1baab5463dfe6f6ca84408ac65c59307515baba8ced4b61b003534496db7faef929a35ee
-EBUILD libqmi-1.20.0.ebuild 1126 BLAKE2B 9a08c6478acd306753d8388b48b4032021cbb322e7f71d5e3105b0106bf569a9e99cf85142dafbc4a1c93c541220caf61c2e1928df741bd0e63cdb959ded7590 SHA512 d0a226e69f6590d0c15f49128a8bbd7dc42b353a83f0296d3555b3fc1baab5463dfe6f6ca84408ac65c59307515baba8ced4b61b003534496db7faef929a35ee
-EBUILD libqmi-1.20.2.ebuild 1132 BLAKE2B b00ab99ac45a3385b902977856cd5f6969913078d382ea22b4bd0e523b99fa178885bd1a638ea7ba4c33967fa46758f5ab0f341c012735d1ea349d7dc641c8cd SHA512 d1e91dea19bf8522ef6a297d55862d1daf0bed28c44eaef2bd4af58c0ec63deb388b899c85091d285c9a317ab7d9ce3a3c67a928c0949977aa063842791a06fd
+DIST libqmi-1.26.6.tar.xz 1127552 BLAKE2B 1dba56c867c688c991fde7bb019234a05d77092f0725498d677a7ff620c56e58e17c873c773d96ee2131bfeac8cdbec86dadacd8fcc2f751f4e9a8d2c75efe5b SHA512 6c5e05fc158a085e1f652ff31cef65762c026cb09eb630153fddccb15e19187141e74c79818ebe00a058c5624891981cfce4d56545d4150ebb3b6e8d7bddb5ba
 EBUILD libqmi-1.22.2.ebuild 1125 BLAKE2B 0f46e9c7304e7fa676f02af18dab551ed8bbab8f0da220da37d4304f966eebe85a4574b6a693d12ad4159b753a5b05fbd6cb7dd63ebb817cbd2bb79291a28ed3 SHA512 58546939e8a9f18dd2d0028bcefb9b937f94dc034f0554cae9be7cd5d79769a5a02ddb79e9899f6442ee648f2c3f962ac42e329443d6368dd35080202e421910
-EBUILD libqmi-9999.ebuild 1126 BLAKE2B f57c7326cefc6864daf35627b7ab3733b12ba81398865927f830d8b5e3c0764d78d821b0923ce257513a49a905ee4674acdaaba9fed3f7289ad67cbd8e4602c9 SHA512 5184d185b9f6dd0343e892de0f178eaa1b4231597748287c94f706ea3bf8e7969bc1ecd09291b35c502a57f18dd287b7c0c3706d78523b148ed1fd355d18f171
+EBUILD libqmi-1.26.6.ebuild 1169 BLAKE2B 1bada98c611f1dad5b52af359ae5e56b92ed3b70fbbd88495c05f49454a8c9c6c954c3f62a187f294c3b093f98aec62e27e3193c4869c77f6b3954a4a01f7389 SHA512 535d09ac3ac4e2d4eda22f28e9825314915c982987ca0d929872234f873cd7e832c76becb50adc997989bfc365d093869834f0de1e6e6d6e8d49bf32dfd69f08
+EBUILD libqmi-9999.ebuild 1169 BLAKE2B 1bada98c611f1dad5b52af359ae5e56b92ed3b70fbbd88495c05f49454a8c9c6c954c3f62a187f294c3b093f98aec62e27e3193c4869c77f6b3954a4a01f7389 SHA512 535d09ac3ac4e2d4eda22f28e9825314915c982987ca0d929872234f873cd7e832c76becb50adc997989bfc365d093869834f0de1e6e6d6e8d49bf32dfd69f08
 MISC metadata.xml 416 BLAKE2B f391913e78bcdb06b9c686a460059b4ee38861fa09fa0d50c19418ac3e1d966efd2646694d89d240d13f0a9bf2eb910d952288de153699b9564040efed8b04ab SHA512 4ebf9f46a3c7c6e18e0eb83341bac1b087bb6471a0f3f11663975b8a6e0e1a78f8db680a628dc693c4c3eb825d50717f0b7ed086d90c9d33818f094de2611fe2
diff --git a/net-libs/libqmi/libqmi-1.12.6.ebuild b/net-libs/libqmi/libqmi-1.12.6.ebuild
deleted file mode 100644
index 30560ac73dd2..000000000000
--- a/net-libs/libqmi/libqmi-1.12.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
-else
-	KEYWORDS="amd64 arm ~mips x86"
-	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
-fi
-
-DESCRIPTION="QMI modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/glib-2.32"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		$(use_enable static{-libs,}) \
-		$(use_enable {,gtk-}doc)
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libqmi/libqmi-1.14.0.ebuild b/net-libs/libqmi/libqmi-1.14.0.ebuild
deleted file mode 100644
index 3ced59117e84..000000000000
--- a/net-libs/libqmi/libqmi-1.14.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
-else
-	KEYWORDS="~amd64 ~arm ~mips ~x86"
-	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
-fi
-
-DESCRIPTION="QMI modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/glib-2.32"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		$(use_enable static{-libs,}) \
-		$(use_enable {,gtk-}doc)
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libqmi/libqmi-1.16.0.ebuild b/net-libs/libqmi/libqmi-1.16.0.ebuild
deleted file mode 100644
index 52ae8fd582c5..000000000000
--- a/net-libs/libqmi/libqmi-1.16.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
-else
-	KEYWORDS="~amd64 ~arm ~mips ~x86"
-	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
-fi
-
-DESCRIPTION="QMI modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
-
-LICENSE="LGPL-2"
-SLOT="0/5.1"
-IUSE="doc +mbim static-libs"
-
-RDEPEND=">=dev-libs/glib-2.32
-	mbim? ( >=net-libs/libmbim-1.14.0 )"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	eapply_user
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		$(use_enable mbim mbim-qmux ) \
-		$(use_enable static{-libs,}) \
-		$(use_enable {,gtk-}doc)
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libqmi/libqmi-1.16.2.ebuild b/net-libs/libqmi/libqmi-1.16.2.ebuild
deleted file mode 100644
index 9a16e2b7027d..000000000000
--- a/net-libs/libqmi/libqmi-1.16.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
-else
-	KEYWORDS="amd64 arm ~mips ppc x86"
-	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
-fi
-
-DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
-
-LICENSE="LGPL-2"
-SLOT="0/5.1"	# soname of libqmi-glib.so
-IUSE="doc +mbim static-libs"
-
-RDEPEND=">=dev-libs/glib-2.32
-	mbim? ( >=net-libs/libmbim-1.14.0 )"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	default
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		$(use_enable mbim mbim-qmux) \
-		$(use_enable static{-libs,}) \
-		$(use_enable {,gtk-}doc)
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libqmi/libqmi-1.16.4.ebuild b/net-libs/libqmi/libqmi-1.16.4.ebuild
deleted file mode 100644
index 5a9f25d5a371..000000000000
--- a/net-libs/libqmi/libqmi-1.16.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
-else
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
-fi
-
-DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
-
-LICENSE="LGPL-2"
-SLOT="0/5.1"	# soname of libqmi-glib.so
-IUSE="doc +mbim static-libs"
-
-RDEPEND=">=dev-libs/glib-2.32
-	mbim? ( >=net-libs/libmbim-1.14.0 )"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	default
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		$(use_enable mbim mbim-qmux) \
-		$(use_enable static{-libs,}) \
-		$(use_enable {,gtk-}doc)
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libqmi/libqmi-1.18.0.ebuild b/net-libs/libqmi/libqmi-1.18.0.ebuild
deleted file mode 100644
index e8219b0697e2..000000000000
--- a/net-libs/libqmi/libqmi-1.18.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
-fi
-
-DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
-
-LICENSE="LGPL-2"
-SLOT="0/5.1"	# soname of libqmi-glib.so
-IUSE="doc +mbim static-libs"
-
-RDEPEND=">=dev-libs/glib-2.32
-	dev-libs/libgudev
-	mbim? ( >=net-libs/libmbim-1.14.0 )"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	default
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		$(use_enable mbim mbim-qmux) \
-		$(use_enable static{-libs,}) \
-		$(use_enable {,gtk-}doc)
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libqmi/libqmi-1.18.2.ebuild b/net-libs/libqmi/libqmi-1.18.2.ebuild
deleted file mode 100644
index e8219b0697e2..000000000000
--- a/net-libs/libqmi/libqmi-1.18.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
-fi
-
-DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
-
-LICENSE="LGPL-2"
-SLOT="0/5.1"	# soname of libqmi-glib.so
-IUSE="doc +mbim static-libs"
-
-RDEPEND=">=dev-libs/glib-2.32
-	dev-libs/libgudev
-	mbim? ( >=net-libs/libmbim-1.14.0 )"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	default
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		$(use_enable mbim mbim-qmux) \
-		$(use_enable static{-libs,}) \
-		$(use_enable {,gtk-}doc)
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libqmi/libqmi-1.20.0.ebuild b/net-libs/libqmi/libqmi-1.20.0.ebuild
deleted file mode 100644
index e8219b0697e2..000000000000
--- a/net-libs/libqmi/libqmi-1.20.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
-fi
-
-DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
-
-LICENSE="LGPL-2"
-SLOT="0/5.1"	# soname of libqmi-glib.so
-IUSE="doc +mbim static-libs"
-
-RDEPEND=">=dev-libs/glib-2.32
-	dev-libs/libgudev
-	mbim? ( >=net-libs/libmbim-1.14.0 )"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	default
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		$(use_enable mbim mbim-qmux) \
-		$(use_enable static{-libs,}) \
-		$(use_enable {,gtk-}doc)
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libqmi/libqmi-1.20.2.ebuild b/net-libs/libqmi/libqmi-1.20.2.ebuild
deleted file mode 100644
index 3f2f0561c2fb..000000000000
--- a/net-libs/libqmi/libqmi-1.20.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
-else
-	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
-	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
-fi
-
-DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
-
-LICENSE="LGPL-2"
-SLOT="0/5.1"	# soname of libqmi-glib.so
-IUSE="doc +mbim static-libs"
-
-RDEPEND=">=dev-libs/glib-2.32
-	dev-libs/libgudev
-	mbim? ( >=net-libs/libmbim-1.14.0 )"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	default
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		$(use_enable mbim mbim-qmux) \
-		$(use_enable static{-libs,}) \
-		$(use_enable {,gtk-}doc)
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libqmi/libqmi-1.26.6.ebuild b/net-libs/libqmi/libqmi-1.26.6.ebuild
new file mode 100644
index 000000000000..51ac0339e070
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.26.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
+fi
+
+DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi"
+
+LICENSE="LGPL-2"
+SLOT="0/5.7"	# soname of libqmi-glib.so
+IUSE="doc +mbim"
+
+RDEPEND=">=dev-libs/glib-2.48
+	dev-libs/libgudev
+	mbim? ( >=net-libs/libmbim-1.18.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-Werror \
+		--disable-static \
+		$(use_enable mbim mbim-qmux) \
+		$(use_enable {,gtk-}doc)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild
index 9ae85656240c..51ac0339e070 100644
--- a/net-libs/libqmi/libqmi-9999.ebuild
+++ b/net-libs/libqmi/libqmi-9999.ebuild
@@ -1,46 +1,47 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit multilib
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libqmi.git"
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
-DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libqmi/"
+DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol library"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi"
 
 LICENSE="LGPL-2"
-SLOT="0/5.1"	# soname of libqmi-glib.so
-IUSE="doc +mbim static-libs"
+SLOT="0/5.7"	# soname of libqmi-glib.so
+IUSE="doc +mbim"
 
-RDEPEND=">=dev-libs/glib-2.36
+RDEPEND=">=dev-libs/glib-2.48
 	dev-libs/libgudev
-	mbim? ( >=net-libs/libmbim-1.14.0 )"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
+	mbim? ( >=net-libs/libmbim-1.18.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214
 
 src_prepare() {
 	default
-	[[ -e configure ]] || eautoreconf
+	[[ ${PV} == "9999" ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
-		--disable-more-warnings \
+		--disable-Werror \
+		--disable-static \
 		$(use_enable mbim mbim-qmux) \
-		$(use_enable static{-libs,}) \
 		$(use_enable {,gtk-}doc)
 }
 
 src_install() {
 	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
+	find "${ED}" -name '*.la' -delete || die
 }