Add missing flags to IUSE, depend conditionally on gnome-base/librsvg. Fixes bug 115725.

Package-Manager: portage-2.0.54

10 files changed, 15 insertions, 270 deletions

diff --git a/media-gfx/k3d/ChangeLog b/media-gfx/k3d/ChangeLog
index 8dba9cbc7bc8..d3f083e9de61 100644
--- a/media-gfx/k3d/ChangeLog
+++ b/media-gfx/k3d/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/k3d
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.20 2006/01/15 21:47:09 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.21 2006/01/30 00:47:28 vanquirius Exp $
+
+  30 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> -files/va_copy.patch,
+  -k3d-0.2.5.4.ebuild, -k3d-0.4.4.0.ebuild, -k3d-0.4.4.2.ebuild,
+  k3d-0.5.0.34.ebuild:
+  Add missing flags to IUSE, depend conditionally on gnome-base/librsvg. Fixes
+  bug 115725. Thanks to Jeroen Roovers <jer at gentoo dot org>. Remove old
+  ebuilds.
 
   15 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> k3d-0.2.5.4.ebuild:
   Take my devspace out of SRC_URI.
diff --git a/media-gfx/k3d/Manifest b/media-gfx/k3d/Manifest
index b788569af3a6..a4eced0e2839 100644
--- a/media-gfx/k3d/Manifest
+++ b/media-gfx/k3d/Manifest
@@ -1,13 +1,6 @@
-MD5 7bd72ff6c16a0a2d64dca79dc40bc424 ChangeLog 2771
-MD5 f94f236b5f0772223f4210a264f18715 files/digest-k3d-0.2.5.4 144
-MD5 43f337d9da3004619b1c64a1280b5b22 files/digest-k3d-0.4.4.0 62
-MD5 525840432840e8ddfa5fa7c20079bc29 files/digest-k3d-0.4.4.2 69
+MD5 a5f3227e541c06bb4af758fdc2d481e4 ChangeLog 3099
 MD5 f422c293ed6d2f4f51162353a19008a0 files/digest-k3d-0.5.0.33 66
 MD5 20e100fbbfd6cb1cee996065d9a66660 files/digest-k3d-0.5.0.34 66
-MD5 0b360e0690b5de9ab01cd583c38408b3 files/va_copy.patch 1546
-MD5 11b0ababd54b6fcf5556a92add82e04b k3d-0.2.5.4.ebuild 1601
-MD5 c540c9ec333f9eca8abd3aa09b82a31b k3d-0.4.4.0.ebuild 1571
-MD5 79d97aa4b737cb59938261ed914a500a k3d-0.4.4.2.ebuild 1585
 MD5 b4275fc98b9707d8361812632919ef93 k3d-0.5.0.33.ebuild 2030
