bug 75912

Package-Manager: portage-2.0.51.22-r2

7 files changed, 19 insertions, 429 deletions

diff --git a/media-gfx/truevision/ChangeLog b/media-gfx/truevision/ChangeLog
index df45a7ca30a0..9c31ab9c1c3f 100644
--- a/media-gfx/truevision/ChangeLog
+++ b/media-gfx/truevision/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/truevision
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/truevision/ChangeLog,v 1.5 2004/06/24 22:51:01 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/truevision/ChangeLog,v 1.6 2005/08/09 20:58:40 vanquirius Exp $
+
+  09 Aug 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/truevision-0.3.10-gentoo1.patch,
+  -files/truevision-0.3.10-gentoo2.patch,
+  -files/truevision-0.3.10-gentoo3.patch, truevision-0.3.10.ebuild:
+  Add patch from bug 75912, move patches to mirrors. Fixes bug 75912. Thanks
+  to psk <gentoo@feeleas.org>, Marnix Klooster <marnix.klooster@gmail.com> and
+  others.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> truevision-0.3.10.ebuild:
   Add inherit eutils
diff --git a/media-gfx/truevision/Manifest b/media-gfx/truevision/Manifest
index b6fbfa92ece1..8893282515b0 100644
--- a/media-gfx/truevision/Manifest
+++ b/media-gfx/truevision/Manifest
@@ -1,7 +1,4 @@
-MD5 0dc7aacf23896a2396c051542476b299 truevision-0.3.10.ebuild 1192
-MD5 3a3f16f981475f40d09cd88537de3b46 ChangeLog 798
+MD5 9da200cf0cba8f50e7871458a1ae51cb truevision-0.3.10.ebuild 1121
+MD5 246cf789fef5822e50ae958af2bb42db ChangeLog 1171
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 9085c40eee347c530e117a0f6a8ae551 files/truevision-0.3.10-gentoo1.patch 8565
-MD5 39d2d26f905c503453e3629b2989b845 files/truevision-0.3.10-gentoo2.patch 8055
-MD5 0c66c4f3bc3edf17a100befe56959457 files/digest-truevision-0.3.10 149
-MD5 63ac8e8758dc811648edcf1e98fbb5b4 files/truevision-0.3.10-gentoo3.patch 667
+MD5 fd3f729570328f8ed534b1490a977561 files/digest-truevision-0.3.10 226
diff --git a/media-gfx/truevision/files/digest-truevision-0.3.10 b/media-gfx/truevision/files/digest-truevision-0.3.10
index a5a0906b3d06..09f5e15fa960 100644
--- a/media-gfx/truevision/files/digest-truevision-0.3.10
+++ b/media-gfx/truevision/files/digest-truevision-0.3.10
@@ -1,2 +1,3 @@
 MD5 260acc07ffb0943554816eb47d4be88b truevision-0.3.10.tar.gz 1088249
 MD5 658bf82b0000435b04737de181e534e5 truevision-extramat-0.3.10.tar.gz 1738369
