fix dependencies wrt #466020, improve sse2 handling wrt #469134, remove env.d file wrt #447626, fix fftw useflag, update REQUIRED_USE, allow running src_install multiple times

Package-Manager: portage-2.2.0_alpha183/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

6 files changed, 153 insertions, 70 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index d740c6e30c22..93b43648a6f0 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.250 2013/06/20 19:59:26 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.251 2013/06/21 15:13:56 hasufell Exp $
+
+*blender-2.67b-r1 (21 Jun 2013)
+*blender-2.66-r1 (21 Jun 2013)
+
+  21 Jun 2013; Julian Ospald <hasufell@gentoo.org> -blender-2.66.ebuild,
+  +blender-2.66-r1.ebuild, +files/blender-2.66-sse2.patch,
+  -blender-2.67b.ebuild, +blender-2.67b-r1.ebuild,
+  +files/blender-2.67b-sse2.patch:
+  fix dependencies wrt #466020, improve sse2 handling wrt #469134, remove env.d
+  file wrt #447626, fix fftw useflag, update REQUIRED_USE, allow running
+  src_install multiple times
 
 *blender-2.67b (20 Jun 2013)
 
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index c0324879c098..bc3432eab369 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,9 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX blender-2.66-cmake.patch 381 SHA256 284c09ec1f0a0fc52123c704c7b89fb8795d83c6c25c7decef44e298343591a5 SHA512 d91f92d7817d2a317ea2328afd120b47d20e475937b8ba478db27f1ebdf6a661b567b15d1e9a1f5e89be0a775181ee8cc0867b261988428e524ea5c82269d5f4 WHIRLPOOL 0b844e49f813044303d94d60fc11b6a3fe8afdbfcc76ce3bd89d16a373fe03c3e6c2629be3599eafed8c7265f4b692f3e8f9bede9ca82e0d57ee5d654463dd6d
 AUX blender-2.66-doxyfile.patch 473 SHA256 4d6f50eb13f71b1ca083d8d8bfc3467660be586fe7d973acc9ce9b8b9d9b3337 SHA512 72e8ce59e485a2bbc4c09b367001fdef9d2a01c7b296bf001c1b708b4984625c40a8dd4ddee2b2ba962aa8f666cc8ed50229803d460ae79a807353080d16d520 WHIRLPOOL 45e0178cc55cd1f2e2e685173abb195367f3e61f07c55e007b44b7e3c14ef53ed0b098335044bca58e16787b738a65b23b223515296c6439e3bdfa9698a35dbf
+AUX blender-2.66-sse2.patch 1255 SHA256 0b7d7374226daec957755364414b4327efdde0430324b011d3e7d1483845e375 SHA512 e658ed4f0d913c599235acfd871f7d1aceda20f17d01e3753683527bf8a659a882d0c83a05f437f55abc9e252099485a1632f2b5842ce57940f747701b709e86 WHIRLPOOL b6cafc4bbdb35f6aeef9229a18db618272ad4a6a40154d9f9e3bc5ab23b51bcf11b5612a4bc0672f1cacb0d37e3a035fad54b0930ef6725f44af3953ba61f97e
 AUX blender-2.66-unbundle.patch 5475 SHA256 86025dc9d93fcd3acac8665cfc09d079bbf450ce12aac6844c7b37bc9dfeeb94 SHA512 86075ebcc388ded5407543e7a54303bb097bea124fd15ada7ae13a1b0949507b84e53133551d4d3aaeaab4d7e921d62857539b216af6bf7962beeca258e97d79 WHIRLPOOL 7b8489258e5d5108018f24927eec77d990af6c0bc565648d3f392251522249a7f54a5015d9880311a3169da495972dcfbfc88ee408c972ebbfd6b6b03ab73c85
 AUX blender-2.67b-doxyfile.patch 733 SHA256 54da3cad8c1ab1f436a74ea720a0bcd650885a4d504c769825fe0fb97bec75b3 SHA512 e361f0cb89639f31fad64fc8ebbafb313658c995d918ef0a15a7363e8483d0c62c57f51974001ef498ebbf1c3b6a42a0ce35c1df05d4ab5d010372e3d436f11e WHIRLPOOL 66f3c3cf385de8b9893a55638b0c7c538c047d1e64405c630ec75130e0c0a0507b82f311226da6fede1e3b40d67d9ba3b08a56a52e9a1427051394bade9386c3
 AUX blender-2.67b-fix-install-rules.patch 740 SHA256 7b3b7a8b19c00b93ae2ebbc5f3cee294c20f8468b40fc5cd7fd686b81ba77adf SHA512 6ebd7ecb87a0137914145f38ded6bf4b7465391680329dc9a8a6fa00ae324cc81f49f485400c0edda6fe530b994231ae0eea6eb76cb8113b16f660d3da09f783 WHIRLPOOL 8ab814662605a492d0e7bbe0d899cfd35406ece17391a01951bb4d8ab285575126caf097772db174833c23ac5b3d4c67ed57ad54e9dcd2bc36e89fbeced23936
 AUX blender-2.67b-remove-binreloc.patch 918 SHA256 f654304421f63bb89862c1688aa288fae744519e03fa292dac191ea0a51c8b90 SHA512 7a53cdf6f31a0f33298adfc3113967547c75451552ce514749ed4926598f0fdffb4854c5443d140f76ec483be7342b4d18bdacfa460b3b3603072a7912429666 WHIRLPOOL ccfb950fe7dab6b7e1ca5e1a1a77327d7a32b8045518063b016dbb73b2595cc7b4281ead7d078089e3b9e7b17ab5566d641d73b3d8c5019b3ae0059220f6ea31
