revbump for adding missing fix for T42797, rm old

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

11 files changed, 17 insertions, 929 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index efb6c809b326..44d41423b642 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.282 2014/12/22 15:41:27 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.283 2014/12/22 15:46:07 hasufell Exp $
+
+*blender-2.72b-r2 (22 Dec 2014)
+
+  22 Dec 2014; Julian Ospald <hasufell@gentoo.org> -blender-2.72b.ebuild,
+  -blender-2.72b-r1.ebuild, +blender-2.72b-r2.ebuild,
+  -files/01-blender-2.68-doxyfile.patch,
+  -files/06-blender-2.68-fix-install-rules.patch,
+  -files/07-blender-2.70-sse2.patch, -files/08-blender-2.71-gflags.patch,
+  -files/02-blender-2.71-unbundle-colamd.patch,
+  -files/04-blender-2.71-unbundle-glog.patch,
+  -files/05-blender-2.72-unbundle-eigen3.patch,
+  -files/09-blender-2.72b-unbundle-minilzo.patch:
+  revbump for adding missing fix for T42797, rm old
 
   22 Dec 2014; Julian Ospald <hasufell@gentoo.org>
   +files/blender-2.68-doxyfile.patch,
diff --git a/media-gfx/blender/blender-2.72b-r1.ebuild b/media-gfx/blender/blender-2.72b-r2.ebuild
index 462a8c3c3fcc..d0d046172c83 100644
--- a/media-gfx/blender/blender-2.72b-r1.ebuild
+++ b/media-gfx/blender/blender-2.72b-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.72b-r1.ebuild,v 1.2 2014/12/21 22:31:45 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.72b-r2.ebuild,v 1.1 2014/12/22 15:46:07 hasufell Exp $
 
 ## BUNDLED-DEPS:
 # extern/cuew
@@ -126,7 +126,8 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.68-doxyfile.patch \
 		"${FILESDIR}"/${PN}-2.68-fix-install-rules.patch \
-		"${FILESDIR}"/${PN}-2.70-sse2.patch
+		"${FILESDIR}"/${PN}-2.70-sse2.patch \
+		"${FILESDIR}"/${PN}-2.72-T42797.diff
 
 	epatch_user
 
