update to EAPI 4.

(Portage version: 2.1.10.3/cvs/Linux i686)

4 files changed, 16 insertions, 71 deletions

diff --git a/app-text/lv/ChangeLog b/app-text/lv/ChangeLog
index 5dde5157d411..ca05ca848578 100644
--- a/app-text/lv/ChangeLog
+++ b/app-text/lv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/lv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lv/ChangeLog,v 1.36 2011/01/13 14:47:24 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lv/ChangeLog,v 1.37 2011/08/13 12:44:44 hattya Exp $
+
+  13 Aug 2011; Akinori Hattori <hattya@gentoo.org> -lv-4.51-r2.ebuild,
+  lv-4.51-r3.ebuild, files/lv-4.51-xz.diff:
+  update to EAPI 4.
 
 *lv-4.51-r3 (13 Jan 2011)
 
diff --git a/app-text/lv/files/lv-4.51-xz.diff b/app-text/lv/files/lv-4.51-xz.diff
index cb41d8b18603..058029b8be28 100644
--- a/app-text/lv/files/lv-4.51-xz.diff
+++ b/app-text/lv/files/lv-4.51-xz.diff
@@ -1,4 +1,3 @@
-diff -ur lv451.orig/index.html lv451/index.html
 --- lv451.orig/index.html
 +++ lv451/index.html
 @@ -301,8 +301,11 @@
@@ -15,7 +14,6 @@ diff -ur lv451.orig/index.html lv451/index.html
  	<P>
  	In case that standard output is not connected to an ordinal terminal
  	but to redirect or pipe-line,
-diff -ur lv451.orig/src/stream.c lv451/src/stream.c
 --- lv451.orig/src/stream.c
 +++ lv451/src/stream.c
 @@ -43,6 +43,8 @@
diff --git a/app-text/lv/lv-4.51-r2.ebuild b/app-text/lv/lv-4.51-r2.ebuild
deleted file mode 100644
index 9c60558faf05..000000000000
--- a/app-text/lv/lv-4.51-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lv/lv-4.51-r2.ebuild,v 1.1 2010/10/11 08:12:47 hattya Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-IUSE=""
-
-MY_P="${PN}${PV//./}"
-
-DESCRIPTION="Powerful Multilingual File Viewer"
-HOMEPAGE="http://www.ff.iij4u.or.jp/~nrt/lv/"
-SRC_URI="http://www.ff.iij4u.or.jp/~nrt/freeware/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="sys-libs/ncurses
-	!app-editors/levee"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-xz.diff
-
-}
-
-src_compile() {
-
-	ECONF_SOURCE=src econf || die
-	emake CC="$(tc-getCC)" || die
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die
-
-	dodoc README hello.sample
-	dohtml index.html relnote.html hello.sample.gif
-
-}
diff --git a/app-text/lv/lv-4.51-r3.ebuild b/app-text/lv/lv-4.51-r3.ebuild
index 3b8375f73962..c74d97fd1ef8 100644
--- a/app-text/lv/lv-4.51-r3.ebuild
+++ b/app-text/lv/lv-4.51-r3.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lv/lv-4.51-r3.ebuild,v 1.1 2011/01/13 14:47:24 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lv/lv-4.51-r3.ebuild,v 1.2 2011/08/13 12:44:44 hattya Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit eutils toolchain-funcs
 
-IUSE=""
-
 MY_P="${PN}${PV//./}"
 
 DESCRIPTION="Powerful Multilingual File Viewer"
@@ -15,38 +13,31 @@ HOMEPAGE="http://www.ff.iij4u.or.jp/~nrt/lv/"
 SRC_URI="http://www.ff.iij4u.or.jp/~nrt/freeware/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
-S="${WORKDIR}/${MY_P}"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
 
 RDEPEND="sys-libs/ncurses
 	!app-editors/levee"
 DEPEND="${RDEPEND}
 	dev-lang/perl"
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	epatch "${FILESDIR}"/${P}-xz.diff
-
 }
 
 src_configure() {
-
-	ECONF_SOURCE=src econf || die
-
+	ECONF_SOURCE=src econf
 }
-src_compile() {
-
-	emake CC="$(tc-getCC)" || die
 
+src_compile() {
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-
-	emake DESTDIR="${D}" install || die
-
-	dodoc README hello.sample || die
-	dohtml index.html relnote.html hello.sample.gif || die
-
+	emake DESTDIR="${D}" install
+	dodoc README hello.sample
+	dohtml index.html relnote.html hello.sample.gif
 }