+AUX blender-2.67b-sse2.patch 1622 SHA256 9c8f6a35413b7d6fee235668c78d072850637978905b70b4596b9e0b38f39f6d SHA512 2cb77391c5fc66d0211020db3820e51fff63fba8dce4852f39e18701f42aef0a44b0546042f309350e66d05bcd8b2119123b76a8e9fc1f557d7e9f415a0528b0 WHIRLPOOL a81f7d76091fd36be71b9586a99014929fbedcd65b6e66e4418ad6d0f45d99e4d65f9c7880be129f349642258488ccee9b18bf7d8a1cc5379e14c863d3aee4e8
 AUX blender-2.67b-unbundle-colamd.patch 1840 SHA256 8d5142ffdb433315b5c8107856c47f5848e58d8070d05e0a2a61531d54b9747a SHA512 d916efb1a94c9b6d443430bd793b8af3a024b11c8b8c0cfde3f6329994aa836831b5191af93c18ae21d5f80002a30d18e9c6577b982c60884b3b5ddfb93060d4 WHIRLPOOL 2f2c0fa0013a049816b5a0574ad29d4c45d467582d971fc99eabdcbebf11621fddff891c2466ec9dd4506c9b922326d967c3d534e83893419de169f0448ad760
 AUX blender-2.67b-unbundle-eigen3.patch 30917 SHA256 587dbe4c263e564edfde0611b2fdde3527442d9c72759912e3efa484bc1ff152 SHA512 1dc845eb8ea6a1f5dae43c88eba9130501b80fa6f9948d294beb236fd9d77f0d6dc8efedcd2827e50721b19b302f97912aacd9d2b0d5904ef08ca21970279194 WHIRLPOOL 4978a467dd548104ee05db32c9093bd59249d2ef6fef7baead3949d9f4b0d8224c1342ed707a17affca1c31e0bf078d7b0aa352b2093e738242e8e3b7cce5ba1
 AUX blender-2.67b-unbundle-glog.patch 3278 SHA256 2eaf6be80747200763fb3a5956cd0883c178ce17995f1563c747347bad096a8a SHA512 e2189b0e0841e5239195501ad39e59e571ad609e8ae81b87669c9c28165d4b92c5bc55080067756ab7655339b8e276d2d90a762c3c8ab4653ced0f4cc5d9246f WHIRLPOOL 154b807351b27b74933683777aadb5b4ddd1208ab6aff5317e5ba2feb4e504469b0c82a76c293fb90247f7a41987b8c4842bd9b724bd165077117cf186ffd845
