From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-934024-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 1FD04139694
for <garchives@archives.gentoo.org>; Thu, 23 Feb 2017 21:57:11 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7BC0A21C241;
Thu, 23 Feb 2017 21:57:10 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 58C7121C241
for <gentoo-commits@lists.gentoo.org>; Thu, 23 Feb 2017 21:57:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 55A8E34167F
for <gentoo-commits@lists.gentoo.org>; Thu, 23 Feb 2017 21:57:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id ADCCC523F
for <gentoo-commits@lists.gentoo.org>; Thu, 23 Feb 2017 21:57:02 +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: <1487887007.85419950523f0967292ddbd03d8d0eb26e7b3a04.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-libs/qwt/qwt-6.1.3-r1.ebuild
X-VCS-Directories: x11-libs/qwt/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 85419950523f0967292ddbd03d8d0eb26e7b3a04
X-VCS-Branch: master
Date: Thu, 23 Feb 2017 21:57:02 +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: c2be2d0c-cade-41e3-aafd-143494fd8b47
X-Archives-Hash: d07d5f41bce75a5007267526aec39564
commit: 85419950523f0967292ddbd03d8d0eb26e7b3a04
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 21:55:32 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 21:56:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85419950
x11-libs/qwt: Block qwt:5[doc], move blockers where they belong
Sort deps while at it.
Gentoo-bug: 610358
Package-Manager: portage-2.3.3
x11-libs/qwt/qwt-6.1.3-r1.ebuild | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/x11-libs/qwt/qwt-6.1.3-r1.ebuild b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
index a198f19b45..bf11ee3733 100644
--- a/x11-libs/qwt/qwt-6.1.3-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="designer doc examples mathml opengl qt4 qt5 static-libs svg"
REQUIRED_USE="|| ( qt4 qt5 )"
DEPEND="
- !<x11-libs/qwt-5.2.3
+ opengl? ( virtual/opengl )
qt4? (
dev-qt/qtcore:4
dev-qt/qtgui:4
@@ -38,10 +38,12 @@ DEPEND="
opengl? ( dev-qt/qtopengl:5 )
svg? ( dev-qt/qtsvg:5 )
)
+"
+RDEPEND="${DEPEND}
+ !<x11-libs/qwt-5.2.3
+ !x11-libs/qwt:5[doc]
doc? ( !<media-libs/coin-3.1.3[doc] )
- opengl? ( virtual/opengl )
- "
-RDEPEND="${DEPEND}"
+"
S="${WORKDIR}"/${MY_P}
@@ -50,7 +52,7 @@ DOCS=( CHANGES-6.1 README )
PATCHES=(
"${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
"${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
- )
+)
src_prepare() {
cat > qwtconfig.pri <<-EOF