media-gfx/tachyon: Fix file collisions

Gentoo-Bug: 592576
Gentoo-Bug: 609982

Package-Manager: Portage-2.3.3, Repoman-2.3.1

4 files changed, 4 insertions, 140 deletions

diff --git a/media-gfx/tachyon/Manifest b/media-gfx/tachyon/Manifest
index 6e5fe00b87ec..d77a5f3dc50f 100644
--- a/media-gfx/tachyon/Manifest
+++ b/media-gfx/tachyon/Manifest
@@ -1,2 +1 @@
-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
diff --git a/media-gfx/tachyon/files/0.98.9-ldflags.patch b/media-gfx/tachyon/files/0.98.9-ldflags.patch
deleted file mode 100644
index 99d5b8bfb664..000000000000
--- a/media-gfx/tachyon/files/0.98.9-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/tachyon-0.98.9-r2.ebuild b/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild
deleted file mode 100644
index 9bc8819bcb00..000000000000
--- a/media-gfx/tachyon/tachyon-0.98.9-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-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"
-
-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"
-
-# TODO: Test on alpha, ia64, ppc
-# TODO: add other architectures
-# TODO: X, Motif, MBOX, Open Media Framework, Spaceball I/O, MGF ?
-
-TACHYON_MAKE_TARGET=
-
-pkg_setup() {
-	local ostarget
-	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() {
-	if use jpeg ; then
-		sed -i \
-			-e "s:USEJPEG=:USEJPEG=-DUSEJPEG:g" \
-			-e "s:JPEGLIB=:JPEGLIB=-ljpeg:g" Make-config \
-			|| die "sed failed"
-	fi
-
-	if use png ; then
-		sed -i \
-			-e "s:USEPNG=:USEPNG=-DUSEPNG:g" \
-			-e "s:PNGINC=:PNGINC=$(pkg-config libpng --cflags):g" \
-			-e "s:PNGLIB=:PNGLIB=$(pkg-config libpng --libs):g" Make-config \
-			|| die "sed failed"
-	fi
-
-	if use mpi ; then
-		sed -i "s:MPIDIR=:MPIDIR=/usr:g" Make-config || die "sed failed"
-		sed -i "s:linux-lam:linux-mpi:g" 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}"/${PV}-ldflags.patch
-}
-
-src_compile() {
-	emake ${TACHYON_MAKE_TARGET}
-}
-
-src_install() {
-	cd ..
-	dodoc Changes README
-
-	use doc && dohtml docs/tachyon/*
-
-	cd compile/${TACHYON_MAKE_TARGET}
-
-	dobin ${PN}
-
-	if use examples; then
-		cd "${S}/../scenes"
-		insinto "/usr/share/${PN}/examples"
-		doins *
-	fi
-}
diff --git a/media-gfx/tachyon/tachyon-0.99_beta6.ebuild b/media-gfx/tachyon/tachyon-0.99_beta6-r1.ebuild
index 26203a4f3ca4..d34193803da2 100644
--- a/media-gfx/tachyon/tachyon-0.99_beta6.ebuild
+++ b/media-gfx/tachyon/tachyon-0.99_beta6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils toolchain-funcs
 
@@ -106,6 +106,7 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-ldflags.patch \
 		"${FILESDIR}"/${P}-shared.patch
+	eapply_user
 }
 
 src_compile() {
@@ -117,7 +118,7 @@ src_install() {
 	dodoc Changes README
 
 	insinto /usr/include/${PN}
-	doheader src/*.h
+	doins src/*.h
 
 	use doc && dohtml docs/tachyon/*