summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-02-01 15:34:53 +0000
committerJeroen Roovers <jer@gentoo.org>2013-02-01 15:34:53 +0000
commit51eea95463bab544b5d09630c5cea5b5bf5c57e4 (patch)
treeb81670b14ab7c5b673c171fc2ccfb0ab42e3e7ba /net-analyzer/bmon
parent0.9.17 version bump. (diff)
downloadhistorical-51eea95463bab544b5d09630c5cea5b5bf5c57e4.tar.gz
historical-51eea95463bab544b5d09630c5cea5b5bf5c57e4.tar.bz2
historical-51eea95463bab544b5d09630c5cea5b5bf5c57e4.zip
Verbose build.
Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'net-analyzer/bmon')
-rw-r--r--net-analyzer/bmon/ChangeLog8
-rw-r--r--net-analyzer/bmon/Manifest31
-rw-r--r--net-analyzer/bmon/bmon-2.1.1_pre1.ebuild32
-rw-r--r--net-analyzer/bmon/files/bmon-2.1.1-verbose.patch24
4 files changed, 62 insertions, 33 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/Manifest b/net-analyzer/bmon/Manifest
index 608c80442463..bad191152f15 100644
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -1,20 +1,21 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
-AUX bmon-2.1.0-gcc4.diff 1241 RMD160 e54ba1e1503b82655a65c65178fa5a85d56babc1 SHA1 ad83356830bdad59ee1ad352708c71e565476a7f SHA256 c26daa21662581f29ceb6ad5ba2274a26a6a80ac45557b2f441290e4b15a43fa
-AUX bmon-2.1.0-libnl-1.0.patch 486 RMD160 8496bc5e231dfa3c3892e10fcbfad33e2200d7d5 SHA1 4d56067e756d1943cef08d40ddddd0496cf17382 SHA256 19a042e7a28882ebaf66deca8bf71843a385df703076543b5fb11c3cf364d350
-AUX bmon-2.1.0-nostrip.patch 443 RMD160 0fbdbfaa613b41e817038aa51b1b26b13d5f58a3 SHA1 62382dc8a90c6ba4f797bda542c30a35bbf65d95 SHA256 32b10476f33109cc112c00be5e4396ed010e4a923c9c1537e94d5f7ed303e82a
-AUX bmon-2.1.0-sysfs-symlink.patch 382 RMD160 32a596a3492d8d3a4dd4e81f54d87b9ad6162619 SHA1 3d2cecc1363cab1e8bbfcdb7c10d804fdc589d93 SHA256 4877f4b2d0b7d847fde3efeb28b8c477673d8bf8484df44e7bc8ea0221a43646
-DIST bmon-2.1.0.tar.gz 270287 RMD160 7e0a5e0a82bfd3dc30fec899088f2206a75796a0 SHA1 969084269f155583063832751fff5a22a6ac77e3 SHA256 36a5772fc0241298b15db3dc4fb2552dcbb43edeffd6fcea4cd8818e97ec99fe
-DIST bmon-2.1.1-pre1.tar.gz 249796 RMD160 52996cdc2ae1ccfc689b65852e0d468f1d1fb4bb SHA1 d075dca44d7623b7d999f4c0160aa32284540703 SHA256 b60027e8a7c5a1db773a055ee6470e15e79265582b263f1f03bafd65edb5b434
-EBUILD bmon-2.1.0-r3.ebuild 1262 RMD160 a6a6a80206ade141b3ef95735d9c5a80c986d0de SHA1 f0ad3443eddd6f56e1bedf3db509898b8c0fc846 SHA256 9fddb9f13ed8a9c98cf18dd8140deb443d94c34b5c71597436cbdda76fd871dd
-EBUILD bmon-2.1.1_pre1.ebuild 1359 RMD160 479bfd2a46cc562ee22fc5b6e0543e67e36e76a9 SHA1 a60585fc0e1e57e555a19578e82e1f3661e7c05d SHA256 39d9bddbcbc187f6eb2d380348ae7f891732274db68952e35b6b0a659ec86711
-MISC ChangeLog 6083 RMD160 90c6d58fc87e7da596bcd96faf3412a24fc0854c SHA1 0c8adddbfc82d92a23fc5d01ac325749cf287159 SHA256 556e5c63eddbf3433a324c6f6344bf1791dcc1b32a80b79ebfdea0364a30c209
-MISC metadata.xml 322 RMD160 acef75fc6365dacab6f2d0e8b1aaf58b3bf81d4a SHA1 dc72f277c4d8d9be608f5291474ea86e8165e57e SHA256 b7fb7c6cfe1300d41f8357724e78e656c76a231e1ad41238ce1449dda76c3975
+AUX bmon-2.1.0-gcc4.diff 1241 SHA256 c26daa21662581f29ceb6ad5ba2274a26a6a80ac45557b2f441290e4b15a43fa SHA512 368b0c4a53e58383ff68d97530cc3ce0ee7d7faf291bbb2a757a67fe4cba5a0835e0531c57181c935aa7931502cb75bd11ed7af9b3645b5b1e30be1eaa489b48 WHIRLPOOL c6ee8baccc694b21c8edf3ede4c0b909c70b7498b7f0df8b815b2f02d6d786f9ccb45df60577d9fe6b59af3c4dda992e82b7913d3d16ace5d52a64f79eb48ac9
+AUX bmon-2.1.0-libnl-1.0.patch 486 SHA256 19a042e7a28882ebaf66deca8bf71843a385df703076543b5fb11c3cf364d350 SHA512 0be292d2744091edd8d6462333c60ffd112f8d9ec7eaa0ef6e8747ff2978bb7fc0a3db70414e8d56b77384b27bbb1a806cdbfec31ef3c7ed1a0b1c17012f3f1f WHIRLPOOL 30cfadab96055b0b467c247db1b859164e969f1b3e684f9d2629972ceb3c931fe127878f05ceb8ba4ca5cbd2c371979a656ce17ec44d9766a256215c6bdd3806
+AUX bmon-2.1.0-nostrip.patch 443 SHA256 32b10476f33109cc112c00be5e4396ed010e4a923c9c1537e94d5f7ed303e82a SHA512 d75ed57a70d8131e29912fff5c0a575bf4679c753818d0eded8fce9a917b006ca0d1ac56ac94eccaa4eb8e2369f275c7ebea21dbdebade6ad4c7f740a4719e83 WHIRLPOOL 313a34a5139d720eb8db6b064dbacd17d0e3c63bb1a2d303f0d18f55b18885dcae9e420369df9473e7ab69f72bdf6d803fe373ab29f3b115ad90d4e8d99e2b59
+AUX bmon-2.1.0-sysfs-symlink.patch 382 SHA256 4877f4b2d0b7d847fde3efeb28b8c477673d8bf8484df44e7bc8ea0221a43646 SHA512 6aa864a9c03b3486e7a56435f31896b1b0998d93d02a2807f119e49137791d35a2d166a4d595caca4af0a9407a7d334b99d80a4aeb953dd93d7ea83b21b71ced WHIRLPOOL d5e7475caf55127bf95b09bbae60674bf490b504ddc40cb18f8d5e17355f238514a8f1ddcf2ec30187349b6581ff5e9471ef0459d273209ace889ceaf6dc49d0
+AUX bmon-2.1.1-verbose.patch 519 SHA256 0116dd315a844256ba0ec5c05678cc6c61b8026b590de38bffd53f40b755754b SHA512 16f3a13986cbe41dafa819089605623f35ec916528fd2677c366eec85f3d2a69df8dcd446554e3f119488ddb7bfa75d29b2168e5c0e9b851c4da3bcf4ec268a1 WHIRLPOOL 6f2e3742fc5d2cfb4498313bd93e119485eb24232f97d6d4f878a282718a49e37e920b180dfb9324b4a44b14ed5dddc9c37a1c6dacb609808aad586090a0783c
+DIST bmon-2.1.0.tar.gz 270287 SHA256 36a5772fc0241298b15db3dc4fb2552dcbb43edeffd6fcea4cd8818e97ec99fe SHA512 83b14a9701d987fc511e3c42cca972a2f6a35342616b62bf297696510395d8ad2b420a629a16e5f9aef60254a90802af0077c13cad58613f44027ec1a87d25cd WHIRLPOOL 08dd8551b22e771270b3ebd9943aed2b8cfaa58d8dc8fb49a001df88e377bfa01d4725cf4e3bd45711f345fd2c4d42bd4febef8f640c440782d76faf4eee983d
+DIST bmon-2.1.1-pre1.tar.gz 249796 SHA256 b60027e8a7c5a1db773a055ee6470e15e79265582b263f1f03bafd65edb5b434 SHA512 6d6b624694994b42a3308287a2bed6598285753db398e259aef0de4e2d1328b9c92c850d1f5441e7e29001ec180cbd3c805309603dc4d9efdb8d2ccf6acf0ab8 WHIRLPOOL 9173fdd1aab26a22b5f7c1bd99b9ce1956ffd5f5571cfa7e3a663c81d416fe560caab8479e3d61cb827b5471618398f2712bb2349eec4ce38b3a735799a1bd07
+EBUILD bmon-2.1.0-r3.ebuild 1262 SHA256 9fddb9f13ed8a9c98cf18dd8140deb443d94c34b5c71597436cbdda76fd871dd SHA512 0fc32054077f962aee369b0a225c734097e756f05969e1cdb6aa8153aa8cab258f167ac4e8932b3b45c59ab83de2544f574007472072d262ce7472a14a2cbef8 WHIRLPOOL 5ed6b90e6e85708372e7b74eeeb3552bbe4d357e4e3a412fd1ed6b3673044273005a04771fcc0b8385fa84aebdd66b78d9f6f309d23fa197420033b18ef73bff
+EBUILD bmon-2.1.1_pre1.ebuild 1301 SHA256 ba7bf5a7ef41b17844e7e1221d7c0c1dfea534d9a77b1c31701b7cc10f0a7545 SHA512 b2d557131a5c2be2171d908497ee1283b3bbdca8835c9b38df7f4de516d0945f2b414995dd4ed0990c20e8a8c7d5476d52cf97d501ef889ba113aad604996610 WHIRLPOOL bb9a312e9bfcec6cfd1b13c576d92ba13b12090fb13d3c561538af69eaa4176e30b2f2b818b875707560180145ebfc8a0ff33c80a638bc4800d2b40e8ad7a7c8
+MISC ChangeLog 6207 SHA256 a6de808aa839dfee08ec782f7497a668d711eed7d7e9d0a9151034fa05e14452 SHA512 8945af58a4d209cd28fbc19d3371a4dc4662d66c8cd233396cfa03bab9c618bad0bde129ea67e11c238a633d799db9d2ea3a6386c615bcc68e7317d390c112b1 WHIRLPOOL 97a419cbd901f14d8c3e35cdee4e36555be890c3a1f874999394b1ba58adc2a9aa579189f01b6a2d4e5e5b02006faa0baa0ff5336adea9e1fc453bba8dcfcdea
+MISC metadata.xml 322 SHA256 b7fb7c6cfe1300d41f8357724e78e656c76a231e1ad41238ce1449dda76c3975 SHA512 b3cfc5fe18086e4af17fb6619a6502e62ab106dd269e683b8a83ae2d73dabeac006b58bef07795e04fe561b8930971342e5c053946e01bd145fb624b049a9325 WHIRLPOOL e817d740c3b05c918db88047954ce0320671a2ec90329e47fa1466ab774d50cc348ebe1c5012032a9d277924beac3ddc1472ecb4ef43e7b00c7f785689ce6bf8
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk9WYHoACgkQVWmRsqeSphNuTQCfXe9Jlnns+bGnO0Ahj1SyQjLV
-iX0AnjytlXiqE6Q2ZgHIkVv6AvDUnrlc
-=Q+On
+iEYEAREIAAYFAlEL4J0ACgkQVWmRsqeSphMaJgCeMGYVtdQXylW5zP0EvvfoSA0Z
+7BgAn2IZ/KPDWmZfJP6Kyviq0ZktGT4o
+=RUYV
-----END PGP SIGNATURE-----
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: