version bump, reported by Christian Strahl in bug #284231

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 194 insertions, 2 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 4946ede2ba72..d1458159b351 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.178 2009/07/24 13:21:48 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.179 2009/09/13 13:59:27 maekke Exp $
+
+*blender-2.49b (13 Sep 2009)
+
+  13 Sep 2009; Markus Meier <maekke@gentoo.org> +blender-2.49b.ebuild:
+  version bump, reported by Christian Strahl in bug #284231
 
   24 Jul 2009; Luca Barbato <lu_zero@gentoo.org>
   +files/blender-2.49a-bake.patch, blender-2.49a.ebuild:
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index f1985c6cd524..95267a39a5d7 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX blender-2.37-dirs.patch 727 RMD160 ddf5c951182f809374c43f1a1cce47f4397a868c SHA1 9b3cb06a8bd23b1a5041bd3193018c2e5e28dcfd SHA256 beb5e5835cde71a00712ddf600278ca0bbdb6020123faeb6ea7a53e8f6812e5e
 AUX blender-2.44-scriptsdir.patch 2586 RMD160 8e80859edf1fae2f401b326be4cb939108879999 SHA1 50143946828d3f2b2568e71fae5ed28f6adf7449 SHA256 a7afac10ce2431cd94d10dc3f4cae33423b5a59d0c6918199006f623cd6d68e4
 AUX blender-2.46-cve-2008-1103-1.patch 636 RMD160 11d0b7dbff6e186334a80b7f6932ace4a1bd6628 SHA1 979fa1c2f0836b46dfd26c197798625a72e0a28b SHA256 a0dd64fb749a9577d84e22896872dc2956a8530700308d0aadad588191356b96
@@ -10,7 +13,16 @@ AUX blender.desktop 194 RMD160 5b154d86d52f46a3f1fcd29da90322e1727f1107 SHA1 a1b
 AUX blender.png 2119 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 SHA1 9a0d713235ce99f8e4fde4f062209ab989e48c0f SHA256 bef633319c81323bb82db274004d89082ca05cab6650eb4c4bf43f830ccb5cad
 DIST blender-2.48a.tar.gz 21502247 RMD160 5ef94d6019302bfea86d5657af738d1d86a8bcd5 SHA1 9fb2dbf5d6cfcba8ae2d6d9b93ca9e3e66aae6c7 SHA256 781d4d9e2332f4f3887af1d66fb70c4c6dd0b89166391403ee4853108abf4e46
 DIST blender-2.49a.tar.gz 23039535 RMD160 f37100c7a02c75b622b8e055f32f06e064a62de2 SHA1 59f5be96eda874bb901390f55a70d58cf8e0b979 SHA256 b206b878a6f96d1e8561ee62a58fba1af4141579c27f51ec795f08f4129eb1fc
+DIST blender-2.49b.tar.gz 22918377 RMD160 5b641de7b41af5e4186c9721b66eddc6870f9fbc SHA1 43f71e7de4efe79c518d45f4b5a04e03c28d5fc5 SHA256 23554db4aa10b00e0e760a8bf9c4a9f749670d815c8bc874a04746adc4752488
 EBUILD blender-2.48a-r3.ebuild 4133 RMD160 9fe866fe26404ff233526ce0bb3c25ed38e0c777 SHA1 27cc6ff87860fc3623a4a9fd4db288435d6da4c7 SHA256 5f1f4112dc9edc04ed77b97d5daa5d27a1be96e8d4c995209909f06790aadea3
 EBUILD blender-2.49a.ebuild 4898 RMD160 97d944e4420b09a971f488f85a9884d94a31e4c0 SHA1 40143dbd2f2269a2d2dc7528a84737ad9c24f077 SHA256 c04b8f7626a15e693b732a7b075d2bbc07954ea034e46fea3fb11e38992f5dc6