+MD5 7f9b96ef904729e639a7bf5da08103b7 truevision-0.3.10-genpatch.tar.bz2 3171
diff --git a/media-gfx/truevision/files/truevision-0.3.10-gentoo1.patch b/media-gfx/truevision/files/truevision-0.3.10-gentoo1.patch
deleted file mode 100644
index 9d8954673066..000000000000
--- a/media-gfx/truevision/files/truevision-0.3.10-gentoo1.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-diff -U3 -r truevision-0.3.10/configure truevision-0.3.10-patched/configure
---- truevision-0.3.10/configure	2002-01-01 06:43:00.000000000 -0500
-+++ truevision-0.3.10-patched/configure	2003-03-15 18:38:04.000000000 -0500
-@@ -4629,11 +4629,11 @@
- 
- 
- 
--PACKAGE_PIXMAPS_DIR="`gnome-config --datadir`/pixmaps/${PACKAGE}"
-+PACKAGE_PIXMAPS_DIR="${datadir}/pixmaps/${PACKAGE}"
- 
- 
- 
--PACKAGE_MATERIALS_DIR="`gnome-config --datadir`/${PACKAGE}/materials"
-+PACKAGE_MATERIALS_DIR="${datadir}/${PACKAGE}/materials"
- 
- 
- 
-diff -U3 -r truevision-0.3.10/src/density.cc truevision-0.3.10-patched/src/density.cc
---- truevision-0.3.10/src/density.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/density.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -49,7 +49,7 @@
- //**************************************
- // Constructeur
- //**************************************
--PovTexDensity::PovTexDensity( app_objs *appref, void (*asuicidal_func)(gpointer, gpointer), gpointer amother, bool is_top=true ) : MaterialItem( app_ref )
-+PovTexDensity::PovTexDensity( app_objs *appref, void (*asuicidal_func)(gpointer, gpointer), gpointer amother, bool is_top ) : MaterialItem( app_ref )
- {
- num = ++count;
- char text[25];
-@@ -74,7 +74,7 @@
- warp = new TvWidget_warp_rb( N_("Warp"), "WARP", NULL, app_ref );
- }
- 
--void PovTexDensity::set_params( void (*asuicidal_func)(gpointer, gpointer), gpointer amother, bool is_top=true )
-+void PovTexDensity::set_params( void (*asuicidal_func)(gpointer, gpointer), gpointer amother, bool is_top )
- {
- suicidal_func = asuicidal_func;
- mother = amother;
-@@ -337,7 +337,7 @@
- if ( map_editor != NULL ) map_editor->flush();
- }
- 
--void PovTexDensity::output_to_povray( ofstream & file, bool inmap = false )
-+void PovTexDensity::output_to_povray( ofstream & file, bool inmap )
- {
- if ( !inmap ) file << "\n\t\t\tdensity {\n\t\t\t\t";
- 
-diff -U3 -r truevision-0.3.10/src/dlgutils.cc truevision-0.3.10-patched/src/dlgutils.cc
---- truevision-0.3.10/src/dlgutils.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/dlgutils.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -41,7 +41,7 @@
- }
- 
- // Double box
--GtkWidget *dlg_double_box( GtkWidget *parent, GtkWidget* &vbox1, GtkWidget* &vbox2, bool packed = false )
-+GtkWidget *dlg_double_box( GtkWidget *parent, GtkWidget* &vbox1, GtkWidget* &vbox2, bool packed )
- {
- GtkWidget *hbox = gtk_hbox_new( TRUE, 5 );
- if ( packed ) gtk_box_pack_start( GTK_BOX(parent), hbox, TRUE, TRUE, 1 );
-diff -U3 -r truevision-0.3.10/src/mapedit.cc truevision-0.3.10-patched/src/mapedit.cc
---- truevision-0.3.10/src/mapedit.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/mapedit.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -28,7 +28,7 @@
- //********************************************
- // MAP ITEM
- //********************************************
--MapItem::MapItem( char *nom, float val = -1 )
-+MapItem::MapItem( char *nom, float val)
- {
- name = nom;
- value = val;
-diff -U3 -r truevision-0.3.10/src/material.cc truevision-0.3.10-patched/src/material.cc
---- truevision-0.3.10/src/material.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/material.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -66,7 +66,7 @@
- //**************************************
- // Add to list
- //**************************************
--void Material::add_to_list( GtkWidget *list, int position = -1 )
-+void Material::add_to_list( GtkWidget *list, int position)
- {
- clist = GTK_CLIST( list );
- gchar *titre[] = { name->value() };
-@@ -182,7 +182,7 @@
- item_type = ref.item_type;
- }
- 
--void MaterialItem::add_to_tree( GtkCTree *tree, GtkCTreeNode *node , GtkCTreeNode *sibling = NULL )
-+void MaterialItem::add_to_tree( GtkCTree *tree, GtkCTreeNode *node , GtkCTreeNode *sibling)
- {
- ctree = tree;
- parent_node = node;
-diff -U3 -r truevision-0.3.10/src/matpov.cc truevision-0.3.10-patched/src/matpov.cc
---- truevision-0.3.10/src/matpov.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/matpov.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -600,7 +600,7 @@
- }
- 
- 
--void PovTexture::output_to_povray( ofstream & file, bool inmap = false )
-+void PovTexture::output_to_povray( ofstream & file, bool inmap )
- {
- //if ( !is_used() ) return;
- 
-diff -U3 -r truevision-0.3.10/src/texnormal.cc truevision-0.3.10-patched/src/texnormal.cc
---- truevision-0.3.10/src/texnormal.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/texnormal.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -44,7 +44,7 @@
- //**************************************
- // Constructeurs & Destructeurs
- //**************************************
--PovTexNormal::PovTexNormal( app_objs *appref, bool mother = true ) : MaterialItem( app_ref )
-+PovTexNormal::PovTexNormal( app_objs *appref, bool mother ) : MaterialItem( app_ref )
- {
- set_name( _("Normal") );
- item_type = TV_MITEM_NORMAL;
-diff -U3 -r truevision-0.3.10/src/texpigment.cc truevision-0.3.10-patched/src/texpigment.cc
---- truevision-0.3.10/src/texpigment.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/texpigment.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -48,7 +48,7 @@
- //**************************************
- // Constructeur
- //**************************************
--PovTexPigment::PovTexPigment( app_objs *appref, bool mother = true ) : MaterialItem( appref )
-+PovTexPigment::PovTexPigment( app_objs *appref, bool mother ) : MaterialItem( appref )
- {
- set_name( _("Pigment") );
- item_type = TV_MITEM_PIGMENT;
-@@ -373,7 +373,7 @@
- }
- 
- 
--void PovTexPigment::output_to_povray( ofstream & file, bool in_map=false )
-+void PovTexPigment::output_to_povray( ofstream & file, bool in_map )
- {
- if ( !used->value() ) return;
- if ( !in_map ) file << "\n\t\tpigment {\n\t\t\t";
-diff -U3 -r truevision-0.3.10/src/tvwidgets.cc truevision-0.3.10-patched/src/tvwidgets.cc
---- truevision-0.3.10/src/tvwidgets.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/tvwidgets.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -56,7 +56,7 @@
- in_update = false;
- }
- 
--void TvWidget::pack_widget( GtkWidget *box, bool tt, GtkWidget *target=NULL )
-+void TvWidget::pack_widget( GtkWidget *box, bool tt, GtkWidget *target )
- {
- if ( tt && tooltip != NULL ) 
- 	{
-diff -U3 -r truevision-0.3.10/src/tvwidgets2.cc truevision-0.3.10-patched/src/tvwidgets2.cc
---- truevision-0.3.10/src/tvwidgets2.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/tvwidgets2.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -887,7 +887,7 @@
- const char *bfiletype_ext[bfiletype_num] = { "df3" };
- const char *bfiletype_def[bfiletype_num] = { " df3 " };
- 
--TvWidget_blendmap::TvWidget_blendmap(  const char *name, const char *sname, const char *tooltip, app_objs *appref, bool is_colmap = false )
-+TvWidget_blendmap::TvWidget_blendmap(  const char *name, const char *sname, const char *tooltip, app_objs *appref, bool is_colmap )
-  : TvWidget( name, sname, tooltip, appref )
- {
- option_box = NULL;
-diff -U3 -r truevision-0.3.10/src/undo.cc truevision-0.3.10-patched/src/undo.cc
---- truevision-0.3.10/src/undo.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/undo.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -181,7 +181,7 @@
- }
- 
- // Undo layers creation / deletion / move		
--void UndoRedoManager::push( UndoAction act, ObjectLayer *lay, int sens = -1 )
-+void UndoRedoManager::push( UndoAction act, ObjectLayer *lay, int sens )
- {
- UndoItem *item = new UndoItem( act, lay, sens );
- UndoList.push_back( item );
-@@ -191,7 +191,7 @@
- }
- 
- // Undo materials creation / deletion / move		
--void UndoRedoManager::push( UndoAction act, Material *mat, int position = -1 )
-+void UndoRedoManager::push( UndoAction act, Material *mat, int position )
- {
- UndoItem *item = new UndoItem( act, mat, position );
- UndoList.push_back( item );
-@@ -231,7 +231,7 @@
- // The main function used
- // in fact it is also used for redo ;-)
- //***************************************************
--void UndoRedoManager::undo( bool doredo = false )
-+void UndoRedoManager::undo( bool doredo )
- {
- // Define source & destination lists
- // The determine if we act as undo or redo...
-diff -U3 -r truevision-0.3.10/src/undo.h truevision-0.3.10-patched/src/undo.h
---- truevision-0.3.10/src/undo.h	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/undo.h	2003-03-15 18:38:29.000000000 -0500
-@@ -65,7 +65,7 @@
- // one for undo and the other for redo
- //**********************************************************
- class UndoItem {
--	friend UndoRedoManager;
-+	friend struct UndoRedoManager;
- 
- 	private:
- 		UndoAction action;
diff --git a/media-gfx/truevision/files/truevision-0.3.10-gentoo2.patch b/media-gfx/truevision/files/truevision-0.3.10-gentoo2.patch
deleted file mode 100644
index da3e6da24ddc..000000000000
--- a/media-gfx/truevision/files/truevision-0.3.10-gentoo2.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-diff -U3 -r truevision-0.3.10/src/density.cc truevision-0.3.10-patched/src/density.cc
---- truevision-0.3.10/src/density.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/density.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -49,7 +49,7 @@
- //**************************************
- // Constructeur
- //**************************************
--PovTexDensity::PovTexDensity( app_objs *appref, void (*asuicidal_func)(gpointer, gpointer), gpointer amother, bool is_top=true ) : MaterialItem( app_ref )
-+PovTexDensity::PovTexDensity( app_objs *appref, void (*asuicidal_func)(gpointer, gpointer), gpointer amother, bool is_top ) : MaterialItem( app_ref )
- {
- num = ++count;
- char text[25];
-@@ -74,7 +74,7 @@
- warp = new TvWidget_warp_rb( N_("Warp"), "WARP", NULL, app_ref );
- }
- 
--void PovTexDensity::set_params( void (*asuicidal_func)(gpointer, gpointer), gpointer amother, bool is_top=true )
-+void PovTexDensity::set_params( void (*asuicidal_func)(gpointer, gpointer), gpointer amother, bool is_top )
- {
- suicidal_func = asuicidal_func;
- mother = amother;
-@@ -337,7 +337,7 @@
- if ( map_editor != NULL ) map_editor->flush();
- }
- 
--void PovTexDensity::output_to_povray( ofstream & file, bool inmap = false )
-+void PovTexDensity::output_to_povray( ofstream & file, bool inmap )
- {
- if ( !inmap ) file << "\n\t\t\tdensity {\n\t\t\t\t";
- 
-diff -U3 -r truevision-0.3.10/src/dlgutils.cc truevision-0.3.10-patched/src/dlgutils.cc
---- truevision-0.3.10/src/dlgutils.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/dlgutils.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -41,7 +41,7 @@
- }
- 
- // Double box
--GtkWidget *dlg_double_box( GtkWidget *parent, GtkWidget* &vbox1, GtkWidget* &vbox2, bool packed = false )
-+GtkWidget *dlg_double_box( GtkWidget *parent, GtkWidget* &vbox1, GtkWidget* &vbox2, bool packed )
- {
- GtkWidget *hbox = gtk_hbox_new( TRUE, 5 );
- if ( packed ) gtk_box_pack_start( GTK_BOX(parent), hbox, TRUE, TRUE, 1 );
-diff -U3 -r truevision-0.3.10/src/mapedit.cc truevision-0.3.10-patched/src/mapedit.cc
---- truevision-0.3.10/src/mapedit.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/mapedit.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -28,7 +28,7 @@
- //********************************************
- // MAP ITEM
- //********************************************
--MapItem::MapItem( char *nom, float val = -1 )
-+MapItem::MapItem( char *nom, float val)
- {
- name = nom;
- value = val;
-diff -U3 -r truevision-0.3.10/src/material.cc truevision-0.3.10-patched/src/material.cc
---- truevision-0.3.10/src/material.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/material.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -66,7 +66,7 @@
- //**************************************
- // Add to list
- //**************************************
--void Material::add_to_list( GtkWidget *list, int position = -1 )
-+void Material::add_to_list( GtkWidget *list, int position)
- {
- clist = GTK_CLIST( list );
- gchar *titre[] = { name->value() };
-@@ -182,7 +182,7 @@
- item_type = ref.item_type;
- }
- 
--void MaterialItem::add_to_tree( GtkCTree *tree, GtkCTreeNode *node , GtkCTreeNode *sibling = NULL )
-+void MaterialItem::add_to_tree( GtkCTree *tree, GtkCTreeNode *node , GtkCTreeNode *sibling)
- {
- ctree = tree;
- parent_node = node;
-diff -U3 -r truevision-0.3.10/src/matpov.cc truevision-0.3.10-patched/src/matpov.cc
---- truevision-0.3.10/src/matpov.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/matpov.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -600,7 +600,7 @@
- }
- 
- 
--void PovTexture::output_to_povray( ofstream & file, bool inmap = false )
-+void PovTexture::output_to_povray( ofstream & file, bool inmap )
- {
- //if ( !is_used() ) return;
- 
-diff -U3 -r truevision-0.3.10/src/texnormal.cc truevision-0.3.10-patched/src/texnormal.cc
---- truevision-0.3.10/src/texnormal.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/texnormal.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -44,7 +44,7 @@
- //**************************************
- // Constructeurs & Destructeurs
- //**************************************
--PovTexNormal::PovTexNormal( app_objs *appref, bool mother = true ) : MaterialItem( app_ref )
-+PovTexNormal::PovTexNormal( app_objs *appref, bool mother ) : MaterialItem( app_ref )
- {
- set_name( _("Normal") );
- item_type = TV_MITEM_NORMAL;
-diff -U3 -r truevision-0.3.10/src/texpigment.cc truevision-0.3.10-patched/src/texpigment.cc
---- truevision-0.3.10/src/texpigment.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/texpigment.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -48,7 +48,7 @@
- //**************************************
- // Constructeur
- //**************************************
--PovTexPigment::PovTexPigment( app_objs *appref, bool mother = true ) : MaterialItem( appref )
-+PovTexPigment::PovTexPigment( app_objs *appref, bool mother ) : MaterialItem( appref )
- {
- set_name( _("Pigment") );
- item_type = TV_MITEM_PIGMENT;
-@@ -373,7 +373,7 @@
- }
- 
- 
--void PovTexPigment::output_to_povray( ofstream & file, bool in_map=false )
-+void PovTexPigment::output_to_povray( ofstream & file, bool in_map )
- {
- if ( !used->value() ) return;
- if ( !in_map ) file << "\n\t\tpigment {\n\t\t\t";
-diff -U3 -r truevision-0.3.10/src/tvwidgets.cc truevision-0.3.10-patched/src/tvwidgets.cc
---- truevision-0.3.10/src/tvwidgets.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/tvwidgets.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -56,7 +56,7 @@
- in_update = false;
- }
- 
--void TvWidget::pack_widget( GtkWidget *box, bool tt, GtkWidget *target=NULL )
-+void TvWidget::pack_widget( GtkWidget *box, bool tt, GtkWidget *target )
- {
- if ( tt && tooltip != NULL ) 
- 	{
-diff -U3 -r truevision-0.3.10/src/tvwidgets2.cc truevision-0.3.10-patched/src/tvwidgets2.cc
---- truevision-0.3.10/src/tvwidgets2.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/tvwidgets2.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -887,7 +887,7 @@
- const char *bfiletype_ext[bfiletype_num] = { "df3" };
- const char *bfiletype_def[bfiletype_num] = { " df3 " };
- 
--TvWidget_blendmap::TvWidget_blendmap(  const char *name, const char *sname, const char *tooltip, app_objs *appref, bool is_colmap = false )
-+TvWidget_blendmap::TvWidget_blendmap(  const char *name, const char *sname, const char *tooltip, app_objs *appref, bool is_colmap )
-  : TvWidget( name, sname, tooltip, appref )
- {
- option_box = NULL;
-diff -U3 -r truevision-0.3.10/src/undo.cc truevision-0.3.10-patched/src/undo.cc
---- truevision-0.3.10/src/undo.cc	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/undo.cc	2003-03-15 18:38:29.000000000 -0500
-@@ -181,7 +181,7 @@
- }
- 
- // Undo layers creation / deletion / move		
--void UndoRedoManager::push( UndoAction act, ObjectLayer *lay, int sens = -1 )
-+void UndoRedoManager::push( UndoAction act, ObjectLayer *lay, int sens )
- {
- UndoItem *item = new UndoItem( act, lay, sens );
- UndoList.push_back( item );
-@@ -191,7 +191,7 @@
- }
- 
- // Undo materials creation / deletion / move		
--void UndoRedoManager::push( UndoAction act, Material *mat, int position = -1 )
-+void UndoRedoManager::push( UndoAction act, Material *mat, int position )
- {
- UndoItem *item = new UndoItem( act, mat, position );
- UndoList.push_back( item );
-@@ -231,7 +231,7 @@
- // The main function used
- // in fact it is also used for redo ;-)
- //***************************************************
--void UndoRedoManager::undo( bool doredo = false )
-+void UndoRedoManager::undo( bool doredo )
- {
- // Define source & destination lists
- // The determine if we act as undo or redo...
-diff -U3 -r truevision-0.3.10/src/undo.h truevision-0.3.10-patched/src/undo.h
---- truevision-0.3.10/src/undo.h	2002-01-01 06:43:01.000000000 -0500
-+++ truevision-0.3.10-patched/src/undo.h	2003-03-15 18:38:29.000000000 -0500
-@@ -65,7 +65,7 @@
- // one for undo and the other for redo
- //**********************************************************
- class UndoItem {
--	friend UndoRedoManager;
-+	friend struct UndoRedoManager;
- 
- 	private:
- 		UndoAction action;
diff --git a/media-gfx/truevision/files/truevision-0.3.10-gentoo3.patch b/media-gfx/truevision/files/truevision-0.3.10-gentoo3.patch
deleted file mode 100644
index dd96cf9c0a02..000000000000
--- a/media-gfx/truevision/files/truevision-0.3.10-gentoo3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- truevision-0.3.10/Makefile.in	2002-01-01 11:43:00.000000000 +0000
-+++ truevision-0.3.10/Makefile.in.new	2003-06-10 21:56:46.000000000 +0100
-@@ -407,11 +407,11 @@
- 
- install-data-local:
- 	test -d pixmaps \
--	&& install -d -m 0755 @PACKAGE_PIXMAPS_DIR@ \
--	&& install -m 0644 pixmaps/* @PACKAGE_PIXMAPS_DIR@
-+	&& install -d -m 0755 $(PACKAGE_PIXMAPS_DIR) \
-+	&& install -m 0644 pixmaps/* $(PACKAGE_PIXMAPS_DIR)
- 	test -d materials \
--	&& install -d -m 0755 @PACKAGE_MATERIALS_DIR@ \
--	&& cp -Rp materials/* @PACKAGE_MATERIALS_DIR@
-+	&& install -d -m 0755 $(PACKAGE_MATERIALS_DIR) \
-+	&& cp -Rp materials/* $(PACKAGE_MATERIALS_DIR)
- 
- dist-hook:
- 	test -d pixmaps \
diff --git a/media-gfx/truevision/truevision-0.3.10.ebuild b/media-gfx/truevision/truevision-0.3.10.ebuild
index be1813ee905e..ce8e7ac3e985 100644
--- a/media-gfx/truevision/truevision-0.3.10.ebuild
+++ b/media-gfx/truevision/truevision-0.3.10.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/truevision/truevision-0.3.10.ebuild,v 1.7 2004/06/24 22:51:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/truevision/truevision-0.3.10.ebuild,v 1.8 2005/08/09 20:58:40 vanquirius Exp $
 
 inherit eutils
 
 DESCRIPTION="Gnome frontend to Povray"
 HOMEPAGE="http://truevision.sourceforge.net"
 SRC_URI="mirror://sourceforge/truevision/${P}.tar.gz
-	mirror://sourceforge/truevision/${PN}-extramat-${PV}.tar.gz"
+	mirror://sourceforge/truevision/${PN}-extramat-${PV}.tar.gz
+	mirror://gentoo/${P}-genpatch.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,13 +24,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/truevision-0.3.10-gentoo2.patch || die
-	epatch ${FILESDIR}/truevision-0.3.10-gentoo3.patch || die
-}
-
-src_compile() {
-	econf || die
-	emake || die
+	epatch ${WORKDIR}/truevision-0.3.10-gentoo{2,3,4}.patch
 }
 
 src_install() {
@@ -37,13 +32,9 @@ src_install() {
 		PACKAGE_MATERIALS_DIR=${D}/usr/share/truevision/materials \
 		PACKAGE_PIXMAPS_DIR=${D}/usr/share/pixmaps/truevision || die
 
-
 	dodoc AUTHORS COPYING README ChangeLog INSTALL TODO
 	cp -r ${S}/examples ${D}/usr/share/doc/${PF}/examples
 
 	cd ${WORKDIR}/${PN}-extramat-${PV} || die
 	cp -R materials ${D}/usr/share/truevision/materials/ || die
-
-
-
 }