[gentoo-commits] repo/gentoo:master commit in: sys-block/blktrace/, sys-block/blktrace/files/

2021-07-07 Thread Robin H. Johnson
commit: 7c25464ace1616c53d5c3f8f528c35453d8ff46e
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Jul  8 02:44:25 2021 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Thu Jul  8 02:44:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c25464a

sys-block/blktrace: cleanup 1.2.0

Reference: https://bugs.gentoo.org/655146
Signed-off-by: Robin H. Johnson  gentoo.org>

 sys-block/blktrace/Manifest|  1 -
 sys-block/blktrace/blktrace-1.2.0.ebuild   | 53 -
 .../blktrace/files/blktrace-1.2.0-ldflags.patch| 89 --
 .../blktrace-1.2.0-overlapping-io-stats.patch  | 68 -
 .../files/blktrace-1.2.0-parallel-build.patch  | 71 -
 5 files changed, 282 deletions(-)

diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index 15d068dc51f..0d52fe09a16 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -1,2 +1 @@
-DIST blktrace-1.2.0.tar.bz2 395193 BLAKE2B 
8f8505f27985f0451f75ced0e438a88758482227e83ba8de235986ab3f116cf38d5aec340d1e7ce3dc3aa5a97c0bd4c46265687976e7326a54ea2e7cce4afc82
 SHA512 
ce82c8010ca5c2868746d8eb7c6a107fc7382c05df949eeff79e612f5b1a98301a5aa5ab39de0766ea1c074f95e378ba985401cbeba9a296e3182da7d7a23b86
 DIST blktrace-1.3.0.tar.bz2 396669 BLAKE2B 
ab340b27421ec423c8e5bd9fd719f97e06c30366ce95560adea644d10737f41d2c2f16e4c6503b65ef8fedeec7d997de6f47f0d3f2542c5065fe7846f8d18966
 SHA512 
4cc3d8e0d77e934bd70f447e1bb462400d3c9982460802f093d260e3cb69a66c6f61a63a05af55b84c35c5bdf18027e571d55cebea8c89d0be6d00c7ca9b9174

diff --git a/sys-block/blktrace/blktrace-1.2.0.ebuild 
b/sys-block/blktrace/blktrace-1.2.0.ebuild
deleted file mode 100644
index ee5ebdfdceb..000
--- a/sys-block/blktrace/blktrace-1.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic linux-info
-
-MY_PN="blktrace"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="show detailed info about what is happening on a block device io 
queue"
-HOMEPAGE="https://git.kernel.dk/cgit/blktrace/";
-SRC_URI="https://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/texlive-core-2014
-   )
-"
-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}"/${P}-overlapping-io-stats.patch
-   "${FILESDIR}"/${PN}-1.2.0-ldflags.patch #335741
-   "${FILESDIR}"/${PN}-1.2.0-parallel-build.patch #335741
-)
-
-src_compile() {
-   append-cppflags -DLVM_REMAP_WORKAROUND -W -I"${S}"
-   emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}"
-   if use doc; then
-   export VARTEXFONTS="${T}/fonts"
-   emake docs
-   fi
-}
-
-src_install() {
-   emake install CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}" 
DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man"
-   einstalldocs
-   use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf
-}

diff --git a/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch 
b/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch
deleted file mode 100644
index b8e2aebfff4..000
--- a/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-http://git.kernel.dk/?p=blktrace.git;a=commit;h=d1398e339585f6750f7158c50c98861b68dddc8b
-
-From 6d8c3d7a10f62b26514a56b25a3744c5f35219a6 Mon Sep 17 00:00:00 2001
-From: "Robin H. Johnson" 
-Date: Tue, 23 Jan 2018 17:40:48 -0500
-Subject: [PATCH] respect LDFLAGS when linking programs
-

- Makefile   | 10 +-
- btreplay/Makefile  |  4 ++--
- btt/Makefile   |  2 +-
- iowatcher/Makefile |  2 +-
- 4 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index fdbded02ee0a..68de59183a73 100644
 a/Makefile
-+++ b/Makefile
-@@ -26,19 +26,19 @@ btreplay/btreplay:
-   $(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,$^)
-

[gentoo-commits] repo/gentoo:master commit in: sys-block/blktrace/, sys-block/blktrace/files/

2021-04-30 Thread Andreas Sturmlechner
commit: fb3c9df94135a48093d66f2e3a7b44578743e105
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 18 10:57:56 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 30 19:02:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb3c9df9

sys-block/blktrace: Drop 1.1.0 and 1.1.0-r1, EAPI5--

Both overshadowed by stable 1.2.0, likely no reason to keep those.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sys-block/blktrace/Manifest|   1 -
 sys-block/blktrace/blktrace-1.1.0-r1.ebuild|  49 --
 sys-block/blktrace/blktrace-1.1.0.ebuild   |  48 --
 .../blktrace-1.1.0-ldflags-parallel-make.patch | 105 -
 4 files changed, 203 deletions(-)

diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index 4dc678b6a05..5f5984d3f9b 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -1,2 +1 @@
-DIST blktrace-1.1.0.tar.bz2 395445 BLAKE2B 
8a19142991527813942e6377baa5de825572196e75ea43606f2ae2db73d9278c8178f104910ecd92593a70fe9c86c36ebd718e09599e88824f5faaddca5bd7cd
 SHA512 
52ed3b66e1ec62c2204d44037d4d13218fd0229ae694493a21f1e83bfc8aeb029edc96b2be83f39cc3e79500abad56cd5a71c8c4e6dd836661777662f3628355
 DIST blktrace-1.2.0.tar.bz2 395193 BLAKE2B 
8f8505f27985f0451f75ced0e438a88758482227e83ba8de235986ab3f116cf38d5aec340d1e7ce3dc3aa5a97c0bd4c46265687976e7326a54ea2e7cce4afc82
 SHA512 
ce82c8010ca5c2868746d8eb7c6a107fc7382c05df949eeff79e612f5b1a98301a5aa5ab39de0766ea1c074f95e378ba985401cbeba9a296e3182da7d7a23b86

diff --git a/sys-block/blktrace/blktrace-1.1.0-r1.ebuild 
b/sys-block/blktrace/blktrace-1.1.0-r1.ebuild
deleted file mode 100644
index 29c03c431b2..000
--- a/sys-block/blktrace/blktrace-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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="https://git.kernel.dk/cgit/blktrace/";
-SRC_URI="https://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/texlive-core-2014
-   )
-"
-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/blktrace/blktrace-1.1.0.ebuild 
b/sys-block/blktrace/blktrace-1.1.0.ebuild
deleted file mode 100644
index dd119541f90..000
--- a/sys-block/blktrace/blktrace-1.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch 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://git.kernel.dk/cgit/blktrace/";
-MY_PN="blktrace"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="https://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/texlive-core-2014
-   )
-   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/

[gentoo-commits] repo/gentoo:master commit in: sys-block/blktrace/, sys-block/blktrace/files/, sys-block/btrace/

2016-10-01 Thread Robin H. Johnson
commit: 3cabac399d2e3228da9969679d32e644fb1fa39c
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Oct  1 22:24:39 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sat Oct  1 22:25:25 2016 +
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  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 
74559960ae7fd6b0eecc9457221f5133f46bbf23e6e096bc96226c85cee4ae9cf67a3e8bff66722dca7cd43afaf910ac47dfe1d850f83c63e0db6f0ea70d
 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..
--- 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/blk