@@ -12,7 +17,18 @@ DIST blender-2.64a.tar.gz 31388178 SHA256 a5b1c3f1919b041a253d8d6d7c4f54e2b7f8a9
 DIST blender-2.66.tar.gz 36914318 SHA256 627a4bb12b6d971be76ae2ada080d5ed65904d7f83bcefe43a9a5a82cf433558 SHA512 f76499edc5f8179a42ec6d6334c6fa03f830570d054061ae40c2e8e1ec0a0090efcbb642f4f7f3b99d3941d4c4b791a0e357a275acf1b3ac251d58906f23b2b4 WHIRLPOOL cfc0e1cb441b41d4363dea28c0d2ac3879d49b417d43f5dce44c784cf78d924b3d640a698c8df3c842aa90a8f5c84faf80d4769f64505c151d0c965b4f28f48b
 DIST blender-2.67b.tar.gz 41368150 SHA256 7d6701d92ee7e3923771de10f610a3f8cca8b6d14b488d3044f8329878187d67 SHA512 d9b24219770e51aac76a15cb6db486835d389e27a89d1ce890da0f0a30f3f76a070ddd9c21e739df93e7f4a670a6b3de993a6f56696983bf466be9c14e906525 WHIRLPOOL fee35d98766a8acf3bd2ca696ae1c9f0deb1422d45f3951c56bae6ea172fef1ecd21801e4696665e6a40384636aee59d5cb173ef31998aba985c41193f9d4949
 EBUILD blender-2.64a.ebuild 7793 SHA256 c7d8f834d31e287958f44a6ae3ea94362b1f651f325df1256c4b1d97c2f48ed6 SHA512 ce6165280c3ac9b59e0e31c74791123fead93c9b91b169051328f4cdc9ad1e76ac6fea27ad8e8e3b7178639f3ef4cf8b8db79759e14afca302b39541ce18d472 WHIRLPOOL 55d443d2e0df5f7ec591cfae317d5b97f266b89a3146f67f4c73e8f7c9a1592908c833acaf9d285e6dacb59155a9637a7670c45b5167511d4c7530bae30ee010
-EBUILD blender-2.66.ebuild 7482 SHA256 41dec63fbce11117ed8b3900fcc92bc26bce5743f8589d8bfd1afc1f0ecedc30 SHA512 0cbde9663a1beb0bec0a4a6978b59e756adea75aee2f8470e2675dead0bf8d1ec502890b7ccc95145815b8f8069c95ba6cfeb19dcb50f58bd195973d7752e526 WHIRLPOOL d1a64f8e1fd07fd4717f8f70c7d9ff4e8554b47487a97ac9cec1a2e219ca2ab04cceb4b2f782a08dc65297b07536f1e16e88f094914099ed5047325f883521db
-EBUILD blender-2.67b.ebuild 7749 SHA256 45a83f9ba1c9acb7f8189a942ff7906f9cc34e0a0d7005adec3527fed3ac4ab3 SHA512 52a95233c69c99c37248cbedf469057f4b2762e74fe01587a9c1ac522d6cdef90b4710cd1471b0c2b69dae309f871c17576d6c94cfb1d77c1d2e92d4e38cc2eb WHIRLPOOL 8ee0f40ab14680d9709fbb51d6a5bfe48abbfd557579aa86a83adaa9d007126107034ea6efa965a33e44176ffd5ccd0c23933457919819cf642b683cc6110ed4
-MISC ChangeLog 43052 SHA256 f8b5e60fcaca9e9697368d6b18f0c7809949f8bc63b844cf534d06df82a43701 SHA512 3aca0615975a8166ee743878ac6204d9605b06ed9042b2abbd098382bf722eb1b3602c18c64b40f29b5af32b4fa23918dacc1557b276ce950bfd5caa35057e0c WHIRLPOOL a1edd23108209ff73f3102a5198fb43901ffc6f0a63c8fba119b4c6ad1c54eae3e440c76867f2921ae95b94cdfe057ac91d4c3277dc03551ff089123e3c951e4
+EBUILD blender-2.66-r1.ebuild 7139 SHA256 011438751f8ea6f55307d337e4cedb0dd7e65a14751c9db21089a33c9b045dd1 SHA512 c61b745e5e90beb19fe9ee6dc0130cc8a599e444746cd1c8a1c131768ef5948b378cef7ff9ad19ffdab99a3383237c75bbeaa4b6934db01addaf13719c972e1c WHIRLPOOL bbcb267b210f0c2392c61fc93131ff9d938e3a0f8e1010d86cd8b50bf6cb5f8bd86773139df8fbad71279b03ede83d0bf890030663fc7f4b15c5307a3943fc82
+EBUILD blender-2.67b-r1.ebuild 7406 SHA256 8ab0792666f1699d630ee46114b3bffd490aff8f433880114c1b2a650bd8a04b SHA512 54fd77385f7e97991a50cf7c5a0255d5a3430e1850d09be607edd5cb82e03a0425caab0022f9cea16cb379b0b88325b7c2ac22b538a9931b9a389559f3594660 WHIRLPOOL 41c1360030b5d87a81cbfd0418b605a22b04dd93d405bdff7fde208074df4c2555f7655526c8a4a5413648ccb8a4e043fb83a753c8e210ce7c8070983cf7fa41
+MISC ChangeLog 43517 SHA256 604f00ffdabd4cc9043e8fd15cd30894c2a75b02654e5666c34a5f1d9a2db00c SHA512 c562dcc883c7e0bdf0effb1c651300cf33fc55ede54c21ead2d3620c1dd590430356e135abd265f24dc2ab5e7a0dfb2d31d3277db639f2488e1aaf097db6505c WHIRLPOOL 0357c716cdbc5949b66b1f3e14a1115f10605ddff3423a072c48358aaa4b842d9a1168a44ffaf62f4c32a51c510d8b6abc4bfc2077daf01b64a7c9e0bf742bc3
 MISC metadata.xml 2292 SHA256 9200af59c7e8551e71eef6e3d9b9653a74ef82f2e00a4c8fcfcbb1bee24dd888 SHA512 e0a20ec354899b299068aaee19ae64044bda5f1ea088485945b423cfdbe8a23bbb006b675d39604e9e5356bbc7185ce05fb1fdd42ecd04c1a052b874ac0de849 WHIRLPOOL 6bddc466a2cc1f7abef7bb6a4ee9aec23f53194053c9f0e08df5a7385e42fe88a49e0253ec4acc749a91ced9428b17ff49319e89dfde7001dde9ea5bd721bae5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRxG25AAoJEFpvPKfnPDWzHKwH/2AV2id5VaP8NQFE1thA8CGe
