| 1 |
commit: 843e613654e1b705b1783d2072d795dcaab3d845 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 8 23:55:40 2021 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 9 00:10:16 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=843e6136 |
| 7 |
|
| 8 |
sys-fs/bees: fix systemd unit and prefix |
| 9 |
|
| 10 |
New quotes (that are needed to handle spaces) leak inside |
| 11 |
the systemd unit preventing it from starting. Also, was |
| 12 |
missing ETC_PREFIX path. LIBDIR no longer needed in -9999. |
| 13 |
|
| 14 |
Fixing on maintainer's behalf given I indirectly caused this issue. |
| 15 |
|
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/21570 |
| 17 |
Thanks-to: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 18 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 19 |
|
| 20 |
sys-fs/bees/{bees-0.6.5.ebuild => bees-0.6.5-r1.ebuild} | 7 +++++++ |
| 21 |
sys-fs/bees/bees-9999.ebuild | 8 +++++++- |
| 22 |
2 files changed, 14 insertions(+), 1 deletion(-) |
| 23 |
|
| 24 |
diff --git a/sys-fs/bees/bees-0.6.5.ebuild b/sys-fs/bees/bees-0.6.5-r1.ebuild |
| 25 |
similarity index 94% |
| 26 |
rename from sys-fs/bees/bees-0.6.5.ebuild |
| 27 |
rename to sys-fs/bees/bees-0.6.5-r1.ebuild |
| 28 |
index a52e8e18f6c..ee339e86c5d 100644 |
| 29 |
--- a/sys-fs/bees/bees-0.6.5.ebuild |
| 30 |
+++ b/sys-fs/bees/bees-0.6.5-r1.ebuild |
| 31 |
@@ -77,6 +77,7 @@ src_prepare() { |
| 32 |
src_configure() { |
| 33 |
tc-export CC CXX |
| 34 |
cat >localconf <<-EOF || die |
| 35 |
+ ETC_PREFIX="${EPREFIX}/etc" |
| 36 |
LIBEXEC_PREFIX="${EPREFIX}/usr/libexec" |
| 37 |
PREFIX="${EPREFIX}/usr" |
| 38 |
LIBDIR="${EPREFIX}/$(get_libdir)" |
| 39 |
@@ -92,3 +93,9 @@ src_configure() { |
| 40 |
echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die |
| 41 |
fi |
| 42 |
} |
| 43 |
+ |
| 44 |
+src_compile() { |
| 45 |
+ default |
| 46 |
+ # localconf quotes leak in the systemd unit but are still needed for spaces |
| 47 |
+ sed -i 's/"//g' scripts/beesd@.service || die |
| 48 |
+} |
| 49 |
|
| 50 |
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild |
| 51 |
index 7777d0ea45f..7fffe63931c 100644 |
| 52 |
--- a/sys-fs/bees/bees-9999.ebuild |
| 53 |
+++ b/sys-fs/bees/bees-9999.ebuild |
| 54 |
@@ -74,9 +74,9 @@ src_prepare() { |
| 55 |
src_configure() { |
| 56 |
tc-export CC CXX AR |
| 57 |
cat >localconf <<-EOF || die |
| 58 |
+ ETC_PREFIX="${EPREFIX}/etc" |
| 59 |
LIBEXEC_PREFIX="${EPREFIX}/usr/libexec" |
| 60 |
PREFIX="${EPREFIX}/usr" |
| 61 |
- LIBDIR="${EPREFIX}/$(get_libdir)" |
| 62 |
SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)" |
| 63 |
DEFAULT_MAKE_TARGET=all |
| 64 |
EOF |
| 65 |
@@ -87,3 +87,9 @@ src_configure() { |
| 66 |
echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die |
| 67 |
fi |
| 68 |
} |
| 69 |
+ |
| 70 |
+src_compile() { |
| 71 |
+ default |
| 72 |
+ # localconf quotes leak in the systemd unit but are still needed for spaces |
| 73 |
+ sed -i 's/"//g' scripts/beesd@.service || die |
| 74 |
+} |
Archives