From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-996057-garchives=archives.gentoo.org@lists.gentoo.org>
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 84F62138330
for <garchives@archives.gentoo.org>; Sun, 7 Jan 2018 13:43:13 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B7F58E0839;
Sun, 7 Jan 2018 13:43:12 +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 9390DE0839
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Jan 2018 13:43:12 +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 5096F3409E6
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Jan 2018 13:43:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D4D591A5
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Jan 2018 13:43:09 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1515332561.50b9b4fe6a53e9539086ff4a42fd2493478ae947.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphviz/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
X-VCS-Directories: media-gfx/graphviz/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 50b9b4fe6a53e9539086ff4a42fd2493478ae947
X-VCS-Branch: master
Date: Sun, 7 Jan 2018 13:43:09 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: bc616657-a633-41bc-9ca3-9e2bdd6aaea0
X-Archives-Hash: b6e0ba27638cff77cd05e97f99e672d5
commit: 50b9b4fe6a53e9539086ff4a42fd2493478ae947
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 10:53:35 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 13:42:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50b9b4fe
media-gfx/graphviz: Add missing || die
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-gfx/graphviz/graphviz-2.40.1-r1.ebuild | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
index 91a891f80f5..f7a96bed93d 100644
--- a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
@@ -257,9 +257,13 @@ src_install() {
pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
install
- use examples || rm -rf "${ED}"/usr/share/graphviz/demo
+ if use !examples; then
+ rm -r "${ED}"/usr/share/graphviz/demo || die
+ fi
- use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+ if use !static-libs; then
+ find "${ED}" -name '*.la' -delete || die
+ fi
dodoc AUTHORS ChangeLog NEWS README
@@ -271,10 +275,10 @@ src_install() {
pkg_postinst() {
# This actually works if --enable-ltdl is passed
# to configure
- dot -c
+ dot -c || die
}
pkg_postrm() {
# Remove cruft, bug #547344
- rm -f "${EROOT}usr/lib/graphviz/config{,6}"
+ rm -rf "${EROOT}"usr/lib/graphviz/config{,6} || die
}