From c6c6c2e6e6a7c02c3545d835387b096dcf5b14f8 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 9 Dec 2014 18:53:17 -0800 Subject: [PATCH] systemd: fix build depends for patched sources Patches routinely modify the man page source XML, invalidating the prebuilt man pages provided by release tarballs. Patch the live ebuild too and require the docbook XML DTDs unconditionally like we did for 215 all the time going forward so this issue isn't forgotten again during the next version bump. --- .../coreos-overlay/sys-apps/systemd/systemd-217-r4.ebuild | 7 +++++-- .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-217-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-217-r4.ebuild index b1a84377fc..b447c4797c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-217-r4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-217-r4.ebuild @@ -99,12 +99,15 @@ DEPEND="${COMMON_DEPEND} python? ( dev-python/lxml[${PYTHON_USEDEP}] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 )" -if [[ ${PV} == *9999 ]]; then +# Only required if patches touch man page source xml, which is usually. DEPEND="${DEPEND} app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 + dev-libs/libxslt:0" + +if [[ ${PV} == *9999 ]]; then +DEPEND="${DEPEND} dev-libs/gobject-introspection >=dev-libs/libgcrypt-1.4.5:0" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index f1812166e7..8a7f3928ab 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -98,12 +98,15 @@ DEPEND="${COMMON_DEPEND} python? ( dev-python/lxml[${PYTHON_USEDEP}] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 )" -if [[ ${PV} == *9999 ]]; then +# Only required if patches touch man page source xml, which is usually. DEPEND="${DEPEND} app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 + dev-libs/libxslt:0" + +if [[ ${PV} == *9999 ]]; then +DEPEND="${DEPEND} dev-libs/gobject-introspection >=dev-libs/libgcrypt-1.4.5:0"