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

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 32 insertions, 22 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/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
 }