Gentoo Archives: gentoo-commits

From: "Robert Buchholz (rbu)" <rbu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/networkmanager: networkmanager-0.7.1-r1.ebuild ChangeLog networkmanager-0.7.0.ebuild networkmanager-0.7.1.ebuild
Date: Sat, 25 Apr 2009 14:27:27
Message-Id: E1Lxiqg-0001Aq-Ca@stork.gentoo.org
1 rbu 09/04/25 14:27:22
2
3 Modified: ChangeLog networkmanager-0.7.0.ebuild
4 Added: networkmanager-0.7.1-r1.ebuild
5 Removed: networkmanager-0.7.1.ebuild
6 Log:
7 Fix bug #267349 by Daniel Gryniewicz, NetworkManager-0.7 links against
8 installed version of nm-util, specify udev directory for bug #267168.
9 (Portage version: 2.1.6.11/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.42 net-misc/networkmanager/ChangeLog
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.42&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.42&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/networkmanager/ChangeLog?r1=1.41&r2=1.42
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v
21 retrieving revision 1.41
22 retrieving revision 1.42
23 diff -u -r1.41 -r1.42
24 --- ChangeLog 24 Apr 2009 12:26:41 -0000 1.41
25 +++ ChangeLog 25 Apr 2009 14:27:22 -0000 1.42
26 @@ -1,6 +1,15 @@
27 # ChangeLog for net-misc/networkmanager
28 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.41 2009/04/24 12:26:41 rbu Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.42 2009/04/25 14:27:22 rbu Exp $
31 +
32 +*networkmanager-0.7.1-r1 (25 Apr 2009)
33 +
34 + 25 Apr 2009; Robert Buchholz <rbu@g.o>
35 + files/networkmanager-0.7.0-gentoo-dhclient.patch,
36 + +files/networkmanager-0.7.1-bad-link.patch, -networkmanager-0.7.1.ebuild,
37 + +networkmanager-0.7.1-r1.ebuild:
38 + Fix bug #267349 by Daniel Gryniewicz, NetworkManager-0.7 links against
39 + installed version of nm-util, specify udev directory for bug #267168.
40
41 24 Apr 2009; Robert Buchholz <rbu@g.o>
42 +networkmanager-0.6.5_p20070823.ebuild:
43
44
45
46 1.4 net-misc/networkmanager/networkmanager-0.7.0.ebuild
47
48 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.0.ebuild?rev=1.4&view=markup
49 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.0.ebuild?rev=1.4&content-type=text/plain
50 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.0.ebuild?r1=1.3&r2=1.4
51
52 Index: networkmanager-0.7.0.ebuild
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.0.ebuild,v
55 retrieving revision 1.3
56 retrieving revision 1.4
57 diff -u -r1.3 -r1.4
58 --- networkmanager-0.7.0.ebuild 21 Apr 2009 15:59:57 -0000 1.3
59 +++ networkmanager-0.7.0.ebuild 25 Apr 2009 14:27:22 -0000 1.4
60 @@ -1,6 +1,6 @@
61 -# Copyright 1999-2008 Gentoo Foundation
62 +# Copyright 1999-2009 Gentoo Foundation
63 # Distributed under the terms of the GNU General Public License v2
64 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.0.ebuild,v 1.3 2009/04/21 15:59:57 dang Exp $
65 +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.0.ebuild,v 1.4 2009/04/25 14:27:22 rbu Exp $
66
67 inherit eutils
68
69
70
71
72 1.1 net-misc/networkmanager/networkmanager-0.7.1-r1.ebuild
73
74 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.1-r1.ebuild?rev=1.1&view=markup
75 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.1-r1.ebuild?rev=1.1&content-type=text/plain
76
77 Index: networkmanager-0.7.1-r1.ebuild
78 ===================================================================
79 # Copyright 1999-2009 Gentoo Foundation
80 # Distributed under the terms of the GNU General Public License v2
81 # $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.1-r1.ebuild,v 1.1 2009/04/25 14:27:22 rbu Exp $
82
83 EAPI="2"
84 inherit eutils
85 # autotools
86
87 # NetworkManager likes itself with capital letters
88 MY_PN=${PN/networkmanager/NetworkManager}
89 MY_P=${MY_PN}-${PV}
90
91 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
92 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
93 SRC_URI="mirror://gnome/sources/NetworkManager/0.7/${MY_P}.tar.bz2"
94
95
96 LICENSE="GPL-2"
97 SLOT="0"
98 KEYWORDS="~arm ~amd64 ~ppc ~x86"
99 IUSE="avahi doc nss gnutls dhclient dhcpcd resolvconf connection-sharing"
100 # modemmanager"
101
102 RDEPEND=">=sys-apps/dbus-1.2
103 >=dev-libs/dbus-glib-0.75
104 >=sys-apps/hal-0.5.10
105 >=net-wireless/wireless-tools-28_pre9
106 >=dev-libs/glib-2.16
107 >=sys-auth/policykit-0.8
108 >=dev-libs/libnl-1.1
109 >=net-wireless/wpa_supplicant-0.5.10[dbus]
110 || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
111 avahi? ( net-dns/avahi[autoipd] )
112 gnutls? (
113 nss? ( >=dev-libs/nss-3.11 )
114 !nss? ( dev-libs/libgcrypt
115 net-libs/gnutls ) )
116 !gnutls? ( >=dev-libs/nss-3.11 )
117 dhclient? (
118 dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
119 !dhcpcd? ( >=net-misc/dhcp-3.0.0 ) )
120 !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
121 resolvconf? ( net-dns/openresolv )
122 connection-sharing? (
123 net-dns/dnsmasq
124 net-firewall/iptables )"
125
126 DEPEND="${RDEPEND}
127 dev-util/pkgconfig
128 dev-util/intltool
129 net-dialup/ppp
130 doc? ( >=dev-util/gtk-doc-1.8 )"
131
132 #PDEPEND="modemmanager? ( >=net-misc/modemmanager-0.2 )"
133
134 S=${WORKDIR}/${MY_P}
135
136 src_prepare() {
137
138 # Fix up the dbus conf file to use plugdev group
139 epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch"
140
141 # bug #266982
142 epatch "${FILESDIR}/${PN}-0.7.0-gentoo-dhclient.patch"
143
144 # bug #267349
145 epatch "${FILESDIR}/${PN}-0.7.1-bad-link.patch"
146
147 # EPATCH_SOURCE="${WORKDIR}/modem-manager-patchset-0.7.1"
148 # EPATCH_SUFFIX="patch"
149 # use modemmanager && epatch && eautoreconf
150
151 }
152
153 src_configure() {
154 ECONF="--disable-more-warnings
155 --localstatedir=/var
156 --with-distro=gentoo
157 --with-dbus-sys=/etc/dbus-1/system.d
158 --with-udev-dir=/etc/udev
159 $(use_enable doc gtk-doc)
160 $(use_with doc docs)
161 $(use_with resolvconf)"
162
163 # default is dhcpcd (if none or both are specified), ISC dchclient otherwise
164 if use dhclient ; then
165 if use dhcpcd ; then
166 ECONF="${ECONF} --with-dhcp-client=dhcpcd"
167 else
168 ECONF="${ECONF} --with-dhcp-client=dhclient"
169 fi
170 else
171 ECONF="${ECONF} --with-dhcp-client=dhcpcd"
172 fi
173
174 # default is NSS (if none or both are specified), GnuTLS otherwise
175 if use gnutls ; then
176 if use nss ; then
177 ECONF="${ECONF} --with-crypto=nss"
178 else
179 ECONF="${ECONF} --with-crypto=gnutls"
180 fi
181 else
182 ECONF="${ECONF} --with-crypto=nss"
183 fi
184
185 econf ${ECONF}
186 }
187
188 src_install() {
189 emake DESTDIR="${D}" install || die "emake install failed"
190
191 # Need to keep the /var/run/NetworkManager directory
192 keepdir /var/run/NetworkManager
193
194 # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
195 keepdir /etc/NetworkManager/dispatcher.d
196
197 dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
198
199 # Add keyfile plugin support
200 keepdir /etc/NetworkManager/system-connections
201 insinto /etc/NetworkManager
202 newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \
203 || die "newins failed"
204 }
205
206 pkg_postinst() {
207 elog "You need to be in the plugdev group in order to use NetworkManager"
208 elog "Problems with your hostname getting changed?"
209 elog ""
210 elog "Add the following to /etc/dhcp/dhclient.conf"
211 elog 'send host-name "YOURHOSTNAME";'
212 elog 'supersede host-name "YOURHOSTNAME";'
213 elog ""
214 elog "If you're using dhcpcd please remove"
215 elog "host_name option from /etc/dhcpcd.conf"
216 elog ""
217 elog "You will need to restart DBUS if this is your first time"
218 elog "installing NetworkManager."
219 elog ""
220 elog "To save system-wide settings as a user, that user needs to have the"
221 elog "right policykit privileges. You can add them by running:"
222 elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify --user "USERNAME"'
223 }