No absolute paths in patches! Bug #219099.

Package-Manager: portage-2.1.4.4

3 files changed, 53 insertions, 36 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index f539a474ce57..95758b70b820 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.266 2008/04/24 00:20:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.267 2008/04/24 08:08:01 robbat2 Exp $
+
+  24 Apr 2008; Robin H. Johnson <robbat2@gentoo.org>
+  files/20080423-git-1.5.5.1-noperl.patch:
+  No absolute paths in patches! Bug #219099.
 
 *git-1.5.5.1 (24 Apr 2008)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 4782f623c8c5..3f60cc39aea3 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,5 +1,5 @@
 AUX 20080322-git-1.5.5.4-noperl.patch 11055 RMD160 a184a12108077bbb44ccce42da2b5f603fdc27d8 SHA1 1437ecf11405109d38fe63a4ab29fbed55eb0b60 SHA256 76c706775095987ca073bb0229c93d7a972d61ddebeed598fbba4bc15112a60f
-AUX 20080423-git-1.5.5.1-noperl.patch 11828 RMD160 1ed65870be9bae270947068061d29ad6b39132c9 SHA1 2f0cbd2c1f3a0ac046453570bed2207fda12a46b SHA256 2aab3d8410f63aa914ab14729ded976bb07a6fea70a729789ef2673ee1e838e1
+AUX 20080423-git-1.5.5.1-noperl.patch 10399 RMD160 dbe5bcfb2e6a6b924807cc2f9458c25c2e1a5399 SHA1 7ad957a4a6ae2414a3eea0ec491cbceb362d2000 SHA256 e681fcf677a141c81ef2e7460cb03b2f0d1fe346c175a1ebdc2323818f615c35
 AUX 70git-gentoo.el 88 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd SHA1 332f9cbf5a1dbb176e54646fa23aa140aee917f7 SHA256 7589206de5ea91e912e0332f7dc503689d348cb752e17ba84a724987c4bbe04a
 AUX 71git-gentoo.el 265 RMD160 c7284b9b210e631c91c4d5a6849e7e43be16d3c9 SHA1 da4a1ea75804fff4d54d34f072478e5ad1a49088 SHA256 930a56df44a3fc9ceb16304b7b53d87bc736708c1a34f4b46f21a128314b5066
 AUX 72git-gentoo.el 337 RMD160 644e711f842f0947592fbc9e58f9f3ea2f085229 SHA1 33d594c19a5f5e7147719b61573505076a3c4984 SHA256 b022fdc82776c869c8e573c154fb0ff9ac748f0b6f4fbcd2f28618e3b946412f
@@ -51,5 +51,5 @@ EBUILD git-1.5.4.4.ebuild 6565 RMD160 60bcf79bd993f95d038921fd8e83dc1289f5c958 S
 EBUILD git-1.5.4.5.ebuild 7849 RMD160 3bfae5d23c43cbd66221afbc5217c8a5babcd5ee SHA1 5bf00d81827a908d6349d4fdfba7bdb2926b191f SHA256 e4dbebf95303502da7fb800604a3f379afd06f873b1bf1d4123e6db0bd8c3a1c
 EBUILD git-1.5.4.ebuild 6565 RMD160 17d6172114dcbbc24d390b93fc9598318e0b4906 SHA1 3a7b86bacacb291fccdde45b7cd1832bc7cdda35 SHA256 8ba59eba4f2377e33302bf9830657c68f3c6fec3b600e234a5b1a4b36e0bee15
 EBUILD git-1.5.5.1.ebuild 7889 RMD160 8388e149d1a5ef9502e9ad2f653a544664f8e8c9 SHA1 0713f497e5ed9d210578bd51c8f04297aef57247 SHA256 9a4d3fa8cb2ba9ab10fe6a6932e4cced2deb6eeef9b60254efb1bd925b9aee18
