Verbose build.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 46 insertions, 18 deletions

diff --git a/net-analyzer/bmon/ChangeLog b/net-analyzer/bmon/ChangeLog
index 3afa5b366bd2..d18a1a18eeb6 100644
--- a/net-analyzer/bmon/ChangeLog
+++ b/net-analyzer/bmon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/bmon
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.46 2012/03/06 19:07:32 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.47 2013/02/01 15:34:52 jer Exp $
+
+  01 Feb 2013; Jeroen Roovers <jer@gentoo.org> bmon-2.1.1_pre1.ebuild,
+  +files/bmon-2.1.1-verbose.patch:
+  Verbose build.
 
   06 Mar 2012; Jeroen Roovers <jer@gentoo.org> bmon-2.1.0-r3.ebuild,
   bmon-2.1.1_pre1.ebuild:
diff --git a/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild b/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild
index 480c4b9133f1..de17b40bcba8 100644
--- a/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild
+++ b/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild,v 1.5 2012/03/06 19:07:32 jer Exp $
-
-EAPI="1"
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild,v 1.6 2013/02/01 15:34:52 jer Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs
 
 MY_PV="${PV/_pre/-pre}"
@@ -18,15 +17,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="dbi rrdtool"
 
-DEPEND=">=sys-libs/ncurses-5.3-r2
+DEPEND="
+	>=sys-libs/ncurses-5.3-r2
 	dev-libs/libnl:1.1
 	dbi? ( >=dev-db/libdbi-0.7.2-r1 )
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.6-r1 )"
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.6-r1 )
+"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+DOCS=( ChangeLog )
+
+src_prepare() {
 	# gcc4 fix, bug 105343
 	epatch "${FILESDIR}"/${PN}-2.1.0-gcc4.diff
 	# Don't strip, bug #144370
@@ -35,16 +36,15 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-2.1.0-libnl-1.0.patch
 	# newer sysfs has symlinks for net class
 	epatch "${FILESDIR}"/${PN}-2.1.0-sysfs-symlink.patch
+	# verbose build
+	epatch "${FILESDIR}"/${PN}-2.1.1-verbose.patch
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable dbi) \
-		$(use_enable rrdtool rrd) || die "econf failed"
-	emake CPPFLAGS="${CXXFLAGS} -I${WORKDIR}/libnl-${NLVER}/include" || die "emake failed"
+		$(use_enable rrdtool rrd)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog
+src_compile() {
+	emake CPPFLAGS="${CXXFLAGS} -I${WORKDIR}/libnl-${NLVER}/include"
 }
diff --git a/net-analyzer/bmon/files/bmon-2.1.1-verbose.patch b/net-analyzer/bmon/files/bmon-2.1.1-verbose.patch
new file mode 100644
index 000000000000..736e3b1a7651
--- /dev/null
+++ b/net-analyzer/bmon/files/bmon-2.1.1-verbose.patch
@@ -0,0 +1,24 @@
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -26,11 +26,9 @@
+ .SUFFIXES: .deps/%.d .c
+ 
+ %.o: %.c
+-	@echo "  CC $<"; \
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+ 
+ .deps/%.d: %.c
+-	@echo "  DEP $<"; \
+ 	$(CC) $(DEPFLAGS) $< > $@.tmp; \
+ 	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.tmp > $@; \
+ 	rm -f $@.tmp
+--- a/src/GNUmakefile
++++ b/src/GNUmakefile
+@@ -65,7 +65,6 @@
+ all: bmon
+ 
+ $(OUT): ../Makefile.opts $(OBJ)
+-	@echo "  LD $(OUT)"; \
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) -o $(OUT) $(OBJ) $(LDFLAGS) $(BMON_LIB)
+ 
+ clean: