|
Lines 8-13
Link Here
|
| 8 |
VALA_USE_DEPEND="vapigen" |
8 |
VALA_USE_DEPEND="vapigen" |
| 9 |
PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
9 |
PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
| 10 |
|
10 |
|
|
|
11 |
# Patch in elogind support |
| 12 |
# Bug #607352 |
| 13 |
GNOME2_EAUTORECONF="yes" |
| 14 |
|
| 11 |
inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \ |
15 |
inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \ |
| 12 |
user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal |
16 |
user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal |
| 13 |
|
17 |
|
|
Lines 17-31
Link Here
|
| 17 |
LICENSE="GPL-2+" |
21 |
LICENSE="GPL-2+" |
| 18 |
SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
22 |
SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
| 19 |
|
23 |
|
| 20 |
IUSE="audit bluetooth connection-sharing consolekit +dhclient gnutls +introspection \ |
24 |
IUSE="audit bluetooth connection-sharing consolekit +dhclient elogind gnutls \ |
| 21 |
json kernel_linux +nss +modemmanager ncurses ofono +ppp resolvconf selinux \ |
25 |
+introspection json kernel_linux +nss +modemmanager ncurses ofono +ppp \ |
| 22 |
systemd teamd test vala +wext +wifi" |
26 |
resolvconf selinux systemd teamd test vala +wext +wifi" |
| 23 |
|
27 |
|
| 24 |
REQUIRED_USE=" |
28 |
REQUIRED_USE=" |
|
|
29 |
|
| 25 |
modemmanager? ( ppp ) |
30 |
modemmanager? ( ppp ) |
| 26 |
vala? ( introspection ) |
31 |
vala? ( introspection ) |
| 27 |
wext? ( wifi ) |
32 |
wext? ( wifi ) |
| 28 |
^^ ( nss gnutls ) |
33 |
^^ ( nss gnutls ) |
|
|
34 |
?? ( consolekit elogind systemd ) |
| 29 |
" |
35 |
" |
| 30 |
|
36 |
|
| 31 |
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" |
37 |
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" |
|
Lines 52-57
Link Here
|
| 52 |
net-firewall/iptables ) |
58 |
net-firewall/iptables ) |
| 53 |
consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
59 |
consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
| 54 |
dhclient? ( >=net-misc/dhcp-4[client] ) |
60 |
dhclient? ( >=net-misc/dhcp-4[client] ) |
|
|
61 |
!dhclient? ( >=net-misc/dhcpcd-6.11.3 ) |
| 62 |
elogind? ( sys-auth/elogind ) |
| 55 |
gnutls? ( |
63 |
gnutls? ( |
| 56 |
dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] |
64 |
dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] |
| 57 |
>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) |
65 |
>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) |
|
Lines 85-90
Link Here
|
| 85 |
) |
93 |
) |
| 86 |
" |
94 |
" |
| 87 |
|
95 |
|
|
|
96 |
PATCHES=( |
| 97 |
# Patch in elogind support |
| 98 |
# Bug #607352 |
| 99 |
"${FILESDIR}"/${P}-enable-elogind.patch |
| 100 |
) |
| 101 |
|
| 88 |
python_check_deps() { |
102 |
python_check_deps() { |
| 89 |
if use test; then |
103 |
if use test; then |
| 90 |
has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && |
104 |
has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && |
|
Lines 165-170
Link Here
|
| 165 |
# maintain and fix it |
179 |
# maintain and fix it |
| 166 |
# Also disable dhcpcd support as it's also completely unmaintained |
180 |
# Also disable dhcpcd support as it's also completely unmaintained |
| 167 |
# and facing bugs like #563938 and many others |
181 |
# and facing bugs like #563938 and many others |
|
|
182 |
# Update: Said bug says, that it *should* work now, so re-enable dhcpcd. |
| 168 |
# |
183 |
# |
| 169 |
# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are |
184 |
# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are |
| 170 |
# still not ready for removing that lib |
185 |
# still not ready for removing that lib |
|
Lines 188-202
Link Here
|
| 188 |
$(multilib_native_with libsoup) \ |
203 |
$(multilib_native_with libsoup) \ |
| 189 |
$(multilib_native_enable concheck) \ |
204 |
$(multilib_native_enable concheck) \ |
| 190 |
--with-crypto=$(usex nss nss gnutls) \ |
205 |
--with-crypto=$(usex nss nss gnutls) \ |
| 191 |
--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \ |
206 |
--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) \ |
| 192 |
--with-suspend-resume=$(multilib_native_usex systemd systemd consolekit) \ |
207 |
--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) \ |
| 193 |
$(multilib_native_use_with audit libaudit) \ |
208 |
$(multilib_native_use_with audit libaudit) \ |
| 194 |
$(multilib_native_use_enable bluetooth bluez5-dun) \ |
209 |
$(multilib_native_use_enable bluetooth bluez5-dun) \ |
| 195 |
$(multilib_native_use_enable introspection) \ |
210 |
$(multilib_native_use_enable introspection) \ |
| 196 |
$(multilib_native_use_enable json json-validation) \ |
211 |
$(multilib_native_use_enable json json-validation) \ |
| 197 |
$(multilib_native_use_enable ppp) \ |
212 |
$(multilib_native_use_enable ppp) \ |
| 198 |
$(use_with dhclient) \ |
213 |
$(use_with dhclient) \ |
| 199 |
--without-dhcpcd \ |
214 |
$(use_with !dhclient dhcpcd) \ |
| 200 |
$(multilib_native_use_with modemmanager modem-manager-1) \ |
215 |
$(multilib_native_use_with modemmanager modem-manager-1) \ |
| 201 |
$(multilib_native_use_with ncurses nmtui) \ |
216 |
$(multilib_native_use_with ncurses nmtui) \ |
| 202 |
$(multilib_native_use_with ofono) \ |
217 |
$(multilib_native_use_with ofono) \ |
