Gentoo Archives: gentoo-commits

From: "Markus Meier (maekke)" <maekke@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/blender: ChangeLog blender-2.48-r1.ebuild
Date: Sun, 19 Oct 2008 21:32:30
Message-Id: E1Krfsx-0007M9-9g@stork.gentoo.org
maekke      08/10/19 21:32:27

  Modified:             ChangeLog blender-2.48-r1.ebuild
  Log:
  downgrade EAPI to 0 as this seems to cause troubles to some users (bug #242502 and bug #242664)
  (Portage version: 2.2_rc12/cvs/Linux 2.6.27.1 i686)

Revision  Changes    Path
1.156                media-gfx/blender/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/ChangeLog?r1=1.155&r2=1.156

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- ChangeLog	19 Oct 2008 14:15:04 -0000	1.155
+++ ChangeLog	19 Oct 2008 21:32:27 -0000	1.156
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.155 2008/10/19 14:15:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.156 2008/10/19 21:32:27 maekke Exp $
+
+  19 Oct 2008; Markus Meier <maekke@g.o> blender-2.48-r1.ebuild:
+  downgrade EAPI to 0 as this seems to cause troubles to some users (bug
+  #242502 and bug #242664)
 
   19 Oct 2008; Markus Meier <maekke@g.o> blender-2.48.ebuild,
   blender-2.48-r1.ebuild:



1.4                  media-gfx/blender/blender-2.48-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.48-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.48-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/blender/blender-2.48-r1.ebuild?r1=1.3&r2=1.4

Index: blender-2.48-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blender-2.48-r1.ebuild	19 Oct 2008 14:15:04 -0000	1.3
+++ blender-2.48-r1.ebuild	19 Oct 2008 21:32:27 -0000	1.4
@@ -1,8 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48-r1.ebuild,v 1.3 2008/10/19 14:15:04 maekke Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48-r1.ebuild,v 1.4 2008/10/19 21:32:27 maekke Exp $
 
 inherit multilib flag-o-matic eutils python
 
@@ -52,15 +50,16 @@
 	fi
 }
 
-src_prepare() {
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
 	epatch "${FILESDIR}"/blender-2.37-dirs.patch
 	epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch
 	epatch "${FILESDIR}"/blender-2.46-ffmpeg.patch
 	epatch "${FILESDIR}"/blender-2.46-cve-2008-1103-1.patch
 	epatch "${FILESDIR}"/${P}-ffmpeg-20081014.patch
-}
 
-src_configure() {
 	if use ffmpeg ; then
 #		cd "${S}"/extern
 #		rm -rf ffmpeg libmp3lame x264
@@ -87,7 +86,9 @@
 		echo "WITH_BF_OPENMP=0" >> "${S}"/user-config.py
 		elog "disabling openmp"
 	fi
+}
 
+src_compile() {
 	for arg in \
 			'blender-game gameengine' \
 			'ffmpeg' \
@@ -100,9 +101,7 @@
 			'verse' ; do
 		blend_with ${arg}
 	done
-}
 
-src_compile() {
 	# scons uses -l differently -> remove it
 	scons ${MAKEOPTS/-l[0-9]} || die \
 	"!!! Please add ${S}/scons.config when filing bugs reports to bugs.gentoo.org"