Handle files with long lines with DB 4.3 (#174547); remove older versions

(Portage version: 2.1.2.3)

14 files changed, 33 insertions, 236 deletions

diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog
index 2c641710463a..49c9e7af9171 100644
--- a/app-editors/nvi/ChangeLog
+++ b/app-editors/nvi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/nvi
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.49 2007/03/21 16:11:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.50 2007/04/14 09:03:56 truedfx Exp $
+
+*nvi-1.81.5-r7 (14 Apr 2007)
+
+  14 Apr 2007; Harald van Dijk <truedfx@gentoo.org>
+  files/nvi-1.81.5-db4.patch, -nvi-1.79.ebuild, -nvi-1.81.4.ebuild,
+  -nvi-1.81.5.ebuild, -nvi-1.81.5-r1.ebuild, -nvi-1.81.5-r2.ebuild,
+  -nvi-1.81.5-r6.ebuild, +nvi-1.81.5-r7.ebuild:
+  Handle files with long lines with DB 4.3 (#174547); remove older versions
 
   21 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> nvi-1.81.5-r5.ebuild:
   Stable on alpha wrt bug #170745.
diff --git a/app-editors/nvi/files/digest-nvi-1.79 b/app-editors/nvi/files/digest-nvi-1.79
deleted file mode 100644
index 25c54f50adc3..000000000000
--- a/app-editors/nvi/files/digest-nvi-1.79
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 765e2153f5fc4f21793f2edc2647305a nvi-1.79.tar.gz 1295401
-RMD160 1c39d480e0d30a87fc061c3219354b50011a8621 nvi-1.79.tar.gz 1295401
-SHA256 755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33 nvi-1.79.tar.gz 1295401
-MD5 1c47843539d225bc4ee72cbf55e2d2eb nvi_1.79-24.diff.gz 13563
-RMD160 b25aa937fa685eba92dfaa53bfddb4163b2ce82e nvi_1.79-24.diff.gz 13563
-SHA256 2917a9a58f3595cf26e4388a8f967498948a93d6e9955841b472ffc1cfa7b508 nvi_1.79-24.diff.gz 13563
diff --git a/app-editors/nvi/files/digest-nvi-1.81.4 b/app-editors/nvi/files/digest-nvi-1.81.4
deleted file mode 100644
index 4599378e0eac..000000000000
--- a/app-editors/nvi/files/digest-nvi-1.81.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5826bdceb43cb3787ee89ef57de033f6 nvi-1.81.4.tar.gz 1514011
-RMD160 7c5f9aca3b1fbce3fa71873b4827dc5685e8afeb nvi-1.81.4.tar.gz 1514011
-SHA256 3d5a1fcccd246dad4650081336767b43ca47f25dcbb4c7cc8496a4fd5d3f33f1 nvi-1.81.4.tar.gz 1514011
diff --git a/app-editors/nvi/files/digest-nvi-1.81.5-r1 b/app-editors/nvi/files/digest-nvi-1.81.5-r1
deleted file mode 100644
index ebc8a212032c..000000000000
--- a/app-editors/nvi/files/digest-nvi-1.81.5-r1
+++ /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/files/digest-nvi-1.81.5-r2 b/app-editors/nvi/files/digest-nvi-1.81.5-r2
deleted file mode 100644
index ebc8a212032c..000000000000
--- a/app-editors/nvi/files/digest-nvi-1.81.5-r2
+++ /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/files/digest-nvi-1.81.5-r6 b/app-editors/nvi/files/digest-nvi-1.81.5-r6
deleted file mode 100644
index ebc8a212032c..000000000000
--- a/app-editors/nvi/files/digest-nvi-1.81.5-r6
+++ /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/files/digest-nvi-1.81.5 b/app-editors/nvi/files/digest-nvi-1.81.5-r7
index ebc8a212032c..ebc8a212032c 100644
--- a/app-editors/nvi/files/digest-nvi-1.81.5
+++ b/app-editors/nvi/files/digest-nvi-1.81.5-r7
diff --git a/app-editors/nvi/files/nvi-1.81.5-db4.patch b/app-editors/nvi/files/nvi-1.81.5-db4.patch
index d6191cb501f2..18e25d59abd2 100644
--- a/app-editors/nvi/files/nvi-1.81.5-db4.patch
+++ b/app-editors/nvi/files/nvi-1.81.5-db4.patch
@@ -132,6 +132,29 @@
  # Check whether --enable-re or --disable-re was given.
  if test "${enable_re+set}" = set; then
    enableval="$enable_re"
+--- nvi-1.81.5/common/db.c
++++ nvi-1.81.5/common/db.c
+@@ -175,7 +175,7 @@
+ 	data.ulen = ep->c_blen;
+ 	data.flags = DB_DBT_USERMEM;
+ 	switch (ep->db->get(ep->db, NULL, &key, &data, 0)) {
+-	case ENOMEM:
++	case DB_BUFFER_SMALL:
+ 		nlen = data.size;
+ 		goto retry;
+         default:
+--- nvi-1.81.5/common/db.h
++++ nvi-1.81.5/common/db.h
+@@ -1,5 +1,9 @@
+ #include <db.h>
+ 
++#ifndef DB_BUFFER_SMALL
++#define DB_BUFFER_SMALL ENOMEM
++#endif
++
+ #ifdef USE_DYNAMIC_LOADING
+ #define db_create   	nvi_db_create
+ #define db_env_create   nvi_db_env_create
 --- nvi-1.81.5/common/exf.c
 +++ nvi-1.81.5/common/exf.c
 @@ -282,7 +282,7 @@
diff --git a/app-editors/nvi/nvi-1.79.ebuild b/app-editors/nvi/nvi-1.79.ebuild
deleted file mode 100644
index bf43a577ec06..000000000000
--- a/app-editors/nvi/nvi-1.79.ebuild
+++ /dev/null
@@ -1,61 +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.79.ebuild,v 1.2 2006/07/23 12:04:12 truedfx Exp $
-
-inherit eutils
-
-DESCRIPTION="Vi clone"
-HOMEPAGE="http://www.bostic.com/vi/"
-SRC_URI="ftp://ftp.sleepycat.com/pub/${P}.tar.gz
-	mirror://debian/pool/main/n/${PN}/${P/-/_}-24.diff.gz"
-
-LICENSE="Sleepycat"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ppc64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!app-editors/vim
-	!app-editors/gvim"
-PROVIDE="virtual/editor"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${DISTDIR}"/${P/-/_}-24.diff.gz
-	epatch "${FILESDIR}"/${P}-build.patch
-	# Fix bug 23888
-	epatch "${FILESDIR}"/${PN}-1.81.5-tcsetattr.patch
-}
-
-src_compile() {
-	cd build
-	econf --program-prefix=n \
-		--disable-curses \
-		--disable-re \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	cd build
-	einstall || die "install failed"
-}
-
-pkg_postinst() {
-	[[ ! -e "${ROOT}"/usr/bin/vi ]] &&
-		ln -sf nvi "${ROOT}"/usr/bin/vi
-	[[ ! -e "${ROOT}"/usr/bin/ex ]] &&
-		ln -sf nvi "${ROOT}"/usr/bin/ex
-	[[ ! -e "${ROOT}"/usr/bin/view ]] &&
-		ln -sf nvi "${ROOT}"/usr/bin/view
-}
-
-pkg_postrm() {
-	[[ -L "${ROOT}"/usr/bin/vi && ! -f "${ROOT}"/usr/bin/vi ]] &&
-		rm -f "${ROOT}"/usr/bin/vi
-	[[ -L "${ROOT}"/usr/bin/ex && ! -f "${ROOT}"/usr/bin/ex ]] &&
-		rm -f "${ROOT}"/usr/bin/ex
-	[[ -L "${ROOT}"/usr/bin/view && ! -f "${ROOT}"/usr/bin/view ]] &&
-		rm -f "${ROOT}"/usr/bin/view
-}
diff --git a/app-editors/nvi/nvi-1.81.4.ebuild b/app-editors/nvi/nvi-1.81.4.ebuild
deleted file mode 100644
index 3cd46c654cf7..000000000000
--- a/app-editors/nvi/nvi-1.81.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.4.ebuild,v 1.18 2005/02/10 15:03:29 ciaranm Exp $
-
-DESCRIPTION="Vi clone"
-SRC_URI="http://www.kotnet.org/~skimo/nvi/devel/${P}.tar.gz"
-HOMEPAGE="http://www.bostic.com/vi/"
-
-SLOT="0"
-LICENSE="Sleepycat"
-KEYWORDS="x86 ppc sparc"
-IUSE=""
-
-DEPEND=">=sys-libs/db-3.1"
-RDEPEND="${DEPEND} !app-editors/vim"
-
-PROVIDE="virtual/editor"
-
-src_compile() {
-	cd build.unix
-	../dist/configure \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--host=${CHOST} || die
-	emake || die
-}
-
-src_install() {
-	cd ${S}/build.unix
-	einstall
-}
diff --git a/app-editors/nvi/nvi-1.81.5-r1.ebuild b/app-editors/nvi/nvi-1.81.5-r1.ebuild
deleted file mode 100644
index 83a29e376712..000000000000
--- a/app-editors/nvi/nvi-1.81.5-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.11 2005/02/10 15:03:29 ciaranm Exp $
-
-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"
-IUSE=""
-
-DEPEND="virtual/libc
-	=sys-libs/db-3.2*"
-RDEPEND="${DEPEND} !app-editors/vim"
-PROVIDE="virtual/editor"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	sed -e 's|-ldb|-ldb-3.2|g' -e 's|libdb-3|libdb-3.2|g' -i ${S}/dist/configure
-}
-
-src_compile() {
-	local myconf=""
-	export LIBS="-lpthread"
-	export ADDCPPFLAGS="-I/usr/include/db3"
-	cd build.unix
-	../dist/configure \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--host=${CHOST} \
-		${myconf} || die "configure failed"
-	einfo "Doing make now"
-	emake || die "emake failed"
-}
-
-src_install() {
-	cd ${S}/build.unix
-	einstall || die
-}
diff --git a/app-editors/nvi/nvi-1.81.5-r2.ebuild b/app-editors/nvi/nvi-1.81.5-r2.ebuild
deleted file mode 100644
index b4a85ab4fac1..000000000000
--- a/app-editors/nvi/nvi-1.81.5-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 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-r2.ebuild,v 1.10 2005/02/10 15:03:29 ciaranm 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=""
-
-DEPEND="virtual/libc
-	=sys-libs/db-3.2*"
-RDEPEND="${DEPEND} !app-editors/vim"
-PROVIDE="virtual/editor"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e 's|-ldb|-ldb-3.2|g' -e 's|libdb-3|libdb-3.2|g' dist/configure \
-		|| die "sed failed"
-	# Fix bug 23888
-	epatch ${FILESDIR}/${P}-tcsetattr.patch || die "epatch failed"
-}
-
-src_compile() {
-	local myconf=""
-	export LIBS="-lpthread"
-	export ADDCPPFLAGS="-I/usr/include/db3"
-	cd build.unix
-	../dist/configure \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--host=${CHOST} \
-		${myconf} || die "configure failed"
-	einfo "Doing make now"
-	emake || die "emake failed"
-}
-
-src_install() {
-	cd ${S}/build.unix
-	einstall || die
-}
diff --git a/app-editors/nvi/nvi-1.81.5-r6.ebuild b/app-editors/nvi/nvi-1.81.5-r7.ebuild
index 3f29816701d4..c7345211d0b9 100644
--- a/app-editors/nvi/nvi-1.81.5-r6.ebuild
+++ b/app-editors/nvi/nvi-1.81.5-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r6.ebuild,v 1.2 2007/03/17 23:10:23 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5-r7.ebuild,v 1.1 2007/04/14 09:03:56 truedfx Exp $
 
 inherit eutils
 
diff --git a/app-editors/nvi/nvi-1.81.5.ebuild b/app-editors/nvi/nvi-1.81.5.ebuild
deleted file mode 100644
index 7d18bb7a1f7e..000000000000
--- a/app-editors/nvi/nvi-1.81.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 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.ebuild,v 1.15 2005/02/10 15:03:29 ciaranm Exp $
-
-DESCRIPTION="Vi clone"
-HOMEPAGE="http://www.bostic.com/vi/"
-SRC_URI="http://www.kotnet.org/~skimo/nvi/devel/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Sleepycat"
-KEYWORDS="x86 ppc ~sparc hppa alpha"
-IUSE=""
-
-DEPEND="=sys-libs/db-3*
-	!>=sys-libs/db-4"
-RDEPEND="${DEPEND} !app-editors/vim"
-
-PROVIDE="virtual/editor"
-
-src_compile() {
-	cd build.unix
-	../dist/configure \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--host=${CHOST} || die
-	emake || die
-}
-
-src_install() {
-	cd ${S}/build.unix
-	einstall
-}