-MISC ChangeLog 39386 RMD160 27e842b5d396593bc99c9fcea2d01cdaab70e8b0 SHA1 9d368725b848ce011a85ccdf1df0ced94fdf05ea SHA256 c2b8e5e79be520dc424112ae6f0a4c854a66f8af64b0de937e83943cafca6f84
+MISC ChangeLog 39528 RMD160 03f3c780be48969c16dd62f3fae6d9906032c1bc SHA1 568daa3f2a011d6a894161ecf6f30ac34bc0df08 SHA256 2efe9a395010108c925a2b6d5ac40bcb66c6ad30412f955225af1f270224fef9
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
diff --git a/dev-util/git/files/20080423-git-1.5.5.1-noperl.patch b/dev-util/git/files/20080423-git-1.5.5.1-noperl.patch
index 1fec6a704703..4f70c9122413 100644
--- a/dev-util/git/files/20080423-git-1.5.5.1-noperl.patch
+++ b/dev-util/git/files/20080423-git-1.5.5.1-noperl.patch
@@ -1,6 +1,19 @@
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/builtin-add.c /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/builtin-add.c
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/builtin-add.c	2008-04-20 15:17:13.000000000 -0700
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/builtin-add.c	2008-04-23 16:58:51.708575899 -0700
+Implement 95% of the NO_PERL functionality, to build Git without any Perl
+support, because some Gentoo users want a Git without any Perl whatesoever
+(Gentoo bug #214168).
+
+Remaining bits are doing configure.ac as well as git-remote usage in:
+t5502-quickfetch.sh
+t5512-ls-remote.sh
+t5520-pull.sh
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+Bugzilla-URL: http://bugs.gentoo.org/show_bug.cgi?id=214168
+Notes: Ported from 20080322-git-1.5.4.5-noperl.patch
+
+diff -Nuar git-1.5.5.1.orig/builtin-add.c git-1.5.5.1/builtin-add.c
+--- git-1.5.5.1.orig/builtin-add.c	2008-04-20 15:17:13.000000000 -0700
++++ git-1.5.5.1/builtin-add.c	2008-04-23 16:58:51.708575899 -0700
 @@ -135,6 +135,7 @@
          free(seen);
  }
@@ -41,9 +54,9 @@ diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/builtin-a
  
  	git_config(git_default_config);
  
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/builtin-commit.c /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/builtin-commit.c
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/builtin-commit.c	2008-04-20 15:17:13.000000000 -0700
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/builtin-commit.c	2008-04-23 17:00:04.672207334 -0700
+diff -Nuar git-1.5.5.1.orig/builtin-commit.c git-1.5.5.1/builtin-commit.c
+--- git-1.5.5.1.orig/builtin-commit.c	2008-04-20 15:17:13.000000000 -0700
++++ git-1.5.5.1/builtin-commit.c	2008-04-23 17:00:04.672207334 -0700
 @@ -97,7 +97,9 @@
  	OPT_GROUP("Commit contents options"),
  	OPT_BOOLEAN('a', "all", &all, "commit all changed files"),
@@ -68,9 +81,9 @@ diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/builtin-c
  
  	if (read_cache() < 0)
  		die("index file corrupt");
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/Makefile /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/Makefile
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/Makefile	2008-04-23 16:58:19.622327000 -0700
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/Makefile	2008-04-23 16:58:51.712091375 -0700
+diff -Nuar git-1.5.5.1.orig/Makefile git-1.5.5.1/Makefile
+--- git-1.5.5.1.orig/Makefile	2008-04-23 16:58:19.622327000 -0700
++++ git-1.5.5.1/Makefile	2008-04-23 16:58:51.712091375 -0700
 @@ -130,6 +130,8 @@
  #
  # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
@@ -189,9 +202,9 @@ diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/Makefile
  	$(MAKE) -C templates/ clean
  	$(MAKE) -C t/ clean
  ifndef NO_TCLTK
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/lib-git-svn.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/lib-git-svn.sh
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/lib-git-svn.sh	2008-04-20 15:17:13.000000000 -0700
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/lib-git-svn.sh	2008-04-23 16:58:51.712091375 -0700
+diff -Nuar git-1.5.5.1.orig/t/lib-git-svn.sh git-1.5.5.1/t/lib-git-svn.sh
+--- git-1.5.5.1.orig/t/lib-git-svn.sh	2008-04-20 15:17:13.000000000 -0700
++++ git-1.5.5.1/t/lib-git-svn.sh	2008-04-23 16:58:51.712091375 -0700
 @@ -6,6 +6,12 @@
  	test_done
  	exit
@@ -205,9 +218,9 @@ diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/lib-git
  
  GIT_DIR=$PWD/.git
  GIT_SVN_DIR=$GIT_DIR/svn/git-svn
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t5505-remote.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t5505-remote.sh
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t5505-remote.sh	2008-04-20 15:17:13.000000000 -0700
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t5505-remote.sh	2008-04-23 16:58:51.712091375 -0700
+diff -Nuar git-1.5.5.1.orig/t/t5505-remote.sh git-1.5.5.1/t/t5505-remote.sh
+--- git-1.5.5.1.orig/t/t5505-remote.sh	2008-04-20 15:17:13.000000000 -0700
++++ git-1.5.5.1/t/t5505-remote.sh	2008-04-23 16:58:51.712091375 -0700
 @@ -3,6 +3,12 @@
  test_description='git remote porcelain-ish'
  
