EAPI bump. Remove short <longdescription>. Install XNetload config. Do not inject CC/CFLAGS/LDFLAGS into Makefile.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 41 insertions, 31 deletions

diff --git a/net-analyzer/xnetload/ChangeLog b/net-analyzer/xnetload/ChangeLog
index 3f251672a384..1ab4d1013bbe 100644
--- a/net-analyzer/xnetload/ChangeLog
+++ b/net-analyzer/xnetload/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/xnetload
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xnetload/ChangeLog,v 1.16 2009/10/16 16:35:12 tcunha Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xnetload/ChangeLog,v 1.17 2014/07/18 03:39:56 jer Exp $
+
+  18 Jul 2014; Jeroen Roovers <jer@gentoo.org> xnetload-1.11.3-r1.ebuild,
+  metadata.xml:
+  EAPI bump. Remove short <longdescription>. Install XNetload config. Do not
+  inject CC/CFLAGS/LDFLAGS into Makefile.
 
   16 Oct 2009; Tiago Cunha <tcunha@gentoo.org> xnetload-1.11.3-r1.ebuild:
   stable amd64/sparc, bug 288947
diff --git a/net-analyzer/xnetload/Manifest b/net-analyzer/xnetload/Manifest
index 277c0dc6ce09..278286ed97b3 100644
--- a/net-analyzer/xnetload/Manifest
+++ b/net-analyzer/xnetload/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST xnetload-1.11.3.tar.gz 24551 RMD160 7394bff0a36df43c15c8fc47f5c09fe7b7119a7a SHA1 d2cc18873dbf3984e128455d86dba4aa0b9c756d SHA256 518f6bd138b9d414865aa068ca7110de8b6d6cccde24e5deda8a8c534087a299
-EBUILD xnetload-1.11.3-r1.ebuild 1039 RMD160 77b21f45c640c6bbed2c64a210f05dd4ab2154a8 SHA1 4763cdb3e6d2a52fa0c74ce80ad736187dfe1173 SHA256 220dcff97c16588d46a3a94042d24a628d4d80cfabd2ce74aa94d24bc83bfce1
-MISC ChangeLog 2036 RMD160 f916f322ace56a3a29f50851d1d1387e57271f73 SHA1 94d1214f217654393d4350f995495091086836ff SHA256 c05915574bb6579c16a36cae3b5bf88a154b376ec3581ae6c42be7cecd80ced2
-MISC metadata.xml 292 RMD160 7b509ecdcecdcc6bb5c380b93e5239d03a00a012 SHA1 bb6c1ff9b03fe4896f7ff163f1f1036cabe5fbb8 SHA256 cd190914c0e2a1e28bca46ed6c0d0c54cd0452da9b1d977c7ed44e3227d85ffd
+DIST xnetload-1.11.3.tar.gz 24551 SHA256 518f6bd138b9d414865aa068ca7110de8b6d6cccde24e5deda8a8c534087a299 SHA512 2008102c132ee96b12251b7c2475efcae7926bb16ba032f75d6be42650785fb707bed3696586369c04bb0e9434ee7854de585e7a015f1a15037a7f30c86036b7 WHIRLPOOL d64db168de3626c60388c5b457602c9d4a31affae445efcbae3dea67e43d5a648c540187a7cbbfcefbad4acfae65428eb115f6a7e100d4ba3d48cd684d010bdc
+EBUILD xnetload-1.11.3-r1.ebuild 964 SHA256 fb1acd42e212030e695cb52fdb8805ab7ab8aefbffb1f651aebe1de0380ed880 SHA512 3429d7c846b09cbbf230c80643ca72a2d62a78d90c867be3fa5ff56ccfa8e050a2e54a5da8fce9f75215c7839857f33f5b5ac7289c988952385c450852c0eb3b WHIRLPOOL bf462e18085fb016f6ee5378dc5afba60df16b2d9b202152472f3fc330c36a59f42d64ca22ea859f717817b9a46e4cfa948db7bd5e3487dcfec1ba923eb3eafb
+MISC ChangeLog 2243 SHA256 79493a74c9755176f764635580864a655b5bfd9afde145c084413a918f93fd8b SHA512 6c571b1806773e60d4ac26f9d48aead2fcc98798a0c782462bfecbdf2ea34a66042a5738c72ea1c7e739cf95bb5d533b49f1f4fe9d261f260fd978949746d8f3 WHIRLPOOL 1a338ed06eaa7fd193071c4aef228429246d8d52d8900a17a828416ecbc0c054adb3089202d0b2d9260cecbb3e574bd28c66f4c107fbda8586e5e31b76dca961
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEARECAAYFAkrYoMwACgkQAgIglOz4paBprQCglkQeN2lXCapO00hoXCyn4xMk
-Wp8AoKt1pUKyXHPB9qYHmeLX8lblsmoK
-=OkdA
+iEYEAREIAAYFAlPIlw4ACgkQVWmRsqeSphOOawCdFLgMQTc98uoLiiB586d46EHM
+Gg8An1uabrUHAjvLYZuBX95VEwwWf8U4
+=F/6t
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/xnetload/metadata.xml b/net-analyzer/xnetload/metadata.xml
index b67e2c3b7c9f..03aa50bab7e3 100644
--- a/net-analyzer/xnetload/metadata.xml
+++ b/net-analyzer/xnetload/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>This little tool displays a count and a graph of the traffic over a specified network connection.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
index f5dee4223299..dcd9b44322b1 100644
--- a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
+++ b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
@@ -1,36 +1,42 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild,v 1.6 2009/10/16 16:35:12 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild,v 1.7 2014/07/18 03:39:56 jer Exp $
 
+EAPI=5
 inherit toolchain-funcs
 
-DESCRIPTION="This little tool displays a count and a graph of the traffic over a specified network connection."
+DESCRIPTION="displays a count and a graph of the traffic over a specified network connection"
+LICENSE="GPL-2"
 HOMEPAGE="http://www.xs4all.nl/~rsmith/software/"
-SRC_URI="http://www.xs4all.nl/~rsmith/software/${P}.tar.gz"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 
-DEPEND=">=x11-libs/libX11-1.0.0
-		>=x11-libs/libXmu-1.0.0
-		>=x11-libs/libXt-1.0.0
-		>=x11-libs/libXaw-1.0.1"
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXaw
+"
+RDEPEND="${DEPEND}"
 
-IUSE=""
+src_prepare() {
+	sed -i \
+		-e 's:CFLAGS = -pipe -O2 -Wall:CFLAGS += -Wall:' \
+		-e 's:LFLAGS = -s -pipe:LFLAGS = $(LDFLAGS):' \
+		-e 's:gcc -MM:$(CC) -MM:' \
+		-e 's:/usr/X11R6:/usr:g' \
+		Makefile || die
+}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s:CC = gcc:CC = $(tc-getCC):" \
-		-e "s:CFLAGS = -pipe -O2 -Wall:CFLAGS = ${CFLAGS} -Wall:" \
-		-e "s:LFLAGS = -s -pipe:LFLAGS = ${LDFLAGS}:" \
-		-e "s:gcc -MM:$(tc-getCC) -MM:" \
-		-e "s:/usr/X11R6:/usr:g" Makefile || die "sed failed in Makefile"
+src_compile() {
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
 	dobin xnetload
 	doman xnetload.1
-	dodoc README ChangeLog
+	dodoc ChangeLog README
+	insinto /usr/share/X11/app-defaults/
+	doins XNetload
 }