make sure that libsdl is built with joystick with USE=blender-game by R Stephan

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

3 files changed, 27 insertions, 12 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 2615d1d3d97c..30f717c7340a 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,9 @@
 # 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.170 2008/12/21 14:41:35 nixnut Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.171 2009/04/15 21:47:11 maekke Exp $
+
+  15 Apr 2009; Markus Meier <maekke@gentoo.org> blender-2.48a-r3.ebuild:
+  make sure that libsdl is built with joystick with USE=blender-game by R Stephan
 
   21 Dec 2008; nixnut <nixnut@gentoo.org> blender-2.48a-r3.ebuild:
   Stable on ppc wrt bug 245515
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 1dd368632e87..5ee019979a42 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
@@ -7,6 +10,13 @@ AUX blender-2.48a-CVE-2008-4863.patch 696 RMD160 b61dc085d0154be3850fa4b53985f67
 AUX blender.desktop 194 RMD160 5b154d86d52f46a3f1fcd29da90322e1727f1107 SHA1 a1b70789388f72f2a292939588365a0b845b83b7 SHA256 9d21fe8823f249f0720895107817854dd8ce64afe6586317af08805b94fe0fab
 AUX blender.png 2119 RMD160 e06574002001f41198dc9408ef1bba45493fcc27 SHA1 9a0d713235ce99f8e4fde4f062209ab989e48c0f SHA256 bef633319c81323bb82db274004d89082ca05cab6650eb4c4bf43f830ccb5cad
 DIST blender-2.48a.tar.gz 21502247 RMD160 5ef94d6019302bfea86d5657af738d1d86a8bcd5 SHA1 9fb2dbf5d6cfcba8ae2d6d9b93ca9e3e66aae6c7 SHA256 781d4d9e2332f4f3887af1d66fb70c4c6dd0b89166391403ee4853108abf4e46
-EBUILD blender-2.48a-r3.ebuild 4090 RMD160 15ddf32bee7f8ac090f1163930e82f017d926826 SHA1 665c5141d713c4fa5f110c8749d61f804839c236 SHA256 40884434cc2f25910819e84d9f19f0e0ec02a9de836b9d15ad0c9bf8cff190a8
-MISC ChangeLog 25607 RMD160 c1a12b6b8208c5e98d72e297443e4011902184e4 SHA1 99d8f377a0c6153f541a7376fc93e65b8cd9da3f SHA256 b1b3d8a030fdfa91947344cf49ac101b297f4299ca49ca02f673ccd7573168e6
+EBUILD blender-2.48a-r3.ebuild 4150 RMD160 807a58663d8dd5abd27cd156a5125b363a7e625c SHA1 8216cf7758d2d1fb325df8076fe79af29604cf73 SHA256 fedae88da4cd8d0b6ab65833e44816f8fc08f387fb5f77fde1f77e67610abfdc
+MISC ChangeLog 25763 RMD160 4749da95c80645645a9561faa5b9f597960d2716 SHA1 ec7e21b8a0debd20797a58372e092d69579283e9 SHA256 d210df51e736060b0e686087980f22f7b44c30a983847ccbb36f641caef322c3
 MISC metadata.xml 719 RMD160 132dfe4fc49228b922ed39f556c403347e992ef9 SHA1 7896fb17bd0dd87d8a072b0f6f6072876c1eed94 SHA256 6409856f1883ed49aae365c885d5512a38784a5a48a2bbf7dd583b8054d32510
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknmVgEACgkQkKaRLQcq0GJ/LQCgrzb0kDwOxszZahohRM/JCt/L
+FWoAnAyeRR1xhT3ejAnEv5HnNbRr0cG9
+=YR8K
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.48a-r3.ebuild b/media-gfx/blender/blender-2.48a-r3.ebuild
index de55668a22cc..7e2e2aaf4983 100644
--- a/media-gfx/blender/blender-2.48a-r3.ebuild
+++ b/media-gfx/blender/blender-2.48a-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.48a-r3.ebuild,v 1.9 2008/12/21 14:41:35 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.48a-r3.ebuild,v 1.10 2009/04/15 21:47:11 maekke Exp $
+
+EAPI="2"
 
 inherit multilib flag-o-matic eutils python
 
@@ -30,6 +32,7 @@ RDEPEND=">=dev-libs/openssl-0.9.6
 	png? ( media-libs/libpng )
 	quicktime? ( media-libs/libquicktime )
 	>=media-libs/libsdl-1.2
+	blender-game? ( >=media-libs/libsdl-1.2[joystick] )
 	virtual/opengl"
 
 DEPEND=">=dev-util/scons-0.98
@@ -51,17 +54,16 @@ blend_with() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.37-dirs.patch
 	epatch "${FILESDIR}"/${PN}-2.44-scriptsdir.patch
 	epatch "${FILESDIR}"/${PN}-2.46-ffmpeg.patch
 	epatch "${FILESDIR}"/${PN}-2.46-cve-2008-1103-1.patch
 	epatch "${FILESDIR}"/${PN}-2.48-ffmpeg-20081014.patch
 	epatch "${FILESDIR}"/${P}-CVE-2008-4863.patch
+}
 
+src_configure() {
 	if use ffmpeg ; then
 #		cd "${S}"/extern
 #		rm -rf ffmpeg libmp3lame x264
@@ -88,9 +90,7 @@ src_unpack() {
 		echo "WITH_BF_OPENMP=0" >> "${S}"/user-config.py
 		elog "disabling openmp"
 	fi
-}
 
-src_compile() {
 	for arg in \
 			'blender-game gameengine' \
 			'ffmpeg' \
@@ -103,7 +103,9 @@ src_compile() {
 			'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"