Applied patch from bug #152229. Marked stable on amd64.

Package-Manager: portage-2.1.2_pre2-r1

3 files changed, 27 insertions, 18 deletions

diff --git a/app-editors/bvi/ChangeLog b/app-editors/bvi/ChangeLog
index aae51499e496..249cad5bb1f7 100644
--- a/app-editors/bvi/ChangeLog
+++ b/app-editors/bvi/ChangeLog
@@ -1,8 +1,11 @@
 # ChangeLog for app-editors/bvi
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/ChangeLog,v 1.13 2006/10/21 14:36:01 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/ChangeLog,v 1.14 2006/10/22 19:41:36 kugelfang Exp $
 
-  21 Oct 2006; <nixnut@gentoo.org> bvi-1.3.2.ebuild:
+  22 Oct 2006; Danny van Dyk <kugelfang@gentoo.org> bvi-1.3.2.ebuild:
+  Applied patch from bug #152229. Marked stable on amd64.
+
+  21 Oct 2006; Gysbert Wassenaar <nixnut@gentoo.org> bvi-1.3.2.ebuild:
   Stable on ppc wrt bug 152229
 
   20 Sep 2005; Kito <kito@gentoo.org> bvi-1.3.2.ebuild:
diff --git a/app-editors/bvi/Manifest b/app-editors/bvi/Manifest
index b7465c0ca753..6aeabd5a0080 100644
--- a/app-editors/bvi/Manifest
+++ b/app-editors/bvi/Manifest
@@ -7,14 +7,14 @@ EBUILD bvi-1.3.1.ebuild 777 RMD160 a5a3451942c8671c55ac8c6d17081afda17935c0 SHA1
 MD5 53c15b24c6a221aa5b4ccfcee8e86d9d bvi-1.3.1.ebuild 777
 RMD160 a5a3451942c8671c55ac8c6d17081afda17935c0 bvi-1.3.1.ebuild 777
 SHA256 5e7613fc85c27f9f912313d793a93510a18c8ba8b1c8b0547781098f03d9fcbe bvi-1.3.1.ebuild 777
