1 |
mgorny 14/11/30 10:16:14 |
2 |
|
3 |
Modified: networkmanager-0.9.10.1_pre20141101.ebuild |
4 |
ChangeLog |
5 |
Log: |
6 |
Use python-any-r1 for the Python dep. |
7 |
|
8 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
9 |
|
10 |
Revision Changes Path |
11 |
1.4 net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild?rev=1.4&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild?rev=1.4&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild?r1=1.3&r2=1.4 |
16 |
|
17 |
Index: networkmanager-0.9.10.1_pre20141101.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild,v |
20 |
retrieving revision 1.3 |
21 |
retrieving revision 1.4 |
22 |
diff -u -r1.3 -r1.4 |
23 |
--- networkmanager-0.9.10.1_pre20141101.ebuild 27 Nov 2014 10:09:39 -0000 1.3 |
24 |
+++ networkmanager-0.9.10.1_pre20141101.ebuild 30 Nov 2014 10:16:14 -0000 1.4 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2014 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild,v 1.3 2014/11/27 10:09:39 pacho Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild,v 1.4 2014/11/30 10:16:14 mgorny Exp $ |
30 |
|
31 |
EAPI="5" |
32 |
GCONF_DEBUG="no" |
33 |
@@ -9,7 +9,9 @@ |
34 |
VALA_MIN_API_VERSION="0.18" |
35 |
VALA_USE_DEPEND="vapigen" |
36 |
|
37 |
-inherit bash-completion-r1 eutils gnome2 linux-info multilib systemd user readme.gentoo toolchain-funcs vala versionator virtualx udev |
38 |
+PYTHON_COMPAT=( python2_7 ) |
39 |
+ |
40 |
+inherit bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd user readme.gentoo toolchain-funcs vala versionator virtualx udev |
41 |
|
42 |
DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts" |
43 |
HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
44 |
@@ -84,9 +86,10 @@ |
45 |
virtual/pkgconfig |
46 |
vala? ( $(vala_depend) ) |
47 |
test? ( |
48 |
- dev-lang/python:2.7 |
49 |
- dev-python/dbus-python[python_targets_python2_7] |
50 |
- dev-python/pygobject:2[python_targets_python2_7] ) |
51 |
+ $(python_gen_any_dep ' |
52 |
+ dev-python/dbus-python[${PYTHON_USEDEP}] |
53 |
+ dev-python/pygobject:2[${PYTHON_USEDEP}]') |
54 |
+ ) |
55 |
" |
56 |
|
57 |
sysfs_deprecated_check() { |
58 |
@@ -126,10 +129,6 @@ |
59 |
# Find arping at proper place, bug #523632 |
60 |
epatch "${FILESDIR}/${PN}-0.9.10.0-arpingpath.patch" |
61 |
|
62 |
- # Use python2.7 shebangs for test scripts, upstream bug #739448 |
63 |
- sed -e 's@\(^#!.*python\)@\12.7@' \ |
64 |
- -i */tests/*.py || die |
65 |
- |
66 |
# Force use of /run, avoid eautoreconf, upstream bug #737139 |
67 |
sed -e 's:$localstatedir/run/:/run/:' -i configure || die |
68 |
|
69 |
@@ -193,6 +192,7 @@ |
70 |
} |
71 |
|
72 |
src_test() { |
73 |
+ python_setup |
74 |
Xemake check |
75 |
} |
76 |
|
77 |
|
78 |
|
79 |
|
80 |
1.214 net-misc/networkmanager/ChangeLog |
81 |
|
82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.214&view=markup |
83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.214&content-type=text/plain |
84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?r1=1.213&r2=1.214 |
85 |
|
86 |
Index: ChangeLog |
87 |
=================================================================== |
88 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v |
89 |
retrieving revision 1.213 |
90 |
retrieving revision 1.214 |
91 |
diff -u -r1.213 -r1.214 |
92 |
--- ChangeLog 27 Nov 2014 10:09:39 -0000 1.213 |
93 |
+++ ChangeLog 30 Nov 2014 10:16:14 -0000 1.214 |
94 |
@@ -1,6 +1,10 @@ |
95 |
# ChangeLog for net-misc/networkmanager |
96 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
97 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.213 2014/11/27 10:09:39 pacho Exp $ |
98 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.214 2014/11/30 10:16:14 mgorny Exp $ |
99 |
+ |
100 |
+ 30 Nov 2014; Michał Górny <mgorny@g.o> |
101 |
+ networkmanager-0.9.10.1_pre20141101.ebuild: |
102 |
+ Use python-any-r1 for the Python dep. |
103 |
|
104 |
27 Nov 2014; Pacho Ramos <pacho@g.o> |
105 |
networkmanager-0.9.10.1_pre20141101.ebuild: |