gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

net-misc/networkmanager: restore dhcpcd support

Browse Source 
Bug: https://bugs.gentoo.org/605272
Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69
This commit is contained in:
Mike Gilbert
2017-05-27 18:14:49 -04:00
parent 438ba1eca2
commit cd67d47439
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net-misc/networkmanager/metadata.xml
View File

@@ -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>

7
net-misc/networkmanager/networkmanager-1.8.0.ebuild
View File

@@ -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)