bug 49829

(Portage version: 2.0.51.22-r2)

7 files changed, 357 insertions, 25 deletions

diff --git a/media-gfx/giram/ChangeLog b/media-gfx/giram/ChangeLog
index 6af2e011a4f5..1c32f58854e9 100644
--- a/media-gfx/giram/ChangeLog
+++ b/media-gfx/giram/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/giram
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/giram/ChangeLog,v 1.5 2004/09/30 00:43:47 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/giram/ChangeLog,v 1.6 2005/08/13 16:04:14 vanquirius Exp $
+
+*giram-0.3.5 (13 Aug 2005)
+
+  13 Aug 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/giram-0.3.4-fbsd.patch, +files/giram-0.3.5-fbsd.patch,
+  giram-0.3.4.ebuild, +giram-0.3.5.ebuild:
+  0.3.5 version bump, using patches from FreeBSD. Also backported patches to
+  0.3.4. Should fix bug 49829. Thanks to Andre Hinrichs
+  <andre.hinrichs@gmx.de> and others for reporting.
 
   18 Nov 2003; Brandy Westcott brandy@gentoo.org giram-0.3.4.ebuild:
   Fixed povfront segfaulting if no config file existed.
diff --git a/media-gfx/giram/Manifest b/media-gfx/giram/Manifest
index 82d86e4a2e66..ab9a8766f467 100644
--- a/media-gfx/giram/Manifest
+++ b/media-gfx/giram/Manifest
@@ -1,16 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3097c6b5a5dc41b5d2bb3ee73458e181 ChangeLog 820
 MD5 07418c593c0743e711ca51d7ae11e795 giram-0.3.3.ebuild 1004
-MD5 f5e33c1537fab889a6582e5452b00790 giram-0.3.4.ebuild 1150
+MD5 d903dd5790f452f18b22a76095ce95f4 giram-0.3.5.ebuild 1197
+MD5 839f351cc3fdcad46d8bdaec372dbae2 giram-0.3.4.ebuild 1196
+MD5 3097c6b5a5dc41b5d2bb3ee73458e181 ChangeLog 820
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
+MD5 e74ef6203f46822ded7256cea16f67d9 files/giram-0.3.5-fbsd.patch 5157
 MD5 0b7a883689b1149507702593d3c79ce3 files/digest-giram-0.3.3 64
 MD5 874c146dc51dca7e7230430c342bbd5a files/digest-giram-0.3.4 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBW1bKI1lqEGTUzyQRAg98AKCnHoMjO8JxkF7tCuq8bIEbwqXMOwCgogmG
