Use Debian's patches

(Portage version: 2.1.1_pre3-r3)

7 files changed, 35 insertions, 44 deletions

diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog
index a27384d89aaf..4dcf7071f401 100644
--- a/app-editors/nvi/ChangeLog
+++ b/app-editors/nvi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/nvi
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.24 2006/07/23 10:50:14 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.25 2006/07/23 12:04:12 truedfx Exp $
+
+  23 Jul 2006; Harald van Dijk <truedfx@gentoo.org>
+  files/nvi-1.79-build.patch, nvi-1.79.ebuild:
+  Use debian's patches to avoid crashes and other bad news
 
 *nvi-1.79 (23 Jul 2006)
 
diff --git a/app-editors/nvi/files/digest-nvi-1.79 b/app-editors/nvi/files/digest-nvi-1.79
index 796ce0673594..25c54f50adc3 100644
--- a/app-editors/nvi/files/digest-nvi-1.79
+++ b/app-editors/nvi/files/digest-nvi-1.79
@@ -1,3 +1,6 @@
 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.5 b/app-editors/nvi/files/digest-nvi-1.81.5
index 38945f51da60..ebc8a212032c 100644
--- a/app-editors/nvi/files/digest-nvi-1.81.5
+++ b/app-editors/nvi/files/digest-nvi-1.81.5
@@ -1 +1,3 @@
 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-r1 b/app-editors/nvi/files/digest-nvi-1.81.5-r1
index 38945f51da60..ebc8a212032c 100644
--- a/app-editors/nvi/files/digest-nvi-1.81.5-r1
+++ b/app-editors/nvi/files/digest-nvi-1.81.5-r1
@@ -1 +1,3 @@
 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
index 38945f51da60..ebc8a212032c 100644
--- a/app-editors/nvi/files/digest-nvi-1.81.5-r2
+++ b/app-editors/nvi/files/digest-nvi-1.81.5-r2
@@ -1 +1,3 @@
 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/nvi-1.79-build.patch b/app-editors/nvi/files/nvi-1.79-build.patch
index 66bccf756506..ae2c14edc445 100644
--- a/app-editors/nvi/files/nvi-1.79-build.patch
+++ b/app-editors/nvi/files/nvi-1.79-build.patch
@@ -1,6 +1,14 @@
 --- nvi-1.79/build/Makefile.in
 +++ nvi-1.79/build/Makefile.in
-@@ -75,7 +75,7 @@
+@@ -60,7 +60,6 @@
+ ln=	@vi_cv_path_ln@
+ mkdir=	@vi_cv_path_mkdir@
+ rm=	@vi_cv_path_rm@
+-strip=	@vi_cv_path_strip@
+ 
+ prefix=	@prefix@
+ bindir=	@bindir@
+@@ -75,26 +74,15 @@
  transform=@program_transform_name@
  
  install: all install_common
@@ -9,9 +17,9 @@
  	[ -d $(bindir) ] || \
  	    ($(mkdir) $(bindir) && $(chmod) $(dmode) $(bindir))
  	cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
