From 571367cadc0dfcc34076bf142069ed25f061ec47 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 11 Oct 2015 09:30:43 +0200 Subject: [PATCH] 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 --- dev-python/soya/metadata.xml | 2 +- dev-python/soya/soya-0.14-r1.ebuild | 26 ++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dev-python/soya/metadata.xml b/dev-python/soya/metadata.xml index de483c53568fa..301d2207cc291 100644 --- a/dev-python/soya/metadata.xml +++ b/dev-python/soya/metadata.xml @@ -1,5 +1,5 @@ -python + python diff --git a/dev-python/soya/soya-0.14-r1.ebuild b/dev-python/soya/soya-0.14-r1.ebuild index 8191ec0f42650..d8f3224526b15 100644 --- 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 }