Version BUmp

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

7 files changed, 369 insertions, 20 deletions

diff --git a/media-gfx/tachyon/ChangeLog b/media-gfx/tachyon/ChangeLog
index 23e3b50103ae..a7f5cd0f5d49 100644
--- a/media-gfx/tachyon/ChangeLog
+++ b/media-gfx/tachyon/ChangeLog
@@ -1,6 +1,14 @@
 # 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.8 2012/12/06 15:56:25 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/ChangeLog,v 1.9 2015/03/06 08:01:42 jlec Exp $
+
+*tachyon-0.99_beta6 (06 Mar 2015)
+
+  06 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  +files/tachyon-0.99_beta6-ldflags.patch,
+  +files/tachyon-0.99_beta6-shared.patch, +tachyon-0.99_beta6.ebuild,
+  metadata.xml, tachyon-0.98.9-r2.ebuild:
+  Version BUmp
 
   06 Dec 2012; Justin Lecher <jlec@gentoo.org> tachyon-0.98.9-r2.ebuild,
   metadata.xml:
@@ -39,4 +47,3 @@
   23 Feb 2010; Alexey Shvetsov <alexxy@gentoo.org> +tachyon-0.98.9.ebuild,
   +metadata.xml:
   Initial import per bug #293969
-
diff --git a/media-gfx/tachyon/Manifest b/media-gfx/tachyon/Manifest
index a5dd0920dcc6..bc35fb3439f9 100644
--- a/media-gfx/tachyon/Manifest
+++ b/media-gfx/tachyon/Manifest
@@ -1,15 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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
+AUX tachyon-0.99_beta6-ldflags.patch 939 SHA256 e1f38acbfbba9835119b88713064aaefd179a214396ea46a0ae8ee5d44046e28 SHA512 a57a66fd72295b74de7ec94bf1a0b4c75fc61c1189bf0c4eb288a274915f72c97c869b60aad167a73d78c7242821e522de22e4de99ab13a3f61367568bfb5acd WHIRLPOOL 3c7210588f055e7f20a6fa8e392106febf6236188f147756cccd636f71b901963203e758d70792be54fe0ad855bf77b4a8e14b1abf069655897c849edb03b5ff
+AUX tachyon-0.99_beta6-shared.patch 8065 SHA256 839f49108fb45d69aac09e4989bca9d667b1f374dab970a171c567c68a6de9ec SHA512 535a3e6524d6d788e1eabf73fb5cd1bbbb2cbc6fb32294895762cf2405360c40861b1813b3b15bea6f28577595bffd84607997a9964bd743722b003acc1dfd17 WHIRLPOOL 4240de75abc404df1ab0550ee1dcaad00235712c2636e84f5eb66a2fb225e925fd559768d0a393c336a4e4afeda8e398ee5fa7d1654c89d8bf7ffc05cefb9081
+DIST tachyon-0.98.9.tar.gz 3273086 SHA256 c6a3298ded4dc3e9390447819e1dac59b62c3d2d46d4154312ffe71549ee40d7 SHA512 b314914ed0e0f547ab5392f23a008adc208a4d541b0d4bfe571325abe7ba9927b208df8be1b0fd62bda5513b4c050b31e2fb0785c171b1f2645415cecb7f8ce9 WHIRLPOOL 9e1e5ac2139159697addeb704b78367cff86dc7ffc64135cc496e2ee1ca983e3f579171cb432a02ed5cd9246fb18f066c777607fc00368aac9c788f16fcbc30e
+DIST tachyon-0.99b6.tar.gz 2981568 SHA256 f4dcaf9c76a4f49310f56254390f9611c22e353947a1745a8c623e8bc8119b97 SHA512 4d0d707bf46528b87bfe1a05f490f40bcbee8f21271c5212247d4fd25956a27ad8a40b4621817a3f1c03495f1ba9eeb99b152929fdcd92c7118a35ef116f3f33 WHIRLPOOL b8f12422ff2ca0199b37f12cd4dde09401e7c7d5aa238b8f16f742d34af382e613cf91d1e6e2827dfc585b46ade56ec100fcad9d625a3e6c32882549b6fcb490
+EBUILD tachyon-0.98.9-r2.ebuild 2829 SHA256 1a24cdef49f43ff44b5f907707bc812cf1a00f3d9e17c8ae9f2c3a5c130a17f3 SHA512 118f12b8591bc08b395fa50ae7679c59d4f72a9543f2a09dc4ee88d276d01c66ccc3d95e66825a854cd2237ed6842ab8fd0f1ac81b1798e6e133be7cd1b86f3e WHIRLPOOL 34d33ffe960c660784d302e11fea7fc9fdd3e08799c885d2ba24f4f93de2565809350a4238644f43e7cb06318b2435c0e73676e41b250f001cb26925d1f6c8de
+EBUILD tachyon-0.99_beta6.ebuild 2888 SHA256 644ad1283d966eda21dc5863ea4d1c89be0cc0e51bbc7b10735a0bde23b97063 SHA512 615b11f96f37b482ebd9a631a338d582a50a33ed1325994243d5515e1f08139d55ead9f9d92b8659979ecdb2c09c796c8a590ba64461c3abb78bbe5ad7b1a608 WHIRLPOOL 5ce7e3b8dd75138ef3a8acbbc953f2d7da6eb0c906dce56c5b9c62c24d39982c3742b797021338e92bff08614bb4f25ef6ab43104e48dd522bcf05fc42deef35
+MISC ChangeLog 1742 SHA256 0779344c569ee7d9ad585ab248d75362405cafc154646f49261dd5a077f47aee SHA512 ceb5a6adc5447d7e672aeb582e39ce3b4ce07b4706f2060a312f6df6dc8705fb3690a43eac5f1cdfce9916699653ffcd66172d2a3563ae0f19c83594553134aa WHIRLPOOL 2cca2ec1f47169f1a3fa82c1240b7dcd64a8606fdd7ee9d9ea1eac8e2fd5af679ae301b49024c93feb3d2147975c42ceb77c0e98dcae50b8c9546adb04b9084d
+MISC metadata.xml 226 SHA256 a5edc3e8ac218bf052222d44a3e92525372a69adfd4c249ed7de62e4d1c463c9 SHA512 4e5f9194554a19b1c0eaf2ace51883fcf8e41298f677a50c96ed9b88966d0405d4f23a3418157bda547e6e59c1c18294aa9fe14c48cc564c7a2fdb9b49d60345 WHIRLPOOL d140b42bafd765270a86b20a5b9da9a3c42e9b50902ef409233950c4845947cf1fe85b6b47febdf70cefe271c7291408be48f054df7909a5692850d825d3b554
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlDAwCoACgkQgAnW8HDreRYMBgCeNyhh9gnnTMqCSY+Igd8nBgJe
-U34An15DPPz7wPYcFEqoYIhppWaIRdWm
-=avP3
+iQJ8BAEBCgBmBQJU+V7nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirglIQAKSMhP4dc4RizSwdFCuWjPy1
+MDt7NT95OaGiOUnn6Flq+o5gxjoFxCyqQPG3ClP/ApefwPLJP4JFHUFheGB9umTS
+Z7ciw9EumK3x52Q3/QQHb3wfXV7wchvr3LKBOnoZuDnAhmqPHz3x8tuX9V46uluH
+ENTa+q3S4C1g1gDrq6epwTA6NhLsReOFnAnrPG3kkAt7veccxt652T0/dmOS8sfb
+qUSGGkTSHi6pBVib1TrtnMRdkmmxs2a4fOPYtNTxq6XIIta0+A1la3Si6xKmP1RA
+inNLni/uSqzKJYDTZIdAeQm1Ude9jVso+2trOtFEGJOpICgDC/2AcCdNgJgxeRfm
+KnWCsWm/zFAl74x9InNirU2Oewv+r/SNdxsJOs+L15U38jZfu7FKjsm2793ZQoMJ
+R/1zhBfxLVHKfdLmbOPz35mdDKzJgFpltHOxu8LRk6uywXN0nCkXLAciGntSfD7U
+GyGV+LpvP0K5/UpOOeRkgyO1gdIs0+siKrHPoX0bZvxRCgTxzmlQOP8pMrFrcy2c
+JTdVEGefUHP2BDiYo1ztUtEwvYN37ozu97Xb39ufxtS0AbGNtbn3cGLAHd2ah05P
+pE4hzE70OWybk0stiCE6hQvsVMhJiDAtCzwWs904UhDfDLhsiH0ZOvvnyLD2uS/r
+4k4tNhbDQCUwVevTkUvO
+=K73p
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/tachyon/files/tachyon-0.99_beta6-ldflags.patch b/media-gfx/tachyon/files/tachyon-0.99_beta6-ldflags.patch
new file mode 100644
index 000000000000..99d5b8bfb664
--- /dev/null
+++ b/media-gfx/tachyon/files/tachyon-0.99_beta6-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/unix/Makefile b/unix/Makefile
+index 8dd0846..d2fe1ac 100644
+--- a/unix/Makefile
++++ b/unix/Makefile
+@@ -121,7 +121,7 @@ ${MGFLIB} : ../libmgf/Makefile
+ 	};
+ 
+ ${ARCHDIR}/tachyon : ${RAYLIB} ${PARSELIB} ${OBJDIR}/main.o ${OBJDIR}/getargs.o ${OBJDIR}/parse.o ${OBJDIR}/nffparse.o ${OBJDIR}/glwin.o ${OBJDIR}/spaceball.o ${OBJDIR}/trackball.o ${PARSEOBJS} 
+-	${CC} ${CFLAGS} ${DEMOINC} -o ${ARCHDIR}/tachyon ${OBJDIR}/main.o ${OBJDIR}/getargs.o ${OBJDIR}/parse.o ${OBJDIR}/nffparse.o ${OBJDIR}/glwin.o ${OBJDIR}/spaceball.o ${OBJDIR}/trackball.o ${PARSEOBJS} -L${RAYLIBDIR} ${PARSELIBS} ${LIBS}
++	${CC} ${CFLAGS} ${LDFLAGS} ${DEMOINC} -o ${ARCHDIR}/tachyon ${OBJDIR}/main.o ${OBJDIR}/getargs.o ${OBJDIR}/parse.o ${OBJDIR}/nffparse.o ${OBJDIR}/glwin.o ${OBJDIR}/spaceball.o ${OBJDIR}/trackball.o ${PARSEOBJS} -L${RAYLIBDIR} ${PARSELIBS} ${LIBS}
+ 	${STRIP} ${ARCHDIR}/tachyon
+ 
+ ${ARCHDIR}/animray : ${RAYLIB} ${OBJDIR}/mainanim.o
diff --git a/media-gfx/tachyon/files/tachyon-0.99_beta6-shared.patch b/media-gfx/tachyon/files/tachyon-0.99_beta6-shared.patch
new file mode 100644
index 000000000000..dd23fe301675
--- /dev/null
+++ b/media-gfx/tachyon/files/tachyon-0.99_beta6-shared.patch
@@ -0,0 +1,179 @@
+diff -up tachyon/unix/Makefile.shared tachyon/unix/Makefile
+--- tachyon/unix/Makefile.shared	2011-02-07 16:14:38.000000000 +0100
++++ tachyon/unix/Makefile	2011-07-23 20:23:51.000000000 +0200
+@@ -22,7 +22,7 @@ OBJDIR=${ARCHDIR}/libtachyon
+ #
+ # Name of raytracing library file to create
+ #
+-RAYLIB=${ARCHDIR}/libtachyon.a
++RAYLIB=${ARCHDIR}/libtachyon.so
+ RAYLIBDIR=${ARCHDIR}
+ 
+ #
+@@ -251,124 +251,125 @@ RAYOBJS= ${OBJDIR}/api.o \
+ 	${OBJDIR}/tgafile.o \
+ 	${OBJDIR}/winbmp.o
+ 
++VERSION=$(shell grep TACHYON_VERSION_STRING ../src/tachyon.h | cut -d\" -f 2)
++${RAYLIB} : DIRNAME=tachyon-${VERSION}
+ ${RAYLIB} : ${RAYOBJS}
+-	rm -f ${RAYLIB}
+-	${AR} ${ARFLAGS} ${RAYLIB} ${RAYOBJS}
+-	${RANLIB} ${RAYLIB}
++	${CC} ${LDFLAGS} -shared -Wl,-soname,libtachyon.so.${VERSION} -o ${RAYLIBDIR}/libtachyon.so.${VERSION} ${CFLAGS} -fPIC ${RAYOBJS} ${PNGLIB} -lm -lpthread ${JPEGLIB}
++	ln -s libtachyon.so.${VERSION} ${RAYLIBDIR}/libtachyon.so
+ 
+ ${OBJDIR}/vol.o : ${SRCDIR}/vol.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vol.c -o ${OBJDIR}/vol.o
+ 
+ ${OBJDIR}/extvol.o : ${SRCDIR}/extvol.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/extvol.c -o ${OBJDIR}/extvol.o
+ 
+ ${OBJDIR}/winbmp.o : ${SRCDIR}/winbmp.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/winbmp.c -o ${OBJDIR}/winbmp.o
+ 
+ ${OBJDIR}/vector.o : ${SRCDIR}/vector.c ${OBJDEPS} 
+-	${CC} ${CFLAGS} -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/vector.c -o ${OBJDIR}/vector.o
+ 
+ ${OBJDIR}/triangle.o : ${SRCDIR}/triangle.c ${OBJDEPS} ${SRCDIR}/triangle.h
+-	${CC} ${CFLAGS} -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/triangle.c -o ${OBJDIR}/triangle.o
+ 
+ ${OBJDIR}/trace.o : ${SRCDIR}/trace.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/trace.c -o ${OBJDIR}/trace.o
+ 
+ ${OBJDIR}/threads.o : ${SRCDIR}/threads.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/threads.c -o ${OBJDIR}/threads.o
+ 
+ ${OBJDIR}/tgafile.o : ${SRCDIR}/tgafile.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/tgafile.c -o ${OBJDIR}/tgafile.o
+ 
+ ${OBJDIR}/util.o : ${SRCDIR}/util.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/util.c -o ${OBJDIR}/util.o
+ 
+ ${OBJDIR}/ui.o : ${SRCDIR}/ui.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ui.c -o ${OBJDIR}/ui.o
+ 
+ ${OBJDIR}/texture.o : ${SRCDIR}/texture.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/texture.c -o ${OBJDIR}/texture.o
+ 
+ ${OBJDIR}/sphere.o : ${SRCDIR}/sphere.c ${OBJDEPS} ${SRCDIR}/sphere.h
+-	${CC} ${CFLAGS} -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sphere.c -o ${OBJDIR}/sphere.o
+ 
+ ${OBJDIR}/sgirgb.o : ${SRCDIR}/sgirgb.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/sgirgb.c -o ${OBJDIR}/sgirgb.o
+ 
+ ${OBJDIR}/shade.o : ${SRCDIR}/shade.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/shade.c -o ${OBJDIR}/shade.o
+ 
+ ${OBJDIR}/ring.o : ${SRCDIR}/ring.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ring.c -o ${OBJDIR}/ring.o
+ 
+ ${OBJDIR}/render.o : ${SRCDIR}/render.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/render.c -o ${OBJDIR}/render.o
+ 
+ ${OBJDIR}/quadric.o : ${SRCDIR}/quadric.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/quadric.c -o ${OBJDIR}/quadric.o
+ 
+ ${OBJDIR}/jpeg.o : ${SRCDIR}/jpeg.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/jpeg.c -o ${OBJDIR}/jpeg.o
+ 
+ ${OBJDIR}/pngfile.o : ${SRCDIR}/pngfile.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/pngfile.c -o ${OBJDIR}/pngfile.o
+ 
+ ${OBJDIR}/ppm.o : ${SRCDIR}/ppm.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/ppm.c -o ${OBJDIR}/ppm.o
+ 
+ ${OBJDIR}/psd.o : ${SRCDIR}/psd.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/psd.c -o ${OBJDIR}/psd.o
+ 
+ ${OBJDIR}/plane.o : ${SRCDIR}/plane.c ${OBJDEPS} ${SRCDIR}/plane.h
+-	${CC} ${CFLAGS} -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/plane.c -o ${OBJDIR}/plane.o
+ 
+ ${OBJDIR}/parallel.o : ${SRCDIR}/parallel.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/parallel.c -o ${OBJDIR}/parallel.o
+ 
+ ${OBJDIR}/objbound.o : ${SRCDIR}/objbound.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/objbound.c -o ${OBJDIR}/objbound.o
+ 
+ ${OBJDIR}/light.o : ${SRCDIR}/light.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/light.c -o ${OBJDIR}/light.o
+ 
+ ${OBJDIR}/intersect.o : ${SRCDIR}/intersect.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/intersect.c -o ${OBJDIR}/intersect.o
+ 
+ ${OBJDIR}/imageio.o : ${SRCDIR}/imageio.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imageio.c -o ${OBJDIR}/imageio.o
+ 
+ ${OBJDIR}/imap.o : ${SRCDIR}/imap.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/imap.c -o ${OBJDIR}/imap.o
+ 
+ ${OBJDIR}/grid.o : ${SRCDIR}/grid.c ${SRCDIR}/grid.h ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/grid.c -o ${OBJDIR}/grid.o
+ 
+ ${OBJDIR}/global.o : ${SRCDIR}/global.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/global.c -o ${OBJDIR}/global.o
+ 
+ ${OBJDIR}/hash.o : ${SRCDIR}/hash.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/hash.c -o ${OBJDIR}/hash.o
+ 
+ ${OBJDIR}/cylinder.o : ${SRCDIR}/cylinder.c ${OBJDEPS} ${SRCDIR}/cylinder.h
+-	${CC} ${CFLAGS} -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/cylinder.c -o ${OBJDIR}/cylinder.o
+ 
+ ${OBJDIR}/coordsys.o : ${SRCDIR}/coordsys.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/coordsys.c -o ${OBJDIR}/coordsys.o
+ 
+ ${OBJDIR}/camera.o : ${SRCDIR}/camera.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/camera.c -o ${OBJDIR}/camera.o
+ 
+ ${OBJDIR}/box.o : ${SRCDIR}/box.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/box.c -o ${OBJDIR}/box.o
+ 
+ ${OBJDIR}/bndbox.o : ${SRCDIR}/bndbox.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/bndbox.c -o ${OBJDIR}/bndbox.o
+ 
+ ${OBJDIR}/apigeom.o : ${SRCDIR}/apigeom.c ${OBJDEPS}
+-	${CC} ${CFLAGS} -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/apigeom.c -o ${OBJDIR}/apigeom.o
+ 
+ ${OBJDIR}/api.o : ${SRCDIR}/api.c ${OBJDEPS} ${SRCDIR}/sphere.h ${SRCDIR}/plane.h ${SRCDIR}/triangle.h ${SRCDIR}/cylinder.h
+-	${CC} ${CFLAGS} -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o
++	${CC} ${CFLAGS} -fPIC -c ${SRCDIR}/api.c -o ${OBJDIR}/api.o
+ 
+ clean :
+ 	@echo "Cleaning object files, binaries etc."
diff --git a/media-gfx/tachyon/metadata.xml b/media-gfx/tachyon/metadata.xml
index d5f29d2ce12a..e7b28c02178f 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 eb7243523d3a..1279983cca68 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
+# Copyright 1999-2015 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.4 2012/12/06 15:56:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild,v 1.5 2015/03/06 08:01:42 jlec Exp $
 
 EAPI="4"
 
@@ -16,12 +16,12 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos ~x86-macos"
 IUSE="doc examples jpeg mpi +opengl png threads"
 
 CDEPEND="
-	jpeg? ( virtual/jpeg )
+	jpeg? ( virtual/jpeg:0 )
 	mpi? ( virtual/mpi )
 	opengl? (
 		virtual/glu
 		virtual/opengl )
-	png? ( media-libs/libpng )"
+	png? ( media-libs/libpng:0 )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}"
diff --git a/media-gfx/tachyon/tachyon-0.99_beta6.ebuild b/media-gfx/tachyon/tachyon-0.99_beta6.ebuild
new file mode 100644
index 000000000000..9c4c47bed01e
--- /dev/null
+++ b/media-gfx/tachyon/tachyon-0.99_beta6.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/tachyon-0.99_beta6.ebuild,v 1.1 2015/03/06 08:01:42 jlec Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+MY_PV=${PV/_beta/b}
+MY_P="${PN}-${MY_PV}"
+
+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/${MY_PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~x86 ~x64-macos ~x86-macos"
+IUSE="doc examples jpeg mpi +opengl png threads"
+
+CDEPEND="
+	jpeg? ( virtual/jpeg:0= )
+	mpi? ( virtual/mpi )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		)
+	png? ( media-libs/libpng:0= )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="^^ ( opengl mpi )"
+
+S="${WORKDIR}/${PN}/unix"
+
+pkg_setup() {
+	local ostarget
+
+	# TODO: Test on alpha, ia64
+	# TODO: add other architectures
+	# TODO: X, Motif, MBOX, Open Media Framework, Spaceball I/O, MGF ?
+	TACHYON_MAKE_TARGET=
+
+	case ${CHOST} in
+		powerpc*-darwin*)   ostarget=macosx      ;;
+		*86*-darwin*)       ostarget=macosx-x86  ;;
+		*)					ostarget=linux       ;;
+	esac
+
+	if use threads ; then
+		if use opengl ; then
+			TACHYON_MAKE_TARGET=${ostarget}-thr-ogl
+		elif use mpi ; then
+			TACHYON_MAKE_TARGET=${ostarget}-mpi-thr
+		else
+			TACHYON_MAKE_TARGET=${ostarget}-thr
+		fi
+
+		# TODO: Support for linux-athlon-thr ?
+	else
+		if use mpi ; then
+			TACHYON_MAKE_TARGET=${ostarget}-mpi
+		else
+			TACHYON_MAKE_TARGET=${ostarget}
+		fi
+	fi
+
+	if [[ -z "${TACHYON_MAKE_TARGET}" ]]; then
+		die "No target found, check use flags"
+	else
+		einfo "Using target: ${TACHYON_MAKE_TARGET}"
+	fi
+}
+
+src_prepare() {
+	emakeconf=()
+	use jpeg && \
+		emakeconf+=(
+			USEJPEG=-DUSEJPEG
+			JPEGLIB=-ljpeg
+		)
+
+	use png && \
+		emakeconf+=(
+			USEPNG=-DUSEPNG
+			PNGINC="$($(tc-getPKG_CONFIG) --cflags libpng)"
+			PNGLIB="$($(tc-getPKG_CONFIG) --libs libpng)"
+			)
+
+	if use mpi ; then
+		sed \
+			-e "s:MPIDIR=:MPIDIR=/usr:g" \
+			-e "s:linux-lam:linux-mpi:g" \
+			-i Make-config || die "sed failed"
+	fi
+	sed -i \
+		-e "s:-O3::g;s:-g::g;s:-pg::g" \
+		-e "s:-m32:${CFLAGS}:g" \
+		-e "s:-m64:${CFLAGS}:g" \
+		-e "s:-ffast-math::g" \
+		-e "s:STRIP = strip:STRIP = touch:g" \
+		-e "s:CC = *cc:CC = $(tc-getCC):g" \
+		-e "s:-fomit-frame-pointer::g" Make-arch || die "sed failed"
+
+	epatch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-shared.patch
+}
+
+src_compile() {
+	emake ${TACHYON_MAKE_TARGET} ${emakeconf[@]} VERSION=${PV}
+}
+
+src_install() {
+	cd .. || die
+	dodoc Changes README
+
+	insinto /usr/include/${PN}
+	doheader src/*.h
+
+	use doc && dohtml docs/tachyon/*
+
+	cd compile/${TACHYON_MAKE_TARGET} || die
+
+	dobin ${PN}
+	dolib.so lib${PN}.so*
+
+	if use examples; then
+		cd "${S}/../scenes" || die
+		insinto "/usr/share/${PN}/examples"
+		doins *
+	fi
+}