Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mu Qiao (qiaomuf)" <qiaomuf@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/networkmanager: metadata.xml ChangeLog networkmanager-0.8.2-r7.ebuild
Date: Fri, 25 Feb 2011 09:55:07
Message-Id: 20110225095442.E898020054@flycatcher.gentoo.org
1 qiaomuf 11/02/25 09:54:42
2
3 Modified: metadata.xml ChangeLog
4 Added: networkmanager-0.8.2-r7.ebuild
5 Log:
6 Won't write to /etc/conf.d/net when nothing changed
7
8 (Portage version: 2.1.9.41/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.13 net-misc/networkmanager/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/metadata.xml?rev=1.13&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/metadata.xml?rev=1.13&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/metadata.xml?r1=1.12&r2=1.13
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/metadata.xml,v
20 retrieving revision 1.12
21 retrieving revision 1.13
22 diff -u -r1.12 -r1.13
23 --- metadata.xml 26 Feb 2010 10:23:29 -0000 1.12
24 +++ metadata.xml 25 Feb 2011 09:54:42 -0000 1.13
25 @@ -14,6 +14,11 @@
26 <email>steev@g.o</email>
27 <name>Stephen Klimaszewski</name>
28 </maintainer>
29 + <maintainer>
30 + <email>qiaomuf@g.o</email>
31 + <name>Mu Qiao</name>
32 + </maintainer>
33 +
34 <use>
35 <flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for getting ip.</flag>
36 <flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip.</flag>
37
38
39
40 1.98 net-misc/networkmanager/ChangeLog
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.98&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.98&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?r1=1.97&r2=1.98
45
46 Index: ChangeLog
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v
49 retrieving revision 1.97
50 retrieving revision 1.98
51 diff -u -r1.97 -r1.98
52 --- ChangeLog 8 Feb 2011 13:31:01 -0000 1.97
53 +++ ChangeLog 25 Feb 2011 09:54:42 -0000 1.98
54 @@ -1,6 +1,12 @@
55 # ChangeLog for net-misc/networkmanager
56 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
57 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.97 2011/02/08 13:31:01 dagger Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.98 2011/02/25 09:54:42 qiaomuf Exp $
59 +
60 +*networkmanager-0.8.2-r7 (25 Feb 2011)
61 +
62 + 25 Feb 2011; Mu Qiao <qiaomuf@g.o> +networkmanager-0.8.2-r7.ebuild,
63 + +files/networkmanager-0.8.2-ifnet-smarter-write.patch, metadata.xml:
64 + Won't write when nothing changed
65
66 *networkmanager-0.8.2-r6 (08 Feb 2011)
67
68
69
70
71 1.1 net-misc/networkmanager/networkmanager-0.8.2-r7.ebuild
72
73 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r7.ebuild?rev=1.1&view=markup
74 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r7.ebuild?rev=1.1&content-type=text/plain
75
76 Index: networkmanager-0.8.2-r7.ebuild
77 ===================================================================
78 # Copyright 1999-2011 Gentoo Foundation
79 # Distributed under the terms of the GNU General Public License v2
80 # $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r7.ebuild,v 1.1 2011/02/25 09:54:42 qiaomuf Exp $
81
82 EAPI="2"
83
84 inherit autotools eutils gnome.org linux-info
85
86 # NetworkManager likes itself with capital letters
87 MY_PN=${PN/networkmanager/NetworkManager}
88 MY_P=${MY_PN}-${PV}
89
90 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
91 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
92 SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
93
94 LICENSE="GPL-2"
95 SLOT="0"
96 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
97 IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing"
98
99 RDEPEND=">=sys-apps/dbus-1.2
100 >=dev-libs/dbus-glib-0.75
101 >=net-wireless/wireless-tools-28_pre9
102 >=sys-fs/udev-145[extras]
103 >=dev-libs/glib-2.18
104 >=sys-auth/polkit-0.92
105 >=dev-libs/libnl-1.1
106 >=net-misc/modemmanager-0.4
107 >=net-wireless/wpa_supplicant-0.5.10[dbus]
108 bluetooth? ( net-wireless/bluez )
109 || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
110 avahi? ( net-dns/avahi[autoipd] )
111 gnutls? (
112 nss? ( >=dev-libs/nss-3.11 )
113 !nss? ( dev-libs/libgcrypt
114 net-libs/gnutls ) )
115 !gnutls? ( >=dev-libs/nss-3.11 )
116 dhclient? (
117 dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
118 !dhcpcd? ( net-misc/dhcp ) )
119 !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
120 resolvconf? ( net-dns/openresolv )
121 connection-sharing? (
122 net-dns/dnsmasq
123 net-firewall/iptables )"
124
125 DEPEND="${RDEPEND}
126 dev-util/pkgconfig
127 dev-util/intltool
128 >=net-dialup/ppp-2.4.5
129 doc? ( >=dev-util/gtk-doc-1.8 )"
130
131 S=${WORKDIR}/${MY_P}
132
133 sysfs_deprecated_check() {
134 ebegin "Checking for SYSFS_DEPRECATED support"
135
136 if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
137 eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
138 eerror "or NetworkManager will not work correctly."
139 eerror "See http://bugs.gentoo.org/333639 for more info."
140 die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
141 fi
142 eend $?
143 }
144
145 pkg_setup() {
146 # FIXME. Required by -confchanges.patch, but the patch is invalid as
147 # ConsoleKit and PolicyKit is enough to get authorization.
148 enewgroup plugdev
149
150 if use kernel_linux; then
151 get_version
152 if linux_config_exists; then
153 sysfs_deprecated_check
154 else
155 ewarn "Was unable to determine your kernel .config"
156 ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
157 ewarn "See http://bugs.gentoo.org/333639 for more info."
158 fi
159
160 fi
161 }
162
163 src_prepare() {
164 # dbus policy patch
165 epatch "${FILESDIR}/${P}-confchanges.patch"
166 # accept "gw" in /etc/conf.d/net (bug #339215)
167 epatch "${FILESDIR}/${P}-accept-gw.patch"
168 # fix shared connection wrt bug #350476
169 # fix parsing dhclient.conf wrt bug #352638
170 epatch "${FILESDIR}/${P}-shared-connection.patch"
171 # Backports #1
172 epatch "${FILESDIR}/${P}-1.patch"
173 # won't crash upon startup for 32bit machines wrt bug #353807
174 epatch "${FILESDIR}/${P}-fix-timestamp.patch"
175 # fix tests wrt bug #353549
176 epatch "${FILESDIR}/${P}-fix-tests.patch"
177 # fix temporary files creation bug #349003
178 epatch "${FILESDIR}/${P}-fix-tempfiles.patch"
179 # won't write when nothing changed (bug #356339)
180 epatch "${FILESDIR}/${P}-ifnet-smarter-write.patch"
181 eautoreconf
182 }
183
184 src_configure() {
185 ECONF="--disable-more-warnings
186 --localstatedir=/var
187 --with-distro=gentoo
188 --with-dbus-sys-dir=/etc/dbus-1/system.d
189 --with-udev-dir=/etc/udev
190 --with-iptables=/sbin/iptables
191 $(use_enable doc gtk-doc)
192 $(use_with doc docs)
193 $(use_with resolvconf)"
194
195 # default is dhcpcd (if none or both are specified), ISC dchclient otherwise
196 if use dhclient ; then
197 if use dhcpcd ; then
198 ECONF="${ECONF} --with-dhcpcd --without-dhclient"
199 else
200 ECONF="${ECONF} --with-dhclient --without-dhcpcd"
201 fi
202 else
203 ECONF="${ECONF} --with-dhcpcd --without-dhclient"
204 fi
205
206 # default is NSS (if none or both are specified), GnuTLS otherwise
207 if use gnutls ; then
208 if use nss ; then
209 ECONF="${ECONF} --with-crypto=nss"
210 else
211 ECONF="${ECONF} --with-crypto=gnutls"
212 fi
213 else
214 ECONF="${ECONF} --with-crypto=nss"
215 fi
216
217 econf ${ECONF}
218 }
219
220 src_install() {
221 emake DESTDIR="${D}" install || die "emake install failed"
222
223 # Need to keep the /var/run/NetworkManager directory
224 keepdir /var/run/NetworkManager
225
226 # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
227 keepdir /etc/NetworkManager/dispatcher.d
228
229 dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
230
231 # Add keyfile plugin support
232 keepdir /etc/NetworkManager/system-connections
233 insinto /etc/NetworkManager
234 newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \
235 || die "newins failed"
236 }
237
238 pkg_postinst() {
239 elog "You will need to reload DBus if this is your first time installing"
240 elog "NetworkManager, or if you're upgrading from 0.7 or older."
241 elog ""
242 }
Report Message
Find on MARC Find on Google Groups