From 76885d2ab3d7021e4db8d18238c51fa696651fa8 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 7 Jul 2015 21:39:20 -0700 Subject: [PATCH] systemd: add a 'man' use flag No need to spend time generating man pages for targets we never install man pages on. --- .../profiles/coreos/targets/generic/make.defaults | 2 +- .../profiles/coreos/targets/sdk/make.defaults | 2 +- .../sys-apps/systemd/systemd-9999.ebuild | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults index 509134dc44..4238a596b6 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 USE="cros-debug acpi usb symlink-usr cryptsetup policykit -pam" -USE="${USE} -cros_host -expat -cairo -X" +USE="${USE} -cros_host -expat -cairo -X -man" USE="${USE} -acl -cracklib -gpm -python -sha512" USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults index 676b831a14..5d10f08a03 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults @@ -1,4 +1,4 @@ -USE="-pam" +USE="man -pam" # Used by some old goo in profiles/coreos/base/profile.bashrc # TODO: clean up that old goo diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index 6b3324a5bb..7c0b822117 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -37,7 +37,7 @@ IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gnuefi gudev http qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb" # Gentoo removed the nls use flag, we'll keep it for now -IUSE+=" nls symlink-usr" +IUSE+=" man nls symlink-usr" REQUIRED_USE="importd? ( curl gcrypt lzma )" @@ -115,10 +115,10 @@ DEPEND="${COMMON_DEPEND} # Not required when building from unpatched tarballs, but we build from git. DEPEND="${DEPEND} - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 + man? ( app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt:0 ) dev-libs/gobject-introspection >=dev-libs/libgcrypt-1.4.5:0" @@ -232,6 +232,7 @@ multilib_src_configure() { $(multilib_native_use_enable kmod) $(use_enable lz4) $(use_enable lzma xz) + $(multilib_native_use_enable man manpages) $(multilib_native_use_enable nat libiptc) $(use_enable nls) $(multilib_native_use_enable pam) @@ -357,7 +358,7 @@ multilib_src_install_all() { dosym "${ROOTPREFIX-/usr}/bin/systemctl" ${prefix}/sbin/${app} done dosym "${ROOTPREFIX-/usr}/lib/systemd/systemd" ${prefix}/sbin/init - else + elif use man; then # we just keep sysvinit tools, so no need for the mans rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ || die