| 1 |
commit: 2be28bf989bf52080049c2cda9b06934f369ca2f |
| 2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 30 16:32:13 2016 +0000 |
| 4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 30 16:41:11 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2be28bf9 |
| 7 |
|
| 8 |
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). |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
.../networkmanager/networkmanager-1.2.2.ebuild | 28 ++-------------------- |
| 13 |
1 file changed, 2 insertions(+), 26 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-misc/networkmanager/networkmanager-1.2.2.ebuild b/net-misc/networkmanager/networkmanager-1.2.2.ebuild |
| 16 |
index 8cef754..f17421a 100644 |
| 17 |
--- a/net-misc/networkmanager/networkmanager-1.2.2.ebuild |
| 18 |
+++ b/net-misc/networkmanager/networkmanager-1.2.2.ebuild |
| 19 |
@@ -123,7 +123,7 @@ src_prepare() { |
| 20 |
root password, add your user account to the 'plugdev' group." |
| 21 |
|
| 22 |
# Don't build examples, they are not needed and can cause build failure |
| 23 |
- sed -e '/^\s*examples\s*\\/d' -i Makefile.{am,in} || die |
| 24 |
+ sed -e '/^\s*examples\s*\\*/d' -i Makefile.{am,in} || die |
| 25 |
|
| 26 |
# Upstream patches from 1.2 branch |
| 27 |
eapply "${FILESDIR}/${P}-sleep-monitor-upower-include.patch" #588278 |
| 28 |
@@ -172,6 +172,7 @@ multilib_src_configure() { |
| 29 |
--disable-lto \ |
| 30 |
--disable-config-plugin-ibft \ |
| 31 |
--disable-ifnet \ |
| 32 |
+ --disable-qt \ |
| 33 |
--without-netconfig \ |
| 34 |
--with-dbus-sys-dir=/etc/dbus-1/system.d \ |
| 35 |
--with-libnm-glib \ |
| 36 |
@@ -301,31 +302,6 @@ pkg_postinst() { |
| 37 |
esac |
| 38 |
fi |
| 39 |
|
| 40 |
- # ifnet plugin was disabled for systemd users with 0.9.8.6 version |
| 41 |
- # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations) |
| 42 |
- if use systemd; then |
| 43 |
- if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then |
| 44 |
- ewarn "Ifnet plugin won't be used with systemd support enabled" |
| 45 |
- ewarn "as it is meant to be used with openRC and can cause collisions" |
| 46 |
- ewarn "(like bug #485658)." |
| 47 |
- ewarn "Because of this, you will likely need to reconfigure some of" |
| 48 |
- ewarn "your networks. To do this you can rely on Gnome control center," |
| 49 |
- ewarn "nm-connection-editor or nmtui tools for example once updated" |
| 50 |
- ewarn "NetworkManager version is installed." |
| 51 |
- fi |
| 52 |
- else |
| 53 |
- if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then |
| 54 |
- ewarn "Ifnet plugin is now disabled because of it being unattended" |
| 55 |
- ewarn "and unmaintained for a long time, leading to some unfixed bugs" |
| 56 |
- ewarn "and new problems appearing. We will now use upstream 'keyfile'" |
| 57 |
- ewarn "plugin." |
| 58 |
- ewarn "Because of this, you will likely need to reconfigure some of" |
| 59 |
- ewarn "your networks. To do this you can rely on Gnome control center," |
| 60 |
- ewarn "nm-connection-editor or nmtui tools for example once updated" |
| 61 |
- ewarn "NetworkManager version is installed." |
| 62 |
- fi |
| 63 |
- fi |
| 64 |
- |
| 65 |
# NM fallbacks to plugin specified at compile time (upstream bug #738611) |
| 66 |
# but still show a warning to remember people to have cleaner config file |
| 67 |
if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then |
Archives