Version bump per bug #254611. Parallel make fix per bug #233389.

(Portage version: 2.2_rc30/cvs/Linux x86_64)

3 files changed, 73 insertions, 2 deletions

diff --git a/sys-block/btrace/ChangeLog b/sys-block/btrace/ChangeLog
index 66f319591558..d18a9ff9183d 100644
--- a/sys-block/btrace/ChangeLog
+++ b/sys-block/btrace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/btrace
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/ChangeLog,v 1.15 2008/09/03 21:01:12 opfer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/ChangeLog,v 1.16 2009/04/13 00:59:54 robbat2 Exp $
+
+*btrace-1.0.0 (13 Apr 2009)
+
+  13 Apr 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +files/btrace-1.0.0-parallel-make.patch, +btrace-1.0.0.ebuild:
+  Version bump per bug #254611. Parallel make fix per bug #233389.
 
   03 Sep 2008; Christian Faulhammer <opfer@gentoo.org>
   btrace-0.0.20060428050322.ebuild, btrace-0.0.20060614042007.ebuild,
diff --git a/sys-block/btrace/btrace-1.0.0.ebuild b/sys-block/btrace/btrace-1.0.0.ebuild
new file mode 100644
index 000000000000..bb38ea531647
--- /dev/null
+++ b/sys-block/btrace/btrace-1.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-1.0.0.ebuild,v 1.1 2009/04/13 00:59:54 robbat2 Exp $
+
+inherit eutils toolchain-funcs flag-o-matic linux-info
+
+DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue."
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/"
+MY_PN="blktrace"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+RDEPEND="virtual/libc"
+# This is a Linux specific app!
+DEPEND="${RDEPEND}
+		|| ( sys-kernel/linux-headers sys-kernel/mips-headers )
+		doc? ( virtual/latex-base )
+		dev-libs/libaio"
+S="${WORKDIR}/${MY_PN}"
+
+CONFIG_CHECK="~BLK_DEV_IO_TRACE"
+WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-1.0.0-parallel-make.patch
+}
+
+src_compile() {
+	append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+	if use doc; then
+		export VARTEXFONTS="${T}/fonts"
+		emake docs || die "emake docs failed"
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
+	dodoc README
+	use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf
+}
diff --git a/sys-block/btrace/files/btrace-1.0.0-parallel-make.patch b/sys-block/btrace/files/btrace-1.0.0-parallel-make.patch
new file mode 100644
index 000000000000..d3f42964c2b9
--- /dev/null
+++ b/sys-block/btrace/files/btrace-1.0.0-parallel-make.patch
@@ -0,0 +1,20 @@
+diff -Nuar blktrace.orig/Makefile blktrace/Makefile
+--- blktrace.orig/Makefile	2008-10-30 07:20:02.000000000 -0700
++++ blktrace/Makefile	2009-04-12 17:54:46.351588795 -0700
+@@ -10,13 +10,13 @@
+ 
+ all: $(ALL)
+ 
+-btt/btt:
++btt/btt: $(PROGS)
+ 	$(MAKE) -C btt
+ 
+-btreplay/btrecord:
++btreplay/btrecord: $(PROGS)
+ 	$(MAKE) -C btreplay
+ 
+-btreplay/btreplay:
++btreplay/btreplay: $(PROGS)
+ 	$(MAKE) -C btreplay
+ 
+ %.o: %.c