@@ -221,9 +234,9 @@ diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t5505-r
  
  setup_repository () {
  	mkdir "$1" && (
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t7501-commit.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t7501-commit.sh
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t7501-commit.sh	2008-04-20 15:17:13.000000000 -0700
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t7501-commit.sh	2008-04-23 16:58:51.712091375 -0700
+diff -Nuar git-1.5.5.1.orig/t/t7501-commit.sh git-1.5.5.1/t/t7501-commit.sh
+--- git-1.5.5.1.orig/t/t7501-commit.sh	2008-04-20 15:17:13.000000000 -0700
++++ git-1.5.5.1/t/t7501-commit.sh	2008-04-23 16:58:51.712091375 -0700
 @@ -38,7 +38,7 @@
  	"echo King of the bongo >file &&
  	! git-commit -m foo -a file"
@@ -242,9 +255,9 @@ diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t7501-c
  	"interactive add" \
  	"echo 7 | git-commit --interactive | grep 'What now'"
  
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9001-send-email.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9001-send-email.sh
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9001-send-email.sh	2008-04-20 15:17:13.000000000 -0700
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9001-send-email.sh	2008-04-23 16:58:51.712091375 -0700
+diff -Nuar git-1.5.5.1.orig/t/t9001-send-email.sh git-1.5.5.1/t/t9001-send-email.sh
+--- git-1.5.5.1.orig/t/t9001-send-email.sh	2008-04-20 15:17:13.000000000 -0700
++++ git-1.5.5.1/t/t9001-send-email.sh	2008-04-23 16:58:51.712091375 -0700
 @@ -2,6 +2,12 @@
  
  test_description='git-send-email'
@@ -258,9 +271,9 @@ diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9001-s
  
  PROG='git send-email'
  test_expect_success \
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9200-git-cvsexportcommit.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9200-git-cvsexportcommit.sh
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9200-git-cvsexportcommit.sh	2008-04-20 15:17:13.000000000 -0700
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9200-git-cvsexportcommit.sh	2008-04-23 16:58:51.715484206 -0700
+diff -Nuar git-1.5.5.1.orig/t/t9200-git-cvsexportcommit.sh git-1.5.5.1/t/t9200-git-cvsexportcommit.sh
+--- git-1.5.5.1.orig/t/t9200-git-cvsexportcommit.sh	2008-04-20 15:17:13.000000000 -0700
++++ git-1.5.5.1/t/t9200-git-cvsexportcommit.sh	2008-04-23 16:58:51.715484206 -0700
 @@ -13,6 +13,12 @@
      test_done
      exit
@@ -274,9 +287,9 @@ diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9200-g
  
  CVSROOT=$(pwd)/cvsroot
  CVSWORK=$(pwd)/cvswork
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9400-git-cvsserver-server.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9400-git-cvsserver-server.sh
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9400-git-cvsserver-server.sh	2008-04-20 15:17:13.000000000 -0700
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9400-git-cvsserver-server.sh	2008-04-23 16:58:51.715484206 -0700
+diff -Nuar git-1.5.5.1.orig/t/t9400-git-cvsserver-server.sh git-1.5.5.1/t/t9400-git-cvsserver-server.sh
+--- git-1.5.5.1.orig/t/t9400-git-cvsserver-server.sh	2008-04-20 15:17:13.000000000 -0700
++++ git-1.5.5.1/t/t9400-git-cvsserver-server.sh	2008-04-23 16:58:51.715484206 -0700
 @@ -17,6 +17,12 @@
      test_done
      exit
@@ -290,9 +303,9 @@ diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9400-g
  perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
      test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' :
      test_done
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9500-gitweb-standalone-no-errors.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9500-gitweb-standalone-no-errors.sh
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9500-gitweb-standalone-no-errors.sh	2008-04-20 15:17:13.000000000 -0700
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9500-gitweb-standalone-no-errors.sh	2008-04-23 16:58:51.715484206 -0700
+diff -Nuar git-1.5.5.1.orig/t/t9500-gitweb-standalone-no-errors.sh git-1.5.5.1/t/t9500-gitweb-standalone-no-errors.sh
+--- git-1.5.5.1.orig/t/t9500-gitweb-standalone-no-errors.sh	2008-04-20 15:17:13.000000000 -0700
++++ git-1.5.5.1/t/t9500-gitweb-standalone-no-errors.sh	2008-04-23 16:58:51.715484206 -0700
 @@ -67,6 +67,13 @@
  }
  
@@ -307,9 +320,9 @@ diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9500-g
  
  perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || {
      test_expect_success 'skipping gitweb tests, perl version is too old' :
-diff -Nuar /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9600-cvsimport.sh /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9600-cvsimport.sh
---- /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1.orig/t/t9600-cvsimport.sh	2008-04-20 15:17:13.000000000 -0700
-+++ /dev/shm/portage/dev-util/git-1.5.5.1/work/git-1.5.5.1/t/t9600-cvsimport.sh	2008-04-23 16:58:51.715484206 -0700
+diff -Nuar git-1.5.5.1.orig/t/t9600-cvsimport.sh git-1.5.5.1/t/t9600-cvsimport.sh
+--- git-1.5.5.1.orig/t/t9600-cvsimport.sh	2008-04-20 15:17:13.000000000 -0700
++++ git-1.5.5.1/t/t9600-cvsimport.sh	2008-04-23 16:58:51.715484206 -0700
 @@ -15,6 +15,12 @@
  	test_done
  	exit