Stable sparc, x86. Removing old verisons.

(Portage version: 2.1_pre7-r3)

11 files changed, 12 insertions, 925 deletions

diff --git a/media-gfx/pixie/ChangeLog b/media-gfx/pixie/ChangeLog
index eaeef7ec3ae8..6c92877b8568 100644
--- a/media-gfx/pixie/ChangeLog
+++ b/media-gfx/pixie/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/pixie
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.19 2005/10/02 23:49:42 eradicator Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.20 2006/04/01 05:54:58 eradicator Exp $
+
+  01 Apr 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/pixie-1.3.11-math.patch, -files/pixie-1.4.1-libtool.patch,
+  -files/pixie-1.4.4-libtool.patch, -pixie-1.4.1-r1.ebuild,
+  -pixie-1.4.5.ebuild, -pixie-1.4.7.ebuild, pixie-1.5.1.ebuild:
+  Stable sparc, x86.  Removing old verisons.
 
 *pixie-1.5.1 (02 Oct 2005)
 *pixie-1.4.7 (02 Oct 2005)
diff --git a/media-gfx/pixie/files/digest-pixie-1.4.1-r1 b/media-gfx/pixie/files/digest-pixie-1.4.1-r1
deleted file mode 100644
index b9aa1633083f..000000000000
--- a/media-gfx/pixie/files/digest-pixie-1.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9bc1d3724f083041a5f57c7826446da5 Pixie-src-1.4.1.tgz 4587151
diff --git a/media-gfx/pixie/files/digest-pixie-1.4.5 b/media-gfx/pixie/files/digest-pixie-1.4.5
deleted file mode 100644
index 70b19e83af5a..000000000000
--- a/media-gfx/pixie/files/digest-pixie-1.4.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51378b014fea28b2efa239aa4b74bda9 Pixie-src-1.4.5.tgz 5424713
diff --git a/media-gfx/pixie/files/digest-pixie-1.4.7 b/media-gfx/pixie/files/digest-pixie-1.4.7
deleted file mode 100644
index ad2b59b85692..000000000000
--- a/media-gfx/pixie/files/digest-pixie-1.4.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3b255946648d01baf9c8b024ba3bc77f Pixie-src-1.4.7.tgz 5450113
diff --git a/media-gfx/pixie/files/pixie-1.3.11-math.patch b/media-gfx/pixie/files/pixie-1.3.11-math.patch
deleted file mode 100644
index 0da001ef1f3f..000000000000
--- a/media-gfx/pixie/files/pixie-1.3.11-math.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Pixie.orig/src/common/global.h Pixie.math/src/common/global.h
---- Pixie.orig/src/common/global.h	2004-06-13 20:00:09.000000000 -0700
-+++ Pixie.math/src/common/global.h	2004-06-14 18:32:42.702734459 -0700
-@@ -47,6 +47,8 @@
- #ifndef GLOBAL_H
- #define	GLOBAL_H
- 
-+#include <math.h>
-+
- // The Pixie version
- #define	VERSION_RELEASE	1
- #define	VERSION_BETA	3
diff --git a/media-gfx/pixie/files/pixie-1.4.1-libtool.patch b/media-gfx/pixie/files/pixie-1.4.1-libtool.patch
deleted file mode 100644
index 54595562edac..000000000000
--- a/media-gfx/pixie/files/pixie-1.4.1-libtool.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-diff -Naurp Pixie.orig/Makefile.am Pixie/Makefile.am
---- Pixie.orig/Makefile.am	2005-02-08 15:36:29.000000000 -0800
-+++ Pixie/Makefile.am	2005-04-08 20:20:17.000000000 -0700
-@@ -1,9 +1,5 @@
- SUBDIRS = src
- 
--topdir = $(prefix)
--
--top_DATA = README AUTHORS LICENSE COPYING
--
- EXTRA_DIST = Pixie.dsw Pixie.ncb Pixie.opt DEVNOTES LICENSE makeclean.bat makeinst.bat tutorials win32inst
- 
- dist-hook:
-@@ -11,12 +8,6 @@ dist-hook:
- 	cp -rf $(srcdir)/shaders $(distdir)
- 
- install-data-local:
--	cp -rf $(srcdir)/doc $(DESTDIR)$(prefix)
--	cp -rf $(srcdir)/shaders $(DESTDIR)$(prefix)
--
--
--
--
--
--
--
-+	mkdir -p $(DESTDIR)@datadir@/pixie
-+	cp -rf $(srcdir)/doc $(DESTDIR)@datadir@/pixie
-+	cp -rf $(srcdir)/shaders $(DESTDIR)@datadir@/pixie
-diff -Naurp Pixie.orig/src/common/Makefile.am Pixie/src/common/Makefile.am
---- Pixie.orig/src/common/Makefile.am	2005-02-08 15:36:29.000000000 -0800
-+++ Pixie/src/common/Makefile.am	2005-04-08 20:19:22.000000000 -0700
-@@ -1,9 +1,11 @@
--noinst_LIBRARIES = libcommon.a 
-+lib_LTLIBRARIES = libpixiecommon.la
- 
--libcommon_a_SOURCES = algebra.cpp os.cpp memoryman.cpp
--libcommon_a_CFLAGS = -fPIC -DPIC
--libcommon_a_CXXFLAGS = -fPIC -DPIC
-+LIBPIXIECOMMON_CURRENT_VERSION=0
-+LIBPIXIECOMMON_REVISION_VERSION=0
-+LIBPIXIECOMMON_AGE_VERSION=0
- 
-+libpixiecommon_la_LDFLAGS = -export-dynamic -version-info $(LIBPIXIECOMMON_CURRENT_VERSION):$(LIBPIXIECOMMON_REVISION_VERSION):$(LIBPIXIECOMMON_AGE_VERSION)
- 
--EXTRA_DIST = *.h *.cpp *.dsp
-+libpixiecommon_la_SOURCES = algebra.cpp os.cpp memoryman.cpp
- 
-+EXTRA_DIST = *.h *.cpp *.dsp
-diff -Naurp Pixie.orig/src/file/Makefile.am Pixie/src/file/Makefile.am
---- Pixie.orig/src/file/Makefile.am	2005-02-08 15:36:29.000000000 -0800
-+++ Pixie/src/file/Makefile.am	2005-04-08 20:19:22.000000000 -0700
-@@ -1,11 +1,11 @@
--lib_LTLIBRARIES = file.la 
-+lib_LTLIBRARIES = file.la
- 
--LIBS = @TIFF_LIBS@
- file_la_SOURCES = file.cpp
--file_la_LIBADD = ../common/libcommon.a
-+file_la_LIBADD = ../common/libpixiecommon.la @TIFF_LIBS@
- file_la_LDFLAGS = -module
- 
- INCLUDES = -I..
- 
- EXTRA_DIST = *cpp *.dsp
- 
-+libdir=@libdir@/pixie/displays
-diff -Naurp Pixie.orig/src/framebuffer/Makefile.am Pixie/src/framebuffer/Makefile.am
---- Pixie.orig/src/framebuffer/Makefile.am	2005-02-08 15:36:29.000000000 -0800
-+++ Pixie/src/framebuffer/Makefile.am	2005-04-08 20:19:22.000000000 -0700
-@@ -1,11 +1,12 @@
- lib_LTLIBRARIES = framebuffer.la 
- 
--CFLAGS = @CFLAGS@ @X_CFLAGS@
- framebuffer_la_SOURCES = framebuffer.cpp fbx.cpp
--framebuffer_la_LIBADD = ../common/libcommon.a @X_LIBS@
-+framebuffer_la_LIBADD = ../common/libpixiecommon.la @X_LIBS@
- framebuffer_la_LDFLAGS = -module @X_LDFLAGS@
-+framebuffer_la_CXXFLAGS = @X_CFLAGS@
- 
- INCLUDES = -I..
- 
- EXTRA_DIST = *.h *.cpp *.dsp
- 
-+libdir=@libdir@/pixie/displays
-diff -Naurp Pixie.orig/src/precomp/Makefile.am Pixie/src/precomp/Makefile.am
---- Pixie.orig/src/precomp/Makefile.am	2005-02-08 15:36:29.000000000 -0800
-+++ Pixie/src/precomp/Makefile.am	2005-04-08 20:19:22.000000000 -0700
-@@ -2,7 +2,7 @@ bin_PROGRAMS = precomp 
- 
- precomp_SOURCES = precomp.cpp
- 
--precomp_LDADD = ../common/libcommon.a
-+precomp_LDADD = ../common/libpixiecommon.la
- 
- INCLUDES = -I..
- 
-diff -Naurp Pixie.orig/src/rgbe/Makefile.am Pixie/src/rgbe/Makefile.am
---- Pixie.orig/src/rgbe/Makefile.am	2005-02-08 15:36:29.000000000 -0800
-+++ Pixie/src/rgbe/Makefile.am	2005-04-08 20:19:22.000000000 -0700
-@@ -1,10 +1,12 @@
- lib_LTLIBRARIES = rgbe.la 
- 
- rgbe_la_SOURCES = file.cpp rgbe.cpp
--rgbe_la_LIBADD = ../common/libcommon.a
-+rgbe_la_LIBADD = ../common/libpixiecommon.la
- rgbe_la_LDFLAGS = -module
- 
- INCLUDES = -I..
- 
- EXTRA_DIST = *.h *.cpp *.dsp
- 
-+libdir=@libdir@/pixie/displays
-+
-diff -Naurp Pixie.orig/src/ri/Makefile.am Pixie/src/ri/Makefile.am
---- Pixie.orig/src/ri/Makefile.am	2005-02-08 15:36:29.000000000 -0800
-+++ Pixie/src/ri/Makefile.am	2005-04-08 20:20:03.000000000 -0700
-@@ -1,6 +1,11 @@
- lib_LTLIBRARIES = libri.la 
- 
--LIBS = @TIFF_LIBS@
-+LIBRI_CURRENT_VERSION=0
-+LIBRI_REVISION_VERSION=0
-+LIBRI_AGE_VERSION=0
-+
-+libri_la_CPPFLAGS = -DPIXIE_PROCEDURALS=\"@libdir@/pixie/procedurals\" -DPIXIE_DISPLAY=\"@libdir@/pixie/displays\" -DPIXIE_SHAREDIR=\"@datadir@/pixie\"
-+libri_la_LDFLAGS = -export-dynamic -version-info $(LIBRI_CURRENT_VERSION):$(LIBRI_REVISION_VERSION):$(LIBRI_AGE_VERSION)
- libri_la_SOURCES = 		attributes.cpp \
- 				bundles.cpp \
- 				cache.cpp \
-@@ -61,12 +66,10 @@ libri_la_SOURCES = 		attributes.cpp \
- 				xform.cpp	\
- 				zbuffer.cpp
- 
--libri_la_LIBADD = ../common/libcommon.a
-+libri_la_LIBADD = ../common/libpixiecommon.la @TIFF_LIBS@
- 
- INCLUDES = -I..
- 
--includedir = $(prefix)/include
--
- include_HEADERS = ri.h dsply.h shadeop.h implicit.h dlo.h
- 
- EXTRA_DIST = *.h *.h *.cpp *.dsp *.l *.y readme.txt
-diff -Naurp Pixie.orig/src/ri/options.cpp Pixie/src/ri/options.cpp
---- Pixie.orig/src/ri/options.cpp	2005-02-08 15:36:23.000000000 -0800
-+++ Pixie/src/ri/options.cpp	2005-04-08 20:22:04.000000000 -0700
-@@ -256,18 +256,30 @@ COptions::COptions() {
- 
- 	hider					=	strdup("stochastic");
- 
--	archivePath				=	optionsGetSearchPath(".:%PIXIEHOME%/models:%RIBS%",NULL);
-+#ifndef PIXIE_SHAREDIR
-+#define PIXIE_SHAREDIR "%PIXIEHOME%"
-+#endif
-+
-+#ifndef PIXIE_PROCEDURALS
-+#define PIXIE_PROCEDURALS "%PIXIE_PROCEDURALS%"
-+#endif
-+
-+#ifndef PIXIE_DISPLAY
-+#define PIXIE_DISPLAY "%PIXIE_DISPLAY%"
-+#endif
-+
-+	archivePath				=	optionsGetSearchPath(".:%PIXIEHOME%/models:%RIBS%:"PIXIE_SHAREDIR"/models",NULL);
- #ifdef _DEBUG
--	proceduralPath			=	optionsGetSearchPath(".:%PIXIEHOME%/procedurals:%PIXIEHOME%/bind:%PROCEDURALS%",NULL);
-+	proceduralPath			=	optionsGetSearchPath(".:%PIXIEHOME%/procedurals:%PIXIEHOME%/bind:%PIXIE_PROCEDURALS%:%PROCEDURALS%",NULL);
- #else
--	proceduralPath			=	optionsGetSearchPath(".:%PIXIEHOME%/procedurals:%PIXIEHOME%/lib:%PROCEDURALS%",NULL);
-+	proceduralPath			=	optionsGetSearchPath(".:%PIXIEHOME%/procedurals:%PIXIEHOME%/lib/procedurals:%PIXIE_PROCEDURALS%:%PROCEDURALS%:"PIXIE_PROCEDURALS,NULL);
- #endif
--	texturePath				=	optionsGetSearchPath(".:%PIXIEHOME%/textures:%TEXTURES%",NULL);
--	shaderPath				=	optionsGetSearchPath(".:%PIXIEHOME%/shaders:%SHADERS%",NULL);
-+	texturePath				=	optionsGetSearchPath(".:%PIXIEHOME%/textures:%TEXTURES%:"PIXIE_SHAREDIR"/textures",NULL);
-+	shaderPath				=	optionsGetSearchPath(".:%PIXIEHOME%/shaders:%SHADERS%:"PIXIE_SHAREDIR"/shaders",NULL);
- #ifdef _DEBUG
--	displayPath				=	optionsGetSearchPath(".:%PIXIEHOME%/bind:%DISPLAY%",NULL);
-+	displayPath				=	optionsGetSearchPath(".:%PIXIEHOME%/bind:%PIXIE_DISPLAY%:%DISPLAY%",NULL);
- #else
--	displayPath				=	optionsGetSearchPath(".:%PIXIEHOME%/lib:%DISPLAY%",NULL);
-+	displayPath				=	optionsGetSearchPath(".:%PIXIE_DISPLAY%:%DISPLAY%:"PIXIE_DISPLAY,NULL);
- #endif
- 	temporaryPath			=	strdup("temp");
- 
-diff -Naurp Pixie.orig/src/rndr/Makefile.am Pixie/src/rndr/Makefile.am
---- Pixie.orig/src/rndr/Makefile.am	2005-02-08 15:36:29.000000000 -0800
-+++ Pixie/src/rndr/Makefile.am	2005-04-08 20:19:22.000000000 -0700
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = rndr 
- 
- rndr_SOURCES = rndr.cpp
--rndr_LDADD = ../ri/libri.la ../common/libcommon.a
-+rndr_LDADD = ../ri/libri.la ../common/libpixiecommon.la
- 
- INCLUDES = -I..
- 
-diff -Naurp Pixie.orig/src/sdr/Makefile.am Pixie/src/sdr/Makefile.am
---- Pixie.orig/src/sdr/Makefile.am	2005-02-08 15:36:29.000000000 -0800
-+++ Pixie/src/sdr/Makefile.am	2005-04-08 20:19:22.000000000 -0700
-@@ -1,13 +1,17 @@
- lib_LTLIBRARIES = libsdr.la 
- 
-+LIBSDR_CURRENT_VERSION=0
-+LIBSDR_REVISION_VERSION=0
-+LIBSDR_AGE_VERSION=0
-+
-+libsdr_la_LDFLAGS = -export-dynamic -version-info $(LIBSDR_CURRENT_VERSION):$(LIBSDR_REVISION_VERSION):$(LIBSDR_AGE_VERSION)
-+
- libsdr_la_SOURCES = sdr.cpp
- 
--libsdr_la_LIBADD = ../common/libcommon.a
-+libsdr_la_LIBADD = ../common/libpixiecommon.la
- 
- INCLUDES = -I..
- 
--includedir = $(prefix)/include
--
- include_HEADERS = sdr.h
- 
- EXTRA_DIST = *.h *.cpp *.l *.y *.dsp
-diff -Naurp Pixie.orig/src/sdrc/Makefile.am Pixie/src/sdrc/Makefile.am
---- Pixie.orig/src/sdrc/Makefile.am	2005-02-08 15:36:29.000000000 -0800
-+++ Pixie/src/sdrc/Makefile.am	2005-04-08 20:19:22.000000000 -0700
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = sdrc 
- 
- sdrc_SOURCES = sdrc.cpp dso.cpp expression.cpp opcodes.cpp sdr.cpp sl.cpp pp1.c pp2.c pp3.c pp4.c pp5.c pp6.c pp7.c pp8.c
--sdrc_LDADD = ../common/libcommon.a
-+sdrc_LDADD = ../common/libpixiecommon.la
- 
- INCLUDES = -I..
- 
-diff -Naurp Pixie.orig/src/sdrinfo/Makefile.am Pixie/src/sdrinfo/Makefile.am
---- Pixie.orig/src/sdrinfo/Makefile.am	2005-02-08 15:36:29.000000000 -0800
-+++ Pixie/src/sdrinfo/Makefile.am	2005-04-08 20:19:22.000000000 -0700
-@@ -1,9 +1,8 @@
- bin_PROGRAMS = sdrinfo 
- 
- sdrinfo_SOURCES = sdrinfo.cpp
--sdrinfo_LDADD = ../sdr/libsdr.la ../common/libcommon.a
-+sdrinfo_LDADD = ../sdr/libsdr.la ../common/libpixiecommon.la
- 
- INCLUDES = -I..
- 
- EXTRA_DIST = *.cpp *.dsp
--
-diff -Naurp Pixie.orig/src/show/Makefile.am Pixie/src/show/Makefile.am
---- Pixie.orig/src/show/Makefile.am	2005-02-08 15:36:29.000000000 -0800
-+++ Pixie/src/show/Makefile.am	2005-04-08 20:19:22.000000000 -0700
-@@ -4,8 +4,6 @@ endif
- 
- EXTRA_DIST = *.h show.dsp
- 
--CFLAGS = @CFLAGS@ @X_CFLAGS@
--
- show_SOURCES = cacheView.cpp \
- 				radView.cpp \
- 				interface.cpp \
-@@ -13,12 +11,7 @@ show_SOURCES = cacheView.cpp \
- 				photonView.cpp \
- 				show.cpp
- 
--show_LDADD = @X_LIBS@ @LIBFLTK@ @LIBFLTKGL@ @X_LDFLAGS@ ../common/libcommon.a
-+show_LDADD = @X_LIBS@ @LIBFLTK@ @LIBFLTKGL@ @X_LDFLAGS@ ../common/libpixiecommon.la
-+show_CXXFLAGS = @X_CFLAGS@
- 
- INCLUDES = -I..
--
--
--
--
--
--
-diff -Naurp Pixie.orig/src/texmake/Makefile.am Pixie/src/texmake/Makefile.am
---- Pixie.orig/src/texmake/Makefile.am	2005-02-08 15:36:29.000000000 -0800
-+++ Pixie/src/texmake/Makefile.am	2005-04-08 20:19:22.000000000 -0700
-@@ -1,9 +1,8 @@
- bin_PROGRAMS = texmake 
- 
- texmake_SOURCES = texmake.cpp
--texmake_LDADD = ../ri/libri.la ../common/libcommon.a
-+texmake_LDADD = ../ri/libri.la ../common/libpixiecommon.la
- 
- INCLUDES = -I..
- 
- EXTRA_DIST = *.cpp *.dsp
--
diff --git a/media-gfx/pixie/files/pixie-1.4.4-libtool.patch b/media-gfx/pixie/files/pixie-1.4.4-libtool.patch
deleted file mode 100644
index 62af4b311726..000000000000
--- a/media-gfx/pixie/files/pixie-1.4.4-libtool.patch
+++ /dev/null
@@ -1,434 +0,0 @@
-diff -Naurp Pixie.orig/Makefile.am Pixie/Makefile.am
---- Pixie.orig/Makefile.am	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/Makefile.am	2005-07-18 11:35:57.000000000 +0000
-@@ -1,28 +1,6 @@
- SUBDIRS = src
- 
--if SELFCONTAINED
-- pixdatadir = $(prefix)
-- docdir = $(prefix)
-- htmldocdir = $(docdir)/html
-- shaderdir = $(pixdatadir)/shaders
--else
-- pixdatadir = $(libdir)/$(PACKAGE)
-- docdir = $(datadir)/doc/$(PACKAGE)
-- htmldocdir = $(docdir)/html
-- shaderdir = $(pixdatadir)/shaders
--endif
--
--doc_DATA = README AUTHORS LICENSE COPYING
-+doc_DATA = AUTHORS ChangeLog DEVNOTES NEWS README doc/*
-+shader_DATA = shaders/*
- 
- EXTRA_DIST = DEVNOTES LICENSE
--
--dist-hook:
--	cp -rf $(srcdir)/doc $(distdir)
--	cp -rf $(srcdir)/shaders $(distdir)
--
--install-data-hook:
--	mkdir -p $(htmldocdir)
--	cp -rf $(srcdir)/doc/* $(htmldocdir)
--	mkdir -p $(shaderdir)
--	cp -rf $(srcdir)/shaders/* $(shaderdir)
--
-diff -Naurp Pixie.orig/configure.in Pixie/configure.in
---- Pixie.orig/configure.in	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/configure.in	2005-07-18 11:40:12.000000000 +0000
-@@ -14,6 +14,7 @@ dnl
- AC_PROG_CC
- AC_PROG_CPP
- AC_PROG_CXX
-+AM_DISABLE_STATIC
- AM_PROG_LIBTOOL
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
-@@ -94,17 +95,80 @@ AC_SUBST(TIFF_LIBS)
- AC_SUBST(BUILD_SHOW)
- 
- dnl ---------------------------------------------------
-+dnl Set custom directories for shaders, models, procedurals, and displays
-+dnl
-+
-+AC_ARG_WITH(docdir,
-+	AS_HELP_STRING([--with-docdir=DIR],[directory where we install documentation (Default: DATADIR/doc/Pixie)]),
-+	docdir="${withval}",
-+	docdir="${datadir}/doc/Pixie")
-+
-+AC_ARG_WITH(shaderdir,
-+	AS_HELP_STRING([--with-shaderdir=DIR],[directory where we store shaders (Default: DATADIR/Pixie/shaders)]),
-+	shaderdir="${withval}",
-+	shaderdir="${datadir}/Pixie/shaders")
-+
-+AC_ARG_WITH(modeldir,
-+	AS_HELP_STRING([--with-modeldir=DIR],[directory where we store models (Default: DATADIR/Pixie/models)]),
-+	modeldir="${withval}",
-+	modeldir="${datadir}/Pixie/models")
-+
-+AC_ARG_WITH(texturedir,
-+	AS_HELP_STRING([--with-modeldir=DIR],[directory where we store models (Default: DATADIR/Pixie/textures)]),
-+	texturedir="${withval}",
-+	texturedir="${datadir}/Pixie/textures")
-+
-+AC_ARG_WITH(proceduraldir,
-+	AS_HELP_STRING([--with-shaderdir=DIR],[directory to store shaders (Default: LIBDIR/Pixie/procedurals)]),
-+	proceduraldir="${withval}",
-+	proceduraldir="${libdir}/Pixie/procedurals")
-+
-+AC_ARG_WITH(displaydir,
-+	AS_HELP_STRING([--with-shaderdir=DIR],[directory to store shaders (Default: LIBDIR/Pixie/displays)]),
-+	displaydir="${withval}",
-+	displaydir="${libdir}/Pixie/displays")
-+
-+dnl ---------------------------------------------------
- dnl Are we building for self contained distribution
- dnl
- 
- AC_ARG_ENABLE(selfcontained,
--AS_HELP_STRING([--enable-selfcontained],[Build for a selfcontained setup]),
-+AS_HELP_STRING([--enable-selfcontained],[Build for a selfcontained setup (overrides custom directory settings)]),
- [case "${enableval}" in
--yes) selfcontained=true ;;
--no) selfcontained=false ;;
--*) AC_MSG_ERROR(bad value ${enableval} for --enable-selfcontained) ;;
--esac],[selfcontained=false])
--AM_CONDITIONAL(SELFCONTAINED, test x$selfcontained = xtrue)
-+	yes)	docdir="${prefix}/doc"
-+		shaderdir="${prefix}/shaders"
-+		modeldir="${prefix}/models"
-+		texturedir="${prefix}/textures"
-+		displaydir="${prefix}/displays"
-+		proceduraldir="${prefix}/procedurals"
-+		;;
-+	no) ;;
-+	*) AC_MSG_ERROR(bad value ${enableval} for --enable-selfcontained) ;;
-+esac])
-+
-+dnl ---------------------------------------------------
-+dnl Now tell the c preprocessor and the Makefiles where stuff goes
-+dnl 
-+
-+AC_DEFUN([AC_DEFINE_DIR], [
-+  prefix_NONE=
-+  exec_prefix_NONE=
-+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
-+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-+  eval ac_define_dir="\"[$]$2\""
-+  AC_SUBST($1, "$ac_define_dir")
-+  AC_SUBST($2, "$ac_define_dir")
-+  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
-+  test "$prefix_NONE" && prefix=NONE
-+  test "$exec_prefix_NONE" && exec_prefix=NONE
-+])
-+
-+AC_DEFINE_DIR(PIXIE_DOCS,docdir,[Directory where we store documentation])
-+AC_DEFINE_DIR(PIXIE_SHADERS,shaderdir,[Directory where we store shaders])
-+AC_DEFINE_DIR(PIXIE_MODELS,modeldir,[Directory where we store models])
-+AC_DEFINE_DIR(PIXIE_TEXTURES,texturedir,[Directory where we store textures])
-+AC_DEFINE_DIR(PIXIE_DISPLAYS,displaydir,[Directory where we store displays])
-+AC_DEFINE_DIR(PIXIE_PROCEDURALS,proceduraldir,[Directory where we store procedurals])
- 
- dnl ---------------------------------------------------
- dnl Write the output
-@@ -118,10 +182,3 @@ echo ">make -install"
- echo "to built Pixie"
- echo
- 
--
--
--
--
--
--
--
-diff -Naurp Pixie.orig/src/common/Makefile.am Pixie/src/common/Makefile.am
---- Pixie.orig/src/common/Makefile.am	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/src/common/Makefile.am	2005-07-18 11:35:57.000000000 +0000
-@@ -1,6 +1,9 @@
--noinst_LIBRARIES = libcommon.a 
--
--libcommon_a_SOURCES = algebra.cpp os.cpp memoryman.cpp
--libcommon_a_CFLAGS = -fPIC -DPIC
--libcommon_a_CXXFLAGS = -fPIC -DPIC
--
-+lib_LTLIBRARIES = libpixiecommon.la
-+  
-+LIBPIXIECOMMON_CURRENT_VERSION=0
-+LIBPIXIECOMMON_REVISION_VERSION=0
-+LIBPIXIECOMMON_AGE_VERSION=0
-+  
-+libpixiecommon_la_LDFLAGS = -export-dynamic -version-info $(LIBPIXIECOMMON_CURRENT_VERSION):$(LIBPIXIECOMMON_REVISION_VERSION):$(LIBPIXIECOMMON_AGE_VERSION)
-+  
-+libpixiecommon_la_SOURCES = algebra.cpp os.cpp memoryman.cpp
-diff -Naurp Pixie.orig/src/common/os.h Pixie/src/common/os.h
---- Pixie.orig/src/common/os.h	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/src/common/os.h	2005-07-18 11:35:57.000000000 +0000
-@@ -73,8 +73,10 @@ typedef void			*(*TFun)(void *);
- #endif
- 
- #include "global.h"
--#include "../../config.h"
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- // Maximum length of a path
- const	int		OS_MAX_PATH_LENGTH	=	512;
-diff -Naurp Pixie.orig/src/file/Makefile.am Pixie/src/file/Makefile.am
---- Pixie.orig/src/file/Makefile.am	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/src/file/Makefile.am	2005-07-18 11:35:57.000000000 +0000
-@@ -1,15 +1,7 @@
-+display_LTLIBRARIES = file.la 
- 
--if SELFCONTAINED
-- displaysdir = $(prefix)/displays
--else
-- displaysdir = $(libdir)/$(PACKAGE)/displays
--endif
--
--displays_LTLIBRARIES = file.la 
--
--LIBS = @TIFF_LIBS@
- file_la_SOURCES = file.cpp
--file_la_LIBADD = ../common/libcommon.a
-+file_la_LIBADD = ../common/libpixiecommon.la @TIFF_LIBS@
- file_la_LDFLAGS = -module
- 
- INCLUDES = -I..
-diff -Naurp Pixie.orig/src/framebuffer/Makefile.am Pixie/src/framebuffer/Makefile.am
---- Pixie.orig/src/framebuffer/Makefile.am	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/src/framebuffer/Makefile.am	2005-07-18 11:35:57.000000000 +0000
-@@ -1,16 +1,9 @@
-+display_LTLIBRARIES = framebuffer.la 
- 
--if SELFCONTAINED
-- displaysdir = $(prefix)/displays
--else
-- displaysdir = $(libdir)/$(PACKAGE)/displays
--endif
--
--displays_LTLIBRARIES = framebuffer.la 
--
--CFLAGS = @CFLAGS@ @X_CFLAGS@
- framebuffer_la_SOURCES = framebuffer.cpp fbx.cpp
--framebuffer_la_LIBADD = ../common/libcommon.a @X_LIBS@
-+framebuffer_la_LIBADD = ../common/libpixiecommon.la @X_LIBS@
- framebuffer_la_LDFLAGS = -module @X_LDFLAGS@
-+framebuffer_la_CXXFLAGS = @X_CFLAGS@
- 
- INCLUDES = -I..
- 
-diff -Naurp Pixie.orig/src/precomp/Makefile.am Pixie/src/precomp/Makefile.am
---- Pixie.orig/src/precomp/Makefile.am	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/src/precomp/Makefile.am	2005-07-18 11:35:57.000000000 +0000
-@@ -2,7 +2,7 @@ bin_PROGRAMS = precomp 
- 
- precomp_SOURCES = precomp.cpp
- 
--precomp_LDADD = ../common/libcommon.a
-+precomp_LDADD = ../common/libpixiecommon.la
- 
- INCLUDES = -I..
- 
-diff -Naurp Pixie.orig/src/rgbe/Makefile.am Pixie/src/rgbe/Makefile.am
---- Pixie.orig/src/rgbe/Makefile.am	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/src/rgbe/Makefile.am	2005-07-18 11:35:57.000000000 +0000
-@@ -1,14 +1,7 @@
--
--if SELFCONTAINED
-- displaysdir = $(prefix)/displays
--else
-- displaysdir = $(libdir)/$(PACKAGE)/displays
--endif
--
--displays_LTLIBRARIES = rgbe.la 
-+display_LTLIBRARIES = rgbe.la 
- 
- rgbe_la_SOURCES = file.cpp rgbe.cpp
--rgbe_la_LIBADD = ../common/libcommon.a
-+rgbe_la_LIBADD = ../common/libpixiecommon.la
- rgbe_la_LDFLAGS = -module
- 
- INCLUDES = -I..
-diff -Naurp Pixie.orig/src/ri/Makefile.am Pixie/src/ri/Makefile.am
---- Pixie.orig/src/ri/Makefile.am	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/src/ri/Makefile.am	2005-07-18 11:35:57.000000000 +0000
-@@ -1,6 +1,10 @@
- lib_LTLIBRARIES = libri.la 
- 
--LIBS = @TIFF_LIBS@
-+LIBRI_CURRENT_VERSION=0
-+LIBRI_REVISION_VERSION=0
-+LIBRI_AGE_VERSION=0
-+
-+libri_la_LDFLAGS = -export-dynamic -version-info $(LIBRI_CURRENT_VERSION):$(LIBRI_REVISION_VERSION):$(LIBRI_AGE_VERSION)
- libri_la_SOURCES = 		attributes.cpp \
- 				bundles.cpp \
- 				cache.cpp \
-@@ -61,11 +65,8 @@ libri_la_SOURCES = 		attributes.cpp \
- 				xform.cpp	\
- 				zbuffer.cpp
- 
--libri_la_LIBADD = ../common/libcommon.a
-+libri_la_LIBADD = ../common/libpixiecommon.la @TIFF_LIBS@
- 
- INCLUDES = -I..
- 
--includedir = $(prefix)/include
--
- include_HEADERS = ri.h dsply.h shadeop.h implicit.h dlo.h
--
-diff -Naurp Pixie.orig/src/ri/options.cpp Pixie/src/ri/options.cpp
---- Pixie.orig/src/ri/options.cpp	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/src/ri/options.cpp	2005-07-18 11:35:57.000000000 +0000
-@@ -37,6 +37,10 @@
- #include "renderer.h"
- #include "stats.h"
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- ///////////////////////////////////////////////////////////////////////
- // Class				:	COptions
- // Method				:	optionsDeleteSearchPath
-@@ -256,18 +260,38 @@ COptions::COptions() {
- 
- 	hider					=	strdup("stochastic");
- 
--	archivePath				=	optionsGetSearchPath(".:%PIXIEHOME%/models:%RIBS%",NULL);
-+#ifndef PIXIE_MODELS
-+#define PIXIE_MODELS "%PIXIEHOME%/models"
-+#endif
-+
-+#ifndef PIXIE_PROCEDURALS
-+#define PIXIE_PROCEDURALS "%PIXIE_PROCEDURALS%"
-+#endif
-+
-+#ifndef PIXIE_TEXTURES
-+#define PIXIE_TEXTURES "%PIXIEHOME%/textures"
-+#endif
-+
-+#ifndef PIXIE_SHADERS
-+#define PIXIE_SHADERS "%PIXIEHOME%/shaders"
-+#endif
-+
-+#ifndef PIXIE_DISPLAYS
-+#define PIXIE_DISPLAYS "%PIXIE_DISPLAY%"
-+#endif
-+
-+	archivePath				=	optionsGetSearchPath(".:%PIXIEHOME%/models:%RIBS%:" PIXIE_MODELS,NULL);
- #ifdef _DEBUG
--	proceduralPath			=	optionsGetSearchPath(".:%PIXIEHOME%/procedurals:%PIXIEHOME%/bind:%PROCEDURALS%",NULL);
-+	proceduralPath			=	optionsGetSearchPath(".:%PIXIEHOME%/procedurals:%PIXIEHOME%/bind:%PIXIE_PROCEDURALS%:%PROCEDURALS%",NULL);
- #else
--	proceduralPath			=	optionsGetSearchPath(".:%PIXIEHOME%/procedurals:%PIXIEHOME%/lib:%PROCEDURALS%",NULL);
-+	proceduralPath			=	optionsGetSearchPath(".:%PIXIEHOME%/procedurals:%PIXIEHOME%/lib:%PIXIE_PROCEDURALS%:%PROCEDURALS%:" PIXIE_PROCEDURALS,NULL);
- #endif
--	texturePath				=	optionsGetSearchPath(".:%PIXIEHOME%/textures:%TEXTURES%",NULL);
--	shaderPath				=	optionsGetSearchPath(".:%PIXIEHOME%/shaders:%SHADERS%",NULL);
-+	texturePath				=	optionsGetSearchPath(".:%PIXIEHOME%/textures:%TEXTURES%:" PIXIE_TEXTURES,NULL);
-+	shaderPath				=	optionsGetSearchPath(".:%PIXIEHOME%/shaders:%SHADERS%:" PIXIE_SHADERS,NULL);
- #ifdef _DEBUG
--	displayPath				=	optionsGetSearchPath(".:%PIXIEHOME%/bind:%DISPLAYS%",NULL);
-+	displayPath				=	optionsGetSearchPath(".:%PIXIEHOME%/bind:%PIXIE_DISPLAY%:%DISPLAYS%",NULL);
- #else
--	displayPath				=	optionsGetSearchPath(".:%PIXIEHOME%/displays:%DISPLAYS%",NULL);
-+	displayPath				=	optionsGetSearchPath(".:%PIXIEHOME%/displays:%PIXIE_DISPLAY%:%DISPLAYS%:" PIXIE_DISPLAYS,NULL);
- #endif
- 	temporaryPath			=	strdup("temp");
- 
-diff -Naurp Pixie.orig/src/rndr/Makefile.am Pixie/src/rndr/Makefile.am
---- Pixie.orig/src/rndr/Makefile.am	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/src/rndr/Makefile.am	2005-07-18 11:35:57.000000000 +0000
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = rndr 
- 
- rndr_SOURCES = rndr.cpp
--rndr_LDADD = ../ri/libri.la ../common/libcommon.a
-+rndr_LDADD = ../ri/libri.la ../common/libpixiecommon.la
- 
- INCLUDES = -I..
- 
-diff -Naurp Pixie.orig/src/sdr/Makefile.am Pixie/src/sdr/Makefile.am
---- Pixie.orig/src/sdr/Makefile.am	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/src/sdr/Makefile.am	2005-07-18 11:35:57.000000000 +0000
-@@ -1,12 +1,16 @@
- lib_LTLIBRARIES = libsdr.la 
- 
-+LIBSDR_CURRENT_VERSION=0
-+LIBSDR_REVISION_VERSION=0
-+LIBSDR_AGE_VERSION=0
-+
-+libsdr_la_LDFLAGS = -export-dynamic -version-info $(LIBSDR_CURRENT_VERSION):$(LIBSDR_REVISION_VERSION):$(LIBSDR_AGE_VERSION)
-+
- libsdr_la_SOURCES = sdr.cpp
- 
--libsdr_la_LIBADD = ../common/libcommon.a
-+libsdr_la_LIBADD = ../common/libpixiecommon.la
- 
- INCLUDES = -I..
- 
--includedir = $(prefix)/include
--
- include_HEADERS = sdr.h
- 
-diff -Naurp Pixie.orig/src/sdrc/Makefile.am Pixie/src/sdrc/Makefile.am
---- Pixie.orig/src/sdrc/Makefile.am	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/src/sdrc/Makefile.am	2005-07-18 11:35:57.000000000 +0000
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = sdrc 
- 
- sdrc_SOURCES = sdrc.cpp dso.cpp expression.cpp opcodes.cpp sdr.cpp sl.cpp pp1.c pp2.c pp3.c pp4.c pp5.c pp6.c pp7.c pp8.c
--sdrc_LDADD = ../common/libcommon.a
-+sdrc_LDADD = ../common/libpixiecommon.la
- 
- INCLUDES = -I..
- 
-diff -Naurp Pixie.orig/src/sdrinfo/Makefile.am Pixie/src/sdrinfo/Makefile.am
---- Pixie.orig/src/sdrinfo/Makefile.am	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/src/sdrinfo/Makefile.am	2005-07-18 11:35:57.000000000 +0000
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = sdrinfo 
- 
- sdrinfo_SOURCES = sdrinfo.cpp
--sdrinfo_LDADD = ../sdr/libsdr.la ../common/libcommon.a
-+sdrinfo_LDADD = ../sdr/libsdr.la ../common/libpixiecommon.la
- 
- INCLUDES = -I..
- 
-diff -Naurp Pixie.orig/src/show/Makefile.am Pixie/src/show/Makefile.am
---- Pixie.orig/src/show/Makefile.am	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/src/show/Makefile.am	2005-07-18 11:35:57.000000000 +0000
-@@ -4,8 +4,6 @@ endif
- 
- EXTRA_DIST = *.h show.dsp
- 
--CFLAGS = @CFLAGS@ @X_CFLAGS@
--
- show_SOURCES = cacheView.cpp \
- 				radView.cpp \
- 				interface.cpp \
-@@ -13,7 +11,7 @@ show_SOURCES = cacheView.cpp \
- 				photonView.cpp \
- 				show.cpp
- 
--show_LDADD = @X_LIBS@ @LIBFLTK@ @LIBFLTKGL@ @X_LDFLAGS@ ../common/libcommon.a
-+show_LDADD = @X_LIBS@ @LIBFLTK@ @LIBFLTKGL@ @X_LDFLAGS@ ../common/libpixiecommon.la
-+show_CXXFLAGS = @X_CFLAGS@
- 
- INCLUDES = -I..
--
-diff -Naurp Pixie.orig/src/texmake/Makefile.am Pixie/src/texmake/Makefile.am
---- Pixie.orig/src/texmake/Makefile.am	2005-07-18 11:36:34.000000000 +0000
-+++ Pixie/src/texmake/Makefile.am	2005-07-18 11:35:57.000000000 +0000
-@@ -1,7 +1,7 @@
- bin_PROGRAMS = texmake 
- 
- texmake_SOURCES = texmake.cpp
--texmake_LDADD = ../ri/libri.la ../common/libcommon.a
-+texmake_LDADD = ../ri/libri.la ../common/libpixiecommon.la
- 
- INCLUDES = -I..
- 
diff --git a/media-gfx/pixie/pixie-1.4.1-r1.ebuild b/media-gfx/pixie/pixie-1.4.1-r1.ebuild
deleted file mode 100644
index eea01e06360d..000000000000
--- a/media-gfx/pixie/pixie-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.4.1-r1.ebuild,v 1.2 2005/06/19 21:11:07 eradicator Exp $
-
-inherit eutils
-
-IUSE="X"
-
-MY_PN="Pixie"
-S="${WORKDIR}/${MY_PN}"
-
-DESCRIPTION="RenderMan like photorealistic renderer."
-HOMEPAGE="http://pixie.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="-amd64 ~ppc sparc x86"
-
-RDEPEND="media-libs/jpeg
-	 sys-libs/zlib
-	 media-libs/tiff
-	 X? ( virtual/x11 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	>=sys-devel/automake-1.8"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# These have been sent upstream, and rejected, but this is the
-	# "right way" -- eradicator
-	epatch ${FILESDIR}/${PN}-1.3.11-math.patch
-
-	# Gentoo-specific stuff to fix the build/install process
-	epatch ${FILESDIR}/${PN}-1.4.1-libtool.patch
-
-	export WANT_AUTOMAKE=1.8
-	export WANT_AUTOCONF=2.5
-	libtoolize --force --copy || die
-	aclocal || die
-	automake -a -f -c || die
-	autoconf || die
-}
-
-src_compile() {
-	econf --disable-static || die
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog DEVNOTES NEWS README
-
-	edos2unix ${D}/usr/share/pixie/shaders/*
-	mv ${D}/usr/share/pixie/doc ${D}/usr/share/doc/${PF}/html
-}
diff --git a/media-gfx/pixie/pixie-1.4.5.ebuild b/media-gfx/pixie/pixie-1.4.5.ebuild
deleted file mode 100644
index 53d71d75582a..000000000000
--- a/media-gfx/pixie/pixie-1.4.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.4.5.ebuild,v 1.1 2005/07/23 23:23:14 eradicator Exp $
-
-inherit eutils
-
-IUSE="X"
-
-MY_PN="Pixie"
-S="${WORKDIR}/${MY_PN}"
-
-DESCRIPTION="RenderMan like photorealistic renderer."
-HOMEPAGE="http://pixie.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="-amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="media-libs/jpeg
-	 sys-libs/zlib
-	 media-libs/tiff
-	 X? ( virtual/x11 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	>=sys-devel/automake-1.8"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# These have been sent upstream, and rejected, but this is the
-	# "right way" -- eradicator
-	epatch ${FILESDIR}/${PN}-1.4.4-math.patch
-
-	# Make the build process more cross-platform...
-	epatch ${FILESDIR}/${PN}-1.4.4-libtool.patch
-
-	export WANT_AUTOMAKE=1.8
-	export WANT_AUTOCONF=2.5
-	libtoolize --force --copy || die
-	aclocal || die
-	automake -a -f -c || die
-	autoheader || die
-	autoconf || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	keepdir /usr/$(get_libdir)/Pixie/procedurals
-	keepdir /usr/share/Pixie/models
-
-	insinto /usr/share/Pixie/textures
-	doins ${S}/textures/checkers.tif
-
-	edos2unix ${D}/usr/share/Pixie/shaders/*
-	mv ${D}/usr/share/doc/Pixie ${D}/usr/share/doc/${PF}
-}
diff --git a/media-gfx/pixie/pixie-1.4.7.ebuild b/media-gfx/pixie/pixie-1.4.7.ebuild
deleted file mode 100644
index 39dba95a2b9c..000000000000
--- a/media-gfx/pixie/pixie-1.4.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.4.7.ebuild,v 1.1 2005/10/02 23:49:42 eradicator Exp $
-
-inherit eutils
-
-IUSE="X"
-
-MY_PN="Pixie"
-S="${WORKDIR}/${MY_PN}"
-
-DESCRIPTION="RenderMan like photorealistic renderer."
-HOMEPAGE="http://pixie.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="-amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="media-libs/jpeg
-	 sys-libs/zlib
-	 media-libs/tiff
-	 X? ( virtual/x11 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	>=sys-devel/automake-1.8"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# These have been sent upstream, and rejected, but this is the
-	# "right way" -- eradicator
-	epatch ${FILESDIR}/${PN}-1.4.4-math.patch
-
-	# Make the build process more cross-platform...
-	epatch ${FILESDIR}/${PN}-1.4.7-libtool.patch
-
-	export WANT_AUTOMAKE=1.8
-	export WANT_AUTOCONF=2.5
-	libtoolize --force --copy || die
-	aclocal || die
-	automake -a -f -c || die
-	autoheader || die
-	autoconf || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	keepdir /usr/$(get_libdir)/Pixie/procedurals
-	keepdir /usr/share/Pixie/models
-
-	insinto /usr/share/Pixie/textures
-	doins ${S}/textures/checkers.tif
-
-	edos2unix ${D}/usr/share/Pixie/shaders/*
-	mv ${D}/usr/share/doc/Pixie ${D}/usr/share/doc/${PF}
-}
diff --git a/media-gfx/pixie/pixie-1.5.1.ebuild b/media-gfx/pixie/pixie-1.5.1.ebuild
index b3803ab1bd7b..bcc51041984d 100644
--- a/media-gfx/pixie/pixie-1.5.1.ebuild
+++ b/media-gfx/pixie/pixie-1.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.5.1.ebuild,v 1.1 2005/10/02 23:49:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.5.1.ebuild,v 1.2 2006/04/01 05:54:58 eradicator Exp $
 
 inherit eutils
 
@@ -16,12 +16,12 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="-amd64 ~ppc ~sparc ~x86"
+KEYWORDS="-amd64 ~ppc sparc x86"
 
 RDEPEND="media-libs/jpeg
 	 sys-libs/zlib
 	 media-libs/tiff
-	 X? ( virtual/x11 )"
+	 X? ( || ( x11-libs/libXext virtual/x11 ) )"
 
 DEPEND="${RDEPEND}
 	sys-devel/libtool