Added X USE flag and dev-lang/tk as a dependency. Added patch to enable radiance to build without X.

4 files changed, 78 insertions, 8 deletions

diff --git a/media-gfx/radiance/ChangeLog b/media-gfx/radiance/ChangeLog
index 58bf45de4b65..4e6dd167f8fc 100644
--- a/media-gfx/radiance/ChangeLog
+++ b/media-gfx/radiance/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/radiance
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/radiance/ChangeLog,v 1.1 2003/12/14 17:44:53 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/radiance/ChangeLog,v 1.2 2003/12/15 04:33:32 brandy Exp $
+
+  15 Dec 2003; Brandy Westcott brandy@gentoo.org radiance-3.5.ebuild:
+  Added X USE flag and dev-lang/tk as a dependency. Added patch to enable
+  radiance to build without X.
 
 *radiance-3.5 (14 Dec 2003)
 
diff --git a/media-gfx/radiance/Manifest b/media-gfx/radiance/Manifest
index d01fa5d76148..fb71701902f8 100644
--- a/media-gfx/radiance/Manifest
+++ b/media-gfx/radiance/Manifest
@@ -1,4 +1,5 @@
-MD5 5c50018c00a91305d8dd8e2f804068a3 radiance-3.5.ebuild 2396
+MD5 7c93ce66a8b88a44ccf200580d558756 radiance-3.5.ebuild 2426
+MD5 4b30a8b93ef4f437308fcad8a6cf468b ChangeLog 679
 MD5 6f826a40d8aafc654f97acab145439df metadata.xml 1059
-MD5 9c8034d7d594e92a8075495d660b47d8 ChangeLog 506
 MD5 347f17131e4ad7db7b308e247e947de5 files/digest-radiance-3.5 59
+MD5 946d7aa641546a37634bf3c7f9a05698 files/radiance-3.5-noX11.patch 2132
diff --git a/media-gfx/radiance/files/radiance-3.5-noX11.patch b/media-gfx/radiance/files/radiance-3.5-noX11.patch
new file mode 100644
index 000000000000..5ed888d55e57
--- /dev/null
+++ b/media-gfx/radiance/files/radiance-3.5-noX11.patch
@@ -0,0 +1,62 @@
+diff -ur ray.orig/src/px/Rmakefile ray/src/px/Rmakefile
+--- ray.orig/src/px/Rmakefile	2003-12-15 16:52:34.000000000 +1300
++++ ray/src/px/Rmakefile	2003-12-15 16:56:41.000000000 +1300
+@@ -20,7 +20,7 @@
+ 
+ PROGS = pfilt ttyimage oki20c oki20 psign ra_tiff normtiff \
+ pvalue pcompos protate ra_pr ra_pr24 ra_avs ra_hexbit \
+-ra_t8 ra_bn ra_t16 pcomb pinterp pflip ra_ppm ximage xshowtrace \
++ra_t8 ra_bn ra_t16 pcomb pinterp pflip ra_ppm \
+ ra_rgbe ra_pict ra_ps pextrem ra_gif ra_xyze macbethcal pcond pcwarp
+ 
+ all:	$(PROGS) $(SPECIAL)
+diff -ur ray.orig/src/rt/Rmakefile ray/src/rt/Rmakefile
+--- ray.orig/src/rt/Rmakefile	2003-12-15 16:52:34.000000000 +1300
++++ ray/src/rt/Rmakefile	2003-12-15 16:53:39.000000000 +1300
+@@ -34,11 +34,11 @@
+ #
+ # Device drivers for rview (see also devtable.c):
+ #
+-DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
++DOBJS = devtable.o devcomm.o editline.o \
+ 	colortab.o
+-DSRC = devtable.c devcomm.c editline.c x11.c x11twind.c \
++DSRC = devtable.c devcomm.c editline.c \
+ 	colortab.c
+-DLIBS = -lX11
++DLIBS = 
+ 
+ #
+ # Standard object files:
+diff -ur ray.orig/src/rt/devtable.c ray/src/rt/devtable.c
+--- ray.orig/src/rt/devtable.c	2003-12-15 16:52:34.000000000 +1300
++++ ray/src/rt/devtable.c	2003-12-15 16:55:23.000000000 +1300
+@@ -11,13 +11,11 @@
+ 
+ #include  "driver.h"
+ 
+-char  dev_default[] = "x11";
+-
+-extern struct driver  *x11_init();
++char  dev_default[] = "sun";
+ 
+ struct device  devtable[] = {			/* supported devices */
+ 	{"slave", "Slave driver", slave_init},
+-	{"x11", "X11 color or greyscale display", x11_init},
+-	{"x11d", "X11 display using stdin/stdout", x11_init},
++	{"x11", "X11 color or greyscale display", comm_init},
++	{"x11d", "X11 display using stdin/stdout", comm_init},
+ 	{0}					/* terminator */
+ };
+diff -ur ray.orig/src/util/Rmakefile ray/src/util/Rmakefile
+--- ray.orig/src/util/Rmakefile	2003-12-15 16:52:35.000000000 +1300
++++ ray/src/util/Rmakefile	2003-12-15 16:57:16.000000000 +1300
+@@ -18,7 +18,7 @@
+ LIBDIR = /usr/local/lib/ray
+ 
+ PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \
+-		vwrays xglaresrc
++		vwrays
+ 
+ all:	$(PROGS)
+ 
diff --git a/media-gfx/radiance/radiance-3.5.ebuild b/media-gfx/radiance/radiance-3.5.ebuild
index 54fec97f8065..f8d9d181144b 100644
--- a/media-gfx/radiance/radiance-3.5.ebuild
+++ b/media-gfx/radiance/radiance-3.5.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/radiance/radiance-3.5.ebuild,v 1.1 2003/12/14 17:44:53 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/radiance/radiance-3.5.ebuild,v 1.2 2003/12/15 04:33:32 brandy Exp $
 
 MY_P=${P/./R}
 MY_P=${MY_P/radiance-/rad}
 
-# Compilation fails with multiple jobs here
-MAKEOPTS=""
+IUSE="X"
 
 DESCRIPTION="Radiance is a suite of programs for the analysis and visualization of lighting in design"
 HOMEPAGE="http://radsite.lbl.gov/radiance/"
@@ -17,7 +16,7 @@ SLOT="0"
 KEYWORDS="~x86"
 
 RDEPEND="media-libs/tiff
-		virtual/x11"
+	X? ( virtual/x11 dev-lang/tk )"
 
 DEPEND="${RDEPEND}"
 
@@ -27,6 +26,8 @@ src_unpack() {
 	cd ${WORKDIR}/ray
 	mkdir -p src/lib
 
+	use X ||  epatch ${FILESDIR}/${P}-noX11.patch
+
 	# patch to not build libtiff that comes with Radiance
 	cp src/px/Rmakefile src/px/Rmakefile.orig
 	sed -e "s/\.\.\/lib\/libtiff\.a$//g" \
@@ -54,7 +55,7 @@ src_compile() {
 	for i in $srcdirs ;
 	do
 		pushd $i
-		emake "SPECIAL=" \
+		make "SPECIAL=" \
 			"OPT=$CFLAGS -DSPEED=200" \
 			"MACH=-Dlinux -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO -DBIGMEM" \
 			ARCH=IBMPC "COMPAT=bmalloc.o erf.o getpagesize.o" \
@@ -90,6 +91,8 @@ src_install() {
 	doman doc/man/man5/*.5
 	prepallman
 
+	dodoc README
+
 	docinto notes
 	dodoc doc/notes/*