Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager/
Date: Thu, 16 Feb 2017 00:18:08
Message-Id: 1487204103.d28020641762b90489e1b980f81fd541199a8f2f.leio@gentoo
1 commit: d28020641762b90489e1b980f81fd541199a8f2f
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 15 23:21:29 2017 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 16 00:15:03 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2802064
7
8 net-misc/networkmanager: remove old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 .../networkmanager/networkmanager-1.4.4.ebuild | 342 ---------------------
13 1 file changed, 342 deletions(-)
14
15 diff --git a/net-misc/networkmanager/networkmanager-1.4.4.ebuild b/net-misc/networkmanager/networkmanager-1.4.4.ebuild
16 deleted file mode 100644
17 index 54a3cb4733..0000000000
18 --- a/net-misc/networkmanager/networkmanager-1.4.4.ebuild
19 +++ /dev/null
20 @@ -1,342 +0,0 @@
21 -# Copyright 1999-2017 Gentoo Foundation
22 -# Distributed under the terms of the GNU General Public License v2
23 -# $Id$
24 -
25 -EAPI=6
26 -GNOME_ORG_MODULE="NetworkManager"
27 -GNOME2_LA_PUNT="yes"
28 -VALA_USE_DEPEND="vapigen"
29 -PYTHON_COMPAT=( python{2_7,3_4,3_5} )
30 -
31 -inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
32 - user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
33 -
34 -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
35 -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
36 -
37 -LICENSE="GPL-2+"
38 -SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
39 -
40 -IUSE="audit bluetooth connection-sharing consolekit +dhclient gnutls +introspection \
41 -json kernel_linux +nss +modemmanager ncurses ofono +ppp resolvconf selinux \
42 -systemd teamd test vala +wext +wifi"
43 -
44 -REQUIRED_USE="
45 - modemmanager? ( ppp )
46 - vala? ( introspection )
47 - wext? ( wifi )
48 - ^^ ( nss gnutls )
49 -"
50 -
51 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
52 -
53 -# gobject-introspection-0.10.3 is needed due to gnome bug 642300
54 -# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
55 -# TODO: need multilib janson (linked to libnm.so)
56 -COMMON_DEPEND="
57 - >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
58 - >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
59 - >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
60 - >=dev-libs/libnl-3.2.8:3=
61 - >=sys-auth/polkit-0.106
62 - net-libs/libndp
63 - >=net-libs/libsoup-2.40:2.4=
64 - net-misc/iputils
65 - sys-apps/util-linux[${MULTILIB_USEDEP}]
66 - sys-libs/readline:0=
67 - >=virtual/libgudev-165:=[${MULTILIB_USEDEP}]
68 - audit? ( sys-process/audit )
69 - bluetooth? ( >=net-wireless/bluez-5 )
70 - connection-sharing? (
71 - net-dns/dnsmasq[dhcp]
72 - net-firewall/iptables )
73 - consolekit? ( >=sys-auth/consolekit-1.0.0 )
74 - dhclient? ( >=net-misc/dhcp-4[client] )
75 - gnutls? (
76 - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
77 - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
78 - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
79 - json? ( dev-libs/jansson )
80 - modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
81 - ncurses? ( >=dev-libs/newt-0.52.15 )
82 - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
83 - ofono? ( net-misc/ofono )
84 - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
85 - resolvconf? ( net-dns/openresolv )
86 - selinux? ( sys-libs/libselinux )
87 - systemd? ( >=sys-apps/systemd-209:0= )
88 - teamd? ( >=net-misc/libteam-1.9 )
89 -"
90 -RDEPEND="${COMMON_DEPEND}
91 - wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
92 -"
93 -DEPEND="${COMMON_DEPEND}
94 - dev-util/gdbus-codegen
95 - dev-util/gtk-doc-am
96 - >=dev-util/intltool-0.40
97 - >=sys-devel/gettext-0.17
98 - >=sys-kernel/linux-headers-2.6.29
99 - virtual/pkgconfig[${MULTILIB_USEDEP}]
100 - vala? ( $(vala_depend) )
101 - test? (
102 - $(python_gen_any_dep '
103 - dev-python/dbus-python[${PYTHON_USEDEP}]
104 - dev-python/pygobject:3[${PYTHON_USEDEP}]')
105 - )
106 -"
107 -
108 -python_check_deps() {
109 - if use test; then
110 - has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
111 - has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
112 - else
113 - return 0
114 - fi
115 -}
116 -
117 -sysfs_deprecated_check() {
118 - ebegin "Checking for SYSFS_DEPRECATED support"
119 -
120 - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
121 - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
122 - eerror "or NetworkManager will not work correctly."
123 - eerror "See https://bugs.gentoo.org/333639 for more info."
124 - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
125 - fi
126 - eend $?
127 -}
128 -
129 -pkg_pretend() {
130 - if use kernel_linux; then
131 - get_version
132 - if linux_config_exists; then
133 - sysfs_deprecated_check
134 - else
135 - ewarn "Was unable to determine your kernel .config"
136 - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
137 - ewarn "See https://bugs.gentoo.org/333639 for more info."
138 - fi
139 -
140 - fi
141 -}
142 -
143 -pkg_setup() {
144 - if use connection-sharing; then
145 - CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
146 - linux-info_pkg_setup
147 - fi
148 - enewgroup plugdev
149 - use test && python-any-r1_pkg_setup
150 -}
151 -
152 -src_prepare() {
153 - DOC_CONTENTS="To modify system network connections without needing to enter the
154 - root password, add your user account to the 'plugdev' group."
155 -
156 - use vala && vala_src_prepare
157 - gnome2_src_prepare
158 -}
159 -
160 -multilib_src_configure() {
161 - local myconf=()
162 -
163 - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
164 - if use ppp; then
165 - local PPPD_VER=`best_version net-dialup/ppp`
166 - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
167 - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
168 - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
169 - fi
170 -
171 - # unit files directory needs to be passed only when systemd is enabled,
172 - # otherwise systemd support is not disabled completely, bug #524534
173 - use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
174 -
175 - if multilib_is_native_abi; then
176 - # work-around man out-of-source brokenness, must be done before configure
177 - mkdir man || die
178 - find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die
179 - else
180 - # libnl, libndp are only used for executables, not libraries
181 - myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' )
182 - fi
183 -
184 - # ifnet plugin always disabled until someone volunteers to actively
185 - # maintain and fix it
186 - # Also disable dhcpcd support as it's also completely unmaintained
187 - # and facing bugs like #563938 and many others
188 - #
189 - # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
190 - # still not ready for removing that lib
191 - ECONF_SOURCE=${S} \
192 - runstatedir="/run" \
193 - gnome2_src_configure \
194 - --disable-more-warnings \
195 - --disable-static \
196 - --localstatedir=/var \
197 - --disable-lto \
198 - --disable-config-plugin-ibft \
199 - --disable-ifnet \
200 - --disable-qt \
201 - --without-netconfig \
202 - --with-dbus-sys-dir=/etc/dbus-1/system.d \
203 - --with-libnm-glib \
204 - --with-nmcli=yes \
205 - --with-udev-dir="$(get_udevdir)" \
206 - --with-config-plugins-default=keyfile \
207 - --with-iptables=/sbin/iptables \
208 - $(multilib_native_with libsoup) \
209 - $(multilib_native_enable concheck) \
210 - --with-crypto=$(usex nss nss gnutls) \
211 - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \
212 - --with-suspend-resume=$(multilib_native_usex systemd systemd consolekit) \
213 - $(multilib_native_use_with audit libaudit) \
214 - $(multilib_native_use_enable bluetooth bluez5-dun) \
215 - $(multilib_native_use_enable introspection) \
216 - $(multilib_native_use_enable json json-validation) \
217 - $(multilib_native_use_enable ppp) \
218 - $(use_with dhclient) \
219 - --without-dhcpcd \
220 - $(multilib_native_use_with modemmanager modem-manager-1) \
221 - $(multilib_native_use_with ncurses nmtui) \
222 - $(multilib_native_use_with ofono) \
223 - $(multilib_native_use_with resolvconf) \
224 - $(multilib_native_use_with selinux) \
225 - $(multilib_native_use_with systemd systemd-journal) \
226 - $(multilib_native_use_enable teamd teamdctl) \
227 - $(multilib_native_use_enable test tests) \
228 - $(multilib_native_use_enable vala) \
229 - --without-valgrind \
230 - $(multilib_native_use_with wext) \
231 - $(multilib_native_use_enable wifi) \
232 - "${myconf[@]}"
233 -
234 - # work-around gtk-doc out-of-source brokedness
235 - if multilib_is_native_abi; then
236 - local d
237 - for d in api libnm libnm-util libnm-glib; do
238 - ln -s "${S}"/docs/${d}/html docs/${d}/html || die
239 - done
240 - fi
241 -
242 - # Disable examples
243 - # https://bugzilla.gnome.org/show_bug.cgi?id=769711
244 - cat > examples/Makefile <<-EOF
245 - .PHONY: all check install
246 - all:
247 - check:
248 - install:
249 - EOF
250 -}
251 -
252 -multilib_src_compile() {
253 - if multilib_is_native_abi; then
254 - emake
255 - else
256 - emake all-am
257 - emake -C shared
258 - emake -C introspection # generated headers, needed for libnm
259 - emake -C libnm-core
260 - emake -C libnm
261 - emake -C libnm-util
262 - emake -C libnm-glib
263 - fi
264 -}
265 -
266 -multilib_src_test() {
267 - if use test && multilib_is_native_abi; then
268 - python_setup
269 - virtx emake check
270 - fi
271 -}
272 -
273 -multilib_src_install() {
274 - if multilib_is_native_abi; then
275 - # Install completions at proper place, bug #465100
276 - gnome2_src_install completiondir="$(get_bashcompdir)"
277 - else
278 - emake DESTDIR="${D}" install-am
279 - emake DESTDIR="${D}" install -C shared
280 - emake DESTDIR="${D}" install -C introspection
281 - emake DESTDIR="${D}" install -C libnm-core
282 - emake DESTDIR="${D}" install -C libnm
283 - emake DESTDIR="${D}" install -C libnm-util
284 - emake DESTDIR="${D}" install -C libnm-glib
285 - fi
286 -}
287 -
288 -multilib_src_install_all() {
289 - ! use systemd && readme.gentoo_create_doc
290 -
291 - newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
292 - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
293 -
294 - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
295 - keepdir /etc/NetworkManager/dispatcher.d
296 -
297 - # Provide openrc net dependency only when nm is connected
298 - exeinto /etc/NetworkManager/dispatcher.d
299 - newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
300 - sed -e "s:@EPREFIX@:${EPREFIX}:g" \
301 - -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
302 -
303 - keepdir /etc/NetworkManager/system-connections
304 - chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
305 -
306 - # Allow users in plugdev group to modify system connections
307 - insinto /usr/share/polkit-1/rules.d/
308 - doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
309 -
310 - # Remove empty /run/NetworkManager
311 - rmdir "${D}"/run/NetworkManager "${D}"/run || die
312 -}
313 -
314 -pkg_postinst() {
315 - gnome2_pkg_postinst
316 - ! use systemd && readme.gentoo_print_elog
317 -
318 - if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
319 - ewarn "The ${PN} system configuration file has moved to a new location."
320 - ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
321 - ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
322 - ewarn
323 - ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
324 - fi
325 -
326 - # The polkit rules file moved to /usr/share
327 - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
328 - if [[ -f "${old_rules}" ]]; then
329 - case "$(md5sum ${old_rules})" in
330 - 574d0cfa7e911b1f7792077003060240* )
331 - # Automatically delete the old rules.d file if the user did not change it
332 - elog
333 - elog "Removing old ${old_rules} ..."
334 - rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
335 - ;;
336 - * )
337 - elog "The ${old_rules}"
338 - elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
339 - elog "If you edited ${old_rules}"
340 - elog "without changing its behavior, you may want to remove it."
341 - ;;
342 - esac
343 - fi
344 -
345 - # NM fallbacks to plugin specified at compile time (upstream bug #738611)
346 - # but still show a warning to remember people to have cleaner config file
347 - if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
348 - if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
349 - ewarn
350 - ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
351 - ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
352 - ewarn
353 - fi
354 - fi
355 -
356 - # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
357 - if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
358 - ewarn "You have psk-flags=1 setting in above files, you will need to"
359 - ewarn "either reconfigure affected networks or, at least, set the flag"
360 - ewarn "value to '0'."
361 - fi
362 -}