Version bump, bug #214860

Package-Manager: portage-2.1.5_rc6

5 files changed, 141 insertions, 7 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index 5565589b9ae3..aab6e3e611bb 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/clanlib
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.40 2007/10/29 22:07:43 mr_bones_ Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.41 2008/04/30 20:03:30 nyhm Exp $
+
+*clanlib-0.8.1 (30 Apr 2008)
+
+  30 Apr 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/clanlib-0.8.1-gcc43.patch, +files/clanlib-0.8.1-ndebug.patch,
+  +clanlib-0.8.1.ebuild:
+  Version bump, bug #214860
 
   29 Oct 2007; Michael Sterrett <mr_bones_@gentoo.org>
   +files/clanlib-0.7.8-ndebug.patch, +files/clanlib-0.8.0-ndebug.patch,
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index e0f4551e51b5..76af45bb31a5 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -8,16 +8,20 @@ AUX clanlib-0.7.8-ndebug.patch 866 RMD160 1b6febbcb84230627ba3c0d3f6185fec6d517b
 AUX clanlib-0.7.8-refreshfix.patch 435 RMD160 e4562f30dea51c6b1f01014611f3a7ebf0976ca5 SHA1 2745951ebc37339188bf63af6949dd1869b57020 SHA256 1cb0bab20ef41f364d5bb4395a78213f4ad8fa187bc49cc5f85e80544f557ffa
 AUX clanlib-0.8.0-gcc42.patch 744 RMD160 e902db2b7692afc386da0eacf3b8e37fe55aa780 SHA1 0ef10d301fa2974c11abf14e707a624529bea823 SHA256 1fd27babc3ca53e274a191bf30013be3290cdf222bef00aa543763b5376ec35a
 AUX clanlib-0.8.0-ndebug.patch 866 RMD160 1b6febbcb84230627ba3c0d3f6185fec6d517b72 SHA1 b91bb16b0fdd59dec3aad28ba8f0b7c88ddd6261 SHA256 d48bdb0b6dee6b84b139eb951da657fa4d2c8427b9b4e7eb76b41a98e7aaf8d5
+AUX clanlib-0.8.1-gcc43.patch 605 RMD160 939a1dd266d570b340e625cc89186fbbedd85773 SHA1 4c21d82abbbecec432db51cfe87315231c5212c4 SHA256 97420cdbef4a3f09b61ddf54881a907616b8c73337928fcdc6e11d783f584320
+AUX clanlib-0.8.1-ndebug.patch 866 RMD160 1b6febbcb84230627ba3c0d3f6185fec6d517b72 SHA1 b91bb16b0fdd59dec3aad28ba8f0b7c88ddd6261 SHA256 d48bdb0b6dee6b84b139eb951da657fa4d2c8427b9b4e7eb76b41a98e7aaf8d5
 DIST ClanLib-0.7.8-1.tar.bz2 6567261 RMD160 b22dbb97010e7b514cbbe3da85a52a1aafe2c686 SHA1 1416b09d8aa3549b1adeef50ba00df59b20917e6 SHA256 742b027b75160d0f17b913f7b3089c901717081d12d3ed1d1c38c108939793b8
 DIST ClanLib-0.8.0.tgz 7527581 RMD160 b78a86b853c12295fcf7d755c59183965bd563ac SHA1 e8b30bbb16d07d1cfd90525d60d9d2d8f3e74282 SHA256 def9bdbb20ea740e005134a77def721e969e230740e67937cc3ac201033059e6
+DIST ClanLib-0.8.1.tgz 7629019 RMD160 b4a48861dc5a133052d2acec5172c9291cff2b91 SHA1 5999b9c882efcaf06fd007bb69e659e322b8e155 SHA256 094331dda35b0d263431d1551991eb208d8e969824434925548a9fcd1d34e495
 EBUILD clanlib-0.7.8-r2.ebuild 2338 RMD160 fc61b0bad4e1a8fdcd9e6729b11c831eed37ab88 SHA1 9aa90fcbbd908c3673bb78037fb13ec333d73c20 SHA256 344a80a7ba96a32c05e364f179ffb39e5631c57bdcf9965f4b1278a422347e39
 EBUILD clanlib-0.8.0.ebuild 2068 RMD160 d1cae5d994b92c6f8cdc3d8cb5e1d92421e8f585 SHA1 d6ebda41d200b633536a6004d3ea0ec41e3812d0 SHA256 a0209e9416c194e446d2f9e3e760c3af827eda96ee6dacc71245b95f6816ec1d
-MISC ChangeLog 8539 RMD160 8ef760f2d2eb0f23d009eccba0534c0c407bc4c7 SHA1 5b1df177a7c0a42c1cb74721cbec9aaccc505a7c SHA256 20a46a2e1297d87948ae8fd9b267ed2d8a04508b324e0e62d8ae751cef7c6685
+EBUILD clanlib-0.8.1.ebuild 2056 RMD160 1c7fbe0d1cec40e6308ac895fdfb8eb655b2995a SHA1 56c4f9bb03f6dcf991b02244d64ed6d0c31bbab7 SHA256 b0d18cd7c5e11189d8f31a1e2fdd5a31fab46acf590e09454ab3811691ec81dc
+MISC ChangeLog 8737 RMD160 c204005da406fc35b95f3e60687043d0d2625e93 SHA1 0035a01d4d213349598fcfdad5f5e28eb4a5916a SHA256 f900932260aa65a7f6e3982ef20e018a0621479ed345f1209ed3a34ee50bf5dc
 MISC metadata.xml 2920 RMD160 725718878c95be29849b2c3c4f47be9e21e4ea41 SHA1 7b05a6cdc831e23c0679217a14e739acdea504b9 SHA256 390505368337501a27b0d5eb795582bd656627c828d4bb982375fecdfbea8dec
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFHthwYdz7hIScOURERArQFAKCR4aKjpmdUwpCUBcKPcAC+ogjlxQCgr17E
-v1MRZSHGoU9vf/mvUWZo3Tk=
-=DleD
+iEYEARECAAYFAkgY0JgACgkQdz7hIScOURH7hACeIuQFs19MMJLibb0UpYeLUDlB
+c6YAoNiGxjpfKWNTLbmZZcGBWqQOnDkP
+=Ikil
 -----END PGP SIGNATURE-----
