Add 0.4.5.0, which is the latest stable version. In 0.5.0.37-r1, drop qt and javascript as recommended by upstream. Also, add a keepdir to /usr/share/k3d/shaders/layered for bug 121678

(Portage version: 2.0.54)

10 files changed, 93 insertions, 186 deletions

diff --git a/media-gfx/k3d/ChangeLog b/media-gfx/k3d/ChangeLog
index 1d801167a31a..b3ff3e6bb469 100644
--- a/media-gfx/k3d/ChangeLog
+++ b/media-gfx/k3d/ChangeLog
@@ -1,6 +1,17 @@
 # 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.25 2006/02/02 20:40:45 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.26 2006/02/09 00:27:12 vanquirius Exp $
+
+*k3d-0.5.0.37-r1 (09 Feb 2006)
+*k3d-0.4.5.0 (09 Feb 2006)
+
+  09 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> +k3d-0.4.5.0.ebuild,
+  -k3d-0.5.0.33.ebuild, -k3d-0.5.0.34.ebuild, -k3d-0.5.0.37.ebuild,
+  +k3d-0.5.0.37-r1.ebuild:
+  Add 0.4.5.0, which is the latest stable version. In 0.5.0.37-r1, drop qt and
+  javascript as recommended by upstream. Also, add a keepdir to
+  /usr/share/k3d/shaders/layered for bug 121678, reported by Daniel Fort <dan
+  at digiola dot com>.
 
 *k3d-0.5.0.37 (02 Feb 2006)
 
diff --git a/media-gfx/k3d/Manifest b/media-gfx/k3d/Manifest
index 0c3ddf314b26..bd6c5bb4a258 100644
--- a/media-gfx/k3d/Manifest
+++ b/media-gfx/k3d/Manifest
@@ -1,10 +1,7 @@
 MD5 bb016ea2206878e9313d4afaf2da1eef ChangeLog 3711
-MD5 f422c293ed6d2f4f51162353a19008a0 files/digest-k3d-0.5.0.33 66
-MD5 20e100fbbfd6cb1cee996065d9a66660 files/digest-k3d-0.5.0.34 66
-MD5 343942ad2f2bca35c9b68ff5e716c8fc files/digest-k3d-0.5.0.37 66
-MD5 496ef774e987945057662901c2f855ee files/k3d-0.5.0.34-nls.patch 1610
+MD5 ce4dabff22a6f1f4d6fc8f45968c7718 files/digest-k3d-0.4.5.0 67
+MD5 343942ad2f2bca35c9b68ff5e716c8fc files/digest-k3d-0.5.0.37-r1 66
 MD5 9955c43875db44f779d1e64142747ab8 files/k3d-0.5.0.37-nls.patch 1724
