Revamp the parallel build improvements. Bug #335741: respect LDFLAGS. Bug #348281: Fix USE=doc building missing DEPEND. Bug #269121: Remove old versions where SRC_URI is no longer valid.

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

8 files changed, 123 insertions, 121 deletions

diff --git a/sys-block/btrace/ChangeLog b/sys-block/btrace/ChangeLog
index 08f928be6f0b..3fd52b53d62b 100644
--- a/sys-block/btrace/ChangeLog
+++ b/sys-block/btrace/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-block/btrace
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/ChangeLog,v 1.18 2011/01/25 04:29:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/ChangeLog,v 1.19 2011/02/03 03:07:06 robbat2 Exp $
+
+*btrace-1.0.1-r1 (03 Feb 2011)
+
+  03 Feb 2011; Robin H. Johnson <robbat2@gentoo.org>
+  -btrace-0.0.20060428050322.ebuild, -btrace-0.0.20060614042007.ebuild,
+  -btrace-0.0.20070730162628.ebuild, -btrace-0.99.3.ebuild,
+  btrace-1.0.0.ebuild, btrace-1.0.1.ebuild, +btrace-1.0.1-r1.ebuild,
+  +files/btrace-1.0.1-ldflags-parallel-make.patch:
+  Revamp the parallel build improvements. Bug #335741: respect LDFLAGS. Bug
+  #348281: Fix USE=doc building missing DEPEND. Bug #269121: Remove old
+  versions where SRC_URI is no longer valid.
 
 *btrace-1.0.1 (25 Jan 2011)
 
diff --git a/sys-block/btrace/btrace-0.0.20060428050322.ebuild b/sys-block/btrace/btrace-0.0.20060428050322.ebuild
deleted file mode 100644
index d0b42e909a3d..000000000000
--- a/sys-block/btrace/btrace-0.0.20060428050322.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-0.0.20060428050322.ebuild,v 1.6 2009/09/23 20:29:31 patrick Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue."
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/"
-# this is in case Jens ever releases a real version
-MY_PV="${PV/0.0.}"
-MY_PN="blktrace"
-MY_P="${MY_PN}-${MY_PV}"
-SRC_URI="mirror://kernel/linux/kernel/people/axboe/${MY_PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="doc"
-RDEPEND=""
-# This is a Linux specific app!
-DEPEND="${RDEPEND}
-		|| ( sys-kernel/linux-headers sys-kernel/mips-headers )
-		doc? ( virtual/latex-base )"
-S="${WORKDIR}/${MY_PN}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall -W" || die "emake failed"
-	if use doc; then
-		emake docs || die "emake docs failed"
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README
-	use doc && doc/blktrace.pdf
-}
diff --git a/sys-block/btrace/btrace-0.0.20060614042007.ebuild b/sys-block/btrace/btrace-0.0.20060614042007.ebuild
deleted file mode 100644
index ac01abd9d926..000000000000
--- a/sys-block/btrace/btrace-0.0.20060614042007.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-0.0.20060614042007.ebuild,v 1.6 2009/09/23 20:29:31 patrick Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue."
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/"
-# this is in case Jens ever releases a real version
-MY_PV="${PV/0.0.}"
-MY_PN="blktrace"
-MY_P="${MY_PN}-${MY_PV}"
-SRC_URI="mirror://kernel/linux/kernel/people/axboe/${MY_PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="doc"
-RDEPEND=""
-# This is a Linux specific app!
-DEPEND="${RDEPEND}
-		|| ( sys-kernel/linux-headers sys-kernel/mips-headers )
-		doc? ( virtual/latex-base )"
-S="${WORKDIR}/${MY_PN}"
-
-src_compile() {
-	append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
-	if use doc; then
-		emake docs || die "emake docs failed"
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README
-	use doc && dodoc doc/blktrace.pdf
-}
diff --git a/sys-block/btrace/btrace-0.0.20070730162628.ebuild b/sys-block/btrace/btrace-0.0.20070730162628.ebuild
deleted file mode 100644
index 02b4603dcc25..000000000000
--- a/sys-block/btrace/btrace-0.0.20070730162628.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-0.0.20070730162628.ebuild,v 1.4 2009/09/23 20:29:31 patrick Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue."
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/"
-# this is in case Jens ever releases a real version
-MY_PV="git-${PV/0.0.}"
-MY_PN="blktrace"
-MY_P="${MY_PN}-${MY_PV}"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="doc"
-RDEPEND=""
-# This is a Linux specific app!
-DEPEND="${RDEPEND}
-		|| ( sys-kernel/linux-headers sys-kernel/mips-headers )
-		doc? ( virtual/latex-base )"
-S="${WORKDIR}/${MY_PN}"
-
-src_compile() {
-	append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
-	if use doc; then
-		emake docs || die "emake docs failed"
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README
-	use doc && dodoc doc/blktrace.pdf
-}
diff --git a/sys-block/btrace/btrace-1.0.0.ebuild b/sys-block/btrace/btrace-1.0.0.ebuild
index 1c7e57e19bf5..964542869f18 100644
--- a/sys-block/btrace/btrace-1.0.0.ebuild
+++ b/sys-block/btrace/btrace-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-1.0.0.ebuild,v 1.2 2009/09/23 20:29:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-1.0.0.ebuild,v 1.3 2011/02/03 03:07:06 robbat2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic linux-info
 
