[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-tmpfiles/files/, sys-apps/systemd-tmpfiles/

[Georgy Yakovlev]

commit:     e19af85ca42eaeeefb8e1083816e4d1ec1085c0d
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 06:17:04 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 06:17:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e19af85c

sys-apps/systemd-tmpfiles: add missing BDEPEND section, rename files

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-apps/systemd-tmpfiles/files/stmpfiles-setup.confd   |  2 --
 .../files/{stmpfiles-dev.confd => stmpfiles.confd}      |  0
 sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild   | 17 +++++++++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/sys-apps/systemd-tmpfiles/files/stmpfiles-setup.confd 
b/sys-apps/systemd-tmpfiles/files/stmpfiles-setup.confd
deleted file mode 100644
index 2ec4b5f0d8b..00000000000
--- a/sys-apps/systemd-tmpfiles/files/stmpfiles-setup.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# Extra options to pass to stmpfiles
-#stmpfiles_opts=""

diff --git a/sys-apps/systemd-tmpfiles/files/stmpfiles-dev.confd 
b/sys-apps/systemd-tmpfiles/files/stmpfiles.confd
similarity index 100%
rename from sys-apps/systemd-tmpfiles/files/stmpfiles-dev.confd
rename to sys-apps/systemd-tmpfiles/files/stmpfiles.confd

diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild 
b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
index 5b99c6958bc..141386b6e3e 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
@@ -25,6 +25,18 @@ RDEPEND="${DEPEND}
        !sys-apps/systemd
 "
 
+BDEPEND="
+       app-text/docbook-xml-dtd:4.2
+       app-text/docbook-xml-dtd:4.5
+       app-text/docbook-xsl-stylesheets
+       dev-libs/libxslt:0
+       >=dev-util/meson-0.46
+       >=dev-util/intltool-0.50
+       >=sys-apps/coreutils-8.16
+       sys-devel/m4
+       virtual/pkgconfig
+"
+
 S="${WORKDIR}/systemd-${PV}"
 
 src_configure() {
@@ -151,8 +163,9 @@ src_install() {
        newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev
        newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup
 
-       newconfd "${FILESDIR}"/stmpfiles-dev.confd stmpfiles-dev
-       newconfd "${FILESDIR}"/stmpfiles-setup.confd stmpfiles-setup
+       # same content, but install as different file
+       newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev
+       newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup
 }
 
 # adapted from opentmpfiles ebuild