Drop opencollada for stable candidate as it's not ready for stabilization yet (#436574).

Package-Manager: portage-2.1.11.37/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 312 insertions, 15 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 4f12d89a0095..d1fbcac92ac1 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,12 @@
 # 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.240 2012/12/11 09:59:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.241 2012/12/15 21:33:59 pacho Exp $
+
+*blender-2.63a-r3 (15 Dec 2012)
+
+  15 Dec 2012; Pacho Ramos <pacho@gentoo.org> +blender-2.63a-r3.ebuild:
+  Drop opencollada for stable candidate as it's not ready for stabilization yet
+  (#436574).
 
   11 Dec 2012; Kacper Kowalik <xarthisius@gentoo.org> blender-2.49b-r2.ebuild:
   Drop ppc* wrt #418399
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 9fe388c10402..ffa5b1ba6979 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -18,23 +18,14 @@ DIST blender-2.64a-patches-1.tar.xz 14388 SHA256 047f3231f4b21dd813e7b052be0b28b
 DIST blender-2.64a.tar.gz 31388178 SHA256 a5b1c3f1919b041a253d8d6d7c4f54e2b7f8a9531795675ab468ae742350cc7b SHA512 77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5 WHIRLPOOL 7f4878a606379dad9d121b0ad08f17e8691baf944147dc72dd33defd33a2303116a7090f7b8f8a186760fdd65ba9c0a0e523ed7d231fd23c070c31b52693178f
 EBUILD blender-2.49b-r2.ebuild 5256 SHA256 2b33b662c841ab4b465d794fcc1f657580a3db4a2e0239ee22f7605724c30d7f SHA512 59176e5ae83a86291dac87a942fd17c84e05c706409fa20d2655e1a68400d0726d18cf6892de404384b3f4ad67e21fafb33cc2a02dfec40bd79c3787fc99195d WHIRLPOOL d72f7c5287884e31f107b2de6ccb5db81bbda621d17ad8dd6d07d22b57e409f49a06a993dccf54c5f30a5dbef95aa18ff5a8528edef1f03dbd05c8827cc9b5e2
 EBUILD blender-2.63a-r2.ebuild 7960 SHA256 19dcaa557d6b3c919a2b6b14d448321caae86bd30ac151d89600689ded57ebfd SHA512 2812c52c561b48e7307183d33cb107be4339b5b541ceb5723a132faebd610606808e24a02d4efb496432debe1deac4dbf45f7ea72478c9d7f513ab2d02514422 WHIRLPOOL 9b6e9992691858df52b5feede66b11acab12cc723aea07c570558455d6e61e47a8d940ffdac85a08037d674aae9253edc4dd310b404c378a0ef7efd4a041c961
+EBUILD blender-2.63a-r3.ebuild 7786 SHA256 85c87d657b733249a012d5f1e28441a1cd29539f5ef4440912c34f6df9366f57 SHA512 31f34d6df07627ea8435568084f55ae0f69e1b7ac3398fddc551d80ff782eb58daddf60804a268d482698951c39e8663c241f8b2b1d76cab777520a3798f834b WHIRLPOOL 099d1de9b84d609ca88ebcb5190b6d32c4479a3928a887a48c1726610dbd8e983b99e2d76451458949fcb21a52eba0a39b7721ee267c992c41c914f3230b8aa3
 EBUILD blender-2.64a.ebuild 7773 SHA256 9295cd8371312f9adf895274dbceea873dcdda1c383dc924fed936f64d041f04 SHA512 c600064f7f2e1150bdab92fc173bf1732d3c849f04a3c85f7487d8d931d64b3844cab267cdb0a548d24d978d592ace1dc139914817854863e267cbb8f62a14bf WHIRLPOOL f13e638bf8e972846c724686b2a71a662b54fe784c7e1a3582d89eed4a10d82ca84276cec8acc47e7b8d672f924e8a5694aa82b849884752bf282908fbaaae4f
-MISC ChangeLog 40722 SHA256 72dd9ccf019ab6137c595888278c07f3142d4eab639b3dad76afb277eedcba88 SHA512 9b8a30218be29390c430b15db511be3a69255449f1423e6df54498daf10478b2b478e7cb8929b0ba33d31873519252f82c5b331ef1a1da202c02efdf28b9c34e WHIRLPOOL c79ec9c531f54d8593d6fb6b4235547084583f5ce42d8c70a228d19b16f55a617a7be03528926a7325c02f7bb94d49abeabcf74e02d946c544e63701196813fd
+MISC ChangeLog 40916 SHA256 924380c00adf5cdbc8373ba5385b87ee228fe94595964540d20d19be1261ca07 SHA512 713d3cc34b16b933393420052b1790fbd2d8f6ea0765a604a4b51cf5c5b91fa549781c0058a35aa84d9fb00cdbfae94448125db239aaf105ecbd0368b43eabd5 WHIRLPOOL d7dfdea428043552f75abbd2aa59d863eb1b07ade713b487c7df91a0f378990b071b6714f94e7a3095165a1e38c58ff93e8e5d0ae595cf206c76520f229baa1b
 MISC metadata.xml 2158 SHA256 bff4c3ff97b8c96d1175eec436c9c2f583ec461f1546b1a0edee9767d89641ba SHA512 c0d0b4ff2b886a4a4ab2596e427113caa4379705113197021fab490953520368fa98bef40379dde6c508a3ec57df89a34121dfdef5ffdfbeca608cc3355c05c6 WHIRLPOOL 15ade3751c5017cc4c2f537b65f00d39bec68ccc15a1a0ac81ac8cb904f43bec10abf395d0834071873952391bb33bf2aee00d4c6007b7d8aeb52a599f15f287
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQxwRDAAoJEF0huFKJUZL5wQQP/RxXd4EWkRyFYcXlqyYSVmlQ
-n+m+yahdCgsUfAvVMPqx7oWFISMGXmfzl06t1zm+XukOJGBPeCVUpRUQj+U5K/sL
-sVInCwkFYEunwHgA8bJbdfi5JfrS6QmBgdOTDvAkxvUPZn+gswxr0xFZKn+lUS7J
-o4H5n0XMUdahQSt88lmvumVQ3zoDY5NTXPfJsmYQj1fgBgW1/CLJlzx6YBcV5Qak
-mgP82yL3kQwSCqgE5jtQV4Jws3wEoROwomil0qqGNtfUapSCbq+2IAdkupQQZ4aJ
-KD+DcGeV9FdHrPHKMekyWCG8nNHnvjTKnHXQF/5LlxXkWt61yyjJcDz44+EKSLYK
-Z9GbZaN4fMrF+uT3/Bw4dFk1fQJYD6+R9nS8u+YqeJvF3FskcBPYelx6pQOEb4pN
-jxE9Ta0n94ODoqRcp998TIi/C9RlExwCG6ilWKUb95XYyaMA1LHi9vsKU7I11xlH
-+5v67TtUyLKm4qzF4e4Yb1eok7ZeKAadD852sun1bkFn1aoJUS+UjPdSxVP02RiV
-aeWWudrA7Isdz0nGxV/fsTLnSUwUIpL02bEtNLsVdoP8+8X9Y6eQS4CvOHQP09VM
-vJscKx7AHwn5dPTzxjHaO+thQrgOBMCE8AMC1VJp7w3rVGRmYGsWePhETaEhowIq
-f0iWBKUiDzC/t1Ad/C2u
-=gJZk
+iEYEAREIAAYFAlDM7MgACgkQCaWpQKGI+9RODQCeKaBoigQpRxVf70d4VKkXnE7C
+JeYAn2IQeRXER02cReOvySm2oCLB227q
+=P1Ub
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.63a-r3.ebuild b/media-gfx/blender/blender-2.63a-r3.ebuild
new file mode 100644
index 000000000000..b57f79f88b5a
--- /dev/null
+++ b/media-gfx/blender/blender-2.63a-r3.ebuild
@@ -0,0 +1,300 @@
+# 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-r3.ebuild,v 1.1 2012/12/15 21:33:59 pacho Exp $
+
+EAPI=4
+PYTHON_DEPEND="3:3.2"
+
+PATCHSET="4"
+
+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 3dmouse debug nls"
+REQUIRED_USE="player? ( game-engine )"
+
+LANGS="en ar bg ca cs de el es es_ES fa fi fr hr id it ja ky ne pl pt 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
+	sys-libs/zlib
+	cycles? (
+		media-libs/openimageio
+		>=dev-libs/boost-1.44
+	)
+	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 )
+	3dmouse? ( dev-libs/libspnav )"
+
+DEPEND="dev-util/scons
+	doc? (
+		dev-python/sphinx
+		app-doc/doxygen[-nodot(-),dot(+)]
+	)
+	nls? ( sys-devel/gettext )
+	sci-libs/ufconfig
+	${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_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/patches" \
+		epatch
+
+	# remove some bundled deps
+	rm -r \
+		extern/libopenjpeg \
+		extern/glew \
+		extern/Eigen3 \
+		extern/bullet2 \
+		extern/colamd \
+		extern/binreloc
+
+	ewarn "$(echo "Remaining bundled dependencies:";
+			find extern -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_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 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_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 plugin headers
+	insinto /usr/include/${PN}
+	doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
+
+	# install desktop file
+	domenu release/freedesktop/blender.desktop
+
+	# 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}/*
+
+	# FIX: making all python scripts readable only by group 'users',
+	#	  so nobody can modify scripts apart root user, but python
+	#	  cache (*.pyc) can be written and shared across the users.
+#	chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
+#	chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
+}
+
+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."
+}