old

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64

6 files changed, 7 insertions, 267 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/Manifest b/dev-games/crystalspace/Manifest
index 126495d9aaa2..1891619750ce 100644
--- a/dev-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@@ -1,24 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX crystalspace-1.4.0-bullet.patch 501 SHA256 0dc5ecb64d9a9a07a3da9e89c51080952beb1a4daed40e6b3eccc64ab9e4677f SHA512 a325edafe6bebbe4679521763a1dcb70ef5caa9593f42486384ede2e6f98754354617e0064af8eaa746981a506b66483df501aa50178c7e9176ccbda21b0f5fb WHIRLPOOL c9e3d9cfa13f9f3699111075eb700cd49656d7bd80d297207c6e69fbd9076db72ef7193e0f37a4c50853842c57edd92710f7e40a1661b5b1ed77700376202169
-AUX crystalspace-1.4.0-gcc47.patch 1211 SHA256 816d4d19c916ce5ccfb198200d9b926948bb62de7e289fdad760faac7bcccd9a SHA512 a7e528041dc0d5d1f03bb6fca2850bc659ceef1ddf426dc29c3be546be83b555ebd35af3998bd977c1df5326fb9b6f630a5b766f126307d14ddb4ba1dcab6f96 WHIRLPOOL 9c6b24a6c82830a0c71d9d6318b7e84f26eebd26fc5103e82a1029e652dc198aa7c15d10f77aafbc742cb3e4726c478e22e16c18a32e51097e73209c6c702450
-AUX crystalspace-1.4.0-png15.patch 1695 SHA256 f755eb090ce0a3df558c9c126d3f30c834807a392c824b8e2eda696fd54a1017 SHA512 78dfc5886b5b3588e6203c0b58d1cbea5561b3cf4b0dff27ef778272c56d12908583b832c707ab4b49af96853703164f680041aaeb8954dfa1eda49f6cc97b65 WHIRLPOOL 2a92dd655b3a9571481ac56e7672a0cb0c3c514b166d53e09c112452c0772f226ac4f3de0d56499219e5f7ac79a671b9dc96c5b4e87c29b390a2dd3862209bb1
 AUX crystalspace-2.0-gcc47.patch 977 SHA256 8410b5686ba19ad814c6a12b6e14814f81fa8d62839b0d918b8ea3638b145086 SHA512 d92ee79e45936529ba10c3c1d1f75b191451ee447af4a27f9eccf9a4ddeaa9356d05aac0b61545cdd29064bd075de989574ae0392f18f683b5d73958a822695c WHIRLPOOL 21cf252665fd872cb90aabacd1def86df90ee389c5c9f2a823dd0f710b5c75fdc306e33a5b7eba3d4821326000512636ca7cd8b7c8838b0f14836ff946547d42
-DIST crystalspace-src-1.4.0.tar.bz2 45670477 SHA256 a8e1bfc9328470121bfbc6cf98f2c310a34f6998978065aa2f6df7e02a0101ba SHA512 fd661f519723ad16c8fc9dc65fa8148b9c828c01b4b586618b9a58cf0c30aec1b7d70a37e61072a1d5f6121b1767647a3a0c06a5a2dd94f26e7b498366bdff55 WHIRLPOOL e9a9bf8fc2d4b4ad171c988706e34062ea4b0053c6dd68a3a417d44d1717dea50ec5d93bed37969738c852b78f5c8b4913f4b6ab1ba3b2ed9e3837f8f1d41aef
 DIST crystalspace-src-2.0.tar.bz2 185925180 SHA256 f1cda74fd998e44088746803209b1ea6625e80e3d4fb72023d8bed6b677b7b6a SHA512 f09d40669268e26542a2854560ac5033e7f89d0bd5def870e5062e08611c36a0875666abe0c705bb5f9f37dafa619f33f900e358d5fe255746a86127a3899f97 WHIRLPOOL a1705cb88b64eb0e8f6a146c2a75baab01aa598d07b8d36ab0671a47d4092b5c9b53c13f46bb1e56663b2b228c4b95cee3a355554c1de92c3d931187e97c4ca1