-@@ -83,41 +83,16 @@
- 	cd $(bindir) && [ -f $(strip) ] && \
- 	    $(strip) `echo vi | sed '$(transform)'`
+ 	$(cp) nvi $(bindir)/`echo vi | sed '$(transform)'`
+-	cd $(bindir) && [ -f $(strip) ] && \
+-	    $(strip) `echo vi | sed '$(transform)'`
  	cd $(bindir) && $(chmod) $(emode) `echo vi | sed '$(transform)'`
 -	cd $(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
 -	cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
@@ -25,18 +33,10 @@
 -	    ($(mkdir) $(mandir)/cat1 && $(chmod) $(dmode) $(mandir)/cat1)
  	@echo "Installing man pages: $(mandir) ..."
 -	cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
--	$(cp) $(srcdir)/docs/USD.doc/vi.man/vi.0 \
--	    $(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
--	cd $(mandir)/cat1 && $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
--	cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
--	cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
--	cd $(mandir)/cat1 && $(ln) \
--	    `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
--	cd $(mandir)/cat1 && $(ln) \
--	    `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
- 	[ -d $(mandir)/man1 ] || \
- 	    ($(mkdir) $(mandir)/man1 && $(chmod) $(dmode) $(mandir)/man1)
- 	cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
+ 	#$(cp) $(srcdir)/docs/USD.doc/vi.man/vi.0 \
+ 	    #$(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
+ 	#cd $(mandir)/cat1 && $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
+@@ -110,12 +98,6 @@
  	$(cp) $(srcdir)/docs/USD.doc/vi.man/vi.1 \
  	    $(mandir)/man1/`echo vi.1 | sed '$(transform)'`
  	cd $(mandir)/man1 && $(chmod) $(fmode) `echo vi.1 | sed '$(transform)'`
@@ -47,29 +47,5 @@
 -	cd $(mandir)/man1 && $(ln) \
 -	    `echo vi.1 | sed '$(transform)'` `echo view.1 | sed '$(transform)'`
  
--cat=	dutch english french german ru_SU.KOI8-R spanish swedish
+ cat=	dutch english french german ru_SU.KOI8-R spanish swedish
  install_common:
- 	[ -f $(chmod) ]
- 	[ -f $(cp) ]
-@@ -132,21 +107,6 @@
- 	    ($(mkdir) $(datadir) && $(chmod) $(dmode) $(datadir))
- 	$(rm) -rf $(datadir)/vi
- 	$(mkdir) $(datadir)/vi && $(chmod) $(dmode) $(datadir)/vi
--	@echo "Installing message catalogs: $(datadir)/vi/catalog ..."
--	$(mkdir) $(datadir)/vi/catalog && \
--	    $(chmod) $(dmode) $(datadir)/vi/catalog
--	(cd $(srcdir)/catalog && $(cp) $(cat) $(datadir)/vi/catalog && \
--	    cd $(datadir)/vi/catalog && $(chmod) $(fmode) *)
--	@echo "Installing Perl scripts: $(datadir)/vi/perl ..."
--	$(mkdir) $(datadir)/vi/perl && $(chmod) $(dmode) $(datadir)/vi/perl
--	[ -f VI.pm ] && $(cp) VI.pm $(datadir)/vi/perl && \
--	    cd $(datadir)/vi/perl && $(chmod) $(fmode) VI.pm)
--	(cd $(srcdir)/perl_scripts && $(cp) *.pl $(datadir)/vi/perl && \
--	    cd $(datadir)/vi/perl && $(chmod) $(fmode) *.pl)
--	@echo "Installing Tcl scripts: $(datadir)/vi/tcl ..."
--	$(mkdir) $(datadir)/vi/tcl && $(chmod) $(dmode) $(datadir)/vi/tcl
--	(cd $(srcdir)/tcl_scripts && $(cp) *.tcl $(datadir)/vi/tcl && \
--	    cd $(datadir)/vi/tcl && $(chmod) $(fmode) *.tcl)
- 	@echo "Installing recover script: $(datadir)/vi/recover ..."
- 	($(cp) recover $(datadir)/vi/recover && \
- 	    $(chmod) $(emode) $(datadir)/vi/recover)
diff --git a/app-editors/nvi/nvi-1.79.ebuild b/app-editors/nvi/nvi-1.79.ebuild
index 8a41f0883eab..bf43a577ec06 100644
--- a/app-editors/nvi/nvi-1.79.ebuild
+++ b/app-editors/nvi/nvi-1.79.ebuild
@@ -1,12 +1,13 @@
 # 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.1 2006/07/23 10:50:14 truedfx Exp $
+# $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"
+SRC_URI="ftp://ftp.sleepycat.com/pub/${P}.tar.gz
+	mirror://debian/pool/main/n/${PN}/${P/-/_}-24.diff.gz"
 
 LICENSE="Sleepycat"
 SLOT="0"
@@ -21,6 +22,7 @@ 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