QA: Fix patches so that they don't use ../ .

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

6 files changed, 26 insertions, 20 deletions

diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog
index d3850e9b172f..8417f232115c 100644
--- a/app-editors/nvi/ChangeLog
+++ b/app-editors/nvi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/nvi
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.86 2011/09/01 21:53:59 neurogeek Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.87 2012/06/17 22:37:23 flameeyes Exp $
+
+  17 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  files/nvi-1.81.6-db.patch, files/nvi-1.81.6-db44.patch,
+  files/nvi-1.81.6-perl-as-needed.patch, files/nvi-1.81.6-perl-shortnames.patch,
+  nvi-1.81.6-r3.ebuild:
+  QA: Fix patches so that they don't use ../ .
 
   01 Sep 2011; Jesus Rivero <neurogeek@gentoo.org> nvi-1.81.6-r3.ebuild:
   Added sys-libs/ncurses to DEPEND wrt bug #381025
diff --git a/app-editors/nvi/files/nvi-1.81.6-db.patch b/app-editors/nvi/files/nvi-1.81.6-db.patch
index 6fc9926c0364..a8b721951270 100644
--- a/app-editors/nvi/files/nvi-1.81.6-db.patch
+++ b/app-editors/nvi/files/nvi-1.81.6-db.patch
@@ -1,5 +1,5 @@
---- ../common/exf.c
-+++ ../common/exf.c
+--- common/exf.c
++++ common/exf.c
 @@ -228,13 +228,18 @@
  		/*
  		 * XXX
diff --git a/app-editors/nvi/files/nvi-1.81.6-db44.patch b/app-editors/nvi/files/nvi-1.81.6-db44.patch
index d247c02b9915..7385137a68c8 100644
--- a/app-editors/nvi/files/nvi-1.81.6-db44.patch
+++ b/app-editors/nvi/files/nvi-1.81.6-db44.patch
@@ -1,8 +1,8 @@
 
   First part is from http://cvsweb.se.netbsd.org/cgi-bin/bsdweb.cgi/pkgsrc/editors/nvi/patches/patch-aa?rev=1.3;content-type=text/plain
 
---- ../common/db.h
-+++ ../common/db.h
+--- common/db.h
++++ common/db.h
 @@ -16,7 +16,10 @@
      (env)->remove(env, path, NULL, flags)
  #endif
@@ -15,8 +15,8 @@
  #define db_open(db,file,type,flags,mode)				\
      (db)->open(db, NULL, file, NULL, type, flags, mode)
  #else
---- ../common/msg.c
-+++ ../common/msg.c
+--- common/msg.c
++++ common/msg.c
 @@ -724,7 +724,8 @@
  		p = buf;
  	} else
diff --git a/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch b/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch
index 86f9883e6ce8..01117491ec4f 100644
--- a/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch
+++ b/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch
@@ -1,5 +1,5 @@
---- ../dist/configure.in
-+++ ../dist/configure.in
+--- dist/configure.in
++++ dist/configure.in
 @@ -105,7 +105,7 @@
  
  dnl A/UX has a broken getopt(3), strpbrk(3).
@@ -72,8 +72,8 @@
  "other RE")
  	;;
  esac
---- ../dist/Makefile.am
-+++ ../dist/Makefile.am
+--- dist/Makefile.am
++++ dist/Makefile.am
 @@ -169,12 +169,15 @@
  	$(visrcdir)/common/pthread.c \
  	$(visrcdir)/common/vi_auto.c \
diff --git a/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch b/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch
index 3b2de789b5b4..88e1829e78d6 100644
--- a/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch
+++ b/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch
@@ -1,5 +1,5 @@
---- ../perl_api/perlsfio.c
-+++ ../perl_api/perlsfio.c
+--- perl_api/perlsfio.c
++++ perl_api/perlsfio.c
 @@ -32,6 +32,7 @@
  /* perl redefines them
   * avoid warnings
@@ -8,8 +8,8 @@
  #undef USE_DYNAMIC_LOADING
  #undef DEBUG
  #undef PACKAGE
---- ../perl_api/perl.xs
-+++ ../perl_api/perl.xs
+--- perl_api/perl.xs
++++ perl_api/perl.xs
 @@ -38,6 +38,7 @@
  /* perl redefines them
   * avoid warnings
diff --git a/app-editors/nvi/nvi-1.81.6-r3.ebuild b/app-editors/nvi/nvi-1.81.6-r3.ebuild
index 48af891082dd..553e0168b940 100644
--- a/app-editors/nvi/nvi-1.81.6-r3.ebuild
+++ b/app-editors/nvi/nvi-1.81.6-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r3.ebuild,v 1.13 2011/09/01 21:53:59 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r3.ebuild,v 1.14 2012/06/17 22:37:23 flameeyes Exp $
 
 EAPI=1
 
@@ -48,12 +48,12 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}" || die
+	cd ${P}
 	epatch "${FILESDIR}"/${P}-db44.patch
 	epatch "${FILESDIR}"/${P}-db.patch
 	epatch "${FILESDIR}"/${P}-perl-as-needed.patch
 	epatch "${FILESDIR}"/${P}-perl-shortnames.patch
-	cd ../dist || die
+	cd dist || die
 	chmod +x findconfig || die
 	append-flags -I"$(db_includedir ${DBSLOTS})"
 	sed -i -e "s@-ldb@-l$(db_libname ${DBSLOTS})@" configure.in || die