Add patch to change static int DiscWithHoleFlag to int DiscWithHoleFlag in tool_disc.c, allowing giram to compile with gcc-4.1.1. Fixes bug 154273, reported by Andrey Grozin <A.G.Grozin at inp.nsk.su>. Also, removing old ebuild.

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

4 files changed, 22 insertions, 174 deletions

diff --git a/media-gfx/giram/Manifest b/media-gfx/giram/Manifest
index 49257f488239..0f0fec65655e 100644
--- a/media-gfx/giram/Manifest
+++ b/media-gfx/giram/Manifest
@@ -1,8 +1,24 @@
-MD5 db8fda30bd0d4a72e076f5ab1afc2bae ChangeLog 1471
-MD5 874c146dc51dca7e7230430c342bbd5a files/digest-giram-0.3.4 64
-MD5 f91a82238c2ace1ce56e21e992a0a69b files/digest-giram-0.3.5 64
-MD5 8070263059a0d62266339edb32750bfd files/giram-0.3.4-fbsd.patch 4157
+AUX giram-0.3.5-fbsd.patch 5157 RMD160 481015500dbb08a0ddda8816208c23702e06f8ef SHA1 e66e98f6c652aa20a90827f8eaedb6ad175a3317 SHA256 cf8db868540d0d206d35193bd30335fef7c0ed35cab4d83926b19de24a81d12f
 MD5 e74ef6203f46822ded7256cea16f67d9 files/giram-0.3.5-fbsd.patch 5157
