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

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

7 files changed, 40 insertions, 30 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/Manifest b/app-editors/nvi/Manifest
index 98f829fc3744..0c77543a3223 100644
--- a/app-editors/nvi/Manifest
+++ b/app-editors/nvi/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX nvi-1.81.6-db.patch 692 RMD160 d97df499f98db3b7c1fd5a36b889fa1bb4e68ced SHA1 792444962a85f707f43b05083e725edbac687c58 SHA256 6d780ddce5963b6a6f0e8db40f903668849ac1daa6cacf2011a43177e4f06d52
-AUX nvi-1.81.6-db44.patch 998 RMD160 a5a91404a22a06b3160d63dd8ad9ddb71a3a384b SHA1 116a870972480867ff916164fc26f5a6afd43342 SHA256 89b6ca0631c4f1df351c8000da17b5c5ca094bbcf704372b0333d37580b50998
-AUX nvi-1.81.6-perl-as-needed.patch 2811 RMD160 f55e43fb03beac7a0021ed7ff1d04ba30c1a33e1 SHA1 2e22341ada5300527961f56409513e9afe25d986 SHA256 fdd1fbd6e78f6def03d8be9781c72d1ffe853f86510bf80f7ab616790c19d645
-AUX nvi-1.81.6-perl-shortnames.patch 388 RMD160 d803b6490ec6e539d6057913eac55ef6a5ae76d3 SHA1 2e11f167c7b3c4022593067c23b1d3f4d907ade2 SHA256 95655b83c8d5b0feaa13bffa51951e95765884d3f85d231b979b1782cff9cf65
+AUX nvi-1.81.6-db.patch 686 RMD160 7e782f78b9c8716cca8a77e1ab6b5aa28bddde5e SHA1 b9805836edd7703534f6c8aaf57931338cfbc6ea SHA256 4d39930b1b3f84bb047dccc5629105379088255d2e1fbc3fad4b9f39376c6471
+AUX nvi-1.81.6-db44.patch 986 RMD160 ba5a85fc7455be9f095281a91725d92a2c174499 SHA1 8cde004a032d945c5981071bd8906d9495b1c196 SHA256 efeadcf1efaef3d9f9f7dc8881f79d922016c3ae17d5705ecb8101dec2d025cc
+AUX nvi-1.81.6-perl-as-needed.patch 2799 RMD160 167cc5161258d791af92ad4f2167a921dfbffdd8 SHA1 55091fc043e667e51f8c4772b26c6be964f6c301 SHA256 87d8cb928bc5260f5800f3e467ad02176d5a9211c81f5051f118d37e4a1877d5
+AUX nvi-1.81.6-perl-shortnames.patch 376 RMD160 3053e3a0faed258da67fd4a99e3e3c86d1d83aed SHA1 b66cd475ebcf2fd4f1a227c16518c3a1d7c2c9fd SHA256 a2fd1baec1d9efa2b201abd1705c667e4764a50917b2f2bcf7391b899b18b3ec
 DIST nvi-1.81.6.tar.bz2 1758309 RMD160 0db8568bea96392d9a027044177c60317c8ade36 SHA1 d3445ed69166102735335a2ff60d092d9a9143c6 SHA256 3441b8e3247b2b6dd19b5fd38355fe6593b2a92e960ecb3dd00d676f63d06b59
-EBUILD nvi-1.81.6-r3.ebuild 2322 RMD160 4bd21ea8c45b446e502bc5d0ca1f3c7af8126ec1 SHA1 dea47969b95def566d995894b0aafd723948ee02 SHA256 1f5852e187efa0d03e47225dd4942234b165858a4679351c55970b2dbbc40a69
-MISC ChangeLog 11931 RMD160 c902c442ba6c92d3b4b75871263a301520653dc0 SHA1 bc9703f7d614fe65ac033ab2938339ef8597fe97 SHA256 76f5cf1f3203a3e4b0c29a8c95c03ae2587fd42f7d102d408bfc8ca7720b160d
+EBUILD nvi-1.81.6-r3.ebuild 2310 RMD160 558a2964ca51bea035019cd9ca4a554433b22c3c SHA1 8250db92aab964c5e44ab5eeb1afa0b8ce3fefae SHA256 5c12de417528658a00acd2ed02d2719274677ae1f7c245225212c539d246d377
+MISC ChangeLog 12198 RMD160 9209ed6a525253e037356c1f57932e640cde7e1d SHA1 5ce8eed96853755c50233898eccc0013a610cf44 SHA256 439b9504de4d06efb03e54124d2d6071ff0e81aa6cef097e7791d82c4531a089
 MISC metadata.xml 234 RMD160 80e8434ae820ec31635f7b286ef9e024619d17d3 SHA1 780c45e4bc81cccbf3a00da2ed73a4fc079c25c7 SHA256 02f0cc57d2e1027d594d1686ac8f5d9cb992854b3e895beb7bd4c16d67cb90e9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk5f/wAACgkQdIssYB9vBoNtCwCfUqmVQ8TkUxO3xHlZ33jy7c/x
-/9sAn2dLLDJBFAkUoqBIb3UdWHuKO90/
-=byIw
+iQEcBAEBAgAGBQJP3ly9AAoJEBzRPIrUMBNCqS8H/jroZvmGZKDXLhllHneNf0M4
+2wCLfSYF6VeGsg2uYO27j8T4mDQYdP9v4HZi35CKkJ1EGJPrnXepPqeBRliYij/s
+STSjXjaGzjTjXxJD4Xv4FfFhV8N9YWqPjbR41MebdSoYrrd58lPXyTmQgr2u+j5q
+6ys2KjiWmZxyfBAp59MXYh7B8sFqA81JY4HIiwu7GZ/II2mcoWF6n6PEwzZ8Qyx2
+fc2MCXtmT+M4nJRRO1F4tqyIv7N8T4KP1VNCu8g6XbKSu1p9FDZwon/JWlzrepBG
+4tJ/YKlIEmf73FXN6ELvCNrdVbS9v3ESvJV+q1iAMitvKgrk9Sdm9qZkfe7J1hQ=
+=+sDl
 -----END PGP SIGNATURE-----
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