sys-apps/systemd: install manpage indexes

Bug: https://bugs.gentoo.org/584676

Package-Manager: portage-2.3.0_rc1_p14

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index d065f425eeb642b781cf7e86d652cfb699c62fb6..d8d00baf1c117c7056a2695c3408b648232e092e 100644 (file)
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -3,5 +3,6 @@ DIST systemd-226.tar.gz 3914162 SHA256 baff6a938c5579769330d0224280bf1a1ff592015
 DIST systemd-228.tar.gz 4034401 SHA256 dd124ff561a07e6439ed2b3713f38ca914df7747f110ce86deea17b56d245ae6 SHA512 e54f282f550854dc082a4788709905e5767b75d2057e18d749b54821f2e44e0a8d1349b1a9180036cc854ecccaf5ff86b3b1dba4d3c2ce1b1fc766930ea4c0ea WHIRLPOOL 16b28367edc29a74f5b08691839da39a02d55bf5bcdffef55bfb1a2e8065eeecbe22a2b661e2d5f161f008d05baa000aff60d662d65db380d6c3fe0c1380eea1
 DIST systemd-229-patches.tar.gz 10782 SHA256 bd688e614177903bbf0204a00afebcb39760c3c694e7a6dd71544290677bfb5a SHA512 b0a7be84827f1553dccc00a0100c2f79160cc5285ce1582e7093e790a373d34b2a94f2805df5ade37a17285ae2f7d02890a495c2cc57e3475a3bdc831f05db52 WHIRLPOOL 643daee4fd23a5a326419cc769f8735d82bffa5ae1d9e9019ed4adfb04aba343f1459761c1d9b6ab3482e1a50cd7b0976a77ecc0bfb7075839000551d35bcb3f
 DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
+DIST systemd-230-man.tar.gz 29191 SHA256 e09ddd909d7aedbf2c1fac7a8f487fd6d0fab0745867c4b948bf8d2cc18fb7a0 SHA512 0ba2f5b0f17ee824df0f6a07d1cbd6fcf7b29d0532a79e2f4cd7cce9e723b14910743badf534cb602729adfc0203e7e8e119bc59beec9fe0f293d5afcfb7cf0c WHIRLPOOL d71fb97e53c08aa4e5d28ca186a417a725d26c287d60372075fa70da9e2ec2796767af55fe4f312e6153566b042b06c02b2e2950eb7188561815a6a3d0b79f9b
 DIST systemd-230-patches.tar.gz 11858 SHA256 7a40071ffa2e43dda5ac2dfc91a263b0599b32dd5590d968e1077bebfce5654b SHA512 302420aabedd07b5a0b00b1f2e7500913586e867e548bde4ef6ee81cb3bd1682bdeac061111f9d8e120f4111cde2c709ed02922d56b0940d5603daff18003215 WHIRLPOOL 44f5ecaa5655e8eba3832b662fd30c7c6ca22f5d34f5d538587aa90b437457e149cd8f99bd83aec863991ec9fb5aef867218ad73a333580fe22f322ab4e3746f
 DIST systemd-230.tar.gz 4288027 SHA256 46b07568142adcd017c62e6230d39eb10d219ed3b2f13ffc12d9a3a6b1c840cd SHA512 a0057c5258055a6b4000eb762ab2ec3c5329361711540f7124ba5c4b1119a1b531ad336ddef3bbe5d08218c8d7f1fd175c86d61357ac72935a932921cff28a96 WHIRLPOOL 95404535eb85d3b8c20dc13b12427a9da1f92729eb9e66a58d7e990f09fee28762be00088897bf1bf485d9a34619799ff0171a161824cc8f135ac2438e978d1e

diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index c7dd4eefb91b05ef7dde20697c75fd5997279ada..d616b8fb757daf31dfc8dd8fdddc5fa2ac9e442a 100644 (file)
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -14,6 +14,7 @@
                <!-- TODO: drop reference to systemd-import once the oldest release in tree is >218 -->
                <flag name="curl">Enable support for uploading journals; required to build systemd-import/systemd-pull</flag>
                <flag name="cryptsetup">Enable cryptsetup tools (includes unit generator for crypttab)</flag>
+               <flag name="doc">Generate systemd.index.7 and systemd.directives.7</flag>
                <flag name="gnuefi">Enable EFI boot manager and stub loader (built using <pkg>sys-boot/gnu-efi</pkg>)</flag>
                <flag name="elfutils">Enable coredump stacktraces in the journal</flag>
                <!-- TODO: drop reference to systemd-import once the oldest release in tree is >218 -->

