Version bump and cleanup.

12 files changed, 20 insertions, 333 deletions

diff --git a/media-gfx/pixie/ChangeLog b/media-gfx/pixie/ChangeLog
index fa342b92618b..d50975100e6e 100644
--- a/media-gfx/pixie/ChangeLog
+++ b/media-gfx/pixie/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/pixie
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.8 2004/09/01 08:41:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.9 2004/09/22 07:41:29 eradicator Exp $
+
+*pixie-1.3.20 (22 Sep 2004)
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/pixie-1.3.11-Makefile.patch, -files/pixie-1.3.11-gcc3.4.patch,
+  -files/pixie-1.3.11-pic.patch, -files/pixie-1.3.5-Makefile.patch,
+  -files/pixie-1.3.5-math.patch, -pixie-1.3.11.ebuild, +pixie-1.3.20.ebuild,
+  -pixie-1.3.5-r1.ebuild:
+  Version bump and cleanup.
 
   01 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> pixie-1.3.13.ebuild:
   Stable sparc x86.
diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest
index 8e7404656fb1..ba58cb9af4c2 100644
--- a/media-gfx/pixie/Manifest
+++ b/media-gfx/pixie/Manifest
@@ -2,11 +2,13 @@ MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
 MD5 5a33dd03ee41fa088d4e32dfb0ede9dd pixie-1.3.5-r1.ebuild 1077
 MD5 75a679b7cb96c7e91a5081a9b4876dfb ChangeLog 1398
 MD5 d2448bbf84f39d4cf43255afa5329e15 pixie-1.3.11.ebuild 1438
+MD5 8c10b46a19766805b1ea389be8cbc182 pixie-1.3.20.ebuild 1339
 MD5 8c10b46a19766805b1ea389be8cbc182 pixie-1.3.13.ebuild 1339
 MD5 cb8ed959bdd211afc4edb2b0607b5f66 files/50pixie 41
 MD5 c3ecef6a787c76274c3123507835c714 files/digest-pixie-1.3.5-r1 65
 MD5 b8cf2dce5fa4e8619c3c3dd4279373b7 files/pixie-1.3.5-Makefile.patch 582
 MD5 30df58c025e459f98cf3aec8548defbb files/pixie-1.3.5-math.patch 992
+MD5 69efa93b4d0b4b3c99bab05baeca8c3d files/digest-pixie-1.3.20 66
 MD5 135dd3e8ee555dcdf2312d1895e61a9e files/pixie-1.3.11-Makefile.patch 436
 MD5 5c5e69938a1ff57dc47a4b82450e9f77 files/digest-pixie-1.3.11 66
 MD5 44355ed7501f8b6bb524b9c6aa348dc7 files/pixie-1.3.11-gentoo.patch 417
