media-gfx/tachyon: Defaulting on USE=opengl, #422815; adding virtual/glu to deps, #444008; drop unnessesary die

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 38 insertions, 22 deletions

diff --git a/media-gfx/tachyon/ChangeLog b/media-gfx/tachyon/ChangeLog
index 63484d27674a..23e3b50103ae 100644
--- a/media-gfx/tachyon/ChangeLog
+++ b/media-gfx/tachyon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/tachyon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/ChangeLog,v 1.7 2012/05/05 07:00:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/ChangeLog,v 1.8 2012/12/06 15:56:25 jlec Exp $
+
+  06 Dec 2012; Justin Lecher <jlec@gentoo.org> tachyon-0.98.9-r2.ebuild,
+  metadata.xml:
+  Defaulting on USE=opengl, #422815; adding virtual/glu to deps, #444008; drop
+  unnessesary die
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> tachyon-0.98.9-r2.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/media-gfx/tachyon/Manifest b/media-gfx/tachyon/Manifest
index 6042314da9fe..a5dd0920dcc6 100644
--- a/media-gfx/tachyon/Manifest
+++ b/media-gfx/tachyon/Manifest
@@ -1,5 +1,15 @@
-AUX 0.98.9-ldflags.patch 939 RMD160 539eb93c29960996a28afb83a50ba1d655e28a87 SHA1 e3ed835ed583b4033dd3a8b345425fb88e4a6eb1 SHA256 e1f38acbfbba9835119b88713064aaefd179a214396ea46a0ae8ee5d44046e28
-DIST tachyon-0.98.9.tar.gz 3273086 RMD160 762abacb3efa4a6560befcdfa17bb4da22053f3a SHA1 a11b512e356d28492a46c964574e1968230ba593 SHA256 c6a3298ded4dc3e9390447819e1dac59b62c3d2d46d4154312ffe71549ee40d7
-EBUILD tachyon-0.98.9-r2.ebuild 2934 RMD160 4105b6a8e241602b26648d2b20bf6212cbaa013b SHA1 5546b1435b71b8909e68e16cd47242665f9c6160 SHA256 73ffa9e10ddd18d6f84de6c145627013afe7d13ba37c97d2274c1f2c731fa572
-MISC ChangeLog 1305 RMD160 641d0c098f13ee141381d60fd4df230dba8a261c SHA1 795f22793840e08e19d8e95ffb13afa5e90d50cd SHA256 ddd104465ee88b2fbeb79f2fcc491d7eced0d31c7d90033cd7bbf37174a276be
-MISC metadata.xml 218 RMD160 c5d041e330d9d9ff361d7951db2ed25a04792dcb SHA1 cb86590d33bc69bd1f5bc4d13ef678cbfeacf286 SHA256 76a4637908a65fd7f6ffafb723f578a4a5e7e040b5f0229a368853284e562a78
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 0.98.9-ldflags.patch 939 SHA256 e1f38acbfbba9835119b88713064aaefd179a214396ea46a0ae8ee5d44046e28 SHA512 a57a66fd72295b74de7ec94bf1a0b4c75fc61c1189bf0c4eb288a274915f72c97c869b60aad167a73d78c7242821e522de22e4de99ab13a3f61367568bfb5acd WHIRLPOOL 3c7210588f055e7f20a6fa8e392106febf6236188f147756cccd636f71b901963203e758d70792be54fe0ad855bf77b4a8e14b1abf069655897c849edb03b5ff
+DIST tachyon-0.98.9.tar.gz 3273086 SHA256 c6a3298ded4dc3e9390447819e1dac59b62c3d2d46d4154312ffe71549ee40d7
+EBUILD tachyon-0.98.9-r2.ebuild 2825 SHA256 cb1b024251b57752d236a34b64e6cc88356f66b477b0474562206a02e95dcf58 SHA512 bf5776a5c5eae38b0368fbfb26445aa4addc7ed6790c08fde9107b3520c7bf45ee2c1f1220bf066e20075723ac20c6d06ee0d77a06325b09ba54d73096fb8a05 WHIRLPOOL bc574e5219146ca3fd72a1e877b34b4b2fcb285e8c5eeeb7d1d780b92613c469f71f7d4d1ee289ed1cc5d165bcdd568f57b81a9ac88af3b48b1630acae5bd441
+MISC ChangeLog 1490 SHA256 9e0f356f5a19070d199464de8f2e67fadbad70cf4b1f098a7d8b2c5ebc234fcc SHA512 0c537859a208d92762d516465d7d7005ae478f5169f11e59d180b80a15c37fc6a498cdb8706919e4d9c00dd5abfaa61cdba93ffdc6cccdda54bb5f94746e6fd4 WHIRLPOOL 1ff3403613bf60eb74b5231c36b3377cbd63f516cf3207094a7f2a51d1edd6785f23c09551477d2234aecf63376266d6ea1e78a78c485a3f87094143c37187b5
+MISC metadata.xml 221 SHA256 988896e2ac41ed44a63362c7f85463fec5b19ac03ea9455e33c2169620a94f1d SHA512 fc2e404dd43de301093a683cea21c7345279672b0f13b1d4a4ad8f8e976770caa6535d2903f2f9f42eb9895566604627f6d3b6b97e820a61fe2b8b5fe647b3cd WHIRLPOOL a2234391324d955a61d67ba198d9122443808a2a4b068ee683b791be22d9997cbccd169012203ba098586b04a61163e49fe3c0d66dceb3be5ab44fbf33148f2d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlDAwCoACgkQgAnW8HDreRYMBgCeNyhh9gnnTMqCSY+Igd8nBgJe
+U34An15DPPz7wPYcFEqoYIhppWaIRdWm
+=avP3
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/tachyon/metadata.xml b/media-gfx/tachyon/metadata.xml
index b492c0347887..d5f29d2ce12a 100644
--- a/media-gfx/tachyon/metadata.xml
+++ b/media-gfx/tachyon/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>alexxy@gentoo.org</email>
-</maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>alexxy@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild b/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild
index 3c0bb9241e5e..eb7243523d3a 100644
--- a/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild
+++ b/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r2.ebuild,v 1.3 2012/05/05 07:00:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild,v 1.4 2012/12/06 15:56:25 jlec Exp $
 
 EAPI="4"
 
