Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager/, net-misc/networkmanager/files/
Date: Thu, 29 Sep 2016 18:31:46
Message-Id: 1475173873.e9606f0e918e2ade8431684f3e40bc800cd0efcb.pacho@gentoo
1 commit: e9606f0e918e2ade8431684f3e40bc800cd0efcb
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 29 17:47:36 2016 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 18:31:13 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9606f0e
7
8 net-misc/networkmanager: Drop old
9
10 Package-Manager: portage-2.3.0
11
12 net-misc/networkmanager/Manifest | 1 -
13 net-misc/networkmanager/files/1.2.4-upower.patch | 67 ----
14 ...anager-1.2.2-sleep-monitor-upower-include.patch | 30 --
15 .../networkmanager/networkmanager-1.2.4.ebuild | 333 --------------------
16 .../networkmanager/networkmanager-1.4.0.ebuild | 341 ---------------------
17 5 files changed, 772 deletions(-)
18
19 diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
20 index c37c3c3..0c9fa51 100644
21 --- a/net-misc/networkmanager/Manifest
22 +++ b/net-misc/networkmanager/Manifest
23 @@ -1,3 +1,2 @@
24 DIST NetworkManager-1.0.12.tar.xz 3490836 SHA256 3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e SHA512 926c0139dc7ade7bbc512f0d2e386a42a278aceff68996bc3a18fb1940f5d516f0ff2768459d6f50fd5669d72c15202307396bb3cf8b67c3dbac19db484b971c WHIRLPOOL 6178af61fb30a7e8b72cc05296a014a5be5b10fed41cd5385f0bebae1fa22519c83cf8c359479372f063fc2b891715015454c53cd4f1f1516fc03bca76a552ac
25 -DIST NetworkManager-1.2.4.tar.xz 3728788 SHA256 19bfb7306dd472d010443a8027d91f9fd50fe6e0c5aa4ea8083845de0fa38faa SHA512 83fa179c0f360c7f40504cf58275e28638b5a986458c99adc85567595ca170ac3d081ffa0c99e5619c97d4a3228e5318e613330894547ad3438eaa2bfcc1f28b WHIRLPOOL 625cf2a32f5fb1e5ae537f2285f6945ca14f438959fb5556b490a90fe16eddcfb22e84c82f8f0f479f2387ec54ba292b18f28c0676375d729f9bb6a435d9e12b
26 DIST NetworkManager-1.4.0.tar.xz 3699568 SHA256 c4d5e075998a291074501602a5068a7e54d9e0f2658aba079d58145d65be531d SHA512 2580e885684f6ad464eebdf9e0dab5432d4d45f0f4127af7f8947be16fc5ce84a5cc090e195b68619c14e218d9cffcde1615400c19326e58bdac8fdf7b53fb46 WHIRLPOOL 39607ac0606039c242b2033b9e540c3beb88e7f48fdb8188d942341a57e097dc0e9c7bde248b6d9ae65bd3ac94df83b5e7d7a371baf7f32c8542581c3bdf778c
27
28 diff --git a/net-misc/networkmanager/files/1.2.4-upower.patch b/net-misc/networkmanager/files/1.2.4-upower.patch
29 deleted file mode 100644
30 index a08e34a..00000000
31 --- a/net-misc/networkmanager/files/1.2.4-upower.patch
32 +++ /dev/null
33 @@ -1,67 +0,0 @@
34 -From f864c58cfe87533c69dcf00e3ea236809392a8e0 Mon Sep 17 00:00:00 2001
35 -From: Beniamino Galvani <bgalvani@××××××.com>
36 -Date: Thu, 4 Aug 2016 16:25:30 +0200
37 -Subject: build: fix build with '--with-suspend-resume=upower'
38 -
39 -Now we have a single file for all suspend APIs and the selection is
40 -done through the preprocessor: remove stale AM_CONDITIONALs and define
41 -SUSPEND_RESUME_UPOWER when needed.
42 -
43 -Fixes: c76eb3e8f7a80b69c570b513ee3eb16bea1b34bd
44 -(cherry picked from commit e4b2c989dc51818e52906b5120ea6a0659274631)
45 -
46 -diff --git a/configure.ac b/configure.ac
47 -index 46775c3..7869f07 100644
48 ---- a/configure.ac
49 -+++ b/configure.ac
50 -@@ -472,7 +472,9 @@ if test "z$with_suspend_resume" = "z"; then
51 - fi
52 -
53 - case $with_suspend_resume in
54 -- upower) ;;
55 -+ upower)
56 -+ AC_DEFINE([SUSPEND_RESUME_UPOWER], 1, [Define to 1 to use UPower suspend api])
57 -+ ;;
58 - systemd)
59 - PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd >= 209],,
60 - [PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183])])
61 -@@ -485,9 +487,6 @@ case $with_suspend_resume in
62 - AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd, consolekit])
63 - ;;
64 - esac
65 --AM_CONDITIONAL(SUSPEND_RESUME_UPOWER, test "x$with_suspend_resume" = "xupower")
66 --AM_CONDITIONAL(SUSPEND_RESUME_SYSTEMD, test "x$with_suspend_resume" = "xsystemd")
67 --AM_CONDITIONAL(SUSPEND_RESUME_CONSOLEKIT, test "x$with_suspend_resume" = "xconsolekit")
68 -
69 - # SELinux support
70 - AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux=yes|no|auto], [Build with SELinux (default: auto)]),,[with_selinux=auto])
71 ---
72 -cgit v0.10.2
73 -
74 ---- a/config.h.in
75 -+++ b/config.h.in
76 -@@ -216,6 +216,9 @@
77 - /* Define to 1 to use systemd suspend api */
78 - #undef SUSPEND_RESUME_SYSTEMD
79 -
80 -+/* Define to 1 to use UPower suspend api */
81 -+#undef SUSPEND_RESUME_UPOWER
82 -+
83 - /* Define to 1 if libsystemd-journald is available */
84 - #undef SYSTEMD_JOURNAL
85 -
86 ---- a/configure
87 -+++ b/configure
88 -@@ -22776,7 +22776,11 @@
89 - fi
90 -
91 - case $with_suspend_resume in
92 -- upower) ;;
93 -+ upower)
94 -+
95 -+$as_echo "#define SUSPEND_RESUME_UPOWER 1" >>confdefs.h
96 -+
97 -+ ;;
98 - systemd)
99 -
100 - pkg_failed=no
101
102 diff --git a/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch b/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch
103 deleted file mode 100644
104 index 52a21c4..00000000
105 --- a/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch
106 +++ /dev/null
107 @@ -1,30 +0,0 @@
108 -From 10ba492047b1ad80adeeb878e7f155a13638da7f Mon Sep 17 00:00:00 2001
109 -From: Michael Olbrich <m.olbrich@×××××××××××.de>
110 -Date: Wed, 18 May 2016 10:43:51 +0200
111 -Subject: [PATCH] sleep-monitor-upower: add missing include
112 -
113 -Otherwise building fails with:
114 -
115 - nm-sleep-monitor-upower.c:132:45: error: expected declaration specifiers or '...' before 'nm_sleep_monitor_get'
116 - nm-sleep-monitor-upower.c:132:67: error: expected declaration specifiers or '...' before '(' token
117 -
118 -https://mail.gnome.org/archives/networkmanager-list/2016-May/msg00053.html
119 ----
120 - src/nm-sleep-monitor-upower.c | 1 +
121 - 1 file changed, 1 insertion(+)
122 -
123 -diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
124 -index 5f0ff24..8d07190 100644
125 ---- a/src/nm-sleep-monitor-upower.c
126 -+++ b/src/nm-sleep-monitor-upower.c
127 -@@ -24,6 +24,7 @@
128 - #include <sys/stat.h>
129 -
130 - #include "nm-core-internal.h"
131 -+#include "NetworkManagerUtils.h"
132 -
133 - #include "nm-sleep-monitor.h"
134 -
135 ---
136 -2.9.0
137 -
138
139 diff --git a/net-misc/networkmanager/networkmanager-1.2.4.ebuild b/net-misc/networkmanager/networkmanager-1.2.4.ebuild
140 deleted file mode 100644
141 index 773be0e..00000000
142 --- a/net-misc/networkmanager/networkmanager-1.2.4.ebuild
143 +++ /dev/null
144 @@ -1,333 +0,0 @@
145 -# Copyright 1999-2016 Gentoo Foundation
146 -# Distributed under the terms of the GNU General Public License v2
147 -# $Id$
148 -
149 -EAPI=6
150 -GNOME_ORG_MODULE="NetworkManager"
151 -GNOME2_LA_PUNT="yes"
152 -VALA_USE_DEPEND="vapigen"
153 -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
154 -
155 -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
156 - user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
157 -
158 -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
159 -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
160 -
161 -LICENSE="GPL-2+"
162 -SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
163 -
164 -IUSE="bluetooth connection-sharing consolekit +dhclient gnutls +introspection \
165 -kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
166 -vala +wext +wifi"
167 -
168 -REQUIRED_USE="
169 - modemmanager? ( ppp )
170 - wext? ( wifi )
171 - ^^ ( nss gnutls )
172 -"
173 -
174 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
175 -
176 -# gobject-introspection-0.10.3 is needed due to gnome bug 642300
177 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
178 -COMMON_DEPEND="
179 - >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
180 - >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
181 - >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
182 - >=dev-libs/libnl-3.2.8:3=
183 - >=sys-auth/polkit-0.106
184 - net-libs/libndp
185 - >=net-libs/libsoup-2.40:2.4=
186 - net-misc/iputils
187 - sys-libs/readline:0=
188 - >=virtual/libgudev-165:=[${MULTILIB_USEDEP}]
189 - bluetooth? ( >=net-wireless/bluez-5 )
190 - connection-sharing? (
191 - net-dns/dnsmasq[dhcp]
192 - net-firewall/iptables )
193 - gnutls? (
194 - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
195 - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
196 - modemmanager? ( >=net-misc/modemmanager-0.7.991 )
197 - ncurses? ( >=dev-libs/newt-0.52.15 )
198 - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
199 - dhclient? ( >=net-misc/dhcp-4[client] )
200 - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
201 - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
202 - resolvconf? ( net-dns/openresolv )
203 - systemd? ( >=sys-apps/systemd-209:0= )
204 - !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
205 - teamd? ( >=net-misc/libteam-1.9 )
206 -"
207 -RDEPEND="${COMMON_DEPEND}
208 - consolekit? ( sys-auth/consolekit )
209 - wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
210 -"
211 -DEPEND="${COMMON_DEPEND}
212 - dev-util/gdbus-codegen
213 - dev-util/gtk-doc-am
214 - >=dev-util/intltool-0.40
215 - >=sys-devel/gettext-0.17
216 - >=sys-kernel/linux-headers-2.6.29
217 - virtual/pkgconfig
218 - vala? ( $(vala_depend) )
219 - test? (
220 - $(python_gen_any_dep '
221 - dev-python/dbus-python[${PYTHON_USEDEP}]
222 - dev-python/pygobject:3[${PYTHON_USEDEP}]')
223 - )
224 -"
225 -
226 -python_check_deps() {
227 - if use test; then
228 - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
229 - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
230 - else
231 - return 0
232 - fi
233 -}
234 -
235 -sysfs_deprecated_check() {
236 - ebegin "Checking for SYSFS_DEPRECATED support"
237 -
238 - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
239 - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
240 - eerror "or NetworkManager will not work correctly."
241 - eerror "See https://bugs.gentoo.org/333639 for more info."
242 - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
243 - fi
244 - eend $?
245 -}
246 -
247 -pkg_pretend() {
248 - if use kernel_linux; then
249 - get_version
250 - if linux_config_exists; then
251 - sysfs_deprecated_check
252 - else
253 - ewarn "Was unable to determine your kernel .config"
254 - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
255 - ewarn "See https://bugs.gentoo.org/333639 for more info."
256 - fi
257 -
258 - fi
259 -}
260 -
261 -pkg_setup() {
262 - enewgroup plugdev
263 -}
264 -
265 -src_prepare() {
266 - DOC_CONTENTS="To modify system network connections without needing to enter the
267 - root password, add your user account to the 'plugdev' group."
268 -
269 - local PATCHES=(
270 - # https://bugs.gentoo.org/590432
271 - "${FILESDIR}/1.2.4-upower.patch"
272 - )
273 -
274 - use vala && vala_src_prepare
275 - gnome2_src_prepare
276 -}
277 -
278 -multilib_src_configure() {
279 - local myconf=()
280 -
281 - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
282 - if use ppp; then
283 - local PPPD_VER=`best_version net-dialup/ppp`
284 - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
285 - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
286 - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
287 - fi
288 -
289 - # unit files directory needs to be passed only when systemd is enabled,
290 - # otherwise systemd support is not disabled completely, bug #524534
291 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
292 -
293 - if multilib_is_native_abi; then
294 - # work-around man out-of-source brokenness, must be done before configure
295 - mkdir man || die
296 - find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die
297 - else
298 - # libnl, libndp are only used for executables, not libraries
299 - myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' )
300 - fi
301 -
302 - # ifnet plugin always disabled until someone volunteers to actively
303 - # maintain and fix it
304 - # Also disable dhcpcd support as it's also completely unmaintained
305 - # and facing bugs like #563938 and many others
306 - #
307 - # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
308 - # still not ready for removing that lib
309 - ECONF_SOURCE=${S} \
310 - runstatedir="/run" \
311 - gnome2_src_configure \
312 - --disable-more-warnings \
313 - --disable-static \
314 - --localstatedir=/var \
315 - --disable-lto \
316 - --disable-config-plugin-ibft \
317 - --disable-ifnet \
318 - --disable-qt \
319 - --without-netconfig \
320 - --with-dbus-sys-dir=/etc/dbus-1/system.d \
321 - --with-libnm-glib \
322 - --with-nmcli=yes \
323 - --with-udev-dir="$(get_udevdir)" \
324 - --with-config-plugins-default=keyfile \
325 - --with-iptables=/sbin/iptables \
326 - $(multilib_native_with libsoup) \
327 - $(multilib_native_enable concheck) \
328 - --with-crypto=$(usex nss nss gnutls) \
329 - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \
330 - --with-suspend-resume=$(multilib_native_usex systemd systemd upower) \
331 - $(multilib_native_use_enable bluetooth bluez5-dun) \
332 - $(multilib_native_use_enable introspection) \
333 - $(multilib_native_use_enable ppp) \
334 - $(use_with dhclient) \
335 - --without-dhcpcd \
336 - $(multilib_native_use_with modemmanager modem-manager-1) \
337 - $(multilib_native_use_with ncurses nmtui) \
338 - $(multilib_native_use_with resolvconf) \
339 - $(multilib_native_use_with selinux) \
340 - $(multilib_native_use_with systemd systemd-journal) \
341 - $(multilib_native_use_enable teamd teamdctl) \
342 - $(multilib_native_use_enable test tests) \
343 - $(multilib_native_use_enable vala) \
344 - --without-valgrind \
345 - $(multilib_native_use_with wext) \
346 - $(multilib_native_use_enable wifi) \
347 - "${myconf[@]}"
348 -
349 - # work-around gtk-doc out-of-source brokedness
350 - if multilib_is_native_abi; then
351 - local d
352 - for d in api libnm libnm-util libnm-glib; do
353 - ln -s "${S}"/docs/${d}/html docs/${d}/html || die
354 - done
355 - fi
356 -
357 - # Disable examples
358 - # https://bugzilla.gnome.org/show_bug.cgi?id=769711
359 - cat > examples/Makefile <<-EOF
360 - .PHONY: all check install
361 - all:
362 - check:
363 - install:
364 - EOF
365 -}
366 -
367 -multilib_src_compile() {
368 - if multilib_is_native_abi; then
369 - emake
370 - else
371 - emake all-am
372 - emake -C shared
373 - emake -C introspection # generated headers, needed for libnm
374 - emake -C libnm-core
375 - emake -C libnm
376 - emake -C libnm-util
377 - emake -C libnm-glib
378 - fi
379 -}
380 -
381 -multilib_src_test() {
382 - if use test && multilib_is_native_abi; then
383 - python_setup
384 - virtx emake check
385 - fi
386 -}
387 -
388 -multilib_src_install() {
389 - if multilib_is_native_abi; then
390 - # Install completions at proper place, bug #465100
391 - gnome2_src_install completiondir="$(get_bashcompdir)"
392 - else
393 - emake DESTDIR="${D}" install-am
394 - emake DESTDIR="${D}" install -C shared
395 - emake DESTDIR="${D}" install -C introspection
396 - emake DESTDIR="${D}" install -C libnm-core
397 - emake DESTDIR="${D}" install -C libnm
398 - emake DESTDIR="${D}" install -C libnm-util
399 - emake DESTDIR="${D}" install -C libnm-glib
400 - fi
401 -}
402 -
403 -multilib_src_install_all() {
404 - ! use systemd && readme.gentoo_create_doc
405 -
406 - newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
407 - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
408 -
409 - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
410 - keepdir /etc/NetworkManager/dispatcher.d
411 -
412 - # Provide openrc net dependency only when nm is connected
413 - exeinto /etc/NetworkManager/dispatcher.d
414 - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
415 - sed -e "s:@EPREFIX@:${EPREFIX}:g" \
416 - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
417 -
418 - keepdir /etc/NetworkManager/system-connections
419 - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
420 -
421 - # Allow users in plugdev group to modify system connections
422 - insinto /usr/share/polkit-1/rules.d/
423 - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
424 -
425 - # Remove empty /run/NetworkManager
426 - rmdir "${D}"/run/NetworkManager "${D}"/run || die
427 -}
428 -
429 -pkg_postinst() {
430 - gnome2_pkg_postinst
431 - ! use systemd && readme.gentoo_print_elog
432 -
433 - if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
434 - ewarn "The ${PN} system configuration file has moved to a new location."
435 - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
436 - ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
437 - ewarn
438 - ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
439 - fi
440 -
441 - # The polkit rules file moved to /usr/share
442 - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
443 - if [[ -f "${old_rules}" ]]; then
444 - case "$(md5sum ${old_rules})" in
445 - 574d0cfa7e911b1f7792077003060240* )
446 - # Automatically delete the old rules.d file if the user did not change it
447 - elog
448 - elog "Removing old ${old_rules} ..."
449 - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
450 - ;;
451 - * )
452 - elog "The ${old_rules}"
453 - elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
454 - elog "If you edited ${old_rules}"
455 - elog "without changing its behavior, you may want to remove it."
456 - ;;
457 - esac
458 - fi
459 -
460 - # NM fallbacks to plugin specified at compile time (upstream bug #738611)
461 - # but still show a warning to remember people to have cleaner config file
462 - if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
463 - if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
464 - ewarn
465 - ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
466 - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
467 - ewarn
468 - fi
469 - fi
470 -
471 - # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
472 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
473 - ewarn "You have psk-flags=1 setting in above files, you will need to"
474 - ewarn "either reconfigure affected networks or, at least, set the flag"
475 - ewarn "value to '0'."
476 - fi
477 -}
478
479 diff --git a/net-misc/networkmanager/networkmanager-1.4.0.ebuild b/net-misc/networkmanager/networkmanager-1.4.0.ebuild
480 deleted file mode 100644
481 index c735125..00000000
482 --- a/net-misc/networkmanager/networkmanager-1.4.0.ebuild
483 +++ /dev/null
484 @@ -1,341 +0,0 @@
485 -# Copyright 1999-2016 Gentoo Foundation
486 -# Distributed under the terms of the GNU General Public License v2
487 -# $Id$
488 -
489 -EAPI=6
490 -GNOME_ORG_MODULE="NetworkManager"
491 -GNOME2_LA_PUNT="yes"
492 -VALA_USE_DEPEND="vapigen"
493 -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
494 -
495 -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
496 - user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
497 -
498 -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
499 -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
500 -
501 -LICENSE="GPL-2+"
502 -SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
503 -
504 -IUSE="audit bluetooth connection-sharing consolekit +dhclient gnutls +introspection \
505 -json kernel_linux +nss +modemmanager ncurses ofono +ppp resolvconf selinux \
506 -systemd teamd test vala +wext +wifi"
507 -
508 -REQUIRED_USE="
509 - modemmanager? ( ppp )
510 - vala? ( introspection )
511 - wext? ( wifi )
512 - ^^ ( nss gnutls )
513 -"
514 -
515 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
516 -
517 -# gobject-introspection-0.10.3 is needed due to gnome bug 642300
518 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
519 -# TODO: need multilib janson (linked to libnm.so)
520 -COMMON_DEPEND="
521 - >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
522 - >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
523 - >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
524 - >=dev-libs/libnl-3.2.8:3=
525 - >=sys-auth/polkit-0.106
526 - net-libs/libndp
527 - >=net-libs/libsoup-2.40:2.4=
528 - net-misc/iputils
529 - sys-libs/readline:0=
530 - >=virtual/libgudev-165:=[${MULTILIB_USEDEP}]
531 - audit? ( sys-process/audit )
532 - bluetooth? ( >=net-wireless/bluez-5 )
533 - connection-sharing? (
534 - net-dns/dnsmasq[dhcp]
535 - net-firewall/iptables )
536 - consolekit? ( >=sys-auth/consolekit-1.0.0 )
537 - dhclient? ( >=net-misc/dhcp-4[client] )
538 - gnutls? (
539 - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
540 - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
541 - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
542 - json? ( dev-libs/jansson )
543 - modemmanager? ( >=net-misc/modemmanager-0.7.991 )
544 - ncurses? ( >=dev-libs/newt-0.52.15 )
545 - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
546 - ofono? ( net-misc/ofono )
547 - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
548 - resolvconf? ( net-dns/openresolv )
549 - selinux? ( sys-libs/libselinux )
550 - systemd? ( >=sys-apps/systemd-209:0= )
551 - !systemd? (
552 - !consolekit? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
553 - )
554 - teamd? ( >=net-misc/libteam-1.9 )
555 -"
556 -RDEPEND="${COMMON_DEPEND}
557 - wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
558 -"
559 -DEPEND="${COMMON_DEPEND}
560 - dev-util/gdbus-codegen
561 - dev-util/gtk-doc-am
562 - >=dev-util/intltool-0.40
563 - >=sys-devel/gettext-0.17
564 - >=sys-kernel/linux-headers-2.6.29
565 - virtual/pkgconfig[${MULTILIB_USEDEP}]
566 - vala? ( $(vala_depend) )
567 - test? (
568 - $(python_gen_any_dep '
569 - dev-python/dbus-python[${PYTHON_USEDEP}]
570 - dev-python/pygobject:3[${PYTHON_USEDEP}]')
571 - )
572 -"
573 -
574 -python_check_deps() {
575 - if use test; then
576 - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
577 - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
578 - else
579 - return 0
580 - fi
581 -}
582 -
583 -sysfs_deprecated_check() {
584 - ebegin "Checking for SYSFS_DEPRECATED support"
585 -
586 - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
587 - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
588 - eerror "or NetworkManager will not work correctly."
589 - eerror "See https://bugs.gentoo.org/333639 for more info."
590 - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
591 - fi
592 - eend $?
593 -}
594 -
595 -pkg_pretend() {
596 - if use kernel_linux; then
597 - get_version
598 - if linux_config_exists; then
599 - sysfs_deprecated_check
600 - else
601 - ewarn "Was unable to determine your kernel .config"
602 - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
603 - ewarn "See https://bugs.gentoo.org/333639 for more info."
604 - fi
605 -
606 - fi
607 -}
608 -
609 -pkg_setup() {
610 - enewgroup plugdev
611 -
612 - use test && python-any-r1_pkg_setup
613 -}
614 -
615 -src_prepare() {
616 - DOC_CONTENTS="To modify system network connections without needing to enter the
617 - root password, add your user account to the 'plugdev' group."
618 -
619 - use vala && vala_src_prepare
620 - gnome2_src_prepare
621 -}
622 -
623 -multilib_src_configure() {
624 - local myconf=()
625 -
626 - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
627 - if use ppp; then
628 - local PPPD_VER=`best_version net-dialup/ppp`
629 - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
630 - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
631 - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
632 - fi
633 -
634 - # unit files directory needs to be passed only when systemd is enabled,
635 - # otherwise systemd support is not disabled completely, bug #524534
636 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
637 -
638 - if multilib_is_native_abi; then
639 - # work-around man out-of-source brokenness, must be done before configure
640 - mkdir man || die
641 - find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die
642 - else
643 - # libnl, libndp are only used for executables, not libraries
644 - myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' )
645 - fi
646 -
647 - # ifnet plugin always disabled until someone volunteers to actively
648 - # maintain and fix it
649 - # Also disable dhcpcd support as it's also completely unmaintained
650 - # and facing bugs like #563938 and many others
651 - #
652 - # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
653 - # still not ready for removing that lib
654 - ECONF_SOURCE=${S} \
655 - runstatedir="/run" \
656 - gnome2_src_configure \
657 - --disable-more-warnings \
658 - --disable-static \
659 - --localstatedir=/var \
660 - --disable-lto \
661 - --disable-config-plugin-ibft \
662 - --disable-ifnet \
663 - --disable-qt \
664 - --without-netconfig \
665 - --with-dbus-sys-dir=/etc/dbus-1/system.d \
666 - --with-libnm-glib \
667 - --with-nmcli=yes \
668 - --with-udev-dir="$(get_udevdir)" \
669 - --with-config-plugins-default=keyfile \
670 - --with-iptables=/sbin/iptables \
671 - $(multilib_native_with libsoup) \
672 - $(multilib_native_enable concheck) \
673 - --with-crypto=$(usex nss nss gnutls) \
674 - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \
675 - --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit upower)) \
676 - $(multilib_native_use_with audit libaudit) \
677 - $(multilib_native_use_enable bluetooth bluez5-dun) \
678 - $(multilib_native_use_enable introspection) \
679 - $(multilib_native_use_enable json json-validation) \
680 - $(multilib_native_use_enable ppp) \
681 - $(use_with dhclient) \
682 - --without-dhcpcd \
683 - $(multilib_native_use_with modemmanager modem-manager-1) \
684 - $(multilib_native_use_with ncurses nmtui) \
685 - $(multilib_native_use_with ofono) \
686 - $(multilib_native_use_with resolvconf) \
687 - $(multilib_native_use_with selinux) \
688 - $(multilib_native_use_with systemd systemd-journal) \
689 - $(multilib_native_use_enable teamd teamdctl) \
690 - $(multilib_native_use_enable test tests) \
691 - $(multilib_native_use_enable vala) \
692 - --without-valgrind \
693 - $(multilib_native_use_with wext) \
694 - $(multilib_native_use_enable wifi) \
695 - "${myconf[@]}"
696 -
697 - # work-around gtk-doc out-of-source brokedness
698 - if multilib_is_native_abi; then
699 - local d
700 - for d in api libnm libnm-util libnm-glib; do
701 - ln -s "${S}"/docs/${d}/html docs/${d}/html || die
702 - done
703 - fi
704 -
705 - # Disable examples
706 - # https://bugzilla.gnome.org/show_bug.cgi?id=769711
707 - cat > examples/Makefile <<-EOF
708 - .PHONY: all check install
709 - all:
710 - check:
711 - install:
712 - EOF
713 -}
714 -
715 -multilib_src_compile() {
716 - if multilib_is_native_abi; then
717 - emake
718 - else
719 - emake all-am
720 - emake -C shared
721 - emake -C introspection # generated headers, needed for libnm
722 - emake -C libnm-core
723 - emake -C libnm
724 - emake -C libnm-util
725 - emake -C libnm-glib
726 - fi
727 -}
728 -
729 -multilib_src_test() {
730 - if use test && multilib_is_native_abi; then
731 - python_setup
732 - virtx emake check
733 - fi
734 -}
735 -
736 -multilib_src_install() {
737 - if multilib_is_native_abi; then
738 - # Install completions at proper place, bug #465100
739 - gnome2_src_install completiondir="$(get_bashcompdir)"
740 - else
741 - emake DESTDIR="${D}" install-am
742 - emake DESTDIR="${D}" install -C shared
743 - emake DESTDIR="${D}" install -C introspection
744 - emake DESTDIR="${D}" install -C libnm-core
745 - emake DESTDIR="${D}" install -C libnm
746 - emake DESTDIR="${D}" install -C libnm-util
747 - emake DESTDIR="${D}" install -C libnm-glib
748 - fi
749 -}
750 -
751 -multilib_src_install_all() {
752 - ! use systemd && readme.gentoo_create_doc
753 -
754 - newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
755 - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
756 -
757 - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
758 - keepdir /etc/NetworkManager/dispatcher.d
759 -
760 - # Provide openrc net dependency only when nm is connected
761 - exeinto /etc/NetworkManager/dispatcher.d
762 - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
763 - sed -e "s:@EPREFIX@:${EPREFIX}:g" \
764 - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
765 -
766 - keepdir /etc/NetworkManager/system-connections
767 - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
768 -
769 - # Allow users in plugdev group to modify system connections
770 - insinto /usr/share/polkit-1/rules.d/
771 - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
772 -
773 - # Remove empty /run/NetworkManager
774 - rmdir "${D}"/run/NetworkManager "${D}"/run || die
775 -}
776 -
777 -pkg_postinst() {
778 - gnome2_pkg_postinst
779 - ! use systemd && readme.gentoo_print_elog
780 -
781 - if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
782 - ewarn "The ${PN} system configuration file has moved to a new location."
783 - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
784 - ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
785 - ewarn
786 - ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
787 - fi
788 -
789 - # The polkit rules file moved to /usr/share
790 - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
791 - if [[ -f "${old_rules}" ]]; then
792 - case "$(md5sum ${old_rules})" in
793 - 574d0cfa7e911b1f7792077003060240* )
794 - # Automatically delete the old rules.d file if the user did not change it
795 - elog
796 - elog "Removing old ${old_rules} ..."
797 - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
798 - ;;
799 - * )
800 - elog "The ${old_rules}"
801 - elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
802 - elog "If you edited ${old_rules}"
803 - elog "without changing its behavior, you may want to remove it."
804 - ;;
805 - esac
806 - fi
807 -
808 - # NM fallbacks to plugin specified at compile time (upstream bug #738611)
809 - # but still show a warning to remember people to have cleaner config file
810 - if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
811 - if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
812 - ewarn
813 - ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
814 - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
815 - ewarn
816 - fi
817 - fi
818 -
819 - # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
820 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
821 - ewarn "You have psk-flags=1 setting in above files, you will need to"
822 - ewarn "either reconfigure affected networks or, at least, set the flag"
823 - ewarn "value to '0'."
824 - fi
825 -}