-MD5 ad713197382ef6ec3abb5556549f95cf giram-0.3.4.ebuild 1198
-MD5 4407382c4e88f964866705d9af4d8cd7 giram-0.3.5.ebuild 1236
+RMD160 481015500dbb08a0ddda8816208c23702e06f8ef files/giram-0.3.5-fbsd.patch 5157
+SHA256 cf8db868540d0d206d35193bd30335fef7c0ed35cab4d83926b19de24a81d12f files/giram-0.3.5-fbsd.patch 5157
+AUX giram-0.3.5-tool_disc.diff 319 RMD160 2823cb11642634b54f61a6837fcd380090b61f75 SHA1 ee10fd43a8e1976495248baed780addb6efa530e SHA256 0e948f39f263ee5ab7697d4e8ec8346af77e843670be9187c7091cc93c962208
+MD5 740cb6ae90252550c8c785521b11b5b0 files/giram-0.3.5-tool_disc.diff 319
+RMD160 2823cb11642634b54f61a6837fcd380090b61f75 files/giram-0.3.5-tool_disc.diff 319
+SHA256 0e948f39f263ee5ab7697d4e8ec8346af77e843670be9187c7091cc93c962208 files/giram-0.3.5-tool_disc.diff 319
+DIST giram-0.3.5.tar.gz 1028404 RMD160 4535ff962ceb68f774e2d8b3176dac9dd9eceed1 SHA1 f8ecdd1a954315cb9e1356af3b8a3b20fb9f9b41 SHA256 8dc6edddb1437476626f9c1ae5e308ea10e5e5d064e441a310b32df763daddd8
+EBUILD giram-0.3.5.ebuild 1299 RMD160 e46d4fe9d26bf3a2b080c6863d7f2ab080295c95 SHA1 057f5833bdd0c161a42831cccd7eca34ac310604 SHA256 e0bb6e020f01108a00b395118db5ff74bba78d091b931647bb55be5022a65c31
+MD5 37e49975934812b6b365d29847c03580 giram-0.3.5.ebuild 1299
+RMD160 e46d4fe9d26bf3a2b080c6863d7f2ab080295c95 giram-0.3.5.ebuild 1299
+SHA256 e0bb6e020f01108a00b395118db5ff74bba78d091b931647bb55be5022a65c31 giram-0.3.5.ebuild 1299
+MISC ChangeLog 1872 RMD160 f8df8a9bedfb9532bf76778e2a5b310e0fff8e2f SHA1 24535b11a200b36490ae91cca8e2d6dd0b0d0c71 SHA256 06c19c34f42e65a60ae76d407880f51fa80a02309e6d39624a3b0ff8efc47c67
+MD5 3b55a9140a6bea21fbaf800a62b165d5 ChangeLog 1872
+RMD160 f8df8a9bedfb9532bf76778e2a5b310e0fff8e2f ChangeLog 1872
+SHA256 06c19c34f42e65a60ae76d407880f51fa80a02309e6d39624a3b0ff8efc47c67 ChangeLog 1872
+MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
+RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 metadata.xml 161
+SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 metadata.xml 161
+MD5 c724a6b0de2ec9bfe1696d651aa546a1 files/digest-giram-0.3.5 238
+RMD160 7fe330e238ec056ca72786487deb906c85afcd83 files/digest-giram-0.3.5 238
+SHA256 fa8f938537fedf3f41e86be539e680d371045cb7232f9145dd72f0250e358a63 files/digest-giram-0.3.5 238
diff --git a/media-gfx/giram/files/digest-giram-0.3.4 b/media-gfx/giram/files/digest-giram-0.3.4
deleted file mode 100644
index 0f9b99b7dba8..000000000000
--- a/media-gfx/giram/files/digest-giram-0.3.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 31946d9cc6fa14e70d9a61b93b1b70c4 giram-0.3.4.tar.gz 1265387
diff --git a/media-gfx/giram/files/giram-0.3.4-fbsd.patch b/media-gfx/giram/files/giram-0.3.4-fbsd.patch
deleted file mode 100644
index a88a63c552ca..000000000000
--- a/media-gfx/giram/files/giram-0.3.4-fbsd.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff --exclude='*~' -Naur giram-0.3.4.orig/configure giram-0.3.4/configure
---- giram-0.3.4.orig/configure	2005-08-13 12:44:04.000000000 -0300
-+++ giram-0.3.4/configure	2005-08-13 12:44:56.000000000 -0300
-@@ -5407,6 +5407,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -6029,7 +6030,7 @@
- fi
- 
- 
--CFLAGS="-g -O2 -Wall -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED $CFLAGS"
-+CFLAGS="-DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED $CFLAGS"
- 
- if test -n "$DEBUGFLAG"; then
-   CFLAGS="$DEBUGFLAG $CFLAGS"
-diff --exclude='*~' -Naur giram-0.3.4.orig/src/camera.c giram-0.3.4/src/camera.c
---- giram-0.3.4.orig/src/camera.c	2005-08-13 12:44:04.000000000 -0300
-+++ giram-0.3.4/src/camera.c	2005-08-13 12:45:15.000000000 -0300
-@@ -19,6 +19,10 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
-+
-+#undef GTK_DISABLE_DEPRECATED
-+#warning GTK_DISABLE_DEPRECATED
-+
- #include <math.h>
- #include "giram.h"
- #include "utils.h"
-diff --exclude='*~' -Naur giram-0.3.4.orig/src/giram.c giram-0.3.4/src/giram.c
---- giram-0.3.4.orig/src/giram.c	2005-08-13 12:44:04.000000000 -0300
-+++ giram-0.3.4/src/giram.c	2005-08-13 12:46:25.000000000 -0300
-@@ -25,6 +25,8 @@
- 
- #include <sys/types.h>
- #include <sys/wait.h>
-+#undef GTK_DISABLE_DEPRECATED
-+#warning GTK_DISABLE_DEPRECATED
- 
- #ifndef  WAIT_ANY
- #define  WAIT_ANY (-1)
-diff --exclude='*~' -Naur giram-0.3.4.orig/src/giramobjecteditor.c giram-0.3.4/src/giramobjecteditor.c
---- giram-0.3.4.orig/src/giramobjecteditor.c	2005-08-13 12:44:04.000000000 -0300
-+++ giram-0.3.4/src/giramobjecteditor.c	2005-08-13 12:46:50.000000000 -0300
-@@ -19,10 +19,10 @@
-  */
- 
- #include <stdlib.h>
-+#include "widgets/gtkcolorbutton.h"
- #include "giram.h"
- 
- #include "giramintl.h"
--#include "widgets/gtkcolorbutton.h"
- #include "widgets/giramfileselection.h"
- 
- #include "widgets/giramvectorframe.h"
-diff --exclude='*~' -Naur giram-0.3.4.orig/src/SavePov.c giram-0.3.4/src/SavePov.c
---- giram-0.3.4.orig/src/SavePov.c	2005-08-13 12:44:04.000000000 -0300
-+++ giram-0.3.4/src/SavePov.c	2005-08-13 12:55:14.000000000 -0300
-@@ -786,6 +786,7 @@
- 
-     default:
-       /* panic */
-+      ;
-   }
-   fprintf(OutFile, "  location <%g, %g, %g>\n", Camera->Location[0],
-                                                 Camera->Location[1],
-diff --exclude='*~' -Naur giram-0.3.4.orig/src/texture.c giram-0.3.4/src/texture.c
---- giram-0.3.4.orig/src/texture.c	2005-08-13 12:44:04.000000000 -0300
-+++ giram-0.3.4/src/texture.c	2005-08-13 12:47:10.000000000 -0300
-@@ -21,10 +21,10 @@
- #include <string.h>
- #undef GTK_DISABLE_DEPRECATED
- #warning GTK_DISABLE_DEPRECATED
--#include "giram.h"
--#include "utils.h"
- #include "widgets/gtkcolorbutton.h"
- #include "widgets/gtkcolormapbutton.h"
-+#include "giram.h"
-+#include "utils.h"
- #include "texture.h"
- 
- #include "widgets/giramwidgets.h"
-diff --exclude='*~' -Naur giram-0.3.4.orig/src/view.c giram-0.3.4/src/view.c
---- giram-0.3.4.orig/src/view.c	2005-08-13 12:44:04.000000000 -0300
-+++ giram-0.3.4/src/view.c	2005-08-13 12:48:09.000000000 -0300
-@@ -22,8 +22,11 @@
- #include <unistd.h>
- #include <math.h>
- #include <string.h>
--#include "giram.h"
-+#undef GTK_DISABLE_DEPRECATED
-+#warning GTK_DISABLE_DEPRECATED
- #include <gdk/gdkkeysyms.h>
-+#include <gtk/gtkitemfactory.h>
-+#include "giram.h"
- 
- #include "tools/tools.h"
- #include "tools/tool_select.h"
-diff --exclude='*~' -Naur giram-0.3.4.orig/src/widgets/gtkcolorbutton.c giram-0.3.4/src/widgets/gtkcolorbutton.c
---- giram-0.3.4.orig/src/widgets/gtkcolorbutton.c	2005-08-13 12:44:04.000000000 -0300
-+++ giram-0.3.4/src/widgets/gtkcolorbutton.c	2005-08-13 12:48:30.000000000 -0300
-@@ -25,12 +25,11 @@
- #undef GTK_DISABLE_DEPRECATED
- #warning GTK_DISABLE_DEPRECATED
- 
-+#include "gtkcolorbutton.h"
- #include "giram.h"
- 
- #include "giramintl.h"
- 
--#include "gtkcolorbutton.h"
--
- static void  gtk_color_button_destroy(GtkObject *object);
- static void  gtk_color_button_clicked(GtkButton *button);
- static void  gtk_color_button_paint(GtkColorButton *gcb);
diff --git a/media-gfx/giram/giram-0.3.4.ebuild b/media-gfx/giram/giram-0.3.4.ebuild
deleted file mode 100644
index cf2e21403add..000000000000
--- a/media-gfx/giram/giram-0.3.4.ebuild
+++ /dev/null
@@ -1,46 +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/giram/giram-0.3.4.ebuild,v 1.7 2005/08/13 16:04:14 vanquirius Exp $
-
-inherit eutils
-
-DESCRIPTION="Giram (Giram is really a modeller). A 3d modeller for POV-ray"
-HOMEPAGE="http://www.giram.org"
-SRC_URI="http://www.giram.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.0.0
-	>=dev-libs/glib-2.0.0
-	media-gfx/povray"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-fbsd.patch
-	cd ${S}/povfront
-	sed -i -e "s:strlen (g_config_file_to_parse) == 0:g_config_file_to_parse == NULL:" povfront.c
-}
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--libexecdir=/usr/lib \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--with-tutorial-path=/usr/share/doc/${PF} \
-		--enable-bishop-s3d --enable-vik-specials || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS ANNOUNCE CONTRIBUTORS ChangeLog HACKING IDEAS NEWS README TODO
-}