diff --git a/dev-games/clanlib/clanlib-0.8.1.ebuild b/dev-games/clanlib/clanlib-0.8.1.ebuild
new file mode 100644
index 000000000000..cd36ffab9080
--- /dev/null
+++ b/dev-games/clanlib/clanlib-0.8.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.8.1.ebuild,v 1.1 2008/04/30 20:03:30 nyhm Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/"
+SRC_URI="http://clanlib.org/download/releases-${PV:0:3}/ClanLib-${PV}.tgz"
+
+LICENSE="ZLIB"
+SLOT="0.8"
+KEYWORDS="~amd64 ~x86" #not big endian safe #82779
+IUSE="opengl sdl vorbis doc mikmod ipv6"
+
+# opengl keyword does not drop the GL/GLU requirement.
+# Autoconf files need to be fixed
+RDEPEND="media-libs/libpng
+	media-libs/jpeg
+	virtual/opengl
+	virtual/glu
+	sdl? (
+		media-libs/libsdl
+		media-libs/sdl-gfx
+	)
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libXxf86vm
+	mikmod? ( media-libs/libmikmod )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto"
+
+S=${WORKDIR}/ClanLib-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${P}-ndebug.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
+}
+
+src_compile() {
+	#clanSound only controls mikmod/vorbis so there's
+	# no need to pass --{en,dis}able-clanSound ...
+	#clanDisplay only controls X, SDL, OpenGL plugins
+	# so no need to pass --{en,dis}able-clanDisplay
+	# also same reason why we don't have to use clanGUI
+	econf \
+		--enable-dyn \
+		--enable-clanNetwork \
+		--disable-dependency-tracking \
+		$(use_enable x86 asm386) \
+		$(use_enable doc docs) \
+		$(use_enable opengl clanGL) \
+		$(use_enable sdl clanSDL) \
+		$(use_enable vorbis clanVorbis) \
+		$(use_enable mikmod clanMikMod) \
+		$(use_enable ipv6 getaddr) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	if use doc ; then
+		dodir /usr/share/doc/${PF}/html
+		mv "${D}"/usr/share/doc/clanlib/* "${D}"/usr/share/doc/${PF}/html/ || die
+		rm -rf "${D}"/usr/share/doc/clanlib
+		cp -r Examples Resources "${D}"/usr/share/doc/${PF}/ || die
+	fi
+	dodoc CODING_STYLE CREDITS NEWS PATCHES README* INSTALL.linux
+}
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-gcc43.patch b/dev-games/clanlib/files/clanlib-0.8.1-gcc43.patch
new file mode 100644
index 000000000000..ca1d898ce5ab
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-gcc43.patch
@@ -0,0 +1,28 @@
+--- Sources/GL/opengl.cpp
++++ Sources/GL/opengl.cpp
+@@ -51,6 +51,8 @@
+ #endif
+ #endif
+ 
++#include <cstring>
++
+ std::vector<std::string> CL_OpenGL::m_ignored_gl_extension;
+ 
+ CL_ProcAddress *CL_OpenGL::get_proc_address(const std::string& function_name)
+@@ -414,4 +416,4 @@
+ #endif
+ 	
+ 	m_ignored_gl_extension.push_back(extension_name);
+-}
+\ No newline at end of file
++}
+--- Sources/Network/Socket/ip_address_getsock.cpp
++++ Sources/Network/Socket/ip_address_getsock.cpp
+@@ -40,6 +40,7 @@
+ #include "ip_address_getsock.h"
+ 
+ #include <cstdlib>
++#include <cstring>
+ 
+ #ifndef WIN32
+ 	#include <sys/socket.h>
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-ndebug.patch b/dev-games/clanlib/files/clanlib-0.8.1-ndebug.patch
new file mode 100644
index 000000000000..e41bae1a3296
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-ndebug.patch
@@ -0,0 +1,21 @@
+Patch for clanlib-0.7.8-r2 Bug 154513:
+
+Signal handler deinit() was not declared.
+
+This leads to a compilation failure when a release version
+rather than a debug version is built (-DNDEBUG).
+
+This patch adds the missing declaration, thus make the
+file compile with or without -DNDEBUG.
+
+diff -Naur clanlib-0.7.8-r2.orig/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp clanlib-0.7.8-r2/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp
+--- clanlib-0.7.8-r2.orig/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp	2003-09-19 10:33:02.000000000 +0000
++++ clanlib-0.7.8-r2/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp	2007-10-26 13:36:39.000000000 +0000
+@@ -52,6 +52,7 @@
+ 	_begin_time = (long) tv.tv_sec*(long) 1000+(long) tv.tv_usec/(long) 1000;
+ 
+ 	#ifdef NDEBUG
++	sighandler_t deinit;
+ 	signal(SIGSEGV, deinit);
+ 	#endif
+ }