commit:     fef0349a136560cd9fb970f1bfa8e817f4d20728
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 23 16:18:56 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Feb 23 16:18:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fef0349a

app-admin/abrt: Use proper PATHs for non /usr merge systems

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 app-admin/abrt/{abrt-2.12.0.ebuild => abrt-2.12.0-r1.ebuild} | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-admin/abrt/abrt-2.12.0.ebuild 
b/app-admin/abrt/abrt-2.12.0-r1.ebuild
similarity index 95%
rename from app-admin/abrt/abrt-2.12.0.ebuild
rename to app-admin/abrt/abrt-2.12.0-r1.ebuild
index a8ed0ff492d..fedc7d3e48b 100644
--- a/app-admin/abrt/abrt-2.12.0.ebuild
+++ b/app-admin/abrt/abrt-2.12.0-r1.ebuild
@@ -64,6 +64,9 @@ src_prepare() {
        # Install under proper directory
        sed -i -e 's:dbusabrtdocdir = 
${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = 
${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die
 
+       # Ensure this works for systemd with and without /usr merge
+       sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service 
|| die
+
        # pyhook test is sensitive to the format of python's error messages, and
        # fails with certain python versions
        sed -e '/pyhook.at/ d' \

Reply via email to