New version

6 files changed, 131 insertions, 7 deletions

diff --git a/media-gfx/k3d/ChangeLog b/media-gfx/k3d/ChangeLog
index cbc590e737d2..b26adaa850b4 100644
--- a/media-gfx/k3d/ChangeLog
+++ b/media-gfx/k3d/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/k3d
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.6 2004/06/24 22:44:11 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.7 2005/01/13 07:53:37 lu_zero Exp $
+
+*k3d-0.4.4.0 (13 Jan 2005)
+
+  13 Jan 2005; Luca Barbato <lu_zero@gentoo.org> +files/va_copy.patch,
+  +k3d-0.4.4.0.ebuild:
+  New version, marked just ~x86 since has known issue at least on ppc.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> k3d-0.2.5.4.ebuild:
   Add inherit eutils
diff --git a/media-gfx/k3d/Manifest b/media-gfx/k3d/Manifest
index 108ca7999448..dae4aa7ea60b 100644
--- a/media-gfx/k3d/Manifest
+++ b/media-gfx/k3d/Manifest
@@ -1,5 +1,8 @@
-MD5 09b783f6074bc95df925ee828c4d988f k3d-0.2.5.4.ebuild 1577
-MD5 95b28e675272f7e5f163f5c5383191ee ChangeLog 834
+MD5 b172304b23d88bf73e91cde1b464b4cd ChangeLog 1027
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
-MD5 e0baf5403904a6b909361f0fdd20271a files/k3d-0.2.5.4-gentoo.patch.tar.bz2 7497
+MD5 a95d1634e39b786f7db8b69b0310a69d k3d-0.2.5.4.ebuild 1576
+MD5 4d1f87f16e0d0c893fb2116deab09ed4 k3d-0.4.4.0.ebuild 1543
 MD5 86d41f87f2689037989cc31b5d19d700 files/digest-k3d-0.2.5.4 69
+MD5 43f337d9da3004619b1c64a1280b5b22 files/digest-k3d-0.4.4.0 62
+MD5 0b360e0690b5de9ab01cd583c38408b3 files/va_copy.patch 1546
+MD5 e0baf5403904a6b909361f0fdd20271a files/k3d-0.2.5.4-gentoo.patch.tar.bz2 7497
diff --git a/media-gfx/k3d/files/digest-k3d-0.4.4.0 b/media-gfx/k3d/files/digest-k3d-0.4.4.0
new file mode 100644
index 000000000000..434c364cb4f0
--- /dev/null
+++ b/media-gfx/k3d/files/digest-k3d-0.4.4.0
@@ -0,0 +1 @@
+MD5 902e0a111e378d0156e03b73850b573a k3d-0.4.4.0.tbz2 4434814
diff --git a/media-gfx/k3d/files/va_copy.patch b/media-gfx/k3d/files/va_copy.patch
new file mode 100644
index 000000000000..80089922441a
--- /dev/null
+++ b/media-gfx/k3d/files/va_copy.patch
@@ -0,0 +1,42 @@
+Index: acinclude.m4
+===================================================================
+RCS file: /cvsroot/k3d/k3d/acinclude.m4,v
+retrieving revision 1.74.2.11
+diff -r1.74.2.11 acinclude.m4
+16a17,45
+> # K3D_CHECK_VARARGS - handles per-platform behavior for varargs macros
+> 
+> AC_DEFUN([K3D_CHECK_VARARGS], [
+> 	AC_MSG_CHECKING([for va_copy() or __va_copy])
+> 	
+> 	AC_LINK_IFELSE([#include <stdarg.h>
+> 		va_list ap1,ap2;
+> 		va_copy(ap1,ap2);],
+> 		[k3d_have_va_copy=yes], [k3d_have_va_copy=no])
+> 
+> 	AC_LINK_IFELSE([#include <stdarg.h>
+> 		va_list ap1,ap2;
+> 		__va_copy(ap1,ap2);],
+> 		[k3d_have___va_copy=yes], [k3d___have_va_copy=no])
+> 
+> 	if test x"$k3d_have_va_copy" = x"yes"; then
+> 		AC_DEFINE(HAVE_VA_COPY, 1, [Define to 1 if either va_copy or __va_copy is available])
+> 		AC_DEFINE(VA_COPY, va_copy, [Define to the specific version of va_copy or __va_copy that is available])
+> 		AC_MSG_RESULT([found va_copy])
+> 	elif test x"$k3d_have___va_copy" = x"yes"; then
+> 		AC_DEFINE(HAVE_VA_COPY, 1, [Define to 1 if either va_copy or __va_copy is available])
+> 		AC_DEFINE(VA_COPY, __va_copy, [Define to the specific version of va_copy or __va_copy that is available])
+> 		AC_MSG_RESULT([found __va_copy])
+> 	else
+> 		AC_MSG_RESULT([found neither])
+> 	fi
+> ])
+> 
+> ########################################################
+Index: configure.ac
+===================================================================
+RCS file: /cvsroot/k3d/k3d/configure.ac,v
+retrieving revision 1.219.2.14
+diff -r1.219.2.14 configure.ac
+19a20
+> K3D_CHECK_VARARGS
diff --git a/media-gfx/k3d/k3d-0.2.5.4.ebuild b/media-gfx/k3d/k3d-0.2.5.4.ebuild
index 52cdfb3dc11f..71698814d431 100644
--- a/media-gfx/k3d/k3d-0.2.5.4.ebuild
+++ b/media-gfx/k3d/k3d-0.2.5.4.ebuild
@@ -1,6 +1,6 @@
-# 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/k3d/k3d-0.2.5.4.ebuild,v 1.6 2004/06/24 22:44:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.2.5.4.ebuild,v 1.7 2005/01/13 07:53:37 lu_zero Exp $
 
 inherit python eutils
 
