commit: cd67d47439df7224a8600779996ede787c18b8f5 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat May 27 22:14:49 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat May 27 22:14:52 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd67d474
net-misc/networkmanager: restore dhcpcd support Bug: https://bugs.gentoo.org/605272 Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69 net-misc/networkmanager/metadata.xml | 1 + net-misc/networkmanager/networkmanager-1.8.0.ebuild | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml index 734ee56b37e..8d695c7325d 100644 --- a/net-misc/networkmanager/metadata.xml +++ b/net-misc/networkmanager/metadata.xml @@ -16,6 +16,7 @@ tracking</flag> <flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for getting ip</flag> + <flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag> <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag> <flag name="json">Enable JSON validation via <pkg>dev-libs/jansson</pkg> in libnm.</flag> diff --git a/net-misc/networkmanager/networkmanager-1.8.0.ebuild b/net-misc/networkmanager/networkmanager-1.8.0.ebuild index 7bf80efe098..7b0e7cf9140 100644 --- a/net-misc/networkmanager/networkmanager-1.8.0.ebuild +++ b/net-misc/networkmanager/networkmanager-1.8.0.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"; LICENSE="GPL-2+" SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version -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" +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" REQUIRED_USE=" modemmanager? ( ppp ) @@ -50,6 +50,7 @@ COMMON_DEPEND=" net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) + dhcpcd? ( net-misc/dhcpcd ) elogind? ( sys-auth/elogind ) gnutls? ( dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] @@ -174,9 +175,7 @@ multilib_src_configure() { $(multilib_native_use_with audit libaudit) $(multilib_native_use_enable bluetooth bluez5-dun) $(use_with dhclient) - # Also disable dhcpcd support as it's also completely unmaintained - # and facing bugs like #563938 and many others - --without-dhcpcd + $(use_with dhcpcd) $(multilib_native_use_enable introspection) $(multilib_native_use_enable json json-validation) $(multilib_native_use_enable ppp)
