commit: e1216ad522c5b134dc5d666882af155a46b7e23b Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Mon Mar 21 21:48:21 2022 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Mon Mar 21 21:48:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1216ad5
dev-cpp/sdbus-c++: Use python-any-r1 eclass to build systemd Closes: https://bugs.gentoo.org/835705 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild | 15 ++++++++++++++- dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild index 2e96c31113c1..04f6c85c5a16 100644 --- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild +++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit meson cmake +PYTHON_COMPAT=( python3_{8..10} ) +inherit python-any-r1 meson cmake SDP="systemd-stable-250.4" DESCRIPTION="High-level C++ D-Bus library" @@ -34,12 +35,24 @@ DEPEND=" BDEPEND=" virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) + !systemd? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') + ) " +python_check_deps() { + has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" +} + S="${WORKDIR}/sdbus-cpp-${PV}" SDS="${WORKDIR}/${SDP}" SDB="${WORKDIR}/systemd-build" +pkg_setup() { + use systemd || python-any-r1_pkg_setup +} + src_prepare() { if ! use systemd; then pushd "${SDS}" || die diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild index 454cc5196d10..7eee346da844 100644 --- a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild +++ b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit meson cmake +PYTHON_COMPAT=( python3_{8..10} ) +inherit python-any-r1 meson cmake SDP="systemd-stable-250.4" DESCRIPTION="High-level C++ D-Bus library" @@ -34,8 +35,16 @@ DEPEND=" BDEPEND=" virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) + !systemd? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') + ) " +python_check_deps() { + has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" +} + S="${WORKDIR}/sdbus-cpp-${PV}" SDS="${WORKDIR}/${SDP}" SDB="${WORKDIR}/systemd-build" @@ -44,6 +53,10 @@ PATCHES=( "${FILESDIR}"/${PN}-gtest-1.11.patch ) +pkg_setup() { + use systemd || python-any-r1_pkg_setup +} + src_prepare() { if ! use systemd; then pushd "${SDS}" || die
