version bump

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

3 files changed, 285 insertions, 9 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 9d7d97c3c3fd..ae48f002bf4a 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
 # 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.257 2013/10/29 10:17:20 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.258 2013/11/01 18:41:17 hasufell Exp $
+
+*blender-2.69 (01 Nov 2013)
+
+  01 Nov 2013; Julian Ospald <hasufell@gentoo.org> +blender-2.69.ebuild:
+  version bump
 
   29 Oct 2013; Julian Ospald <hasufell@gentoo.org>
   files/05-blender-2.68-unbundle-eigen3.patch:
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index feb5a244b64d..21922226427f 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -25,21 +25,23 @@ DIST blender-2.66.tar.gz 36914318 SHA256 627a4bb12b6d971be76ae2ada080d5ed65904d7
 DIST blender-2.67b.tar.gz 41368150 SHA256 7d6701d92ee7e3923771de10f610a3f8cca8b6d14b488d3044f8329878187d67 SHA512 d9b24219770e51aac76a15cb6db486835d389e27a89d1ce890da0f0a30f3f76a070ddd9c21e739df93e7f4a670a6b3de993a6f56696983bf466be9c14e906525 WHIRLPOOL fee35d98766a8acf3bd2ca696ae1c9f0deb1422d45f3951c56bae6ea172fef1ecd21801e4696665e6a40384636aee59d5cb173ef31998aba985c41193f9d4949
 DIST blender-2.68.tar.gz 40073577 SHA256 3c102ebc42f989c8509c704c87dec465ba0ded81c9cfb15e44414ba2702ce21c SHA512 b7a8ce36714881d8dd809c3597695945cceddfc65ab2d20597a7d9c6327805d86edc4131cdc543d9267e120833781764a8a43a2dba06866fc4e62761f7c93ebf WHIRLPOOL d0bef7ad235d5738a243e7d48e6f451178fac9e400fc5d1dc82f1c400af737646a68d97087b8b56390a2488702d54cace7967abf49425e6c43fa7574ad4a72d5
 DIST blender-2.68a.tar.gz 40042207 SHA256 13ed290b0db381523dd26689d29fd00b08bae01a9123533d75f0243733dd7b3a SHA512 ce93779c5cbadf361f08ad0f9d5370d52878f94edc0b113d73711b842169d0e000e1500ece8e534439d94c5983e6ff3f15ca4ccd74db5f21447274c475090019 WHIRLPOOL 0d391db77b2ad3035f98f63ae4f299a14fd0d584c7ec0e35936b267c0ea300fe76ced0f79864a85bdd5c3f67a7299b8da2f03381513f4a6c550ef06355ea80da
