| 1 |
commit: a6594332f39a00e43ebb6b5b81c1c2e1eeb8e8a6 |
| 2 |
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 4 21:20:57 2014 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 4 21:20:57 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=a6594332 |
| 7 |
|
| 8 |
[dev-vcs/git] hacked support for vendor_dir |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.7 |
| 11 |
|
| 12 |
--- |
| 13 |
dev-vcs/git/files/git-1.8.5-mw-vendor.patch | 39 +++++++++++++++++++++++++++++ |
| 14 |
dev-vcs/git/git-1.8.5.2.ebuild | 6 ++++- |
| 15 |
2 files changed, 44 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-vcs/git/files/git-1.8.5-mw-vendor.patch b/dev-vcs/git/files/git-1.8.5-mw-vendor.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..54302ef |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-vcs/git/files/git-1.8.5-mw-vendor.patch |
| 22 |
@@ -0,0 +1,39 @@ |
| 23 |
+diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile |
| 24 |
+index a4b6f7a..d83df2c 100644 |
| 25 |
+--- a/contrib/mw-to-git/Makefile |
| 26 |
++++ b/contrib/mw-to-git/Makefile |
| 27 |
+@@ -22,7 +22,7 @@ INSTALL = install |
| 28 |
+ |
| 29 |
+ SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL)) |
| 30 |
+ INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \ |
| 31 |
+- -s --no-print-directory instlibdir) |
| 32 |
++ -s --no-print-directory instvendorlibdir) |
| 33 |
+ DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) |
| 34 |
+ INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR)) |
| 35 |
+ |
| 36 |
+diff --git a/perl/Makefile b/perl/Makefile |
| 37 |
+index 15d96fc..91348c6 100644 |
| 38 |
+--- a/perl/Makefile |
| 39 |
++++ b/perl/Makefile |
| 40 |
+@@ -12,7 +12,7 @@ ifndef V |
| 41 |
+ QUIET = @ |
| 42 |
+ endif |
| 43 |
+ |
| 44 |
+-all install instlibdir: $(makfile) |
| 45 |
++all install instlibdir instvendorlibdir: $(makfile) |
| 46 |
+ $(QUIET)$(MAKE) -f $(makfile) $@ |
| 47 |
+ |
| 48 |
+ clean: |
| 49 |
+diff --git a/perl/Makefile.PL b/perl/Makefile.PL |
| 50 |
+index 3f29ba9..c0b3508 100644 |
| 51 |
+--- a/perl/Makefile.PL |
| 52 |
++++ b/perl/Makefile.PL |
| 53 |
+@@ -17,6 +17,8 @@ sub MY::postamble { |
| 54 |
+ return <<'MAKE_FRAG'; |
| 55 |
+ instlibdir: |
| 56 |
+ @echo '$(INSTALLSITELIB)' |
| 57 |
++instvendorlibdir: |
| 58 |
++ @echo '$(INSTALLVENDORLIB)' |
| 59 |
+ |
| 60 |
+ ifneq (,$(DESTDIR)) |
| 61 |
+ ifeq (0,$(shell expr '$(MM_VERSION)' '>' 6.10)) |
| 62 |
|
| 63 |
diff --git a/dev-vcs/git/git-1.8.5.2.ebuild b/dev-vcs/git/git-1.8.5.2.ebuild |
| 64 |
index 0c54ae5..9232939 100644 |
| 65 |
--- a/dev-vcs/git/git-1.8.5.2.ebuild |
| 66 |
+++ b/dev-vcs/git/git-1.8.5.2.ebuild |
| 67 |
@@ -223,9 +223,13 @@ src_prepare() { |
| 68 |
# bug #350330 - automagic CVS when we don't want it is bad. |
| 69 |
epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch |
| 70 |
|
| 71 |
- # honor and correctly quote DISTDIR (from git master) |
| 72 |
+ # honor and correctly quote DISTDIR (from upstream git master) |
| 73 |
epatch "${FILESDIR}"/git-1.8.5-mw-destdir.patch |
| 74 |
|
| 75 |
+ # install mediawiki perl modules also in vendor_dir |
| 76 |
+ # hack, needs better upstream solution |
| 77 |
+ epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch |
| 78 |
+ |
| 79 |
sed -i \ |
| 80 |
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ |
| 81 |
-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ |
Archives