1 |
commit: a6daa6bd7eb5cc16cf39209a00602cb6cd2607cf |
2 |
Author: Robert Piasek <dagger <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 4 20:11:56 2011 +0000 |
4 |
Commit: Robert Piasek <dagger <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 4 20:11:56 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dagger.git;a=commit;h=a6daa6bd |
7 |
|
8 |
add networkmanager 0.8.4 and 9.0_rc2 |
9 |
|
10 |
--- |
11 |
net-misc/networkmanager/Manifest | 10 +- |
12 |
net-misc/networkmanager/metadata.xml | 1 + |
13 |
..._beta3.ebuild => networkmanager-0.8.4.0.ebuild} | 90 ++++++++++--------- |
14 |
....9_rc1.ebuild => networkmanager-0.9_rc2.ebuild} | 4 +- |
15 |
4 files changed, 55 insertions(+), 50 deletions(-) |
16 |
|
17 |
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest |
18 |
index c2acb8d..6e4572e 100644 |
19 |
--- a/net-misc/networkmanager/Manifest |
20 |
+++ b/net-misc/networkmanager/Manifest |
21 |
@@ -1,8 +1,8 @@ |
22 |
AUX nm-system-settings.conf 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f |
23 |
-DIST NetworkManager-0.8.997.tar.bz2 2048464 RMD160 6c8b685065540500b5fc4510f7b99338b6364be1 SHA1 385b094f2806703edac2d9a5dfb38f1ad8bfbd8e SHA256 332cdd94f480099d23f39d56b3aee9925e435ffe91d088a9476d9b8b3586887a |
24 |
-DIST NetworkManager-0.8.998.tar.bz2 2055112 RMD160 d95ecc2f5ea86e45bb7a9fd8600c83dd9c65cf0c SHA1 56f874463d24e90b7e6a077469f644401cccb280 SHA256 239271e7cd93272776bb9297bfc5214ab910d3d9a7c1862b2625b90719014a82 |
25 |
+DIST NetworkManager-0.8.4.0.tar.bz2 1672926 RMD160 d2f20c4130b1a0015973358920802ad6796e7400 SHA1 85a75f7ed80cbdd4b35797ae5698cafad10084c8 SHA256 e71f2ed5b28b9d46566fbf573e43ee8553e60aa3f557dc61e07b9e198c657588 |
26 |
+DIST NetworkManager-0.8.999.tar.bz2 2084950 RMD160 9fb22a6e53814d3d89cc3bb9862d7090adaae0bc SHA1 517647c1916dbdb0f0258c5f3ecdfd010a373d2e SHA256 fc2430e4babe1f53ac071746cd3f662f064a7d338f0e324f42f82fe9512968cd |
27 |
DIST ifnet-0.9.tar.bz2 5351 RMD160 a936dcd50fca5d8b89cd119223f4c4c9c6a8fc68 SHA1 f2fe16ee3b36698977ac48bbd17d60373336214d SHA256 e23addc579ec2f40ad8babb5073f15abc5f2368c6313e4a983999c54ef9479ed |
28 |
-EBUILD networkmanager-0.9_beta3.ebuild 4010 RMD160 480e33a182241ea665706b0894db8b928954d410 SHA1 278cce3b003ec642874053ac76d18a63a929fca1 SHA256 595636c765c65110efdf31385bce56697d4a1353950874fc97832c2810c57a9e |
29 |
-EBUILD networkmanager-0.9_rc1.ebuild 4008 RMD160 3eb89863d22f9093afc5cd5221683476d9842f0d SHA1 e1bd42a1c4898f093a7b1b0fe859134c78f4bcff SHA256 08913c6f71a1392ca21cbc5040213d23c126ceb5849427b47ff40b663d90ede8 |
30 |
+EBUILD networkmanager-0.8.4.0.ebuild 3932 RMD160 3119c1e39039d2a62b109c89a337d9b2589f586c SHA1 c4a5dc0c65e80011d294d4c4182543fbe989267e SHA256 352c9e4cecb0e7fd1c8c96c54e2fad5d3d7e069a8fbfe36fa25c1ab3b61f0076 |
31 |
+EBUILD networkmanager-0.9_rc2.ebuild 3996 RMD160 45633b277c53852a36fcabaef8746b9cb182c6a4 SHA1 b62b6d75266684bd9e4e88b9c1abbab84a468a1d SHA256 a1151089d5c9591e3b88815eb5f59527cde64eb293011894045f0407ece588e1 |
32 |
MISC ChangeLog 13714 RMD160 d527dda4eafb8aef2547bd0ee54514588eb5d47a SHA1 8ce7174a11ed35dc522ea7a0bb4318fd1ffcd913 SHA256 fb4a4a61edf20acfefbef3598d134f225edb8d215e7c2544939af59a7fb7ad52 |
33 |
-MISC metadata.xml 1190 RMD160 50f2c2962026f1e2c6b7d199fbe336f0a5e4979f SHA1 2e43144f0318d30c62221875c4e6682bde9cb78f SHA256 2407742dbcfe0171431274ac31b198b185a2f642965c09ab922e9fb93ad12836 |
34 |
+MISC metadata.xml 1290 RMD160 1285a26b775a35451982a7c19e16dfd7b2d59554 SHA1 c530542e8a292173ca722cb6d96ced7ceb55dabf SHA256 924b5245838d35e16b8b99ba6585c434fd6938c6f99b4abec0d8ea8d0fad17ce |
35 |
|
36 |
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml |
37 |
index c1409e5..7d8b3b4 100644 |
38 |
--- a/net-misc/networkmanager/metadata.xml |
39 |
+++ b/net-misc/networkmanager/metadata.xml |
40 |
@@ -18,6 +18,7 @@ |
41 |
<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and <pkg>net-firewall/iptables</pkg> for connection sharing </flag> |
42 |
<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for getting ip.</flag> |
43 |
<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip.</flag> |
44 |
+ <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag> |
45 |
<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography.</flag> |
46 |
<flag name="ppp">Enable support for mobile broadband and PPPoE connections using <pkg>net-dialup/ppp</pkg>.</flag> |
47 |
<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing DNS information</flag> |
48 |
|
49 |
diff --git a/net-misc/networkmanager/networkmanager-0.9_beta3.ebuild b/net-misc/networkmanager/networkmanager-0.8.4.0.ebuild |
50 |
similarity index 62% |
51 |
rename from net-misc/networkmanager/networkmanager-0.9_beta3.ebuild |
52 |
rename to net-misc/networkmanager/networkmanager-0.8.4.0.ebuild |
53 |
index d0ec03b..f7bcb78 100644 |
54 |
--- a/net-misc/networkmanager/networkmanager-0.9_beta3.ebuild |
55 |
+++ b/net-misc/networkmanager/networkmanager-0.8.4.0.ebuild |
56 |
@@ -1,65 +1,54 @@ |
57 |
# Copyright 1999-2011 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.995.ebuild,v 1.1 2011/03/09 07:56:21 qiaomuf Exp $ |
60 |
+# $Header: $ |
61 |
|
62 |
-EAPI="4" |
63 |
+EAPI="2" |
64 |
|
65 |
-inherit eutils linux-info |
66 |
-# gnome.org |
67 |
-# once 0.9 is released add gnome.org eclass back |
68 |
+inherit eutils gnome.org linux-info |
69 |
|
70 |
# NetworkManager likes itself with capital letters |
71 |
MY_PN=${PN/networkmanager/NetworkManager} |
72 |
-# Use 0.9 beta/rc rather then 0.8.9xx |
73 |
-MY_PV=${PV/0.9_beta3/0.8.997} |
74 |
-MY_P=${MY_PN}-${MY_PV} |
75 |
+MY_P=${MY_PN}-${PV} |
76 |
|
77 |
DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent." |
78 |
HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" |
79 |
- |
80 |
-SRC_URI="mirror://gnome/sources/${MY_PN}/0.8/${MY_P}.tar.bz2 |
81 |
- http://dev.gentoo.org/~dagger/files/ifnet-0.9.tar.bz2" |
82 |
- |
83 |
-# Change once 0.9 is released |
84 |
-#SRC_URI="${SRC_URI//${PN}/${MY_PN}} |
85 |
+SRC_URI="${SRC_URI//${PN}/${MY_PN}}" |
86 |
|
87 |
LICENSE="GPL-2" |
88 |
SLOT="0" |
89 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
90 |
-IUSE="avahi bluetooth doc +nss gnutls dhclient +dhcpcd +introspection kernel_linux +ppp resolvconf connection-sharing wimax" |
91 |
- |
92 |
-REQUIRED_USE=" |
93 |
- nss? ( !gnutls ) !nss? ( gnutls ) |
94 |
- dhcpcd? ( !dhclient ) !dhcpcd? ( dhclient )" |
95 |
+IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing" |
96 |
|
97 |
RDEPEND=">=sys-apps/dbus-1.2 |
98 |
>=dev-libs/dbus-glib-0.75 |
99 |
>=net-wireless/wireless-tools-28_pre9 |
100 |
- >=sys-fs/udev-147[extras] |
101 |
- >=dev-libs/glib-2.26 |
102 |
- >=sys-auth/polkit-0.96 |
103 |
+ >=sys-fs/udev-145[extras] |
104 |
+ >=dev-libs/glib-2.18 |
105 |
+ >=sys-auth/polkit-0.92 |
106 |
>=dev-libs/libnl-1.1 |
107 |
>=net-misc/modemmanager-0.4 |
108 |
- >=net-wireless/wpa_supplicant-0.7.2[dbus] |
109 |
- bluetooth? ( >=net-wireless/bluez-4.82 ) |
110 |
+ >=net-wireless/wpa_supplicant-0.5.10[dbus] |
111 |
+ bluetooth? ( net-wireless/bluez ) |
112 |
+ || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) |
113 |
avahi? ( net-dns/avahi[autoipd] ) |
114 |
gnutls? ( |
115 |
- dev-libs/libgcrypt |
116 |
- net-libs/gnutls ) |
117 |
- nss? ( >=dev-libs/nss-3.11 ) |
118 |
- dhclient? ( net-misc/dhcp ) |
119 |
- dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) |
120 |
- introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) |
121 |
- ppp? ( >=net-dialup/ppp-2.4.5 ) |
122 |
+ nss? ( >=dev-libs/nss-3.11 ) |
123 |
+ !nss? ( dev-libs/libgcrypt |
124 |
+ net-libs/gnutls ) ) |
125 |
+ !gnutls? ( >=dev-libs/nss-3.11 ) |
126 |
+ dhclient? ( |
127 |
+ dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) |
128 |
+ !dhcpcd? ( net-misc/dhcp ) ) |
129 |
+ !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 ) |
130 |
resolvconf? ( net-dns/openresolv ) |
131 |
connection-sharing? ( |
132 |
net-dns/dnsmasq |
133 |
- net-firewall/iptables ) |
134 |
- wimax? ( >=net-wireless/wimax-1.5.1 )" |
135 |
+ net-firewall/iptables )" |
136 |
|
137 |
DEPEND="${RDEPEND} |
138 |
dev-util/pkgconfig |
139 |
dev-util/intltool |
140 |
+ >=net-dialup/ppp-2.4.5 |
141 |
doc? ( >=dev-util/gtk-doc-1.8 )" |
142 |
|
143 |
S=${WORKDIR}/${MY_P} |
144 |
@@ -90,33 +79,48 @@ pkg_setup() { |
145 |
fi |
146 |
} |
147 |
|
148 |
+#src_prepare() { |
149 |
+#} |
150 |
+ |
151 |
src_configure() { |
152 |
ECONF="--disable-more-warnings |
153 |
--localstatedir=/var |
154 |
--with-distro=gentoo |
155 |
--with-dbus-sys-dir=/etc/dbus-1/system.d |
156 |
- --with-udev-dir=/etc/udev |
157 |
+ --with-udev-dir=/lib/udev |
158 |
--with-iptables=/sbin/iptables |
159 |
$(use_enable doc gtk-doc) |
160 |
- $(use_enable introspection) |
161 |
- $(use_enable ppp) |
162 |
- $(use_enable wimax) |
163 |
- $(use_with dhclient) |
164 |
- $(use_with dhcpcd) |
165 |
$(use_with doc docs) |
166 |
$(use_with resolvconf)" |
167 |
|
168 |
+ # default is dhcpcd (if none or both are specified), ISC dchclient otherwise |
169 |
+ if use dhclient ; then |
170 |
+ if use dhcpcd ; then |
171 |
+ ECONF="${ECONF} --with-dhcpcd --without-dhclient" |
172 |
+ else |
173 |
+ ECONF="${ECONF} --with-dhclient --without-dhcpcd" |
174 |
+ fi |
175 |
+ else |
176 |
+ ECONF="${ECONF} --with-dhcpcd --without-dhclient" |
177 |
+ fi |
178 |
+ |
179 |
+ # default is NSS (if none or both are specified), GnuTLS otherwise |
180 |
+ if use gnutls ; then |
181 |
if use nss ; then |
182 |
- ECONF="${ECONF} $(use_with nss crypto=nss)" |
183 |
+ ECONF="${ECONF} --with-crypto=nss" |
184 |
else |
185 |
- ECONF="${ECONF} $(use_with gnutls crypto=gnutls)" |
186 |
+ ECONF="${ECONF} --with-crypto=gnutls" |
187 |
fi |
188 |
+ else |
189 |
+ ECONF="${ECONF} --with-crypto=nss" |
190 |
+ fi |
191 |
|
192 |
econf ${ECONF} |
193 |
} |
194 |
|
195 |
src_install() { |
196 |
- default |
197 |
+ emake DESTDIR="${D}" install || die "emake install failed" |
198 |
+ |
199 |
# Need to keep the /var/run/NetworkManager directory |
200 |
keepdir /var/run/NetworkManager |
201 |
|
202 |
@@ -128,7 +132,7 @@ src_install() { |
203 |
# Add keyfile plugin support |
204 |
keepdir /etc/NetworkManager/system-connections |
205 |
insinto /etc/NetworkManager |
206 |
- newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \ |
207 |
+ newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \ |
208 |
|| die "newins failed" |
209 |
} |
210 |
|
211 |
|
212 |
diff --git a/net-misc/networkmanager/networkmanager-0.9_rc1.ebuild b/net-misc/networkmanager/networkmanager-0.9_rc2.ebuild |
213 |
similarity index 98% |
214 |
rename from net-misc/networkmanager/networkmanager-0.9_rc1.ebuild |
215 |
rename to net-misc/networkmanager/networkmanager-0.9_rc2.ebuild |
216 |
index 623f2a9..c0f6c9f 100644 |
217 |
--- a/net-misc/networkmanager/networkmanager-0.9_rc1.ebuild |
218 |
+++ b/net-misc/networkmanager/networkmanager-0.9_rc2.ebuild |
219 |
@@ -11,7 +11,7 @@ inherit eutils linux-info |
220 |
# NetworkManager likes itself with capital letters |
221 |
MY_PN=${PN/networkmanager/NetworkManager} |
222 |
# Use 0.9 beta/rc rather then 0.8.9xx |
223 |
-MY_PV=${PV/0.9_rc1/0.8.998} |
224 |
+MY_PV=${PV/0.9_rc2/0.8.999} |
225 |
MY_P=${MY_PN}-${MY_PV} |
226 |
|
227 |
DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent." |
228 |
@@ -25,7 +25,7 @@ SRC_URI="mirror://gnome/sources/${MY_PN}/0.8/${MY_P}.tar.bz2 |
229 |
|
230 |
LICENSE="GPL-2" |
231 |
SLOT="0" |
232 |
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
233 |
+KEYWORDS="~amd64 ~arm ~x86" |
234 |
IUSE="avahi bluetooth doc +nss gnutls dhclient +dhcpcd +introspection kernel_linux +ppp resolvconf connection-sharing wimax" |
235 |
|
236 |
REQUIRED_USE=" |