+DIST blender-2.69.tar.gz 41274518 SHA256 c94a7f5dec0d42683b96b2591c240ebcc2743d10b84fc53ca13374b5e654ce09 SHA512 f4de1f5a0a7868ee509b57ef65962a6c2af4c2bc7328db6ebe7b8e05f771c06efea92977f7a64433e8383382a33dbd73cb42b2bf872e63410e55c19ddd133142 WHIRLPOOL 30b5e8dd4e2a8ed3a0e9484656d9ac5b6c420076438aa0cdabf3d5d6b5d608bb90d5253c365b712899a9b7ea8965b815059e3e8c5a712c07c399f7848c14e8cb
 EBUILD blender-2.64a.ebuild 7793 SHA256 c7d8f834d31e287958f44a6ae3ea94362b1f651f325df1256c4b1d97c2f48ed6 SHA512 ce6165280c3ac9b59e0e31c74791123fead93c9b91b169051328f4cdc9ad1e76ac6fea27ad8e8e3b7178639f3ef4cf8b8db79759e14afca302b39541ce18d472 WHIRLPOOL 55d443d2e0df5f7ec591cfae317d5b97f266b89a3146f67f4c73e8f7c9a1592908c833acaf9d285e6dacb59155a9637a7670c45b5167511d4c7530bae30ee010
 EBUILD blender-2.66-r1.ebuild 7139 SHA256 011438751f8ea6f55307d337e4cedb0dd7e65a14751c9db21089a33c9b045dd1 SHA512 c61b745e5e90beb19fe9ee6dc0130cc8a599e444746cd1c8a1c131768ef5948b378cef7ff9ad19ffdab99a3383237c75bbeaa4b6934db01addaf13719c972e1c WHIRLPOOL bbcb267b210f0c2392c61fc93131ff9d938e3a0f8e1010d86cd8b50bf6cb5f8bd86773139df8fbad71279b03ede83d0bf890030663fc7f4b15c5307a3943fc82
 EBUILD blender-2.67b-r1.ebuild 7427 SHA256 f0d03ad665b193486237fa70486daaa431e16f2c8935259ea2994ca151ae0b96 SHA512 91365c7dbeec837d901010aed569772f3916cba6de18f5630bfaa35d202e11b488bc11939397d12ed6a0314f41ed2cea463f41645ebacaa4f868500846552c01 WHIRLPOOL 98b932679c1a34a47f7ce5ab631aaa2187a8356d0c1eb5a578df89d16f5019dfb7e8a219a9fca6f3e1ed5b0ab30eabf4bce1bd3b42ce9414fd68e21784be119f
 EBUILD blender-2.68.ebuild 7489 SHA256 4535f1ae0ecdcc199d51fd4eba72e6655ef70cb098faafd02e0376328188cdb9 SHA512 970f616bc9e992d2f7ed93c33de1057380eef69153a0ef191697821dd46f847d28cbf5cb28af7c20b031eb77db344bb9ee9045a063ab43bc23a295880f341aa7 WHIRLPOOL 6155ba3719813e942d70681657cf50bce884da9b93781512cb17be0fe92d0f7e6bc54a998e65ef7619018614180d4f9699628392943e00b41ec9f83dcddaed01
 EBUILD blender-2.68a.ebuild 7532 SHA256 6358360c3b66795509d3dfb77d74e26eac000f619aa40652835e9e87dcd24ad5 SHA512 8a51cf77266377eae23eb8be418f68f7e1297a4318e77df2fa7a971431d5e087c79ef7b557154d432f999654b2603f076054ebcfa1fd6fe43a88531bf9075c7b WHIRLPOOL 48c97e6c9ca17939200c1183866533a867e57f8d9487b29f7bc335eb10b0bff5c4880007b9860fc8564cf5138efac47bbf940bc6af96de3b966e0b7b31f5bd8f
-MISC ChangeLog 45212 SHA256 5e8b74b607698f0c001c939c29f4af2fb74386adb9ff7d030d4362ae9dcfbf1b SHA512 51a41af853f7268f30c74a9265a11c1ee939ac96adc7018e67f642314dd6c6b4b5219ae86e0f49f418c549ac74d9a3f2238bc751be374589da462af827bc4f42 WHIRLPOOL 87722853a17385fb3e26e9cf854b114f4c909a95e10c72845540ab075b92780b95abb9b35c813af28531a462352d39d9cfc62b4ad7f7388ab0e7fe8e6dd06aa3
+EBUILD blender-2.69.ebuild 7531 SHA256 ffb5f298229d449655cd88758bc6b9ef16817bb0c43413717929ac354877b653 SHA512 50b57cc7599f81b1b897ff7592ec17d8286849708e687762bf7f4966eec090a864cb64b792ecb8dffbc1d5c06534d7049dabf5e05aa5fc20ead58e5bcd53c36f WHIRLPOOL 9d43289039a7b30e75baf6c9d15ceec783c1ecc79504c12a11ebbd0ccc05a67945704d184b682da1be1d89f8eb05fb392358a71006a8e519790549ba71f6272a
+MISC ChangeLog 45330 SHA256 8219650b202b5a9b96f383fe44c1f92eb6ac51a2f5a7ac786bb231ae445970d0 SHA512 51a1c5f38625bfa59ece655b8cf09a9169a87aee1a14d7042bfa326a4183681973777891a3a3349434ee37ea1241c03da259e81323ee8a1de83b3925f95d78d2 WHIRLPOOL 499ffa1c825b57691065aebb0d53f21bba7f915193a1997a45a368e12fd344b5ecef0b2fa9095bfb31c063e268efd6c9ee6bbf6a4986c43a4b2aecbc5a5fa789
 MISC metadata.xml 2292 SHA256 9200af59c7e8551e71eef6e3d9b9653a74ef82f2e00a4c8fcfcbb1bee24dd888 SHA512 e0a20ec354899b299068aaee19ae64044bda5f1ea088485945b423cfdbe8a23bbb006b675d39604e9e5356bbc7185ce05fb1fdd42ecd04c1a052b874ac0de849 WHIRLPOOL 6bddc466a2cc1f7abef7bb6a4ee9aec23f53194053c9f0e08df5a7385e42fe88a49e0253ec4acc749a91ced9428b17ff49319e89dfde7001dde9ea5bd721bae5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSb4szAAoJEFpvPKfnPDWzfdgIALL9C/TihE1WKiUIA4OydVUT
