old

(Portage version: 2.1.11.50/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 6 insertions, 247 deletions

diff --git a/dev-games/crystalspace/ChangeLog b/dev-games/crystalspace/ChangeLog
index aacb6e2755d7..bd8e3ed8684c 100644
--- a/dev-games/crystalspace/ChangeLog
+++ b/dev-games/crystalspace/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-games/crystalspace
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.57 2013/01/24 00:16:26 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/ChangeLog,v 1.58 2013/02/13 17:27:38 mr_bones_ Exp $
+
+  13 Feb 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -crystalspace-1.4.0.ebuild, -files/crystalspace-1.4.0-bullet.patch,
+  -files/crystalspace-1.4.0-gcc47.patch, -files/crystalspace-1.4.0-png15.patch:
+  old
 
 *crystalspace-2.0 (24 Jan 2013)
 
diff --git a/dev-games/crystalspace/crystalspace-1.4.0.ebuild b/dev-games/crystalspace/crystalspace-1.4.0.ebuild
deleted file mode 100644
index c838c9521bcb..000000000000
--- a/dev-games/crystalspace/crystalspace-1.4.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.4.0.ebuild,v 1.11 2012/07/17 12:33:39 tupone Exp $
-
-EAPI=2
-inherit eutils flag-o-matic multilib java-pkg-opt-2 autotools wxwidgets versionator
-
-MY_P=${PN}-src-${PV}
-PATH_P=${PN}-$(get_version_component_range 1-2)
-
-DESCRIPTION="Portable 3D Game Development Kit written in C++"
-HOMEPAGE="http://crystal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/crystal/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="3ds alsa bullet cal3d cegui cg doc java jpeg mng ode png
-sdl speex truetype vorbis wxwidgets"
-
-COMMON_DEP="virtual/opengl
-	media-libs/openal
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-	cg? ( media-gfx/nvidia-cg-toolkit )
-	ode? ( dev-games/ode )
-	cal3d? ( >=media-libs/cal3d-0.11 )
-	jpeg? ( virtual/jpeg )
-	bullet? ( sci-physics/bullet )
-	sdl? ( media-libs/libsdl )
-	vorbis? ( media-libs/libvorbis )
-	speex? ( media-libs/libogg
-		media-libs/speex )
-	truetype? ( >=media-libs/freetype-2.1 )
-	alsa? ( media-libs/alsa-lib )
-	mng? ( media-libs/libmng )
-	png? ( media-libs/libpng )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X,opengl] )
-	cegui? ( >=dev-games/cegui-0.5.0 )
-	3ds? ( media-libs/lib3ds )"
-
-RDEPEND="${COMMON_DEP}
-	java? ( >=virtual/jre-1.5 )"
-
-DEPEND="${COMMON_DEP}
-	java? ( >=virtual/jdk-1.5
-		dev-java/ant-core )
-	dev-util/ftjam
-	dev-lang/swig
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Installing doc conflict with dodoc on src_install
-	# Removing conflicting target
-	sed -i \
-		-e "/^InstallDoc/d" \
-		Jamfile.in \
-		docs/Jamfile \
-		|| die "sed failed"
-	epatch "${FILESDIR}"/${P}-bullet.patch \
-		"${FILESDIR}"/${P}-png15.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
-	AT_M4DIR=mk/autoconf
-	eautoreconf
-}
-
-src_configure() {
-	if use wxwidgets; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets gtk2
-	fi
-
-	econf --enable-cpu-specific-optimizations=no \
-		--disable-separate-debug-info \
-		--without-lcms \
-		--without-caca \
-		--without-jackasyn \
-		--without-perl \
-		$(use_with java) \
-		--disable-make-emulation \
-		$(use_with bullet) \
-		--without-python \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with mng) \
-		$(use_with vorbis) \
-		$(use_with speex) \
-		$(use_with 3ds) \
-		$(use_with ode) \
-		$(use_with truetype freetype2) \
-		$(use_with cal3d) \
-		$(use_with sdl) \
-		$(use_with wxwidgets wx) \
-		$(use_with cegui CEGUI) \
-		$(use_with cg Cg) \
-		$(use_with alsa asound)
-	#remove unwanted CFLAGS added by ./configure
-	sed -i -e '/COMPILER\.CFLAGS\.optimize/d' \
-		Jamconfig \
-		|| die "sed failed"
-}
-
-src_compile() {
-	local jamopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
-	jam -q ${jamopts} || die "compile failed"
-}
-
-src_install() {
-	for installTarget in bin plugin lib include data config bindings
-	do
-		jam -q -s DESTDIR="${D}" install_${installTarget} \
-			|| die "jam install_${installTarget} failed"
-	done
-	if use doc; then
-		jam -q -s DESTDIR="${D}" install_doc || die "jam install_doc failed"
-	fi
-	dodoc README docs/history*
-
-	echo "CRYSTAL_PLUGIN=/usr/$(get_libdir)/${PATH_P}" > 90crystalspace
-	echo "CRYSTAL_CONFIG=/etc/${PATH_P}" >> 90crystalspace
-	doenvd 90crystalspace
-}
-
-pkg_postinst() {
-	elog "Examples coming with this package, need correct light calculation"
-	elog "Do the following commands, with the root account, to fix that:"
-	# Fill cache directory for the examples
-	local dir
-	for dir in castle flarge isomap parallaxtest partsys r3dtest stenciltest \
-		terrain terrainf;
-	do
-		elog "cslight -video=null /usr/share/${PATH_P}/data/maps/${dir}"
-	done
-}
diff --git a/dev-games/crystalspace/files/crystalspace-1.4.0-bullet.patch b/dev-games/crystalspace/files/crystalspace-1.4.0-bullet.patch
deleted file mode 100644
index 2fd0f207e503..000000000000
--- a/dev-games/crystalspace/files/crystalspace-1.4.0-bullet.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.ac.old	2010-06-19 21:50:21.000000000 +0200
-+++ configure.ac	2010-06-19 22:00:50.000000000 +0200
-@@ -1318,8 +1318,7 @@
-       btDefaultCollisionConfiguration* c;
-       btDynamicsWorld* world = new btDiscreteDynamicsWorld (d, b, s, c)])],
-     [], [C++], [], [],
--    [], [], [-lbulletdynamics -lbulletcollision -lbulletmath],
--    [bulletdynamics])
-+    [])
- 
- AS_IF([test $cs_cv_libbullet = yes],
-     [CS_CHECK_BUILD([if bullet is sufficiently recent (>=2.68)], [cs_cv_bullet_recent],
diff --git a/dev-games/crystalspace/files/crystalspace-1.4.0-gcc47.patch b/dev-games/crystalspace/files/crystalspace-1.4.0-gcc47.patch
deleted file mode 100644
index 74ac5df38296..000000000000
--- a/dev-games/crystalspace/files/crystalspace-1.4.0-gcc47.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- include/csutil/blockallocator.h.old	2012-07-17 09:08:57.203478402 +0200
-+++ include/csutil/blockallocator.h	2012-07-17 09:10:34.556642885 +0200
-@@ -166,7 +166,7 @@
-   ~csBlockAllocator()
-   {
-     ObjectDispose dispose (*this, false);
--    DisposeAll (dispose);
-+    this->DisposeAll (dispose);
-   }
- 
-   /**
-@@ -177,7 +177,7 @@
-   void Empty()
-   {
-     ObjectDispose dispose (*this, true);
--    DisposeAll (dispose);
-+    this->DisposeAll (dispose);
-   }
- 
-   /**
---- include/csutil/parray.h.old	2012-07-17 13:02:11.524886456 +0200
-+++ include/csutil/parray.h	2012-07-17 13:02:43.531639147 +0200
-@@ -106,7 +106,7 @@
-   {
-     CS_ASSERT (this->GetSize () > 0);
-     T* ret = GetAndClear (this->GetSize () - 1); // see *1*
--    Truncate (this->GetSize () - 1);
-+    this->Truncate (this->GetSize () - 1);
-     return ret;
-   }
- 
---- include/csutil/refarr.h.old	2012-07-17 09:16:33.084469347 +0200
-+++ include/csutil/refarr.h	2012-07-17 09:17:04.008298074 +0200
-@@ -106,7 +106,7 @@
-   {
-     CS_ASSERT (this->GetSize () > 0);
-     csRef<T> ret = this->Get (this->GetSize () - 1); // see *1*
--    SetSize (this->GetSize () - 1);
-+    this->SetSize (this->GetSize () - 1);
-     return csPtr<T> (ret);
-   }
- };
diff --git a/dev-games/crystalspace/files/crystalspace-1.4.0-png15.patch b/dev-games/crystalspace/files/crystalspace-1.4.0-png15.patch
deleted file mode 100644
index 314521eaf235..000000000000
--- a/dev-games/crystalspace/files/crystalspace-1.4.0-png15.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- plugins/video/loader/png/pngimage.cpp.old	2011-09-09 10:39:57.218570796 +0200
-+++ plugins/video/loader/png/pngimage.cpp	2011-09-09 10:46:45.733522309 +0200
-@@ -60,7 +60,7 @@
- 
- static void png_write (png_structp png, png_bytep data, png_size_t length)
- {
--  datastore *ds = (datastore *)png->io_ptr;
-+  datastore *ds = (datastore *)png_get_io_ptr(png);
-   if (ds->pos + (long)length > ds->length)
-   {
-     ds->data = (unsigned char*)cs_realloc (ds->data, ds->pos + (long)length);
-@@ -173,7 +173,7 @@
-   }
- 
-   /* Catch processing errors */
--  if (setjmp(png->jmpbuf))
-+  if (setjmp(png_jmpbuf(png)))
-   {
-     /* If we get here, we had a problem reading the file */
-     png_destroy_write_struct (&png, &info);
-@@ -355,7 +355,7 @@
- void ImagePngFile::PngLoader::ImagePngRead (png_structp png, png_bytep data, 
- 					    png_size_t size)
- {
--  ImagePngRawData *self = (ImagePngRawData *) png->io_ptr;
-+  ImagePngRawData *self = (ImagePngRawData *) png_get_io_ptr(png);
- 
-   if (self->r_size < size)
-     png_error (png, "Read Error");
-@@ -394,7 +394,7 @@
-     return false;
-   }
- 
--  if (setjmp (png->jmpbuf))
-+  if (setjmp (png_jmpbuf(png)))
-   {
- nomem2:
-     // If we get here, we had a problem reading the file
-@@ -524,7 +524,7 @@
- {
-   size_t rowbytes, exp_rowbytes;
- 
--  if (setjmp (png->jmpbuf))
-+  if (setjmp (png_jmpbuf(png)))
-   {
- nomem2:
-     // If we get here, we had a problem reading the file
-@@ -560,7 +560,7 @@
- 
-   png_bytep * const row_pointers = new png_bytep[Height];
- 
--  if (setjmp (png->jmpbuf))             // Set a new exception handler
-+  if (setjmp (png_jmpbuf(png)))             // Set a new exception handler
-   {
-     delete [] row_pointers;
-     goto nomem2;