summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-02-23 22:55:32 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2017-02-23 22:56:47 +0100
commit85419950523f0967292ddbd03d8d0eb26e7b3a04 (patch)
treee8d8969b5acc0507595688bb12d2e91077af736c /x11-libs
parentsys-apps/sandbox: ppc64 stable (bug 604402). (diff)
downloadgentoo-85419950523f0967292ddbd03d8d0eb26e7b3a04.tar.gz
gentoo-85419950523f0967292ddbd03d8d0eb26e7b3a04.tar.bz2
gentoo-85419950523f0967292ddbd03d8d0eb26e7b3a04.zip
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
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qwt/qwt-6.1.3-r1.ebuild12
1 files 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 a198f19b453f..bf11ee3733e2 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