sci-misc/sfst: Bump to EAPI=5

Package-Manager: portage-2.2.21
Signed-off-by: Justin Lecher <jlec@gentoo.org>

2 files changed, 26 insertions, 28 deletions

diff --git a/sci-misc/sfst/sfst-1.4.2.ebuild b/sci-misc/sfst/sfst-1.4.2.ebuild
index 7d032c399..1215ed3e5 100644
--- a/sci-misc/sfst/sfst-1.4.2.ebuild
+++ b/sci-misc/sfst/sfst-1.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 inherit elisp eutils
 
@@ -21,12 +21,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs vim-syntax"
 
-DEPEND="
-	sys-libs/readline
+RDEPEND="sys-libs/readline:0="
+DEPEND="${RDEPEND}
 	sys-devel/bison
-	sys-devel/flex
-	sys-apps/sed"
-RDEPEND="sys-libs/readline"
+	sys-devel/flex"
 
 S="${WORKDIR}/${MY_PN}"
 
@@ -42,29 +40,29 @@ src_prepare() {
 		-e 's/ldconfig/true/' \
 		-e 's/$(INSTALL_LIBS)/$(INSTALL_DIR) $(DESTDIR)$(PREFIX)\/lib\n\t\0/' \
 		-i "${S}"/src/Makefile || die "sed failed"
-	cd "${S}"
+	cd "${S}" || die
 	if use emacs ; then
-		cp "${DISTDIR}/sfst.el" "${S}"
+		cp "${DISTDIR}/sfst.el" "${S}" || die
 	fi
 	if use vim-syntax ; then
-		mv "${WORKDIR}"/INSTALL "${S}"/INSTALL-vim-syntax
-		mv "${WORKDIR}"/sfst.vim "${S}"/
+		mv "${WORKDIR}"/INSTALL "${S}"/INSTALL-vim-syntax || die
+		mv "${WORKDIR}"/sfst.vim "${S}"/ || die
 	fi
 }
 
 src_compile() {
 	emake -C "${S}/src"
 	if use emacs ; then
-		cd "${S}"
+		cd "${S}" || die
 		elisp_src_compile
 	fi
 }
 
 src_install() {
-	cd "${S}/src"
+	cd "${S}/src" || die
 	# destdir works but prefix fails
 	emake DESTDIR="${D}" install maninstall libinstall
-	cd "${S}"
+	cd "${S}" || die
 	dodoc README
 	insinto /usr/share/doc/${PF}/
 	doins doc/SFST-Manual.pdf doc/SFST-Tutorial.pdf
diff --git a/sci-misc/sfst/sfst-1.4.6g.ebuild b/sci-misc/sfst/sfst-1.4.6g.ebuild
index f7798738e..c59d0cc2e 100644
--- a/sci-misc/sfst/sfst-1.4.6g.ebuild
+++ b/sci-misc/sfst/sfst-1.4.6g.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 inherit elisp-common eutils
 
@@ -21,12 +21,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs vim-syntax"
 
-RDEPEND="sys-libs/readline"
+RDEPEND="
+	sys-libs/readline:0=
+	emacs? ( virtual/emacs )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
-	sys-devel/flex
-	sys-apps/sed
-	emacs? ( virtual/emacs )"
+	sys-devel/flex"
 
 S="${WORKDIR}/${MY_PN}"
 
@@ -42,29 +42,29 @@ src_prepare() {
 		-e 's/ldconfig/true/' \
 		-e 's/$(INSTALL_LIBS)/$(INSTALL_DIR) $(DESTDIR)$(PREFIX)\/lib\n\t\0/' \
 		-i "${S}"/src/Makefile || die "sed failed"
-	cd "${S}"
+	cd "${S}" || die
 	if use emacs ; then
-		cp "${DISTDIR}/sfst.el" "${S}"
+		cp "${DISTDIR}/sfst.el" "${S}" || die
 	fi
 	if use vim-syntax ; then
-		mv "${WORKDIR}"/INSTALL "${S}"/INSTALL-vim-syntax
-		mv "${WORKDIR}"/sfst.vim "${S}"/
+		mv "${WORKDIR}"/INSTALL "${S}"/INSTALL-vim-syntax || die
+		mv "${WORKDIR}"/sfst.vim "${S}"/ || die
 	fi
 }
 
 src_compile() {
 	emake -C "${S}/src"
 	if use emacs ; then
-		cd "${S}"
+		cd "${S}" || die
 		elisp-compile *.el || die "could not compile elisp"
 	fi
 }
 
 src_install() {
-	cd "${S}/src"
+	cd "${S}/src" || die
 	# destdir works but prefix fails
 	emake DESTDIR="${D}" install maninstall libinstall
-	cd "${S}"
+	cd "${S}" || die
 	dodoc README
 	insinto /usr/share/doc/${PF}/
 	doins doc/SFST-Manual.pdf doc/SFST-Tutorial.pdf
@@ -78,6 +78,6 @@ src_install() {
 		dodoc INSTALL-vim-syntax
 	fi
 	if use emacs ; then
-		elisp-install ${PN} *.el *.elc || die "could not install elisp"
+		elisp-install ${PN} *.el *.elc
 	fi
 }