Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-tmpfiles/files/, sys-apps/systemd-tmpfiles/
Date: Thu, 29 Oct 2020 06:18:59
Message-Id: 1603952240.e19af85ca42eaeeefb8e1083816e4d1ec1085c0d.gyakovlev@gentoo
1 commit: e19af85ca42eaeeefb8e1083816e4d1ec1085c0d
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 29 06:17:04 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 29 06:17:20 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e19af85c
7
8 sys-apps/systemd-tmpfiles: add missing BDEPEND section, rename files
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.2
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 sys-apps/systemd-tmpfiles/files/stmpfiles-setup.confd | 2 --
14 .../files/{stmpfiles-dev.confd => stmpfiles.confd} | 0
15 sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild | 17 +++++++++++++++--
16 3 files changed, 15 insertions(+), 4 deletions(-)
17
18 diff --git a/sys-apps/systemd-tmpfiles/files/stmpfiles-setup.confd b/sys-apps/systemd-tmpfiles/files/stmpfiles-setup.confd
19 deleted file mode 100644
20 index 2ec4b5f0d8b..00000000000
21 --- a/sys-apps/systemd-tmpfiles/files/stmpfiles-setup.confd
22 +++ /dev/null
23 @@ -1,2 +0,0 @@
24 -# Extra options to pass to stmpfiles
25 -#stmpfiles_opts=""
26
27 diff --git a/sys-apps/systemd-tmpfiles/files/stmpfiles-dev.confd b/sys-apps/systemd-tmpfiles/files/stmpfiles.confd
28 similarity index 100%
29 rename from sys-apps/systemd-tmpfiles/files/stmpfiles-dev.confd
30 rename to sys-apps/systemd-tmpfiles/files/stmpfiles.confd
31
32 diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
33 index 5b99c6958bc..141386b6e3e 100644
34 --- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
35 +++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
36 @@ -25,6 +25,18 @@ RDEPEND="${DEPEND}
37 !sys-apps/systemd
38 "
39
40 +BDEPEND="
41 + app-text/docbook-xml-dtd:4.2
42 + app-text/docbook-xml-dtd:4.5
43 + app-text/docbook-xsl-stylesheets
44 + dev-libs/libxslt:0
45 + >=dev-util/meson-0.46
46 + >=dev-util/intltool-0.50
47 + >=sys-apps/coreutils-8.16
48 + sys-devel/m4
49 + virtual/pkgconfig
50 +"
51 +
52 S="${WORKDIR}/systemd-${PV}"
53
54 src_configure() {
55 @@ -151,8 +163,9 @@ src_install() {
56 newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev
57 newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup
58
59 - newconfd "${FILESDIR}"/stmpfiles-dev.confd stmpfiles-dev
60 - newconfd "${FILESDIR}"/stmpfiles-setup.confd stmpfiles-setup
61 + # same content, but install as different file
62 + newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev
63 + newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup
64 }
65
66 # adapted from opentmpfiles ebuild