diff --git a/media-gfx/k3d/k3d-0.4.4.0.ebuild b/media-gfx/k3d/k3d-0.4.4.0.ebuild
new file mode 100644
index 000000000000..49815715b561
--- /dev/null
+++ b/media-gfx/k3d/k3d-0.4.4.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.4.4.0.ebuild,v 1.1 2005/01/13 07:53:37 lu_zero Exp $
+
+inherit eutils
+
+IUSE="truetype doc python ruby"
+
+DESCRIPTION="K-3D is a free 3D modeling, animation, and rendering system."
+HOMEPAGE="http://k3d.sourceforge.net"
+SRC_URI="mirror://sourceforge/k3d/${P}.tbz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND="virtual/x11
+	virtual/opengl
+	virtual/glu
+	>=dev-libs/glib-2.2.1
+	=x11-libs/gtk+-1.2*
+	=dev-libs/libsigc++-1.0*
+	>=media-libs/netpbm-10
+	media-libs/plib
+	truetype? ( >=media-libs/freetype-2 )
+	doc? ( app-text/xmlto )
+	python? ( >=dev-lang/python-2.3 )
+	ruby? ( virtual/ruby )"
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+	use ppc && epatch ${FILESDIR}/va_copy.patch
+	libtoolize --force --automake
+	aclocal
+	automake --add-missing
+	autoconf
+}
+
+src_compile()
+{
+	local myconf="--with-plib --without-graphviz"
+
+	use truetype \
+		&& myconf="${myconf} --with-freetype" \
+		|| myconf="${myconf} --without-freetype"
+
+	use doc \
+		&& myconf="${myconf} --with-docbook" \
+		|| myconf="${myconf} --without-docbook"
+
+	use python \
+		&& myconf="${myconf} --with-python" \
+		|| myconf="${myconf} --without-python"
+
+	use ruby \
+		&& myconf="${myconf} --with-ruby=`ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]'`" \
+		|| myconf="${myconf} --without-ruby"
+
+
+	econf "CXXFLAGS=${CXXFLAGS}" || die
+	emake || die
+
+}
+
+src_install()
+{
+	einstall || die
+	dodoc AUTHORS INSTALL NEWS README TODO
+}
+