| 1 |
commit: cd67d47439df7224a8600779996ede787c18b8f5 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 27 22:14:49 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 27 22:14:52 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd67d474 |
| 7 |
|
| 8 |
net-misc/networkmanager: restore dhcpcd support |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/605272 |
| 11 |
Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69 |
| 12 |
|
| 13 |
net-misc/networkmanager/metadata.xml | 1 + |
| 14 |
net-misc/networkmanager/networkmanager-1.8.0.ebuild | 7 +++---- |
| 15 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml |
| 18 |
index 734ee56b37e..8d695c7325d 100644 |
| 19 |
--- a/net-misc/networkmanager/metadata.xml |
| 20 |
+++ b/net-misc/networkmanager/metadata.xml |
| 21 |
@@ -16,6 +16,7 @@ |
| 22 |
tracking</flag> |
| 23 |
<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for |
| 24 |
getting ip</flag> |
| 25 |
+ <flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag> |
| 26 |
<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag> |
| 27 |
<flag name="json">Enable JSON validation via <pkg>dev-libs/jansson</pkg> |
| 28 |
in libnm.</flag> |
| 29 |
|
| 30 |
diff --git a/net-misc/networkmanager/networkmanager-1.8.0.ebuild b/net-misc/networkmanager/networkmanager-1.8.0.ebuild |
| 31 |
index 7bf80efe098..7b0e7cf9140 100644 |
| 32 |
--- a/net-misc/networkmanager/networkmanager-1.8.0.ebuild |
| 33 |
+++ b/net-misc/networkmanager/networkmanager-1.8.0.ebuild |
| 34 |
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
| 35 |
LICENSE="GPL-2+" |
| 36 |
SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
| 37 |
|
| 38 |
-IUSE="audit bluetooth connection-sharing consolekit +dhclient elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 39 |
+IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 40 |
|
| 41 |
REQUIRED_USE=" |
| 42 |
modemmanager? ( ppp ) |
| 43 |
@@ -50,6 +50,7 @@ COMMON_DEPEND=" |
| 44 |
net-firewall/iptables ) |
| 45 |
consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
| 46 |
dhclient? ( >=net-misc/dhcp-4[client] ) |
| 47 |
+ dhcpcd? ( net-misc/dhcpcd ) |
| 48 |
elogind? ( sys-auth/elogind ) |
| 49 |
gnutls? ( |
| 50 |
dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] |
| 51 |
@@ -174,9 +175,7 @@ multilib_src_configure() { |
| 52 |
$(multilib_native_use_with audit libaudit) |
| 53 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 54 |
$(use_with dhclient) |
| 55 |
- # Also disable dhcpcd support as it's also completely unmaintained |
| 56 |
- # and facing bugs like #563938 and many others |
| 57 |
- --without-dhcpcd |
| 58 |
+ $(use_with dhcpcd) |
| 59 |
$(multilib_native_use_enable introspection) |
| 60 |
$(multilib_native_use_enable json json-validation) |
| 61 |
$(multilib_native_use_enable ppp) |
Archives