-MISC ChangeLog 26553 RMD160 49185c8a1c1555066f5fbc5466a1a5d5845bccb4 SHA1 db48bce9d19186e8dd5d46578c2e6c6f59a1fda9 SHA256 466791e4ac86b8543ef8f1c32a05dcd710bd1878ae71c950bed90bbfb8683b33
+EBUILD blender-2.49b.ebuild 4852 RMD160 879a2c497bc7f19be0701dbccc606ff98b5adc5b SHA1 82f71623c751d75d036dbfc04420afa5c3549927 SHA256 e621996c8b92723dc3f48fc45679bff671beb2f5790094eade4f0ef5e47c4531
+MISC ChangeLog 26714 RMD160 93000f0e8d42a7b79466ae55c465cf30cf5e53c4 SHA1 47d9e1eb9a505180b06f8670e82e824d7688b131 SHA256 c1daef73025328b4ac28f7d52ccc4150e62cbf7d146e3134a86636b206d705aa
 MISC metadata.xml 719 RMD160 132dfe4fc49228b922ed39f556c403347e992ef9 SHA1 7896fb17bd0dd87d8a072b0f6f6072876c1eed94 SHA256 6409856f1883ed49aae365c885d5512a38784a5a48a2bbf7dd583b8054d32510
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqs+1gACgkQkKaRLQcq0GLEFQCfd8zgtZIsC3DtqsTcLOkpY2gO
+7nIAn18pAKyDQHU5mFgGbbnLCdfZdNPP
+=oBwl
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.49b.ebuild b/media-gfx/blender/blender-2.49b.ebuild
new file mode 100644
index 000000000000..8673c3e3072b
--- /dev/null
+++ b/media-gfx/blender/blender-2.49b.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b.ebuild,v 1.1 2009/09/13 13:59:27 maekke Exp $
+
+EAPI=2
+
+inherit multilib eutils python
+
+IUSE="blender-game ffmpeg nls ogg openmp verse openal"
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org/"
+SRC_URI="http://download.blender.org/source/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL BSD )"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="ffmpeg? ( >=media-video/ffmpeg-0.5[encode,theora] )
+	media-libs/jpeg
+	media-libs/openjpeg
+	media-libs/tiff
+	>=dev-lang/python-2.5
+	nls? ( >=media-libs/freetype-2.0
+		virtual/libintl
+		>=media-libs/ftgl-2.1 )
+	openal? ( >=media-libs/openal-1.6.372 )
+	>=media-libs/freealut-1.1.0-r1
+	media-libs/openexr
+	media-libs/libpng
+	blender-game? ( >=media-libs/libsdl-1.2[joystick] )
+	>=media-libs/libsdl-1.2
+	ogg? ( media-libs/libogg )
+	virtual/opengl"
+
+DEPEND=">=dev-util/scons-0.98
+	sys-devel/gcc[openmp?]
+	x11-base/xorg-server
+	${RDEPEND}"
+
+blend_with() {
+	local UWORD="$2"
+	if [ -z "${UWORD}" ]; then
+		UWORD="$1"
+	fi
+	if useq $1; then
+		echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
+			>> "${S}"/user-config.py
+	else
+		echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
+			>> "${S}"/user-config.py
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/blender-2.48a-CVE-2008-4863.patch
+	epatch "${FILESDIR}"/${PN}-2.37-dirs.patch
+	epatch "${FILESDIR}"/${PN}-2.44-scriptsdir.patch
+	epatch "${FILESDIR}"/${PN}-2.49a-sys-openjpeg.patch
+	rm -f "${S}/release/scripts/bpymodules/"*.pyc
+}
+
+src_configure() {
+
+	# add ffmpeg info to the scons build info
+	cat <<- EOF >> "${S}"/user-config.py
+		BF_FFMPEG="/usr"
+		BF_FFMPEG_LIB="avdevice avformat avcodec swscale avutil"
+	EOF
+
+	#  set python version to current version in use
+	python_version
+	cat <<- EOF >> "${S}"/user-config.py
+		BF_PYTHON_VERSION="${PYVER}"
+		BF_PYTHON_INC="/usr/include/python${PYVER}"
+		BF_PYTHON_BINARY="/usr/bin/python${PYVER}"
+		BF_PYTHON_LIB="python${PYVER}"
+	EOF
+
+	# add system openjpeg into scons build.
+	cat <<- EOF >> "${S}"/user-config.py
+		BF_OPENJPEG = "/usr"
+		BF_OPENJPEG_INC = "/usr/include"
+		BF_OPENJPEG_LIB = "openjpeg"
+	EOF
+
+	#set CFLAGS used in /etc/make.conf correctly
+
+	echo "CFLAGS= [`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
+		  | sed -e "s:,]: ]:" >> "${S}"/user-config.py
+
+	echo "CXXFLAGS= [`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`]" \
+		 | sed -e "s:,]: ]:" >> "${S}"/user-config.py
+
+	# check for blender-game USE flag.
+	# blender-game will merge with blenderplayer.
+
+	for arg in \
+			'openal'\
+			'ffmpeg' \
+			'blender-game player' \
+			'blender-game gameengine' \
+			'nls international' \
+			'ogg' \
+			'openmp' \
+			'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'
+
+	cd "${WORKDIR}"/install/linux2/plugins
+	chmod 755 bmake
+	emake || die
+}
+
+src_install() {
+	exeinto /usr/bin/
+	doexe "${WORKDIR}"/install/linux2/blender
+	use blender-game && doexe "${WORKDIR}"/install/linux2/blenderplayer
+
+	dodir /usr/share/${PN}
+
+	exeinto /usr/$(get_libdir)/${PN}/textures
+	doexe "${WORKDIR}"/install/linux2/plugins/texture/*.so
+	exeinto /usr/$(get_libdir)/${PN}/sequences
+	doexe "${WORKDIR}"/install/linux2/plugins/sequence/*.so
+	insinto /usr/include/${PN}
+	doins "${WORKDIR}"/install/linux2/plugins/include/*.h
+
+	if use nls ; then
+		mv "${WORKDIR}"/install/linux2/.blender/{.Blanguages,.bfont.ttf} \
+			"${D}"/usr/share/${PN}
+		mv "${WORKDIR}"/install/linux2/.blender/locale \
+			"${D}"/usr/share/locale
+	fi
+
+	mv "${WORKDIR}"/install/linux2/.blender/scripts "${D}"/usr/share/${PN}
+
+	insinto /usr/share/pixmaps
+	doins "${WORKDIR}"/install/linux2/icons/scalable/blender.svg
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/${PN}.desktop
+
+	dodoc INSTALL README
+	dodoc "${WORKDIR}"/install/linux2/BlenderQuickStart.pdf
+
+}
+
+pkg_preinst(){
+	if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
+	then
+		rm -f "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
+	fi
+}
+
+pkg_postinst(){
+	elog "blender uses python integration.  As such, may have some"
+	elog "inherit risks with running unknown python scripting."
+	elog " "
+	elog "CVE-2008-1103-1.patch has been removed as it interferes"
+	elog "with autosave undo features. Up stream blender coders"
+	elog "have not addressed the CVE issue as the status is still"
+	elog "a CANDIDATE and not CONFIRMED."
+	elog " "
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to ~tmp or another tmp file under your home"
+	elog "directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+}