diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2021-07-08 19:55:40 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2021-07-08 20:10:16 -0400 |
| commit | 843e613654e1b705b1783d2072d795dcaab3d845 (patch) | |
| tree | f9bdafe3f8f5235596f100486f073fd2b7e99f3d /sys-fs/bees | |
| parent | sys-kernel/gentoo-kernel-bin: bump to 5.12.14-r1 for arm64 (diff) | |
| download | gentoo-843e613654e1b705b1783d2072d795dcaab3d845.tar.gz gentoo-843e613654e1b705b1783d2072d795dcaab3d845.tar.bz2 gentoo-843e613654e1b705b1783d2072d795dcaab3d845.zip | |
sys-fs/bees: fix systemd unit and prefix
New quotes (that are needed to handle spaces) leak inside
the systemd unit preventing it from starting. Also, was
missing ETC_PREFIX path. LIBDIR no longer needed in -9999.
Fixing on maintainer's behalf given I indirectly caused this issue.
Closes: https://github.com/gentoo/gentoo/pull/21570
Thanks-to: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'sys-fs/bees')
| -rw-r--r-- | sys-fs/bees/bees-0.6.5-r1.ebuild (renamed from sys-fs/bees/bees-0.6.5.ebuild) | 7 | ||||
| -rw-r--r-- | sys-fs/bees/bees-9999.ebuild | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/sys-fs/bees/bees-0.6.5.ebuild b/sys-fs/bees/bees-0.6.5-r1.ebuild index a52e8e18f6c9..ee339e86c5d3 100644 --- a/sys-fs/bees/bees-0.6.5.ebuild +++ b/sys-fs/bees/bees-0.6.5-r1.ebuild @@ -77,6 +77,7 @@ src_prepare() { src_configure() { tc-export CC CXX cat >localconf <<-EOF || die + ETC_PREFIX="${EPREFIX}/etc" LIBEXEC_PREFIX="${EPREFIX}/usr/libexec" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/$(get_libdir)" @@ -92,3 +93,9 @@ src_configure() { echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die fi } + +src_compile() { + default + # localconf quotes leak in the systemd unit but are still needed for spaces + sed -i 's/"//g' scripts/beesd@.service || die +} diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild index 7777d0ea45fd..7fffe63931c2 100644 --- a/sys-fs/bees/bees-9999.ebuild +++ b/sys-fs/bees/bees-9999.ebuild @@ -74,9 +74,9 @@ src_prepare() { src_configure() { tc-export CC CXX AR cat >localconf <<-EOF || die + ETC_PREFIX="${EPREFIX}/etc" LIBEXEC_PREFIX="${EPREFIX}/usr/libexec" PREFIX="${EPREFIX}/usr" - LIBDIR="${EPREFIX}/$(get_libdir)" SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)" DEFAULT_MAKE_TARGET=all EOF @@ -87,3 +87,9 @@ src_configure() { echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die fi } + +src_compile() { + default + # localconf quotes leak in the systemd unit but are still needed for spaces + sed -i 's/"//g' scripts/beesd@.service || die +} |