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

[Andreas Sturmlechner]

commit:     fb3c9df94135a48093d66f2e3a7b44578743e105
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 10:57:56 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 19:02:25 2021 +0000
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 <asturm <AT> 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..00000000000
--- 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..00000000000
--- 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/doc/btt.pdf
-}

diff --git a/sys-block/blktrace/files/blktrace-1.1.0-ldflags-parallel-make.patch b/sys-block/blktrace/files/blktrace-1.1.0-ldflags-parallel-make.patch
deleted file mode 100644
index f26799238fe..00000000000
--- a/sys-block/blktrace/files/blktrace-1.1.0-ldflags-parallel-make.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- 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