Version bump, thanks to Dirk S. for the help with the patches in bug #437596; remove bundled copies of ldl, glog and gflags; also fix building with libav-9 (bug #443180); and add a dependency for the old 2.63a (bug #443702).

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 324 insertions, 11 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 7c0d2bca21b6..3913a8e8664e 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,14 @@
 # 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.238 2012/09/21 19:14:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.239 2012/11/18 01:06:23 flameeyes Exp $
+
+*blender-2.64a (18 Nov 2012)
+
+  18 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> +blender-2.64a.ebuild,
+  blender-2.63a-r2.ebuild:
+  Version bump, thanks to Dirk S. for the help with the patches in bug #437596;
+  remove bundled copies of ldl, glog and gflags; also fix building with libav-9
+  (bug #443180); and add a dependency for the old 2.63a (bug #443702).
 
   21 Sep 2012; Diego E. Pettenò <flameeyes@gentoo.org> blender-2.63a-r2.ebuild:
   Add missing dependency on virtual/glu (now visible as mesa no longer provides
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index f723c5ecdfb4..339637c19448 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -14,18 +14,21 @@ AUX blender.desktop 199 SHA256 3fbab5be3f52ce56f285e422c856aecd15627cffeadcb07af
 DIST blender-2.49b.tar.gz 22918377 SHA256 23554db4aa10b00e0e760a8bf9c4a9f749670d815c8bc874a04746adc4752488 SHA512 0e83388849898a61a308584be05307697ef8d0e67c5f161eea0d11f75a29d14c26547aa7b20f356065e70db823082e11a39dc06e59d3d73ef8c87738d2f88460 WHIRLPOOL d8b54b39eb47841c7e93157726f55c855d0930b89e4cbe8f093dcd7110978ed267ca96517281861bd6d62c1108a8068c5a863452d3208b1f4ad3d374f1e74f7d
 DIST blender-2.63a-patches-4.tar.xz 14588 SHA256 eae250292db9127072d786db08b3f0a6b7fb7c0b172cde6c1f78a9c0cf655d81 SHA512 6c998cd7899a6961975b21d858b6781515fdde0143a8cb3c686c3df2ff2f491be723a7f974ce5cedac17e67017fe9ffa8bf791d3171f6ac276542e84b674f0f7 WHIRLPOOL d68117005e17e02d47286a03fb11522d886bbebd6ba7ca3baafef629918c53a129d8177e7da4d7fc4f7d90d24c9cafb4ab0218d9b0a9960438e7c70905dc1c4d
 DIST blender-2.63a.tar.gz 26759658 SHA256 c479b1abfe5fd8a1a5d04b8d21fdbc0fc960d7855b24785b888c09792bca4c1a SHA512 86abf813153da2b0c9974d35bb794ea6df4f933559abf99ffefcffce429d2304c0e04ce91f576f0c8b3394fd4bed05d465602b39f2b0081c62b5ba4e7073b297 WHIRLPOOL 08f26def3c4ede3c50c71c59bccae0ab2fef91e123e31acddb7f2ee42ffed7a6e4c6ac96ad8f66f6e57720c49d35d0ec6d4534bbe486449d1c39eb5eaa379ec2
+DIST blender-2.64a-patches-1.tar.xz 10492 SHA256 0c40e3bc4d5ca588ccd8b18789e76563b140efc2a188e723e3292d17cdf17f84 SHA512 412e731b2293b9a2faf9221572d465b7d01d2045a9639487a7328837dbc4ba5befcc89344faa378019cb5fa06d97ac6c5a147c7042b2e22885a815444e9b7ba3 WHIRLPOOL 8e356e535abf3787864db50ded16da91945a9b0a749b6337784a494853389b4ec24983a8d1a15d7155ca721c5342d2ef9575e6cfbfb5ba3e51a6508d875a94d2
+DIST blender-2.64a.tar.gz 31388178 SHA256 a5b1c3f1919b041a253d8d6d7c4f54e2b7f8a9531795675ab468ae742350cc7b SHA512 77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5 WHIRLPOOL 7f4878a606379dad9d121b0ad08f17e8691baf944147dc72dd33defd33a2303116a7090f7b8f8a186760fdd65ba9c0a0e523ed7d231fd23c070c31b52693178f
 EBUILD blender-2.49b-r2.ebuild 5260 SHA256 fde1d059906fde82f65a5b5b8e520a04ab26fc7d8bfc78d43712fce89ca1f6cc SHA512 3585ac5d707fffc8929c2f4377c4377829e390e7c54100fea51f07171ae9f851b3cd6060d5cbb22be82dd539d31646ff8ef52f84a00a66e101b8dc0b5b13502e WHIRLPOOL f57a432140247ea18786c193a1de477df84781b1fb2a47ebdeb40f8a0207b2d33c2b44dfc2bded0de1d7f65b2ef43350ed73873b23f68902d2bdddaed4d50f02
-EBUILD blender-2.63a-r2.ebuild 7941 SHA256 ffca3949d880f85f14e5f8e2cbb36db625e955176f55b2dd8e729f7356505399 SHA512 6a92cab5e67f9dc2e84964a11bb42bfccfb447a49247735a9b2ff969aae3e90107b6c5c71b3215ebe3612b9141c6bce733de9f62518e1ac2f178fd5fcafe95a3 WHIRLPOOL bc43bbad8e0bce1ef022a43d79faa97c3e71a36a5312d7c8520b89fdd9a381043946f8fd536e0a34dc46156d266f61c781a84a6cd93483a41a49808c5c9761b5
-MISC ChangeLog 40249 SHA256 b2b099fe7ae1f7acbd281a8dfcab4550ae44a9f9b0f57ec6b665bce5acc1dcec SHA512 61775e6f06ea5f0f4e3f2034753c8ffab81dc8ce2b7dedc34c28ead154591c4aa767b6480b7ae178c33a75d898023dd01e5277736d1bb3a54fddf3f686698e6c WHIRLPOOL f4bdfdfc2287f6c68e942df1125f449846ab1678fa4a164e9e8c42ef0aad9fdfbf7de2887f59dba437699da2c9df39d9947a2a0c62031699f763b981948bf973
+EBUILD blender-2.63a-r2.ebuild 7960 SHA256 19dcaa557d6b3c919a2b6b14d448321caae86bd30ac151d89600689ded57ebfd SHA512 2812c52c561b48e7307183d33cb107be4339b5b541ceb5723a132faebd610606808e24a02d4efb496432debe1deac4dbf45f7ea72478c9d7f513ab2d02514422 WHIRLPOOL 9b6e9992691858df52b5feede66b11acab12cc723aea07c570558455d6e61e47a8d940ffdac85a08037d674aae9253edc4dd310b404c378a0ef7efd4a041c961
+EBUILD blender-2.64a.ebuild 7773 SHA256 9295cd8371312f9adf895274dbceea873dcdda1c383dc924fed936f64d041f04 SHA512 c600064f7f2e1150bdab92fc173bf1732d3c849f04a3c85f7487d8d931d64b3844cab267cdb0a548d24d978d592ace1dc139914817854863e267cbb8f62a14bf WHIRLPOOL f13e638bf8e972846c724686b2a71a662b54fe784c7e1a3582d89eed4a10d82ca84276cec8acc47e7b8d672f924e8a5694aa82b849884752bf282908fbaaae4f
+MISC ChangeLog 40617 SHA256 02e8a4c50a1a5384ad409a1a17e93458a1d2515b7be761a88bc575fddf87305d SHA512 2e63b7a1ecb213d8faab72143672dc307cc389589f64d2205efc94f392abb7ff824a8c6da38bb3baee61206f1b16e2cf1d96898bd050f19238ad6d2541855564 WHIRLPOOL dc5d35a09e52760ea6808140965d9c32d1a6426bc81e8fcdfa7316c7b368b29048b030e4411a0de27c2e944c262455bf59bb1663f30e94fc740f6b2e1bc5e4a0
 MISC metadata.xml 2158 SHA256 bff4c3ff97b8c96d1175eec436c9c2f583ec461f1546b1a0edee9767d89641ba SHA512 c0d0b4ff2b886a4a4ab2596e427113caa4379705113197021fab490953520368fa98bef40379dde6c508a3ec57df89a34121dfdef5ffdfbeca608cc3355c05c6 WHIRLPOOL 15ade3751c5017cc4c2f537b65f00d39bec68ccc15a1a0ac81ac8cb904f43bec10abf395d0834071873952391bb33bf2aee00d4c6007b7d8aeb52a599f15f287
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQXLy2AAoJEBzRPIrUMBNCPc8H/0swAzNpq4N11N4U9R6cKgjp
-cIUaspHmBugDtSrYPSyMC/rzwk17YhmTCbwp3ihluggNbhKbSojlLhJTz4WqbHga
-IZHurRMbMObfTAA1FZvwf6bkSABNIJpmMKp8sfDL0vuo0HyDEk7TveX1s72mLljq
-0I5CTrt6fEJPLYAouFd7HxTZUPZ27mw6gH9YpZ7Z9FLc3KRriezgVrSx7Lg7VTUA
-prHViIvcQt2SzecYSPNdlZtrVYdf2EOExRt0FHYonlViDH9XJE6gXhrFHvd8NWZK
-pzhPFr0z9pjWpXUgS8vL23ZKqjbIs5YUrx9ucwqXULuWm8vVfzxpyy7FpCmYsEY=
-=DVZw
+iQEcBAEBCAAGBQJQqDSXAAoJEBzRPIrUMBNCML4H/115KipFwSEDHbMv2aMEe/Xm
+IL+w/RncOjydIVPZRYXv0rE5bTxjAnncB1CuH9CnTHL29WV0yYKsb8GypWYbxQuN
+rvativxWrkHjUsTpXvFhyCE1LW56H4miUU/Z+Egn1SAPEqzvAhg4tC6tc+vENA3/
+PuXVw1uu4vebPpg2RGKaHfVNB7h9aYx1CtmdH5v9EcKbZMxieu0IWB4E6/wGmtcj
+gbYmQaqQTH/eNKvBOPemZzs48nLStlkQSeBqMEJHpPy0jDyIqhzkU6Zy1QGQAnfw
+Z/8Ks6UDsgN4SFYj0S8ymfIChZPWJJFr/OXraKVm+R/CVNeOcZnrEULn9h6wh7I=
+=TQll
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.63a-r2.ebuild b/media-gfx/blender/blender-2.63a-r2.ebuild
index e5cd2cb036cd..7f3ba0e1a294 100644
--- a/media-gfx/blender/blender-2.63a-r2.ebuild
+++ b/media-gfx/blender/blender-2.63a-r2.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.63a-r2.ebuild,v 1.7 2012/09/21 19:14:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.63a-r2.ebuild,v 1.8 2012/11/18 01:06:23 flameeyes Exp $
 
 EAPI=4
 PYTHON_DEPEND="3:3.2"
@@ -76,6 +76,7 @@ DEPEND="dev-util/scons
 		app-doc/doxygen[-nodot(-),dot(+)]
 	)
 	nls? ( sys-devel/gettext )
+	sci-libs/ufconfig
 	${RDEPEND}"
 
 pkg_pretend() {
diff --git a/media-gfx/blender/blender-2.64a.ebuild b/media-gfx/blender/blender-2.64a.ebuild
new file mode 100644
index 000000000000..b8aa45a13a50
--- /dev/null
+++ b/media-gfx/blender/blender-2.64a.ebuild
@@ -0,0 +1,301 @@
+# 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.64a.ebuild,v 1.1 2012/11/18 01:06:23 flameeyes Exp $
+
+EAPI=4
+PYTHON_DEPEND="3:3.2"
+
+PATCHSET="1"
+
+inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils check-reqs
+
+IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal
+	openmp +dds fftw jack doc sndfile tweak-mode sdl sse redcode
+	iconv collada 3dmouse debug nls"
+REQUIRED_USE="player? ( game-engine )"
+
+LANGS="en ar bg ca cs de el es es_ES fa fi fr he hr hu id it ja ky ne nl pl pt pt_BR ru sr sr@latin sv tr uk zh_CN zh_TW"
+for X in ${LANGS} ; do
+	IUSE+=" linguas_${X}"
+	REQUIRED_USE+=" linguas_${X}? ( nls )"
+done
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org"
+
+case ${PV} in
+	*_p*)
+		SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;;
+	*)
+		SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;;
+esac
+
+if [[ -n ${PATCHSET} ]]; then
+	SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
+fi
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/jpeg
+	media-libs/libpng:0
+	x11-libs/libXi
+	x11-libs/libX11
+	media-libs/tiff:0
+	media-libs/libsamplerate
+	virtual/opengl
+	virtual/glu
+	>=media-libs/freetype-2.0
+	virtual/libintl
+	media-libs/glew
+	>=sci-physics/bullet-2.78[-double-precision]
+	dev-cpp/eigen:3
+	sci-libs/colamd
+	sci-libs/ldl
+	dev-cpp/glog[gflags]
+	sys-libs/zlib
+	cycles? (
+		media-libs/openimageio
+		>=dev-libs/boost-1.44[threads(+)]
+	)
+	iconv? ( dev-libs/libiconv )
+	sdl? ( media-libs/libsdl[audio,joystick] )
+	openexr? ( media-libs/openexr )
+	ffmpeg? (
+		>=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k?]
+	)
+	openal? ( >=media-libs/openal-1.6.372 )
+	fftw? ( sci-libs/fftw:3.0 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	sndfile? ( media-libs/libsndfile )
+	collada? ( media-libs/opencollada )
+	3dmouse? ( dev-libs/libspnav )"
+
+DEPEND="dev-util/scons
+	doc? (
+		dev-python/sphinx
+		app-doc/doxygen[-nodot(-),dot(+)]
+	)
+	nls? ( sys-devel/gettext )
+	${RDEPEND}"
+
+pkg_pretend() {
+	if use openmp && ! tc-has-openmp; then
+		eerror "You are using gcc built without 'openmp' USE."
+		eerror "Switch CXX to an OpenMP capable compiler."
+		die "Need openmp"
+	fi
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	python_set_active_version 3
+}
+
+src_prepare() {
+	epatch "${WORKDIR}"/${PV}/*.patch
+
+	# remove some bundled deps
+	rm -r \
+		extern/libopenjpeg \
+		extern/glew \
+		extern/Eigen3 \
+		extern/bullet2 \
+		extern/colamd \
+		extern/binreloc \
+		extern/libmv/third_party/{ldl,glog,gflags} \
+		|| die
+
+	ewarn "$(echo "Remaining bundled dependencies:";
+			( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')"
+}
+
+src_configure() {
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+
+	local mycflags=$(printf "'%s'," ${CPPFLAGS} ${CFLAGS} | sed -e 's:,$::')
+	local mycxxflags=$(printf "'%s'," ${CPPFLAGS} ${CXXFLAGS} | sed -e 's:,$::')
+	local myldflags=$(printf "'%s'," ${LDFLAGS} | sed -e 's:,$::')
+	cat << EOF >> "${S}"/user-config.py
+CC="$(tc-getCC)"
+CXX="$(tc-getCXX)"
+CFLAGS=[${mycflags}]
+CXXFLAGS=[${mycxxflags}]
+BGE_CXXFLAGS=[${mycxxflags}]
+LINKFLAGS=[${myldflags}]
+PLATFORM_LINKFLAGS=[${myldflags}]
+CCFLAGS=[]
+REL_CFLAGS=[]
+REL_CXXFLAGS=[]
+REL_CCFLAGS=[]
+C_WARN=[]
+CC_WARN=[]
+CXX_WARN=[]
+
+BF_OPENJPEG="/usr"
+BF_OPENJPEG_INC="/usr/include"
+BF_OPENJPEG_LIB="openjpeg"
+
+WITH_BF_BULLET=1
+BF_BULLET="/usr/include"
+BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
+BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
+
+WITH_BF_COLAMD=1
+BF_COLAMD="/usr"
+BF_COLAMD_INC="/usr/include"
+BF_COLAMD_LIB="colamd"
+
+BF_OPENCOLLADA_INC="/usr/include/opencollada/"
+BF_OPENCOLLADA_LIBPATH="/usr/$(get_libdir)/opencollada/"
+
+BF_OIIO="/usr"
+BF_OIIO_INC="/usr/include"
+BF_OIIO_LIB="OpenImageIO"
+
+BF_BOOST="/usr"
+BF_BOOST_INC="/usr/include/boost"
+
+BF_ICONV="/usr"
+
+BF_TWEAK_MODE=$(usex tweak-mode 1 0)
+BF_DEBUG=$(usex debug 1 0)
+
+BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
+BF_INSTALLDIR="../install"
+WITH_PYTHON_SECURITY=1
+WITHOUT_BF_PYTHON_INSTALL=1
+BF_PYTHON="/usr"
+BF_PYTHON_VERSION="3.2"
+BF_PYTHON_ABI_FLAGS=""
+BF_BUILDINFO=0
+BF_QUIET=0
+BF_LINE_OVERWRITE=0
+WITH_BF_FHS=1
+WITH_BF_BINRELOC=0
+WITH_BF_STATICOPENGL=0
+EOF
+
+	blend_with() {
+		echo "WITH_BF_${2:-$1}=$(usex $1 1 0)" | tr '[:lower:]' '[:upper:]' \
+			>> "${S}"/user-config.py
+	}
+
+	# configure WITH_BF* Scons build options
+	blend_with 3dmouse
+	blend_with collada
+	blend_with cycles boost
+	blend_with cycles oiio
+	blend_with cycles
+	blend_with dds
+	blend_with doc docs
+	blend_with elbeem fluid
+	blend_with ffmpeg ogg
+	blend_with ffmpeg
+	blend_with fftw fftw3
+	blend_with fftw oceansim
+	blend_with game-engine gameengine
+	blend_with iconv
+	blend_with jack
+	blend_with jpeg2k openjpeg
+	blend_with nls international
+	blend_with openal
+	blend_with openexr
+	blend_with openmp
+	blend_with player
+	blend_with redcode
+	blend_with sdl
+	blend_with sndfile
+	blend_with sse rayoptimization
+}
+
+src_compile() {
+	escons
+
+	cat - > "${T}"/${PN}.env <<EOF
+BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/scripts"
+BLENDER_SYSTEM_DATAFILES="/usr/share/blender/datafiles"
+BLENDER_SYSTEM_PLUGINS="/usr/$(get_libdir)/plugins"
+EOF
+
+	if use doc; then
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${S}"/doc/doxygen
+		doxygen -u Doxyfile
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${S}"
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${WORKDIR}"/install/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed."
+
+		cd "${S}"/doc/python_api
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() { :; }
+
+src_install() {
+	# Pax mark blender for hardened support.
+	pax-mark m "${WORKDIR}/install/blender"
+
+	newenvd "${T}"/${PN}.env 60${PN}
+
+	# install binaries
+	dobin "${WORKDIR}/install/blender"
+	use player && newbin "${WORKDIR}/install/blenderplayer" blenderplayer
+
+	# install desktop file and icons
+	domenu release/freedesktop/blender.desktop
+	insinto /usr/share/icons/hicolor
+	doins -r release/freedesktop/icons/{*x*,scalable}
+
+	# install docs
+	doman "${WORKDIR}"/${P}/doc/manpage/blender.1
+	dodoc -r "${WORKDIR}"/${P}/doc/guides/*
+
+	if use doc; then
+		docinto "API/python"
+		dohtml -r "${S}"/doc/python_api/BPY_API/*
+
+		docinto "API/blender"
+		dohtml -r "${S}"/doc/doxygen/html/*
+	fi
+
+	# final cleanup
+	rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
+	if ! use nls; then
+		rm -r "${WORKDIR}/install/${PV/a}/datafiles/locale"
+	else
+		for x in "${WORKDIR}"/install/${PV/a}/datafiles/locale/* ; do
+			mylang=${x##*/}
+			use linguas_${mylang} || rm -r ${x}
+		done
+	fi
+
+	# installing blender
+	insinto /usr/share/${PN}
+	doins -r "${WORKDIR}"/install/${PV/a}/*
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherit risks with running unknown python scripting."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+	elog
+	ewarn "If you're updating from blender before 2.63a, please make"
+	ewarn "sure to log out and then back in before launching it, so"
+	ewarn "that the new environment variables are picked up."
+}