Fix for wormux segfault, bug #96382

(Portage version: 2.1_pre7-r1)

5 files changed, 126 insertions, 4 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index 80c550d2ef5b..ab9856e0ee60 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/clanlib
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.29 2006/02/26 15:25:45 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.30 2006/03/26 19:53:36 tupone Exp $
+
+*clanlib-0.7.8-r2 (26 Mar 2006)
+
+  26 Mar 2006; <Tupone@gentoo.org> +files/clanlib-0.7.8-refreshfix.patch,
+  +clanlib-0.7.8-r2.ebuild:
+  Fix for wormux segfault, bug #96382 by Radek "rush" Senfeld
 
   26 Feb 2006; <Tupone@gentoo.org> clanlib-0.7.8-r1.ebuild:
   Modular X dependency fix
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index d4d6c12a1680..8fd3e795b19e 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -1,12 +1,15 @@
-MD5 16bb5c72357b71f446f8072698812d49 ChangeLog 6596
-RMD160 ee1f42cae0d086d4a2a77f398e673b1370e2c931 ChangeLog 6596
-SHA256 ad45dba5841985a3decd407099cccde3216a50ad9fae197d1669c78301c8b805 ChangeLog 6596
+MD5 741afd19779673389fe05e7e194cc990 ChangeLog 6794
+RMD160 697c89ec82e83abf6dc8fc18bb797f625234d797 ChangeLog 6794
+SHA256 3ce383c52a07f34d6d34af7fa00a690b94321bfd54ea4f28aecbd664a642eecb ChangeLog 6794
 MD5 4d124b4093673bd0bfb894c666147911 clanlib-0.6.5-r3.ebuild 2435
 RMD160 b129df10c3a59b7aade0fe13856f8e5f2a319064 clanlib-0.6.5-r3.ebuild 2435
 SHA256 72d703814b19baacc1ad6fd1772e42c108f7bb75019dae7a8283672be64c5d05 clanlib-0.6.5-r3.ebuild 2435
 MD5 0a45bb3072bf6ac09557254ecfea03c2 clanlib-0.7.8-r1.ebuild 2337
 RMD160 1ea7f79ff3b93ce1b90d290e6f9e73805539ef06 clanlib-0.7.8-r1.ebuild 2337
 SHA256 b6270f6fd6bf44f302ddb2ee4fcfdcab92bbeaeb553a92447c69cae9aa943d63 clanlib-0.7.8-r1.ebuild 2337
+MD5 e77742cb90324ca7b2470ae40b3142ed clanlib-0.7.8-r2.ebuild 2372
+RMD160 f4033a33dac324e768cc3086291c2d5d3280bb82 clanlib-0.7.8-r2.ebuild 2372
+SHA256 5c9af8698a366e6797da2db2452fb841c489f476186867ceaec73408c2770d7d clanlib-0.7.8-r2.ebuild 2372
 MD5 7c2e9c0016e1bcd9daaa26d1dd55228a files/0.7.8-install-opengl-wrap.patch 346
 RMD160 9bc4dbf6ef3e75381c8de3eff571385d34e6dec0 files/0.7.8-install-opengl-wrap.patch 346
 SHA256 771d196e405f3e3d68a27030c80e1fc0d7b4c34e27fa8ed697deadfda42b6082 files/0.7.8-install-opengl-wrap.patch 346
@@ -28,12 +31,18 @@ SHA256 6c4d075d90dd2efc98139eb00030a89e2d1cfd94059fdf4e249a7d5da74f38b7 files/cl
 MD5 2b74f3abb88b08665766135f0e794ed6 files/clanlib-0.7.8-gcc41.patch 1663
 RMD160 e3a0b0b66c849598bac2c082f0d6740693b046e8 files/clanlib-0.7.8-gcc41.patch 1663
 SHA256 9d092a6b3484c22d93fc066985ae092db37b3624ee9a11dec1046a48dc615815 files/clanlib-0.7.8-gcc41.patch 1663
+MD5 0056626610eb4285f75e571aae2c6662 files/clanlib-0.7.8-refreshfix.patch 435
+RMD160 e4562f30dea51c6b1f01014611f3a7ebf0976ca5 files/clanlib-0.7.8-refreshfix.patch 435
+SHA256 1cb0bab20ef41f364d5bb4395a78213f4ad8fa187bc49cc5f85e80544f557ffa files/clanlib-0.7.8-refreshfix.patch 435
 MD5 3e439d751339f684be1c709644d71a4d files/digest-clanlib-0.6.5-r3 68
 RMD160 3ef0e3d707c3f4d3a176b2b43b2a72946f0c0bc8 files/digest-clanlib-0.6.5-r3 68
 SHA256 2b1272b156642f51d2c9de746284a62b1ec0b000bfac99a3ae2794a48f50679c files/digest-clanlib-0.6.5-r3 68
 MD5 02ebcc5ba4f293b75824427ac799d514 files/digest-clanlib-0.7.8-r1 253
 RMD160 afe72e12986e2080029071e179370ba4ceb34471 files/digest-clanlib-0.7.8-r1 253
 SHA256 2d33b72d6157f3dc50ef950fdae218e425b0faf6e38220dd98a64d46774779ac files/digest-clanlib-0.7.8-r1 253