-EBUILD bvi-1.3.2.ebuild 819 RMD160 9bd3aca4ba17062fe1842b42d96e828996e6bdad SHA1 ec0467490ac33315e2d5c820e983df6621deb2d0 SHA256 2981119f7e9bd24ff74b597a0fab13924c3d9462e6479d354dc4fb78c9a03f1d
-MD5 5f17f3478713f5407e13115308f02364 bvi-1.3.2.ebuild 819
-RMD160 9bd3aca4ba17062fe1842b42d96e828996e6bdad bvi-1.3.2.ebuild 819
-SHA256 2981119f7e9bd24ff74b597a0fab13924c3d9462e6479d354dc4fb78c9a03f1d bvi-1.3.2.ebuild 819
-MISC ChangeLog 1261 RMD160 5e58b60d16837c0709e659e1e0525efe41ffd999 SHA1 c1fab34304f3df3c6a8bb9a460df3c5efeffd004 SHA256 8b311b1358fa69bfd1b8a26af35214b0b4e0020ed19839438c3fc6ab206da37f
-MD5 4aa1fd57fbdfd0bb55115598b3c42c3d ChangeLog 1261
-RMD160 5e58b60d16837c0709e659e1e0525efe41ffd999 ChangeLog 1261
-SHA256 8b311b1358fa69bfd1b8a26af35214b0b4e0020ed19839438c3fc6ab206da37f ChangeLog 1261
+EBUILD bvi-1.3.2.ebuild 967 RMD160 247f7fdb5f22d4c8f081a00d07e50f58b019609b SHA1 747c3b62d911f5bb634408984d90e1f0e4c4cac1 SHA256 fb2105f1d66b19dd37cb0cf20daf40831bcb2cd5b7ecfd733c0e2d2aa8977131
+MD5 2a06ba486c81148f6ae80ad0123baf96 bvi-1.3.2.ebuild 967
+RMD160 247f7fdb5f22d4c8f081a00d07e50f58b019609b bvi-1.3.2.ebuild 967
+SHA256 fb2105f1d66b19dd37cb0cf20daf40831bcb2cd5b7ecfd733c0e2d2aa8977131 bvi-1.3.2.ebuild 967
+MISC ChangeLog 1411 RMD160 d8c96984dc43e44c1bf85238046c9506276fe8ea SHA1 f7ec671d2da8b37fd647e6eada0c44bc56215cd5 SHA256 d8bbecf0cbc3654c4dadc5df4d021145dd1623f3a3af608a046cace0d3f92a6e
+MD5 b3e7dd88fdb9f1a7f31d8747a6c69b97 ChangeLog 1411
+RMD160 d8c96984dc43e44c1bf85238046c9506276fe8ea ChangeLog 1411
+SHA256 d8bbecf0cbc3654c4dadc5df4d021145dd1623f3a3af608a046cace0d3f92a6e ChangeLog 1411
 MISC metadata.xml 310 RMD160 5b59fc85d3bafae0872cf691e5f032bac39ba539 SHA1 bdd3f2bc135db7a1475e69cf818c6644a6146d3f SHA256 39e1273dd60bd3ceb460e9366a648c8fa21db1c292df4573e69f41cf6c84f6fc
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 RMD160 5b59fc85d3bafae0872cf691e5f032bac39ba539 metadata.xml 310
@@ -26,9 +26,9 @@ MD5 e899f182241e85185ebb736793b613ef files/digest-bvi-1.3.2 65
 RMD160 d8b163d098c2aed7454efdd50409909c89d834cf files/digest-bvi-1.3.2 65
 SHA256 54665b9b4a2337ff0ce05c56d47eb40f2a1f427806ef72f13fa4dd501a617f76 files/digest-bvi-1.3.2 65
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFFOjAywLwTda5NScMRAq4hAKCc8jIaniKX5lYKi0DDfO0pXAiCLACcDZo4
-dWMJKD9IUAbLC6TOk/hTQRg=
-=G+0g
+iD8DBQFFO8mq5mJXAu5GbtIRAij7AJ95j6oUj+fhtjygd9UpiroD09kgMQCfc3F0
+XJlSPt3UxK+xftcsihsHNtU=
+=Wfaw
 -----END PGP SIGNATURE-----
diff --git a/app-editors/bvi/bvi-1.3.2.ebuild b/app-editors/bvi/bvi-1.3.2.ebuild
index cf8ea4fde2e5..0122e1a5cf49 100644
--- a/app-editors/bvi/bvi-1.3.2.ebuild
+++ b/app-editors/bvi/bvi-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.4 2006/10/21 14:36:01 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/bvi-1.3.2.ebuild,v 1.5 2006/10/22 19:41:36 kugelfang Exp $
 
 DESCRIPTION="display-oriented editor for binary files, based on the vi texteditor"
 HOMEPAGE="http://bvi.sourceforge.net/"
@@ -13,18 +13,24 @@ KEYWORDS="~amd64 ppc ~ppc-macos ~x86"
 
 DEPEND="sys-libs/ncurses"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's:(INSTALL_PROGRAM) -s:(INSTALL_PROGRAM):g' \
+		Makefile.in || die "sed failed in Makefile.in"
+}
+
 src_compile() {
 	econf --with-ncurses=/usr || die "econf failed"
 
-	cp bmore.h bmore.h.old
-	sed -e 's:ncurses/term.h:term.h:g' bmore.h.old > bmore.h
+	sed -i -e 's:ncurses/term.h:term.h:g' bmore.h || die "sed failed in bmore.h"
 
 	emake || die "emake failed"
 }
 
 src_install() {
 	einstall || die "make install failed"
-	rm -rf ${D}/usr/share/bmore.help
+	rm -rf "${D}"/usr/lib/bmore.help
 	dodoc README CHANGES CREDITS bmore.help
 	dohtml -r html/*
 }