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

1 files changed, 32 insertions, 22 deletions

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
 }