diff --git a/media-gfx/pixie/files/digest-pixie-1.3.11 b/media-gfx/pixie/files/digest-pixie-1.3.11
deleted file mode 100644
index 5e0cb445616e..000000000000
--- a/media-gfx/pixie/files/digest-pixie-1.3.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4c0935f1f0fefeaaa303d6e1a5c1f7ac Pixie-src-1.3.11.tgz 4925938
diff --git a/media-gfx/pixie/files/digest-pixie-1.3.20 b/media-gfx/pixie/files/digest-pixie-1.3.20
new file mode 100644
index 000000000000..b418897e5de9
--- /dev/null
+++ b/media-gfx/pixie/files/digest-pixie-1.3.20
@@ -0,0 +1 @@
+MD5 3fef0588af57af5ea2521a0805a30c92 Pixie-src-1.3.20.tgz 4924993
diff --git a/media-gfx/pixie/files/digest-pixie-1.3.5-r1 b/media-gfx/pixie/files/digest-pixie-1.3.5-r1
deleted file mode 100644
index fbafc3db7e82..000000000000
--- a/media-gfx/pixie/files/digest-pixie-1.3.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 244a168fe7942d449566c8ad15e6caf9 Pixie-src-1.3.5.tgz 4269413
diff --git a/media-gfx/pixie/files/pixie-1.3.11-Makefile.patch b/media-gfx/pixie/files/pixie-1.3.11-Makefile.patch
deleted file mode 100644
index 6c69c3940829..000000000000
--- a/media-gfx/pixie/files/pixie-1.3.11-Makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur Pixie.orig/Makefile.am Pixie.Makefile/Makefile.am
---- Pixie.orig/Makefile.am	2004-06-13 20:00:09.000000000 -0700
-+++ Pixie.Makefile/Makefile.am	2004-06-14 18:33:41.169944272 -0700
-@@ -11,8 +11,8 @@
- 	cp -rf $(srcdir)/shaders $(distdir)
- 
- install-data-local:
--	cp -rf $(srcdir)/doc $(prefix)
--	cp -rf $(srcdir)/shaders $(prefix)
-+	cp -rf $(srcdir)/doc $(DESTDIR)$(prefix)
-+	cp -rf $(srcdir)/shaders $(DESTDIR)$(prefix)
- 
- 
- 
diff --git a/media-gfx/pixie/files/pixie-1.3.11-gcc3.4.patch b/media-gfx/pixie/files/pixie-1.3.11-gcc3.4.patch
deleted file mode 100644
index cd28046d2b0d..000000000000
--- a/media-gfx/pixie/files/pixie-1.3.11-gcc3.4.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-diff -Naur Pixie.orig/src/common/containers.h Pixie.gcc34/src/common/containers.h
---- Pixie.orig/src/common/containers.h	2004-06-13 20:00:09.000000000 -0700
-+++ Pixie.gcc34/src/common/containers.h	2004-06-14 19:02:34.133763870 -0700
-@@ -53,13 +53,13 @@
- 	virtual				~CDictionary()	{	}
- 
- 						// inserts an entity into the dictionary
--	virtual	void		insert(keyType,valType)				=	NULL;
-+	virtual	void		insert(keyType,valType)				=	0;
- 						// return 1 if the entity is found in the dictionary
--	virtual	int			find(keyType,valType &)	const		=	NULL;
-+	virtual	int			find(keyType,valType &)	const		=	0;
- 						// return 1 if the entity is found in the dictionary and erase it
--	virtual	int			erase(keyType,valType &)			=	NULL;
-+	virtual	int			erase(keyType,valType &)			=	0;
- 						// Delete the dictionary including everything in it
--	virtual	void		destroy()							=	NULL;
-+	virtual	void		destroy()							=	0;
- };
- 
- ///////////////////////////////////////////////////////////////////////
-diff -Naur Pixie.orig/src/framebuffer/framebuffer.h Pixie.gcc34/src/framebuffer/framebuffer.h
---- Pixie.orig/src/framebuffer/framebuffer.h	2004-06-13 20:00:09.000000000 -0700
-+++ Pixie.gcc34/src/framebuffer/framebuffer.h	2004-06-14 19:01:19.992178690 -0700
-@@ -50,8 +50,8 @@
- 	char			*name;									// Name of the display
- 	char			*samples;								// Samples for the display
- 
--	virtual	int		data(int,int,int,int,float *)	= NULL;	// Store data
--	virtual	void	finish()						= NULL;	// Finish displaying the data
-+	virtual	int		data(int,int,int,int,float *)	= 0;	// Store data
-+	virtual	void	finish()						= 0;	// Finish displaying the data
- 
- 			void	clampData(int,int,float *);				// Clamp the data so that everything is between 0 and 1
- };
-diff -Naur Pixie.orig/src/ri/cache.h Pixie.gcc34/src/ri/cache.h
---- Pixie.orig/src/ri/cache.h	2004-06-13 20:00:06.000000000 -0700
-+++ Pixie.gcc34/src/ri/cache.h	2004-06-14 19:02:59.297550257 -0700
-@@ -52,8 +52,8 @@
- 					CCache(const char *,unsigned int);
- 					~CCache();
- 
--	virtual	void	lookup(float *,const float *,const float *,const CGlobalIllumLookup *)		=	NULL;
--	virtual	void	cachesample(float *,const float *,const float *,float)						=	NULL;
-+	virtual	void	lookup(float *,const float *,const float *,const CGlobalIllumLookup *)		=	0;
-+	virtual	void	cachesample(float *,const float *,const float *,float)						=	0;
- 	virtual	void	finalize(const CGlobalIllumLookup *)	{	}
- 
- protected:
-diff -Naur Pixie.orig/src/ri/hierarchy.h Pixie.gcc34/src/ri/hierarchy.h
---- Pixie.orig/src/ri/hierarchy.h	2004-06-13 20:00:06.000000000 -0700
-+++ Pixie.gcc34/src/ri/hierarchy.h	2004-06-14 19:04:02.661940051 -0700
-@@ -49,9 +49,9 @@
- // Date last edited		:	3/18/2002
- class	CTracable {
- public:
--	virtual	void	bound(float *,float *) const					=	NULL;
--	virtual	void	intersect(CRay *)								=	NULL;
--	virtual	int		intersect(const float *,const float *) const	=	NULL;
-+	virtual	void	bound(float *,float *) const					=	0;
-+	virtual	void	intersect(CRay *)								=	0;
-+	virtual	int		intersect(const float *,const float *) const	=	0;
- 
- 	int				ID;
- };
-diff -Naur Pixie.orig/src/ri/reyes.h Pixie.gcc34/src/ri/reyes.h
---- Pixie.orig/src/ri/reyes.h	2004-06-13 20:00:07.000000000 -0700
-+++ Pixie.gcc34/src/ri/reyes.h	2004-06-14 19:03:21.869770596 -0700
-@@ -123,10 +123,10 @@
- 	void						renderFrame();									// Right after world end to force rendering of the entire frame
- 
- 								// The following functions must be overriden by the child rasterizer
--	virtual	void				rasterBegin(int,int,int,int)				=	NULL;
--	virtual	void				rasterDrawPrimitives(TRasterPrimitive *,int)=	NULL;
--	virtual	int					rasterProbeTri(TRasterPrimitive *)			=	NULL;
--	virtual	void				rasterEnd(float *)							=	NULL;
-+	virtual	void				rasterBegin(int,int,int,int)				=	0;
-+	virtual	void				rasterDrawPrimitives(TRasterPrimitive *,int)=	0;
-+	virtual	int					rasterProbeTri(TRasterPrimitive *)			=	0;
-+	virtual	void				rasterEnd(float *)							=	0;
- 	
- 	
- 	void						drawObject(CObject *,const float *,const float *);			// Draw an object
-diff -Naur Pixie.orig/src/ri/shader.h Pixie.gcc34/src/ri/shader.h
---- Pixie.orig/src/ri/shader.h	2004-06-13 20:00:07.000000000 -0700
-+++ Pixie.gcc34/src/ri/shader.h	2004-06-14 19:03:45.208862524 -0700
-@@ -211,7 +211,7 @@
- // Date last edited		:	3/23/2003
- class	CGatherVariable {
- public:
--	virtual	void	record(int,CGatherRay **,float **varying)	=	NULL;
-+	virtual	void	record(int,CGatherRay **,float **varying)	=	0;
- 
- 	CGatherVariable	*next;		// The next item in the linked list
- 	int				shade;		// TRUE if this variable requires shading
-@@ -395,12 +395,12 @@
- 		void					detach()	{	refCount--; if (refCount == 0) delete this; }
- 		void					check()		{	if (refCount == 0)	delete this;			}
- 
--		virtual	void			illuminate(CShadingContext *)		=	NULL;
--		virtual	void			setParameters(int,char **,void **)	=	NULL;
--		virtual int				getParameter(const char *,void *)	=	NULL;
--		virtual	void			execute(CShadingContext *)			=	NULL;
--		virtual	unsigned int	requiredParameters()				=	NULL;
--		virtual	const char		*getName()							=	NULL;
-+		virtual	void			illuminate(CShadingContext *)		=	0;
-+		virtual	void			setParameters(int,char **,void **)	=	0;
-+		virtual int				getParameter(const char *,void *)	=	0;
-+		virtual	void			execute(CShadingContext *)			=	0;
-+		virtual	unsigned int	requiredParameters()				=	0;
-+		virtual	const char		*getName()							=	0;
- 
- 		int						refCount;						// The refcount to manage the clones
- 		CXform					*xform;
-diff -Naur Pixie.orig/src/ri/shading.h Pixie.gcc34/src/ri/shading.h
---- Pixie.orig/src/ri/shading.h	2004-06-13 20:00:07.000000000 -0700
-+++ Pixie.gcc34/src/ri/shading.h	2004-06-14 19:04:38.863878128 -0700
-@@ -176,10 +176,10 @@
- 		int						depth;										// The transparency depth of the bundle
- 		CShaderInstance			*postShader;								// The shader to execute after the raytrace
- 
--		virtual	int				postTraceAction()				=	NULL;	// The function to be called after the rays are traced
--		virtual	void			postShade(int,CRay **,float **)	=	NULL;	// The function that's called with the shade results
--		virtual	void			postShade(int,CRay **)			=	NULL;	// The function that's called with the rays that don't intersect anything
--		virtual	void			post()							=	NULL;	// The function that's called after each pass
-+		virtual	int				postTraceAction()				=	0;	// The function to be called after the rays are traced
-+		virtual	void			postShade(int,CRay **,float **)	=	0;	// The function that's called with the shade results
-+		virtual	void			postShade(int,CRay **)			=	0;	// The function that's called with the rays that don't intersect anything
-+		virtual	void			post()							=	0;	// The function that's called after each pass
- };
- 
- 
-@@ -201,17 +201,17 @@
- 		void					beginWorld();											// We're starting to specify geometry
- 		void					endWorld();												// We're done specifying geometry
- 
--		virtual	void			renderFrame()					=	NULL;				// Right after world end to force rendering of the entire frame
-+		virtual	void			renderFrame()					=	0;				// Right after world end to force rendering of the entire frame
- 
- 		// Delayed rendering functions
--		virtual	void			drawObject(CObject *,const float *,const float *)		=	NULL;
--		virtual	void			drawTriangle(CObject *,const float *,const float *,const float *) = NULL;
--		virtual	void			drawQuad(CObject *,const float *,const float *,const float *,const float *) = NULL;
-+		virtual	void			drawObject(CObject *,const float *,const float *)		=	0;
-+		virtual	void			drawTriangle(CObject *,const float *,const float *,const float *) = 0;
-+		virtual	void			drawQuad(CObject *,const float *,const float *,const float *,const float *) = 0;
- 
- 		// Primitive creation functions
--		virtual	void			drawGrid(CSurface *,int,int,float,float,float,float)	=	NULL;
--		virtual	void			drawRibbon(CSurface *,int,float,float)					=	NULL;
--		virtual	void			drawPoints(CSurface *,int)								=	NULL;
-+		virtual	void			drawGrid(CSurface *,int,int,float,float,float,float)	=	0;
-+		virtual	void			drawRibbon(CSurface *,int,float,float)					=	0;
-+		virtual	void			drawPoints(CSurface *,int)								=	0;
- 
- 		// Some shading functions
- 		CShadingState			*currentShadingState;									// The current shading state
-diff -Naur Pixie.orig/src/ri/texture.h Pixie.gcc34/src/ri/texture.h
---- Pixie.orig/src/ri/texture.h	2004-06-13 20:00:08.000000000 -0700
-+++ Pixie.gcc34/src/ri/texture.h	2004-06-14 19:04:53.404443347 -0700
-@@ -83,7 +83,7 @@
- 	int					fileWidth,fileHeight;											// The physical size in the file
- protected:
- 	// This function must be overriden by the child class
--	virtual	void		lookupPixel(float *,int,int,const CTextureLookup *)	=	NULL;	// Lookup 4 pixel values
-+	virtual	void		lookupPixel(float *,int,int,const CTextureLookup *)	=	0;	// Lookup 4 pixel values
- };
- 
- 
diff --git a/media-gfx/pixie/files/pixie-1.3.11-pic.patch b/media-gfx/pixie/files/pixie-1.3.11-pic.patch
deleted file mode 100644
index 81ec5fcc5bc3..000000000000
--- a/media-gfx/pixie/files/pixie-1.3.11-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Pixie.orig/src/common/Makefile.am Pixie.amd64/src/common/Makefile.am
---- Pixie.orig/src/common/Makefile.am	2004-06-13 20:00:09.000000000 -0700
-+++ Pixie.amd64/src/common/Makefile.am	2004-06-14 18:59:50.884099612 -0700
-@@ -1,6 +1,8 @@
- noinst_LIBRARIES = libcommon.a 
- 
- libcommon_a_SOURCES = algebra.cpp os.cpp memoryman.cpp
-+libcommon_a_CFLAGS = -fPIC -DPIC
-+libcommon_a_CXXFLAGS = -fPIC -DPIC
- 
- EXTRA_DIST = *.h *.cpp *.dsp
- 
diff --git a/media-gfx/pixie/files/pixie-1.3.5-Makefile.patch b/media-gfx/pixie/files/pixie-1.3.5-Makefile.patch
deleted file mode 100644
index 19446e92e3f9..000000000000
--- a/media-gfx/pixie/files/pixie-1.3.5-Makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.am.orig	2004-04-29 16:49:45.000000000 -0700
-+++ Makefile.am	2004-04-29 17:06:12.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,11 +7,6 @@
- 	cp -rf $(srcdir)/shaders $(distdir)
- 
- install-data-local:
--	cp -rf $(srcdir)/doc $(prefix)
--	cp -rf $(srcdir)/shaders $(prefix)
--
--
--
--
--
-+	cp -rf $(srcdir)/doc $(DESTDIR)$(prefix)
-+	cp -rf $(srcdir)/shaders $(DESTDIR)$(prefix)
- 
diff --git a/media-gfx/pixie/files/pixie-1.3.5-math.patch b/media-gfx/pixie/files/pixie-1.3.5-math.patch
deleted file mode 100644
index 18366104e2fc..000000000000
--- a/media-gfx/pixie/files/pixie-1.3.5-math.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/common/global.h.orig	2004-04-29 17:30:45.000000000 -0700
-+++ src/common/global.h	2004-04-29 17:33:40.000000000 -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
-@@ -54,21 +56,33 @@
- 
- // Come constant definitions
- // Math constants
-+#ifndef INFINITY
- #define	INFINITY							(float) 1e30
--#define	EPSILON								(float) 1e-6
-+#endif
- 
-+#define	EPSILON								(float) 1e-6
- 
- // The most famous number
- #ifndef PI
-+#ifdef M_PI
-+#define PI M_PI
-+#else
- #define	PI									(float) 3.141592653589793238462643383279502884197169399375105820974944592308
-+#endif
-+#endif
-+
-+#ifndef DOUBLE_PI
-+#ifdef M_PIl
-+#define DOUBLE_PI M_PIl
-+#else
- #define	DOUBLE_PI							3.141592653589793238462643383279502884197169399375105820974944592308
- #endif
-+#endif
- 
- // Logic constants
- #define	TRUE								1
- #define	FALSE								0
- 
--
- // Misc Options and Attributes constants
- #ifdef min
- #undef min
diff --git a/media-gfx/pixie/pixie-1.3.11.ebuild b/media-gfx/pixie/pixie-1.3.20.ebuild
index ad06ffdac0c7..327a82f89a08 100644
--- a/media-gfx/pixie/pixie-1.3.11.ebuild
+++ b/media-gfx/pixie/pixie-1.3.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.11.ebuild,v 1.3 2004/07/19 19:10:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.20.ebuild,v 1.1 2004/09/22 07:41:29 eradicator Exp $
 
 inherit eutils
 
