net-libs/libnm-glib : revision bump, switch to autotools, meson 0.6* breaks the build

4 files changed, 98 insertions, 111 deletions

diff --git a/metadata/md5-cache/net-libs/libnm-glib-1.18.10-r1 b/metadata/md5-cache/net-libs/libnm-glib-1.18.10-r2
index 6137bd82..7e0265a2 100644
--- a/metadata/md5-cache/net-libs/libnm-glib-1.18.10-r1
+++ b/metadata/md5-cache/net-libs/libnm-glib-1.18.10-r2
@@ -1,10 +1,10 @@
-BDEPEND=>=dev-util/intltool-0.40 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=>=dev-util/intltool-0.40 virtual/pkgconfig
 DEFINED_PHASES=compile configure install test
 DEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 DESCRIPTION=Legacy NetworkManager glib and util libraries
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-INHERIT=gnome.org meson multilib-minimal
+INHERIT=eutils multilib-minimal
 IUSE=gnutls +nss abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
@@ -12,6 +12,6 @@ RDEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 REQUIRED_USE=|| ( nss gnutls )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.18/NetworkManager-1.18.10.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	96bca76bf96533b38e3d4e09d1306490	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=90287576afa1dca6a454a11df2a1f473
+SRC_URI=https://download.gnome.org/sources/NetworkManager/1.18/NetworkManager-1.18.10.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3a8a4359df192ac65f4592426834949e
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 09fe513e..2bfc378f 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -33,7 +33,7 @@ media-tv/sopcast 3.2.6-r2: SopCast free P2P Internet TV binary
 media-video/guvcview 2.0.6-r10: Simple Qt5 or GTK+3 interface for capturing and viewing video from v4l2 devices
 media-video/mpv 0.34.1-r10: Media player based on MPlayer and mplayer2
 media-video/nvidia_video_sdk 6.0.1-r10: NVIDIA Video Codec SDK
-net-libs/libnm-glib 1.18.10-r1: Legacy NetworkManager glib and util libraries
+net-libs/libnm-glib 1.18.10-r2: Legacy NetworkManager glib and util libraries
 net-libs/webkit-gtk 2.34.1-r100: Open source web browser engine
 net-wireless/broadcom-sta 6.30.223.271-r2: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver
 net-wireless/rtl8821cu 5.8.1: Realtek RTL8821CU USB Wi-Fi adapter driver for Linux
diff --git a/net-libs/libnm-glib/libnm-glib-1.18.10-r1.ebuild b/net-libs/libnm-glib/libnm-glib-1.18.10-r1.ebuild
deleted file mode 100644
index fcb61704..00000000
--- a/net-libs/libnm-glib/libnm-glib-1.18.10-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GNOME_ORG_MODULE="NetworkManager"
-
-inherit gnome.org meson multilib-minimal
-
-DESCRIPTION="Legacy NetworkManager glib and util libraries"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gnutls +nss"
-REQUIRED_USE="|| ( nss gnutls )"
-RESTRICT="test"
-
-DEPEND="
-	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-"
-
-RDEPEND="
-	${DEPEND}
-	!<net-misc/networkmanager-1.19
-"
-
-BDEPEND="
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dsystemdsystemunitdir=no
-		-Dudev_dir=no
-		-Ddbus_conf_dir="/etc/dbus-1/system.d"
-
-		-Dsession_tracking_consolekit=false
-		-Dsession_tracking=no
-		-Dsuspend_resume=upower
-		-Dpolkit=false
-		-Dpolkit_agent=false
-		-Dselinux=false
-		-Dsystemd_journal=false
-		-Dlibaudit=no
-
-		-Dwext=false
-		-Dwifi=false
-		-Diwd=false
-		-Dppp=false
-		-Dmodem_manager=false
-		-Dofono=false
-		-Dconcheck=false
-		-Dteamdctl=false
-		-Dovs=false
-		-Dlibnm_glib=true
-		-Dnmcli=false
-		-Dnmtui=false
-		-Dbluez5_dun=false
-		-Debpf=true
-
-		-Dresolvconf=no
-		-Dnetconfig=no
-
-		-Ddhclient=no
-		-Ddhcpcanon=no
-		-Ddhcpcd=no
-
-		-Dintrospection=false
-		-Dvapi=false
-		-Dtests=no
-		-Dmore_asserts=no
-		-Dmore_logging=false
-		-Dvalgrind=no
-		-Dlibpsl=false
-		-Djson_validation=false
-		-Dcrypto=$(usex nss nss gnutls)
-		-Dqt=false
-	)
-
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	dolib.so libnm-{glib,util}/libnm-*.so*[0-9]
-}
-
-multilib_src_install_all() {
-	:
-}
diff --git a/net-libs/libnm-glib/libnm-glib-1.18.10-r2.ebuild b/net-libs/libnm-glib/libnm-glib-1.18.10-r2.ebuild
new file mode 100644
index 00000000..e2ad6d75
--- /dev/null
+++ b/net-libs/libnm-glib/libnm-glib-1.18.10-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="Legacy NetworkManager glib and util libraries"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gnutls +nss"
+REQUIRED_USE="|| ( nss gnutls )"
+RESTRICT="test"
+SRC_URI="https://download.gnome.org/sources/NetworkManager/1.18/NetworkManager-${PV}.tar.xz"
+
+DEPEND="
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+"
+
+RDEPEND="
+	${DEPEND}
+	!<net-misc/networkmanager-1.19
+"
+
+BDEPEND="
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/NetworkManager-${PV}"
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-bluez5-dun
+		--disable-concheck
+		--disable-json-validation
+		--disable-more-asserts
+		--disable-more-logging
+		--disable-ovs
+		--disable-polkit
+		--disable-polkit-agent
+		--disable-ppp
+		--disable-qt
+		--disable-rpath
+		--disable-teamdctl
+		--disable-wifi
+		--enable-introspection=no
+		--enable-more-warnings=no
+		--enable-vala=no
+		--with-consolekit=no
+		--with-crypto=$(usex nss gnutls)
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		--with-dhclient=no
+		--with-dhcpcanon=no
+		--with-dhcpcd=no
+		--with-ebpf=no
+		--with-libnm-glib
+		--with-libpsl=no
+		--with-netconfig=no
+		--with-nmcli=no
+		--with-nmtui=no
+		--without-iwd
+		--without-libaudit
+		--without-modem-manager-1
+		--without-ofono
+		--without-resolvconf
+		--without-wext
+		--with-selinux=no
+		--with-session-tracking=no
+		--with-suspend-resume=upower
+		--with-systemd-journal=no
+		--with-systemd-logind=no
+		--with-valgrind=no
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	dolib.so libnm-{glib,util}/.libs/libnm-*.so*[0-9]
+}