From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4CCE913832E for ; Sat, 30 Jul 2016 16:41:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECA1CE0B26; Sat, 30 Jul 2016 16:41:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7797BE0B26 for ; Sat, 30 Jul 2016 16:41:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01524340C3E for ; Sat, 30 Jul 2016 16:41:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71F3B7DC for ; Sat, 30 Jul 2016 16:41:17 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1469896871.2be28bf989bf52080049c2cda9b06934f369ca2f.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/networkmanager/networkmanager-1.2.2.ebuild X-VCS-Directories: net-misc/networkmanager/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 2be28bf989bf52080049c2cda9b06934f369ca2f X-VCS-Branch: master Date: Sat, 30 Jul 2016 16:41:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: aaaaf2f9-fb93-456b-8942-af23359e0acd X-Archives-Hash: 741dd0644540b28da64f9e3b2b930e55 commit: 2be28bf989bf52080049c2cda9b06934f369ca2f Author: Pacho Ramos gentoo org> AuthorDate: Sat Jul 30 16:32:13 2016 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sat Jul 30 16:41:11 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2be28bf9 net-misc/networkmanager: Fix the disabling of examples building and prevent qt automagic dep (#588828 by Eugene Shalygin), drop old migration messages (#589496 by mgorny). Package-Manager: portage-2.3.0 .../networkmanager/networkmanager-1.2.2.ebuild | 28 ++-------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/net-misc/networkmanager/networkmanager-1.2.2.ebuild b/net-misc/networkmanager/networkmanager-1.2.2.ebuild index 8cef754..f17421a 100644 --- a/net-misc/networkmanager/networkmanager-1.2.2.ebuild +++ b/net-misc/networkmanager/networkmanager-1.2.2.ebuild @@ -123,7 +123,7 @@ src_prepare() { root password, add your user account to the 'plugdev' group." # Don't build examples, they are not needed and can cause build failure - sed -e '/^\s*examples\s*\\/d' -i Makefile.{am,in} || die + sed -e '/^\s*examples\s*\\*/d' -i Makefile.{am,in} || die # Upstream patches from 1.2 branch eapply "${FILESDIR}/${P}-sleep-monitor-upower-include.patch" #588278 @@ -172,6 +172,7 @@ multilib_src_configure() { --disable-lto \ --disable-config-plugin-ibft \ --disable-ifnet \ + --disable-qt \ --without-netconfig \ --with-dbus-sys-dir=/etc/dbus-1/system.d \ --with-libnm-glib \ @@ -301,31 +302,6 @@ pkg_postinst() { esac fi - # ifnet plugin was disabled for systemd users with 0.9.8.6 version - # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations) - if use systemd; then - if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then - ewarn "Ifnet plugin won't be used with systemd support enabled" - ewarn "as it is meant to be used with openRC and can cause collisions" - ewarn "(like bug #485658)." - ewarn "Because of this, you will likely need to reconfigure some of" - ewarn "your networks. To do this you can rely on Gnome control center," - ewarn "nm-connection-editor or nmtui tools for example once updated" - ewarn "NetworkManager version is installed." - fi - else - if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then - ewarn "Ifnet plugin is now disabled because of it being unattended" - ewarn "and unmaintained for a long time, leading to some unfixed bugs" - ewarn "and new problems appearing. We will now use upstream 'keyfile'" - ewarn "plugin." - ewarn "Because of this, you will likely need to reconfigure some of" - ewarn "your networks. To do this you can rely on Gnome control center," - ewarn "nm-connection-editor or nmtui tools for example once updated" - ewarn "NetworkManager version is installed." - fi - fi - # NM fallbacks to plugin specified at compile time (upstream bug #738611) # but still show a warning to remember people to have cleaner config file if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then