| 1 |
commit: a8233cc1127f6191c96942a43807ec583567c6a1 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 27 13:23:36 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 27 13:24:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8233cc1 |
| 7 |
|
| 8 |
sys-apps/systemd: depend on lxml unconditionally |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5_p31, Repoman-2.3.2_p61 |
| 11 |
|
| 12 |
sys-apps/systemd/systemd-9999.ebuild | 18 ++++-------------- |
| 13 |
1 file changed, 4 insertions(+), 14 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 16 |
index aacb665331d..4d9b716196d 100644 |
| 17 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 18 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 19 |
@@ -7,8 +7,7 @@ if [[ ${PV} == 9999 ]]; then |
| 20 |
EGIT_REPO_URI="https://github.com/systemd/systemd.git" |
| 21 |
inherit git-r3 |
| 22 |
else |
| 23 |
- SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz |
| 24 |
- !doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )" |
| 25 |
+ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 26 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 27 |
fi |
| 28 |
|
| 29 |
@@ -21,7 +20,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" |
| 30 |
|
| 31 |
LICENSE="GPL-2 LGPL-2.1 MIT public-domain" |
| 32 |
SLOT="0/2" |
| 33 |
-IUSE="acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http |
| 34 |
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http |
| 35 |
idn importd +kmod +lz4 lzma nat pam policykit |
| 36 |
qrcode +seccomp selinux ssl sysv-utils test vanilla xkb" |
| 37 |
|
| 38 |
@@ -100,13 +99,9 @@ DEPEND="${COMMON_DEPEND} |
| 39 |
app-text/docbook-xml-dtd:4.5 |
| 40 |
app-text/docbook-xsl-stylesheets |
| 41 |
dev-libs/libxslt:0 |
| 42 |
- doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') ) |
| 43 |
+ $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') |
| 44 |
" |
| 45 |
|
| 46 |
-python_check_deps() { |
| 47 |
- has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]" |
| 48 |
-} |
| 49 |
- |
| 50 |
pkg_pretend() { |
| 51 |
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS |
| 52 |
~CHECKPOINT_RESTORE ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE |
| 53 |
@@ -171,7 +166,7 @@ src_configure() { |
| 54 |
# Prevent conflicts with i686 cross toolchain, bug 559726 |
| 55 |
tc-export AR CC NM OBJCOPY RANLIB |
| 56 |
|
| 57 |
- use doc && python_setup |
| 58 |
+ python_setup |
| 59 |
|
| 60 |
multilib-minimal_src_configure |
| 61 |
} |
| 62 |
@@ -242,7 +237,6 @@ multilib_src_configure() { |
| 63 |
#-Dtests=$(meson_ml_use test) |
| 64 |
-Ddbus=$(meson_ml_use test) |
| 65 |
-Dxkbcommon=$(meson_ml_use xkb) |
| 66 |
- -Ddoc=$(meson_ml_use doc python) |
| 67 |
# hardcode a few paths to spare some deps |
| 68 |
-Dpath-kill=/bin/kill |
| 69 |
-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" |
| 70 |
@@ -303,10 +297,6 @@ multilib_src_install_all() { |
| 71 |
einstalldocs |
| 72 |
dodoc "${FILESDIR}"/nsswitch.conf |
| 73 |
|
| 74 |
- if [[ ${PV} != 9999 ]]; then |
| 75 |
- use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7 |
| 76 |
- fi |
| 77 |
- |
| 78 |
if use sysv-utils; then |
| 79 |
for app in halt poweroff reboot runlevel shutdown telinit; do |
| 80 |
dosym "..${ROOTPREFIX%/}/bin/systemctl" /sbin/${app} |
Archives