diff options
| author |   Markus Meier <maekke@gentoo.org> | 2008-10-19 21:32:27 +0000 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2008-10-19 21:32:27 +0000 |
| commit | 617b18a5a7077c36221cee17be0cd9bcc98536c1 (patch) | |
| tree | 0c2b1d9440c1e5f9b6bf963a9c7d3aac09f5d362 | |
| parent | Redigest (diff) | |
| download | historical-617b18a5a7077c36221cee17be0cd9bcc98536c1.tar.gz historical-617b18a5a7077c36221cee17be0cd9bcc98536c1.tar.bz2 historical-617b18a5a7077c36221cee17be0cd9bcc98536c1.zip | |
downgrade EAPI to 0 as this seems to cause troubles to some users (bug #242502 and bug #242664)
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27.1 i686
| -rw-r--r-- | media-gfx/blender/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/blender/Manifest | 10 | ||||
| -rw-r--r-- | media-gfx/blender/blender-2.48-r1.ebuild | 15 |
3 files changed, 17 insertions, 14 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index 1cd4d8f68752..097177ff5e44 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -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@gentoo.org> 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@gentoo.org> blender-2.48.ebuild, blender-2.48-r1.ebuild: diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 221a90b2000e..8e96e8e03553 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -28,14 +28,14 @@ EBUILD blender-2.46-r1.ebuild 3630 RMD160 f2a4f3bbdfbc0b30f4284694e6ec263b6e7e66 EBUILD blender-2.46.ebuild 3602 RMD160 86e8526c456b78f44bcd8cc05c1df320d76903f0 SHA1 5c1ab9951e4256ce75f47c9623755cd90e52f2e8 SHA256 d36260c6399766db15b38c79a01216be23dd982113a34e3e83927ed6ecfac52a EBUILD blender-2.47-r1.ebuild 3898 RMD160 720bb4010b011282cdd83294abc28528ec738bac SHA1 04c6ae4ab6e7173c39e4b71ca1530d814c6f4835 SHA256 e671f2121b13001acc4b4f3261515df61f58621425d1a7d281cb1ecb34142fc0 EBUILD blender-2.47.ebuild 3869 RMD160 257e24844e835bd63b47a6c3ce6115ad61c77c5a SHA1 2fa64735a9c6a5180d9d90062abbe3baf21da740 SHA256 cd68ab5a6991222a7268fbf0a1244be660768dbab165f2488b0bf85c4c93a723 -EBUILD blender-2.48-r1.ebuild 4017 RMD160 fbd41a64911c49da6f65a7baef7a1ebd390c4ad9 SHA1 cd6a66575f14982318e4f84cc0f9a6b598096164 SHA256 1a833243b326c261970a126a21d3698a7b8161b5ca49e85ff80287c2f346c58b +EBUILD blender-2.48-r1.ebuild 4011 RMD160 23a93a7aab32058ca8c319174c97c032768a8b9f SHA1 c21ff69548cb71bf81ca7d709a61161784d59675 SHA256 1f9227e9f4cf396e2287017f29d7f1fa5b5db287e228944931bdc7761c90968e EBUILD blender-2.48.ebuild 3933 RMD160 47e7e71e1b39b3ea34caeeae4b81d72c9e7a028b SHA1 046a29b139570a149ce3ced40383640af68782ee SHA256 68849d83d27cea5695cbe348ddc7aa9fc37c6f5234024b59db6abaaf07271575 -MISC ChangeLog 23111 RMD160 4413a2cf249b8522efe6da8a48c42d5aafdd83a9 SHA1 99729b0ac4c055ac449a7fd9559b0b5135e4841c SHA256 4a1a145ae653ef65ee9b8aa4a7dfde5a8eb6a0e7190f4c2128158a6e5635d710 +MISC ChangeLog 23284 RMD160 5016f6beee4fbf5d614987277596c8e337aecb3b SHA1 45a7061d0e340f31892a025b2f28fa7fe4ff4621 SHA256 e308c5fe31b32086ddfc729214a57fec9386eb083f0ae65737709e6b86250293 MISC metadata.xml 719 RMD160 132dfe4fc49228b922ed39f556c403347e992ef9 SHA1 7896fb17bd0dd87d8a072b0f6f6072876c1eed94 SHA256 6409856f1883ed49aae365c885d5512a38784a5a48a2bbf7dd583b8054d32510 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkj7QUkACgkQkKaRLQcq0GLj+wCffKaM1TI9N09iAIqFCUxSbrOW -d8IAoLTu1SOCZSXppOUPRztVYTf45qCy -=X5NU +iEYEARECAAYFAkj7p8sACgkQkKaRLQcq0GKPtACdFKARffaODZEbeko+ohSrT4Ai +uYQAmQGTt5BEosb9OZR6mwJcTtgVAzsd +=Kcmq -----END PGP SIGNATURE----- diff --git a/media-gfx/blender/blender-2.48-r1.ebuild b/media-gfx/blender/blender-2.48-r1.ebuild index e0852878a692..7cd0eaf15ed7 100644 --- a/media-gfx/blender/blender-2.48-r1.ebuild +++ b/media-gfx/blender/blender-2.48-r1.ebuild @@ -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 @@ blend_with() { 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 @@ src_configure() { 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 @@ src_configure() { '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" |