Blocking x11-libs/qwt[doc], #312043

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 55 insertions, 37 deletions

diff --git a/media-libs/coin/ChangeLog b/media-libs/coin/ChangeLog
index 0ac6ae7fdc92..d974cab3bd60 100644
--- a/media-libs/coin/ChangeLog
+++ b/media-libs/coin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/coin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.29 2009/12/10 17:25:16 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.30 2010/06/25 12:15:47 jlec Exp $
+
+  25 Jun 2010; Justin Lecher <jlec@gentoo.org> coin-3.1.0.ebuild,
+  coin-3.1.2.ebuild:
+  Blocking x11-libs/qwt[doc], #312043
 
 *coin-3.1.2 (10 Dec 2009)
 
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index c6759c7bbb6b..dda06b93bf86 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX coin-3.1.0-javascript.patch 1259 RMD160 b5d2b39d7f75bf975efde6e2e96f21ba97894fc0 SHA1 8ab2f91bc9fdf1e23ba49f9cd2cd4f50810dd7aa SHA256 179489dfd99872150cc229d4f9d1bd40a03c67df5daad20741ff8b3a1874a883
 DIST Coin-3.1.0.tar.gz 5632452 RMD160 0fd8125b08be4d623d2ded14feceb0c70b45eec4 SHA1 369f3b28baa7725ab2a3f0f2cf4ccaa191fcecc5 SHA256 81ec8c4bf0daca6718d6b59eca76354f5f9e1c5a19c20dd4fa173d65f04cb899
 DIST Coin-3.1.2.tar.gz 5557072 RMD160 8b357238ed8f9d718b240911ee9c6fc7d1881213 SHA1 5cf0018da2e67e0fa2858f094bb170acb20f3055 SHA256 2b97c7fc738f73cb76e59f72d16013012ef07733d6455c5efa3a897ef7cb0845
-EBUILD coin-3.1.0.ebuild 1690 RMD160 ca7a480fc8ad01c4ab205f92889595e2d8d4e447 SHA1 71dff2ad614c6335de7c20d25c21fc218efe2b1b SHA256 e4bcced68b4052d5a0a4efc92babad7f9914910e2f63ca442be800702f0504fb
-EBUILD coin-3.1.2.ebuild 1695 RMD160 8a8e6d5a10a2d979dd9f0cd2230b465f7ff0bf74 SHA1 157afee01ada138113e6897b6d744a08757a5bb3 SHA256 647b5014bffa43a476abfd3af51a471fce80ec4a90213599cf6b0bf47c7ca67d
-MISC ChangeLog 4090 RMD160 cf38b5ef836eefde1a2a5d877f015da2da12e68d SHA1 4b4a998015ca3be2a9501d82df6bdda3297b36b5 SHA256 55987478e3efe8180f48ddb5c21d96f658b0169d2c10c3be3c3a854f7c8a40c4
+EBUILD coin-3.1.0.ebuild 1697 RMD160 eb725e9fb3e0f20bf514bd66bcdb0a4d2b24158c SHA1 f34e1ae5e5d5c1b00e5cae079c4054a24aeccd3d SHA256 af1ca228e82709f1491d29f5835c23abb43fb8454852688512fb9e5dff54dc25
+EBUILD coin-3.1.2.ebuild 1705 RMD160 8263908350fcb74eab5bce25ce5aa7bec7098f4c SHA1 143c1690300d8eef06dcac9f0e53f619be4131fe SHA256 8a7186b19690dbcfa51bd852b7e431b0085e8d3b4174934a131b55062b8f540f
+MISC ChangeLog 4217 RMD160 0c1ae9a044ef16c63d3d44e9e28589ef336581e3 SHA1 93f0001597af4cde30af4451e505b78d467ce6bb SHA256 e30cf0257f9986e91cd2b851c231af5ff084440314206b9e62b6caa995823f5c
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwknfkACgkQgAnW8HDreRaXmwCdFqPreriWA98G1uVqXVP1Rfwx
+qwMAoMdT/EQNi1av+vNlGz+Mjj2xTETB
+=8KqR
+-----END PGP SIGNATURE-----
diff --git a/media-libs/coin/coin-3.1.0.ebuild b/media-libs/coin/coin-3.1.0.ebuild
index 7f66d3db4d9a..c09c29237f47 100644
--- a/media-libs/coin/coin-3.1.0.ebuild
+++ b/media-libs/coin/coin-3.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.0.ebuild,v 1.3 2009/11/23 20:38:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.0.ebuild,v 1.4 2010/06/25 12:15:47 jlec Exp $
 
 EAPI=2
 
@@ -18,22 +18,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE="debug doc java javascript openal"
 
-RDEPEND="media-libs/fontconfig
-		media-libs/freetype
-		virtual/opengl
-		virtual/glu
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		java? ( virtual/jdk )
-		javascript? ( dev-lang/spidermonkey )
-		openal? ( media-libs/openal )"
+RDEPEND="
+	!x11-libs/qwt[doc]
+	media-libs/fontconfig
+	media-libs/freetype
+	virtual/opengl
+	virtual/glu
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	java? ( virtual/jdk )
+	javascript? ( dev-lang/spidermonkey )
+	openal? ( media-libs/openal )"
 
 DEPEND="${RDEPEND}
-		doc? ( app-doc/doxygen )
-		dev-util/pkgconfig"
+	doc? ( app-doc/doxygen )
+	dev-util/pkgconfig"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-javascript.patch"
diff --git a/media-libs/coin/coin-3.1.2.ebuild b/media-libs/coin/coin-3.1.2.ebuild
index 95c5d710fb1a..ac6cb21e1377 100644
--- a/media-libs/coin/coin-3.1.2.ebuild
+++ b/media-libs/coin/coin-3.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.2.ebuild,v 1.1 2009/12/10 17:20:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.2.ebuild,v 1.2 2010/06/25 12:15:47 jlec Exp $
 
 EAPI=2
 
@@ -18,22 +18,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug doc java javascript openal"
 
-RDEPEND="media-libs/fontconfig
-		media-libs/freetype
-		virtual/opengl
-		virtual/glu
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		java? ( virtual/jdk )
-		javascript? ( dev-lang/spidermonkey )
-		openal? ( media-libs/openal )"
+RDEPEND="
+	!x11-libs/qwt[doc]
+	media-libs/fontconfig
+	media-libs/freetype
+	virtual/opengl
+	virtual/glu
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	java? ( virtual/jdk )
+	javascript? ( dev-lang/spidermonkey )
+	openal? ( media-libs/openal )"
 
 DEPEND="${RDEPEND}
-		doc? ( app-doc/doxygen )
-		dev-util/pkgconfig"
+	doc? ( app-doc/doxygen )
+	dev-util/pkgconfig"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.1.0-javascript.patch