gentoo resync : 14.07.2018

3 files changed, 0 insertions, 92 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 895031500184..23c00980e9ff 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index 3ad4e97b44d0..1fd0336bc886 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -1,4 +1,3 @@
-AUX blktrace-1.0.1-ldflags-parallel-make.patch 2951 BLAKE2B 478ad1fb6c00c6d7813318b34842ecf779946b2267d52c1c17e21430a52cae02f0268f30146b67486805ef770c03fdb8ec426854aa2e37e37a02627a62f69334 SHA512 b384b90d86e52d8a314efa2bee2ae67ed562d56b2c2412211e28cae9dabb448378fe083e0dfe30b6462c5e5d1d85ad7fda6c7d81e3ede0da5ba4c73606b36c7b
 AUX blktrace-1.1.0-ldflags-parallel-make.patch 3043 BLAKE2B e6c3c6fd23795f18665ddc39ab55b351c1250cdb29bbbc171d8fcf4f0a0f2b2be94e7f697e2fd83d1dc56353aa98a8604fc540cb82e5c2800990dee0b9c01fbd SHA512 d119ef833ca50527a9f2705ff4a741a9d091625286253bf0d7440f695326eaa753232965bf69a6dad4ea24cf411ef2a992d4226e009d9b4fcadbec616c384fce
 AUX blktrace-1.2.0-ldflags.patch 2748 BLAKE2B 2e5bb94aeb829d6f187bb22c109f732fd442df20c1da4acc4cb31fff46d51e9dc37f0aa2c2bceac661c334c0f1727214fba4ee22455e4df2a58efb817d9eb1c3 SHA512 d0a411020f7ca01beea5c7915e1d934c93120d86111d789fd2c7719d10b116e56634b86fe5f37717e104c6493bbce2878df2abf9ddea8ba87089cb2f0a01c084
 AUX blktrace-1.2.0-overlapping-io-stats.patch 1973 BLAKE2B 2ba883a033f24b9c3b70bab6f4b1c0843452cb1ec63b5d3efda549b0ff99d01170e43b9bcb8ab9ccb3206792aac7f69bc1b1fee5e39378159d4c30463bc8abc3 SHA512 b72a7f6bb03105e7e10116c70bc79d4fe131f223cf5d56649850f777c59226a8c78d7f0dc758fba97891f2f29bde903e41c7bf5e04cae710058a3e38017c02b7
diff --git a/sys-block/blktrace/files/blktrace-1.0.1-ldflags-parallel-make.patch b/sys-block/blktrace/files/blktrace-1.0.1-ldflags-parallel-make.patch
deleted file mode 100644
index 40c7d97d5dea..000000000000
--- a/sys-block/blktrace/files/blktrace-1.0.1-ldflags-parallel-make.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -Nuar blktrace-1.0.1.orig/btreplay/Makefile blktrace-1.0.1/btreplay/Makefile
---- blktrace-1.0.1.orig/btreplay/Makefile	2009-05-11 12:00:10.000000000 +0000
-+++ blktrace-1.0.1/btreplay/Makefile	2011-02-03 03:01:41.161365886 +0000
-@@ -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
-diff -Nuar blktrace-1.0.1.orig/btt/Makefile blktrace-1.0.1/btt/Makefile
---- blktrace-1.0.1.orig/btt/Makefile	2009-05-11 12:00:10.000000000 +0000
-+++ blktrace-1.0.1/btt/Makefile	2011-02-03 03:01:41.161365886 +0000
-@@ -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
-diff -Nuar blktrace-1.0.1.orig/Makefile blktrace-1.0.1/Makefile
---- blktrace-1.0.1.orig/Makefile	2009-05-11 12:00:10.000000000 +0000
-+++ blktrace-1.0.1/Makefile	2011-02-03 03:03:32.713725832 +0000
-@@ -4,38 +4,35 @@
- PROGS	= blkparse blktrace verify_blkparse blkrawverify blkiomon
- LIBS	= -lpthread
- SCRIPTS	= btrace
-+SUBDIRS = btreplay btt
- 
--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
- 
--all: $(ALL)
-+all: $(ALL) $(SUBDIRS)
-+.PHONY: $(SUBDIRS)
- 
--btt/btt:
--	$(MAKE) -C btt
--
--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
- 
-@@ -81,7 +78,7 @@
- 	$(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
-