[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/

["Michał Górny" <mgorny@gentoo.org>]

commit:     40d74c39f382e84086c763a23e1b63ef3427714e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 15:21:43 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 18:01:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40d74c39

media-gfx/blender: Drop 2.72b-r4, due to py3.4 removal

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-gfx/blender/Manifest                         |   1 -
 media-gfx/blender/blender-2.72b-r4.ebuild          | 290 ---------------------
 .../blender/files/blender-2.68-doxyfile.patch      |  19 --
 .../files/blender-2.68-fix-install-rules.patch     |  26 --
 media-gfx/blender/files/blender-2.70-sse2.patch    |  35 ---
 media-gfx/blender/files/blender-2.72-T42797.diff   |  13 -
 .../files/blender-2.72b-fix-util_simd.patch        |  10 -
 .../blender/files/blender-2.72b-gcc6-fixes.patch   | 126 ---------
 media-gfx/blender/metadata.xml                     |  34 +--
 9 files changed, 12 insertions(+), 542 deletions(-)

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 42826ca0c67..1255e093b89 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,3 +1,2 @@
-DIST blender-2.72b.tar.gz 52018242 BLAKE2B fa0b8ab3feaeb35e76d833415984eb21d7b6dca47b9e5fb337cdfbdc9924165d3345caa5608ee2849bf71855c917a6fa56d79d4f375b57ff367047ef92e8e0b9 SHA512 9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124
 DIST blender-2.79.tar.gz 50145270 BLAKE2B 5c11b36840d4bf4a414f01d1f8efcbfb2879ce56c9e2ebe32d8bb0be3ce29fd194dec8b3aa5bca9bf664804c1be57d01394494fdfebc7a4d8257bd2c47866338 SHA512 9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f
 DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f

diff --git a/media-gfx/blender/blender-2.72b-r4.ebuild b/media-gfx/blender/blender-2.72b-r4.ebuild
deleted file mode 100644
index 9d68984d4e3..00000000000
--- a/media-gfx/blender/blender-2.72b-r4.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-## BUNDLED-DEPS:
-# extern/cuew
-# extern/Eigen3
-# extern/xdnd
-# extern/carve
-# extern/glew
-# extern/libmv
-# extern/clew
-# extern/colamd
-# extern/lzma
-# extern/gtest
-# extern/rangetree
-# extern/libredcode
-# extern/wcwidth
-# extern/binreloc
-# extern/recastnavigation
-# extern/bullet2
-# extern/lzo
-# extern/libopenjpeg
-# extern/libmv/third_party/msinttypes
-# extern/libmv/third_party/ceres
-# extern/libmv/third_party/gflags
-# extern/libmv/third_party/glog
-
-EAPI=6
-PYTHON_COMPAT=( python3_4 )
-#PATCHSET="1"
-
-inherit multilib gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org"
-
-case ${PV} in
-	*_p*)
-		SRC_URI="https://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;;
-	*)
-		SRC_URI="https://download.blender.org/source/${P}.tar.gz" ;;
-esac
-
-if [[ -n ${PATCHSET} ]]; then
-	SRC_URI+=" https://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 libav ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile cpu_flags_x86_sse cpu_flags_x86_sse2 tiff"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	player? ( game-engine )
-	redcode? ( jpeg2k ffmpeg )
-	cycles? ( boost openexr tiff )
-	nls? ( boost )
-	colorio? ( boost )
-	openal? ( boost )
-	game-engine? ( boost )
-	?? ( ffmpeg libav )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=media-libs/freetype-2.0:2
-	media-libs/glew:0=
-	media-libs/libpng:0
-	media-libs/libsamplerate
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/libintl
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXxf86vm
-	boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] )
-	collada? ( >=media-libs/opencollada-1.6.18 )
-	colorio? ( >=media-libs/opencolorio-1.0.9-r2 )
-	cycles? (
-		media-libs/openimageio
-	)
-	ffmpeg? ( media-video/ffmpeg:0=[x264,mp3,encode,theora,jpeg2k?] )
-	libav? ( >=media-video/libav-11.3:0=[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/ilmbase media-libs/openexr )
-	sdl? ( media-libs/libsdl[sound,joystick] )
-	sndfile? ( media-libs/libsndfile )
-	tiff? ( media-libs/tiff:0 )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[-nodot(-),dot(+)]
-		dev-python/sphinx
-	)
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.68-doxyfile.patch
-	"${FILESDIR}"/${PN}-2.68-fix-install-rules.patch
-	"${FILESDIR}"/${PN}-2.70-sse2.patch
-	"${FILESDIR}"/${PN}-2.72-T42797.diff
-	"${FILESDIR}"/${P}-fix-util_simd.patch
-	"${FILESDIR}"/${P}-gcc6-fixes.patch
-)
-
-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() {
-	default
-
-	# 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
-
-	# 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
-	append-ldflags $(no-as-needed)
-
-	# WITH_PYTHON_SECURITY
-	# WITH_PYTHON_SAFETY
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DWITH_INSTALL_PORTABLE=OFF
-		-DWITH_BOOST=$(usex boost ON OFF )
-		-DWITH_CYCLES=$(usex cycles ON OFF )
-		-DWITH_OPENCOLLADA=$(usex collada ON OFF )
-		-DWITH_IMAGE_DDS=$(usex dds ON OFF )
-		-DWITH_MOD_FLUID=$(usex elbeem ON OFF )
-		-DWITH_CODEC_FFMPEG=$(usex ffmpeg ON OFF )
-		-DWITH_FFTW3=$(usex fftw ON OFF )
-		-DWITH_MOD_OCEANSIM=$(usex fftw ON OFF )
-		-DWITH_GAMEENGINE=$(usex game-engine ON OFF )
-		-DWITH_INTERNATIONAL=$(usex nls ON OFF )
-		-DWITH_JACK=$(usex jack ON OFF )
-		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k ON OFF )
-		-DWITH_OPENIMAGEIO=$(usex openimageio ON OFF )
-		-DWITH_OPENAL=$(usex openal ON OFF )
-		-DWITH_IMAGE_OPENEXR=$(usex openexr ON OFF )
-		-DWITH_OPENMP=$(usex openmp ON OFF )
-		-DWITH_OPENNL=$(usex opennl ON OFF )
-		-DWITH_PLAYER=$(usex player ON OFF )
-		-DWITH_IMAGE_REDCODE=$(usex redcode ON OFF )
-		-DWITH_SDL=$(usex sdl ON OFF )
-		-DWITH_CODEC_SNDFILE=$(usex sndfile ON OFF )
-		-DWITH_RAYOPTIMIZATION=$(usex cpu_flags_x86_sse ON OFF )
-		-DWITH_SSE2=$(usex cpu_flags_x86_sse2 ON OFF )
-		-DWITH_BULLET=$(usex bullet ON OFF )
-		-DWITH_IMAGE_TIFF=$(usex tiff ON OFF )
-		-DWITH_OPENCOLORIO=$(usex colorio ON OFF )
-		-DWITH_INPUT_NDOF=$(usex ndof ON OFF )
-		-DWITH_CXX_GUARDEDALLOC=$(usex debug ON OFF )
-		-DWITH_ASSERT_ABORT=$(usex debug ON OFF )
-		-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
-		# Workaround for binary drivers.
-		cards=( /dev/ati/card* /dev/nvidia* )
-		for card in "${cards[@]}"; do addpredict "${card}"; done
-
-		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 "html/API/python"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/*
-
-		docinto "html/API/blender"
-		dodoc -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
-	docinto "html"
-	dodoc "${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
-	ewarn
-	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
-	ewarn "libraries which are shipped with blender. Note that"
-	ewarn "these have caused security issues in the past."
-	ewarn "If you are concerned about security, file a bug upstream:"
-	ewarn "  https://developer.blender.org/"
-	ewarn
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}

diff --git a/media-gfx/blender/files/blender-2.68-doxyfile.patch b/media-gfx/blender/files/blender-2.68-doxyfile.patch
deleted file mode 100644
index c11c793fda9..00000000000
--- a/media-gfx/blender/files/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/blender-2.68-fix-install-rules.patch b/media-gfx/blender/files/blender-2.68-fix-install-rules.patch
deleted file mode 100644
index aa8ecc9f617..00000000000
--- a/media-gfx/blender/files/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/blender-2.70-sse2.patch b/media-gfx/blender/files/blender-2.70-sse2.patch
deleted file mode 100644
index 6fc870ea325..00000000000
--- a/media-gfx/blender/files/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/blender-2.72-T42797.diff b/media-gfx/blender/files/blender-2.72-T42797.diff
deleted file mode 100644
index cef03853434..00000000000
--- a/media-gfx/blender/files/blender-2.72-T42797.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/source/blender/blenfont/intern/blf_glyph.c
-+++ a/source/blender/blenfont/intern/blf_glyph.c
-@@ -262,8 +262,8 @@
- 	g->xoff = -1;
- 	g->yoff = -1;
- 	bitmap = slot->bitmap;
--	g->width = bitmap.width;
--	g->height = bitmap.rows;
-+	g->width = (int)bitmap.width;
-+	g->height = (int)bitmap.rows;
- 
- 	if (g->width && g->height) {
- 		if (sharp) {

diff --git a/media-gfx/blender/files/blender-2.72b-fix-util_simd.patch b/media-gfx/blender/files/blender-2.72b-fix-util_simd.patch
deleted file mode 100644
index 8c83ee09628..00000000000
--- a/media-gfx/blender/files/blender-2.72b-fix-util_simd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/intern/cycles/util/util_simd.h	2014-10-20 12:58:22.000000000 +0500
-+++ b/intern/cycles/util/util_simd.h	2015-05-17 11:57:37.000000000 +0500
-@@ -19,6 +19,7 @@
- #define __UTIL_SIMD_TYPES_H__
- 
- #include <limits>
-+#include <x86intrin.h>
- 
- #include "util_debug.h"
- #include "util_types.h"

diff --git a/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch b/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch
deleted file mode 100644
index 1c4ab09e62c..00000000000
--- a/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -purN a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp
---- a/source/blender/imbuf/intern/dds/ColorBlock.cpp	2014-10-20 08:58:23.000000000 +0100
-+++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp	2016-09-22 15:50:25.359318967 +0100
-@@ -86,8 +86,8 @@ void ColorBlock::init(const Image *img,
- 
- void ColorBlock::init(uint w, uint h, const uint *data, uint x, uint y)
- {
--	const uint bw = min(w - x, 4U);
--	const uint bh = min(h - y, 4U);
-+	const uint bw = MIN(w - x, 4U);
-+	const uint bh = MIN(h - y, 4U);
- 
- 	// Blocks that are smaller than 4x4 are handled by repeating the pixels.
- 	// @@ Thats only correct when block size is 1, 2 or 4, but not with 3. :(
-@@ -107,8 +107,8 @@ void ColorBlock::init(uint w, uint h, co
- 
- void ColorBlock::init(uint w, uint h, const float *data, uint x, uint y)
- {
--	const uint bw = min(w - x, 4U);
--	const uint bh = min(h - y, 4U);
-+	const uint bw = MIN(w - x, 4U);
-+	const uint bh = MIN(h - y, 4U);
- 
- 	// Blocks that are smaller than 4x4 are handled by repeating the pixels.
- 	// @@ Thats only correct when block size is 1, 2 or 4, but not with 3. :(
-@@ -124,10 +124,10 @@ void ColorBlock::init(uint w, uint h, co
- 			const uint idx = ((y + by) * w + x + bx);
- 			
- 			Color32 & c = color(e, i);
--			c.r = uint8(255 * clamp(data[idx + 0 * srcPlane], 0.0f, 1.0f)); // @@ Is this the right way to quantize floats to bytes?
--			c.g = uint8(255 * clamp(data[idx + 1 * srcPlane], 0.0f, 1.0f));
--			c.b = uint8(255 * clamp(data[idx + 2 * srcPlane], 0.0f, 1.0f));
--			c.a = uint8(255 * clamp(data[idx + 3 * srcPlane], 0.0f, 1.0f));
-+			c.r = uint8(255 * CLAMP(data[idx + 0 * srcPlane], 0.0f, 1.0f)); // @@ Is this the right way to quantize floats to bytes?
-+			c.g = uint8(255 * CLAMP(data[idx + 1 * srcPlane], 0.0f, 1.0f));
-+			c.b = uint8(255 * CLAMP(data[idx + 2 * srcPlane], 0.0f, 1.0f));
-+			c.a = uint8(255 * CLAMP(data[idx + 3 * srcPlane], 0.0f, 1.0f));
- 		}
- 	}
- }
-diff -purN a/source/blender/imbuf/intern/dds/Common.h b/source/blender/imbuf/intern/dds/Common.h
---- a/source/blender/imbuf/intern/dds/Common.h	2014-10-20 08:58:23.000000000 +0100
-+++ b/source/blender/imbuf/intern/dds/Common.h	2016-09-22 15:47:31.327081239 +0100
-@@ -28,14 +28,14 @@
- #ifndef __COMMON_H__
- #define __COMMON_H__
- 
--#ifndef min
--#define min(a,b) ((a) <= (b) ? (a) : (b))
-+#ifndef MIN
-+#define MIN(a,b) ((a) <= (b) ? (a) : (b))
- #endif
--#ifndef max
--#define max(a,b) ((a) >= (b) ? (a) : (b))
-+#ifndef MAX
-+#define MAX(a,b) ((a) >= (b) ? (a) : (b))
- #endif
--#ifndef clamp
--#define clamp(x,a,b) min(max((x), (a)), (b))
-+#ifndef CLAMP
-+#define CLAMP(x,a,b) MIN(MAX((x), (a)), (b))
- #endif
- 
- template<typename T>
-diff -purN a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
---- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp	2014-10-20 08:58:23.000000000 +0100
-+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp	2016-09-22 16:10:53.985775837 +0100
-@@ -1102,8 +1102,8 @@ void DirectDrawSurface::mipmap(Image *im
- 	// Compute width and height.
- 	for (uint m = 0; m < mipmap; m++)
- 	{
--		w = max(1U, w / 2);
--		h = max(1U, h / 2);
-+		w = MAX(1U, w / 2);
-+		h = MAX(1U, h / 2);
- 	}
- 	
- 	img->allocate(w, h);
-@@ -1223,9 +1223,9 @@ void DirectDrawSurface::readBlockImage(I
- 			readBlock(&block);
- 			
- 			// Write color block.
--			for (uint y = 0; y < min(4U, h-4*by); y++)
-+			for (uint y = 0; y < MIN(4U, h-4*by); y++)
- 			{
--				for (uint x = 0; x < min(4U, w-4*bx); x++)
-+				for (uint x = 0; x < MIN(4U, w-4*bx); x++)
- 				{
- 					img->pixel(4*bx+x, 4*by+y) = block.color(x, y);
- 				}
-@@ -1240,7 +1240,7 @@ static Color32 buildNormal(uint8 x, uint
- 	float ny = 2 * (y / 255.0f) - 1;
- 	float nz = 0.0f;
- 	if (1 - nx*nx - ny*ny > 0) nz = sqrt(1 - nx*nx - ny*ny);
--	uint8 z = clamp(int(255.0f * (nz + 1) / 2.0f), 0, 255);
-+	uint8 z = CLAMP(int(255.0f * (nz + 1) / 2.0f), 0, 255);
- 	
- 	return Color32(x, y, z);
- }
-@@ -1379,9 +1379,9 @@ uint DirectDrawSurface::mipmapSize(uint
- 	
- 	for (uint m = 0; m < mipmap; m++)
- 	{
--		w = max(1U, w / 2);
--		h = max(1U, h / 2);
--		d = max(1U, d / 2);
-+		w = MAX(1U, w / 2);
-+		h = MAX(1U, h / 2);
-+		d = MAX(1U, d / 2);
- 	}
- 
- 	if (header.pf.flags & DDPF_FOURCC)
-diff -purN a/source/blender/imbuf/intern/dds/FlipDXT.cpp b/source/blender/imbuf/intern/dds/FlipDXT.cpp
---- a/source/blender/imbuf/intern/dds/FlipDXT.cpp	2014-10-20 08:58:23.000000000 +0100
-+++ b/source/blender/imbuf/intern/dds/FlipDXT.cpp	2016-09-22 16:11:35.626829002 +0100
-@@ -246,8 +246,8 @@ int FlipDXTCImage(unsigned int width, un
- 
- 		// mip levels are contiguous.
- 		data += block_bytes * blocks;
--		mip_width = max(1U, mip_width >> 1);
--		mip_height = max(1U, mip_height >> 1);
-+		mip_width = MAX(1U, mip_width >> 1);
-+		mip_height = MAX(1U, mip_height >> 1);
- 	}
- 
- 	return 1;

diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 9dd73dfe352..14a1619c7d4 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer restrict="&gt;=media-gfx/blender-2.77" type="person">
+	<maintainer type="person">
 		<email>dracwyrm@gentoo.org</email>
 		<name>Jonathan Scruggs</name>
 	</maintainer>
-	<maintainer restrict="&gt;=media-gfx/blender-2.77" type="person">
+	<maintainer type="person">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
@@ -20,9 +20,6 @@
 	</longdescription>
 
 	<use>
-		<flag name="boost">
-			Enable features depending on boost.
-		</flag>
 		<flag name="bullet">
 			Enable Bullet (Physics Engine).
 		</flag>
@@ -50,49 +47,42 @@
 		<flag name="elbeem">
 			Adds surface fluid simulation to Blender using El'Beem library.
 		</flag>
-		<flag name="game-engine" restrict="&gt;=media-gfx/blender-2.50">
+		<flag name="game-engine">
 			Adds Game Engine support to Blender.
 		</flag>
-		<flag name="headless" restrict="&gt;=media-gfx/blender-2.77">
+		<flag name="headless">
 			Build without graphical support (renderfarm, server mode only).
 		</flag>
-		<flag name="llvm" restrict="&gt;=media-gfx/blender-2.77">
+		<flag name="llvm">
 			Enable features depending on llvm.
 		</flag>
-		<flag name="man" restrict="&gt;=media-gfx/blender-2.77">
+		<flag name="man">
 			Build and install man pages.
 		</flag>
 		<flag name="ndof">
 			Enable NDOF input devices (SpaceNavigator and friends).
 		</flag>
-		<flag name="opencl" restrict="&lt;=media-gfx/blender-2.79">
+		<flag name="opencl">
 			Allow OpenCL Graphics Acceleration. This may
 			require extra graphics card drivers.</flag>
 		<flag name="openimageio">Enable OpenImageIO Support</flag>
-		<flag name="opennl" restrict="&lt;=media-gfx/blender-2.73">
-			Enable use of Open Numerical Library
-		</flag>
-		<flag name="opensubdiv" restrict="&gt;=media-gfx/blender-2.77">
+		<flag name="opensubdiv">
 			Add rendering support form OpenSubdiv from Dreamworks Animation
 			through <pkg>media-libs/opensubdiv</pkg>.
 		</flag>
-		<flag name="openvdb" restrict="&gt;=media-gfx/blender-2.77">
+		<flag name="openvdb">
 			Add GPU preview rendering. Only works with nVidia cards.
 		</flag>
-		<flag name="osl" restrict="&gt;=media-gfx/blender-2.79">
+		<flag name="osl">
 			Add support for OpenShadingLanguage scripting.
 		</flag>
 		<flag name="player">
 			Build the Blender Player. THis requires the Game engine.
 		</flag>
-		<flag name="redcode" restrict="&lt;=media-gfx/blender-2.73">
-			This flag add support for RED CODE camera digital format (5K HD
-			images *.r3d) - EXPERIMENTAL.
-		</flag>
-		<flag name="test" restrict="&gt;=media-gfx/blender-2.77">
+		<flag name="test">
 			Build the provided unit tests.
 		</flag>
-		<flag name="valgrind" restrict="&gt;=media-gfx/blender-2.77">
+		<flag name="valgrind">
 			Add support for memory debugging using
 			<pkg>dev-util/valgrind</pkg>
 		</flag>