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 EED521382C5 for ; Sun, 23 May 2021 13:09:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A5ABE0826; Sun, 23 May 2021 13:09:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 0FA2CE0826 for ; Sun, 23 May 2021 13:09:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 19EF6340DF0 for ; Sun, 23 May 2021 13:08:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A8AB878B for ; Sun, 23 May 2021 13:08:57 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1621775332.84849e1d8e53a0ea6d4585497be59ef6301c94e6.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/qwt/qwt-5.2.3_p20210211.ebuild x11-libs/qwt/qwt-6.1.5.ebuild X-VCS-Directories: x11-libs/qwt/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 84849e1d8e53a0ea6d4585497be59ef6301c94e6 X-VCS-Branch: master Date: Sun, 23 May 2021 13:08:57 +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: 29654469-b817-4d23-a65d-e74e34297267 X-Archives-Hash: 9057edc765c06555f27bdd395058c7cf commit: 84849e1d8e53a0ea6d4585497be59ef6301c94e6 Author: Andrew Ammerlaan gentoo org> AuthorDate: Sun May 23 13:05:38 2021 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sun May 23 13:08:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84849e1d x11-libs/qwt: add missing die on the heredocs Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> x11-libs/qwt/qwt-5.2.3_p20210211.ebuild | 6 +++--- x11-libs/qwt/qwt-6.1.5.ebuild | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild index 3e01139e4af..5762259d2e3 100644 --- a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild +++ b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild @@ -33,7 +33,7 @@ src_prepare() { default sed -e "/QwtVersion/s:5.2.2.:${PV/_*}:g" -i ${PN}.prf || die - cat > qwtconfig.pri <<-EOF + cat > qwtconfig.pri <<-EOF || die target.path = "${EPREFIX}/usr/$(get_libdir)" headers.path = "${EPREFIX}/usr/include/qwt5" doc.path = "${EPREFIX}/usr/share/doc/${PF}" @@ -46,7 +46,7 @@ src_prepare() { # Fails to compile with MathML enabled #use mathml && echo "CONFIG += QwtMathML" >> qwtconfig.pri - cat >> qwtconfig.pri <<-EOF + cat >> qwtconfig.pri <<-EOF || die QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer" QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features" EOF @@ -68,7 +68,7 @@ src_install () { if use examples; then # don't build examples - fix the qt files to build once installed - cat > examples/examples.pri <<-EOF + cat > examples/examples.pri <<-EOF || die include( qwtconfig.pri ) TEMPLATE = app MOC_DIR = moc diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild index fccc45df62b..96d8e6a1750 100644 --- a/x11-libs/qwt/qwt-6.1.5.ebuild +++ b/x11-libs/qwt/qwt-6.1.5.ebuild @@ -39,7 +39,7 @@ PATCHES=( src_prepare() { default - cat > qwtconfig.pri <<-EOF + cat > qwtconfig.pri <<-EOF || die QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)" QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6" QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}" @@ -53,13 +53,13 @@ src_prepare() { use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri - cat > qwtbuild.pri <<-EOF + cat > qwtbuild.pri <<-EOF || die QWT_CONFIG += qt warn_on thread release no_keywords EOF echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri - cat >> qwtconfig.pri <<-EOF + cat >> qwtconfig.pri <<-EOF || die QWT_INSTALL_PLUGINS = "${EPREFIX}$(qt5_get_plugindir)/designer" QWT_INSTALL_FEATURES = "${EPREFIX}$(qt5_get_mkspecsdir)/features" EOF @@ -113,7 +113,7 @@ src_install() { if use examples; then # don't build examples - fix the qt files to build once installed - cat > examples/examples.pri <<-EOF + cat > examples/examples.pri <<-EOF || die include( qwtconfig.pri ) TEMPLATE = app MOC_DIR = moc