dev-python/soya: Add missing dep on freetype

restructured installation for better eclass usage

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec@gentoo.org>

diff --git a/dev-python/soya/metadata.xml b/dev-python/soya/metadata.xml
index de483c53568fa127e082f0a932b29dc573eb3ebf..301d2207cc291aebf05ac934224fc74e5e8a74b7 100644 (file)
--- a/dev-python/soya/metadata.xml
+++ b/dev-python/soya/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+       <herd>python</herd>
 </pkgmetadata>

diff --git a/dev-python/soya/soya-0.14-r1.ebuild b/dev-python/soya/soya-0.14-r1.ebuild
index 8191ec0f42650afba0f7595fa0444a6a3233e95b..d8f3224526b15756bce3100dd72127a8a54a5074 100644 (file)
--- a/dev-python/soya/soya-0.14-r1.ebuild
+++ b/dev-python/soya/soya-0.14-r1.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 flag-o-matic
@@ -13,7 +14,8 @@ TUT_P="SoyaTutorial-${MY_PV}"
 
 DESCRIPTION="A high-level 3D engine for Python, designed with games in mind"
 HOMEPAGE="http://oomadness.nekeme.net/Soya/FrontPage"
-SRC_URI="http://download.gna.org/soya/${MY_P}.tar.bz2
+SRC_URI="
+       http://download.gna.org/soya/${MY_P}.tar.bz2
        doc? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )
        examples? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )"
 
@@ -22,18 +24,21 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc examples"
 
-DEPEND="=dev-games/ode-0.11.1
+DEPEND="
+       =dev-games/ode-0.11.1
        dev-python/editobj
-       virtual/python-imaging[${PYTHON_USEDEP}]
        >=dev-python/pyopenal-0.1.6[${PYTHON_USEDEP}]
        media-fonts/freefonts
+       media-libs/freetype:2
        >=media-libs/cal3d-0.10
        media-libs/freeglut
        >=media-libs/freetype-2.5
        >=media-libs/glew-1.3.3
        >=media-libs/libsdl-1.2.8[opengl]
        media-libs/openal
-       virtual/opengl"
+       virtual/opengl
+       virtual/python-imaging[${PYTHON_USEDEP}]
+"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -51,15 +56,8 @@ python_compile() {
 }
 
 python_install_all() {
-       distutils-r1_python_install_all
+       use doc && DOCS=( "${WORKDIR}/${TUT_P}/doc"/{soya_guide,pudding/pudding}.pdf )
+       use examples && EXAMPLES=( "${WORKDIR}/${TUT_P}"/tutorial )
 
-       insinto /usr/share/${PF}
-       if use doc; then
-               cd "${WORKDIR}/${TUT_P}/doc"
-               doins soya_guide.pdf pudding/pudding.pdf || die "doins failed"
-       fi
-       if use examples; then
-               cd "${WORKDIR}/${TUT_P}"
-               doins -r tutorial || die "doins failed"
-       fi
+       distutils-r1_python_install_all
 }