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>
This commit is contained in:
Ionen Wolkens
2021-07-08 19:55:40 -04:00
parent 68b0ead2f4
commit 843e613654
2 changed files with 14 additions and 1 deletions

View File

@@ -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
}

View File

@@ -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
}