From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0933D138334 for ; Sat, 23 Feb 2019 16:19:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1258EE0955; Sat, 23 Feb 2019 16:19:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB45BE0955 for ; Sat, 23 Feb 2019 16:19:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5FA81335C9C for ; Sat, 23 Feb 2019 16:19:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5193326 for ; Sat, 23 Feb 2019 16:19:10 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1550938736.fef0349a136560cd9fb970f1bfa8e817f4d20728.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/abrt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/abrt/abrt-2.12.0-r1.ebuild app-admin/abrt/abrt-2.12.0.ebuild X-VCS-Directories: app-admin/abrt/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: fef0349a136560cd9fb970f1bfa8e817f4d20728 X-VCS-Branch: master Date: Sat, 23 Feb 2019 16:19:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4392cbca-d2c4-4e72-859a-326adc909fcd X-Archives-Hash: 3ffae945106b277272effd533596a1be commit: fef0349a136560cd9fb970f1bfa8e817f4d20728 Author: Pacho Ramos gentoo org> AuthorDate: Sat Feb 23 16:18:56 2019 +0000 Commit: Pacho Ramos gentoo 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 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' \