Stop stripping by buildsystem, #314955; do not install static lib, #315225; respect LDFLAGS

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

4 files changed, 151 insertions, 5 deletions

diff --git a/media-gfx/tachyon/ChangeLog b/media-gfx/tachyon/ChangeLog
index f036fd202dc3..0f66c733b262 100644
--- a/media-gfx/tachyon/ChangeLog
+++ b/media-gfx/tachyon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/tachyon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/ChangeLog,v 1.2 2010/03/11 19:32:40 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tachyon/ChangeLog,v 1.3 2010/04/16 20:58:16 jlec Exp $
+
+*tachyon-0.98.9-r1 (16 Apr 2010)
+
+  16 Apr 2010; Justin Lecher <jlec@gentoo.org> +files/0.98.9-ldflags.patch,
+  +tachyon-0.98.9-r1.ebuild:
+  Stop stripping by buildsystem, #314955; do not install static lib,
+  #315225; respect LDFLAGS
 
   11 Mar 2010; Joseph Jezak <josejx@gentoo.org> tachyon-0.98.9.ebuild:
   Marked ~ppc for bug #306549.
diff --git a/media-gfx/tachyon/Manifest b/media-gfx/tachyon/Manifest
index a8c64a451b2b..869d6b6de98e 100644
--- a/media-gfx/tachyon/Manifest
+++ b/media-gfx/tachyon/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+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-r1.ebuild 3044 RMD160 01123c6127d9beefdd836cf9f4fe2798993fca66 SHA1 a6c61b225bc4f0909b5ce508eef0865a56ed5353 SHA256 37bcc97c67e81b07d52df3ddc64b4e20fb717c5044952f71ae2e3ecd0a2ea26e
 EBUILD tachyon-0.98.9.ebuild 2944 RMD160 a891423cc4828cf740b1b2beb74cf02f4283c8d2 SHA1 ab86dcde83685b64c6d54c6671ad2e979f48daaf SHA256 b9187e94f57a2d9c08d2e93cc29198865729e4056077409910cc79bffc8e6692
-MISC ChangeLog 467 RMD160 00e213528f0cd0782d1333fcbe91c248b02dfab1 SHA1 13fac2ae29e4403de470f43f81e99089d82f47f1 SHA256 498182ee5c349f01d0cfe5ebf84b3e1a944dbc67f5d86ac45465427e474b45f1
+MISC ChangeLog 701 RMD160 b78fbfc07aba71918daba4dc22afc021d0540cc8 SHA1 12e10457ef5a76d0c4832cd048f2377fd023c2db SHA256 1e8bc64b35a08a7dd1cb447dd172c9d9ba274023f3a6db0833f10e43885aca16
 MISC metadata.xml 218 RMD160 c5d041e330d9d9ff361d7951db2ed25a04792dcb SHA1 cb86590d33bc69bd1f5bc4d13ef678cbfeacf286 SHA256 76a4637908a65fd7f6ffafb723f578a4a5e7e040b5f0229a368853284e562a78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuZRUEACgkQcsIHjyDViGQ9NgCfRPiqkk3H/9YOjqKy4Vl9iI9A
-6bwAnjyikJrleSe52IrORfjAwBhzhXJK
-=0PLr
+iEYEARECAAYFAkvIz24ACgkQgAnW8HDreRazhwCgsrB9D7l/vQsnN65rjpbifLYu
+rBYAnjDDoZ400OcELOPmfa7dDFveZ1jb
+=zyWx
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/tachyon/files/0.98.9-ldflags.patch b/media-gfx/tachyon/files/0.98.9-ldflags.patch
new file mode 100644
index 000000000000..99d5b8bfb664
--- /dev/null
+++ b/media-gfx/tachyon/files/0.98.9-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/tachyon-0.98.9-r1.ebuild b/media-gfx/tachyon/tachyon-0.98.9-r1.ebuild
new file mode 100644
index 000000000000..7349071ef3b0
--- /dev/null
+++ b/media-gfx/tachyon/tachyon-0.98.9-r1.ebuild
@@ -0,0 +1,124 @@
+# 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-r1.ebuild,v 1.1 2010/04/16 20:58:16 jlec Exp $
+
+EAPI="2"
+
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples jpeg mpi opengl png threads"
+
+CDEPEND="jpeg? ( media-libs/jpeg )
+	mpi? ( virtual/mpi )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng )"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${PN}/unix"
+
+# TODO: Test on alpha, ia64, ppc
+# TODO: MPI: Depend on lam or virtual ? Test MPI
+# TODO: Check for threads dependencies
+# TODO: add other architectures
+# TODO: X, Motif, MBOX, Open Media Framework, Spaceball I/O, MGF ?
+
+TACHYON_MAKE_TARGET=
+
+pkg_setup() {
+	if use threads ; then
+		if use opengl ; then
+			TACHYON_MAKE_TARGET=linux-thr-ogl
+			if use mpi ; then
+				die "tachyon does not support MPI with OpenGL and threads"
+			fi
+		elif use mpi ; then
+			TACHYON_MAKE_TARGET=linux-mpi-thr
+		else
+			TACHYON_MAKE_TARGET=linux-thr
+		fi
+
+		# TODO: Support for linux-athlon-thr ?
+	else
+		if use opengl ; then
+			# TODO: Support target: linux-lam-64-ogl
+
+			die "OpenGL is only available with USE=threads!"
+		elif use mpi ; then
+				TACHYON_MAKE_TARGET=linux-mpi
+		else
+			TACHYON_MAKE_TARGET=linux
+		fi
+
+		# TODO: Support for linux-p4, linux-athlon, linux-ps2 ?
+	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} || die "emake failed"
+}
+
+src_install() {
+	cd ..
+	dodoc Changes README || die "dodoc failed"
+
+	if use doc ; then
+		dohtml docs/tachyon/* || die "dohtml failed"
+	fi
+
+	cd compile/${TACHYON_MAKE_TARGET}
+
+	dobin tachyon || die "dobin failed"
+
+	if use examples; then
+		cd "${S}/../scenes"
+		insinto "/usr/share/${PN}/examples"
+		doins * || die "doins failed"
+	fi
+}