summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2017-05-29 16:42:22 -0400
committerMike Gilbert <floppym@gentoo.org>2017-05-29 16:44:14 -0400
commit42b11bc1d31857b42efff40f8069f9b57593ca20 (patch)
tree09418a02aee59ae9c1fedc8d8c3733fc5d9e1574 /sys-apps
parentpackage.mask: Mask app-shells/z for removal (diff)
downloadgentoo-42b11bc1d31857b42efff40f8069f9b57593ca20.tar.gz
gentoo-42b11bc1d31857b42efff40f8069f9b57593ca20.tar.bz2
gentoo-42b11bc1d31857b42efff40f8069f9b57593ca20.zip
sys-apps/systemd: use meson.eclass
Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild12
1 files changed, 2 insertions, 10 deletions
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index e384f59919aa..beab35a74419 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -13,7 +13,7 @@ fi
PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-inherit bash-completion-r1 linux-info multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
DESCRIPTION="System and service manager for Linux"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
@@ -91,8 +91,6 @@ DEPEND="${COMMON_DEPEND}
app-arch/xz-utils:0
dev-util/gperf
>=dev-util/intltool-0.50
- >=dev-util/meson-0.40.0
- dev-util/ninja
>=sys-apps/coreutils-8.16
>=sys-kernel/linux-headers-${MINKV}
virtual/pkgconfig
@@ -199,10 +197,6 @@ meson_multilib_native_use() {
multilib_src_configure() {
local myconf=(
- --buildtype=plain
- --prefix="${EPREFIX}/usr"
- --libdir="$(get_libdir)"
- --sysconfdir="${EPREFIX}/etc"
--localstatedir="${EPREFIX}/var"
-Dpamlibdir="$(getpam_mod_dir)"
# avoid bash-completion dep
@@ -283,9 +277,7 @@ multilib_src_configure() {
)
fi
- set -- meson "${myconf[@]}" "${S}"
- echo "$@"
- "$@" || die
+ meson_src_configure "${myconf[@]}"
}
multilib_src_compile() {