No absolute paths in patches! Bug #219099.

(Portage version: 2.1.4.4)

2 files changed, 51 insertions, 34 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/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