Version bump

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 159 insertions, 2 deletions

diff --git a/sys-block/btrace/ChangeLog b/sys-block/btrace/ChangeLog
index 27523d760549..db4b451c3bf2 100644
--- a/sys-block/btrace/ChangeLog
+++ b/sys-block/btrace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/btrace
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/ChangeLog,v 1.26 2014/08/10 20:21:30 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/ChangeLog,v 1.27 2015/02/07 09:28:58 polynomial-c Exp $
+
+*btrace-1.1.0 (07 Feb 2015)
+
+  07 Feb 2015; Lars Wendler <polynomial-c@gentoo.org> +btrace-1.1.0.ebuild,
+  +files/btrace-1.1.0-ldflags-parallel-make.patch:
+  Version bump.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> btrace-1.0.0.ebuild,
   btrace-1.0.1-r1.ebuild, btrace-1.0.1.ebuild, btrace-1.0.3.ebuild:
diff --git a/sys-block/btrace/btrace-1.1.0.ebuild b/sys-block/btrace/btrace-1.1.0.ebuild
new file mode 100644
index 000000000000..e3276590c1bf
--- /dev/null
+++ b/sys-block/btrace/btrace-1.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-1.1.0.ebuild,v 1.1 2015/02/07 09:28:58 polynomial-c Exp $
+
+EAPI=5
+
+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=""
+# This is a Linux specific app!
+DEPEND="${RDEPEND}
+		sys-kernel/linux-headers
+		doc? ( virtual/latex-base app-text/dvipdfm )
+		dev-libs/libaio"
+S="${WORKDIR}/${MY_P}"
+
+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_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.0-ldflags-parallel-make.patch
+}
+
+src_compile() {
+	append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	if use doc; then
+		export VARTEXFONTS="${T}/fonts"
+		emake docs
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
+	dodoc README
+	use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf
+}
diff --git a/sys-block/btrace/files/btrace-1.1.0-ldflags-parallel-make.patch b/sys-block/btrace/files/btrace-1.1.0-ldflags-parallel-make.patch
new file mode 100644
index 000000000000..f26799238feb
--- /dev/null
+++ b/sys-block/btrace/files/btrace-1.1.0-ldflags-parallel-make.patch
@@ -0,0 +1,105 @@
+--- blktrace-1.1.0/btreplay/Makefile
++++ blktrace-1.1.0/btreplay/Makefile
+@@ -32,10 +32,10 @@
+ 	$(CC) $(CFLAGS) -c -o $*.o $<
+ 
+ btrecord: btrecord.o
+-	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
+ 
+ btreplay: btreplay.o
+-	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+ 
+ depend:
+ 	@$(CC) -MM $(CFLAGS) *.c 1> .depend
+--- blktrace-1.1.0/btt/Makefile
++++ blktrace-1.1.0/btt/Makefile
+@@ -38,7 +38,7 @@
+ 	$(CC) $(CFLAGS) -c -o $*.o $<
+ 
+ btt: $(OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+ 
+ ifneq ($(wildcard .depend),)
+ include .depend
+--- blktrace-1.1.0/iowatcher/Makefile
++++ blktrace-1.1.0/iowatcher/Makefile
+@@ -19,7 +19,7 @@
+ 	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
+ 
+ iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o
+-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) -lm
+ 
+ depend:
+ 	@$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend
+--- blktrace-1.1.0/Makefile
++++ blktrace-1.1.0/Makefile
+@@ -4,41 +4,35 @@
+ PROGS	= blkparse blktrace verify_blkparse blkrawverify blkiomon
+ LIBS	= -lpthread
+ SCRIPTS	= btrace
++SUBDIRS = btreplay btt iowatcher
+ 
+-ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \
++ALL = $(PROGS) $(SCRIPTS) 
++INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \
+       btt/bno_plot.py iowatcher/iowatcher
+ 
+-all: $(ALL)
++all: $(ALL) $(SUBDIRS)
++.PHONY: $(SUBDIRS)
+ 
+-btt/btt:
+-	$(MAKE) -C btt
+-
+-iowatcher/iowatcher:
+-	$(MAKE) -C iowatcher
+-
+-btreplay/btrecord:
+-	$(MAKE) -C btreplay
+-
+-btreplay/btreplay:
+-	$(MAKE) -C btreplay
++$(SUBDIRS): $(PROGS)
++	$(MAKE) -C $@
+ 
+ %.o: %.c
+ 	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
+ 
+ blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o
+-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
+ 
+ blktrace: blktrace.o act_mask.o
+-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+ 
+ verify_blkparse: verify_blkparse.o
+-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
+ 
+ blkrawverify: blkrawverify.o
+-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
+ 
+ blkiomon: blkiomon.o rbtree.o
+-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
+ 
+ $(PROGS): | depend
+ 
+@@ -84,9 +78,10 @@
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8
+-	$(INSTALL) -m 755 $(ALL) $(DESTDIR)$(bindir)
++	$(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir)
+ 	$(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8
++	$(INSTALL) -m 644 iowatcher/*.1 $(DESTDIR)$(mandir)/man1
+ 
+ ifneq ($(wildcard .depend),)
+ include .depend