-MD5 b4275fc98b9707d8361812632919ef93 k3d-0.5.0.33.ebuild 2030
-MD5 8457926992e542c81999ad3552b0d409 k3d-0.5.0.34.ebuild 2098
-MD5 a3b1150af7841e83b623d05cae832be8 k3d-0.5.0.37.ebuild 2098
+MD5 93adb996a7470d34a459f3d4269db145 k3d-0.4.5.0.ebuild 1674
+MD5 57c1b867b5e3fa865d03b0c79737f770 k3d-0.5.0.37-r1.ebuild 2067
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
diff --git a/media-gfx/k3d/files/digest-k3d-0.4.5.0 b/media-gfx/k3d/files/digest-k3d-0.4.5.0
new file mode 100644
index 000000000000..845b5f225992
--- /dev/null
+++ b/media-gfx/k3d/files/digest-k3d-0.4.5.0
@@ -0,0 +1 @@
+MD5 dfe46f3cfb43159bd5bfcc28ca843cda k3d-0.4.5.0-2.tar.bz2 4379421
diff --git a/media-gfx/k3d/files/digest-k3d-0.5.0.33 b/media-gfx/k3d/files/digest-k3d-0.5.0.33
deleted file mode 100644
index 1252f280a04c..000000000000
--- a/media-gfx/k3d/files/digest-k3d-0.5.0.33
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5369e886171e1741a66ed4d8b0c4ccaa k3d-0.5.0.33.tar.bz2 4934272
diff --git a/media-gfx/k3d/files/digest-k3d-0.5.0.34 b/media-gfx/k3d/files/digest-k3d-0.5.0.34
deleted file mode 100644
index 5db13a78b7df..000000000000
--- a/media-gfx/k3d/files/digest-k3d-0.5.0.34
+++ /dev/null
@@ -1 +0,0 @@
-MD5 62cc8e74400e2a75f46f211e59f2d782 k3d-0.5.0.34.tar.bz2 4391013
diff --git a/media-gfx/k3d/files/digest-k3d-0.5.0.37 b/media-gfx/k3d/files/digest-k3d-0.5.0.37-r1
index a1692fc80b4f..a1692fc80b4f 100644
--- a/media-gfx/k3d/files/digest-k3d-0.5.0.37
+++ b/media-gfx/k3d/files/digest-k3d-0.5.0.37-r1
diff --git a/media-gfx/k3d/k3d-0.4.5.0.ebuild b/media-gfx/k3d/k3d-0.4.5.0.ebuild
new file mode 100644
index 000000000000..dfee8a1ee0d8
--- /dev/null
+++ b/media-gfx/k3d/k3d-0.4.5.0.ebuild
@@ -0,0 +1,73 @@
+# 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.4.5.0.ebuild,v 1.1 2006/02/09 00:27:12 vanquirius Exp $
+
+inherit eutils
+
+MY_P="${P}-2"
+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/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~ppc"
+
+#virtual/x11
+DEPEND="
+	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 )
+
+S="${WORKDIR}/${MY_P}"
+
+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} \
+	--without-new-pnmtotiff || die
+	emake || die
+
+}
+
+src_install() {
+	einstall || die
+	dodoc AUTHORS NEWS README TODO
+}
diff --git a/media-gfx/k3d/k3d-0.5.0.33.ebuild b/media-gfx/k3d/k3d-0.5.0.33.ebuild
deleted file mode 100644
index 632ff5b59e9f..000000000000
--- a/media-gfx/k3d/k3d-0.5.0.33.ebuild
+++ /dev/null
@@ -1,78 +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.5.0.33.ebuild,v 1.3 2005/11/03 10:45:12 lu_zero Exp $
-
-inherit eutils
-
-DESCRIPTION="a free 3D modeling, animation, and rendering system"
-HOMEPAGE="http://k3d.sourceforge.net/"
-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"
-
-DEPEND="virtual/x11
-	virtual/opengl
-	virtual/glu
-	dev-libs/boost
-	expat? ( dev-libs/expat )
-	xml2? ( dev-libs/libxml2 )
-	!xml2? ( dev-libs/expat )
-	truetype? ( >=media-libs/freetype-2 )
-	gnome? ( gnome-base/libgnome )
-	imagemagick? ( media-gfx/imagemagick )
-	jpeg? ( media-libs/jpeg )
-	dev-cpp/glibmm dev-cpp/gtkmm x11-libs/gtkglext
-	openexr? ( media-libs/openexr )
-	plib? ( media-libs/plib )
-	png? ( media-libs/libpng )
-	python? ( >=dev-lang/python-2.3 )
-	qt? ( x11-libs/qt )
-	tiff? ( media-libs/tiff )
-	=dev-libs/libsigc++-2.0*"
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:#if _LIB_VERSION == _IEEE_:#if 0:" \
-		${S}/modules/javascript/js/src/fdlibm/k_standard.c \
-		|| die "errno fix failed"
-	rm -f ${S}/modules/javascript/object_model.cpp
-	touch ${S}/modules/javascript/object_model.cpp
-}
-
-src_compile() {
-	local myconf="--with-ngui"
-	if use expat || ! use xml2 ; then
-		myconf="--without-libxml2"
-	else
-		myconf="--with-libxml2"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		--with-external-boost \
-		$(use_with truetype freetype2) \
-		$(use_with gnome) \
-		$(use_with graphviz) \
-		$(use_with imagemagick) \
-		$(use_with javascript) \
-		$(use_with jpeg) \
-		$(use_with openexr) \
-		$(use_with plib) \
-		$(use_with png) \
-		$(use_with python) \
-		$(use_with qt) \
-		$(use_with svg svg-icons) \
-		$(use_with tiff) \
-		${myconf} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS INSTALL NEWS README TODO
-	#missing dir
-	dodir /usr/share/k3d/shaders/layered
-}
diff --git a/media-gfx/k3d/k3d-0.5.0.34.ebuild b/media-gfx/k3d/k3d-0.5.0.34.ebuild
deleted file mode 100644
index 2b567ae6cdca..000000000000
--- a/media-gfx/k3d/k3d-0.5.0.34.ebuild
+++ /dev/null
@@ -1,93 +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.5.0.34.ebuild,v 1.5 2006/02/02 03:19:59 vanquirius Exp $
-
-inherit eutils
-
-DESCRIPTION="A free 3D modeling, animation, and rendering system"
-HOMEPAGE="http://k3d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/k3d/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="expat gnome graphviz imagemagick javascript jpeg nls openexr plib png python qt svg tiff truetype xml2"
-
-DEPEND="virtual/opengl
-	virtual/glu
-	dev-libs/boost
-	expat? ( dev-libs/expat )
-	xml2? ( dev-libs/libxml2 )
-	!xml2? ( dev-libs/expat )
-	truetype? ( >=media-libs/freetype-2 )
-	gnome? ( gnome-base/libgnome )
-	imagemagick? ( media-gfx/imagemagick )
-	jpeg? ( media-libs/jpeg )
-	dev-cpp/glibmm
-	dev-cpp/gtkmm
-	>=x11-libs/gtkglext-1.0.6-r3
-	openexr? ( media-libs/openexr )
-	plib? ( media-libs/plib )
-	png? ( media-libs/libpng )
-	python? ( >=dev-lang/python-2.3 )
-	qt? ( =x11-libs/qt-3* )
-	tiff? ( media-libs/tiff )
-	=dev-libs/libsigc++-2.0*
-	svg? ( gnome-base/librsvg )"
-
-RDEPEND="${DEPEND}
-	( || (
-	( x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM )
-	virtual/x11 )
-	)"
-
-DEPEND="${DEPEND}
-	( || (
-	( media-libs/mesa )
-	virtual/x11 )
-	)"
-
-src_unpack() {
-	unpack ${A}
-	# bug 112144
-	epatch "${FILESDIR}"/${PN}-0.5.0.34-nls.patch
-}
-
-src_compile() {
-	local myconf="--with-ngui"
-	if use expat || ! use xml2 ; then
-		myconf="--without-libxml2"
-	else
-		myconf="--with-libxml2"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		--with-external-boost \
-		$(use_with truetype freetype2) \
-		$(use_with gnome) \
-		$(use_with graphviz) \
-		$(use_with imagemagick) \
-		$(use_with javascript) \
-		$(use_with jpeg) \
-		$(use_with openexr) \
-		$(use_with plib) \
-		$(use_with png) \
-		$(use_with python) \
-		$(use_with qt) \
-		$(use_with svg svg-icons) \
-		$(use_with tiff) \
-		${myconf} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS NEWS README TODO
-	#missing dir
-	dodir /usr/share/k3d/shaders/layered
-}
diff --git a/media-gfx/k3d/k3d-0.5.0.37.ebuild b/media-gfx/k3d/k3d-0.5.0.37-r1.ebuild
index 49e09fde0fda..0fee9c7b8025 100644
--- a/media-gfx/k3d/k3d-0.5.0.37.ebuild
+++ b/media-gfx/k3d/k3d-0.5.0.37-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.37.ebuild,v 1.1 2006/02/02 20:40:45 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.5.0.37-r1.ebuild,v 1.1 2006/02/09 00:27:12 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 graphviz imagemagick javascript jpeg nls openexr plib png python qt svg tiff truetype xml2"
+IUSE="expat gnome graphviz imagemagick jpeg nls openexr plib png python svg tiff truetype xml2"
 
 DEPEND="virtual/opengl
 	virtual/glu
@@ -30,7 +30,6 @@ DEPEND="virtual/opengl
 	plib? ( media-libs/plib )
 	png? ( media-libs/libpng )
 	python? ( >=dev-lang/python-2.3 )
-	qt? ( =x11-libs/qt-3* )
 	tiff? ( media-libs/tiff )
 	=dev-libs/libsigc++-2.0*
 	svg? ( gnome-base/librsvg )"
@@ -71,13 +70,11 @@ src_compile() {
 		$(use_with gnome) \
 		$(use_with graphviz) \
 		$(use_with imagemagick) \
-		$(use_with javascript) \
 		$(use_with jpeg) \
 		$(use_with openexr) \
 		$(use_with plib) \
 		$(use_with png) \
 		$(use_with python) \
-		$(use_with qt) \
 		$(use_with svg svg-icons) \
 		$(use_with tiff) \
 		${myconf} \
@@ -90,4 +87,5 @@ src_install() {
 	dodoc AUTHORS NEWS README TODO
 	#missing dir
 	dodir /usr/share/k3d/shaders/layered
+	keepdir /usr/share/k3d/shaders/layered
 }