systemd: apply a few trivial changes from upstream

This commit is contained in:
Michael Marineau 2015-05-12 14:15:10 -07:00
parent 9b5c37fa39
commit ce4e710c6c

View File

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation # Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.160 2015/02/20 16:13:22 floppym Exp $ # $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.164 2015/04/18 23:54:18 floppym Exp $
EAPI=5 EAPI=5
@ -22,7 +22,7 @@ inherit cros-workon
AUTOTOOLS_AUTORECONF=yes AUTOTOOLS_AUTORECONF=yes
AUTOTOOLS_PRUNE_LIBTOOL_FILES=all AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit autotools-utils bash-completion-r1 linux-info multilib \ inherit autotools-utils bash-completion-r1 linux-info multilib \
multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \ multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
user user
@ -45,6 +45,7 @@ MINKV="3.8"
COMMON_DEPEND=">=sys-apps/util-linux-2.25:0= COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
sys-libs/libcap:0= sys-libs/libcap:0=
!<sys-libs/glibc-2.16
acl? ( sys-apps/acl:0= ) acl? ( sys-apps/acl:0= )
apparmor? ( sys-libs/libapparmor:0= ) apparmor? ( sys-libs/libapparmor:0= )
audit? ( >=sys-process/audit-2:0= ) audit? ( >=sys-process/audit-2:0= )
@ -86,7 +87,6 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
RDEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND}
>=sys-apps/baselayout-2.2 >=sys-apps/baselayout-2.2
!sys-auth/nss-myhostname !sys-auth/nss-myhostname
!<sys-libs/glibc-2.14
!sys-fs/eudev !sys-fs/eudev
!sys-fs/udev" !sys-fs/udev"
@ -255,6 +255,9 @@ multilib_src_configure() {
QUOTAON=/usr/sbin/quotaon QUOTAON=/usr/sbin/quotaon
QUOTACHECK=/usr/sbin/quotacheck QUOTACHECK=/usr/sbin/quotacheck
# TODO: we may need to restrict this to gcc
EFI_CC="$(tc-getCC)"
# dbus paths # dbus paths
--with-dbuspolicydir="${EPREFIX}/usr/share/dbus-1/system.d" --with-dbuspolicydir="${EPREFIX}/usr/share/dbus-1/system.d"
--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"