Version bump.

Package-Manager: portage-2.1_pre7-r5

5 files changed, 534 insertions, 7 deletions

diff --git a/media-gfx/pixie/ChangeLog b/media-gfx/pixie/ChangeLog
index 6c92877b8568..d8efb81a5579 100644
--- a/media-gfx/pixie/ChangeLog
+++ b/media-gfx/pixie/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/pixie
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.21 2006/04/12 08:01:46 eradicator Exp $
+
+*pixie-1.6.2 (12 Apr 2006)
+
+  12 Apr 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/pixie-1.6.2-libtool.patch, +pixie-1.6.2.ebuild:
+  Version bump.
 
   01 Apr 2006; Jeremy Huddleston <eradicator@gentoo.org>
   -files/pixie-1.3.11-math.patch, -files/pixie-1.4.1-libtool.patch,
diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest
index a8483d94bce8..36b259b8f3de 100644
--- a/media-gfx/pixie/Manifest
+++ b/media-gfx/pixie/Manifest
@@ -1,28 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d57819c985917c31b1bbf425114906af ChangeLog 3860
-RMD160 6d3abbbd1f207ac787f2a2a644b66d1378638078 ChangeLog 3860
-SHA256 3d6517917165c8422775157692f92f9f1ad353026278d4e2cb5df0db53f4bc34 ChangeLog 3860
+MD5 90c920ad7d4e766f351b6aa99b6527bf ChangeLog 4019
+RMD160 878ce382cd9694ab4bc0db8284cddd348c9490cc ChangeLog 4019
+SHA256 6b4359d0ed305e9ef2f7cbca08954bbbb56386d79480cb8b4d7c3f9904b31044 ChangeLog 4019
 MD5 89da012136dbc32c9a68dabc09e802d4 files/digest-pixie-1.5.1 65
 RMD160 52633c2285d9d1d6edc19969365d3ca4413e4f08 files/digest-pixie-1.5.1 65
 SHA256 b066f044a0f059e98ded56816063ea0a3cb390f838196c3d410aca2bb944af2b files/digest-pixie-1.5.1 65
+MD5 cf55e915501831f08f31ce612db9ef67 files/digest-pixie-1.6.2 241
+RMD160 4cfbc4d58e7ad1aab643795342a1a015c7ecbdca files/digest-pixie-1.6.2 241
+SHA256 1f9022faf9043d18c487c126a5f488dfad44c5d0ba2c325dc827ce13096ff498 files/digest-pixie-1.6.2 241
 MD5 48ac8837dbadef8c09f4707f8010c85f files/pixie-1.4.4-math.patch 836
 RMD160 5ce5894aeb65e57fb0fc76b404f45dc7f3e2ee13 files/pixie-1.4.4-math.patch 836
 SHA256 2a87f85c7da0e4fccb7e15d1c133d1f2a24e5983de9b22e2e3ccc05c7ac4e5a8 files/pixie-1.4.4-math.patch 836
 MD5 391ca6aaedf3654e8e09f851cf502c01 files/pixie-1.4.7-libtool.patch 14583
 RMD160 75044cb4b56fdb7c550b599f94e621e07ace479f files/pixie-1.4.7-libtool.patch 14583
 SHA256 4d100d71328a22be80caf7fd28f43a750cf4b78ec8aa22ca377c7a369266208d files/pixie-1.4.7-libtool.patch 14583
+MD5 06728f346102a5d097ceb2633df61932 files/pixie-1.6.2-libtool.patch 15395
+RMD160 34bb16a4fe943f364656c7213d06a49fc7d1a844 files/pixie-1.6.2-libtool.patch 15395
+SHA256 bed6db7f99317500a83d376e020978cdb53afccd959a4f9ea3b55367d4915b9b files/pixie-1.6.2-libtool.patch 15395
 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
 RMD160 d1f5ea37202987c54db9697175a55e5609386654 metadata.xml 259
 SHA256 14f1bab6a31d434eda6319b2783239e50179d75501edb6e255bb6c3e665418cf metadata.xml 259
 MD5 fe08794a72d5c9e98b6274122958c19d pixie-1.5.1.ebuild 1412
 RMD160 1321c5826ae15ccd4bfc975bcfb82250c9ab8a85 pixie-1.5.1.ebuild 1412
 SHA256 79e7844882882647ca8e9e192e7d64c8a57cd7b1f6e615962cc8094d0de1057e pixie-1.5.1.ebuild 1412