-2zH9u+AN0rImC7w1uDLDoiY=
-=HHoN
------END PGP SIGNATURE-----
+MD5 f91a82238c2ace1ce56e21e992a0a69b files/digest-giram-0.3.5 64
+MD5 8070263059a0d62266339edb32750bfd files/giram-0.3.4-fbsd.patch 4157
diff --git a/media-gfx/giram/files/digest-giram-0.3.5 b/media-gfx/giram/files/digest-giram-0.3.5
new file mode 100644
index 000000000000..4b9382d29299
--- /dev/null
+++ b/media-gfx/giram/files/digest-giram-0.3.5
@@ -0,0 +1 @@
+MD5 1197134bd838669f202fc2f2f1b5da9b giram-0.3.5.tar.gz 1028404
diff --git a/media-gfx/giram/files/giram-0.3.4-fbsd.patch b/media-gfx/giram/files/giram-0.3.4-fbsd.patch
new file mode 100644
index 000000000000..a88a63c552ca
--- /dev/null
+++ b/media-gfx/giram/files/giram-0.3.4-fbsd.patch
@@ -0,0 +1,121 @@
+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/files/giram-0.3.5-fbsd.patch b/media-gfx/giram/files/giram-0.3.5-fbsd.patch
new file mode 100644
index 000000000000..7d02ea5c08c2
--- /dev/null
+++ b/media-gfx/giram/files/giram-0.3.5-fbsd.patch
@@ -0,0 +1,163 @@
+diff --exclude='*~' -Naur giram-0.3.5.orig/configure giram-0.3.5/configure
+--- giram-0.3.5.orig/configure	2005-08-12 22:07:08.000000000 -0300
++++ giram-0.3.5/configure	2005-08-13 12:28:02.000000000 -0300
+@@ -5432,6 +5432,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'
+@@ -5843,7 +5844,7 @@
+ fi
+ 
+ 
+-CFLAGS="-g -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.5.orig/src/camera.c giram-0.3.5/src/camera.c
+--- giram-0.3.5.orig/src/camera.c	2005-08-12 22:07:08.000000000 -0300
++++ giram-0.3.5/src/camera.c	2005-08-13 12:18:08.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.5.orig/src/filetypes/povray/LoadPov.c giram-0.3.5/src/filetypes/povray/LoadPov.c
+--- giram-0.3.5.orig/src/filetypes/povray/LoadPov.c	2005-08-12 22:07:08.000000000 -0300
++++ giram-0.3.5/src/filetypes/povray/LoadPov.c	2005-08-13 12:21:00.000000000 -0300
+@@ -1152,6 +1152,7 @@
+         break;
+       default:
+        /* panic!!! */
++	;
+     }
+     get_token();
+   }
+@@ -3238,6 +3239,7 @@
+ 
+           default:
+             /*Error("Mis-matched '#case' or '#range'.");*/
++	    ;
+         }
+         done = TRUE;
+         break;
+@@ -3303,6 +3305,7 @@
+ 
+           default:
+ /*            Error("Mis-matched '#end'.");*/
++	    ;
+         }
+         done = TRUE;
+         break;
+@@ -4965,6 +4968,7 @@
+         break;
+       default:
+         /* panic!!! */
++	;
+     }
+     get_token();
+   }
+@@ -5111,6 +5115,7 @@
+       PARSE_FLOAT(HoleRadius)
+       break;
+     default: /* nothing */
++      ;
+   }
+ 
+   *pDisc = giram_disc_new(Center, Normal, Radius, HoleRadius);
+diff --exclude='*~' -Naur giram-0.3.5.orig/src/filetypes/povray/SavePov.c giram-0.3.5/src/filetypes/povray/SavePov.c
+--- giram-0.3.5.orig/src/filetypes/povray/SavePov.c	2005-08-12 22:07:08.000000000 -0300
++++ giram-0.3.5/src/filetypes/povray/SavePov.c	2005-08-13 12:21:30.000000000 -0300
+@@ -799,6 +799,7 @@
+ 
+     default:
+       /* panic */
++      ;
+   }
+   fprintf(OutFile, "  location <%g, %g, %g>\n", Camera->Location[0],
+                                                 Camera->Location[1],
+diff --exclude='*~' -Naur giram-0.3.5.orig/src/giram.c giram-0.3.5/src/giram.c
+--- giram-0.3.5.orig/src/giram.c	2005-08-12 22:07:08.000000000 -0300
++++ giram-0.3.5/src/giram.c	2005-08-12 22:13:56.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.5.orig/src/giramobjecteditor.c giram-0.3.5/src/giramobjecteditor.c
+--- giram-0.3.5.orig/src/giramobjecteditor.c	2005-08-12 22:07:08.000000000 -0300
++++ giram-0.3.5/src/giramobjecteditor.c	2005-08-12 22:15:37.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.5.orig/src/texture.c giram-0.3.5/src/texture.c
+--- giram-0.3.5.orig/src/texture.c	2005-08-12 22:07:08.000000000 -0300
++++ giram-0.3.5/src/texture.c	2005-08-13 12:38:18.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.5.orig/src/view.c giram-0.3.5/src/view.c
+--- giram-0.3.5.orig/src/view.c	2005-08-12 22:07:08.000000000 -0300
++++ giram-0.3.5/src/view.c	2005-08-12 22:19:46.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.5.orig/src/widgets/gtkcolorbutton.c giram-0.3.5/src/widgets/gtkcolorbutton.c
+--- giram-0.3.5.orig/src/widgets/gtkcolorbutton.c	2005-08-12 22:07:08.000000000 -0300
++++ giram-0.3.5/src/widgets/gtkcolorbutton.c	2005-08-12 22:10:41.000000000 -0300
+@@ -25,11 +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);
diff --git a/media-gfx/giram/giram-0.3.4.ebuild b/media-gfx/giram/giram-0.3.4.ebuild
index 38e7d792f5d4..cf2e21403add 100644
--- a/media-gfx/giram/giram-0.3.4.ebuild
+++ b/media-gfx/giram/giram-0.3.4.ebuild
@@ -1,6 +1,8 @@
-# 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/giram/giram-0.3.4.ebuild,v 1.6 2004/07/14 17:35:21 agriffis Exp $
+# $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"
@@ -13,18 +15,16 @@ IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.0.0
 	>=dev-libs/glib-2.0.0
-	media-gfx/povray
-	"
+	media-gfx/povray"
+
 DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	"
+	>=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() {
@@ -37,12 +37,10 @@ src_compile() {
 		--mandir=/usr/share/man \
 		--with-tutorial-path=/usr/share/doc/${PF} \
 		--enable-bishop-s3d --enable-vik-specials || die "./configure failed"
-
-	make || die
+	emake || die
 }
 
 src_install () {
 	make DESTDIR=${D} install || die
-
 	dodoc AUTHORS BUGS ANNOUNCE CONTRIBUTORS ChangeLog HACKING IDEAS NEWS README TODO
 }
diff --git a/media-gfx/giram/giram-0.3.5.ebuild b/media-gfx/giram/giram-0.3.5.ebuild
new file mode 100644
index 000000000000..9e322cf70e3b
--- /dev/null
+++ b/media-gfx/giram/giram-0.3.5.ebuild
@@ -0,0 +1,46 @@
+# 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.5.ebuild,v 1.1 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
+}