-iiNUVKlz8VE5AgPKiTPgyxL4+9IgQn2pekKyk3MweqeoofKQhXgMlQhJDoPa6rmU
-1f+p1WPl4HBk0jO4Ok53ZEoqIktbO2yhFBsl/TbNJufkyCJabK7hAdAlUM38DxJA
-IOsVanzCizO6yGYDTZ643UYOez6+L4UxUM6tPMrZVvARCB2NLACk6Uj/+C0GA4eD
-Eec7VcZFwHFEoE2JlZ3sn29FjMCnirvu4BwKCLYmbmx5eV9lcNcXZ0DXPG69FzgD
-lYQhfzsS3qLbWY6G2Whorz4f3Bbmjd+7owGbmHMMPvCkXD+VKFXLxnp3f1JYPeM=
-=bnvY
+iQEcBAEBCAAGBQJSc/XRAAoJEFpvPKfnPDWzNSgIAIimHfBg2/Eedh+jNZnWawDK
+R6r4cq79z/lgOz9Wdvv/MWpqzYs2IDrD45b7nIbK01U/Z+bY9XanFESgXoN1bdQN
+pv9N6E/N8wM6tWSzQFDJoa5kziOOqouq/O3yhDGmy+u4z1XPviinwA55AAVuSW5X
+g17GQjcROKAsOmcGlgDgFTOppW5oa9wLJjY0oiKa3ew3bEC7bb4lK+3rPbiQTWv4
+PGNRNXg/2Cv839LPAuuUmv/Gaap9xEzSAoge9+Sce9gP2cvzkTli01neqFZT4sLF
+HafqOVuuHbT7s5UjuuRfzJ/qIT2UmNcJGAqAL5iiwgXe3kFnxVEmrKyNeOYitJo=
+=xWFb
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.69.ebuild b/media-gfx/blender/blender-2.69.ebuild
new file mode 100644
index 000000000000..819564beefec
--- /dev/null
+++ b/media-gfx/blender/blender-2.69.ebuild
@@ -0,0 +1,269 @@
+# 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.69.ebuild,v 1.1 2013/11/01 18:41:17 hasufell Exp $
+
+# TODO:
+#   bundled-deps: bullet is modified
+#   multiple python abi?
+
+EAPI=5
+PYTHON_COMPAT=( python3_3 )
+#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 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
+	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[threads(+)] )
+	collada? ( media-libs/opencollada )
+	colorio? ( media-libs/opencolorio )
+	cycles? (
+		media-libs/openimageio
+	)
+	ffmpeg? (
+		|| (
+			media-video/ffmpeg: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 )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( >=media-libs/openal-1.6.372 )
+	openexr? ( media-libs/openexr )
+	sdl? ( media-libs/libsdl[audio,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.68-unbundle-colamd.patch \
+		"${FILESDIR}"/03-${PN}-2.68-remove-binreloc.patch \
+		"${FILESDIR}"/04-${PN}-2.68-unbundle-glog.patch \
+		"${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \
+		"${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \
+		"${FILESDIR}"/07-${PN}-2.68-sse2.patch
+
+	# remove some bundled deps
+	rm -r \
+		extern/Eigen3 \
+		extern/libopenjpeg \
+		extern/glew \
+		extern/colamd \
+		extern/binreloc \
+		extern/libmv/third_party/{ldl,glog,gflags} \
+		|| die
+
+	# turn off binreloc (not cached)
+	sed -i \
+		-e 's#set(WITH_BINRELOC ON)#set(WITH_BINRELOC OFF)#' \
+		CMakeLists.txt || 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
+			for i in "${S}"/release/datafiles/locale/* ; do
+				mylang=${i##*/}
+				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 openal OPENAL)
+		$(cmake-utils_use_with openexr IMAGE_OPENEXR)
+		$(cmake-utils_use_with openmp OPENMP)
+		$(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
+}