[media-gfx/tachyon] Update ebuild per bug #293969. thanks to Christopher Schwan

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

2 files changed, 19 insertions, 30 deletions

diff --git a/media-gfx/tachyon/Manifest b/media-gfx/tachyon/Manifest
index 3f850382c171..f192a480a077 100644
--- a/media-gfx/tachyon/Manifest
+++ b/media-gfx/tachyon/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST tachyon-0.98.9.tar.gz 3273086 RMD160 762abacb3efa4a6560befcdfa17bb4da22053f3a SHA1 a11b512e356d28492a46c964574e1968230ba593 SHA256 c6a3298ded4dc3e9390447819e1dac59b62c3d2d46d4154312ffe71549ee40d7
-EBUILD tachyon-0.98.9.ebuild 2830 RMD160 b7b9e6ad69fa696bfe308a485efa70703d200fc7 SHA1 002eb0af35a3b7b1f6b091cb83ee8795d7afd924 SHA256 8115275e31595ad846e482836973b8073d881782bdf693f3c81ea387d3b8889d
+EBUILD tachyon-0.98.9.ebuild 2939 RMD160 def4e6f08f7a6127961abfb9fb42f4d70b27ec68 SHA1 6aac50b0c9f956de50c330259e770b58da3fc3ac SHA256 c6a6802bfccb45c133b386c3829fb10c331fc3d91ca1d7cff7a28237a998a7b7
 MISC ChangeLog 364 RMD160 1395e9709eda287929519a725dd79a40e16a1539 SHA1 dbe3f1627a8107ae99bf03fe0d0c11bd5ebf0efd SHA256 e881ff07aaf31d8a9f12a3d09fcdd98d8bb90ce2ebdb12cf69e67e0df0de9fb6
 MISC metadata.xml 218 RMD160 c5d041e330d9d9ff361d7951db2ed25a04792dcb SHA1 cb86590d33bc69bd1f5bc4d13ef678cbfeacf286 SHA256 76a4637908a65fd7f6ffafb723f578a4a5e7e040b5f0229a368853284e562a78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuEE/kACgkQ5BmOA85PVLg71wCeIgp1eQQxhHjc5cRkvKoAdjUL
-zGUAnAwOXfeWJNR2avOOOqeY0EEevI1J
-=/0CQ
------END PGP SIGNATURE-----
diff --git a/media-gfx/tachyon/tachyon-0.98.9.ebuild b/media-gfx/tachyon/tachyon-0.98.9.ebuild
index 62c4db3457d8..8b998925ea39 100644
--- a/media-gfx/tachyon/tachyon-0.98.9.ebuild
+++ b/media-gfx/tachyon/tachyon-0.98.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/tachyon-0.98.9.ebuild,v 1.1 2010/02/23 17:44:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/tachyon-0.98.9.ebuild,v 1.2 2010/03/07 22:32:01 alexxy Exp $
 
 EAPI=2
 
@@ -10,18 +10,18 @@ DESCRIPTION="A portable, high performance parallel ray tracing system"
 HOMEPAGE="http://jedi.ks.uiuc.edu/~johns/raytracer/"
 SRC_URI="http://jedi.ks.uiuc.edu/~johns/raytracer/files/${PV}/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples jpeg mpi opengl png threads"
 
-RESTRICT="mirror"
-
-DEPEND="jpeg? ( media-libs/jpeg )
+CDEPEND="jpeg? ( media-libs/jpeg )
 	mpi? ( virtual/mpi )
 	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng )"
-RDEPEND="${DEPEND}"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}"
 
 S="${WORKDIR}/${PN}/unix"
 
@@ -38,8 +38,7 @@ pkg_setup() {
 		if use opengl ; then
 			TACHYON_MAKE_TARGET=linux-thr-ogl
 			if use mpi ; then
-				eerror "tachyon does not support MPI with OpenGL and threads"
-				die
+				die "tachyon does not support MPI with OpenGL and threads"
 			fi
 		elif use mpi ; then
 			TACHYON_MAKE_TARGET=linux-mpi-thr
@@ -52,7 +51,7 @@ pkg_setup() {
 		if use opengl ; then
 			# TODO: Support target: linux-lam-64-ogl
 
-			eerror "OpenGL is only available with USE=threads!"
+			die "OpenGL is only available with USE=threads!"
 		elif use mpi ; then
 				TACHYON_MAKE_TARGET=linux-mpi
 		else
@@ -63,7 +62,7 @@ pkg_setup() {
 	fi
 
 	if [[ -z "${TACHYON_MAKE_TARGET}" ]]; then
-		eerror "No target found, check use flags" && die
+		die "No target found, check use flags"
 	else
 		einfo "Using target: ${TACHYON_MAKE_TARGET}"
 	fi
@@ -80,8 +79,8 @@ src_prepare() {
 	if use png ; then
 		sed -i \
 			-e "s:USEPNG=:USEPNG=-DUSEPNG:g" \
-			-e "s:PNGINC=:PNGINC=$(libpng-config --cflags):g" \
-			-e "s:PNGLIB=:PNGLIB=$(libpng-config --ldflags):g" Make-config \
+			-e "s:PNGINC=:PNGINC=$(pkg-config libpng --cflags):g" \
+			-e "s:PNGLIB=:PNGLIB=$(pkg-config libpng --libs):g" Make-config \
 			|| die "sed failed"
 	fi
 
@@ -98,25 +97,25 @@ src_prepare() {
 }
 
 src_compile() {
-	emake "${TACHYON_MAKE_TARGET}" || die "emake failed"
+	emake ${TACHYON_MAKE_TARGET} || die "emake failed"
 }
 
 src_install() {
 	cd ..
-	dodoc Changes README
+	dodoc Changes README || die "dodoc failed"
 
 	if use doc ; then
-		dohtml docs/tachyon/*
+		dohtml docs/tachyon/* || die "dohtml failed"
 	fi
 
-	cd "compile/${TACHYON_MAKE_TARGET}"
+	cd compile/${TACHYON_MAKE_TARGET}
 
-	dobin tachyon
-	dolib libtachyon.a
+	dobin tachyon || die "dobin failed"
+	dolib libtachyon.a || die "dolib failed"
 
 	if use examples; then
 		cd "${S}/../scenes"
 		insinto "/usr/share/${PN}/examples"
-		doins *
+		doins * || die "doins failed"
 	fi
 }