EAPI bump. Remove short <longdescription>. Convert sed scripts to patch.

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

4 files changed, 44 insertions, 39 deletions

diff --git a/net-analyzer/tleds/ChangeLog b/net-analyzer/tleds/ChangeLog
index d8a3c1a958c4..2068aaf94f92 100644
--- a/net-analyzer/tleds/ChangeLog
+++ b/net-analyzer/tleds/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/tleds
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/ChangeLog,v 1.20 2010/09/19 00:12:14 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/ChangeLog,v 1.21 2014/07/17 21:07:04 jer Exp $
+
+  17 Jul 2014; Jeroen Roovers <jer@gentoo.org> tleds-1.05_beta11-r2.ebuild,
+  files/tleds-1.05_beta11-gentoo.patch, metadata.xml:
+  EAPI bump. Remove short <longdescription>. Convert sed scripts to patch.
 
 *tleds-1.05_beta11-r2 (19 Sep 2010)
 
diff --git a/net-analyzer/tleds/files/tleds-1.05_beta11-gentoo.patch b/net-analyzer/tleds/files/tleds-1.05_beta11-gentoo.patch
index 6f1c42174d15..96e6e3d21d45 100644
--- a/net-analyzer/tleds/files/tleds-1.05_beta11-gentoo.patch
+++ b/net-analyzer/tleds/files/tleds-1.05_beta11-gentoo.patch
@@ -1,6 +1,5 @@
-diff -uNr a/Changes b/Changes
---- a/Changes	2002-07-02 02:10:57.000000000 +0100
-+++ b/Changes	2002-07-02 02:05:37.000000000 +0100
+--- a/Changes
++++ b/Changes
 @@ -1,4 +1,7 @@
  VERSION	DATE		WHAT WAS FIXED OR WHAT WAS/IS NEW
 +
@@ -9,9 +8,8 @@ diff -uNr a/Changes b/Changes
  1.05b11 7 Mar 2002	Support for multiple interfaces
  
  1.05b7	2 Apr 1998	Keeps LEDs deattached also after VT is reset if run
-diff -uNr a/tleds.c b/tleds.c
---- a/tleds.c	2002-07-02 02:10:57.000000000 +0100
-+++ b/tleds.c	2002-07-02 02:11:24.000000000 +0100
+--- a/tleds.c
++++ b/tleds.c
 @@ -43,16 +43,6 @@
  #define VERSION	"1.05beta11"
  #define MYNAME	"tleds"
@@ -29,3 +27,27 @@ diff -uNr a/tleds.c b/tleds.c
  /* If you don't want X stuff. */
  #ifdef NO_X_SUPPORT
  #define REMOVE_X_CODE 1
+--- a/Makefile
++++ b/Makefile
+@@ -9,18 +9,18 @@
+ 
+ # For 2.1.x kernels, you have to include -DKERNEL2_1 option for gcc
+ 
+-GCCOPTS = -D_GNU_SOURCE -O3 -Wall 
++GCCOPTS = -D_GNU_SOURCE $(CFLAGS) $(LDFLAGS) -Wall 
+ 
+ # The first one is if you want to include X code
+ xtleds:	tleds.c Makefile
+ 	# Making xtleds
+-	gcc $(GCCOPTS) -o xtleds tleds.c -I /usr/X11R6/include/ -L /usr/X11R6/lib/ -lX11
++	$(CC) $(GCCOPTS) -o xtleds tleds.c -I /usr/include/ -L /usr/lib/ -lX11
+ 
+ # This second one works only when started in VT. Check the REMOVE_X_CODE
+ # in the source code.
+ tleds:	tleds.c Makefile
+ 	# Making tleds
+-	gcc -DNO_X_SUPPORT $(GCCOPTS) -o tleds tleds.c
++	$(CC) -DNO_X_SUPPORT $(GCCOPTS) -o tleds tleds.c
+ 
+ help:
+ 	# make help	-	this.
diff --git a/net-analyzer/tleds/metadata.xml b/net-analyzer/tleds/metadata.xml
index a7a371586ff3..03aa50bab7e3 100644
--- a/net-analyzer/tleds/metadata.xml
+++ b/net-analyzer/tleds/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>
-Blinks keyboard LEDs indicating outgoing and incoming network packets on
-selected network interface
-</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
index 3fe5a326518c..1953c6d49697 100644
--- a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
+++ b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
@@ -1,53 +1,36 @@
-# Copyright 1999-2010 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/tleds/tleds-1.05_beta11-r2.ebuild,v 1.1 2010/09/19 00:12:14 jer Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild,v 1.2 2014/07/17 21:07:04 jer Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs
 
 MY_P="${P/_/}"
 S="${WORKDIR}/${MY_P/eta11/}"
 DESCRIPTION="Blinks keyboard LEDs indicating outgoing and incoming network packets on selected network interface"
 HOMEPAGE="http://www.hut.fi/~jlohikos/tleds_orig.html"
-SRC_URI="http://www.hut.fi/~jlohikos/tleds/public/${MY_P/11/10}.tgz
-	http://www.hut.fi/~jlohikos/tleds/public/${MY_P}.patch.bz2"
+SRC_URI="
+	http://www.hut.fi/~jlohikos/tleds/public/${MY_P/11/10}.tgz
+	http://www.hut.fi/~jlohikos/tleds/public/${MY_P}.patch.bz2
+"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="X"
 
-DEPEND="X? ( >=x11-libs/libX11-1.0.0 )"
+DEPEND="X? ( x11-libs/libX11 )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	# unpack only original sources, not patches
-	unpack tleds-1.05beta10.tgz
-}
-
 src_prepare() {
 	# code patches
 	epatch \
-		"${DISTDIR}"/${MY_P}.patch.bz2 \
+		"${WORKDIR}"/${MY_P}.patch \
 		"${FILESDIR}"/${P}-gentoo.patch
-
-	# respect CC/CFLAGS/LDFLAGS, new X11 prefix
-	local opts="$(echo '$(GCCOPTS)')"
-	sed -i Makefile \
-		-e 's:-O3 -Wall:$(CFLAGS) $(LDFLAGS) -Wall:' \
-		-e 's:gcc \($(GCCOPTS)\):$(CC) \1:' \
-		-e 's:gcc \(-DNO_X_SUPPORT\):$(CC) \1:' \
-		-e 's:/usr/X11R6:/usr:g' \
-		|| die "sed failed in Makefile"
 }
 
 src_compile() {
-	if use X ; then
-		emake CC=$(tc-getCC) all || die "make failed"
-	else
-		emake CC=$(tc-getCC) tleds || die "make tleds failed"
-	fi
+	emake CC=$(tc-getCC) $(usex X all tleds)
 }
 
 src_install() {