@@ -17,7 +17,7 @@ RDEPEND=""
 # This is a Linux specific app!
 DEPEND="${RDEPEND}
 		|| ( sys-kernel/linux-headers sys-kernel/mips-headers )
-		doc? ( virtual/latex-base )
+		doc? ( virtual/latex-base app-text/dvipdfm )
 		dev-libs/libaio"
 S="${WORKDIR}/${MY_PN}"
 
diff --git a/sys-block/btrace/btrace-0.99.3.ebuild b/sys-block/btrace/btrace-1.0.1-r1.ebuild
index 49f9750d7795..abe2e6fe8c63 100644
--- a/sys-block/btrace/btrace-0.99.3.ebuild
+++ b/sys-block/btrace/btrace-1.0.1-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-0.99.3.ebuild,v 1.3 2009/09/23 20:29:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-1.0.1-r1.ebuild,v 1.1 2011/02/03 03:07:06 robbat2 Exp $
 
-inherit eutils toolchain-funcs flag-o-matic
+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="http://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/"
@@ -17,14 +19,22 @@ RDEPEND=""
 # This is a Linux specific app!
 DEPEND="${RDEPEND}
 		|| ( sys-kernel/linux-headers sys-kernel/mips-headers )
-		doc? ( virtual/latex-base )
+		doc? ( virtual/latex-base app-text/dvipdfm )
 		dev-libs/libaio"
-S="${WORKDIR}/${MY_PN}"
+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
 }
diff --git a/sys-block/btrace/btrace-1.0.1.ebuild b/sys-block/btrace/btrace-1.0.1.ebuild
index 8ea4b6420684..345b79b70f16 100644
--- a/sys-block/btrace/btrace-1.0.1.ebuild
+++ b/sys-block/btrace/btrace-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-1.0.1.ebuild,v 1.1 2011/01/25 04:29:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-1.0.1.ebuild,v 1.2 2011/02/03 03:07:06 robbat2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic linux-info
 
@@ -17,7 +17,7 @@ RDEPEND=""
 # This is a Linux specific app!
 DEPEND="${RDEPEND}
 		|| ( sys-kernel/linux-headers sys-kernel/mips-headers )
-		doc? ( virtual/latex-base )
+		doc? ( virtual/latex-base app-text/dvipdfm )
 		dev-libs/libaio"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch b/sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch
new file mode 100644
index 000000000000..40c7d97d5dea
--- /dev/null
+++ b/sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch
@@ -0,0 +1,91 @@
+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
+