Specify LICENSE more precisely. Bump EAPI to 5. Remove old.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

3 files changed, 13 insertions, 52 deletions

diff --git a/app-editors/e3/ChangeLog b/app-editors/e3/ChangeLog
index 4db5e6f14027..fbd630af1732 100644
--- a/app-editors/e3/ChangeLog
+++ b/app-editors/e3/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/e3
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/ChangeLog,v 1.37 2012/06/09 14:47:27 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/ChangeLog,v 1.38 2014/01/01 16:42:11 ulm Exp $
+
+  01 Jan 2014; Ulrich Müller <ulm@gentoo.org> -e3-2.7.1.ebuild, e3-2.8.ebuild:
+  Specify LICENSE more precisely. Bump EAPI to 5. Remove old.
 
   09 Jun 2012; Justin Lecher <jlec@gentoo.org> e3-2.8.ebuild, metadata.xml:
   Add -- to emake so that -l doesn't get confused by [number]* make targets,
diff --git a/app-editors/e3/e3-2.7.1.ebuild b/app-editors/e3/e3-2.7.1.ebuild
deleted file mode 100644
index c988dd4ae5c9..000000000000
--- a/app-editors/e3/e3-2.7.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/e3-2.7.1.ebuild,v 1.6 2010/03/30 22:39:27 fauli Exp $
-
-DESCRIPTION="Very tiny editor in ASM with emacs, pico, wordstar, and vi keybindings"
-HOMEPAGE="http://freshmeat.net/projects/e3/
-	http://mitglied.multimania.de/albkleine/"
-SRC_URI="http://mitglied.multimania.de/albkleine/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="x86? ( >=dev-lang/nasm-0.98.39-r3 )
-	amd64? ( >=dev-lang/yasm-0.6.1 )"
-RDEPEND=""
-
-src_compile() {
-	local target=""
-	use amd64 && target="yasm64"
-	emake ${target} || die "emake failed"
-}
-
-src_install() {
-	dobin e3 || die "dobin failed"
-	dosym e3 /usr/bin/e3em
-	dosym e3 /usr/bin/e3ne
-	dosym e3 /usr/bin/e3pi
-	dosym e3 /usr/bin/e3vi
-	dosym e3 /usr/bin/e3ws
-
-	newman e3.man e3.1
-	dodoc ChangeLog README
-	dohtml e3.html
-}
diff --git a/app-editors/e3/e3-2.8.ebuild b/app-editors/e3/e3-2.8.ebuild
index 7cd97556b409..032cae77b78f 100644
--- a/app-editors/e3/e3-2.8.ebuild
+++ b/app-editors/e3/e3-2.8.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/e3-2.8.ebuild,v 1.5 2012/06/09 14:47:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/e3-2.8.ebuild,v 1.6 2014/01/01 16:42:11 ulm Exp $
 
-EAPI=3
+EAPI=5
 
 DESCRIPTION="Very tiny editor in ASM with emacs, pico, wordstar, and vi keybindings"
 HOMEPAGE="http://sites.google.com/site/e3editor/"
 SRC_URI="http://sites.google.com/site/e3editor/Home/${P}.tgz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE=""
 RESTRICT="strip"
 
 DEPEND=">=dev-lang/nasm-2.09.04"
@@ -22,22 +21,18 @@ src_prepare() {
 }
 
 src_compile() {
-	if use amd64; then
-		emake -- 64 || die
-	else
-		emake -- 32 || die
-	fi
+	emake -- $(usex amd64 64 32)
 }
 
 src_install() {
-	dobin e3 || die
+	dobin e3
 	dosym e3 /usr/bin/e3em
 	dosym e3 /usr/bin/e3ne
 	dosym e3 /usr/bin/e3pi
 	dosym e3 /usr/bin/e3vi
 	dosym e3 /usr/bin/e3ws
 
-	newman e3.man e3.1 || die
-	dohtml e3.html || die
+	newman e3.man e3.1
+	dohtml e3.html
 	dodoc ChangeLog README README_OLD
 }