Better multibyte support (bug #150169)

(Portage version: 2.1.2_pre2-r3)
 (Signed Manifest commit)

3 files changed, 25 insertions, 73 deletions

diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest
index b1c8f90214df..9f30a5bb5152 100644
--- a/app-editors/nvi/Manifest
+++ b/app-editors/nvi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nvi-1.79-build.patch 2118 RMD160 32d9b51f7f1420db3b0d3b86cb8943dd787885dc SHA1 6370b74ff936311d97e1deefd0b5d36adce8e9df SHA256 8c2308f37591c41649aedaf2400704e4be1b4c25c4f4cf8257ac51da7cb8a4b5
 MD5 c06a0131cbb66e5a377df2ad572d9ea5 files/nvi-1.79-build.patch 2118
 RMD160 32d9b51f7f1420db3b0d3b86cb8943dd787885dc files/nvi-1.79-build.patch 2118
@@ -18,6 +21,10 @@ AUX nvi-1.81.5-tcsetattr.patch 565 RMD160 a086c01ffe498b1472cfde7cf1a261b79280df
 MD5 e4c11bab15aaee62f61cbe103c890cb9 files/nvi-1.81.5-tcsetattr.patch 565
 RMD160 a086c01ffe498b1472cfde7cf1a261b79280df85 files/nvi-1.81.5-tcsetattr.patch 565
 SHA256 1e912b57ceb65370540c28ca6114a0254eb4238583d7eb4850d4f3d437141b26 files/nvi-1.81.5-tcsetattr.patch 565
+AUX nvi-1.81.5-wide.patch 2464 RMD160 b6515008120041bd1888dc55253cb5b224c58dff SHA1 b5513b2832450d5a302b3f3837c352a90a9b6e62 SHA256 99139bb3762a800af88e38fcb826fde8a95cfd8feb803a30f42616a15bb71691
+MD5 8cbb25c05b847c738b548ee0c60db86e files/nvi-1.81.5-wide.patch 2464
+RMD160 b6515008120041bd1888dc55253cb5b224c58dff files/nvi-1.81.5-wide.patch 2464
+SHA256 99139bb3762a800af88e38fcb826fde8a95cfd8feb803a30f42616a15bb71691 files/nvi-1.81.5-wide.patch 2464
 DIST nvi-1.79.tar.gz 1295401 RMD160 1c39d480e0d30a87fc061c3219354b50011a8621 SHA1 65b49768783372609278ecedd63caa8c1547aa2a SHA256 755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33
 DIST nvi-1.81.4.tar.gz 1514011 RMD160 7c5f9aca3b1fbce3fa71873b4827dc5685e8afeb SHA1 5be066d0989d1389da8c5ec7276edd7a5b3dc4de SHA256 3d5a1fcccd246dad4650081336767b43ca47f25dcbb4c7cc8496a4fd5d3f33f1
 DIST nvi-1.81.5.tar.gz 1628555 RMD160 d1cfd4a87250baea4832ed6cac69ed18e6880915 SHA1 a4a8ee861526f661b3461c79df9c61ce0d508f79 SHA256 4c6b5c13999d8883da85e49e6dc2d02dddc084ac24fc72102cc372c5a0b7e745
@@ -42,18 +49,18 @@ EBUILD nvi-1.81.5-r3.ebuild 1753 RMD160 c6b2c2709739d8973be86929db958bb75350ac25
 MD5 fff8e3aaa456423171b37d831d7df182 nvi-1.81.5-r3.ebuild 1753
 RMD160 c6b2c2709739d8973be86929db958bb75350ac25 nvi-1.81.5-r3.ebuild 1753
 SHA256 8c014c7c5d291116479e49641cb47d6a8ec9801a2e246f9014de748662de2206 nvi-1.81.5-r3.ebuild 1753
-EBUILD nvi-1.81.5-r4.ebuild 1368 RMD160 7d9ccddb9d961c1c39a1edd52b50e2eacd7343f3 SHA1 db109eb19193eadc94b0353474549feba9ef43ba SHA256 6a0b4b086106866b2391b07697d16c5f0c0b1fa60706752eb1f30bf002cebd4d
-MD5 d4c161c7aa72b50b2216bd49e8526728 nvi-1.81.5-r4.ebuild 1368
-RMD160 7d9ccddb9d961c1c39a1edd52b50e2eacd7343f3 nvi-1.81.5-r4.ebuild 1368
-SHA256 6a0b4b086106866b2391b07697d16c5f0c0b1fa60706752eb1f30bf002cebd4d nvi-1.81.5-r4.ebuild 1368
+EBUILD nvi-1.81.5-r5.ebuild 1424 RMD160 c5858508ff351d4cdae94f855cbc9b54b8ba696d SHA1 f912d2e46ac550b5acbd2d5e846ab84d0a09f789 SHA256 b2925cfe406c7cdacbcc0a0dcfd87247690a966406437a682ffb0e8121efff2b
+MD5 e3fcb756eb95b92c6e7879223c2c81c9 nvi-1.81.5-r5.ebuild 1424
+RMD160 c5858508ff351d4cdae94f855cbc9b54b8ba696d nvi-1.81.5-r5.ebuild 1424
+SHA256 b2925cfe406c7cdacbcc0a0dcfd87247690a966406437a682ffb0e8121efff2b nvi-1.81.5-r5.ebuild 1424
 EBUILD nvi-1.81.5.ebuild 740 RMD160 603b62f186c042dbaf123db499f02a1df4fb7f50 SHA1 61b1f847cccadf7b79e09926e078a5701c93079b SHA256 ec13fa09cbea157fec2ed0abf9aba9d4c908410d165d15da62631c7302a5a9fd
 MD5 097be8de63d6000e28275ce4ca15e3b5 nvi-1.81.5.ebuild 740
 RMD160 603b62f186c042dbaf123db499f02a1df4fb7f50 nvi-1.81.5.ebuild 740
 SHA256 ec13fa09cbea157fec2ed0abf9aba9d4c908410d165d15da62631c7302a5a9fd nvi-1.81.5.ebuild 740
-MISC ChangeLog 5228 RMD160 6ae5eeb7434d8fadf1385e75f6602ce9a9e7eb7b SHA1 61d5d5b467a79b05eb6932c75860c909b9c368cf SHA256 41d3a6d5e910f82ec8502f282c19ab531fc55fc8b1f80dc22f145721a54eabe0
-MD5 8127a45d06cc79d5ef72d5d63e89311f ChangeLog 5228
-RMD160 6ae5eeb7434d8fadf1385e75f6602ce9a9e7eb7b ChangeLog 5228
-SHA256 41d3a6d5e910f82ec8502f282c19ab531fc55fc8b1f80dc22f145721a54eabe0 ChangeLog 5228
+MISC ChangeLog 5434 RMD160 82b402c8338360d42380cb628739237fac1e7c0b SHA1 edd379143ff4444dca8972bedd62fa87107b1f83 SHA256 0c9a156e7eea0d409f9f7e6f88e9b223edc00ebbb581e54584c08ee81929f289
+MD5 1996eb51428a7a69bd13de3494df6a20 ChangeLog 5434
+RMD160 82b402c8338360d42380cb628739237fac1e7c0b ChangeLog 5434
+SHA256 0c9a156e7eea0d409f9f7e6f88e9b223edc00ebbb581e54584c08ee81929f289 ChangeLog 5434
 MISC metadata.xml 229 RMD160 062ecd5166b6dc7b58f6628fbe66726d6e6e9d86 SHA1 e73c39033b0ba91260f9204c2e1671d241ade7f2 SHA256 8a284b9b59c3f0170e57a942a872e0251f6c691e8b8f6076187b0c3228664d79
 MD5 d2f99257546fd32545332a3cce582cd9 metadata.xml 229
 RMD160 062ecd5166b6dc7b58f6628fbe66726d6e6e9d86 metadata.xml 229
@@ -76,6 +83,13 @@ SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/di
 MD5 57f64625d249c4a4f9c8a946506fc896 files/digest-nvi-1.81.5-r3 235
 RMD160 ecceb3fd5a1c33ad0677f0b925835ae218353bcb files/digest-nvi-1.81.5-r3 235
 SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/digest-nvi-1.81.5-r3 235
-MD5 57f64625d249c4a4f9c8a946506fc896 files/digest-nvi-1.81.5-r4 235
-RMD160 ecceb3fd5a1c33ad0677f0b925835ae218353bcb files/digest-nvi-1.81.5-r4 235
-SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/digest-nvi-1.81.5-r4 235
+MD5 57f64625d249c4a4f9c8a946506fc896 files/digest-nvi-1.81.5-r5 235
+RMD160 ecceb3fd5a1c33ad0677f0b925835ae218353bcb files/digest-nvi-1.81.5-r5 235
+SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/digest-nvi-1.81.5-r5 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFJmgMwnQyISwouHwRAg4rAJ49H+XWXD2L8Gl7bUr6a8JyxBE0pACeKb9H
+CqLG8jQS5r84zxDdVPh66wc=
+=5+62
+-----END PGP SIGNATURE-----
diff --git a/app-editors/nvi/files/digest-nvi-1.81.5-r4 b/app-editors/nvi/files/digest-nvi-1.81.5-r4
deleted file mode 100644
index ebc8a212032c..000000000000
--- a/app-editors/nvi/files/digest-nvi-1.81.5-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5cc674f049054f3e8f7600df8d8d5cf4 nvi-1.81.5.tar.gz 1628555
-RMD160 d1cfd4a87250baea4832ed6cac69ed18e6880915 nvi-1.81.5.tar.gz 1628555
-SHA256 4c6b5c13999d8883da85e49e6dc2d02dddc084ac24fc72102cc372c5a0b7e745 nvi-1.81.5.tar.gz 1628555
diff --git a/app-editors/nvi/nvi-1.81.5-r4.ebuild b/app-editors/nvi/nvi-1.81.5-r4.ebuild
deleted file mode 100644
index cc9d94e0af38..000000000000
--- a/app-editors/nvi/nvi-1.81.5-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5-r4.ebuild,v 1.2 2006/10/01 15:56:03 truedfx Exp $
-
-inherit eutils
-
-DESCRIPTION="Vi clone"
-HOMEPAGE="http://www.bostic.com/vi/"
-SRC_URI="http://www.kotnet.org/~skimo/nvi/devel/${P}.tar.gz"
-
-LICENSE="Sleepycat"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ppc64"
-IUSE="perl unicode"
-
-DEPEND="=sys-libs/db-4*"
-RDEPEND="${DEPEND}
-	app-admin/eselect-vi"
-PROVIDE="virtual/editor"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	# Fix bug 23888
-	epatch "${FILESDIR}"/${P}-tcsetattr.patch
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P}-db4.patch
-	touch "${S}"/dist/{configure,aclocal.m4,Makefile.in,stamp-h.in}
-}
-
-src_compile() {
-	local myconf
-
-	use perl && myconf="${myconf} --enable-perlinterp"
-	use unicode && myconf="${myconf} --enable-widechar"
-
-	cd build.unix
-	ECONF_SOURCE=../dist econf \
-		--program-prefix=n \
-		${myconf} \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	cd build.unix
-	emake -j1 DESTDIR="${D}" install || die "install failed"
-}
-
-pkg_postinst() {
-	einfo "Setting /usr/bin/vi symlink"
-	eselect vi set "${PN}"
-}
-
-pkg_postrm() {
-	einfo "Updating /usr/bin/vi symlink"
-	eselect vi update
-}