add patch for linking against glu from Florent D'halluin (bug #344351)

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 30 insertions, 8 deletions

diff --git a/dev-python/soya/ChangeLog b/dev-python/soya/ChangeLog
index e6d603e30626..82495e44e6f2 100644
--- a/dev-python/soya/ChangeLog
+++ b/dev-python/soya/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/soya
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/ChangeLog,v 1.24 2010/09/16 16:44:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/ChangeLog,v 1.25 2010/11/06 16:21:38 mr_bones_ Exp $
+
+  06 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org> soya-0.14.ebuild,
+  +files/soya-0.14-glu.patch:
+  add patch for linking against glu from Florent D'halluin (bug #344351)
 
   16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> soya-0.10.2.ebuild,
   soya-0.13_rc1.ebuild, soya-0.14.ebuild:
diff --git a/dev-python/soya/files/soya-0.14-glu.patch b/dev-python/soya/files/soya-0.14-glu.patch
new file mode 100644
index 000000000000..606114a22fb7
--- /dev/null
+++ b/dev-python/soya/files/soya-0.14-glu.patch
@@ -0,0 +1,13 @@
+Index: setup.py
+===================================================================
+--- setup.py	(revision 550)
++++ setup.py	(working copy)
+@@ -130,7 +130,7 @@
+ if sys.platform[:3] == "win":
+ 	LIBS = ["m", "glew32", "SDL", "SDL_mixer", "freetype", "cal3d", "stdc++", "ode"]
+ else:
+-	LIBS = ["m", "GLEW", "SDL", "freetype", "cal3d", "stdc++","ode"]
++	LIBS = ["m", "GLEW", "GLU" , "SDL", "freetype", "cal3d", "stdc++","ode"]
+ 	FRAMEWORKS=[]
+ 
+ SOYA_PYREX_SOURCES  = ["_soya.pyx", "matrix.c", "chunk.c"]
diff --git a/dev-python/soya/soya-0.14.ebuild b/dev-python/soya/soya-0.14.ebuild
index a89bfbc59a47..48034fb4fcc2 100644
--- a/dev-python/soya/soya-0.14.ebuild
+++ b/dev-python/soya/soya-0.14.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.14.ebuild,v 1.3 2010/09/16 16:44:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.14.ebuild,v 1.4 2010/11/06 16:21:38 mr_bones_ Exp $
 
-inherit distutils
+EAPI=2
+inherit eutils distutils
 
 MY_PV=${PV/_}
 MY_P=Soya-${MY_PV}
@@ -15,7 +16,7 @@ SRC_URI="http://download.gna.org/soya/${MY_P}.tar.bz2
 	examples? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc examples"
 
 DEPEND="virtual/opengl
@@ -26,24 +27,28 @@ DEPEND="virtual/opengl
 	>=media-libs/glew-1.3.3
 	>=media-libs/freetype-2.1.5
 	media-fonts/freefonts
-	>=media-libs/libsdl-1.2.8
+	>=media-libs/libsdl-1.2.8[opengl]
 	>=dev-games/ode-0.5
 	media-libs/openal
 	>=dev-python/pyopenal-0.1.6"
-RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glu.patch
+	distutils_src_prepare
+}
+
 src_install() {
 	distutils_src_install
 
 	insinto /usr/share/${PF}
 	if use doc ; then
 		cd "${WORKDIR}/${TUT_P}/doc"
-		doins soya_guide.pdf pudding/pudding.pdf
+		doins soya_guide.pdf pudding/pudding.pdf || die
 	fi
 	if use examples ; then
 		cd "${WORKDIR}/${TUT_P}"
-		doins -r tutorial
+		doins -r tutorial || die
 	fi
 }