diff --git a/sys-apps/systemd/systemd-230-r1.ebuild b/sys-apps/systemd/systemd-230-r1.ebuild
index c61d9a4a0e1976b5783da35342dff37d0c53ffb7..b6cf9159079e5a96b8d13ae156b19506ea30cb0a 100644 (file)
--- a/sys-apps/systemd/systemd-230-r1.ebuild
+++ b/sys-apps/systemd/systemd-230-r1.ebuild
@@ -9,19 +9,21 @@ if [[ ${PV} == 9999 ]]; then
        inherit git-r3
 else
        SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+               !doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )
                https://dev.gentoo.org/~floppym/dist/${P}-patches.tar.gz"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-inherit autotools bash-completion-r1 linux-info \
-       multilib-minimal pam systemd toolchain-funcs udev user
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit autotools bash-completion-r1 linux-info  multilib-minimal pam python-any-r1 systemd toolchain-funcs udev user
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit cryptsetup curl elfutils +gcrypt gnuefi http
+IUSE="acl apparmor audit cryptsetup curl doc elfutils +gcrypt gnuefi http
        idn importd +kdbus +kmod +lz4 lzma nat pam policykit
        qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
 
@@ -94,8 +96,13 @@ DEPEND="${COMMON_DEPEND}
        app-text/docbook-xml-dtd:4.5
        app-text/docbook-xsl-stylesheets
        dev-libs/libxslt:0
+       doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') )
 "
 
+python_check_deps() {
+       has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
 pkg_pretend() {
        local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
                ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
@@ -167,6 +174,8 @@ src_configure() {
        # Prevent conflicts with i686 cross toolchain, bug 559726
        tc-export AR CC NM OBJCOPY RANLIB
 
+       use doc && python_setup
+
        multilib-minimal_src_configure
 }
 
@@ -203,7 +212,6 @@ multilib_src_configure() {
                # no deps
                --enable-efi
                --enable-ima
-               --without-python
 
                # Optional components/dependencies
                $(multilib_native_use_enable acl)
@@ -233,6 +241,7 @@ multilib_src_configure() {
                $(multilib_native_use_enable test tests)
                $(multilib_native_use_enable test dbus)
                $(multilib_native_use_enable xkb xkbcommon)
+               $(multilib_native_use_with doc python)
 
                # hardcode a few paths to spare some deps
                KILL=/bin/kill
@@ -314,6 +323,10 @@ multilib_src_install_all() {
        prune_libtool_files --modules
        einstalldocs
 
+       if [[ ${PV} != 9999 ]]; then
+               use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7
+       fi
+
        if use sysv-utils; then
                for app in halt poweroff reboot runlevel shutdown telinit; do
                        dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index bfdb3ea3d4b33e668ae80dcb13759a5bf211e1a9..97dd86be86006fea25e6c2925c13b0dc620f1e52 100644 (file)
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -8,19 +8,21 @@ if [[ ${PV} == 9999 ]]; then
        EGIT_REPO_URI="https://github.com/systemd/systemd.git"
        inherit git-r3
 else
-       SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+       SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+               !doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-inherit autotools bash-completion-r1 linux-info \
-       multilib-minimal pam systemd toolchain-funcs udev user
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit autotools bash-completion-r1 linux-info  multilib-minimal pam python-any-r1 systemd toolchain-funcs udev user
 
 DESCRIPTION="System and service manager for Linux"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit cryptsetup curl elfutils +gcrypt gnuefi http
+IUSE="acl apparmor audit cryptsetup curl doc elfutils +gcrypt gnuefi http
        idn importd +kdbus +kmod +lz4 lzma nat pam policykit
        qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
 
@@ -93,8 +95,13 @@ DEPEND="${COMMON_DEPEND}
        app-text/docbook-xml-dtd:4.5
        app-text/docbook-xsl-stylesheets
        dev-libs/libxslt:0
+       doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') )
 "
 
+python_check_deps() {
+       has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
 pkg_pretend() {
        local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
                ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
@@ -166,6 +173,8 @@ src_configure() {
        # Prevent conflicts with i686 cross toolchain, bug 559726
        tc-export AR CC NM OBJCOPY RANLIB
 
+       use doc && python_setup
+
        multilib-minimal_src_configure
 }
 
@@ -202,7 +211,6 @@ multilib_src_configure() {
                # no deps
                --enable-efi
                --enable-ima
-               --without-python
 
                # Optional components/dependencies
                $(multilib_native_use_enable acl)
@@ -232,6 +240,7 @@ multilib_src_configure() {
                $(multilib_native_use_enable test tests)
                $(multilib_native_use_enable test dbus)
                $(multilib_native_use_enable xkb xkbcommon)
+               $(multilib_native_use_with doc python)
 
                # hardcode a few paths to spare some deps
                KILL=/bin/kill
@@ -313,6 +322,10 @@ multilib_src_install_all() {
        prune_libtool_files --modules
        einstalldocs
 
+       if [[ ${PV} != 9999 ]]; then
+               use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7
+       fi
+
        if use sysv-utils; then
                for app in halt poweroff reboot runlevel shutdown telinit; do
                        dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}