+jJgEyXq/w+L1sqHGsQ6C/YNHNhX0H5szIyv0aMh0VyD1CSRtXT8OLLdAA3mVj8mZ
+x5IRjjXeTB0dFx6UJKhdUt4IX7nFVsoScrxjAQYiayiVFVIDDk6fv8AVR/e0bEp2
+YogK0cYPig/uA1c6O/ZMEPaantz+d73HhjYj3LSiJ2TGxQC6E8UT0U5d0QT70861
+q7DryVs6I6hq0hG3MCDEsoOiYgSGBJTdfnjeJhItA28obN+3Re2vppL92Cr4Xe5V
+akKNRotRIchw+0GSnvXVVDz2UE1IPPZALwieBO/fUir+6iMG8wlJRlbSU4PflS0=
+=/RA0
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.66.ebuild b/media-gfx/blender/blender-2.66-r1.ebuild
index cdb475bccb10..7cba06952b00 100644
--- a/media-gfx/blender/blender-2.66.ebuild
+++ b/media-gfx/blender/blender-2.66-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.66.ebuild,v 1.2 2013/05/29 13:29:28 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.66-r1.ebuild,v 1.1 2013/06/21 15:13:56 hasufell Exp $
 
 # TODO:
 #   bundled-deps: eigen:3 is too old
@@ -30,11 +30,17 @@ fi
 SLOT="0"
 LICENSE="|| ( GPL-2 BL )"
 KEYWORDS="~amd64 ~x86"
-IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openmp +openexr player redcode sdl sndfile sse tiff"
-REQUIRED_USE="${PYTHON_REQUIRED_USE} player? ( game-engine ) redcode? ( jpeg2k ) cycles? ( boost ) nls? ( boost )"
+IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openmp +openexr player redcode sdl sndfile sse sse2 tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	player? ( game-engine )
+	redcode? ( jpeg2k )
+	cycles? ( boost openexr tiff )
+	nls? ( boost )
+	game-engine? ( boost )"
 
 RDEPEND="
 	${PYTHON_DEPS}
