| 1 |
commit: 7ddd8548bf1a60b377aa9c73138a68c69f4e474e |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 2 12:34:19 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 2 12:35:26 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ddd8548 |
| 7 |
|
| 8 |
sys-apps/systemd: install manpage indexes |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/584676 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0_rc1_p14 |
| 13 |
|
| 14 |
sys-apps/systemd/Manifest | 1 + |
| 15 |
sys-apps/systemd/metadata.xml | 1 + |
| 16 |
sys-apps/systemd/systemd-230-r1.ebuild | 21 +++++++++++++++++---- |
| 17 |
sys-apps/systemd/systemd-9999.ebuild | 23 ++++++++++++++++++----- |
| 18 |
4 files changed, 37 insertions(+), 9 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest |
| 21 |
index d065f42..d8d00ba 100644 |
| 22 |
--- a/sys-apps/systemd/Manifest |
| 23 |
+++ b/sys-apps/systemd/Manifest |
| 24 |
@@ -3,5 +3,6 @@ DIST systemd-226.tar.gz 3914162 SHA256 baff6a938c5579769330d0224280bf1a1ff592015 |
| 25 |
DIST systemd-228.tar.gz 4034401 SHA256 dd124ff561a07e6439ed2b3713f38ca914df7747f110ce86deea17b56d245ae6 SHA512 e54f282f550854dc082a4788709905e5767b75d2057e18d749b54821f2e44e0a8d1349b1a9180036cc854ecccaf5ff86b3b1dba4d3c2ce1b1fc766930ea4c0ea WHIRLPOOL 16b28367edc29a74f5b08691839da39a02d55bf5bcdffef55bfb1a2e8065eeecbe22a2b661e2d5f161f008d05baa000aff60d662d65db380d6c3fe0c1380eea1 |
| 26 |
DIST systemd-229-patches.tar.gz 10782 SHA256 bd688e614177903bbf0204a00afebcb39760c3c694e7a6dd71544290677bfb5a SHA512 b0a7be84827f1553dccc00a0100c2f79160cc5285ce1582e7093e790a373d34b2a94f2805df5ade37a17285ae2f7d02890a495c2cc57e3475a3bdc831f05db52 WHIRLPOOL 643daee4fd23a5a326419cc769f8735d82bffa5ae1d9e9019ed4adfb04aba343f1459761c1d9b6ab3482e1a50cd7b0976a77ecc0bfb7075839000551d35bcb3f |
| 27 |
DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392 |
| 28 |
+DIST systemd-230-man.tar.gz 29191 SHA256 e09ddd909d7aedbf2c1fac7a8f487fd6d0fab0745867c4b948bf8d2cc18fb7a0 SHA512 0ba2f5b0f17ee824df0f6a07d1cbd6fcf7b29d0532a79e2f4cd7cce9e723b14910743badf534cb602729adfc0203e7e8e119bc59beec9fe0f293d5afcfb7cf0c WHIRLPOOL d71fb97e53c08aa4e5d28ca186a417a725d26c287d60372075fa70da9e2ec2796767af55fe4f312e6153566b042b06c02b2e2950eb7188561815a6a3d0b79f9b |
| 29 |
DIST systemd-230-patches.tar.gz 11858 SHA256 7a40071ffa2e43dda5ac2dfc91a263b0599b32dd5590d968e1077bebfce5654b SHA512 302420aabedd07b5a0b00b1f2e7500913586e867e548bde4ef6ee81cb3bd1682bdeac061111f9d8e120f4111cde2c709ed02922d56b0940d5603daff18003215 WHIRLPOOL 44f5ecaa5655e8eba3832b662fd30c7c6ca22f5d34f5d538587aa90b437457e149cd8f99bd83aec863991ec9fb5aef867218ad73a333580fe22f322ab4e3746f |
| 30 |
DIST systemd-230.tar.gz 4288027 SHA256 46b07568142adcd017c62e6230d39eb10d219ed3b2f13ffc12d9a3a6b1c840cd SHA512 a0057c5258055a6b4000eb762ab2ec3c5329361711540f7124ba5c4b1119a1b531ad336ddef3bbe5d08218c8d7f1fd175c86d61357ac72935a932921cff28a96 WHIRLPOOL 95404535eb85d3b8c20dc13b12427a9da1f92729eb9e66a58d7e990f09fee28762be00088897bf1bf485d9a34619799ff0171a161824cc8f135ac2438e978d1e |
| 31 |
|
| 32 |
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml |
| 33 |
index c7dd4ee..d616b8f 100644 |
| 34 |
--- a/sys-apps/systemd/metadata.xml |
| 35 |
+++ b/sys-apps/systemd/metadata.xml |
| 36 |
@@ -14,6 +14,7 @@ |
| 37 |
<!-- TODO: drop reference to systemd-import once the oldest release in tree is >218 --> |
| 38 |
<flag name="curl">Enable support for uploading journals; required to build systemd-import/systemd-pull</flag> |
| 39 |
<flag name="cryptsetup">Enable cryptsetup tools (includes unit generator for crypttab)</flag> |
| 40 |
+ <flag name="doc">Generate systemd.index.7 and systemd.directives.7</flag> |
| 41 |
<flag name="gnuefi">Enable EFI boot manager and stub loader (built using <pkg>sys-boot/gnu-efi</pkg>)</flag> |
| 42 |
<flag name="elfutils">Enable coredump stacktraces in the journal</flag> |
| 43 |
<!-- TODO: drop reference to systemd-import once the oldest release in tree is >218 --> |
| 44 |
|
| 45 |
diff --git a/sys-apps/systemd/systemd-230-r1.ebuild b/sys-apps/systemd/systemd-230-r1.ebuild |
| 46 |
index c61d9a4..b6cf915 100644 |
| 47 |
--- a/sys-apps/systemd/systemd-230-r1.ebuild |
| 48 |
+++ b/sys-apps/systemd/systemd-230-r1.ebuild |
| 49 |
@@ -9,19 +9,21 @@ if [[ ${PV} == 9999 ]]; then |
| 50 |
inherit git-r3 |
| 51 |
else |
| 52 |
SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz |
| 53 |
+ !doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz ) |
| 54 |
https://dev.gentoo.org/~floppym/dist/${P}-patches.tar.gz" |
| 55 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 56 |
fi |
| 57 |
|
| 58 |
-inherit autotools bash-completion-r1 linux-info \ |
| 59 |
- multilib-minimal pam systemd toolchain-funcs udev user |
| 60 |
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) |
| 61 |
+ |
| 62 |
+inherit autotools bash-completion-r1 linux-info multilib-minimal pam python-any-r1 systemd toolchain-funcs udev user |
| 63 |
|
| 64 |
DESCRIPTION="System and service manager for Linux" |
| 65 |
HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" |
| 66 |
|
| 67 |
LICENSE="GPL-2 LGPL-2.1 MIT public-domain" |
| 68 |
SLOT="0/2" |
| 69 |
-IUSE="acl apparmor audit cryptsetup curl elfutils +gcrypt gnuefi http |
| 70 |
+IUSE="acl apparmor audit cryptsetup curl doc elfutils +gcrypt gnuefi http |
| 71 |
idn importd +kdbus +kmod +lz4 lzma nat pam policykit |
| 72 |
qrcode +seccomp selinux ssl sysv-utils test vanilla xkb" |
| 73 |
|
| 74 |
@@ -94,8 +96,13 @@ DEPEND="${COMMON_DEPEND} |
| 75 |
app-text/docbook-xml-dtd:4.5 |
| 76 |
app-text/docbook-xsl-stylesheets |
| 77 |
dev-libs/libxslt:0 |
| 78 |
+ doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') ) |
| 79 |
" |
| 80 |
|
| 81 |
+python_check_deps() { |
| 82 |
+ has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]" |
| 83 |
+} |
| 84 |
+ |
| 85 |
pkg_pretend() { |
| 86 |
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS |
| 87 |
~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE |
| 88 |
@@ -167,6 +174,8 @@ src_configure() { |
| 89 |
# Prevent conflicts with i686 cross toolchain, bug 559726 |
| 90 |
tc-export AR CC NM OBJCOPY RANLIB |
| 91 |
|
| 92 |
+ use doc && python_setup |
| 93 |
+ |
| 94 |
multilib-minimal_src_configure |
| 95 |
} |
| 96 |
|
| 97 |
@@ -203,7 +212,6 @@ multilib_src_configure() { |
| 98 |
# no deps |
| 99 |
--enable-efi |
| 100 |
--enable-ima |
| 101 |
- --without-python |
| 102 |
|
| 103 |
# Optional components/dependencies |
| 104 |
$(multilib_native_use_enable acl) |
| 105 |
@@ -233,6 +241,7 @@ multilib_src_configure() { |
| 106 |
$(multilib_native_use_enable test tests) |
| 107 |
$(multilib_native_use_enable test dbus) |
| 108 |
$(multilib_native_use_enable xkb xkbcommon) |
| 109 |
+ $(multilib_native_use_with doc python) |
| 110 |
|
| 111 |
# hardcode a few paths to spare some deps |
| 112 |
KILL=/bin/kill |
| 113 |
@@ -314,6 +323,10 @@ multilib_src_install_all() { |
| 114 |
prune_libtool_files --modules |
| 115 |
einstalldocs |
| 116 |
|
| 117 |
+ if [[ ${PV} != 9999 ]]; then |
| 118 |
+ use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7 |
| 119 |
+ fi |
| 120 |
+ |
| 121 |
if use sysv-utils; then |
| 122 |
for app in halt poweroff reboot runlevel shutdown telinit; do |
| 123 |
dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app} |
| 124 |
|
| 125 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 126 |
index bfdb3ea..97dd86b 100644 |
| 127 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 128 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 129 |
@@ -8,19 +8,21 @@ if [[ ${PV} == 9999 ]]; then |
| 130 |
EGIT_REPO_URI="https://github.com/systemd/systemd.git" |
| 131 |
inherit git-r3 |
| 132 |
else |
| 133 |
- SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 134 |
+ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz |
| 135 |
+ !doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )" |
| 136 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 137 |
fi |
| 138 |
|
| 139 |
-inherit autotools bash-completion-r1 linux-info \ |
| 140 |
- multilib-minimal pam systemd toolchain-funcs udev user |
| 141 |
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) |
| 142 |
+ |
| 143 |
+inherit autotools bash-completion-r1 linux-info multilib-minimal pam python-any-r1 systemd toolchain-funcs udev user |
| 144 |
|
| 145 |
DESCRIPTION="System and service manager for Linux" |
| 146 |
HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" |
| 147 |
|
| 148 |
LICENSE="GPL-2 LGPL-2.1 MIT public-domain" |
| 149 |
SLOT="0/2" |
| 150 |
-IUSE="acl apparmor audit cryptsetup curl elfutils +gcrypt gnuefi http |
| 151 |
+IUSE="acl apparmor audit cryptsetup curl doc elfutils +gcrypt gnuefi http |
| 152 |
idn importd +kdbus +kmod +lz4 lzma nat pam policykit |
| 153 |
qrcode +seccomp selinux ssl sysv-utils test vanilla xkb" |
| 154 |
|
| 155 |
@@ -93,8 +95,13 @@ DEPEND="${COMMON_DEPEND} |
| 156 |
app-text/docbook-xml-dtd:4.5 |
| 157 |
app-text/docbook-xsl-stylesheets |
| 158 |
dev-libs/libxslt:0 |
| 159 |
+ doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') ) |
| 160 |
" |
| 161 |
|
| 162 |
+python_check_deps() { |
| 163 |
+ has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]" |
| 164 |
+} |
| 165 |
+ |
| 166 |
pkg_pretend() { |
| 167 |
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS |
| 168 |
~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE |
| 169 |
@@ -166,6 +173,8 @@ src_configure() { |
| 170 |
# Prevent conflicts with i686 cross toolchain, bug 559726 |
| 171 |
tc-export AR CC NM OBJCOPY RANLIB |
| 172 |
|
| 173 |
+ use doc && python_setup |
| 174 |
+ |
| 175 |
multilib-minimal_src_configure |
| 176 |
} |
| 177 |
|
| 178 |
@@ -202,7 +211,6 @@ multilib_src_configure() { |
| 179 |
# no deps |
| 180 |
--enable-efi |
| 181 |
--enable-ima |
| 182 |
- --without-python |
| 183 |
|
| 184 |
# Optional components/dependencies |
| 185 |
$(multilib_native_use_enable acl) |
| 186 |
@@ -232,6 +240,7 @@ multilib_src_configure() { |
| 187 |
$(multilib_native_use_enable test tests) |
| 188 |
$(multilib_native_use_enable test dbus) |
| 189 |
$(multilib_native_use_enable xkb xkbcommon) |
| 190 |
+ $(multilib_native_use_with doc python) |
| 191 |
|
| 192 |
# hardcode a few paths to spare some deps |
| 193 |
KILL=/bin/kill |
| 194 |
@@ -313,6 +322,10 @@ multilib_src_install_all() { |
| 195 |
prune_libtool_files --modules |
| 196 |
einstalldocs |
| 197 |
|
| 198 |
+ if [[ ${PV} != 9999 ]]; then |
| 199 |
+ use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7 |
| 200 |
+ fi |
| 201 |
+ |
| 202 |
if use sysv-utils; then |
| 203 |
for app in halt poweroff reboot runlevel shutdown telinit; do |
| 204 |
dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app} |
Archives