Fix dependency on app-doc/doxygen wrt converting useflags 'nodot' to 'dot'. Fixes bug 405445 by Marien Zwart <marienz@gentoo.org>

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

4 files changed, 27 insertions, 12 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/Manifest b/media-gfx/blender/Manifest
index ca9dea13845f..ad6e916d4f39 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX blender-2.37-dirs.patch 727 RMD160 ddf5c951182f809374c43f1a1cce47f4397a868c SHA1 9b3cb06a8bd23b1a5041bd3193018c2e5e28dcfd SHA256 beb5e5835cde71a00712ddf600278ca0bbdb6020123faeb6ea7a53e8f6812e5e
 AUX blender-2.44-scriptsdir.patch 2586 RMD160 8e80859edf1fae2f401b326be4cb939108879999 SHA1 50143946828d3f2b2568e71fae5ed28f6adf7449 SHA256 a7afac10ce2431cd94d10dc3f4cae33423b5a59d0c6918199006f623cd6d68e4
@@ -48,14 +48,24 @@ DIST blender-2.60a.tar.gz 25679123 RMD160 74434c4e748872322386971cf6021255b0bfa1
 EBUILD blender-2.48a-r3.ebuild 4044 RMD160 831a9636988fb1a5ca9a406e45e6bf204511b609 SHA1 9b7b45cd51aa2057a1043d40223dd6a742282919 SHA256 5b677a561cb8c02ebb9527e78f9a11385d1e902602d0caa3d932e135f20af335
 EBUILD blender-2.49a.ebuild 4819 RMD160 109229feaf551d5c4829ecad0f4eb7c9cfea8c1e SHA1 3537ea47e3ccb11df14c321580559e04452bb7ee SHA256 67af33393f99caee9c451feb548d98836d2a0d75c714c253ec01416281339ed4
 EBUILD blender-2.49b-r2.ebuild 5050 RMD160 87bba6723e7f083f395666581f568848154c3233 SHA1 105297aa72047f8501775933f1d4b51bf992d60e SHA256 39dec297a537d22f07576adc90211ec8806f8d63c6c30906f58f6e51dc2cc764
-EBUILD blender-2.57-r1.ebuild 13944 RMD160 9454a84cc292579d40ac7eed698b37c721803185 SHA1 5500bbd689e39f2741a9d757df19866bc9184bb4 SHA256 ac0677eea62ded4647e09dacad093148261def41c66893a011d7a1ce4478724f
-EBUILD blender-2.60a.ebuild 14103 RMD160 a2998bc5228958fd8aae1ef5106220074825431d SHA1 517a806fce552f97f6304a28c4c6255fd2d644d4 SHA256 d848dbcf4a109b5e9db8991633831d77e70cc93f07642f5b994254c9c0c4c38b
-MISC ChangeLog 34339 RMD160 733bdc757f5b456c117e47a144e22431b26ef4fe SHA1 4336208c9967231374a16cee266ec41eae41cc67 SHA256 e061e4f4402055abe336ce6ebc79a3530eb26e70176695c45757611b98e7ec1f
+EBUILD blender-2.57-r1.ebuild 13984 RMD160 71ab64e33034d30a56340b6f0c43456396a26a5c SHA1 19db072f5c0e99efe6f7fd463817076c6470a0a8 SHA256 d970a33e08ec5e8c10bcad302f935e7d1b05524cf4f9b13f4fe88c0eecd3d049
+EBUILD blender-2.60a.ebuild 14155 RMD160 a88ae146423d250ecfab834716895e5882eb5e31 SHA1 b76639d4b1f1a229ff6bbf44590071a3d203bcb5 SHA256 7d71a9a943c5038c70955b2db0158d1174c49d628b7f3aec0563cf5a789f862d
+MISC ChangeLog 34581 RMD160 44f3a68165bb5799e904d5c12404b503dbb6613c SHA1 ae1a0489161d8d384001e4829d70cc09bae9c360 SHA256 6a15d4d6db720c5d99c058dbdca4389cbe0a12797cf616c1967b1e0953a40762
 MISC metadata.xml 1965 RMD160 3f48332ec841384161d2377ff0a2e02c37a4a909 SHA1 bf4dce385ef1e309b5d6ac4a8a631463587cf949 SHA256 ec5973923a2cce6ae374f6dfed03b15f401b1c9a05b1e8520440cdd5756a1c39
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk829VIACgkQsAvGakAaFgBHUACgtjrAdS0+L3K5h1l13vQXHBcK
-ObUAnAzizLG/Zgk9oJr1Dhp22ve7J+aG
-=zj6o
+iQIcBAEBCAAGBQJPRm/2AAoJEF0huFKJUZL529oQAIPqtBH+m8arJBz6E8TCCs0U
+xqi9b0MyaiDQM1iN3RI3HS1zpfDaVuUpEDh7aoQuO9MD3anHUtdLaby/tz77XmGe
+U2W3ORdzhWeFd4QdkRpxtVGrpGWwKh8t7T8DSkpL/vV6F5VdLRWueWCi5iZiKmO1
+kSESS0hiI87yEUSFV3aq+tLG4ZI5e8pl+Un/pWRkBpoWW0cQnejz2jB9ohPBrMGr
+MypQVKBwsZsddR+jjv1Qs0kuVuYNc3zhDThuaWrMT8HTrQvjNs4vBP9bvyXFEl4v
+LNiiuRXLeHp4YXiXEbgPTbbZ4chT0yAcUNNpZNNGy83w+SUGeaYDe01tCjTZ0ylU
+jS3UjbGdqqiVWgS6sq9DQlHEfm1VDMyqQOcSc9EySBultDTw+r9gugEcTHdxHgpX
+eIzLNvrnkGJ921h0X3qoXOUWRZVWa0InqxFtjd3fDVmef1lmrBO5UQXoykDF3DIC
+Kmn7f/kRMxfoQNo7I1Cm0akL82YBL2vNgb0Gn816H/eqD9Mfw/XKVtxw8xoRLCrh
+jYxDK/a2kdlPgsn4j15lIkB19mBsCdKLMhtVebHcVepoTC6Ry90xV4tLiv7aJ+K6
+UzYsUrfg9lW+1Ls1zAmUQNSTmiC+OLc+5VVz/Se/UUSz0WiK2nDtO1fagxj4lrue
+4d0SzhT+xAOxnbsA1VG3
+=GV4o
 -----END PGP SIGNATURE-----
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}"