summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <sven.eden@gmx.de>2016-11-25 14:07:53 +0100
committerSven Eden <sven.eden@gmx.de>2016-11-25 14:07:53 +0100
commitd1c05d369fbc6090dc9a46c5b47243436b991dc4 (patch)
tree6a006059b2d42ac261434bdc693184c031ae1379
parentsys-auth/elogind-219.12-r9 : Fix libelogind.pc going into the wrong directory. (diff)
downloadseden-d1c05d369fbc6090dc9a46c5b47243436b991dc4.tar.gz
seden-d1c05d369fbc6090dc9a46c5b47243436b991dc4.tar.bz2
seden-d1c05d369fbc6090dc9a46c5b47243436b991dc4.zip
sys-fs/udisks-2.1.7-r4 : Apply fixes from official udisks-2.1.7-r1 ebuild
-rw-r--r--profiles/package.mask/elogind2
-rw-r--r--sys-fs/udisks/udisks-2.1.7-r4.ebuild (renamed from sys-fs/udisks/udisks-2.1.7-r3.ebuild)6
2 files changed, 5 insertions, 3 deletions
diff --git a/profiles/package.mask/elogind b/profiles/package.mask/elogind
index 9ecd8a8..6694404 100644
--- a/profiles/package.mask/elogind
+++ b/profiles/package.mask/elogind
@@ -9,7 +9,7 @@
=sys-auth/elogind-219.12-r9
=sys-auth/pambase-20150213-r2
=sys-auth/polkit-0.113-r203
-=sys-fs/udisks-2.1.7-r3
+=sys-fs/udisks-2.1.7-r4
=sys-process/procps-3.3.12-r2
=x11-apps/xinit-1.3.4-r2
=x11-base/xorg-server-1.18.4-r1
diff --git a/sys-fs/udisks/udisks-2.1.7-r3.ebuild b/sys-fs/udisks/udisks-2.1.7-r4.ebuild
index 2b8656a..d8e359f 100644
--- a/sys-fs/udisks/udisks-2.1.7-r3.ebuild
+++ b/sys-fs/udisks/udisks-2.1.7-r4.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=6
-inherit autotools bash-completion-r1 eutils linux-info systemd udev
+inherit autotools bash-completion-r1 eutils linux-info systemd udev xdg-utils
DESCRIPTION="Daemon providing interfaces to work with storage devices"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
@@ -69,12 +69,14 @@ pkg_setup() {
}
src_prepare() {
+ xdg_environment_reset
+
default
if use elogind; then
epatch "${FILESDIR}"/${PN}-enable-elogind.patch || die
eautoreconf
- elif use !systemd; then
+ elif ! use systemd; then
sed -i -e 's:libsystemd-login:&disable:' configure || die
fi