Version bump to 1.4.0alpha; Remove obsolete ebuilds

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)

3 files changed, 15 insertions, 44 deletions

diff --git a/app-editors/bvi/ChangeLog b/app-editors/bvi/ChangeLog
index ffb2e4556fbb..936cb82805a0 100644
--- a/app-editors/bvi/ChangeLog
+++ b/app-editors/bvi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/bvi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/ChangeLog,v 1.22 2013/08/26 16:52:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/ChangeLog,v 1.23 2013/08/27 19:25:13 ryao Exp $
+
+*bvi-1.4.0_alpha (27 Aug 2013)
+
+  27 Aug 2013; Richard Yao <ryao@gentoo.org> +bvi-1.4.0_alpha.ebuild,
+  -bvi-1.3.2-r1.ebuild, -bvi-1.3.2.ebuild:
+  Version bump to 1.4.0alpha; Remove obsolete ebuilds
 
   26 Aug 2013; Agostino Sarubbo <ago@gentoo.org> bvi-1.3.2-r2.ebuild:
   Stable for ppc, wrt bug #457228
diff --git a/app-editors/bvi/bvi-1.3.2.ebuild b/app-editors/bvi/bvi-1.3.2.ebuild
deleted file mode 100644
index 02ef97cd9022..000000000000
--- a/app-editors/bvi/bvi-1.3.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/bvi-1.3.2.ebuild,v 1.11 2013/01/04 09:55:25 ryao Exp $
-
-EAPI=3
-
-inherit multilib
-
-DESCRIPTION="display-oriented editor for binary files, based on the vi texteditor"
-HOMEPAGE="http://bvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bvi/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's:(INSTALL_PROGRAM) -s:(INSTALL_PROGRAM):g' \
-		Makefile.in || die "sed failed in Makefile.in"
-}
-
-src_configure() {
-	econf --with-ncurses="${EPREFIX}"/usr
-
-	sed -i -e 's:ncurses/term.h:term.h:g' bmore.h || die "sed failed in bmore.h"
-}
-
-src_install() {
-	einstall || die "make install failed"
-	rm -rf "${ED}"/usr/$(get_libdir)/bmore.help
-	dodoc README CHANGES CREDITS bmore.help
-	dohtml -r html/*
-}
diff --git a/app-editors/bvi/bvi-1.3.2-r1.ebuild b/app-editors/bvi/bvi-1.4.0_alpha.ebuild
index aad2d3ee5cc6..37a8371ed7a6 100644
--- a/app-editors/bvi/bvi-1.3.2-r1.ebuild
+++ b/app-editors/bvi/bvi-1.4.0_alpha.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/bvi-1.3.2-r1.ebuild,v 1.1 2013/01/04 09:55:25 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/bvi-1.4.0_alpha.ebuild,v 1.1 2013/08/27 19:25:13 ryao Exp $
 
 EAPI=3
 
-inherit multilib eutils
+inherit multilib eutils versionator
+
+MY_P=$(replace_version_separator 4 '' ${P})
 
 DESCRIPTION="display-oriented editor for binary files, based on the vi texteditor"
 HOMEPAGE="http://bvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bvi/${P}.src.tar.gz"
+SRC_URI="mirror://sourceforge/bvi/$(replace_version_separator 4 '' ${P}).src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,8 +20,9 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~spar
 DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}/$MY_P"
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-buffer-overflow.patch"
 	sed -i -e 's:(INSTALL_PROGRAM) -s:(INSTALL_PROGRAM):g' \
 		Makefile.in || die "sed failed in Makefile.in"
 
@@ -33,8 +36,7 @@ src_configure() {
 }
 
 src_install() {
-	einstall || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	rm -rf "${ED}"/usr/$(get_libdir)/bmore.help
 	dodoc README CHANGES CREDITS bmore.help
-	dohtml -r html/*
 }