gentoo auto-resync : 29:07:2023 - 16:39:59

3 files changed, 96 insertions, 23 deletions

diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index f8fcf56bd6f6..7b3dac09c292 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,4 +1,6 @@
 DIST libqmi-1.30.8.tar.xz 1244844 BLAKE2B c8d98106783eb22571ee82c0012e1ce7ed79e94818350134b80853e16fa287c77bafb34d2913690ae593d02112dc5d2b0ff77606a24c4ce63733fd64245961a1 SHA512 60567e82eb35ed7ab3d65f1073e19ca8faa68e909f96e498b8f9d8ce2a987156e0a580f9c212416c4e0740d2ad05cb93f4dfeae9b2d048f0eb53ab6a83f6d024
+DIST libqmi-1.32.4.tar.bz2 3710575 BLAKE2B 728cc821208432ec69d21d6b1b16e82f982e27ba899e0a2426b6e1ae6ce8cc800f15417e4d5ff6fd9a60ad2a0e7c3f3ddc77caee9115431d174e29bd40a8398b SHA512 6f68e2dd4bf5493de0c9298d88e477f9477b367f887bf5321a1faab7e8217fd10e761748326deb37ca26659bef70d5c8464bcb964d0ed0ba1f44c423785ebb0f
 EBUILD libqmi-1.30.8.ebuild 1268 BLAKE2B 8c7eedda6bcbab7e0e401980883b80fa2425c43e5537121689d0d180d3cea553e3b05eb9a492341a0ffc7c93554846b8f3b0901d8f0fba6b39f268a30c905555 SHA512 80dde870797eb4e8ecdf7f3df8eaddec90d884de1b293e24059b5648d396cd0bb0351ce59bd649b16d3db9449cf585d32659082cd2af4c7c1df8b53ca8b7b4bb
-EBUILD libqmi-9999.ebuild 1274 BLAKE2B 59b385ed839554f7c1af5ddbf10039c9a7792eff43b035ab8618e34a77913ca148b01b120c51d2442a36c9d80c0263f4be19978bf07cdd67547b9edb3055f128 SHA512 9dda22b5dfb286317875902d46524edcde2df7c453f2aa2f743570e3521b96e56ffe8a8f254567fb6e611c0be4f7d06dfab00152a381ab304ccd24d76c91975b
+EBUILD libqmi-1.32.4.ebuild 1419 BLAKE2B 9c41b6e9bec6d317df230a043785e5d970ccdae9a1c17ed9a2f51ba3c1bf7b121411f51c6c06473d4bb72b947c2fa169867efebf2821fb2ab6c09570b7c5924d SHA512 99522e01dce8a5cd78fc9233956cf810cabe101265e400acc4dfcf93f4927a0e74b1c373d22c08241b158dfd938f9b6ffae9dd0bc07ab7b16af2ff100da3475e
+EBUILD libqmi-9999.ebuild 1419 BLAKE2B 9c41b6e9bec6d317df230a043785e5d970ccdae9a1c17ed9a2f51ba3c1bf7b121411f51c6c06473d4bb72b947c2fa169867efebf2821fb2ab6c09570b7c5924d SHA512 99522e01dce8a5cd78fc9233956cf810cabe101265e400acc4dfcf93f4927a0e74b1c373d22c08241b158dfd938f9b6ffae9dd0bc07ab7b16af2ff100da3475e
 MISC metadata.xml 584 BLAKE2B b68349a0ffdd18d892129b88e33fae82e294fd52cbe4c4d90bd750750aa7918ed96ef2a734e01b2b70af525e7fc2bc2bac6bf2592fa941ce8805de7f810de856 SHA512 50549b9ad459c518b1248df30b428e585e14ce7285d442a1d070ea9a98c268fbc282c21bf1349111fcd0d1226f86534791aeb565514618a4a0b8543930164cd3
diff --git a/net-libs/libqmi/libqmi-1.32.4.ebuild b/net-libs/libqmi/libqmi-1.32.4.ebuild
new file mode 100644
index 000000000000..5336e7de9c06
--- /dev/null
+++ b/net-libs/libqmi/libqmi-1.32.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+	SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/${PV}/${P}.tar.bz2"
+fi
+
+inherit bash-completion-r1 meson udev
+
+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"
+IUSE="gtk-doc +mbim +qrtr"
+
+SLOT="0/5.9"	# soname of libqmi-glib.so
+
+RDEPEND="
+	>=dev-libs/glib-2.56
+	>=dev-libs/libgudev-232
+	mbim? ( >=net-libs/libmbim-1.18.0 )
+	qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
+
+	dev-libs/gobject-introspection:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/help2man
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_configure() {
+	# Let's avoid BuildRequiring bash-completion, install it manually
+	local emesonargs=(
+		$(meson_use mbim mbim_qmux)
+		$(meson_use qrtr)
+		-Drmnet=true
+
+		-Dudev=true
+		-Dudevdir="$(get_udevdir)"
+
+		-Dintrospection=true
+		$(meson_use gtk-doc gtk_doc)
+		-Dman=true
+
+		-Dbash_completion=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dobashcomp src/qmicli/qmicli
+}
diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild
index 56d9060d775c..5336e7de9c06 100644
--- a/net-libs/libqmi/libqmi-9999.ebuild
+++ b/net-libs/libqmi/libqmi-9999.ebuild
@@ -1,51 +1,61 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
+	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
-	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
+	SRC_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/${PV}/${P}.tar.bz2"
 fi
 
+inherit bash-completion-r1 meson udev
+
 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.8"	# soname of libqmi-glib.so
 IUSE="gtk-doc +mbim +qrtr"
 
-RDEPEND=">=dev-libs/glib-2.56
+SLOT="0/5.9"	# soname of libqmi-glib.so
+
+RDEPEND="
+	>=dev-libs/glib-2.56
 	>=dev-libs/libgudev-232
 	mbim? ( >=net-libs/libmbim-1.18.0 )
 	qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= )
+
+	dev-libs/gobject-introspection:=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	sys-apps/help2man
 	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )"
-[[ ${PV} == "9999" ]] && BDEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
+	gtk-doc? ( dev-util/gtk-doc )
+"
 
 src_configure() {
-	local myconf=(
-		--disable-Werror
-		--disable-static
-		$(use_enable qrtr)
-		$(use_enable mbim mbim-qmux)
-		$(use_enable gtk-doc)
+	# Let's avoid BuildRequiring bash-completion, install it manually
+	local emesonargs=(
+		$(meson_use mbim mbim_qmux)
+		$(meson_use qrtr)
+		-Drmnet=true
+
+		-Dudev=true
+		-Dudevdir="$(get_udevdir)"
+
+		-Dintrospection=true
+		$(meson_use gtk-doc gtk_doc)
+		-Dman=true
+
+		-Dbash_completion=false
 	)
-	econf "${myconf[@]}"
+	meson_src_configure
 }
 
 src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
+	meson_src_install
+	dobashcomp src/qmicli/qmicli
 }