fix crash with large number of roms (bug #89926) - patch from Lars Langhans

Package-Manager: portage-2.0.51.19

5 files changed, 25 insertions, 52 deletions

diff --git a/games-emulation/qmamecat/ChangeLog b/games-emulation/qmamecat/ChangeLog
index 86727a7ef370..82cf530d5286 100644
--- a/games-emulation/qmamecat/ChangeLog
+++ b/games-emulation/qmamecat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/qmamecat
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/qmamecat/ChangeLog,v 1.6 2004/07/01 11:15:51 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/qmamecat/ChangeLog,v 1.7 2005/04/27 02:09:08 mr_bones_ Exp $
+
+  27 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -qmamecat-0.44.45.ebuild, qmamecat-0.44.46.ebuild:
+  fix crash with large number of roms (bug #89926) - patch from Lars Langhans
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   qmamecat-0.44.45.ebuild, qmamecat-0.44.46.ebuild:
diff --git a/games-emulation/qmamecat/Manifest b/games-emulation/qmamecat/Manifest
index c5350774c1da..ff99a2bb40cb 100644
--- a/games-emulation/qmamecat/Manifest
+++ b/games-emulation/qmamecat/Manifest
@@ -1,6 +1,4 @@
-MD5 0653925d4cd134869d9e77c619a695b8 ChangeLog 814
+MD5 0e14b5aade362cfe05728e59aab7d9e0 qmamecat-0.44.46.ebuild 945
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 d1c765a850eef5b66a5775ec0bda2f78 qmamecat-0.44.45.ebuild 790
-MD5 9e2b37dd28f194f4ff21371fd3c78f95 qmamecat-0.44.46.ebuild 790
-MD5 f19653dfde85c58875212d0d8f44554a files/digest-qmamecat-0.44.45 70
+MD5 739e47eb95bd788523472387f4ef5ed6 ChangeLog 1000
 MD5 41de3caebf2f058b49f70b241652d1bd files/digest-qmamecat-0.44.46 70
diff --git a/games-emulation/qmamecat/files/digest-qmamecat-0.44.45 b/games-emulation/qmamecat/files/digest-qmamecat-0.44.45
deleted file mode 100644
index 12aaf1ed5167..000000000000
--- a/games-emulation/qmamecat/files/digest-qmamecat-0.44.45
+++ /dev/null
@@ -1 +0,0 @@
-MD5 90aa9fde4186ae5b1412de388d33a0ee qmamecat-0.44.b45.tar.bz2 282748
diff --git a/games-emulation/qmamecat/qmamecat-0.44.45.ebuild b/games-emulation/qmamecat/qmamecat-0.44.45.ebuild
deleted file mode 100644
index f50a4f6d41c6..000000000000
--- a/games-emulation/qmamecat/qmamecat-0.44.45.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/qmamecat/qmamecat-0.44.45.ebuild,v 1.6 2004/07/01 11:15:51 eradicator Exp $
-
-inherit kde
-
-MY_PV="${PV/45/b45}"
-DESCRIPTION="QT mame catalog and frontend"
-HOMEPAGE="http://www.mameworld.net/mamecat/"
-SRC_URI="http://www.mameworld.net/mamecat/snapshots/qmamecat-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND="virtual/libc
-	virtual/x11
-	x11-libs/qt"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	# See bug #41006
-	kde_src_compile none
-
-	# emake is horribly broken
-	make COPTIM="${CFLAGS}" || die
-}
-
-src_install() {
-	rm bin/{Makefile,make.cfg}
-	dobin bin/*
-	doman doc/*.6
-	rm doc/{*.6,COPYING}
-	dodoc doc/*
-}
diff --git a/games-emulation/qmamecat/qmamecat-0.44.46.ebuild b/games-emulation/qmamecat/qmamecat-0.44.46.ebuild
index 7536089d654d..d9ac40e47735 100644
--- a/games-emulation/qmamecat/qmamecat-0.44.46.ebuild
+++ b/games-emulation/qmamecat/qmamecat-0.44.46.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/qmamecat/qmamecat-0.44.46.ebuild,v 1.3 2004/07/01 11:15:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/qmamecat/qmamecat-0.44.46.ebuild,v 1.4 2005/04/27 02:09:08 mr_bones_ Exp $
 
 inherit kde
 
@@ -11,21 +11,30 @@ SRC_URI="http://www.mameworld.net/mamecat/snapshots/qmamecat-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="ppc x86"
 IUSE=""
 
-DEPEND="virtual/libc
-	virtual/x11
+DEPEND="virtual/x11
 	x11-libs/qt"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# bug #89926 - we lub magic numbers
+	sed -i \
+		-e 's/5000/6000/' \
+		-e 's/101/120/' \
+		src/include/macros.hxx \
+		|| die "sed failed"
+}
 
 src_compile() {
 	# See bug #41006
 	kde_src_compile none
 
-	# emake is horribly broken
-	make COPTIM="${CFLAGS}" || die
+	emake -j1 COPTIM="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {