[gentoo-commits] dev/dilfridge:master commit in: dev-vcs/git/, dev-vcs/git/files/

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     a6594332f39a00e43ebb6b5b81c1c2e1eeb8e8a6
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  4 21:20:57 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 21:20:57 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=a6594332

[dev-vcs/git] hacked support for vendor_dir

Package-Manager: portage-2.2.7

---
 dev-vcs/git/files/git-1.8.5-mw-vendor.patch | 39 +++++++++++++++++++++++++++++
 dev-vcs/git/git-1.8.5.2.ebuild              |  6 ++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

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
new file mode 100644
index 0000000..54302ef
--- /dev/null
+++ b/dev-vcs/git/files/git-1.8.5-mw-vendor.patch
@@ -0,0 +1,39 @@
+diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
+index a4b6f7a..d83df2c 100644
+--- a/contrib/mw-to-git/Makefile
++++ b/contrib/mw-to-git/Makefile
+@@ -22,7 +22,7 @@ INSTALL = install
+ 
+ SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
+ INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
+-                -s --no-print-directory instlibdir)
++                -s --no-print-directory instvendorlibdir)
+ DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
+ INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
+ 
+diff --git a/perl/Makefile b/perl/Makefile
+index 15d96fc..91348c6 100644
+--- a/perl/Makefile
++++ b/perl/Makefile
+@@ -12,7 +12,7 @@ ifndef V
+ 	QUIET = @
+ endif
+ 
+-all install instlibdir: $(makfile)
++all install instlibdir instvendorlibdir: $(makfile)
+ 	$(QUIET)$(MAKE) -f $(makfile) $@
+ 
+ clean:
+diff --git a/perl/Makefile.PL b/perl/Makefile.PL
+index 3f29ba9..c0b3508 100644
+--- a/perl/Makefile.PL
++++ b/perl/Makefile.PL
+@@ -17,6 +17,8 @@ sub MY::postamble {
+ 	return <<'MAKE_FRAG';
+ instlibdir:
+ 	@echo '$(INSTALLSITELIB)'
++instvendorlibdir:
++	@echo '$(INSTALLVENDORLIB)'
+ 
+ ifneq (,$(DESTDIR))
+ ifeq (0,$(shell expr '$(MM_VERSION)' '>' 6.10))

diff --git a/dev-vcs/git/git-1.8.5.2.ebuild b/dev-vcs/git/git-1.8.5.2.ebuild
index 0c54ae5..9232939 100644
--- a/dev-vcs/git/git-1.8.5.2.ebuild
+++ b/dev-vcs/git/git-1.8.5.2.ebuild
@@ -223,9 +223,13 @@ src_prepare() {
 	# bug #350330 - automagic CVS when we don't want it is bad.
 	epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch
 
-	# honor and correctly quote DISTDIR (from git master)
+	# honor and correctly quote DISTDIR (from upstream git master)
 	epatch "${FILESDIR}"/git-1.8.5-mw-destdir.patch
 
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
 	sed -i \
 		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
 		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \