Stable for HPPA (bug #503034).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
RepoMan-Options: --ignore-arches
Manifest-Sign-Key: 0xA792A613

4 files changed, 12 insertions, 57 deletions

diff --git a/net-analyzer/bmon/ChangeLog b/net-analyzer/bmon/ChangeLog
index 44768a24cfff..cb1f409fb330 100644
--- a/net-analyzer/bmon/ChangeLog
+++ b/net-analyzer/bmon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/bmon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.51 2014/02/28 18:02:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.52 2014/02/28 18:06:47 jer Exp $
+
+  28 Feb 2014; Jeroen Roovers <jer@gentoo.org> -bmon-2.1.0-r3.ebuild,
+  bmon-2.1.1_pre1.ebuild:
+  Stable for HPPA (bug #503034).
 
 *bmon-3.2 (28 Feb 2014)
 
diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
index b98ea22bce44..7eab908db9e0 100644
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -6,18 +6,16 @@ AUX bmon-2.1.0-libnl-1.0.patch 486 SHA256 19a042e7a28882ebaf66deca8bf71843a385df
 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
 DIST bmon-3.2.tar.gz 55660 SHA256 1608aa8c5a55763c216d80069e0ef3afbcf0f5349acca34f7d5ece0551b231ea SHA512 a5017a8924f8ac5eaf9f671a8494302081050aab14f629f863eecccd01ea1f4a223b3f8ce4deb4304d5904dd99acca92e973ba503167d3805641d88ddbb938ce WHIRLPOOL 362f38610ccb1bf0943f3d56d0f95b88febada0e90729f0021c1265b259765df922281a2e173561366c36135969d209e48c950f66bc3116404e77a1f3afd2593
-EBUILD bmon-2.1.0-r3.ebuild 1262 SHA256 9fddb9f13ed8a9c98cf18dd8140deb443d94c34b5c71597436cbdda76fd871dd SHA512 0fc32054077f962aee369b0a225c734097e756f05969e1cdb6aa8153aa8cab258f167ac4e8932b3b45c59ab83de2544f574007472072d262ce7472a14a2cbef8 WHIRLPOOL 5ed6b90e6e85708372e7b74eeeb3552bbe4d357e4e3a412fd1ed6b3673044273005a04771fcc0b8385fa84aebdd66b78d9f6f309d23fa197420033b18ef73bff
-EBUILD bmon-2.1.1_pre1.ebuild 1508 SHA256 34c6b941846f3f25a84960a6c6633437aa24ba6c41784d93d7a427739d45895d SHA512 c43afd777c15e9c408414e8515d176c5394359ecc1677d7ff5a5de5ad93a7de8a75ab0b94c31596c7bd9174b1a59aed92e72539e2fb2eb6da9a14cc7d3645769 WHIRLPOOL 6b0b2e35abdd993630d8605dd598ca8a2dea73a5fa5bbd7fa577700c417ffdaf29dbf32f673172bccd73189260233bf23e8327b24b224e7dbb30b4ef330e7abb
+EBUILD bmon-2.1.1_pre1.ebuild 1503 SHA256 cd3c98e0914567308c8137e6564260966a28664743e830438ebab9f3898f7b44 SHA512 d6e6e71521330df73f0fdbae33772221152027eafaa973fc7912c0fe18b49643edf810fcbc84fae33d9e8be21751211b652477d359df55096998b0d0c356002a WHIRLPOOL 65cce61057f2e39acb6359dc19971d87ea64bc7cf28cd4ff21d5a5693161402bc818bb603fd35e4a433fc93f0dea09283b8b6241d7fe56cfbcf4e5b4ab9b0e1a
 EBUILD bmon-3.2.ebuild 765 SHA256 d8f6e961aa021f893953e22c3e4bac608f67a5a63ad4afe54c321d50e9a34410 SHA512 a354d0765603002c56cc710ab5b226964fdf730847f159630eff273bd5c3a41af35406efb1358829f7caff894d2a703f758f0c224fb078bf9ee4cfd9a174eab9 WHIRLPOOL 9450d6c92c996d19e1f45ec741633e202c8f99072eb5fc2f3f159a77431ce7647f1e37b37b1d308a2701492d635328830728d01ca0817b81354ae3272e4b55da
-MISC ChangeLog 6696 SHA256 18994ae310192490d2b3570e38deb26d8f4df7799b57f721ba4759c6c8585b16 SHA512 241828654ee0dca336b6413382d3b1319783895e87b3c63135edd0554a3fb5eaa952c3c36e54290a5a33952eacedcb5fff3efae42a57115ae62a76493e3bf54a WHIRLPOOL 2ab7505e58c0cba41aca7254af5136c9b34af465fb7c4d4045e4aab8428fa042f9e34a95ff2874063a3bf2816c61192392ca2b0bd55279db7d0c5c52754fe985
+MISC ChangeLog 6826 SHA256 595c0167222f9b6185d8c707a3558279e010321f824bf00dda0e82c7c70e0d8f SHA512 8b830e6f3ba74d0bc1ceb491f1a88297a4f6148334f69d1fa9a56fffcacb29bf2f6788ed54882579be9a532775f82a8c586ac827de22d310abd6ea3a7c3f6345 WHIRLPOOL bfd6163e24e42c5f0c9f9a45260bd64f1bcdfc65e96318b8a709987c257d58b3d6d6f22f9639d6b2e9af23782bb3dc56c83ea7e408afae6815a3b826f6b60b36
 MISC metadata.xml 322 SHA256 b7fb7c6cfe1300d41f8357724e78e656c76a231e1ad41238ce1449dda76c3975 SHA512 b3cfc5fe18086e4af17fb6619a6502e62ab106dd269e683b8a83ae2d73dabeac006b58bef07795e04fe561b8930971342e5c053946e01bd145fb624b049a9325 WHIRLPOOL e817d740c3b05c918db88047954ce0320671a2ec90329e47fa1466ab774d50cc348ebe1c5012032a9d277924beac3ddc1472ecb4ef43e7b00c7f785689ce6bf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMQzy0ACgkQVWmRsqeSphNcawCfWuBMKaRhUcqlgsEHGflwLqyq
-FJUAnA35DD2XXr9aRgA5F65qlkirBASt
-=/RkW
+iEYEAREIAAYFAlMQ0DkACgkQVWmRsqeSphPGRQCfd0dV/t0WM761gxvH7OLbTvrF
+ARcAn3WS/uSAvocZrTZYfzQ+uiJcPQnh
+=BNL3
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/bmon/bmon-2.1.0-r3.ebuild b/net-analyzer/bmon/bmon-2.1.0-r3.ebuild
deleted file mode 100644
index 1bef3591f49c..000000000000
--- a/net-analyzer/bmon/bmon-2.1.0-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.0-r3.ebuild,v 1.12 2012/03/06 19:07:32 jer Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="interface bandwidth monitor"
-HOMEPAGE="http://www.infradead.org/~tgr/bmon/"
-SRC_URI="http://people.suug.ch/~tgr/bmon/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~sparc x86"
-IUSE="dbi rrdtool"
-
-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 )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# gcc4 fix, bug 105343
-	epatch "${FILESDIR}"/${P}-gcc4.diff
-	# Don't strip, bug #144370
-	epatch "${FILESDIR}"/${P}-nostrip.patch
-	# libnl crap, bug 176378
-	epatch "${FILESDIR}"/${P}-libnl-1.0.patch
-	# newer sysfs has symlinks for net class
-	epatch "${FILESDIR}"/${P}-sysfs-symlink.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable dbi) \
-		$(use_enable rrdtool rrd) || die "econf failed"
-	emake CPPFLAGS="${CXXFLAGS} -I${WORKDIR}/libnl-${NLVER}/include" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog
-}
diff --git a/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild b/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild
index 6e71856b0e15..feeae8304a18 100644
--- a/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild
+++ b/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.9 2014/02/28 11:14:26 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.1_pre1.ebuild,v 1.10 2014/02/28 18:06:47 jer Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://people.suug.ch/~tgr/bmon/files/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
+KEYWORDS="amd64 hppa ~ppc ~sparc x86"
 IUSE="dbi rrdtool"
 
 RDEPEND="