commit:     1307e72ff25078fcf6d053025450ed125dab444c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 14:04:46 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 19:08:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1307e72f

net-misc/networkmanager: [QA] Remove invalid USE=lto

USE=lto was only used to toggle b_lto in meson.  This is equivalent
to appending `-flto`, and it is already force-disabled in the eclass.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/34695
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-misc/networkmanager/networkmanager-1.42.6-r2.ebuild | 16 ++++------------
 net-misc/networkmanager/networkmanager-1.44.0-r1.ebuild | 16 +++-------------
 net-misc/networkmanager/networkmanager-1.44.2.ebuild    | 16 +++-------------
 3 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/net-misc/networkmanager/networkmanager-1.42.6-r2.ebuild 
b/net-misc/networkmanager/networkmanager-1.42.6-r2.ebuild
index 09782cd3d2a0..46da08f3b953 100644
--- a/net-misc/networkmanager/networkmanager-1.42.6-r2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.42.6-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 GNOME_ORG_MODULE="NetworkManager"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
-inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 
systemd toolchain-funcs udev vala virtualx
+inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 
systemd udev vala virtualx
 
 DESCRIPTION="A set of co-operative tools that make networking simple and 
straightforward"
 HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager";
@@ -16,7 +16,7 @@ SRC_URI+=" 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd 
elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss 
nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog 
systemd teamd test +tools vala +wext +wifi"
+IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd 
elogind gnutls +gtk-doc +introspection iptables iwd psl libedit +nss nftables 
+modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd 
test +tools vala +wext +wifi"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -150,12 +150,6 @@ pkg_setup() {
        if use introspection || use test; then
                python-any-r1_pkg_setup
        fi
-
-       # bug 809695
-       if tc-is-clang && use lto; then
-               eerror "Clang does not support -flto-partition"
-               die "Please use gcc or turn off USE=lto flag when building with 
clang"
-       fi
 }
 
 src_prepare() {
@@ -243,8 +237,6 @@ multilib_src_configure() {
                -Dld_gc=false
                $(meson_native_use_bool psl libpsl)
                -Dqt=false
-
-               $(meson_use lto b_lto)
        )
 
        if multilib_is_native_abi && use systemd; then

diff --git a/net-misc/networkmanager/networkmanager-1.44.0-r1.ebuild 
b/net-misc/networkmanager/networkmanager-1.44.0-r1.ebuild
index 47c2023fc20f..a281df555cd2 100644
--- a/net-misc/networkmanager/networkmanager-1.44.0-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.44.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 GNOME_ORG_MODULE="NetworkManager"
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit flag-o-matic gnome.org linux-info meson-multilib python-any-r1 
readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
+inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 
systemd udev vala virtualx
 
 DESCRIPTION="A set of co-operative tools that make networking simple and 
straightforward"
 HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager";
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager";
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd 
elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss 
nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog 
systemd teamd test +tools vala +wext +wifi"
+IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd 
elogind gnutls +gtk-doc +introspection iptables iwd psl libedit +nss nftables 
+modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd 
test +tools vala +wext +wifi"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -143,12 +143,6 @@ pkg_setup() {
        if use introspection || use test; then
                python-any-r1_pkg_setup
        fi
-
-       # bug 809695
-       if tc-is-clang && use lto; then
-               eerror "Clang does not support -flto-partition"
-               die "Please use gcc or turn off USE=lto flag when building with 
clang"
-       fi
 }
 
 src_prepare() {
@@ -173,8 +167,6 @@ meson_nm_native_program() {
 }
 
 multilib_src_configure() {
-       filter-lto
-
        local emesonargs=(
                --localstatedir="${EPREFIX}/var"
 
@@ -239,8 +231,6 @@ multilib_src_configure() {
                -Dld_gc=false
                $(meson_native_use_bool psl libpsl)
                -Dqt=false
-
-               $(meson_use lto b_lto)
        )
 
        if multilib_is_native_abi && use systemd; then

diff --git a/net-misc/networkmanager/networkmanager-1.44.2.ebuild 
b/net-misc/networkmanager/networkmanager-1.44.2.ebuild
index 47c2023fc20f..a281df555cd2 100644
--- a/net-misc/networkmanager/networkmanager-1.44.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.44.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 GNOME_ORG_MODULE="NetworkManager"
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit flag-o-matic gnome.org linux-info meson-multilib python-any-r1 
readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
+inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 
systemd udev vala virtualx
 
 DESCRIPTION="A set of co-operative tools that make networking simple and 
straightforward"
 HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager";
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager";
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd 
elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss 
nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog 
systemd teamd test +tools vala +wext +wifi"
+IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd 
elogind gnutls +gtk-doc +introspection iptables iwd psl libedit +nss nftables 
+modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd 
test +tools vala +wext +wifi"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -143,12 +143,6 @@ pkg_setup() {
        if use introspection || use test; then
                python-any-r1_pkg_setup
        fi
-
-       # bug 809695
-       if tc-is-clang && use lto; then
-               eerror "Clang does not support -flto-partition"
-               die "Please use gcc or turn off USE=lto flag when building with 
clang"
-       fi
 }
 
 src_prepare() {
@@ -173,8 +167,6 @@ meson_nm_native_program() {
 }
 
 multilib_src_configure() {
-       filter-lto
-
        local emesonargs=(
                --localstatedir="${EPREFIX}/var"
 
@@ -239,8 +231,6 @@ multilib_src_configure() {
                -Dld_gc=false
                $(meson_native_use_bool psl libpsl)
                -Dqt=false
-
-               $(meson_use lto b_lto)
        )
 
        if multilib_is_native_abi && use systemd; then

Reply via email to