summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-07-16 12:05:02 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-07-16 12:05:02 +0000
commitb10d99ed61421b6eb01df0c23785dd8b1ba13c37 (patch)
tree869785f2e89c216a398ba2a7adc7039bff505aa6 /media-gfx
parentVersion bump (diff)
downloadgentoo-2-b10d99ed61421b6eb01df0c23785dd8b1ba13c37.tar.gz
gentoo-2-b10d99ed61421b6eb01df0c23785dd8b1ba13c37.tar.bz2
gentoo-2-b10d99ed61421b6eb01df0c23785dd8b1ba13c37.zip
Bump to install an env.d file to make blender find its own files. Fixes bug #426832.
(Portage version: 2.2.0_alpha118/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/blender/ChangeLog9
-rw-r--r--media-gfx/blender/blender-2.63a-r2.ebuild (renamed from media-gfx/blender/blender-2.63a-r1.ebuild)12
2 files changed, 17 insertions, 4 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 216478bf194c..820fc6b212b3 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-gfx/blender
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.230 2012/07/16 11:40:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.231 2012/07/16 12:05:02 flameeyes Exp $
+
+*blender-2.63a-r2 (16 Jul 2012)
+
+ 16 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> +blender-2.63a-r2.ebuild,
+ -blender-2.63a-r1.ebuild:
+ Bump to install an env.d file to make blender find its own files. Fixes bug
+ #426832.
16 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> blender-2.63a-r1.ebuild:
Simplify handling of iconv USE flag (masked on profiles where it's useless).
diff --git a/media-gfx/blender/blender-2.63a-r1.ebuild b/media-gfx/blender/blender-2.63a-r2.ebuild
index 6bc3ca0354d7..d5b4affe34f3 100644
--- a/media-gfx/blender/blender-2.63a-r1.ebuild
+++ b/media-gfx/blender/blender-2.63a-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.63a-r1.ebuild,v 1.3 2012/07/16 11:40:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.63a-r2.ebuild,v 1.1 2012/07/16 12:05:02 flameeyes Exp $
EAPI=4
PYTHON_DEPEND="3:3.2"
@@ -215,6 +215,12 @@ EOF
src_compile() {
escons
+ cat - > "${T}"/${PN}.env <<EOF
+BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/scripts"
+BLENDER_SYSTEM_DATAFILES="/usr/share/blender/datafiles"
+BLENDER_SYSTEM_PLUGINS="/usr/$(get_libdir)/plugins"
+EOF
+
if use doc; then
einfo "Generating Blender C/C++ API docs ..."
cd "${WORKDIR}"/${P}/doc/doxygen
@@ -227,6 +233,8 @@ src_install() {
# Pax mark blender for hardened support.
pax-mark m "${WORKDIR}/install/blender"
+ newenvd "${T}"/${PN}.env 60${PN}
+
# install binaries
dobin "${WORKDIR}/install/blender"
use player && newbin "${WORKDIR}/install/blenderplayer" blenderplayer
@@ -236,8 +244,6 @@ src_install() {
doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
# install desktop file
- insinto /usr/share/pixmaps
- doins release/freedesktop/icons/scalable/apps/blender.svg
insinto /usr/share/applications
doins release/freedesktop/blender.desktop