-EBUILD crystalspace-1.4.0.ebuild 3645 SHA256 c11fcf69fb5fdaa7c45a702a4a3d998b78f3fc1ee4fb27f5ca3f0edf1ca48979 SHA512 f43b18b9c4ba1a6b789c5b097614d980757ef759d3ed7db8c8dbb306043b82a41f0dc67e8ad6a503713119091955d68b9e4e900a7a02cb7dc5b632ca46efe3c1 WHIRLPOOL 1481fbf0025cb20b983e969dc8aa3408594c574abb3a0290fbd5ee2150052f79d7163f6cffe7e57a32ead1841a0c2924d363d5856732757016270bd91b6c31cc
 EBUILD crystalspace-2.0.ebuild 3557 SHA256 90c5e5aad6ed0ce6529f6f1a9910f856dc6592e873cf8cd45a970b6216cc1617 SHA512 3e28375e8223c0ff627df6b1afea83b2ca44899ad4ddcbcaacc9c35ca00cde2ec8c675464b94e1d2a8ee1bc1e5d4fc81fcedf4d27e88a8feaabf168ff9a7d011 WHIRLPOOL 781fa7ab9dc523bf92def2e0159831f9b65f3157fbf0d1d1fc58dec003d6608868f2fc44edbd3762da753cb6f040e6adf626bf7f16b75f24515552b9f09b3214
-MISC ChangeLog 8857 SHA256 dcbad4a3b3cc12f242d578ab4530ce8e0a69b4deb62026b5eb4025516fe5800f SHA512 cd289cf59c517df671e2ca7d8cb44709fb537b9b693b48c798ccd040b946fc6837b191b4b016977fd4d800abf3ae30ac703c70e6a9ff11111f03a3fbc3ef43ae WHIRLPOOL c889a74d594f08e54ba12c715dc24d50882a51436525af6f2881275a311ab155cfa328b17daa0c95fba43a599474ddf9cf32edd33c27813963f0ca2024f8a373
+MISC ChangeLog 9070 SHA256 9e45818e5e325326e9f17f5a17a789b871b8319bf708506e035c54010b2f07e6 SHA512 b8a2cef3003ede6fe4508dc48ae405931388c1454a1cf0ed2297798231edb64bf106c4441692006085f40f79bedf3081723afef9b523e54dea87343be3b76569 WHIRLPOOL 30d7fd136063590757f1b36bbdb3935ad198ff39f1a0a7db44114e3e9cb7d1edb8ccb6b061e86d000613d4207f274ac2b9154dc19b1a7edafc6720ad48aeaa25
 MISC metadata.xml 1309 SHA256 94be39659027a6759ea4645650771553d5982ee01253f860bc526270e83cc283 SHA512 6314078e087224153cc83679bc592a6e39db1133228ff1ed045766a5004b45723d9ff01eff089007ae1f5279c1539883b0ecbf7e75ccb298ce45882a0f56512d WHIRLPOOL 816ed43eb53fcf7035bc152211d6337406e3293256c90f35ccd4808c6fdb09147d25ebae0bf507334521e08093383e1c930ec60c5678a09cdcd9093aa5c7c880
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJRAH1eAAoJEFpvPKfnPDWz7rwIAIJbrdzQ1HuNgGih+J/VN6z7
-S/wytJ5jTm0yrEg6lz5/fbKxLbfvOUdf54arK9RgaJfBF6YtVWI3yYpw0Fog3EPC
-pDYiU7uFpKP0t0EascqMKCWMdscMSbi6xLSgjnuK6cLIC6+Nwjx2xQNnvBu5lBBc
-H032TLLhrq9HRNvTcVq+Ng7ei64ovIffnYuXIDZUMxRtPv5EXrVhNxf7usYeM35O
-eOvr4m1EnglADnmt3TlqICLAkUMGiG1KBefKsA8rTU881hke4AcfXCLDKbi3IfNu
-QuH1mp7VIoW8uaHL6aGbhPWmVN4GcdEZh+0cnIM/fY4e2AgPTTpVA5dG2jjRmR4=
-=EqSx
------END PGP SIGNATURE-----
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;