|
Lines 14-20
Link Here
|
| 14 |
|
14 |
|
| 15 |
LICENSE="GPL-2+" |
15 |
LICENSE="GPL-2+" |
| 16 |
SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
16 |
SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
| 17 |
IUSE="avahi bluetooth connection-sharing consolekit dhclient +dhcpcd gnutls +introspection kernel_linux +nss +modemmanager +ppp resolvconf systemd test vala +wext +wifi" # wimax |
17 |
IUSE="avahi bluetooth connection-sharing consolekit dhclient +dhcpcd gnutls +introspection kernel_linux +nss +modemmanager policykit +ppp resolvconf systemd suspend test vala +wext +wifi" # wimax |
| 18 |
|
18 |
|
| 19 |
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
19 |
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 20 |
|
20 |
|
|
Lines 32-38
Link Here
|
| 32 |
>=dev-libs/dbus-glib-0.94 |
32 |
>=dev-libs/dbus-glib-0.94 |
| 33 |
>=dev-libs/glib-2.30 |
33 |
>=dev-libs/glib-2.30 |
| 34 |
>=dev-libs/libnl-3.2.7:3= |
34 |
>=dev-libs/libnl-3.2.7:3= |
| 35 |
>=sys-auth/polkit-0.106 |
35 |
policykit? ( >=sys-auth/polkit-0.106 ) |
| 36 |
>=net-libs/libsoup-2.26:2.4= |
36 |
>=net-libs/libsoup-2.26:2.4= |
| 37 |
>=virtual/udev-165[gudev] |
37 |
>=virtual/udev-165[gudev] |
| 38 |
bluetooth? ( >=net-wireless/bluez-4.82 ) |
38 |
bluetooth? ( >=net-wireless/bluez-4.82 ) |
|
Lines 51-57
Link Here
|
| 51 |
ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) |
51 |
ppp? ( >=net-dialup/ppp-2.4.5[ipv6] ) |
| 52 |
resolvconf? ( net-dns/openresolv ) |
52 |
resolvconf? ( net-dns/openresolv ) |
| 53 |
systemd? ( >=sys-apps/systemd-183:0= ) |
53 |
systemd? ( >=sys-apps/systemd-183:0= ) |
| 54 |
|| ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) |
54 |
suspend? ( || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) ) |
| 55 |
" |
55 |
" |
| 56 |
RDEPEND="${COMMON_DEPEND} |
56 |
RDEPEND="${COMMON_DEPEND} |
| 57 |
consolekit? ( sys-auth/consolekit ) |
57 |
consolekit? ( sys-auth/consolekit ) |
|
Lines 142-154
Link Here
|
| 142 |
--enable-concheck \ |
142 |
--enable-concheck \ |
| 143 |
--with-crypto=$(usex nss nss gnutls) \ |
143 |
--with-crypto=$(usex nss nss gnutls) \ |
| 144 |
--with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \ |
144 |
--with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \ |
| 145 |
--with-suspend-resume=$(usex systemd systemd upower) \ |
145 |
$(usex suspend $(usex--with-suspend-resume=$(usex systemd systemd upower))) \ |
| 146 |
$(use_enable introspection) \ |
146 |
$(use_enable introspection) \ |
| 147 |
$(use_enable ppp) \ |
147 |
$(use_enable ppp) \ |
| 148 |
--disable-wimax \ |
148 |
--disable-wimax \ |
| 149 |
$(use_with dhclient) \ |
149 |
$(use_with dhclient) \ |
| 150 |
$(use_with dhcpcd) \ |
150 |
$(use_with dhcpcd) \ |
| 151 |
$(use_with modemmanager modem-manager-1) \ |
151 |
$(use_with modemmanager modem-manager-1) \ |
|
|
152 |
$(use_with policykit polkit) \ |
| 152 |
$(use_with resolvconf) \ |
153 |
$(use_with resolvconf) \ |
| 153 |
$(use_enable test tests) \ |
154 |
$(use_enable test tests) \ |
| 154 |
$(use_enable vala) \ |
155 |
$(use_enable vala) \ |
|
Lines 195-202
Link Here
|
| 195 |
fi |
196 |
fi |
| 196 |
|
197 |
|
| 197 |
# Allow users in plugdev group to modify system connections |
198 |
# Allow users in plugdev group to modify system connections |
| 198 |
insinto /usr/share/polkit-1/rules.d/ |
199 |
if use policykit; then |
| 199 |
doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
200 |
insinto /usr/share/polkit-1/rules.d/ |
|
|
201 |
doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
| 202 |
fi |
| 200 |
|
203 |
|
| 201 |
prune_libtool_files --modules |
204 |
prune_libtool_files --modules |
| 202 |
} |
205 |
} |
|
Lines 214-220
Link Here
|
| 214 |
|
217 |
|
| 215 |
# The polkit rules file moved to /usr/share |
218 |
# The polkit rules file moved to /usr/share |
| 216 |
old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
219 |
old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules" |
| 217 |
if [[ -f "${old_rules}" ]]; then |
220 |
if use policykit && [[ -f "${old_rules}" ]]; then |
| 218 |
case "$(md5sum ${old_rules})" in |
221 |
case "$(md5sum ${old_rules})" in |
| 219 |
574d0cfa7e911b1f7792077003060240* ) |
222 |
574d0cfa7e911b1f7792077003060240* ) |
| 220 |
# Automatically delete the old rules.d file if the user did not change it |
223 |
# Automatically delete the old rules.d file if the user did not change it |