-MD5 92ed01778392b0509441377c5dbcd738 k3d-0.5.0.34.ebuild 1765
+MD5 7671b0301dbdfb65761c8627c4f4b148 k3d-0.5.0.34.ebuild 1818
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
diff --git a/media-gfx/k3d/files/digest-k3d-0.2.5.4 b/media-gfx/k3d/files/digest-k3d-0.2.5.4
deleted file mode 100644
index 20fff127ba94..000000000000
--- a/media-gfx/k3d/files/digest-k3d-0.2.5.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e0baf5403904a6b909361f0fdd20271a k3d-0.2.5.4-gentoo.patch.tar.bz2 7497
-MD5 5343d39a6120f7b9848f9152230e7d5a k3d-0.2.5.4-src.tar.bz2 3053441
diff --git a/media-gfx/k3d/files/digest-k3d-0.4.4.0 b/media-gfx/k3d/files/digest-k3d-0.4.4.0
deleted file mode 100644
index 434c364cb4f0..000000000000
--- a/media-gfx/k3d/files/digest-k3d-0.4.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 902e0a111e378d0156e03b73850b573a k3d-0.4.4.0.tbz2 4434814
diff --git a/media-gfx/k3d/files/digest-k3d-0.4.4.2 b/media-gfx/k3d/files/digest-k3d-0.4.4.2
deleted file mode 100644
index 9d32688083ea..000000000000
--- a/media-gfx/k3d/files/digest-k3d-0.4.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4c0cb01e395b7a592cd75061dc95d934 k3d-0.4.4.2-src.tar.bz2 4529815
diff --git a/media-gfx/k3d/files/va_copy.patch b/media-gfx/k3d/files/va_copy.patch
deleted file mode 100644
index 80089922441a..000000000000
--- a/media-gfx/k3d/files/va_copy.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
deleted file mode 100644
index b64bb1bc3407..000000000000
--- a/media-gfx/k3d/k3d-0.2.5.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 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.10 2006/01/15 21:47:09 vanquirius Exp $
-
-inherit python 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}-src.tar.bz2
-	mirror://gentoo/${P}-gentoo.patch.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-
-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/plib
-	truetype? ( >=media-libs/freetype-2 )
-	doc? ( app-text/xmlto )
-	python? ( >=dev-lang/python-2.2 )
-	ruby? ( virtual/ruby )"
-
-src_unpack() {
-	unpack ${A}; cd ${S}
-	epatch "${WORKDIR}/${P}-gentoo.patch"
-
-	# fix python compilation
-	python_version
-	sed -i -e "s:python2.2:python${PYVER}:g" configure
-}
-
-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 ${myconf} || die
-	emake "CXXFLAGS=${CXXFLAGS}" || die
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS NEWS README TODO
-}
diff --git a/media-gfx/k3d/k3d-0.4.4.0.ebuild b/media-gfx/k3d/k3d-0.4.4.0.ebuild
deleted file mode 100644
index 7ebd3acd40c1..000000000000
--- a/media-gfx/k3d/k3d-0.4.4.0.ebuild
+++ /dev/null
@@ -1,73 +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/k3d/k3d-0.4.4.0.ebuild,v 1.3 2005/01/23 04:12:29 weeve 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 ~sparc"
-
-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
-	media-gfx/imagemagick
-	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
-}
-
diff --git a/media-gfx/k3d/k3d-0.4.4.2.ebuild b/media-gfx/k3d/k3d-0.4.4.2.ebuild
deleted file mode 100644
index 812680e09b75..000000000000
--- a/media-gfx/k3d/k3d-0.4.4.2.ebuild
+++ /dev/null
@@ -1,72 +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/k3d/k3d-0.4.4.2.ebuild,v 1.3 2005/04/02 19:27:02 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}-src.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
-
-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
-	media-gfx/imagemagick
-	truetype? ( >=media-libs/freetype-2 )
-	doc? ( app-text/xmlto )
-	python? ( >=dev-lang/python-2.3 )
-	" ##ruby support deprecated ruby? ( virtual/ruby )
-
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}
-	libtoolize --force --copy --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}" $myconf || die
-	emake || die
-
-}
-
-src_install()
-{
-	einstall || die
-	dodoc AUTHORS INSTALL NEWS README TODO
-}
-
diff --git a/media-gfx/k3d/k3d-0.5.0.34.ebuild b/media-gfx/k3d/k3d-0.5.0.34.ebuild
index 17992b1cff36..0a67becc504d 100644
--- a/media-gfx/k3d/k3d-0.5.0.34.ebuild
+++ b/media-gfx/k3d/k3d-0.5.0.34.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.5.0.34.ebuild,v 1.1 2005/12/10 19:41:35 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.5.0.34.ebuild,v 1.2 2006/01/30 00:47:28 vanquirius Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/k3d/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="expat gnome imagemagick jpeg nls openexr plib png python qt tiff truetype xml2"
+IUSE="expat gnome graphviz imagemagick javascript jpeg nls openexr plib png python qt svg tiff truetype xml2"
 
 DEPEND="virtual/x11
 	virtual/opengl
@@ -31,7 +31,8 @@ DEPEND="virtual/x11
 	python? ( >=dev-lang/python-2.3 )
 	qt? ( x11-libs/qt )
 	tiff? ( media-libs/tiff )
-	=dev-libs/libsigc++-2.0*"
+	=dev-libs/libsigc++-2.0*
+	svg? ( gnome-base/librsvg )"
 
 src_compile() {
 	local myconf="--with-ngui"