Fix build by just not using the broken Makefile, instead build straight in src_compile. Also fix DEPEND/RDEPEND and die on failed install. Closes bug #247924.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 36 insertions, 18 deletions

diff --git a/net-analyzer/bwmon/ChangeLog b/net-analyzer/bwmon/ChangeLog
index c153658ee68d..9d99724a0be3 100644
--- a/net-analyzer/bwmon/ChangeLog
+++ b/net-analyzer/bwmon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/bwmon
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/ChangeLog,v 1.14 2007/07/02 14:36:59 peper Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/ChangeLog,v 1.15 2009/06/02 11:43:08 flameeyes Exp $
+
+  02 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> bwmon-1.3.ebuild:
+  Fix build by just not using the broken Makefile, instead build straight in
+  src_compile. Also fix DEPEND/RDEPEND and die on failed install. Closes bug
+  #247924.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> bwmon-1.3.ebuild:
   (QA) RESTRICT clean up.
diff --git a/net-analyzer/bwmon/Manifest b/net-analyzer/bwmon/Manifest
index 9ec17fff4ba5..41783d3fe32f 100644
--- a/net-analyzer/bwmon/Manifest
+++ b/net-analyzer/bwmon/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST bwmon-1.3.tar.gz 5668 RMD160 375829dd60f4425ed90e244b715e426939df0618 SHA1 3fe85d05c6511f8f7f4a4e49bf33e3de9d6199f8 SHA256 624381208d0faae6c123bc6198a59d6c4316cd4fffb1ba5aca206374f5a42df6
-EBUILD bwmon-1.3.ebuild 816 RMD160 5b8d99ef6c946ea56b65c809adfc94ca27dd45aa SHA1 315e5df72cb1736cfb226b36ce2212eda25e1a64 SHA256 24477147eb0d47002eaacb8304e077fd157bd141f417084436acf359c0129385
-MISC ChangeLog 1411 RMD160 093f5a0324494073435cbc350af4031824f583b2 SHA1 07926ad05560eff784011c1c47a1ff28cf90405e SHA256 e3776766b82bd42b38e659910944ff74c5f59ccc87af90801846122fae7713c9
+EBUILD bwmon-1.3.ebuild 820 RMD160 9b90ddd66cb4f29f610b0678534b2c486d5429e6 SHA1 4c7fbe0433b4f55dc045bf97441cb45f21af7ebc SHA256 f0b1ba2336d367821b45e3b7a405244e4e0b02b043c56dc84f44e5d4c2b4d76f
+MISC ChangeLog 1655 RMD160 8846e8c919a0114958588a9feae635bc4e354aaa SHA1 cddf47cd881cb20153b62ae426e1fafa44a80b3e SHA256 e7fbc4087780f5e88e77ebdd94b585e3b89ad53f5ff618751c2863f2f35a42ae
 MISC metadata.xml 227 RMD160 da09415985a20658beb1b579b7505189e6fb89fe SHA1 b436bcafc08dbd5c5be1bd49b5947387d98e55e8 SHA256 465609212401299513731252063d93eb272a2b61f65e3db84a6d38d229040d85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkolEFEACgkQAiZjviIA2Xi9vgCgzlC4NXjhXVuayaZ0OFo5IspU
+lM8AoKy9tq4bHeZhEg4ITHL3hLZ6em0A
+=1QRA
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/bwmon/bwmon-1.3.ebuild b/net-analyzer/bwmon/bwmon-1.3.ebuild
index 2f4eba55eddc..ed7ef47f9ac2 100644
--- a/net-analyzer/bwmon/bwmon-1.3.ebuild
+++ b/net-analyzer/bwmon/bwmon-1.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/bwmon-1.3.ebuild,v 1.17 2007/07/02 14:36:59 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/bwmon-1.3.ebuild,v 1.18 2009/06/02 11:43:08 flameeyes Exp $
+
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="Simple ncurses bandwidth monitor"
 HOMEPAGE="http://bwmon.sourceforge.net/"
@@ -8,28 +10,29 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 RESTRICT="mirror"
 
 DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
 
 SLOT="0"
 LICENSE="GPL-2 public-domain"
 KEYWORDS="amd64 hppa ~ppc sparc x86"
 IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e "s:/usr/local/bin:\$\{DESTDIR\}usr/bin:" \
-	    Makefile
-	sed -i -e "s:CFLAGS =:CFLAGS = ${CFLAGS}:" \
-	    -e "s:LDFLAGS =:LDFLAGS = -L/lib:" \
-	    src/Makefile
+
+doecho() {
+	echo "$@"
+	"$@"
 }
 
 src_compile() {
-	emake || die
+	append-flags -I "${S}"/include -D__THREADS
+
+	doecho $(tc-getCC) -o ${PN} \
+		${CFLAGS} ${LDFLAGS} \
+		src/${PN}.c -lncurses -lpthread \
+		|| die "build failed"
 }
 
 src_install () {
-	dodir /usr/bin
-	make DESTDIR=${D} install || die
-	dodoc README
+	dobin ${PN} || die
+	dodoc README || die
 }