fixed collision with imagemagick as per bug #197552 thanks to Nick Soveiko. Added QA patch also

Package-Manager: portage-2.1.5_rc6

4 files changed, 36 insertions, 15 deletions

diff --git a/app-benchmarks/lmbench/ChangeLog b/app-benchmarks/lmbench/ChangeLog
index 8d9ca917b3b7..e649a27817e1 100644
--- a/app-benchmarks/lmbench/ChangeLog
+++ b/app-benchmarks/lmbench/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-benchmarks/lmbench
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/lmbench/ChangeLog,v 1.13 2007/02/21 20:10:25 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/lmbench/ChangeLog,v 1.14 2008/05/02 23:22:07 dragonheart Exp $
+
+  02 May 2008; Daniel Black <dragonheart@gentoo.org>
+  +files/lmbench-3.0_alpha3-qa.patch, lmbench-3.0_alpha3.ebuild:
+  fixed collision with imagemagick as per bug #197552 thanks to Nick Soveiko.
+  Added QA patch also
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-benchmarks/lmbench/Manifest b/app-benchmarks/lmbench/Manifest
index b953c18d079a..4b032d214aad 100644
--- a/app-benchmarks/lmbench/Manifest
+++ b/app-benchmarks/lmbench/Manifest
@@ -1,6 +1,7 @@
 AUX bc-config 646 RMD160 b04d340b19b6e4c33db962e05e4c387a16ad6d0f SHA1 d69df9336cd011a7d22553ffdd67bd99edc7bfa7 SHA256 e9f35bb1ba2c50945d502980692e7c92679cdbf8240f64c73ac9a802b46dc25d
 AUX bc_lm.pl 3196 RMD160 4bb880e84a474aac816d9172a401b568bd80dbfa SHA1 a4fe87118194c9347337db908ffbc8dd556f0b94 SHA256 b993b85c5af07bd2294036a006a03f72342717aa6f310e80ed5770f1ce071afe
+AUX lmbench-3.0_alpha3-qa.patch 296 RMD160 e8d452a092cc4753778d67396624c3af6a78edd3 SHA1 9e20acc808bb0b505ad42b6a32fe29e4618dc2e5 SHA256 da2db90c6c784d5f9be044e137a6b3b079bc4b0a20d4058a8a4e6c95fae0036f
 DIST lmbench-3.0-a3.tgz 1159027 RMD160 8b13422b89f77e8ff8a7d6b46d13cd45fa40e38c SHA1 49dc8022cf2a409885b6d969f65f121f13a87505 SHA256 7d3903f25d5b22d3630b79c868ed7fb9578da5f5a54a28795dd6a49573c2410f
-EBUILD lmbench-3.0_alpha3.ebuild 1421 RMD160 c884988724dc22bb7461360aefd1a5126b5013e1 SHA1 78cd4da761a2970f1c990d1a2aa55300f4e01681 SHA256 920ade8a48526c98de0651999b15508c9557ea0c78589ec13e17499b46f3443e
-MISC ChangeLog 1528 RMD160 8027f8023f8c934fc82f8f223437940d6457cac1 SHA1 a50c18ffcc981c706863351463be89f81135c001 SHA256 993c9ae385a3d34ab25bdd8fbda11d187770bf18239c5c76e9516a6e8ad3403d
+EBUILD lmbench-3.0_alpha3.ebuild 1558 RMD160 3e91d831d54b08c9cded72a86a2f0de7446bfbba SHA1 7e6cfe1d30a8bbdf0138b50a2c36085e8bec5fb9 SHA256 3f70524c93600a927063c87156081e3d36a48e9fe1d51995de83bd12c32e4957
+MISC ChangeLog 1753 RMD160 1d050361c6260d4f1e320e4f6ff1e5c1a862c293 SHA1 2bd2d3fbbc101b9caf25f92a598441be7b7c2546 SHA256 17d695605ae006d33236c06676365197c72cb7dcba21fa4943afb27beecee781
 MISC metadata.xml 412 RMD160 b7b57b44cbf476a3ec04af997c7077a23ae4bfe9 SHA1 8129e18a893c8e62aa9e7f58662134c27102d8a3 SHA256 84cc2d4168174cfea7e19c957b3bbef3a6bd00289d19a34c7c4394554dfa141e
diff --git a/app-benchmarks/lmbench/files/lmbench-3.0_alpha3-qa.patch b/app-benchmarks/lmbench/files/lmbench-3.0_alpha3-qa.patch
new file mode 100644
index 000000000000..08fb91326b6c
--- /dev/null
+++ b/app-benchmarks/lmbench/files/lmbench-3.0_alpha3-qa.patch
@@ -0,0 +1,9 @@
+--- lmbench-3.0-a3/src/lib_debug.c.orig	2008-05-03 09:10:35.000000000 +1000
++++ lmbench-3.0-a3/src/lib_debug.c	2008-05-03 09:11:01.000000000 +1000
+@@ -1,5 +1,6 @@
+ #include "bench.h"
+ #include "lib_debug.h"
++#include <math.h>
+ 
+ /*
+  * return micro-seconds / iteration at the the fraction point.
diff --git a/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild b/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild
index 2fe58a034da6..24ea7f981701 100644
--- a/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild
+++ b/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild,v 1.13 2006/05/07 00:57:04 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/lmbench/lmbench-3.0_alpha3.ebuild,v 1.14 2008/05/02 23:22:07 dragonheart Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 MY_P=${P/_alpha/-a}
 DESCRIPTION="Suite of simple, portable benchmarks"
 HOMEPAGE="http://www.bitmover.com/lmbench/whatis_lmbench.html"
-SRC_URI="ftp://ftp.bitmover.com/lmbench/${MY_P}.tgz"
+SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,6 +18,11 @@ DEPEND="virtual/libc"
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-qa.patch
+}
+
 src_compile() {
 	sed -e "s#^my \$distro =.*#my \$distro = \"`uname -r`\";#" \
 		-e 's#^@files =#chdir "/usr/share/lmbench"; @files =#' \
@@ -27,22 +32,23 @@ src_compile() {
 }
 
 src_install() {
-	cd src ; make BASE=${D}/usr install || die
+	cd src ; make BASE="${D}"/usr install || die
 
 	dodir /usr/share
-	mv ${D}/usr/man ${D}/usr/share
+	mv "${D}"/usr/man "${D}"/usr/share
 
-	cd ${S}
+	cd "${S}"
 	exeinto /usr/bin
-	doexe ${S}/bc_lm.pl
+	doexe "${S}"/bc_lm.pl
+	mv "${D}"/usr/bin/stream "${D}"/usr/bin/stream.lmbench
 
 	insinto /etc
-	doins ${FILESDIR}/bc-config
+	doins "${FILESDIR}"/bc-config
 
 	dodir /usr/share/lmbench
 	dodir /usr/share/lmbench/src
-	cp src/webpage-lm.tar ${D}/usr/share/lmbench/src
-	cp -R scripts ${D}/usr/share/lmbench
+	cp src/webpage-lm.tar "${D}"/usr/share/lmbench/src
+	cp -R scripts "${D}"/usr/share/lmbench
 
 	dodir /usr/share/lmbench/results
 	chmod 777 ${D}/usr/share/lmbench/results