summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2012-02-23 16:57:16 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2012-02-23 16:57:16 +0000
commit7a59bcbcad3f420c69e9933583329d7ee853d6a5 (patch)
tree322389238fc694ec8d14342e868a09ebc2de72cd /media-gfx
parentFix dependency on app-doc/doxygen wrt converting useflags 'nodot' to 'dot'. F... (diff)
downloadgentoo-2-7a59bcbcad3f420c69e9933583329d7ee853d6a5.tar.gz
gentoo-2-7a59bcbcad3f420c69e9933583329d7ee853d6a5.tar.bz2
gentoo-2-7a59bcbcad3f420c69e9933583329d7ee853d6a5.zip
Fix dependency on app-doc/doxygen wrt converting useflags 'nodot' to 'dot'. Fixes bug 405445 by Marien Zwart <marienz@gentoo.org>
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/blender/ChangeLog7
-rw-r--r--media-gfx/blender/blender-2.57-r1.ebuild4
-rw-r--r--media-gfx/blender/blender-2.60a.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 923741bbebfd..fdd2f4fc0c55 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/blender
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.220 2012/02/11 23:10:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.221 2012/02/23 16:57:16 xarthisius Exp $
+
+ 23 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> blender-2.57-r1.ebuild,
+ blender-2.60a.ebuild:
+ Fix dependency on app-doc/doxygen wrt converting useflags 'nodot' to 'dot'.
+ Fixes bug 405445 by Marien Zwart <marienz@gentoo.org>
11 Feb 2012; Sebastian Pipping <sping@gentoo.org> blender-2.60a.ebuild,
+files/blender-2.61-opencollada-debug.patch:
diff --git a/media-gfx/blender/blender-2.57-r1.ebuild b/media-gfx/blender/blender-2.57-r1.ebuild
index ccdac498576c..c40196eaeba2 100644
--- a/media-gfx/blender/blender-2.57-r1.ebuild
+++ b/media-gfx/blender/blender-2.57-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.10 2012/01/23 18:34:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.11 2012/02/23 16:57:16 xarthisius Exp $
PYTHON_DEPEND="3:3.2"
@@ -69,7 +69,7 @@ RDEPEND="virtual/jpeg
DEPEND=">=dev-util/scons-2.0.1-r1
apidoc? (
dev-python/sphinx
- >=app-doc/doxygen-1.5.7[-nodot]
+ || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] )
)
x11-base/xorg-server
${RDEPEND}"
diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild
index 87701df3d5f6..466c9ed53565 100644
--- a/media-gfx/blender/blender-2.60a.ebuild
+++ b/media-gfx/blender/blender-2.60a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.8 2012/02/11 23:10:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.9 2012/02/23 16:57:16 xarthisius Exp $
PYTHON_DEPEND="3:3.2"
EAPI=4
@@ -67,7 +67,7 @@ RDEPEND="virtual/jpeg
DEPEND="dev-util/scons
apidoc? (
dev-python/sphinx
- app-doc/doxygen[-nodot]
+ || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] )
game-engine? ( dev-python/epydoc )
)
${RDEPEND}"