diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2016-07-30 18:32:13 +0200 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2016-07-30 18:41:11 +0200 |
| commit | 2be28bf989bf52080049c2cda9b06934f369ca2f (patch) | |
| tree | 9fe8ead25e656d61608ca602e06bf0bed66e4b1d | |
| parent | dev-db/aerospike-server-community: Bump (diff) | |
| download | gentoo-2be28bf989bf52080049c2cda9b06934f369ca2f.tar.gz gentoo-2be28bf989bf52080049c2cda9b06934f369ca2f.tar.bz2 gentoo-2be28bf989bf52080049c2cda9b06934f369ca2f.zip | |
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
| -rw-r--r-- | net-misc/networkmanager/networkmanager-1.2.2.ebuild | 28 |
1 files 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 8cef754d62dd..f17421aa6be3 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 |