commit: 7f004736df522df022d1e38800b8f3e22a7909a9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Oct 9 08:18:44 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Oct 9 08:18:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f004736
net-libs/libqmi: make introspection optional again, style tweaks * Make introspection optional again as unconditionally depending on it is problematic for embedded use as it drags in Python as well. This was the case before the Meson port in d26c72d36cfa28a035d89a9efdf7182e6351544c. * Style tweaks (just variable order bits which are IMO unobjectionable). Bug: https://bugs.gentoo.org/936949 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{libqmi-9999.ebuild => libqmi-1.32.4-r1.ebuild} | 16 +++++++--------- net-libs/libqmi/libqmi-9999.ebuild | 16 +++++++--------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-1.32.4-r1.ebuild similarity index 81% copy from net-libs/libqmi/libqmi-9999.ebuild copy to net-libs/libqmi/libqmi-1.32.4-r1.ebuild index 5336e7de9c06..68b118b34834 100644 --- a/net-libs/libqmi/libqmi-9999.ebuild +++ b/net-libs/libqmi/libqmi-1.32.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,8 +7,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"; + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" fi inherit bash-completion-r1 meson udev @@ -17,17 +17,15 @@ DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol 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 +SLOT="0/5.9" # soname of libqmi-glib.so +IUSE="gtk-doc introspection +mbim +qrtr" RDEPEND=" >=dev-libs/glib-2.56 >=dev-libs/libgudev-232 + introspection? ( dev-libs/gobject-introspection:= ) mbim? ( >=net-libs/libmbim-1.18.0 ) qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= ) - - dev-libs/gobject-introspection:= " DEPEND="${RDEPEND}" BDEPEND=" @@ -37,7 +35,6 @@ BDEPEND=" " src_configure() { - # Let's avoid BuildRequiring bash-completion, install it manually local emesonargs=( $(meson_use mbim mbim_qmux) $(meson_use qrtr) @@ -46,10 +43,11 @@ src_configure() { -Dudev=true -Dudevdir="$(get_udevdir)" - -Dintrospection=true + $(meson_use introspection) $(meson_use gtk-doc gtk_doc) -Dman=true + # Let's avoid BuildRequiring bash-completion, install it manually -Dbash_completion=false ) meson_src_configure diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild index 5336e7de9c06..68b118b34834 100644 --- a/net-libs/libqmi/libqmi-9999.ebuild +++ b/net-libs/libqmi/libqmi-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,8 +7,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"; + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" fi inherit bash-completion-r1 meson udev @@ -17,17 +17,15 @@ DESCRIPTION="Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol 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 +SLOT="0/5.9" # soname of libqmi-glib.so +IUSE="gtk-doc introspection +mbim +qrtr" RDEPEND=" >=dev-libs/glib-2.56 >=dev-libs/libgudev-232 + introspection? ( dev-libs/gobject-introspection:= ) mbim? ( >=net-libs/libmbim-1.18.0 ) qrtr? ( >=net-libs/libqrtr-glib-1.0.0:= ) - - dev-libs/gobject-introspection:= " DEPEND="${RDEPEND}" BDEPEND=" @@ -37,7 +35,6 @@ BDEPEND=" " src_configure() { - # Let's avoid BuildRequiring bash-completion, install it manually local emesonargs=( $(meson_use mbim mbim_qmux) $(meson_use qrtr) @@ -46,10 +43,11 @@ src_configure() { -Dudev=true -Dudevdir="$(get_udevdir)" - -Dintrospection=true + $(meson_use introspection) $(meson_use gtk-doc gtk_doc) -Dman=true + # Let's avoid BuildRequiring bash-completion, install it manually -Dbash_completion=false ) meson_src_configure
