version bump, bug #144259; old

(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc5 i686)

4 files changed, 222 insertions, 91 deletions

diff --git a/media-libs/panda3d/ChangeLog b/media-libs/panda3d/ChangeLog
index 078aca9b6d46..db815f58aa93 100644
--- a/media-libs/panda3d/ChangeLog
+++ b/media-libs/panda3d/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/panda3d
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/panda3d/ChangeLog,v 1.7 2007/10/17 18:21:00 drac Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/panda3d/ChangeLog,v 1.8 2008/08/30 15:52:28 maekke Exp $
+
+*panda3d-1.5.2 (30 Aug 2008)
+
+  30 Aug 2008; Markus Meier <maekke@gentoo.org>
+  +files/panda3d-1.5.2-gcc43.patch, -panda3d-1.0.4.ebuild,
+  +panda3d-1.5.2.ebuild:
+  version bump, bug #144259; old
 
   17 Oct 2007; Samuli Suominen <drac@gentoo.org> panda3d-1.0.5.ebuild:
   Change media-libs/fmod dep to work with slots.
diff --git a/media-libs/panda3d/files/panda3d-1.5.2-gcc43.patch b/media-libs/panda3d/files/panda3d-1.5.2-gcc43.patch
new file mode 100644
index 000000000000..df6404c246c0
--- /dev/null
+++ b/media-libs/panda3d/files/panda3d-1.5.2-gcc43.patch
@@ -0,0 +1,92 @@
+diff -ur panda3d-1.5.2.orig/dtool/src/dtoolbase/typeRegistryNode.cxx panda3d-1.5.2/dtool/src/dtoolbase/typeRegistryNode.cxx
+--- panda3d-1.5.2.orig/dtool/src/dtoolbase/typeRegistryNode.cxx	2008-08-30 15:53:58.000000000 +0200
++++ panda3d-1.5.2/dtool/src/dtoolbase/typeRegistryNode.cxx	2008-08-30 15:56:36.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include "typeRegistryNode.h"
+ 
+ #include <algorithm>
++#include <string.h>
+ 
+ bool TypeRegistryNode::_paranoid_inheritance = false;
+ 
+diff -ur panda3d-1.5.2.orig/dtool/src/dtoolutil/filename.I panda3d-1.5.2/dtool/src/dtoolutil/filename.I
+--- panda3d-1.5.2.orig/dtool/src/dtoolutil/filename.I	2008-08-30 16:01:48.000000000 +0200
++++ panda3d-1.5.2/dtool/src/dtoolutil/filename.I	2008-08-30 16:03:50.000000000 +0200
+@@ -16,6 +16,8 @@
+ //
+ ////////////////////////////////////////////////////////////////////
+ 
++#include <string.h>
++
+ ////////////////////////////////////////////////////////////////////
+ //     Function: Filename::Constructor
+ //       Access: Published
+diff -ur panda3d-1.5.2.orig/dtool/src/cppparser/cppExpression.cxx panda3d-1.5.2/dtool/src/cppparser/cppExpression.cxx
+--- panda3d-1.5.2.orig/dtool/src/cppparser/cppExpression.cxx	2008-08-30 16:06:51.000000000 +0200
++++ panda3d-1.5.2/dtool/src/cppparser/cppExpression.cxx	2008-08-30 16:08:14.000000000 +0200
+@@ -32,6 +32,7 @@
+ #include "cppBison.h"
+ 
+ #include <assert.h>
++#include <stdlib.h>
+ 
+ ////////////////////////////////////////////////////////////////////
+ //     Function: CPPExpresion::Result::Constructor
+diff -ur panda3d-1.5.2.orig/dtool/src/cppparser/cppPreprocessor.cxx panda3d-1.5.2/dtool/src/cppparser/cppPreprocessor.cxx
+--- panda3d-1.5.2.orig/dtool/src/cppparser/cppPreprocessor.cxx	2008-08-30 16:06:51.000000000 +0200
++++ panda3d-1.5.2/dtool/src/cppparser/cppPreprocessor.cxx	2008-08-30 16:07:36.000000000 +0200
+@@ -32,6 +32,7 @@
+ 
+ #include <assert.h>
+ #include <ctype.h>
++#include <stdlib.h>
+ 
+ // We manage our own visibility counter, in addition to that managed
+ // by cppBison.y.  We do this just so we can define manifests with the
+diff -ur panda3d-1.5.2.orig/dtool/src/prc/configDeclaration.cxx panda3d-1.5.2/dtool/src/prc/configDeclaration.cxx
+--- panda3d-1.5.2.orig/dtool/src/prc/configDeclaration.cxx	2008-08-30 16:12:41.000000000 +0200
++++ panda3d-1.5.2/dtool/src/prc/configDeclaration.cxx	2008-08-30 16:13:07.000000000 +0200
+@@ -19,6 +19,7 @@
+ #include "configDeclaration.h"
+ #include "configVariableCore.h"
+ 
++#include <stdlib.h>
+ 
+ ////////////////////////////////////////////////////////////////////
+ //     Function: ConfigDeclaration::Constructor
+diff -ur panda3d-1.5.2.orig/dtool/src/interrogate/interrogate_module.cxx panda3d-1.5.2/dtool/src/interrogate/interrogate_module.cxx
+--- panda3d-1.5.2.orig/dtool/src/interrogate/interrogate_module.cxx	2008-08-30 16:15:50.000000000 +0200
++++ panda3d-1.5.2/dtool/src/interrogate/interrogate_module.cxx	2008-08-30 16:16:20.000000000 +0200
+@@ -29,6 +29,8 @@
+ 
+ #include "set"
+ 
++#include <stdlib.h>
++
+ // If our system getopt() doesn't come with getopt_long_only(), then use
+ // the GNU flavor that we've got in tool for this purpose.
+ #ifndef HAVE_GETOPT_LONG_ONLY
+diff -ur panda3d-1.5.2.orig/panda/src/nativenet/socket_address.h panda3d-1.5.2/panda/src/nativenet/socket_address.h
+--- panda3d-1.5.2.orig/panda/src/nativenet/socket_address.h	2008-08-30 16:27:03.000000000 +0200
++++ panda3d-1.5.2/panda/src/nativenet/socket_address.h	2008-08-30 16:28:49.000000000 +0200
+@@ -5,6 +5,8 @@
+ #include "numeric_types.h"
+ #include "socket_portable.h"
+ 
++#include <stdlib.h>
++
+ ///////////////////////////////////
+ // Class : Socket_Address
+ //
+diff -ur panda3d-1.5.2.orig/panda/src/pnmimagetypes/pnmFileTypePNM.cxx panda3d-1.5.2/panda/src/pnmimagetypes/pnmFileTypePNM.cxx
+--- panda3d-1.5.2.orig/panda/src/pnmimagetypes/pnmFileTypePNM.cxx	2008-08-30 16:56:33.000000000 +0200
++++ panda3d-1.5.2/panda/src/pnmimagetypes/pnmFileTypePNM.cxx	2008-08-30 16:57:53.000000000 +0200
+@@ -22,6 +22,8 @@
+ #include "pnmFileTypeRegistry.h"
+ #include "bamReader.h"
+ 
++#include <limits.h>
++
+ static const char * const extensions_PNM[] = {
+   "pbm", "pgm", "ppm", "pnm"
+ };
diff --git a/media-libs/panda3d/panda3d-1.0.4.ebuild b/media-libs/panda3d/panda3d-1.0.4.ebuild
deleted file mode 100644
index cfe4d7207855..000000000000
--- a/media-libs/panda3d/panda3d-1.0.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/panda3d/panda3d-1.0.4.ebuild,v 1.4 2007/04/30 23:28:32 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="A 3D framework in C++ with python bindings"
-HOMEPAGE="http://panda3d.org"
-SRC_URI="http://panda3d.org/download/${P}.tar.gz"
-
-LICENSE="Panda3D"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="png jpeg tiff fmod nspr ssl truetype doc zlib"
-
-DEPEND="doc? ( dev-python/epydoc )
-		png? ( media-libs/libpng )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		fmod? ( media-libs/fmod )
-		ssl? ( dev-libs/openssl )
-		truetype? ( media-libs/freetype )
-		zlib? ( sys-libs/zlib )"
-
-use_no()
-{
-	local UWORD="$2"
-	if [ -z "${UWORD}" ]; then
-		UWORD="$1"
-	fi
-
-	if useq $1 ; then
-		echo "--use-${UWORD}"
-	else
-		echo "--no-${UWORD}"
-	fi
-}
-
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makepanda.patch
-}
-
-src_compile()
-{
-	./makepanda/makepanda.py \
-	--compiler LINUXA \
-	--prefix built \
-	--libdir $(get_libdir) \
-	$(use_no png) $(use_no jpeg) \
-	$(use_no tiff) $(use_no fmod) \
-	$(use_no ssl) $(use_no truetype freetype) \
-	$(use_no zlib) $(use_no nspr) \
-	|| die "build failed"
-}
-
-src_install()
-{
-	dodir /opt/panda3d
-	cp -R ${S}/direct ${S}/built
-
-	doenvd ${FILESDIR}/50panda3d
-	sed -i -e "s:lib:$(get_libdir):g" \
-	${D}/etc/env.d/50panda3d \
-	|| die "libdir patching failed"
-
-	if use doc; then
-		cp -R ${S}/samples ${S}/built
-		cd ${S}/built
-		epydoc --html direct
-	fi
-
-	cp -R ${S}/built/* ${D}/opt/panda3d
-}
-
-pkg_postinst()
-{
-	elog "Panda3d is installed in /opt/panda3d"
-	if use doc ; then
-		elog "Documentation is avaliable in /opt/panda3d/html"
-		elog "Samples are avalaible in /opt/panda3d/samples"
-	fi
-	elog "For C++ compiling, include directory must be set:"
-	elog "g++ -I/opt/panda3d/include [other flags]"
-	elog "Python scripts must be ran with ppython"
-	elog "Tutorials avaliable at http://panda3d.org"
-}
diff --git a/media-libs/panda3d/panda3d-1.5.2.ebuild b/media-libs/panda3d/panda3d-1.5.2.ebuild
new file mode 100644
index 000000000000..31eba281c1ac
--- /dev/null
+++ b/media-libs/panda3d/panda3d-1.5.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/panda3d/panda3d-1.5.2.ebuild,v 1.1 2008/08/30 15:52:28 maekke Exp $
+
+inherit eutils python
+
+DESCRIPTION="A 3D framework in C++ with python bindings"
+HOMEPAGE="http://panda3d.org"
+SRC_URI="http://panda3d.org/download/${P}/${P}.tar.gz"
+
+LICENSE="Panda3D"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc ffmpeg fftw fmod jpeg openal png python ssl tiff truetype zlib"
+
+DEPEND="doc? ( dev-python/epydoc )
+		ffmpeg? ( media-video/ffmpeg )
+		fftw? ( sci-libs/fftw )
+		fmod? ( =media-libs/fmod-3* )
+		jpeg? ( media-libs/jpeg )
+		openal? ( media-libs/openal )
+		png? ( media-libs/libpng )
+		python? ( dev-lang/python )
+		ssl? ( dev-libs/openssl )
+		tiff? ( media-libs/tiff )
+		truetype? ( media-libs/freetype )
+		zlib? ( sys-libs/zlib )"
+
+use_no() {
+	local UWORD="$2"
+	if [ -z "${UWORD}" ]; then
+		UWORD="$1"
+	fi
+
+	if useq $1 ; then
+		echo "--use-${UWORD}"
+	else
+		echo "--no-${UWORD}"
+	fi
+}
+
+pkg_setup() {
+	ewarn "Please note that python bindings are now"
+	ewarn "set by the python USE flag to coordinate"
+	ewarn "with upstream."
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
+src_compile() {
+	./makepanda/makepanda.py \
+		$(use_no ffmpeg) \
+		$(use_no fftw) \
+		$(use_no fmod) \
+		$(use_no jpeg) \
+		$(use_no png) \
+		$(use_no openal) \
+		$(use_no python) \
+		$(use_no ssl openssl) \
+		$(use_no tiff) \
+		$(use_no truetype freetype) \
+		$(use_no zlib) \
+		|| die "build failed"
+}
+
+src_install() {
+	dodir /opt/panda3d
+
+	doenvd "${FILESDIR}"/50panda3d
+	sed -i -e "s:lib:$(get_libdir):g" \
+		"${D}"/etc/env.d/50panda3d \
+		|| die "libdir patching failed"
+
+	if use doc; then
+		cp -R "${S}"/samples "${S}"/built
+		cp -R "${S}"/direct/src "${S}"/built/direct/src
+		cd "${S}"/built
+	fi
+
+	if use python ; then
+		# python installation
+		python_version
+		dodir /usr/$(get_libdir)/python${PYVER}/site-packages
+		cat <<- EOF > "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/panda3d.pth
+		# This document sets up paths for python to access the
+		# panda3d modules
+		/opt/panda3d
+		/opt/panda3d/lib
+		/opt/panda3d/direct
+		/opt/panda3d/pandac
+		/opt/panda3d/built
+		/opt/panda3d/built/$(get_libdir)
+		EOF
+	fi
+
+	cp -R "${S}"/direct/src "${S}"/built/direct/
+	cp -R "${S}"/built/* "${D}"/opt/panda3d
+}
+
+pkg_postinst()
+{
+	elog "Panda3d is installed in /opt/panda3d"
+	elog
+	if use doc ; then
+		elog "Documentation is avaliable in /opt/panda3d/doc"
+		elog "Samples are avalaible in /opt/panda3d/samples"
+	fi
+	elog "For C++ compiling, include directory must be set:"
+	elog "g++ -I/opt/panda3d/include [other flags]"
+	if use python ; then
+		elog
+		elog "ppython is depricated and panda3d modules are"
+		elog "now installed as standard python modules."
+	fi
+	elog
+	elog "Tutorials avaliable at http://panda3d.org"
+}