@@ -10,14 +10,17 @@ 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="BSD"
 SLOT="0"
+LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos ~x86-macos"
-IUSE="doc examples jpeg mpi opengl png threads"
+IUSE="doc examples jpeg mpi +opengl png threads"
 
-CDEPEND="jpeg? ( virtual/jpeg )
+CDEPEND="
+	jpeg? ( virtual/jpeg )
 	mpi? ( virtual/mpi )
-	opengl? ( virtual/opengl )
+	opengl? (
+		virtual/glu
+		virtual/opengl )
 	png? ( media-libs/libpng )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@@ -99,24 +102,22 @@ src_prepare() {
 }
 
 src_compile() {
-	emake ${TACHYON_MAKE_TARGET} || die "emake failed"
+	emake ${TACHYON_MAKE_TARGET}
 }
 
 src_install() {
 	cd ..
-	dodoc Changes README || die "dodoc failed"
+	dodoc Changes README
 
-	if use doc ; then
-		dohtml docs/tachyon/* || die "dohtml failed"
-	fi
+	use doc && dohtml docs/tachyon/*
 
 	cd compile/${TACHYON_MAKE_TARGET}
 
-	dobin tachyon || die "dobin failed"
+	dobin ${PN}
 
 	if use examples; then
 		cd "${S}/../scenes"
 		insinto "/usr/share/${PN}/examples"
-		doins * || die "doins failed"
+		doins *
 	fi
 }