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: ChangeLog networkmanager-0.8.2-r3.ebuild
Date: Mon, 24 Jan 2011 07:31:59
Message-Id: 20110124073149.0D49F20054@flycatcher.gentoo.org
1 qiaomuf 11/01/24 07:31:48
2
3 Modified: ChangeLog
4 Added: networkmanager-0.8.2-r3.ebuild
5 Log:
6 Revision bump wrt bug #350476
7
8 (Portage version: 2.1.9.25/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.93 net-misc/networkmanager/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.93&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.93&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?r1=1.92&r2=1.93
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v
20 retrieving revision 1.92
21 retrieving revision 1.93
22 diff -u -r1.92 -r1.93
23 --- ChangeLog 18 Dec 2010 10:12:11 -0000 1.92
24 +++ ChangeLog 24 Jan 2011 07:31:48 -0000 1.93
25 @@ -1,6 +1,12 @@
26 # ChangeLog for net-misc/networkmanager
27 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.92 2010/12/18 10:12:11 qiaomuf Exp $
29 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.93 2011/01/24 07:31:48 qiaomuf Exp $
31 +
32 +*networkmanager-0.8.2-r3 (24 Jan 2011)
33 +
34 + 24 Jan 2011; Mu Qiao <qiaomuf@g.o> +networkmanager-0.8.2-r3.ebuild,
35 + +files/networkmanager-0.8.2-shared-connection.patch:
36 + fix shared connection wrt bug #350476
37
38 17 Dec 2010; Robert Piasek <dagger@g.o>
39 files/networkmanager-0.8.2-1.patch:
40
41
42
43 1.1 net-misc/networkmanager/networkmanager-0.8.2-r3.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r3.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r3.ebuild?rev=1.1&content-type=text/plain
47
48 Index: networkmanager-0.8.2-r3.ebuild
49 ===================================================================
50 # Copyright 1999-2011 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r3.ebuild,v 1.1 2011/01/24 07:31:48 qiaomuf Exp $
53
54 EAPI="2"
55
56 inherit gnome.org linux-info
57
58 # NetworkManager likes itself with capital letters
59 MY_PN=${PN/networkmanager/NetworkManager}
60 MY_P=${MY_PN}-${PV}
61
62 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
63 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
64 SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
65
66 LICENSE="GPL-2"
67 SLOT="0"
68 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
69 IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing"
70
71 RDEPEND=">=sys-apps/dbus-1.2
72 >=dev-libs/dbus-glib-0.75
73 >=net-wireless/wireless-tools-28_pre9
74 >=sys-fs/udev-145[extras]
75 >=dev-libs/glib-2.18
76 >=sys-auth/polkit-0.92
77 >=dev-libs/libnl-1.1
78 >=net-misc/modemmanager-0.4
79 >=net-wireless/wpa_supplicant-0.5.10[dbus]
80 bluetooth? ( net-wireless/bluez )
81 || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
82 avahi? ( net-dns/avahi[autoipd] )
83 gnutls? (
84 nss? ( >=dev-libs/nss-3.11 )
85 !nss? ( dev-libs/libgcrypt
86 net-libs/gnutls ) )
87 !gnutls? ( >=dev-libs/nss-3.11 )
88 dhclient? (
89 dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
90 !dhcpcd? ( net-misc/dhcp ) )
91 !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
92 resolvconf? ( net-dns/openresolv )
93 connection-sharing? (
94 net-dns/dnsmasq
95 net-firewall/iptables )"
96
97 DEPEND="${RDEPEND}
98 dev-util/pkgconfig
99 dev-util/intltool
100 >=net-dialup/ppp-2.4.5
101 doc? ( >=dev-util/gtk-doc-1.8 )"
102
103 S=${WORKDIR}/${MY_P}
104
105 sysfs_deprecated_check() {
106 ebegin "Checking for SYSFS_DEPRECATED support"
107
108 if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
109 eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
110 eerror "or NetworkManager will not work correctly."
111 eerror "See http://bugs.gentoo.org/333639 for more info."
112 die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
113 fi
114 eend $?
115 }
116
117 pkg_setup() {
118
119 if use kernel_linux; then
120 get_version
121 if linux_config_exists; then
122 sysfs_deprecated_check
123 else
124 ewarn "Was unable to determine your kernel .config"
125 ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
126 ewarn "See http://bugs.gentoo.org/333639 for more info."
127 fi
128
129 fi
130 }
131
132 src_prepare() {
133 # dbus policy patch
134 epatch "${FILESDIR}/${P}-confchanges.patch"
135 # accept "gw" in /etc/conf.d/net (bug #339215)
136 epatch "${FILESDIR}/${P}-accept-gw.patch"
137 # fix shared connection wrt bug #350476
138 epatch "${FILESDIR}/${P}-shared-connection.patch"
139 # Backports #1
140 epatch "${FILESDIR}/${P}-1.patch"
141 }
142
143 src_configure() {
144 ECONF="--disable-more-warnings
145 --localstatedir=/var
146 --with-distro=gentoo
147 --with-dbus-sys-dir=/etc/dbus-1/system.d
148 --with-udev-dir=/etc/udev
149 --with-iptables=/sbin/iptables
150 $(use_enable doc gtk-doc)
151 $(use_with doc docs)
152 $(use_with resolvconf)"
153
154 # default is dhcpcd (if none or both are specified), ISC dchclient otherwise
155 if use dhclient ; then
156 if use dhcpcd ; then
157 ECONF="${ECONF} --with-dhcpcd --without-dhclient"
158 else
159 ECONF="${ECONF} --with-dhclient --without-dhcpcd"
160 fi
161 else
162 ECONF="${ECONF} --with-dhcpcd --without-dhclient"
163 fi
164
165 # default is NSS (if none or both are specified), GnuTLS otherwise
166 if use gnutls ; then
167 if use nss ; then
168 ECONF="${ECONF} --with-crypto=nss"
169 else
170 ECONF="${ECONF} --with-crypto=gnutls"
171 fi
172 else
173 ECONF="${ECONF} --with-crypto=nss"
174 fi
175
176 econf ${ECONF}
177 }
178
179 src_install() {
180 emake DESTDIR="${D}" install || die "emake install failed"
181
182 # Need to keep the /var/run/NetworkManager directory
183 keepdir /var/run/NetworkManager
184
185 # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
186 keepdir /etc/NetworkManager/dispatcher.d
187
188 dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
189
190 # Add keyfile plugin support
191 keepdir /etc/NetworkManager/system-connections
192 insinto /etc/NetworkManager
193 newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \
194 || die "newins failed"
195 }
196
197 pkg_postinst() {
198 elog "You will need to reload DBus if this is your first time installing"
199 elog "NetworkManager, or if you're upgrading from 0.7 or older."
200 elog ""
201 }