sys-block/btrace: Merge GitHub PR #1716

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

9 files changed, 46 insertions, 0 deletions

diff --git a/sys-block/btrace/Manifest b/sys-block/blktrace/Manifest
index ec19b75ff943..ec19b75ff943 100644
--- a/sys-block/btrace/Manifest
+++ b/sys-block/blktrace/Manifest
diff --git a/sys-block/btrace/btrace-1.0.1-r1.ebuild b/sys-block/blktrace/btrace-1.0.1-r1.ebuild
index 685308fac28a..685308fac28a 100644
--- a/sys-block/btrace/btrace-1.0.1-r1.ebuild
+++ b/sys-block/blktrace/btrace-1.0.1-r1.ebuild
diff --git a/sys-block/btrace/btrace-1.0.3.ebuild b/sys-block/blktrace/btrace-1.0.3.ebuild
index 0802676ed20d..0802676ed20d 100644
--- a/sys-block/btrace/btrace-1.0.3.ebuild
+++ b/sys-block/blktrace/btrace-1.0.3.ebuild
diff --git a/sys-block/blktrace/btrace-1.1.0-r1.ebuild b/sys-block/blktrace/btrace-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..0278e0ca9889
--- /dev/null
+++ b/sys-block/blktrace/btrace-1.1.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils toolchain-funcs flag-o-matic linux-info
+
+MY_PN="blktrace"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue"
+HOMEPAGE="http://git.kernel.dk/cgit/blktrace/"
+SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/libaio"
+# This is a Linux specific app!
+DEPEND="${RDEPEND}
+		sys-kernel/linux-headers
+		doc? ( virtual/latex-base app-text/dvipdfm )"
+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"
+
+PATCHES=( "${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"
+	einstalldocs
+	use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf
+}
diff --git a/sys-block/btrace/btrace-1.1.0.ebuild b/sys-block/blktrace/btrace-1.1.0.ebuild
index 23c11b3bd066..23c11b3bd066 100644
--- a/sys-block/btrace/btrace-1.1.0.ebuild
+++ b/sys-block/blktrace/btrace-1.1.0.ebuild
diff --git a/sys-block/btrace/files/btrace-1.0.0-parallel-make.patch b/sys-block/blktrace/files/btrace-1.0.0-parallel-make.patch
index d3f42964c2b9..d3f42964c2b9 100644
--- a/sys-block/btrace/files/btrace-1.0.0-parallel-make.patch
+++ b/sys-block/blktrace/files/btrace-1.0.0-parallel-make.patch
diff --git a/sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch b/sys-block/blktrace/files/btrace-1.0.1-ldflags-parallel-make.patch
index 40c7d97d5dea..40c7d97d5dea 100644
--- a/sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch
+++ b/sys-block/blktrace/files/btrace-1.0.1-ldflags-parallel-make.patch
diff --git a/sys-block/btrace/files/btrace-1.1.0-ldflags-parallel-make.patch b/sys-block/blktrace/files/btrace-1.1.0-ldflags-parallel-make.patch
index f26799238feb..f26799238feb 100644
--- a/sys-block/btrace/files/btrace-1.1.0-ldflags-parallel-make.patch
+++ b/sys-block/blktrace/files/btrace-1.1.0-ldflags-parallel-make.patch
diff --git a/sys-block/btrace/metadata.xml b/sys-block/blktrace/metadata.xml
index 79d462e85571..79d462e85571 100644
--- a/sys-block/btrace/metadata.xml
+++ b/sys-block/blktrace/metadata.xml