commit: 3cabac399d2e3228da9969679d32e644fb1fa39c Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> AuthorDate: Sat Oct 1 22:24:39 2016 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Sat Oct 1 22:25:25 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cabac39
sys-block/blktrace: fix rename from bad PR. Package-Manager: portage-2.2.28 RepoMan-Options: --force Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> sys-block/blktrace/Manifest | 1 - .../{btrace-1.0.3.ebuild => blktrace-1.0.3.ebuild} | 0 ...ce-1.1.0-r1.ebuild => blktrace-1.1.0-r1.ebuild} | 0 .../{btrace-1.1.0.ebuild => blktrace-1.1.0.ebuild} | 0 sys-block/blktrace/btrace-1.0.1-r1.ebuild | 46 ---------------------- ... => blktrace-1.0.1-ldflags-parallel-make.patch} | 0 ... => blktrace-1.1.0-ldflags-parallel-make.patch} | 0 .../files/btrace-1.0.0-parallel-make.patch | 20 ---------- sys-block/btrace/btrace-1.1.0-r1.ebuild | 46 ---------------------- 9 files changed, 113 deletions(-) diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest index ec19b75..701f9dd 100644 --- a/sys-block/blktrace/Manifest +++ b/sys-block/blktrace/Manifest @@ -1,3 +1,2 @@ -DIST blktrace-1.0.1.tar.bz2 292208 SHA256 fdd1481a69f14b916f8d835203c1189ee3076d4a5ff88163b6e6b1f27b087f6d SHA512 7faac50dd04ccc0b782f9d2e8909161e42614a348792af736fac8924680ab9eff6d0db0dea9717a0a468577cc03f8bb1314f4d61cb0f0d92423c000fce89c172 WHIRLPOOL 74559960ae7fd6b0eecc9457221f5133f46bbf23e6e096bc96226c85cee49999ae9cf67a3e8bff66722dca7cd43afaf910ac47dfe1d850f83c63e0db6f0ea70d DIST blktrace-1.0.3.tar.bz2 359325 SHA256 221b66a6008a46bc41b8e455cfb1ba924849ce660ac7c7f9dff0fb64c07becb2 SHA512 f20a33b5309146304277a5f8a4c7f2c61e804b2caa5c62d00425ef26fcd1cd628521067b2502d05c368e10d2cd38a98c246030705ba358f835e8a6921444f9a5 WHIRLPOOL 3de4ef8db992e6b6e697b35ae6a2e47b36e5a9157bc6fafc8fc0de206ee15e3e8ceb4dc3bf70c9dfaae16567bbf4c6d8e81f38a3f1619d804b1a680cbfa1ac81 DIST blktrace-1.1.0.tar.bz2 395445 SHA256 54a2faaa06dd52fd4a56a6aafa2a251990eb8dcf1832bb8c2fb1fc13a74a9295 SHA512 52ed3b66e1ec62c2204d44037d4d13218fd0229ae694493a21f1e83bfc8aeb029edc96b2be83f39cc3e79500abad56cd5a71c8c4e6dd836661777662f3628355 WHIRLPOOL b2777e248533fee8ffe3d92e0311d5797f12f57e188dce94b39e4531b58350ed600a64b50cae590455b52e92b8727c098b56f2c92e58a0567641123201ec9085 diff --git a/sys-block/blktrace/btrace-1.0.3.ebuild b/sys-block/blktrace/blktrace-1.0.3.ebuild similarity index 100% rename from sys-block/blktrace/btrace-1.0.3.ebuild rename to sys-block/blktrace/blktrace-1.0.3.ebuild diff --git a/sys-block/blktrace/btrace-1.1.0-r1.ebuild b/sys-block/blktrace/blktrace-1.1.0-r1.ebuild similarity index 100% rename from sys-block/blktrace/btrace-1.1.0-r1.ebuild rename to sys-block/blktrace/blktrace-1.1.0-r1.ebuild diff --git a/sys-block/blktrace/btrace-1.1.0.ebuild b/sys-block/blktrace/blktrace-1.1.0.ebuild similarity index 100% rename from sys-block/blktrace/btrace-1.1.0.ebuild rename to sys-block/blktrace/blktrace-1.1.0.ebuild diff --git a/sys-block/blktrace/btrace-1.0.1-r1.ebuild b/sys-block/blktrace/btrace-1.0.1-r1.ebuild deleted file mode 100644 index 685308f..00000000 --- a/sys-block/blktrace/btrace-1.0.1-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -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="https://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.0.1-ldflags-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/blktrace/files/btrace-1.0.1-ldflags-parallel-make.patch b/sys-block/blktrace/files/blktrace-1.0.1-ldflags-parallel-make.patch similarity index 100% rename from sys-block/blktrace/files/btrace-1.0.1-ldflags-parallel-make.patch rename to sys-block/blktrace/files/blktrace-1.0.1-ldflags-parallel-make.patch diff --git a/sys-block/blktrace/files/btrace-1.1.0-ldflags-parallel-make.patch b/sys-block/blktrace/files/blktrace-1.1.0-ldflags-parallel-make.patch similarity index 100% rename from sys-block/blktrace/files/btrace-1.1.0-ldflags-parallel-make.patch rename to sys-block/blktrace/files/blktrace-1.1.0-ldflags-parallel-make.patch diff --git a/sys-block/blktrace/files/btrace-1.0.0-parallel-make.patch b/sys-block/blktrace/files/btrace-1.0.0-parallel-make.patch deleted file mode 100644 index d3f4296..00000000 --- a/sys-block/blktrace/files/btrace-1.0.0-parallel-make.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 diff --git a/sys-block/btrace/btrace-1.1.0-r1.ebuild b/sys-block/btrace/btrace-1.1.0-r1.ebuild deleted file mode 100644 index 0278e0c..00000000 --- a/sys-block/btrace/btrace-1.1.0-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# 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 -}