1 |
commit: 48aca6748b3434e8e888f4f1d2c13a676bdd0264 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 20 10:20:15 2018 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 20 11:38:52 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48aca674 |
7 |
|
8 |
net-misc/networkmanager: Drop old |
9 |
|
10 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
net-misc/networkmanager/Manifest | 2 - |
14 |
.../networkmanager/networkmanager-1.12.2.ebuild | 341 --------------------- |
15 |
2 files changed, 343 deletions(-) |
16 |
|
17 |
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest |
18 |
index 86a9cbc33b0..96f550bf5a6 100644 |
19 |
--- a/net-misc/networkmanager/Manifest |
20 |
+++ b/net-misc/networkmanager/Manifest |
21 |
@@ -1,7 +1,5 @@ |
22 |
DIST NetworkManager-1.10.10.tar.xz 4038552 BLAKE2B a0a3c2a74dd641d25267ec7932f0801e30720334cb905c86abfaeb9bc3c60a2c1e9372b738b1eb43c55a34edf952905d94e3513cef653ea62e470d56bc575b65 SHA512 e536598b19064e0ab7fe3e92362de9c380281ff53a1481438216c2247b2d5287244e735be41c56c53040a5861bf36bbb979e36578244fabd6448a50ea42c4645 |
23 |
-DIST NetworkManager-1.12.2.tar.xz 4193776 BLAKE2B bc2b55f33e85dc8381eb18148cef02059e96abe1863da35af2b8f5671e3b2a4296eb1f9b79d864f3d0e6b362f7dbebdea4518a96d255acda9141b9ae95b49038 SHA512 cf5dae6ca8b6d3819a79485082f959907213d43413d15c41b79eb7da40edb913a41e7c18586b14bbf84f30ac493e2d9d466f5e66130c636f041ce939aaf49f35 |
24 |
DIST NetworkManager-1.12.4.tar.xz 4195812 BLAKE2B 11c59da430cdf6f70cc841d980e0bc0280244a1a1ee52311946f27c1f61ae23b14e115caba02c80738ef35d67eab6f1fadc1a0dee3250510d05fd1e90aed5ac1 SHA512 6fc891a6f8c3b4cc43449dabf0c025a9e706b723f602085f34cc93bda885c300de293004390c4926b95e26201b86d97ecd23160f82ef03e4d2b680f822c827c3 |
25 |
DIST NetworkManager-1.14.0.tar.xz 4389692 BLAKE2B 1d1b12764503d5f56d27f11449f3a0149491887312ed735c5cd25c0eeb6928fead30544d32cdd65262e00c4bdaed55dfb6dbc731c82de41ff8c49ff85937211e SHA512 cb0add2585c586ad36b4fb986a654de30047dc77f038927437156227f42622ac1045c58b76573f4e1acef22aa9f695da417f392a50fde70f4a086504701cecf1 |
26 |
DIST NetworkManager-1.14.2.tar.xz 4415068 BLAKE2B e33d385f907feb6ca7cae51aaa4a0c64e9f33d7f3c9ba11ca19ba71d0d9f1f9b05ab99eb10debb65d4d0bf9d76be7d1610d23dfe84a2718be353725d8d0a7c70 SHA512 f2c45138daf8124704d4f8ee3966da8a2b6c9a18bc51332d19c36d6d5bbd795c6f85f182c7816604fa5e8be7e6ee1daa62b26a868b731e7bc4d4b72e543d3646 |
27 |
DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1 |
28 |
-DIST networkmanager-1.12.2-patchset.tar.xz 4944 BLAKE2B 3ab6e395b4e13fd019fbcf851286f1cc8a08eff9d93891174c19949efe10390c69d9aaf6cdbe81f33503ec96838eb001eda67f6d1da034195327e172527cd72b SHA512 bdb22c42a8c53dce2f81ecfd026685240c8b790c44b0f13767ccfa0834cb2edec61ade69c828fb21c54ad3d37412e89b15f1fff4a98577a5bea460ba78d43bc3 |
29 |
|
30 |
diff --git a/net-misc/networkmanager/networkmanager-1.12.2.ebuild b/net-misc/networkmanager/networkmanager-1.12.2.ebuild |
31 |
deleted file mode 100644 |
32 |
index cdfd87acdf7..00000000000 |
33 |
--- a/net-misc/networkmanager/networkmanager-1.12.2.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,341 +0,0 @@ |
36 |
-# Copyright 1999-2018 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=6 |
40 |
-GNOME_ORG_MODULE="NetworkManager" |
41 |
-GNOME2_LA_PUNT="yes" |
42 |
-VALA_USE_DEPEND="vapigen" |
43 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
44 |
- |
45 |
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \ |
46 |
- user readme.gentoo-r1 vala virtualx udev multilib-minimal |
47 |
- |
48 |
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" |
49 |
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
50 |
-SRC_URI="${SRC_URI} https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
51 |
- |
52 |
-LICENSE="GPL-2+" |
53 |
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
54 |
- |
55 |
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
56 |
- |
57 |
-REQUIRED_USE=" |
58 |
- iwd? ( wifi ) |
59 |
- modemmanager? ( ppp ) |
60 |
- vala? ( introspection ) |
61 |
- wext? ( wifi ) |
62 |
- ^^ ( nss gnutls ) |
63 |
- ?? ( consolekit elogind systemd ) |
64 |
-" |
65 |
- |
66 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
67 |
- |
68 |
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300 |
69 |
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 |
70 |
-COMMON_DEPEND=" |
71 |
- >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] |
72 |
- >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] |
73 |
- >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] |
74 |
- policykit? ( >=sys-auth/polkit-0.106 ) |
75 |
- net-libs/libndp[${MULTILIB_USEDEP}] |
76 |
- >=net-misc/curl-7.24 |
77 |
- net-misc/iputils |
78 |
- sys-apps/util-linux[${MULTILIB_USEDEP}] |
79 |
- sys-libs/readline:0= |
80 |
- >=virtual/libudev-175:=[${MULTILIB_USEDEP}] |
81 |
- audit? ( sys-process/audit ) |
82 |
- bluetooth? ( >=net-wireless/bluez-5 ) |
83 |
- connection-sharing? ( |
84 |
- net-dns/dnsmasq[dbus,dhcp] |
85 |
- net-firewall/iptables ) |
86 |
- consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
87 |
- dhclient? ( >=net-misc/dhcp-4[client] ) |
88 |
- dhcpcd? ( net-misc/dhcpcd ) |
89 |
- elogind? ( >=sys-auth/elogind-219 ) |
90 |
- gnutls? ( |
91 |
- dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] |
92 |
- >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) |
93 |
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) |
94 |
- json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] ) |
95 |
- modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) |
96 |
- ncurses? ( >=dev-libs/newt-0.52.15 ) |
97 |
- nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) |
98 |
- ofono? ( net-misc/ofono ) |
99 |
- ovs? ( dev-libs/jansson ) |
100 |
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) |
101 |
- resolvconf? ( net-dns/openresolv ) |
102 |
- selinux? ( sys-libs/libselinux ) |
103 |
- systemd? ( >=sys-apps/systemd-209:0= ) |
104 |
- teamd? ( |
105 |
- dev-libs/jansson |
106 |
- >=net-misc/libteam-1.9 |
107 |
- ) |
108 |
-" |
109 |
-RDEPEND="${COMMON_DEPEND} |
110 |
- || ( |
111 |
- net-misc/iputils[arping(+)] |
112 |
- net-analyzer/arping |
113 |
- ) |
114 |
- wifi? ( |
115 |
- !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) |
116 |
- iwd? ( net-wireless/iwd ) |
117 |
- ) |
118 |
-" |
119 |
-DEPEND="${COMMON_DEPEND} |
120 |
- dev-util/gdbus-codegen |
121 |
- dev-util/glib-utils |
122 |
- dev-util/gtk-doc-am |
123 |
- >=dev-util/intltool-0.40 |
124 |
- >=sys-devel/gettext-0.17 |
125 |
- >=sys-kernel/linux-headers-2.6.29 |
126 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
127 |
- introspection? ( |
128 |
- $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') |
129 |
- dev-lang/perl |
130 |
- dev-libs/libxslt |
131 |
- ) |
132 |
- vala? ( $(vala_depend) ) |
133 |
- test? ( |
134 |
- $(python_gen_any_dep ' |
135 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
136 |
- dev-python/pygobject:3[${PYTHON_USEDEP}]') |
137 |
- ) |
138 |
-" |
139 |
- |
140 |
-PATCHES=( "${WORKDIR}"/patches/ ) # Selective patches from nm-1-12 branch, most importantly fix for NM_AVAILABLE_IN_1_12_2 macro, otherwise nm-applet and co fail to compile |
141 |
- |
142 |
-python_check_deps() { |
143 |
- if use introspection; then |
144 |
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return |
145 |
- fi |
146 |
- if use test; then |
147 |
- has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && |
148 |
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" |
149 |
- fi |
150 |
-} |
151 |
- |
152 |
-sysfs_deprecated_check() { |
153 |
- ebegin "Checking for SYSFS_DEPRECATED support" |
154 |
- |
155 |
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then |
156 |
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" |
157 |
- eerror "or NetworkManager will not work correctly." |
158 |
- eerror "See https://bugs.gentoo.org/333639 for more info." |
159 |
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" |
160 |
- fi |
161 |
- eend $? |
162 |
-} |
163 |
- |
164 |
-pkg_pretend() { |
165 |
- if use kernel_linux; then |
166 |
- get_version |
167 |
- if linux_config_exists; then |
168 |
- sysfs_deprecated_check |
169 |
- else |
170 |
- ewarn "Was unable to determine your kernel .config" |
171 |
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." |
172 |
- ewarn "See https://bugs.gentoo.org/333639 for more info." |
173 |
- fi |
174 |
- |
175 |
- fi |
176 |
-} |
177 |
- |
178 |
-pkg_setup() { |
179 |
- if use connection-sharing; then |
180 |
- CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" |
181 |
- linux-info_pkg_setup |
182 |
- fi |
183 |
- enewgroup plugdev |
184 |
- if use introspection || use test; then |
185 |
- python-any-r1_pkg_setup |
186 |
- fi |
187 |
-} |
188 |
- |
189 |
-src_prepare() { |
190 |
- DOC_CONTENTS="To modify system network connections without needing to enter the |
191 |
- root password, add your user account to the 'plugdev' group." |
192 |
- |
193 |
- use vala && vala_src_prepare |
194 |
- gnome2_src_prepare |
195 |
-} |
196 |
- |
197 |
-multilib_src_configure() { |
198 |
- local myconf=( |
199 |
- --disable-more-warnings |
200 |
- --disable-static |
201 |
- --localstatedir=/var |
202 |
- --disable-lto |
203 |
- --disable-config-plugin-ibft |
204 |
- --disable-qt |
205 |
- --without-netconfig |
206 |
- --with-dbus-sys-dir=/etc/dbus-1/system.d |
207 |
- # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are |
208 |
- # still not ready for removing that lib, bug #665338 |
209 |
- --with-libnm-glib |
210 |
- --with-nmcli=yes |
211 |
- --with-udev-dir="$(get_udevdir)" |
212 |
- --with-config-plugins-default=keyfile |
213 |
- --with-iptables=/sbin/iptables |
214 |
- $(multilib_native_enable concheck) |
215 |
- --with-crypto=$(usex nss nss gnutls) |
216 |
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) |
217 |
- --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
218 |
- $(multilib_native_use_with audit libaudit) |
219 |
- $(multilib_native_use_enable bluetooth bluez5-dun) |
220 |
- $(use_with dhclient) |
221 |
- $(use_with dhcpcd) |
222 |
- $(multilib_native_use_enable introspection) |
223 |
- $(use_enable json json-validation) |
224 |
- $(multilib_native_use_enable ppp) |
225 |
- --without-libpsl |
226 |
- $(multilib_native_use_with modemmanager modem-manager-1) |
227 |
- $(multilib_native_use_with ncurses nmtui) |
228 |
- $(multilib_native_use_with ofono) |
229 |
- $(multilib_native_use_enable ovs) |
230 |
- $(multilib_native_use_with resolvconf) |
231 |
- $(multilib_native_use_with selinux) |
232 |
- $(multilib_native_use_with systemd systemd-journal) |
233 |
- $(multilib_native_use_enable teamd teamdctl) |
234 |
- $(multilib_native_use_enable test tests) |
235 |
- $(multilib_native_use_enable vala) |
236 |
- --without-valgrind |
237 |
- $(multilib_native_use_with wifi iwd) |
238 |
- $(multilib_native_use_with wext) |
239 |
- $(multilib_native_use_enable wifi) |
240 |
- ) |
241 |
- |
242 |
- if multilib_is_native_abi && use policykit; then |
243 |
- myconf+=( --enable-polkit=yes ) |
244 |
- else |
245 |
- myconf+=( --enable-polkit=disabled ) |
246 |
- fi |
247 |
- |
248 |
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
249 |
- if use ppp; then |
250 |
- local PPPD_VER=`best_version net-dialup/ppp` |
251 |
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} |
252 |
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision |
253 |
- myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) |
254 |
- fi |
255 |
- |
256 |
- # unit files directory needs to be passed only when systemd is enabled, |
257 |
- # otherwise systemd support is not disabled completely, bug #524534 |
258 |
- use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) |
259 |
- |
260 |
- if multilib_is_native_abi; then |
261 |
- # work-around man out-of-source brokenness, must be done before configure |
262 |
- ln -s "${S}/docs" docs || die |
263 |
- ln -s "${S}/man" man || die |
264 |
- fi |
265 |
- |
266 |
- ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}" |
267 |
-} |
268 |
- |
269 |
-multilib_src_compile() { |
270 |
- if multilib_is_native_abi; then |
271 |
- emake |
272 |
- else |
273 |
- local targets=( |
274 |
- libnm/libnm.la |
275 |
- libnm-util/libnm-util.la |
276 |
- libnm-glib/libnm-glib.la |
277 |
- libnm-glib/libnm-glib-vpn.la |
278 |
- ) |
279 |
- emake "${targets[@]}" |
280 |
- fi |
281 |
-} |
282 |
- |
283 |
-multilib_src_test() { |
284 |
- if use test && multilib_is_native_abi; then |
285 |
- python_setup |
286 |
- virtx emake check |
287 |
- fi |
288 |
-} |
289 |
- |
290 |
-multilib_src_install() { |
291 |
- if multilib_is_native_abi; then |
292 |
- # Install completions at proper place, bug #465100 |
293 |
- gnome2_src_install completiondir="$(get_bashcompdir)" |
294 |
- else |
295 |
- local targets=( |
296 |
- install-libLTLIBRARIES |
297 |
- install-libdeprecatedHEADERS |
298 |
- install-libnm_glib_libnmvpnHEADERS |
299 |
- install-libnm_glib_libnmincludeHEADERS |
300 |
- install-libnm_util_libnm_util_includeHEADERS |
301 |
- install-libnmincludeHEADERS |
302 |
- install-nodist_libnm_glib_libnmincludeHEADERS |
303 |
- install-nodist_libnm_glib_libnmvpnHEADERS |
304 |
- install-nodist_libnm_util_libnm_util_includeHEADERS |
305 |
- install-nodist_libnmincludeHEADERS |
306 |
- install-pkgconfigDATA |
307 |
- ) |
308 |
- emake DESTDIR="${D}" "${targets[@]}" |
309 |
- fi |
310 |
-} |
311 |
- |
312 |
-multilib_src_install_all() { |
313 |
- ! use systemd && readme.gentoo_create_doc |
314 |
- |
315 |
- newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager |
316 |
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager |
317 |
- |
318 |
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts |
319 |
- keepdir /etc/NetworkManager/dispatcher.d |
320 |
- |
321 |
- # Provide openrc net dependency only when nm is connected |
322 |
- exeinto /etc/NetworkManager/dispatcher.d |
323 |
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status |
324 |
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \ |
325 |
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die |
326 |
- |
327 |
- keepdir /etc/NetworkManager/system-connections |
328 |
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 |
329 |
- |
330 |
- # Allow users in plugdev group to modify system connections |
331 |
- insinto /usr/share/polkit-1/rules.d/ |
332 |
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
333 |
- |
334 |
- if use iwd; then |
335 |
- # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir |
336 |
- cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf |
337 |
- [device] |
338 |
- wifi.backend=iwd |
339 |
- EOF |
340 |
- fi |
341 |
- |
342 |
- # Empty |
343 |
- rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die |
344 |
-} |
345 |
- |
346 |
-pkg_postinst() { |
347 |
- gnome2_pkg_postinst |
348 |
- systemd_reenable NetworkManager.service |
349 |
- ! use systemd && readme.gentoo_print_elog |
350 |
- |
351 |
- if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then |
352 |
- ewarn "The ${PN} system configuration file has moved to a new location." |
353 |
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" |
354 |
- ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" |
355 |
- ewarn |
356 |
- ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" |
357 |
- fi |
358 |
- |
359 |
- # NM fallbacks to plugin specified at compile time (upstream bug #738611) |
360 |
- # but still show a warning to remember people to have cleaner config file |
361 |
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then |
362 |
- if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then |
363 |
- ewarn |
364 |
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" |
365 |
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." |
366 |
- ewarn |
367 |
- fi |
368 |
- fi |
369 |
- |
370 |
- # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457 |
371 |
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then |
372 |
- ewarn "You have psk-flags=1 setting in above files, you will need to" |
373 |
- ewarn "either reconfigure affected networks or, at least, set the flag" |
374 |
- ewarn "value to '0'." |
375 |
- fi |
376 |
-} |