1 |
commit: 491e2a1344652614617030924d85556868125a74 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 3 11:52:34 2015 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 3 11:52:59 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=491e2a13 |
7 |
|
8 |
net-misc/networkmanager: Drop old |
9 |
|
10 |
Package-Manager: portage-2.2.22 |
11 |
|
12 |
net-misc/networkmanager/Manifest | 1 - |
13 |
.../networkmanager/networkmanager-1.0.4-r1.ebuild | 342 --------------------- |
14 |
2 files changed, 343 deletions(-) |
15 |
|
16 |
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest |
17 |
index 3d6b3b9..409c529 100644 |
18 |
--- a/net-misc/networkmanager/Manifest |
19 |
+++ b/net-misc/networkmanager/Manifest |
20 |
@@ -1,3 +1,2 @@ |
21 |
DIST NetworkManager-1.0.2.tar.xz 3210588 SHA256 359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff SHA512 9c5884c75c2a2aae478d99bde4ecbb0dc4293b3f50dcf78a1579aa13e09ab95b01981a366f1dc58cd5d02fe77dc90fc0941f00142cd5ef1cea14c3b9d89f5c36 WHIRLPOOL 0a9f4bc6cc0f176bfc1c82294b45392c86b6d6a65cefe38fc80fce8f09584f275a23163d1909dfde9427405fe7b4086b8e2bc4995eded4cf441b8024fa00657d |
22 |
-DIST NetworkManager-1.0.4.tar.xz 3364168 SHA256 e4099fa2f4f4b8d95d0ad9fdd03ec20960845085fa500bf79aecbf54cee018c9 SHA512 b07583ca654a95dc018a712626ba0065c2ff5d9904b326891be684b32526f360f287b46cbd11026277a385558c1b55e38a086ae2b0aab059b63a4f3e11566cb1 WHIRLPOOL d6a612a855e216b7b46c620a85ceb3b3893029cf83bb9699ed0ba1c2d349abdeb4ee8921155216fb8285ac369cea64704836984e86bbf3813d8287b4803fc49a |
23 |
DIST NetworkManager-1.0.6.tar.xz 3381092 SHA256 38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd SHA512 74e8f91bbd9a70f1764b06c729717e091d2be0a8e316fe1b6235e644b65f43add5214be7a1100fe9d30b1511f4a00b9892dce79bb8ba0f0b0d57089d2ba6ddbb WHIRLPOOL 5f1d8c905e4aaa78c742c16e773f8fdbcdb2771edf36565f6b419af457776084573aa43b384ba32885992e76b399d4f2fc7dc94ad4295ac28dcfa3d6b6994b97 |
24 |
|
25 |
diff --git a/net-misc/networkmanager/networkmanager-1.0.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.0.4-r1.ebuild |
26 |
deleted file mode 100644 |
27 |
index 3d133d3..0000000 |
28 |
--- a/net-misc/networkmanager/networkmanager-1.0.4-r1.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,342 +0,0 @@ |
31 |
-# Copyright 1999-2015 Gentoo Foundation |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
-# $Id$ |
34 |
- |
35 |
-EAPI="5" |
36 |
-GCONF_DEBUG="no" |
37 |
-GNOME_ORG_MODULE="NetworkManager" |
38 |
-GNOME2_LA_PUNT="yes" |
39 |
-VALA_USE_DEPEND="vapigen" |
40 |
-PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
41 |
- |
42 |
-inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \ |
43 |
- user readme.gentoo toolchain-funcs vala versionator virtualx udev multilib-minimal |
44 |
- |
45 |
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts" |
46 |
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
47 |
- |
48 |
-LICENSE="GPL-2+" |
49 |
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
50 |
- |
51 |
-IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \ |
52 |
-kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \ |
53 |
-vala +wext +wifi zeroconf" # wimax |
54 |
- |
55 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" |
56 |
- |
57 |
-REQUIRED_USE=" |
58 |
- modemmanager? ( ppp ) |
59 |
- wext? ( wifi ) |
60 |
- ^^ ( nss gnutls ) |
61 |
- ^^ ( dhclient dhcpcd ) |
62 |
-" |
63 |
- |
64 |
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300 |
65 |
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 |
66 |
-# TODO: Qt support? |
67 |
-COMMON_DEPEND=" |
68 |
- >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] |
69 |
- >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] |
70 |
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}] |
71 |
- >=dev-libs/libnl-3.2.8:3= |
72 |
- >=sys-auth/polkit-0.106 |
73 |
- net-libs/libndp |
74 |
- >=net-libs/libsoup-2.26:2.4= |
75 |
- net-misc/iputils |
76 |
- sys-libs/readline:0 |
77 |
- >=virtual/libgudev-165:=[${MULTILIB_USEDEP}] |
78 |
- bluetooth? ( >=net-wireless/bluez-5 ) |
79 |
- connection-sharing? ( |
80 |
- net-dns/dnsmasq[dhcp] |
81 |
- net-firewall/iptables ) |
82 |
- gnutls? ( |
83 |
- dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] |
84 |
- net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
85 |
- modemmanager? ( >=net-misc/modemmanager-0.7.991 ) |
86 |
- ncurses? ( >=dev-libs/newt-0.52.15 ) |
87 |
- nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) |
88 |
- dhclient? ( >=net-misc/dhcp-4[client] ) |
89 |
- dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) |
90 |
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) |
91 |
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe ) |
92 |
- resolvconf? ( net-dns/openresolv ) |
93 |
- systemd? ( >=sys-apps/systemd-209:0= ) |
94 |
- !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) |
95 |
- teamd? ( >=net-misc/libteam-1.9 ) |
96 |
- zeroconf? ( net-dns/avahi:=[autoipd] ) |
97 |
-" |
98 |
-RDEPEND="${COMMON_DEPEND} |
99 |
- consolekit? ( sys-auth/consolekit ) |
100 |
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) |
101 |
-" |
102 |
-DEPEND="${COMMON_DEPEND} |
103 |
- dev-util/gdbus-codegen |
104 |
- dev-util/gtk-doc-am |
105 |
- >=dev-util/intltool-0.40 |
106 |
- >=sys-devel/gettext-0.17 |
107 |
- >=sys-kernel/linux-headers-2.6.29 |
108 |
- virtual/pkgconfig |
109 |
- vala? ( $(vala_depend) ) |
110 |
- test? ( |
111 |
- $(python_gen_any_dep ' |
112 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
113 |
- dev-python/pygobject:2[${PYTHON_USEDEP}]') |
114 |
- ) |
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 |
- enewgroup plugdev |
145 |
-} |
146 |
- |
147 |
-src_prepare() { |
148 |
- DOC_CONTENTS="To modify system network connections without needing to enter the |
149 |
- root password, add your user account to the 'plugdev' group." |
150 |
- |
151 |
- # Force use of /run, avoid eautoreconf, upstream bug #737139, fixed in 'master' |
152 |
- sed -e 's:$localstatedir/run/:/run/:' -i configure || die |
153 |
- |
154 |
- use vala && vala_src_prepare |
155 |
- |
156 |
- epatch_user # don't remove, users often want custom patches for NM |
157 |
- |
158 |
- eautoreconf |
159 |
- |
160 |
- gnome2_src_prepare |
161 |
-} |
162 |
- |
163 |
-multilib_src_configure() { |
164 |
- local myconf=() |
165 |
- |
166 |
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
167 |
- if use ppp; then |
168 |
- local PPPD_VER=`best_version net-dialup/ppp` |
169 |
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} |
170 |
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision |
171 |
- myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) |
172 |
- fi |
173 |
- |
174 |
- # unit files directory needs to be passed only when systemd is enabled, |
175 |
- # otherwise systemd support is not disabled completely, bug #524534 |
176 |
- use systemd && myconf+=( "$(systemd_with_unitdir)" ) |
177 |
- |
178 |
- if multilib_is_native_abi; then |
179 |
- # work-around man out-of-source brokenness, must be done before configure |
180 |
- mkdir man || die |
181 |
- find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die |
182 |
- else |
183 |
- # libnl, libndp are only used for executables, not libraries |
184 |
- myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' ) |
185 |
- fi |
186 |
- |
187 |
- # TODO: enable wimax when we have a libnl:3 compatible revision of it |
188 |
- # wimax will be removed, bug #522822 |
189 |
- # ifnet plugin always disabled until someone volunteers to actively |
190 |
- # maintain and fix it |
191 |
- ECONF_SOURCE=${S} \ |
192 |
- gnome2_src_configure \ |
193 |
- --disable-more-warnings \ |
194 |
- --disable-static \ |
195 |
- --localstatedir=/var \ |
196 |
- --disable-lto \ |
197 |
- --disable-config-plugin-ibft \ |
198 |
- --disable-ifnet \ |
199 |
- --without-netconfig \ |
200 |
- --with-dbus-sys-dir=/etc/dbus-1/system.d \ |
201 |
- --with-udev-dir="$(get_udevdir)" \ |
202 |
- --with-config-plugins-default=keyfile \ |
203 |
- --with-iptables=/sbin/iptables \ |
204 |
- $(multilib_native_with libsoup) \ |
205 |
- $(multilib_native_enable concheck) \ |
206 |
- --with-crypto=$(usex nss nss gnutls) \ |
207 |
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \ |
208 |
- --with-suspend-resume=$(multilib_native_usex systemd systemd upower) \ |
209 |
- $(multilib_native_use_enable bluetooth bluez5-dun) \ |
210 |
- $(multilib_native_use_enable introspection) \ |
211 |
- $(multilib_native_use_enable ppp) \ |
212 |
- --disable-wimax \ |
213 |
- $(use_with dhclient) \ |
214 |
- $(use_with dhcpcd) \ |
215 |
- $(multilib_native_use_with modemmanager modem-manager-1) \ |
216 |
- $(multilib_native_use_with ncurses nmtui) \ |
217 |
- $(multilib_native_use_with resolvconf) \ |
218 |
- $(multilib_native_use_with selinux) \ |
219 |
- $(multilib_native_use_enable teamd teamdctl) \ |
220 |
- $(multilib_native_use_enable test tests) \ |
221 |
- $(multilib_native_use_enable vala) \ |
222 |
- --without-valgrind \ |
223 |
- $(multilib_native_use_with wext) \ |
224 |
- $(multilib_native_use_enable wifi) \ |
225 |
- "${myconf[@]}" |
226 |
- |
227 |
- # work-around gtk-doc out-of-source brokedness |
228 |
- if multilib_is_native_abi; then |
229 |
- local d |
230 |
- for d in api libnm libnm-util libnm-glib; do |
231 |
- ln -s "${S}"/docs/${d}/html docs/${d}/html || die |
232 |
- done |
233 |
- fi |
234 |
-} |
235 |
- |
236 |
-multilib_src_compile() { |
237 |
- if multilib_is_native_abi; then |
238 |
- emake |
239 |
- else |
240 |
- emake all-am |
241 |
- emake -C include |
242 |
- emake -C introspection # generated headers, needed for libnm |
243 |
- emake -C libnm-core |
244 |
- emake -C libnm |
245 |
- emake -C libnm-util |
246 |
- emake -C libnm-glib |
247 |
- fi |
248 |
-} |
249 |
- |
250 |
-multilib_src_test() { |
251 |
- if multilib_is_native_abi; then |
252 |
- python_setup |
253 |
- Xemake check |
254 |
- fi |
255 |
-} |
256 |
- |
257 |
-multilib_src_install() { |
258 |
- if multilib_is_native_abi; then |
259 |
- # Install completions at proper place, bug #465100 |
260 |
- gnome2_src_install completiondir="$(get_bashcompdir)" |
261 |
- else |
262 |
- emake DESTDIR="${D}" install-am |
263 |
- emake DESTDIR="${D}" install -C include |
264 |
- emake DESTDIR="${D}" install -C introspection |
265 |
- emake DESTDIR="${D}" install -C libnm-core |
266 |
- emake DESTDIR="${D}" install -C libnm |
267 |
- emake DESTDIR="${D}" install -C libnm-util |
268 |
- emake DESTDIR="${D}" install -C libnm-glib |
269 |
- fi |
270 |
-} |
271 |
- |
272 |
-multilib_src_install_all() { |
273 |
- ! use systemd && readme.gentoo_create_doc |
274 |
- |
275 |
- newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager |
276 |
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager |
277 |
- |
278 |
- # /var/run/NetworkManager is used by some distros, but not by Gentoo |
279 |
- rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed" |
280 |
- rmdir -v "${ED}/var/run" || die "rmdir failed" |
281 |
- |
282 |
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts |
283 |
- keepdir /etc/NetworkManager/dispatcher.d |
284 |
- |
285 |
- # Provide openrc net dependency only when nm is connected |
286 |
- exeinto /etc/NetworkManager/dispatcher.d |
287 |
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status |
288 |
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \ |
289 |
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die |
290 |
- |
291 |
- keepdir /etc/NetworkManager/system-connections |
292 |
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765 |
293 |
- |
294 |
- # Allow users in plugdev group to modify system connections |
295 |
- insinto /usr/share/polkit-1/rules.d/ |
296 |
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
297 |
-} |
298 |
- |
299 |
-pkg_postinst() { |
300 |
- gnome2_pkg_postinst |
301 |
- ! use systemd && readme.gentoo_print_elog |
302 |
- |
303 |
- if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then |
304 |
- ewarn "The ${PN} system configuration file has moved to a new location." |
305 |
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" |
306 |
- ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" |
307 |
- ewarn |
308 |
- ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" |
309 |
- fi |
310 |
- |
311 |
- # The polkit rules file moved to /usr/share |
312 |
- old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
313 |
- if [[ -f "${old_rules}" ]]; then |
314 |
- case "$(md5sum ${old_rules})" in |
315 |
- 574d0cfa7e911b1f7792077003060240* ) |
316 |
- # Automatically delete the old rules.d file if the user did not change it |
317 |
- elog |
318 |
- elog "Removing old ${old_rules} ..." |
319 |
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually" |
320 |
- ;; |
321 |
- * ) |
322 |
- elog "The ${old_rules}" |
323 |
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4" |
324 |
- elog "If you edited ${old_rules}" |
325 |
- elog "without changing its behavior, you may want to remove it." |
326 |
- ;; |
327 |
- esac |
328 |
- fi |
329 |
- |
330 |
- # ifnet plugin was disabled for systemd users with 0.9.8.6 version |
331 |
- # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations) |
332 |
- if use systemd; then |
333 |
- if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then |
334 |
- ewarn "Ifnet plugin won't be used with systemd support enabled" |
335 |
- ewarn "as it is meant to be used with openRC and can cause collisions" |
336 |
- ewarn "(like bug #485658)." |
337 |
- ewarn "Because of this, you will likely need to reconfigure some of" |
338 |
- ewarn "your networks. To do this you can rely on Gnome control center," |
339 |
- ewarn "nm-connection-editor or nmtui tools for example once updated" |
340 |
- ewarn "NetworkManager version is installed." |
341 |
- fi |
342 |
- else |
343 |
- if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then |
344 |
- ewarn "Ifnet plugin is now disabled because of it being unattended" |
345 |
- ewarn "and unmaintained for a long time, leading to some unfixed bugs" |
346 |
- ewarn "and new problems appearing. We will now use upstream 'keyfile'" |
347 |
- ewarn "plugin." |
348 |
- ewarn "Because of this, you will likely need to reconfigure some of" |
349 |
- ewarn "your networks. To do this you can rely on Gnome control center," |
350 |
- ewarn "nm-connection-editor or nmtui tools for example once updated" |
351 |
- ewarn "NetworkManager version is installed." |
352 |
- fi |
353 |
- fi |
354 |
- |
355 |
- # NM fallbacks to plugin specified at compile time (upstream bug #738611) |
356 |
- # but still show a warning to remember people to have cleaner config file |
357 |
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then |
358 |
- if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then |
359 |
- ewarn |
360 |
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" |
361 |
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." |
362 |
- ewarn |
363 |
- fi |
364 |
- fi |
365 |
- |
366 |
- # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457 |
367 |
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then |
368 |
- ewarn "You have psk-flags=1 setting in above files, you will need to" |
369 |
- ewarn "either reconfigure affected networks or, at least, set the flag" |
370 |
- ewarn "value to '0'." |
371 |
- fi |
372 |
-} |