+MD5 02ebcc5ba4f293b75824427ac799d514 files/digest-clanlib-0.7.8-r2 253
+RMD160 afe72e12986e2080029071e179370ba4ceb34471 files/digest-clanlib-0.7.8-r2 253
+SHA256 2d33b72d6157f3dc50ef950fdae218e425b0faf6e38220dd98a64d46774779ac files/digest-clanlib-0.7.8-r2 253
 MD5 33ee8adc6546aef9881086d98bfadb79 metadata.xml 3010
 RMD160 e619d1e2cbf474c526bf1deb3dd15a0117643e66 metadata.xml 3010
 SHA256 3b9b77c59757bc65889103949b95597432d5e00f69fdf4bdc909f50dcbff98ac metadata.xml 3010
diff --git a/dev-games/clanlib/clanlib-0.7.8-r2.ebuild b/dev-games/clanlib/clanlib-0.7.8-r2.ebuild
new file mode 100644
index 000000000000..ab4f270852e1
--- /dev/null
+++ b/dev-games/clanlib/clanlib-0.7.8-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.8-r2.ebuild,v 1.1 2006/03/26 19:53:36 tupone Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/"
+SRC_URI="http://www.clanlib.org/download/files/ClanLib-${PV}-1.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0.7"
+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/libXmu
+			x11-libs/libXxf86vm
+		)
+		virtual/x11
+	)
+	mikmod? ( >=media-libs/libmikmod-3.1.9 )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	|| (
+		(
+			x11-libs/libXt
+			x11-proto/xf86vidmodeproto
+		)
+		virtual/x11
+	)"
+
+S="${WORKDIR}/ClanLib-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	find . -name .cvsignore -exec rm -f '{}' \;
+	epatch "${FILESDIR}"/${PV}-port.patch \
+		"${FILESDIR}"/${PV}-install-opengl-wrap.patch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-refreshfix.patch
+
+	if ! use doc ; then
+		sed -i \
+			-e '/^SUBDIRS/s:Documentation::' \
+			Makefile.in \
+			|| die "sed Makefile.in failed"
+	fi
+}
+
+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() {
+	make DESTDIR="${D}" install || die "make install failed"
+	if use doc ; then
+		dodir "/usr/share/doc/${PF}/html"
+		mv "${D}/usr/share/doc/clanlib/"* "${D}/usr/share/doc/${PF}/html/"
+		rm -rf "${D}/usr/share/doc/clanlib"
+		cp -r Examples "${D}/usr/share/doc/${PF}/"
+	fi
+	dodoc CODING_STYLE CREDITS NEWS PATCHES README* INSTALL.linux
+}
diff --git a/dev-games/clanlib/files/clanlib-0.7.8-refreshfix.patch b/dev-games/clanlib/files/clanlib-0.7.8-refreshfix.patch
new file mode 100644
index 000000000000..93c6dfd9f441
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.7.8-refreshfix.patch
@@ -0,0 +1,11 @@
+--- Sources/Display/display_mode.cpp.original	2006-03-26 21:06:33.000000000 +0200
++++ Sources/Display/display_mode.cpp	2006-03-26 21:08:30.000000000 +0200
+@@ -117,6 +117,8 @@
+ 
+ 				for (int i = 0; i < nmodes; i++)
+ 				{
++					if (!vmodes[i]->htotal || !vmodes[i]->vtotal)
++						continue;
+ 					if ((vmodes[i]->flags) & V_DBLSCAN)
+ 						refresh_rate = vmodes[i]->dotclock * 500 / (vmodes[i]->htotal * vmodes[i]->vtotal);
+ 					else
diff --git a/dev-games/clanlib/files/digest-clanlib-0.7.8-r2 b/dev-games/clanlib/files/digest-clanlib-0.7.8-r2
new file mode 100644
index 000000000000..07d336d36cc7
--- /dev/null
+++ b/dev-games/clanlib/files/digest-clanlib-0.7.8-r2
@@ -0,0 +1,3 @@
+MD5 c034e1cf0485cdc377e1e4e83f99640b ClanLib-0.7.8-1.tar.bz2 6567261
+RMD160 b22dbb97010e7b514cbbe3da85a52a1aafe2c686 ClanLib-0.7.8-1.tar.bz2 6567261
+SHA256 742b027b75160d0f17b913f7b3089c901717081d12d3ed1d1c38c108939793b8 ClanLib-0.7.8-1.tar.bz2 6567261