Remove 2.63a ebuild as no stable is coming to them at this point. Add a missing REQUIRED_USE for redcode/openjpeg (bug #446932).

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

5 files changed, 17 insertions, 617 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index d1fbcac92ac1..4af8d4895386 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.241 2012/12/15 21:33:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.242 2012/12/31 16:02:50 flameeyes Exp $
+
+  31 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org> -blender-2.63a-r2.ebuild,
+  -blender-2.63a-r3.ebuild, blender-2.64a.ebuild:
+  Remove 2.63a ebuild as no stable is coming to them at this point. Add a
+  missing REQUIRED_USE for redcode/openjpeg (bug #446932).
 
 *blender-2.63a-r3 (15 Dec 2012)
 
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index ffa5b1ba6979..3b82588d30fe 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -12,20 +12,20 @@ AUX blender-2.49b-linux-3.patch 414 SHA256 4f1f8960e1b5706b426e272c17b70682b1eaa
 AUX blender-2.49b-subversion-1.7.patch 477 SHA256 744c7af5f0fdc24c84262748991c397b171c33246bb319ba5d3a54a4eda5da2a SHA512 d145e2c0a8c6d92c834ce11061dcce613f3e4c284038fc3d208621ca6c0cacfacfb35f6d61bc2e6e20896a571e3224bbf1f16f0d07ada1fa009f4a4c0018d3bb WHIRLPOOL d196325348926ad6e73e4935e32c1ad0689d829fa4a75ef60da09c65bf3f5e6fcb876b7db9b1d67b1c036891dd78b8c2ed5e3944a679d655f3a26e7fb3f779e8
 AUX blender.desktop 199 SHA256 3fbab5be3f52ce56f285e422c856aecd15627cffeadcb07af313e0d64c4803ad SHA512 f5674f4a9ebe70170e8bcde1fd31cd5bd569ca0f66866a23c5239ae97e9d4d7de083c835e166085848b7420d6778a0469e6868628ff5020b44faac6582ac77d0 WHIRLPOOL b259746b3c412a1101a5bec84eac411dc34dc104053a7e6f09351c4b03b3202a74f1eb5fae9b2d87aa0a91f9ddc6ea274ad2a9ae14da817d30c8dc60d4516747
 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 14388 SHA256 047f3231f4b21dd813e7b052be0b28b9391345422fb335d4cca578820977bc8b SHA512 f0dc73769a74ca9098380640ae28508b204f4c198a97219bb2ac8445eff6120dbda64a9d2d80e5dcab48df34d7de844489702510b5a8d32677b5cb8e70c7b4d9 WHIRLPOOL e8bfaf0ca1a51991e3109a51068bea2619da7d3a93bba623d78f67f98681c43ad7dc3a1452fd13929081b3a118ae6a35ff07994251c857e3b6d35aabcd4b732e
 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 40916 SHA256 924380c00adf5cdbc8373ba5385b87ee228fe94595964540d20d19be1261ca07 SHA512 713d3cc34b16b933393420052b1790fbd2d8f6ea0765a604a4b51cf5c5b91fa549781c0058a35aa84d9fb00cdbfae94448125db239aaf105ecbd0368b43eabd5 WHIRLPOOL d7dfdea428043552f75abbd2aa59d863eb1b07ade713b487c7df91a0f378990b071b6714f94e7a3095165a1e38c58ff93e8e5d0ae595cf206c76520f229baa1b
+EBUILD blender-2.64a.ebuild 7793 SHA256 c7d8f834d31e287958f44a6ae3ea94362b1f651f325df1256c4b1d97c2f48ed6 SHA512 ce6165280c3ac9b59e0e31c74791123fead93c9b91b169051328f4cdc9ad1e76ac6fea27ad8e8e3b7178639f3ef4cf8b8db79759e14afca302b39541ce18d472 WHIRLPOOL 55d443d2e0df5f7ec591cfae317d5b97f266b89a3146f67f4c73e8f7c9a1592908c833acaf9d285e6dacb59155a9637a7670c45b5167511d4c7530bae30ee010
+MISC ChangeLog 41186 SHA256 fccd2bb7ed0145fad753de9c40647fd5cc641b9332709e5409ce011ee0b37fd0 SHA512 4a65640a634fbe920d38cffd5b2b70a2e70e85311002a7fc91a2e739a9307cbe367b46caa2f2b4eb454278d81b9e19ff690422cadd9732be4b81938aeb95eacf WHIRLPOOL caa28544112663682ce36ab23e544406a6e524188488a331f9cf7adf6d9b5bc6c6c84265456539cb943c723da29d316b03ee9f650aee9e3fa9ff8e22ef71bf71
 MISC metadata.xml 2158 SHA256 bff4c3ff97b8c96d1175eec436c9c2f583ec461f1546b1a0edee9767d89641ba SHA512 c0d0b4ff2b886a4a4ab2596e427113caa4379705113197021fab490953520368fa98bef40379dde6c508a3ec57df89a34121dfdef5ffdfbeca608cc3355c05c6 WHIRLPOOL 15ade3751c5017cc4c2f537b65f00d39bec68ccc15a1a0ac81ac8cb904f43bec10abf395d0834071873952391bb33bf2aee00d4c6007b7d8aeb52a599f15f287
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDM7MgACgkQCaWpQKGI+9RODQCeKaBoigQpRxVf70d4VKkXnE7C
-JeYAn2IQeRXER02cReOvySm2oCLB227q
-=P1Ub
+iQEcBAEBCAAGBQJQ4bc7AAoJEBzRPIrUMBNCiCsIAIfeAZjMvb8CAYke2Qz1s5Ob
+aSz7fdIZ9VbRVLGl+wrcRt6I6PDOllo3IALybZTnGfjvXDg8cdsqkFR0iJ/Fu18o
+FVbLAK15TBWvMuBgLfixBQc23Pfbtge3y1l7rYLiR0JexMEMvZL8kEFNWLRcwPLJ
+kkXlwzUEJPxvWtkO8mjds2HLfdXZ4cUfZAAdjv0nKiyyuYaOkWONuiyph53YfNH+
+QR0/vuGhyv+UcqE0pxtnhnkBlQagsTHZ3ge5nHfi8QiYqbnJA2I9BaSnCdtTaFHP
+V73mxfGaKizA9i0aJ1EPgPLFxb+o6h26eRhbv2zR/5rJDr9ghxQLdl4HLtiB/Ig=
+=O7dY
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.63a-r2.ebuild b/media-gfx/blender/blender-2.63a-r2.ebuild
deleted file mode 100644
index 7f3ba0e1a294..000000000000
--- a/media-gfx/blender/blender-2.63a-r2.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# 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.8 2012/11/18 01:06:23 flameeyes 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 collada 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 )
-	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 )
-	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_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_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."
-}
diff --git a/media-gfx/blender/blender-2.63a-r3.ebuild b/media-gfx/blender/blender-2.63a-r3.ebuild
deleted file mode 100644
index b57f79f88b5a..000000000000
--- a/media-gfx/blender/blender-2.63a-r3.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# 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."
-}
diff --git a/media-gfx/blender/blender-2.64a.ebuild b/media-gfx/blender/blender-2.64a.ebuild
index b8aa45a13a50..dca3e4532c6b 100644
--- a/media-gfx/blender/blender-2.64a.ebuild
+++ b/media-gfx/blender/blender-2.64a.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.64a.ebuild,v 1.1 2012/11/18 01:06:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.64a.ebuild,v 1.2 2012/12/31 16:02:50 flameeyes Exp $
 
 EAPI=4
 PYTHON_DEPEND="3:3.2"
@@ -12,7 +12,7 @@ inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-fu
 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 )"
+REQUIRED_USE="player? ( game-engine ) redcode? ( jpeg2k )"
 
 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