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 BFFD4138330 for ; Wed, 28 Sep 2016 21:17:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 236D2E0925; Wed, 28 Sep 2016 21:17:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06DE4E0925 for ; Wed, 28 Sep 2016 21:17:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9EED340815 for ; Wed, 28 Sep 2016 21:17:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E1FE37E1 for ; Wed, 28 Sep 2016 21:17:31 +0000 (UTC) From: "Kristian Fiskerstrand" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kristian Fiskerstrand" Message-ID: <1475097445.82a2fab3856a3dd33079e76bfc6efc8815d046f0.k_f@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-power/apcupsd/apcupsd-3.14.14.ebuild X-VCS-Directories: sys-power/apcupsd/ X-VCS-Committer: k_f X-VCS-Committer-Name: Kristian Fiskerstrand X-VCS-Revision: 82a2fab3856a3dd33079e76bfc6efc8815d046f0 X-VCS-Branch: master Date: Wed, 28 Sep 2016 21:17:31 +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-Archives-Salt: bd07b3d3-e52b-471c-93f4-ef3a5ab9243d X-Archives-Hash: c559f1fa4840753c937a93ad2ca3dadf commit: 82a2fab3856a3dd33079e76bfc6efc8815d046f0 Author: Kristian Fiskerstrand gentoo org> AuthorDate: Wed Sep 28 21:17:02 2016 +0000 Commit: Kristian Fiskerstrand gentoo org> CommitDate: Wed Sep 28 21:17:25 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a2fab3 sys-power/apcupsd: Fixup missing || die Package-Manager: portage-2.3.1 sys-power/apcupsd/apcupsd-3.14.14.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-power/apcupsd/apcupsd-3.14.14.ebuild b/sys-power/apcupsd/apcupsd-3.14.14.ebuild index 22b9887..02c1086 100644 --- a/sys-power/apcupsd/apcupsd-3.14.14.ebuild +++ b/sys-power/apcupsd/apcupsd-3.14.14.ebuild @@ -74,12 +74,12 @@ src_compile() { # the text files in the distribution, but I wouldn't count on them # doing that anytime soon. MANPAGER=$(type -p cat) \ - emake || die "emake failed" + emake } src_install() { emake DESTDIR="${D}" install - rm -f "${D}"/etc/init.d/halt + rm -f "${D}"/etc/init.d/halt || die insinto /etc/apcupsd newins examples/safe.apccontrol safe.apccontrol @@ -90,7 +90,7 @@ src_install() { dohtml -r doc/manual/* - rm "${D}"/etc/init.d/apcupsd + rm "${D}"/etc/init.d/apcupsd || die newinitd "${FILESDIR}/${PN}.init.4" "${PN}" newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail @@ -98,7 +98,7 @@ src_install() { systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf # remove hal settings, we don't really want to have it around still. - rm -r "${D}"/usr/share/hal + rm -r "${D}"/usr/share/hal || die # replace it with our udev rules if we're in Linux if use kernel_linux; then