+	dev-cpp/gflags
 	dev-cpp/glog[gflags]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=media-libs/freetype-2.0
@@ -61,7 +67,10 @@ RDEPEND="
 	)
 	fftw? ( sci-libs/fftw:3.0 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	ndof? ( app-misc/spacenavd )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
 	nls? ( virtual/libiconv )
 	openal? ( >=media-libs/openal-1.6.372 )
 	openexr? ( media-libs/openexr )
@@ -92,7 +101,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.66-{unbundle,cmake,doxyfile}.patch
+	epatch "${FILESDIR}"/${PN}-2.66-{unbundle,cmake,doxyfile,sse2}.patch
 
 	# remove some bundled deps
 	rm -r \
@@ -116,6 +125,19 @@ src_prepare() {
 
 	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|^|- |')"
+
+	# linguas cleanup
+	local i
+	if ! use nls; then
+		rm -r "${S}"/release/datafiles/locale || die
+	else
+		if [[ -n "${LINGUAS+x}" ]] ; then
+			for i in "${S}"/release/datafiles/locale/* ; do
+				mylang=${i##*/}
+				has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; }
+			done
+		fi
+	fi
 }
 
 src_configure() {
@@ -136,7 +158,7 @@ src_configure() {
 		$(cmake-utils_use_with elbeem MOD_FLUID)
 		$(cmake-utils_use_with ffmpeg CODEC_FFMPEG)
 		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fftw MOD_OCEANISM)
+		$(cmake-utils_use_with fftw MOD_OCEANSIM)
 		$(cmake-utils_use_with game-engine GAMEENGINE)
 		$(cmake-utils_use_with nls INTERNATIONAL)
 		$(cmake-utils_use_with jack JACK)
@@ -149,6 +171,7 @@ src_configure() {
 		$(cmake-utils_use_with sdl SDL)
 		$(cmake-utils_use_with sndfile CODEC_SNDFILE)
 		$(cmake-utils_use_with sse RAYOPTIMIZATION)
+		$(cmake-utils_use_with sse2 SSE2)
 		$(cmake-utils_use_with bullet BULLET)
 		$(cmake-utils_use_with tiff IMAGE_TIFF)
 		$(cmake-utils_use_with colorio OPENCOLORIO)
@@ -169,12 +192,6 @@ src_configure() {
 src_compile() {
 	cmake-utils_src_compile
 
-	cat - > "${T}"/${PN}.env <<EOF
-BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV}/scripts"
-BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV}/datafiles"
-BLENDER_SYSTEM_PLUGINS="/usr/$(get_libdir)/plugins"
-EOF
-
 	if use doc; then
 		einfo "Generating Blender C/C++ API docs ..."
 		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
@@ -198,8 +215,6 @@ src_install() {
 	# Pax mark blender for hardened support.
 	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
 
-	newenvd "${T}"/${PN}.env 60${PN}
-
 	if use doc; then
 		docinto "API/python"
 		dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/*
@@ -208,28 +223,15 @@ src_install() {
 		dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/*
 	fi
 
-	# linguas cleanup
-	if ! use nls; then
-		rm -r "${CMAKE_USE_DIR}"/release/datafiles/locale || die
-	else
-		if [[ -n "${LINGUAS+x}" ]] ; then
-			for i in "${CMAKE_USE_DIR}"/release/datafiles/locale/* ; do
-				mylang=${i##*/}
-				has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; }
-			done
-		fi
-	fi
-
 	# fucked up cmake will relink binary for no reason
-	# on normal "install" rule
 	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast
 
 	# fix doc installdir
-	dohtml "${D}"/usr/share/doc/blender/readme.html
-	rm -r "${D}"/usr/share/doc/blender || die
+	dohtml "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -rf "${ED%/}"/usr/share/doc/blender
 
-	python_fix_shebang "${D}"/usr/bin/blender-thumbnailer.py
-	python_optimize "${D}"/usr/share/blender/${PV}/scripts
+	python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py
+	python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts
 }
 
 pkg_preinst() {
@@ -246,9 +248,6 @@ pkg_postinst() {
 	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.66, please make"
-	ewarn "sure to log out and then back in before launching it, so"
-	ewarn "that the new environment variables are picked up."
 	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
 }
diff --git a/media-gfx/blender/blender-2.67b.ebuild b/media-gfx/blender/blender-2.67b-r1.ebuild
index 40098181e039..dc153fcba794 100644
--- a/media-gfx/blender/blender-2.67b.ebuild
+++ b/media-gfx/blender/blender-2.67b-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.67b.ebuild,v 1.1 2013/06/20 19:59:26 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.67b-r1.ebuild,v 1.1 2013/06/21 15:13:56 hasufell Exp $
 
 # TODO:
 #   bundled-deps: bullet is modified
@@ -29,7 +29,7 @@ fi
 SLOT="0"
 LICENSE="|| ( GPL-2 BL )"
 KEYWORDS="~amd64 ~x86"
-IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openmp +openexr player redcode sdl sndfile sse tiff"
+IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openmp +openexr player redcode sdl sndfile sse sse2 tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	player? ( game-engine )
 	redcode? ( jpeg2k )
@@ -66,7 +66,10 @@ RDEPEND="
 	)
 	fftw? ( sci-libs/fftw:3.0 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	ndof? ( app-misc/spacenavd )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
 	nls? ( virtual/libiconv )
 	openal? ( >=media-libs/openal-1.6.372 )
 	openexr? ( media-libs/openexr )
@@ -103,7 +106,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-remove-binreloc.patch \
 		"${FILESDIR}"/${P}-unbundle-glog.patch \
 		"${FILESDIR}"/${P}-unbundle-eigen3.patch \
-		"${FILESDIR}"/${P}-fix-install-rules.patch
+		"${FILESDIR}"/${P}-fix-install-rules.patch \
+		"${FILESDIR}"/${P}-sse2.patch
 
 	# remove some bundled deps
 	rm -r \
@@ -129,6 +133,19 @@ src_prepare() {
 
 	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|^|- |')"
+
+	# linguas cleanup
+	local i
+	if ! use nls; then
+		rm -r "${S}"/release/datafiles/locale || die
+	else
+		if [[ -n "${LINGUAS+x}" ]] ; then
+			for i in "${S}"/release/datafiles/locale/* ; do
+				mylang=${i##*/}
+				has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; }
+			done
+		fi
+	fi
 }
 
 src_configure() {
@@ -149,7 +166,7 @@ src_configure() {
 		$(cmake-utils_use_with elbeem MOD_FLUID)
 		$(cmake-utils_use_with ffmpeg CODEC_FFMPEG)
 		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fftw MOD_OCEANISM)
+		$(cmake-utils_use_with fftw MOD_OCEANSIM)
 		$(cmake-utils_use_with game-engine GAMEENGINE)
 		$(cmake-utils_use_with nls INTERNATIONAL)
 		$(cmake-utils_use_with jack JACK)
@@ -162,6 +179,7 @@ src_configure() {
 		$(cmake-utils_use_with sdl SDL)
 		$(cmake-utils_use_with sndfile CODEC_SNDFILE)
 		$(cmake-utils_use_with sse RAYOPTIMIZATION)
+		$(cmake-utils_use_with sse2 SSE2)
 		$(cmake-utils_use_with bullet BULLET)
 		$(cmake-utils_use_with tiff IMAGE_TIFF)
 		$(cmake-utils_use_with colorio OPENCOLORIO)
@@ -182,12 +200,6 @@ src_configure() {
 src_compile() {
 	cmake-utils_src_compile
 
-	cat - > "${T}"/${PN}.env <<EOF
-BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV}/scripts"
-BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV}/datafiles"
-BLENDER_SYSTEM_PLUGINS="/usr/$(get_libdir)/plugins"
-EOF
-
 	if use doc; then
 		einfo "Generating Blender C/C++ API docs ..."
 		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
@@ -211,8 +223,6 @@ src_install() {
 	# Pax mark blender for hardened support.
 	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
 
-	newenvd "${T}"/${PN}.env 60${PN}
-
 	if use doc; then
 		docinto "API/python"
 		dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/*
@@ -221,27 +231,15 @@ src_install() {
 		dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/*
 	fi
 
-	# linguas cleanup
-	if ! use nls; then
-		rm -r "${CMAKE_USE_DIR}"/release/datafiles/locale || die
-	else
-		if [[ -n "${LINGUAS+x}" ]] ; then
-			for i in "${CMAKE_USE_DIR}"/release/datafiles/locale/* ; do
-				mylang=${i##*/}
-				has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; }
-			done
-		fi
-	fi
-
 	# fucked up cmake will relink binary for no reason
 	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast
 
 	# fix doc installdir
-	dohtml "${D}"/usr/share/doc/blender/readme.html
-	rm -r "${D}"/usr/share/doc/blender || die
+	dohtml "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -rf "${ED%/}"/usr/share/doc/blender
 
-	python_fix_shebang "${D}"/usr/bin/blender-thumbnailer.py
-	python_optimize "${D}"/usr/share/blender/${PV}/scripts
+	python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py
+	python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts
 }
 
 pkg_preinst() {
@@ -258,9 +256,6 @@ pkg_postinst() {
 	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.66, please make"
-	ewarn "sure to log out and then back in before launching it, so"
-	ewarn "that the new environment variables are picked up."
 	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
 }
diff --git a/media-gfx/blender/files/blender-2.66-sse2.patch b/media-gfx/blender/files/blender-2.66-sse2.patch
new file mode 100644
index 000000000000..a51e5e4a845c
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.66-sse2.patch
@@ -0,0 +1,27 @@
+--- blender-2.66/CMakeLists.txt
++++ blender-2.66/CMakeLists.txt
+@@ -86,6 +86,7 @@
+ #-----------------------------------------------------------------------------
+ # Load some macros.
+ include(build_files/cmake/macros.cmake)
++include(CMakeDependentOption)
+ 
+ 
+ #-----------------------------------------------------------------------------
+@@ -236,6 +237,7 @@
+ # Misc
+ option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
+ option(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON)
++cmake_dependent_option(WITH_SSE2 "SSE2 optimizations" ON WITH_RAYOPTIMIZATION OFF)
+ if(UNIX AND NOT APPLE)
+ 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
+ 	option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF)
+@@ -1767,7 +1769,7 @@
+ 		set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}")
+ 		add_definitions(-D__SSE__ -D__MMX__)
+ 	endif()
+-	if(SUPPORT_SSE2_BUILD)
++	if(WITH_SSE2 AND SUPPORT_SSE2_BUILD)
+ 		set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}")
+ 		add_definitions(-D__SSE2__)
+ 		if(NOT SUPPORT_SSE_BUILD) # dont double up
diff --git a/media-gfx/blender/files/blender-2.67b-sse2.patch b/media-gfx/blender/files/blender-2.67b-sse2.patch
new file mode 100644
index 000000000000..bbf7a3116496
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.67b-sse2.patch
@@ -0,0 +1,35 @@
+commit 824e0f9182059d2d2694167606da7abd536e22c8
+Author: hasufell <hasufell@gentoo.org>
+Date:   Fri Jun 21 16:17:40 2013 +0200
+
+    add option to explicitly control sse2 optimization
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 44ce1c3..f6fc3b8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -86,6 +86,7 @@ cmake_policy(SET CMP0014 NEW)
+ #-----------------------------------------------------------------------------
+ # Load some macros.
+ include(build_files/cmake/macros.cmake)
++include(CMakeDependentOption)
+ 
+ 
+ #-----------------------------------------------------------------------------
+@@ -255,6 +256,7 @@ option(WITH_FREESTYLE     "Enable Freestyle (advanced edges rendering)" ON)
+ # Misc
+ option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
+ option(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON)
++cmake_dependent_option(WITH_SSE2 "SSE2 optimizations" ON WITH_RAYOPTIMIZATION OFF)
+ if(UNIX AND NOT APPLE)
+ 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
+ 	option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF)
+@@ -1804,7 +1806,7 @@ if(WITH_RAYOPTIMIZATION)
+ 		set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}")
+ 		add_definitions(-D__SSE__ -D__MMX__)
+ 	endif()
+-	if(SUPPORT_SSE2_BUILD)
++	if(WITH_SSE2 AND SUPPORT_SSE2_BUILD)
+ 		set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}")
+ 		add_definitions(-D__SSE2__)
+ 		if(NOT SUPPORT_SSE_BUILD) # dont double up