@@ -30,14 +30,12 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	# These have been sent upstream
-	epatch ${FILESDIR}/${P}-Makefile.patch
-	epatch ${FILESDIR}/${P}-gcc3.4.patch
-	epatch ${FILESDIR}/${P}-math.patch
-	epatch ${FILESDIR}/${P}-pic.patch
-
-	# Gentoo-specific stuff
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	# 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.3.11-gentoo.patch
 
 	# redirecting aclocal to /dev/null because there are alot of warnings
 	# output for deprecated stuff in 1.8.5
diff --git a/media-gfx/pixie/pixie-1.3.5-r1.ebuild b/media-gfx/pixie/pixie-1.3.5-r1.ebuild
deleted file mode 100644
index 799ce5a85c4b..000000000000
--- a/media-gfx/pixie/pixie-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.5-r1.ebuild,v 1.5 2004/07/19 19:10:39 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="~x86 ~ppc ~sparc"
-
-RDEPEND="media-libs/jpeg
-	 sys-libs/zlib
-	 media-libs/tiff
-	 X? ( virtual/x11 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/automake"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-math.patch
-	epatch ${FILESDIR}/${P}-Makefile.patch
-	WANT_AUTOMAKE=1.4 automake
-}
-
-src_compile() {
-	./configure --prefix=/opt/pixie || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog DEVNOTES NEWS README
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/50pixie
-
-	edos2unix ${D}/opt/pixie/shaders/*
-
-	mv ${D}/opt/pixie/doc ${D}/usr/share/doc/${PF}/html
-}