diff --git a/media-gfx/blender/blender-2.72b.ebuild b/media-gfx/blender/blender-2.72b.ebuild
deleted file mode 100644
index 079bcf83f618..000000000000
--- a/media-gfx/blender/blender-2.72b.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.72b.ebuild,v 1.3 2014/12/17 16:45:22 hasufell Exp $
-
-## BUNDLED-DEPS:
-# extern/recastnavigation
-# extern/libmv
-# extern/clew
-# extern/bullet2
-# extern/wcwidth
-# extern/cuew
-# extern/carve
-# extern/xdnd
-# extern/binreloc
-# extern/libredcode
-# extern/gtest
-# extern/rangetree
-# extern/lzma
-# extern/libmv/third_party/ceres
-# extern/libmv/third_party/msinttypes
-
-# TODO:
-#   bundled-deps: bullet is modified
-#   multiple python abi?
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 )
-#PATCHSET="1"
-
-inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs
-
-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"
-IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	player? ( game-engine )
-	redcode? ( jpeg2k ffmpeg )
-	cycles? ( boost openexr tiff )
-	nls? ( boost )
-	game-engine? ( boost )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-cpp/gflags-2.1.1-r1
-	>=dev-cpp/glog-0.3.3-r1[gflags]
-	>=dev-libs/lzo-2.08:2
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=media-libs/freetype-2.0
-	media-libs/glew
-	media-libs/libpng:0
-	media-libs/libsamplerate
-	sci-libs/colamd
-	sci-libs/ldl
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg
-	virtual/libintl
-	virtual/opengl
-	x11-libs/libXi
-	x11-libs/libX11
-	boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] )
-	collada? ( media-libs/opencollada )
-	colorio? ( <=media-libs/opencolorio-1.0.9 )
-	cycles? (
-		media-libs/openimageio
-	)
-	ffmpeg? (
-		|| (
-			>=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?]
-			>=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?]
-		)
-	)
-	fftw? ( sci-libs/fftw:3.0 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ndof? (
-		app-misc/spacenavd
-		dev-libs/libspnav
-	)
-	nls? ( virtual/libiconv )
-	openal? ( >=media-libs/openal-1.6.372 )
-	openimageio? ( media-libs/openimageio )
-	openexr? ( media-libs/openexr )
-	sdl? ( media-libs/libsdl[sound,joystick] )
-	sndfile? ( media-libs/libsndfile )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}
-	>=dev-cpp/eigen-3.1.3:3
-	doc? (
-		app-doc/doxygen[-nodot(-),dot(+)]
-		dev-python/sphinx
-	)
-	nls? ( sys-devel/gettext )"
-
-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-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \
-		"${FILESDIR}"/02-${PN}-2.71-unbundle-colamd.patch \
-		"${FILESDIR}"/04-${PN}-2.71-unbundle-glog.patch \
-		"${FILESDIR}"/05-${PN}-2.72-unbundle-eigen3.patch \
-		"${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \
-		"${FILESDIR}"/07-${PN}-2.70-sse2.patch \
-		"${FILESDIR}"/08-${PN}-2.71-gflags.patch \
-		"${FILESDIR}"/09-${PN}-2.72b-unbundle-minilzo.patch \
-		"${FILESDIR}"/${PN}-2.72-T42797.diff
-
-	epatch_user
-
-	# remove some bundled deps
-	rm -r \
-		extern/Eigen3 \
-		extern/libopenjpeg \
-		extern/glew \
-		extern/colamd \
-		extern/lzo \
-		extern/libmv/third_party/{glog,gflags} \
-		|| die
-
-	# we don't want static glew, but it's scattered across
-	# thousand files
-	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
-	sed -i \
-		-e '/-DGLEW_STATIC/d' \
-		$(find . -type f -name "CMakeLists.txt") || 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|^|- |')"
-
-	# linguas cleanup
-	local i
-	if ! use nls; then
-		rm -r "${S}"/release/datafiles/locale || die
-	else
-		if [[ -n "${LINGUAS+x}" ]] ; then
-			cd "${S}"/release/datafiles/locale/po
-			for i in *.po ; do
-				mylang=${i%.po}
-				has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; }
-			done
-		fi
-	fi
-}
-
-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
-
-	# WITH_PYTHON_SECURITY
-	# WITH_PYTHON_SAFETY
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DWITH_INSTALL_PORTABLE=OFF
-		$(cmake-utils_use_with boost BOOST)
-		$(cmake-utils_use_with cycles CYCLES)
-		$(cmake-utils_use_with collada OPENCOLLADA)
-		$(cmake-utils_use_with dds IMAGE_DDS)
-		$(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_OCEANSIM)
-		$(cmake-utils_use_with game-engine GAMEENGINE)
-		$(cmake-utils_use_with nls INTERNATIONAL)
-		$(cmake-utils_use_with jack JACK)
-		$(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG)
-		$(cmake-utils_use_with openimageio OPENIMAGEIO)
-		$(cmake-utils_use_with openal OPENAL)
-		$(cmake-utils_use_with openexr IMAGE_OPENEXR)
-		$(cmake-utils_use_with openmp OPENMP)
-		$(cmake-utils_use_with opennl OPENNL)
-		$(cmake-utils_use_with player PLAYER)
-		$(cmake-utils_use_with redcode IMAGE_REDCODE)
-		$(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)
-		$(cmake-utils_use_with ndof INPUT_NDOF)
-		-DWITH_PYTHON_INSTALL=OFF
-		-DWITH_PYTHON_INSTALL_NUMPY=OFF
-		-DWITH_STATIC_LIBS=OFF
-		-DWITH_SYSTEM_GLEW=ON
-		-DWITH_SYSTEM_OPENJPEG=ON
-		-DWITH_SYSTEM_BULLET=OFF
-		-DPYTHON_VERSION="${EPYTHON/python/}"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	local i
-
-	# Pax mark blender for hardened support.
-	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
-
-	if use doc; then
-		docinto "API/python"
-		dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/*
-
-		docinto "API/blender"
-		dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/*
-	fi
-
-	# fucked up cmake will relink binary for no reason
-	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast
-
-	# fix doc installdir
-	dohtml "${CMAKE_USE_DIR}"/release/text/readme.html
-	rm -rf "${ED%/}"/usr/share/doc/blender
-
-	python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py
-	python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/blender/files/01-blender-2.68-doxyfile.patch b/media-gfx/blender/files/01-blender-2.68-doxyfile.patch
deleted file mode 100644
index c11c793fda97..000000000000
--- a/media-gfx/blender/files/01-blender-2.68-doxyfile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 62308d9fc24bde22a50497816c44c8ca91f96f63
-Author: hasufell <hasufell@gentoo.org>
-Date:   Fri Jul 19 18:36:34 2013 +0200
-
-    remove hhc.exe reference
-
-diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
-index 397cc30..ac61756 100644
---- a/doc/doxygen/Doxyfile
-+++ b/doc/doxygen/Doxyfile
-@@ -1051,7 +1051,7 @@ CHM_FILE               = blender.chm
- # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
- # the HTML help compiler on the generated index.hhp.
- 
--HHC_LOCATION           = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe"
-+HHC_LOCATION           = 
- 
- # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
- # controls if a separate .chi index file is generated (YES) or that
diff --git a/media-gfx/blender/files/02-blender-2.71-unbundle-colamd.patch b/media-gfx/blender/files/02-blender-2.71-unbundle-colamd.patch
deleted file mode 100644
index ee062fe687f5..000000000000
--- a/media-gfx/blender/files/02-blender-2.71-unbundle-colamd.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-commit f6af85bef74ae6d1df1e811db7274829e50f10a9
-Author: hasufell <hasufell@gentoo.org>
-Date:   Fri Jul 19 18:37:21 2013 +0200
-
-    unbundle colamd
-
-diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
-index f6de873..2b40c22 100644
---- a/extern/CMakeLists.txt
-+++ b/extern/CMakeLists.txt
-@@ -26,7 +26,6 @@
- # Otherwise we get warnings here that we cant fix in external projects
- remove_strict_flags()
- 
--add_subdirectory(colamd)
- add_subdirectory(rangetree)
- add_subdirectory(wcwidth)
- add_subdirectory(libmv)
-diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
-index d91319d..bc3baee 100644
---- a/source/blenderplayer/CMakeLists.txt
-+++ b/source/blenderplayer/CMakeLists.txt
-@@ -170,8 +170,6 @@ endif()
- 		list(APPEND BLENDER_SORTED_LIBS extern_ceres)
- 	endif()
- 
--	list(APPEND BLENDER_SORTED_LIBS extern_colamd)
--
- 	if(WITH_MOD_BOOLEAN)
- 		list(APPEND BLENDER_SORTED_LIBS extern_carve)
- 	endif()
-@@ -214,7 +212,7 @@ endif()
- 		list(SORT REM_MSG)
- 		message(STATUS "Player Skipping: (${REM_MSG})")
- 	endif()
--	target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS})
-+	target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS} colamd)
- 
- 	unset(SEARCHLIB)
- 	unset(SORTLIB)
-diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 8ff4ec4..c84d944 100644
---- a/source/creator/CMakeLists.txt
-+++ b/source/creator/CMakeLists.txt
-@@ -889,6 +889,6 @@
- 
- setup_blender_sorted_libs()
- 
--target_link_libraries(blender ${BLENDER_SORTED_LIBS})
-+target_link_libraries(blender ${BLENDER_SORTED_LIBS} colamd)
- 
- setup_liblinks(blender)
diff --git a/media-gfx/blender/files/04-blender-2.71-unbundle-glog.patch b/media-gfx/blender/files/04-blender-2.71-unbundle-glog.patch
deleted file mode 100644
index 5f5c1aef332a..000000000000
--- a/media-gfx/blender/files/04-blender-2.71-unbundle-glog.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 26e853d31931a8bb08695aa98ae53b263236d407
-Author: hasufell <hasufell@gentoo.org>
-Date:   Fri Jul 19 18:40:23 2013 +0200
-
-    unbundle glog/gflags
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b1a7830..a30831c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -106,6 +106,14 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE)
- set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
- 
- #-----------------------------------------------------------------------------
-+# Check for some modules
-+if(UNIX)
-+  find_package(PkgConfig)
-+  pkg_check_modules(_PC_GFLAGS libgflags)
-+  pkg_check_modules(_PC_GLOG libglog)
-+endif()
-+
-+#-----------------------------------------------------------------------------
- # Set default config options
- 
- get_blender_version()
-diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
-index 2c9a219..7061e04 100644
---- a/extern/libmv/CMakeLists.txt
-+++ b/extern/libmv/CMakeLists.txt
-@@ -47,8 +47,6 @@
- 	)
- 
- 	list(APPEND INC
--		third_party/gflags
--		third_party/glog/src
- 		third_party/ceres/include
- 		../../intern/guardedalloc
- 	)
-@@ -208,7 +206,10 @@
- 	)
- endif()
- 
-+include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS})
- blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
-+target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES} ${_PC_GLOG_LIBRARIES})
-+
- 
- if(WITH_LIBMV)
- 	add_subdirectory(third_party)
-@@ -299,5 +300,5 @@
- 	set(GLOG_INC_SYS
- 	)
- 
--	blender_add_lib(extern_glog "${GLOG_SRC}" "${GLOG_INC}" "${GLOG_INC_SYS}")
-+	# blender_add_lib(extern_glog "${GLOG_SRC}" "${GLOG_INC}" "${GLOG_INC_SYS}")
- endif()
diff --git a/media-gfx/blender/files/05-blender-2.72-unbundle-eigen3.patch b/media-gfx/blender/files/05-blender-2.72-unbundle-eigen3.patch
deleted file mode 100644
index 3cfc62fa1730..000000000000
--- a/media-gfx/blender/files/05-blender-2.72-unbundle-eigen3.patch
+++ /dev/null
@@ -1,334 +0,0 @@
-commit 03b41be3de15b4810e55ff1988d27d28eb358df0
-Author: hasufell <hasufell@gentoo.org>
-Date:   Fri Jul 19 18:47:43 2013 +0200
-
-    unbundle Eigen3
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a30831c..78bb3c6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -109,6 +109,7 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
- # Check for some modules
- if(UNIX)
-   find_package(PkgConfig)
-+  pkg_check_modules(_PC_EIGEN3 eigen3)
-   pkg_check_modules(_PC_GFLAGS libgflags)
-   pkg_check_modules(_PC_GLOG libglog)
- endif()
-diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
-index 7061e04..b8ab180 100644
---- a/extern/libmv/CMakeLists.txt
-+++ b/extern/libmv/CMakeLists.txt
-@@ -44,7 +44,7 @@ if(WITH_LIBMV)
- 	)
- 
- 	set(INC_SYS
--		../Eigen3
-+		${_PC_EIGEN3_INCLUDE_DIRS}
- 		${PNG_INCLUDE_DIRS}
- 		${ZLIB_INCLUDE_DIRS}
- 	)
-diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt
-index 0645883..d79fe9e 100644
---- a/extern/libmv/third_party/ceres/CMakeLists.txt
-+++ b/extern/libmv/third_party/ceres/CMakeLists.txt
-@@ -35,7 +35,7 @@ set(INC
- )
- 
- set(INC_SYS
--	../../../Eigen3
-+	${_PC_EIGEN3_INCLUDE_DIRS}
- )
- 
- set(SRC
-diff --git a/intern/dualcon/CMakeLists.txt b/intern/dualcon/CMakeLists.txt
-index da5e10f..a4aae1b 100644
---- a/intern/dualcon/CMakeLists.txt
-+++ b/intern/dualcon/CMakeLists.txt
-@@ -22,7 +22,7 @@ set(INC
- )
- 
- set(INC_SYS
--	../../extern/Eigen3
-+	${_PC_EIGEN3_INCLUDE_DIRS}
- )
- 
- set(SRC
-diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt
-index bc3ea0c..f8cbc23 100644
---- a/intern/itasc/CMakeLists.txt
-+++ b/intern/itasc/CMakeLists.txt
-@@ -28,7 +28,7 @@
- )
- 
- set(INC_SYS
--	../../extern/Eigen3
-+	${_PC_EIGEN3_INCLUDE_DIRS}
- )
- 
- set(SRC
-@@ -119,237 +119,6 @@
- 	kdl/frameacc.inl
- 	kdl/frames.inl
- 	kdl/framevel.inl
--
--	# until we have another user...
--	../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h
--	../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
--	../../extern/Eigen3/Eigen/src/Cholesky/LLT_MKL.h
--	../../extern/Eigen3/Eigen/src/CholmodSupport/CholmodSupport.h
--	../../extern/Eigen3/Eigen/src/Core/Array.h
--	../../extern/Eigen3/Eigen/src/Core/ArrayBase.h
--	../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
--	../../extern/Eigen3/Eigen/src/Core/Assign.h
--	../../extern/Eigen3/Eigen/src/Core/Assign_MKL.h
--	../../extern/Eigen3/Eigen/src/Core/BandMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/Block.h
--	../../extern/Eigen3/Eigen/src/Core/BooleanRedux.h
--	../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h
--	../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
--	../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
--	../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
--	../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
--	../../extern/Eigen3/Eigen/src/Core/DenseBase.h
--	../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
--	../../extern/Eigen3/Eigen/src/Core/DenseStorage.h
--	../../extern/Eigen3/Eigen/src/Core/Diagonal.h
--	../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
--	../../extern/Eigen3/Eigen/src/Core/Dot.h
--	../../extern/Eigen3/Eigen/src/Core/EigenBase.h
--	../../extern/Eigen3/Eigen/src/Core/Flagged.h
--	../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
--	../../extern/Eigen3/Eigen/src/Core/Functors.h
--	../../extern/Eigen3/Eigen/src/Core/Fuzzy.h
--	../../extern/Eigen3/Eigen/src/Core/GeneralProduct.h
--	../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
--	../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
--	../../extern/Eigen3/Eigen/src/Core/IO.h
--	../../extern/Eigen3/Eigen/src/Core/Map.h
--	../../extern/Eigen3/Eigen/src/Core/MapBase.h
--	../../extern/Eigen3/Eigen/src/Core/MathFunctions.h
--	../../extern/Eigen3/Eigen/src/Core/Matrix.h
--	../../extern/Eigen3/Eigen/src/Core/MatrixBase.h
--	../../extern/Eigen3/Eigen/src/Core/NestByValue.h
--	../../extern/Eigen3/Eigen/src/Core/NoAlias.h
--	../../extern/Eigen3/Eigen/src/Core/NumTraits.h
--	../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
--	../../extern/Eigen3/Eigen/src/Core/Product.h
--	../../extern/Eigen3/Eigen/src/Core/ProductBase.h
--	../../extern/Eigen3/Eigen/src/Core/Random.h
--	../../extern/Eigen3/Eigen/src/Core/Redux.h
--	../../extern/Eigen3/Eigen/src/Core/Replicate.h
--	../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h
--	../../extern/Eigen3/Eigen/src/Core/Reverse.h
--	../../extern/Eigen3/Eigen/src/Core/Select.h
--	../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
--	../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
--	../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h
--	../../extern/Eigen3/Eigen/src/Core/StableNorm.h
--	../../extern/Eigen3/Eigen/src/Core/Stride.h
--	../../extern/Eigen3/Eigen/src/Core/Swap.h
--	../../extern/Eigen3/Eigen/src/Core/Transpose.h
--	../../extern/Eigen3/Eigen/src/Core/Transpositions.h
--	../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/VectorBlock.h
--	../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
--	../../extern/Eigen3/Eigen/src/Core/Visitor.h
--	../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
--	../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
--	../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h
--	../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
--	../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
--	../../extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h
--	../../extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
--	../../extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
--	../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
--	../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
--	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
--	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_MKL.h
--	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h
--	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
--	../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector_MKL.h
--	../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
--	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix_MKL.h
--	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
--	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector_MKL.h
--	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
--	../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
--	../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h
--	../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
--	../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector_MKL.h
--	../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
--	../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h
--	../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
--	../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
--	../../extern/Eigen3/Eigen/src/Core/util/Constants.h
--	../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
--	../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
--	../../extern/Eigen3/Eigen/src/Core/util/Macros.h
--	../../extern/Eigen3/Eigen/src/Core/util/Memory.h
--	../../extern/Eigen3/Eigen/src/Core/util/Meta.h
--	../../extern/Eigen3/Eigen/src/Core/util/MKL_support.h
--	../../extern/Eigen3/Eigen/src/Core/util/NonMPL2.h
--	../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
--	../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
--	../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
--	../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur_MKL.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur_MKL.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h
--	../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
--	../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
--	../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
--	../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
--	../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
--	../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
--	../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
--	../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
--	../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h
--	../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
--	../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h
--	../../extern/Eigen3/Eigen/src/Geometry/Scaling.h
--	../../extern/Eigen3/Eigen/src/Geometry/Transform.h
--	../../extern/Eigen3/Eigen/src/Geometry/Translation.h
--	../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h
--	../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
--	../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
--	../../extern/Eigen3/Eigen/src/Householder/Householder.h
--	../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
--	../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h
--	../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h
--	../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h
--	../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h
--	../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h
--	../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
--	../../extern/Eigen3/Eigen/src/LU/Determinant.h
--	../../extern/Eigen3/Eigen/src/LU/FullPivLU.h
--	../../extern/Eigen3/Eigen/src/LU/Inverse.h
--	../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h
--	../../extern/Eigen3/Eigen/src/LU/PartialPivLU_MKL.h
--	../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
--	../../extern/Eigen3/Eigen/src/misc/blas.h
--	../../extern/Eigen3/Eigen/src/misc/Image.h
--	../../extern/Eigen3/Eigen/src/misc/Kernel.h
--	../../extern/Eigen3/Eigen/src/misc/Solve.h
--	../../extern/Eigen3/Eigen/src/misc/SparseSolve.h
--	../../extern/Eigen3/Eigen/src/OrderingMethods/Amd.h
--	../../extern/Eigen3/Eigen/src/PardisoSupport/PardisoSupport.h
--	../../extern/Eigen3/Eigen/src/PaStiXSupport/PaStiXSupport.h
--	../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
--	../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
--	../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h
--	../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
--	../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
--	../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
--	../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
--	../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
--	../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR_MKL.h
--	../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
--	../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h
--	../../extern/Eigen3/Eigen/src/QR/HouseholderQR_MKL.h
--	../../extern/Eigen3/Eigen/src/SparseCholesky/SimplicialCholesky.h
--	../../extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h
--	../../extern/Eigen3/Eigen/src/SparseCore/CompressedStorage.h
--	../../extern/Eigen3/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h
--	../../extern/Eigen3/Eigen/src/SparseCore/CoreIterators.h
--	../../extern/Eigen3/Eigen/src/SparseCore/MappedSparseMatrix.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseAssign.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseBlock.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseBinaryOp.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseUnaryOp.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseDenseProduct.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseDiagonalProduct.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseDot.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseFuzzy.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrix.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrixBase.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparsePermutation.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseProduct.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseRedux.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseSparseProductWithPruning.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseTranspose.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseTriangularView.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseUtil.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseVector.h
--	../../extern/Eigen3/Eigen/src/SparseCore/SparseView.h
--	../../extern/Eigen3/Eigen/src/SparseCore/TriangularSolver.h
--	../../extern/Eigen3/Eigen/src/StlSupport/details.h
--	../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h
--	../../extern/Eigen3/Eigen/src/StlSupport/StdList.h
--	../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h
--	../../extern/Eigen3/Eigen/src/SuperLUSupport/SuperLUSupport.h
--	../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
--	../../extern/Eigen3/Eigen/src/SVD/JacobiSVD_MKL.h
--	../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
--	../../extern/Eigen3/Eigen/src/UmfPackSupport/UmfPackSupport.h
- )
- 
- 
-diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt
-index 0a0e0e6..45fe6c9 100644
---- a/source/blender/ikplugin/CMakeLists.txt
-+++ b/source/blender/ikplugin/CMakeLists.txt
-@@ -59,7 +59,7 @@ if(WITH_IK_ITASC)
- 		../../../intern/itasc
- 	)
- 	list(APPEND INC_SYS
--		../../../extern/Eigen3
-+		${_PC_EIGEN3_INCLUDE_DIRS}
- 	)
- 	list(APPEND SRC
- 		intern/itasc_plugin.cpp
-diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt
-index 084a85c..7cdfa01 100644
---- a/source/gameengine/Converter/CMakeLists.txt
-+++ b/source/gameengine/Converter/CMakeLists.txt
-@@ -57,7 +57,7 @@ set(INC
- set(INC_SYS
- 	../../../intern/moto/include
- 	../../../extern/recastnavigation/Detour/Include
--	../../../extern/Eigen3
-+	${_PC_EIGEN3_INCLUDE_DIRS}
- 	${PTHREADS_INCLUDE_DIRS}
- 	${BOOST_INCLUDE_DIR}
- )
diff --git a/media-gfx/blender/files/06-blender-2.68-fix-install-rules.patch b/media-gfx/blender/files/06-blender-2.68-fix-install-rules.patch
deleted file mode 100644
index aa8ecc9f6174..000000000000
--- a/media-gfx/blender/files/06-blender-2.68-fix-install-rules.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 94eed33f878e35a8c7b69b0c23b3b30026460f33
-Author: hasufell <hasufell@gentoo.org>
-Date:   Fri Jul 19 18:50:08 2013 +0200
-
-    remove stupid uninstall snippet
-    
-    whoever coded this... it is dangerous
-    uninstall methods have NO PLACE in install rules
-
-diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index c84d944..2b9bf46 100644
---- a/source/creator/CMakeLists.txt
-+++ b/source/creator/CMakeLists.txt
-@@ -268,12 +268,6 @@ endif()
- # Install Targets (Generic, All Platforms)
- 
- 
--# important to make a clean  install each time, else old scripts get loaded.
--install(
--	CODE
--	"file(REMOVE_RECURSE ${TARGETDIR_VER})"
--)
--
- if(WITH_PYTHON)
- 	# install(CODE "message(\"copying blender scripts...\")")
- 	
diff --git a/media-gfx/blender/files/07-blender-2.70-sse2.patch b/media-gfx/blender/files/07-blender-2.70-sse2.patch
deleted file mode 100644
index 6fc870ea3258..000000000000
--- a/media-gfx/blender/files/07-blender-2.70-sse2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 0e0b27a589680e10e38a26575ad4dba8f3af2ec6
-Author: hasufell <hasufell@gentoo.org>
-Date:   Fri Jul 19 18:50:19 2013 +0200
-
-    add option to explicitly control sse2 optimization
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 78bb3c6..d5f4576 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -86,6 +86,7 @@
- #-----------------------------------------------------------------------------
- # Load some macros.
- include(build_files/cmake/macros.cmake)
-+include(CMakeDependentOption)
- 
- 
- #-----------------------------------------------------------------------------
-@@ -251,6 +252,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)
- option(WITH_OPENNL        "Enable use of Open Numerical Library" ON)
- if(UNIX AND NOT APPLE)
- 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
-@@ -1950,7 +1952,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/08-blender-2.71-gflags.patch b/media-gfx/blender/files/08-blender-2.71-gflags.patch
deleted file mode 100644
index 9718398ef03d..000000000000
--- a/media-gfx/blender/files/08-blender-2.71-gflags.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- ./CMakeLists.txt	2014-07-15 17:30:36.608718963 -0400
-+++ ./CMakeLists.txt	2014-07-15 17:25:24.940615350 -0400
-@@ -116,6 +116,7 @@
- # Check for some modules
- if(UNIX)
-   find_package(PkgConfig)
-+  find_package(gflags REQUIRED)
-   pkg_check_modules(_PC_EIGEN3 eigen3)
-   pkg_check_modules(_PC_GFLAGS libgflags)
-   pkg_check_modules(_PC_GLOG libglog)
---- extern/libmv/CMakeLists.txt	2014-07-15 17:30:36.565719500 -0400
-+++ extern/libmv/CMakeLists.txt	2014-07-15 17:25:06.388847279 -0400
-@@ -208,7 +208,7 @@
- 
- include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS})
- blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
--target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES} ${_PC_GLOG_LIBRARIES})
-+target_link_libraries(extern_libmv ${gflags_LIBRARIES} ${_PC_GLOG_LIBRARIES})
- 
-
- if(WITH_LIBMV)
---- extern/libmv/libmv-capi.cc	2014-06-25 16:43:52.000000000 -0400
-+++ extern/libmv/libmv-capi.cc	2014-07-15 09:29:04.332922116 -0400
-@@ -112,18 +112,18 @@
- 	         google::GLOG_FATAL);
- 
- 	google::InitGoogleLogging(argv0);
--	google::SetCommandLineOption("logtostderr", "1");
--	google::SetCommandLineOption("v", "0");
--	google::SetCommandLineOption("stderrthreshold", severity_fatal);
--	google::SetCommandLineOption("minloglevel", severity_fatal);
-+	gflags::SetCommandLineOption("logtostderr", "1");
-+	gflags::SetCommandLineOption("v", "0");
-+	gflags::SetCommandLineOption("stderrthreshold", severity_fatal);
-+	gflags::SetCommandLineOption("minloglevel", severity_fatal);
- }
- 
- void libmv_startDebugLogging(void)
- {
--	google::SetCommandLineOption("logtostderr", "1");
--	google::SetCommandLineOption("v", "2");
--	google::SetCommandLineOption("stderrthreshold", "1");
--	google::SetCommandLineOption("minloglevel", "0");
-+	gflags::SetCommandLineOption("logtostderr", "1");
-+	gflags::SetCommandLineOption("v", "2");
-+	gflags::SetCommandLineOption("stderrthreshold", "1");
-+	gflags::SetCommandLineOption("minloglevel", "0");
- }
- 
- void libmv_setLoggingVerbosity(int verbosity)
-@@ -131,7 +131,7 @@
- 	char val[10];
- 	snprintf(val, sizeof(val), "%d", verbosity);
- 
--	google::SetCommandLineOption("v", val);
-+	gflags::SetCommandLineOption("v", val);
- }
- 
- /* ************ Planar tracker ************ */
diff --git a/media-gfx/blender/files/09-blender-2.72b-unbundle-minilzo.patch b/media-gfx/blender/files/09-blender-2.72b-unbundle-minilzo.patch
deleted file mode 100644
index 06ded78d1d8c..000000000000
--- a/media-gfx/blender/files/09-blender-2.72b-unbundle-minilzo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Sep 27 13:35:35 UTC 2014
-Subject: unbundle vulnerable minilzo version
-
---- source/blender/blenkernel/intern/pointcache.c
-+++ source/blender/blenkernel/intern/pointcache.c
-@@ -84,7 +84,7 @@
- #endif
- 
- #ifdef WITH_LZO
--#include "minilzo.h"
-+#include <lzo/lzo1x.h>
- #define LZO_HEAP_ALLOC(var,size) \
- 	lzo_align_t __LZO_MMODEL var [ ((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t) ]
- #endif
---- extern/CMakeLists.txt
-+++ extern/CMakeLists.txt
-@@ -62,10 +62,6 @@
- 	add_subdirectory(libredcode)
- endif()
- 
--if(WITH_LZO)
--	add_subdirectory(lzo)
--endif()
--
- if(WITH_LZMA)
- 	add_subdirectory(lzma)
- endif()
---- source/blender/blenkernel/CMakeLists.txt
-+++ source/blender/blenkernel/CMakeLists.txt
-@@ -397,9 +397,6 @@
- endif()
- 
- if(WITH_LZO)
--	list(APPEND INC_SYS
--		../../../extern/lzo/minilzo
--	)
- 	add_definitions(-DWITH_LZO)
- endif()
- 
---- build_files/cmake/macros.cmake
-+++ build_files/cmake/macros.cmake
-@@ -304,6 +304,10 @@
- 		endif()
- 	endif()
- 
-+	if(WITH_LZO)
-+		target_link_libraries(${target} liblzo2.so)
-+	endif()
-+
- 	if(WITH_SYSTEM_GLEW)
- 		target_link_libraries(${target} ${GLEW_LIBRARY})
- 	endif()