| 1 |
flameeyes 09/06/02 11:43:08 |
| 2 |
|
| 3 |
Modified: ChangeLog bwmon-1.3.ebuild |
| 4 |
Log: |
| 5 |
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. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.15 net-analyzer/bwmon/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/bwmon/ChangeLog?rev=1.15&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/bwmon/ChangeLog?rev=1.15&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/bwmon/ChangeLog?r1=1.14&r2=1.15 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/ChangeLog,v |
| 18 |
retrieving revision 1.14 |
| 19 |
retrieving revision 1.15 |
| 20 |
diff -u -r1.14 -r1.15 |
| 21 |
--- ChangeLog 2 Jul 2007 14:36:59 -0000 1.14 |
| 22 |
+++ ChangeLog 2 Jun 2009 11:43:08 -0000 1.15 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for net-analyzer/bwmon |
| 25 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/ChangeLog,v 1.14 2007/07/02 14:36:59 peper Exp $ |
| 27 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/ChangeLog,v 1.15 2009/06/02 11:43:08 flameeyes Exp $ |
| 29 |
+ |
| 30 |
+ 02 Jun 2009; Diego E. Pettenò <flameeyes@g.o> bwmon-1.3.ebuild: |
| 31 |
+ Fix build by just not using the broken Makefile, instead build straight in |
| 32 |
+ src_compile. Also fix DEPEND/RDEPEND and die on failed install. Closes bug |
| 33 |
+ #247924. |
| 34 |
|
| 35 |
02 Jul 2007; Piotr Jaroszyński <peper@g.o> bwmon-1.3.ebuild: |
| 36 |
(QA) RESTRICT clean up. |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.18 net-analyzer/bwmon/bwmon-1.3.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/bwmon/bwmon-1.3.ebuild?rev=1.18&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/bwmon/bwmon-1.3.ebuild?rev=1.18&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/bwmon/bwmon-1.3.ebuild?r1=1.17&r2=1.18 |
| 45 |
|
| 46 |
Index: bwmon-1.3.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/bwmon-1.3.ebuild,v |
| 49 |
retrieving revision 1.17 |
| 50 |
retrieving revision 1.18 |
| 51 |
diff -u -r1.17 -r1.18 |
| 52 |
--- bwmon-1.3.ebuild 2 Jul 2007 14:36:59 -0000 1.17 |
| 53 |
+++ bwmon-1.3.ebuild 2 Jun 2009 11:43:08 -0000 1.18 |
| 54 |
@@ -1,6 +1,8 @@ |
| 55 |
-# Copyright 1999-2007 Gentoo Foundation |
| 56 |
+# Copyright 1999-2009 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/bwmon-1.3.ebuild,v 1.17 2007/07/02 14:36:59 peper Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/bwmon-1.3.ebuild,v 1.18 2009/06/02 11:43:08 flameeyes Exp $ |
| 60 |
+ |
| 61 |
+inherit toolchain-funcs flag-o-matic |
| 62 |
|
| 63 |
DESCRIPTION="Simple ncurses bandwidth monitor" |
| 64 |
HOMEPAGE="http://bwmon.sourceforge.net/" |
| 65 |
@@ -8,28 +10,29 @@ |
| 66 |
RESTRICT="mirror" |
| 67 |
|
| 68 |
DEPEND="sys-libs/ncurses" |
| 69 |
+RDEPEND="${DEPEND}" |
| 70 |
|
| 71 |
SLOT="0" |
| 72 |
LICENSE="GPL-2 public-domain" |
| 73 |
KEYWORDS="amd64 hppa ~ppc sparc x86" |
| 74 |
IUSE="" |
| 75 |
|
| 76 |
-src_unpack() { |
| 77 |
- unpack ${A} |
| 78 |
- cd ${S} |
| 79 |
- sed -i -e "s:/usr/local/bin:\$\{DESTDIR\}usr/bin:" \ |
| 80 |
- Makefile |
| 81 |
- sed -i -e "s:CFLAGS =:CFLAGS = ${CFLAGS}:" \ |
| 82 |
- -e "s:LDFLAGS =:LDFLAGS = -L/lib:" \ |
| 83 |
- src/Makefile |
| 84 |
+ |
| 85 |
+doecho() { |
| 86 |
+ echo "$@" |
| 87 |
+ "$@" |
| 88 |
} |
| 89 |
|
| 90 |
src_compile() { |
| 91 |
- emake || die |
| 92 |
+ append-flags -I "${S}"/include -D__THREADS |
| 93 |
+ |
| 94 |
+ doecho $(tc-getCC) -o ${PN} \ |
| 95 |
+ ${CFLAGS} ${LDFLAGS} \ |
| 96 |
+ src/${PN}.c -lncurses -lpthread \ |
| 97 |
+ || die "build failed" |
| 98 |
} |
| 99 |
|
| 100 |
src_install () { |
| 101 |
- dodir /usr/bin |
| 102 |
- make DESTDIR=${D} install || die |
| 103 |
- dodoc README |
| 104 |
+ dobin ${PN} || die |
| 105 |
+ dodoc README || die |
| 106 |
} |
Archives