+MD5 f4797b5fddcf4173482b284c4baeecb3 pixie-1.6.2.ebuild 1320
+RMD160 55544c8d11482f2dd8e8c2e2e8db085fe35c96a0 pixie-1.6.2.ebuild 1320
+SHA256 686750f27e06146685f857b7c057a68e2e6892eae4ea0d615e90fc92702c8f08 pixie-1.6.2.ebuild 1320
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFELhXNOpjtAl+gMRURAk6EAJwJLXM4CEcixAB4bi4azePEQeDBnwCg1D6f
-74fQCVFJ+8zA5tX4m+DteAY=
-=uOtl
+iD8DBQFEPLP3OpjtAl+gMRURAquBAKDXv4MSb0GjqSBtsP6w+GcPPtgxNQCeJhk2
+Y8M5tOR4LO+FvLAPBhNfAAI=
+=SHao
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/pixie/files/digest-pixie-1.6.2 b/media-gfx/pixie/files/digest-pixie-1.6.2
new file mode 100644
index 000000000000..aaea5f296b1a
--- /dev/null
+++ b/media-gfx/pixie/files/digest-pixie-1.6.2
@@ -0,0 +1,3 @@
+MD5 ed12ba2853d68beb16b25fc1092cbdcb Pixie-src-1.6.2.tgz 6088092
+RMD160 b2ba2e71b1c2430f304801b715b2d7a741b25f23 Pixie-src-1.6.2.tgz 6088092
+SHA256 c5a989aaa9fe17857fdde3c18cff574948e5581316d11b1bffaf1fbb97bcf6d3 Pixie-src-1.6.2.tgz 6088092
diff --git a/media-gfx/pixie/files/pixie-1.6.2-libtool.patch b/media-gfx/pixie/files/pixie-1.6.2-libtool.patch
new file mode 100644
index 000000000000..73050bbdac26
--- /dev/null
+++ b/media-gfx/pixie/files/pixie-1.6.2-libtool.patch
@@ -0,0 +1,450 @@
+diff -Naurp -Naurp Pixie.orig/Makefile.am Pixie/Makefile.am
+--- Pixie.orig/Makefile.am	2006-04-08 23:25:09.000000000 +0000
++++ Pixie/Makefile.am	2006-04-12 07:40:02.000000000 +0000
+@@ -1,29 +1,8 @@
+ 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
+-
+ man_MANS = man/rndr.1 man/sdrc.1 man/sdrinfo.1 man/texmake.1
+ 
+-EXTRA_DIST = DEVNOTES LICENSE
++doc_DATA = AUTHORS ChangeLog COPYING DEVNOTES LICENSE NEWS README doc/*
+ 
+-dist-hook:
+-	cp -rf $(srcdir)/doc $(DESTDIR)$(distdir)
+-	cp -rf $(srcdir)/shaders $(DESTDIR)$(distdir)
++shader_DATA = shaders/*
+ 
+-install-data-hook:
+-	mkdir -p $(DESTDIR)$(htmldocdir)
+-	cp -rf $(srcdir)/doc/* $(DESTDIR)$(htmldocdir)
+-	mkdir -p $(DESTDIR)$(shaderdir)
+-	cp -rf $(srcdir)/shaders/* $(DESTDIR)$(shaderdir)
+diff -Naurp -Naurp Pixie.orig/configure.in Pixie/configure.in
+--- Pixie.orig/configure.in	2006-04-08 23:25:09.000000000 +0000
++++ Pixie/configure.in	2006-04-12 07:40:02.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
+@@ -101,17 +102,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(displaysdir,
++	AS_HELP_STRING([--with-displaysdir=DIR],[directory to store displays (Default: LIBDIR/Pixie/displays)]),
++	displaysdir="${withval}",
++	displaysdir="${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"
++		displaysdir="${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,displaysdir,[Directory where we store displays])
++AC_DEFINE_DIR(PIXIE_PROCEDURALS,proceduraldir,[Directory where we store procedurals])
+ 
+ dnl ---------------------------------------------------
+ dnl Write the output
+@@ -125,10 +189,3 @@ echo ">make -install"
+ echo "to built Pixie"
+ echo
+ 
+-
+-
+-
+-
+-
+-
+-
+diff -Naurp -Naurp Pixie.orig/src/common/Makefile.am Pixie/src/common/Makefile.am
+--- Pixie.orig/src/common/Makefile.am	2006-04-08 23:25:09.000000000 +0000
++++ Pixie/src/common/Makefile.am	2006-04-12 07:40:02.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 -Naurp Pixie.orig/src/common/os.h Pixie/src/common/os.h
+--- Pixie.orig/src/common/os.h	2006-04-08 23:25:07.000000000 +0000
++++ Pixie/src/common/os.h	2006-04-12 07:40:02.000000000 +0000
+@@ -32,7 +32,10 @@
+ #define OS_H
+ 
+ #include "global.h"
+-#include "../../config.h"
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+ #ifdef WIN32
+ // >> WIN32
+diff -Naurp -Naurp Pixie.orig/src/file/Makefile.am Pixie/src/file/Makefile.am
+--- Pixie.orig/src/file/Makefile.am	2006-04-08 23:25:09.000000000 +0000
++++ Pixie/src/file/Makefile.am	2006-04-12 07:40:02.000000000 +0000
+@@ -1,15 +1,7 @@
+-
+-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 -avoid-version
+ 
+ INCLUDES = -I..
+diff -Naurp -Naurp Pixie.orig/src/framebuffer/Makefile.am Pixie/src/framebuffer/Makefile.am
+--- Pixie.orig/src/framebuffer/Makefile.am	2006-04-08 23:25:09.000000000 +0000
++++ Pixie/src/framebuffer/Makefile.am	2006-04-12 07:40:02.000000000 +0000
+@@ -1,16 +1,9 @@
++displays_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 -avoid-version @X_LDFLAGS@
++framebuffer_la_CXXFLAGS = @X_CFLAGS@
+ 
+ INCLUDES = -I..
+ 
+diff -Naurp -Naurp Pixie.orig/src/openexr/Makefile.am Pixie/src/openexr/Makefile.am
+--- Pixie.orig/src/openexr/Makefile.am	2006-04-08 23:25:09.000000000 +0000
++++ Pixie/src/openexr/Makefile.am	2006-04-12 07:43:07.000000000 +0000
+@@ -1,17 +1,9 @@
+-
+-if SELFCONTAINED
+- displaysdir = $(prefix)/displays
+-else
+- displaysdir = $(libdir)/$(PACKAGE)/displays
+-endif
+-
+ if BUILD_OPENEXR
+  displays_LTLIBRARIES = openexr.la 
+ endif
+ 
+-LIBS = @OPENEXR_LIBS@
+ openexr_la_SOURCES = openexr.cpp
+-openexr_la_LIBADD = ../common/libcommon.a
++openexr_la_LIBADD = ../common/libpixiecommon.la @OPENEXR_LIBS@
+ openexr_la_LDFLAGS = -module -avoid-version
+ 
+ INCLUDES = -I.. @OPENEXR_INCLUDES@
+diff -Naurp -Naurp Pixie.orig/src/precomp/Makefile.am Pixie/src/precomp/Makefile.am
+--- Pixie.orig/src/precomp/Makefile.am	2006-04-08 23:25:09.000000000 +0000
++++ Pixie/src/precomp/Makefile.am	2006-04-12 07:40:02.000000000 +0000
+@@ -2,7 +2,7 @@ noinst_PROGRAMS = precomp 
+ 
+ precomp_SOURCES = precomp.cpp
+ 
+-precomp_LDADD = ../common/libcommon.a
++precomp_LDADD = ../common/libpixiecommon.la
+ 
+ INCLUDES = -I..
+ 
+diff -Naurp -Naurp Pixie.orig/src/rgbe/Makefile.am Pixie/src/rgbe/Makefile.am
+--- Pixie.orig/src/rgbe/Makefile.am	2006-04-08 23:25:09.000000000 +0000
++++ Pixie/src/rgbe/Makefile.am	2006-04-12 07:40:02.000000000 +0000
+@@ -1,14 +1,7 @@
+-
+-if SELFCONTAINED
+- displaysdir = $(prefix)/displays
+-else
+- displaysdir = $(libdir)/$(PACKAGE)/displays
+-endif
+-
+ displays_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 -avoid-version
+ 
+ INCLUDES = -I..
+diff -Naurp -Naurp Pixie.orig/src/ri/Makefile.am Pixie/src/ri/Makefile.am
+--- Pixie.orig/src/ri/Makefile.am	2006-04-08 23:25:09.000000000 +0000
++++ Pixie/src/ri/Makefile.am	2006-04-12 07:40:02.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 \
+@@ -62,8 +66,7 @@ libri_la_SOURCES = 		attributes.cpp \
+ 				xform.cpp	\
+ 				zbuffer.cpp
+ 
+-libri_la_LIBADD = ../common/libcommon.a
+-libri_la_LDFLAGS = -version-info 0:0:0
++libri_la_LIBADD = ../common/libpixiecommon.la @TIFF_LIBS@
+ 
+ INCLUDES = -I..
+ 
+diff -Naurp -Naurp Pixie.orig/src/ri/options.cpp Pixie/src/ri/options.cpp
+--- Pixie.orig/src/ri/options.cpp	2006-04-08 23:25:05.000000000 +0000
++++ Pixie/src/ri/options.cpp	2006-04-12 07:40:02.000000000 +0000
+@@ -37,6 +37,10 @@
+ #include "renderer.h"
+ #include "stats.h"
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ ///////////////////////////////////////////////////////////////////////
+ // Class				:	COptions
+ // Method				:	optionsDeleteSearchPath
+@@ -260,18 +264,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 -Naurp Pixie.orig/src/rndr/Makefile.am Pixie/src/rndr/Makefile.am
+--- Pixie.orig/src/rndr/Makefile.am	2006-04-08 23:25:09.000000000 +0000
++++ Pixie/src/rndr/Makefile.am	2006-04-12 07:40:02.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 -Naurp Pixie.orig/src/sdr/Makefile.am Pixie/src/sdr/Makefile.am
+--- Pixie.orig/src/sdr/Makefile.am	2006-04-08 23:25:10.000000000 +0000
++++ Pixie/src/sdr/Makefile.am	2006-04-12 07:40:02.000000000 +0000
+@@ -1,9 +1,14 @@
+ 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_LDFLAGS = -version-info 0:0:0
++libsdr_la_LIBADD = ../common/libpixiecommon.la
+ 
+ INCLUDES = -I..
+ 
+diff -Naurp -Naurp Pixie.orig/src/sdrc/Makefile.am Pixie/src/sdrc/Makefile.am
+--- Pixie.orig/src/sdrc/Makefile.am	2006-04-08 23:25:10.000000000 +0000
++++ Pixie/src/sdrc/Makefile.am	2006-04-12 07:40:02.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 -Naurp Pixie.orig/src/sdrinfo/Makefile.am Pixie/src/sdrinfo/Makefile.am
+--- Pixie.orig/src/sdrinfo/Makefile.am	2006-04-08 23:25:10.000000000 +0000
++++ Pixie/src/sdrinfo/Makefile.am	2006-04-12 07:40:02.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 -Naurp Pixie.orig/src/show/Makefile.am Pixie/src/show/Makefile.am
+--- Pixie.orig/src/show/Makefile.am	2006-04-08 23:25:10.000000000 +0000
++++ Pixie/src/show/Makefile.am	2006-04-12 07:40:02.000000000 +0000
+@@ -4,9 +4,6 @@ endif
+ 
+ EXTRA_DIST = *.h show.dsp
+ 
+-CFLAGS = @CFLAGS@ @X_CFLAGS@
+-LIBS = @TIFF_LIBS@
+-
+ show_SOURCES = cacheView.cpp \
+ 				radView.cpp \
+ 				interface.cpp \
+@@ -15,7 +12,8 @@ show_SOURCES = cacheView.cpp \
+ 				imageView.cpp \
+ 				show.cpp
+ 
+-show_LDADD = @X_LIBS@ @LIBFLTK@ @LIBFLTKGL@ @X_LDFLAGS@ ../common/libcommon.a
++show_LDADD = @X_LIBS@ @LIBFLTK@ @LIBFLTKGL@ @X_LDFLAGS@ @TIFF_LIBS@ ../common/libpixiecommon.la
++show_CXXFLAGS = @X_CFLAGS@
+ 
+ INCLUDES = -I..
+ 
+diff -Naurp -Naurp Pixie.orig/src/texmake/Makefile.am Pixie/src/texmake/Makefile.am
+--- Pixie.orig/src/texmake/Makefile.am	2006-04-08 23:25:10.000000000 +0000
++++ Pixie/src/texmake/Makefile.am	2006-04-12 07:40:02.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.6.2.ebuild b/media-gfx/pixie/pixie-1.6.2.ebuild
new file mode 100644
index 000000000000..705969c696ec
--- /dev/null
+++ b/media-gfx/pixie/pixie-1.6.2.ebuild
@@ -0,0 +1,59 @@
+# 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.6.2.ebuild,v 1.1 2006/04/12 08:01:46 eradicator Exp $
+
+inherit eutils
+
+IUSE="X openexr"
+
+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
+	 openexr? ( media-libs/openexr )
+	 X? ( || ( x11-libs/libXext virtual/x11 ) )"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	>=sys-devel/automake-1.8"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# Make the build process more cross-platform...
+	epatch ${FILESDIR}/${PN}-1.6.2-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}
+}