summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-06-25 12:11:23 +0000
committerJustin Lecher <jlec@gentoo.org>2010-06-25 12:11:23 +0000
commit28da61343fe2d974fa320dd8265aabfd4500fe6b (patch)
treee98f5771d7584043340219626a0cd12cc2d42f0b
parentremove old (diff)
downloadgentoo-2-28da61343fe2d974fa320dd8265aabfd4500fe6b.tar.gz
gentoo-2-28da61343fe2d974fa320dd8265aabfd4500fe6b.tar.bz2
gentoo-2-28da61343fe2d974fa320dd8265aabfd4500fe6b.zip
Blocking media-libs/coin when USE=doc
(Portage version: 2.2_rc67/cvs/Linux x86_64)
-rw-r--r--x11-libs/qwt/ChangeLog6
-rw-r--r--x11-libs/qwt/qwt-5.2.0.ebuild3
-rw-r--r--x11-libs/qwt/qwt-5.2.1.ebuild3
3 files changed, 9 insertions, 3 deletions
diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 73a6461c012f..b94033e67775 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qwt
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.77 2010/06/02 07:09:47 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.78 2010/06/25 12:11:23 jlec Exp $
+
+ 25 Jun 2010; Justin Lecher <jlec@gentoo.org> qwt-5.2.0.ebuild,
+ qwt-5.2.1.ebuild:
+ Blocking media-libs/coin when USE=doc
02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
Remove caleb from metadata.xml (#317071)
diff --git a/x11-libs/qwt/qwt-5.2.0.ebuild b/x11-libs/qwt/qwt-5.2.0.ebuild
index f654532b69ce..413e12659014 100644
--- a/x11-libs/qwt/qwt-5.2.0.ebuild
+++ b/x11-libs/qwt/qwt-5.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.0.ebuild,v 1.8 2010/02/20 17:28:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.0.ebuild,v 1.9 2010/06/25 12:11:23 jlec Exp $
EAPI=2
inherit eutils qt4
@@ -15,6 +15,7 @@ SLOT="5"
IUSE="doc examples svg"
DEPEND="x11-libs/qt-gui:4
+ doc? ( !media-libs/coin )
svg? ( x11-libs/qt-svg:4 )"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/qwt/qwt-5.2.1.ebuild b/x11-libs/qwt/qwt-5.2.1.ebuild
index b8b2590f5a79..509cb1bcb49a 100644
--- a/x11-libs/qwt/qwt-5.2.1.ebuild
+++ b/x11-libs/qwt/qwt-5.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild,v 1.1 2010/04/30 19:31:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.1.ebuild,v 1.2 2010/06/25 12:11:23 jlec Exp $
EAPI="3"
inherit eutils qt4
@@ -15,6 +15,7 @@ SLOT="5"
IUSE="doc examples svg"
DEPEND="x11-libs/qt-gui:4
+ doc? ( !media-libs/coin )
svg? ( x11-libs/qt-svg:4 )"
RDEPEND="${DEPEND}"