gentoo resync : 28.04.2021

5 files changed, 2 insertions, 331 deletions

diff --git a/media-gfx/tachyon/Manifest b/media-gfx/tachyon/Manifest
index 17a7139da245..73a9943d5a40 100644
--- a/media-gfx/tachyon/Manifest
+++ b/media-gfx/tachyon/Manifest
@@ -1,8 +1,5 @@
-AUX tachyon-0.99_beta6-ldflags.patch 939 BLAKE2B e0c96b6e46fe53e58eba7077a76003d06543c6d95714b49977bc2eb130f327758e82c1b93bbc436baf1d467b5d870a1636483ec1db747692d27f052a270f3506 SHA512 a57a66fd72295b74de7ec94bf1a0b4c75fc61c1189bf0c4eb288a274915f72c97c869b60aad167a73d78c7242821e522de22e4de99ab13a3f61367568bfb5acd
 AUX tachyon-0.99_beta6-r2-ldflags.patch 856 BLAKE2B 5d8587eac987a66758f0314afb5bba620fbbb99b32d295e4deb649a929ac19afd52c835f375d72bd2284b3cd4d9185c272090d2a27d06ea0220d1c59b03bb995 SHA512 2807689e3bad156d3d54a0f4dce5e6aaf7555750c6650aa3957bd3ae51922ed3f8489534528de45c22d75db85450340d674a621e608668cde972df12c03a63b0
 AUX tachyon-0.99_beta6-r2-shared.patch 8043 BLAKE2B 6d559c22477de0e3148e374a8db2faa1e8249d0599409f9d8cfc843d06c1960639f74797414328c40a7fa46c9143cefb208ab68f4d47e3c0b8fd0dbde1ea951d SHA512 eb9c2e43c679030b410d5f9077e85969ee9ec3926f7c44eb9047c902f5834dd4734af3f07105f116b4dc23c0d420f87d67193a759d329810ca168ac4a28f95ad
-AUX tachyon-0.99_beta6-shared.patch 8065 BLAKE2B 7336cf23288d2a20df3ab8373508b3720b6ac2e381987a645aded0c5d189bbe73d8e12211f36ea4fc0256de662cd7b2b51eee03fdce6daa195f504eaa1e1cf5e SHA512 535a3e6524d6d788e1eabf73fb5cd1bbbb2cbc6fb32294895762cf2405360c40861b1813b3b15bea6f28577595bffd84607997a9964bd743722b003acc1dfd17
 DIST tachyon-0.99b6.tar.gz 2981568 BLAKE2B 69e96362d5914db7cfeaf36a7c0fc57ebe2bff07c6c2c4b13107edb17146577df73ad7dbf740d402e322f1fb2df9cde79e634170ecd9d49037beb678de42df83 SHA512 4d0d707bf46528b87bfe1a05f490f40bcbee8f21271c5212247d4fd25956a27ad8a40b4621817a3f1c03495f1ba9eeb99b152929fdcd92c7118a35ef116f3f33
-EBUILD tachyon-0.99_beta6-r1.ebuild 2770 BLAKE2B 97f621974a5b750bb6b3d2c121fb4e2c0304038a4eccf0952dd1cbb1a451f181f84905072aa4f8854453e89189f37b2be63c8c2d4036f4d137110dc943af226f SHA512 bc878fed95bcbd9d193426dd5252ec80ba508e36adcae36418478fab596794c792aa2afbc1005327a8fec2a680408bca0745f869e2ad0693eda983b2a5fd53d2
-EBUILD tachyon-0.99_beta6-r2.ebuild 2540 BLAKE2B c8ff5b64f22c954e3a8488c5b21c5a54b5087dfb85c4aab43ebd5831997b252b4f6fa5c7863c1f9647a3e0482b1ea8a6a024acf632d6afa1c722e388e048142e SHA512 5a8cdcbecf01a4c02aa42467c9a0feb39b4a45224b94103418764b846c7c693e48cc078b2b2037f6d193d81ea82db5e8a5b81292f900f119a506d206ee0eeb13
+EBUILD tachyon-0.99_beta6-r2.ebuild 2533 BLAKE2B 0b7ab33bba057b75b772dcacb5a6122526ed1e0a09b92f7e256755ece2374894667dd8fb6844dc5a8aafaf3e95e6943a2a9af534655991a37a0e543fc45f46a1 SHA512 4236ae35aff704933cb75a603eeb9b103754deb38a250d96532c8913106e93fc878b1867d5db57d7a300ee677b865b7e738fca14401e4925b05950591285e990
 MISC metadata.xml 339 BLAKE2B 342dd48842a409d4be459fcfd339f485ed05f838cf9dfe4d3f5695cee5ca0dc3f09623c4b4adddc1661b02ae5f066e11b97551ec0ef0771269fd89972ebda7ad SHA512 ceba0ae3ec140c4efe0d1708243954fb3bc9804109727610079712a5ce91f5133197e61a2c3bb4dcfd6f743dcfcbc829cc68f5def0b2aa023e3eeb5dfa09a68a
diff --git a/media-gfx/tachyon/files/tachyon-0.99_beta6-ldflags.patch b/media-gfx/tachyon/files/tachyon-0.99_beta6-ldflags.patch
deleted file mode 100644
index 99d5b8bfb664..000000000000
--- a/media-gfx/tachyon/files/tachyon-0.99_beta6-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index dd23fe301675..000000000000
--- a/media-gfx/tachyon/files/tachyon-0.99_beta6-shared.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-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/tachyon-0.99_beta6-r1.ebuild b/media-gfx/tachyon/tachyon-0.99_beta6-r1.ebuild
deleted file mode 100644
index 906476b0c400..000000000000
--- a/media-gfx/tachyon/tachyon-0.99_beta6-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-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
-	eapply_user
-}
-
-src_compile() {
-	emake ${TACHYON_MAKE_TARGET} "${emakeconf[@]}" VERSION=${PV}
-}
-
-src_install() {
-	cd .. || die
-	dodoc Changes README
-
-	insinto /usr/include/${PN}
-	doins 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
-}
diff --git a/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild b/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
index bb7b5300a850..73976dc2018e 100644
--- a/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
+++ b/media-gfx/tachyon/tachyon-0.99_beta6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_PV="${PV/_beta/b}"
 MY_P="${PN}-${MY_PV}"