Add (masked until dependencies are keyworded) support for mediawiki, use subslot dependency on perl

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

7 files changed, 151 insertions, 27 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index ab738143de41..777c3422d79a 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/git
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.236 2013/12/18 12:19:15 polynomial-c Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.237 2014/01/04 22:35:55 dilfridge Exp $
+
+  04 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> git-1.8.5.2.ebuild,
+  +files/git-1.8.5-mw-destdir.patch, +files/git-1.8.5-mw-vendor.patch,
+  git-9999.ebuild, metadata.xml:
+  Add (masked until dependencies are keyworded) support for mediawiki, use
+  subslot dependency on perl
 
 *git-1.8.5.2 (18 Dec 2013)
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 4ec4b29849e0..e5890d63ceef 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -7,6 +7,8 @@ AUX git-1.7.12-optional-cvs.patch 11683 SHA256 4ffbbef802c60315740820491c25eaa57
 AUX git-1.8.2-optional-cvs.patch 11737 SHA256 37e092ca2dfa3ec216df568c1439acb3bdcc7366b75feb092f39642fc5894ce4 SHA512 7f914f16efee2f81a6f42a0e7ff1d72094bf032e98fa1a22f4b1e848eebf3a056ccdea1c84b24310cff4f19737b336d79a4f9c098a0ac4b0556e1a74708ef870 WHIRLPOOL d5e66fbfe0a6ae6c956ffb886d66c7a7906a3d60eac43b87d1e40206197f58d9aed54ee57cf5bb592147b7b9ac50fe50996f3b7e94161e5e308567c3a108cf43
 AUX git-1.8.2-texinfo.patch 515 SHA256 86d60eeae9a21fa64047401b80a5e082b0f306a68efab139979bc979fb31830f SHA512 9a9920f6b2d170f3ca71ae4c35cb001252e5f43e087f5b49f9aa617606fb3b7173aea5ef91c5d195b36bf1a1964e936d777797e03642a0da55a596e68c13a29c WHIRLPOOL 9e66c94c5eac4fe22f7cdd400c68893368a21550a5aadd467c53591e62bcf146d6a08db1e7a3cb8b32a45d5568c0b7a7462a0c6f8709ea35a284845a2c5e5820
 AUX git-1.8.4-optional-cvs.patch 11737 SHA256 7f8f1bd8f2953044433d90edea2bae7334e0d14ee7dc5e6e327e4caec8b0100b SHA512 2966582ccd5640c34aba156a955b458176ec2d450471279ec77200cbd1fb19f84dabc2a913fea17ae7503609074f8c80c05bb93f7244acfe296c078cf4a030ac WHIRLPOOL 07d5ab8ab60f6338ff1c9c7b8817938917ec12a5c360e595d7a40ffbbff18b439fea576c70dd4ddc7547edab23f4e86110f201c88be68e5a874d295f6051e592
+AUX git-1.8.5-mw-destdir.patch 1138 SHA256 4f9684b14b93ceae0426cf0ba9a3970c15f63fef8bb0f7179bbee81e7a41aa52 SHA512 dd782f6b408111fc10342973dc6afeb305a27cf7cdce85694bd6e73da55a6164076c7d08679cb148d9850769456f23e9f166c4c1686152ec276f9125a59f829a WHIRLPOOL aa84f8834c6867a33b1406b96ccdd8b4749af14ea7b615b7010dfc28d2b2e50e3846c249ec0675c3c829cd1117dd2e99659fa5d06a823519375ea07e5efddda1
+AUX git-1.8.5-mw-vendor.patch 1160 SHA256 e613f8874beec8d11644ad8d12c43cccb6585f96e99485d7d8ead6618321e8c0 SHA512 6513104f28eff36c18840f90e56fb21e8e04055e4e9a304ef15e5d7e1c13c8b45c4be0380b7781e776ce3b8ee9f7371ed2200e01174cc257125a613aef43ac9b WHIRLPOOL 6a5dcb28dc40590cf4e4b1369b0d770b40f1060bf933366f252edafbb9781f39d7f46dc218c16d429f507c7d5a9479bafce2df7309178071bcb782095809ed69
 AUX git-1.8.5-optional-cvs.patch 10088 SHA256 a35732c6d3bfbe62b298a730652a85f7deac6bdd59bd842b4dddedaa6ad0f1fb SHA512 f78f82af4e51002553157e61a16fb9855743acaa9cd9b9914e047eb3ff7f7fc4aa2d89e9c7f86fb6bf9d3f5854e44519c72669c6436132c728b28a4599d184f1 WHIRLPOOL f8080b56bff0c1add20d9c3c3e2b842e351029cae02e147307260a6504de4300d01262176c03203259037e6f98ffb043e1e1b4a914b1110d666b30383ead2e24
 AUX git-daemon.confd 712 SHA256 9bf02170dcf73e930a992adf44326ed7c27159d41a503ca4d9371861ee5030c9 SHA512 bf715ce0d3cd6a5be405d7739bc06252b95f93f9874716dadf666d33063be6ab3e37ae1ee253ed291bfb4f66df268b44d9653672851e1bb40112c0aae08fc4ea WHIRLPOOL 13643f53cd2f9675867ff194d680cd8ffe91bccbd0b15ae41b45471ec7310c09af8335619ff2a1562a835d8449eb44f9a9e9453c3ba15005763497c668d59181
 AUX git-daemon.initd 738 SHA256 48e7e1228c9811079dce8fecc560000cf645de5b4bb697f8f8ad3f906906330b SHA512 2b1cff1e1bf85db1674bd130639a7557fd4bb1ee2e9b2e7d1e2dc28274b6fa6c6c150acf37d0e652173980c640cb0f7ac36332012182955ecc4d21c6258bfd4d WHIRLPOOL c47dd7d0f3b183e14f3ca4e499b1ceef0b88f11675c7f6dee225516f062f556bfd41aa7f87d6cdf490411101ae541ab5fe173069dbfab6b1473a2b3d951ce901
@@ -37,25 +39,27 @@ EBUILD git-1.8.2.1.ebuild 17694 SHA256 e8e04cf2b65d526ae906b47f58e40960484cfc340
 EBUILD git-1.8.3.2-r1.ebuild 17614 SHA256 0fd06a9ea0c955ab1725f2482971fed6a474c195d642e87c73a49a2f75f8f536 SHA512 84607b181d6dbafe087c380b309f80425de3905d3a34a97d5605b1bed1c59b50ffd27e0aad79410aeca66a342ed784724aa65bea91b11d169f64b098d2cf0f5a WHIRLPOOL 4d769be71a9cc83d592a6fc947a15f99018363028e50ccede7f653e54b8403b5365e32cafcd40ab0f57e21cf6dc1d58f9b5f7394113067612bb7efd3540b2512
 EBUILD git-1.8.4.5.ebuild 17847 SHA256 3b68c33ddab44a4dfe05e21607b172e1da00f9f67c5d6264725720752ba9dffa SHA512 0446ba1e7177d4daecc745d035241a5251f9229c232ff20e03d68304f8a8f5aa60e405786f4350d731a499bc8222a76017626c76eb4cee207f7a06370cba7a6c WHIRLPOOL 070e2b58bff6845e047d3ec2325fc2aa384837da2d1fffd970796fa7aa14a2884bd09901ad4cdfc0caafead3c4fc7e85d28a1f9432bcccdd339974650a79b48b
 EBUILD git-1.8.5.1.ebuild 17840 SHA256 5d6826836fd8efbf665fb1aff413a79a42004aa13a39e7869387012d945dcb07 SHA512 8594acea9e9e68fc519fb36f48747169a9b956fc95f0dcf382e4edc49f7745dcb731d9ab425b0fca56a8523f7b3d0f5bee87251bb0615318026a2056c61fe813 WHIRLPOOL 949dcf5016e6955997c6c02326c67f92120d38de7fb22359bacd04e330fdcd43737ecda5bd4605edf235c046525742ceefd4b21790615f7b0d4e72c6441d8db9
-EBUILD git-1.8.5.2.ebuild 17840 SHA256 3f823bc81f12c15312ecc249a3b45a0860fa90d780b4f2e6e8bae3c4db9cdc2e SHA512 789fcbcd05a5dee35fedabb79b1e7e316f20f45b86db201b5322641b08d98913ff507f43ddaf6d184774e4afe9e7e0086f0eace216de4ac2c13edcd47b171d01 WHIRLPOOL b42b88a9cc444215b4b316268341082e510b16cdd66068d0aaf55491f416e6fb074eb118216799fdd6669846792aac002ed5c5bebab886d43170cfb83fc8158f
-EBUILD git-9999.ebuild 17803 SHA256 beae98898e2f9554f9f3f3be3a30130c9c9efcc7da5314b8e49aec16756f8463 SHA512 d34ce325189f1d597fac71f67a59e90fa6dc9721d86c567101b64448e3a21080ccff2f38f36956b03307af1418941103567a8398dfd4aa676813b4eb24c27674 WHIRLPOOL 8e0daa447d9d3c51727a0fd43db37285969b7beff0b4a6e77ecba652c4829391527a3b28753aaf92c29d146c87c7d15e91c112cde0de61ccfe2e583ffe8781e0
-MISC ChangeLog 10664 SHA256 e9358a3b1c6fa8cd9afae1aedd99dd4f5b07be5dc08fbd6553c5ccbe93bb79e6 SHA512 8e11e667bb147587827b35c4aeb0f8c15c15335d56f6dbeb9acebe38ad36ef8ad2a2adb6f1728a72a4c1da34e1272a96ff0f0c2f8ed3273adb8970f3f8f01c69 WHIRLPOOL b974e583fcca40f5b4e9bdac256794f7222573717b403fe5e9d56cdd0f5603f2e82807fd55cb8a63d2ea6226f016ea8256c5a6a714464eb0793f16d70b7c1c94
+EBUILD git-1.8.5.2.ebuild 18329 SHA256 fcd8dfd5cad91e618756154811060987597b2399fc79caa04d73b116eadaf813 SHA512 7f9bb6631cbcdb8de172de2b3ceda96a95ad408bd88765512cafc51c00baf1924216af2615d458f37f26eaaeaac8fc0db498553bbcc512c0dd7b2fbb63e2cd2f WHIRLPOOL aa7ee69cd5ffb03b040601770093881993399e1731e965ba2ea35bd0eb59a29c3a22d6bf37307da48107f206d1cc1426b19e804b3aaa8cc4a0c484c0be179116
+EBUILD git-9999.ebuild 18178 SHA256 457c2939cd06272fec4fd647b912099d13c3217cd3cdaf8e92c09a026bde31f2 SHA512 7ddf4bccd18e959b360ec1e05b4125b9ef9238e19a4fa04d6d22909f81c1e133ed4a245fbd4ed5101920226a87ba9a3192b137380159d7cec99eabc4a4f1dab3 WHIRLPOOL 9f1635f9174f58497a7108552b05e9e524fc325c4f504fef12c8ae4d44f6c74e60100a72d97e76c8c71e339f2b3c8254668a2709e851436116e11b376c4e76f3
+MISC ChangeLog 10947 SHA256 4e2046bb57b8f2bdb8d88411d06934d504f0d744f4aab2abf0276542f367237e SHA512 5a393dfe6047aed1d4a9dd1d17b5d2097ad7fd0cbf1c04b7fe9658d140ca198c3a179576f7be0a91cd7c55f98740d1d2dc25f7f3ac995f8fa9f99ad30c436e89 WHIRLPOOL 50e16e4259cfb36a73d91b5d98a3ee893e222f4f7e729c0fbda23a07447b2b4da8b87bbe1b1d35f0631636d4e1de65ffc66b775516b289fe6911ed7ed83de144
 MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
-MISC metadata.xml 1876 SHA256 6b8a45678bfb4c0c7db85f5d6e94c4fc68ee2d8ed5ef6c83855ff3d6998b0773 SHA512 084b1be894ce30dd443cda711d120d6a436fafe59e4cd04a5879dbe88f17b9a7d5061377ed4cbd2c3cbd2f0d43ac168994e83368b3890b2135f63fa4fb935efa WHIRLPOOL 4051958b34b2c1aedc82e856de3554483eaa88ab4f5b43a9c1394aaa2bc925ca02edc13ca38c8379b947154249d4279fa227706b09776ee79a7b054f8e722d19
+MISC metadata.xml 1953 SHA256 42ceaecde578b4f37102ef4ab2412d4b75dd3f1a429bb65c38acb40d6ef0d638 SHA512 dac3b6be740607dcada598d35cd18b26f729a561a362fe7486ce58879bcc78a771e2e2b4275d42067b3c014e958191002906ce11008ee34b4456f163a36d8471 WHIRLPOOL 1cdfeb1cd560d167b0e044e3f47e9134bf9206fb3dd143b70a1c43fdcf524651ba94f838503f194e2895c98e4bab54c2adc68913fb024633da75cc5d1bc6ad48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSsZLFAAoJEPiazRVxLXTFMHQP/RaiJ9FbpF51tg2XwTtH6wkP
-PJJOueMKQs6A1X0RWa21GPzWFBPR0WUFFb3N84aC5RmXufbBaq6xxe1zggwScjI3
-8CPriALPBuH+K9GbOsz83Acx00Ah/ZrYLyuHC84wlPx6jjaWtYIT4PNCp+qJCCGJ
-JNFzWFeuvC6vMW6/cDZMCTp8xmL2jtr42YTDsHIqQUYLiNKkBSzWPVt93ZgVQhuU
-hvGTOWHOlIimZaloGmw6uZNQmyEDTsbH31lRWjJ24xIPL0zyHq0C12pF+s0YRR6Y
-UYqiEL8uvC1JesMSdVbgZsjRVNR1gCbEei9hDK0MsnUGDC/A8M6IYWE2eGn0RKBb
-lrzKP7znPyQQ4o0+fEAXSMh6r6xAL1JTsshflZRHa4TaoJ05/Rn2y3ja9DvoLWBf
-Yl5xAZSxBCOWf1r5dTTNhg3kZzERAUalCRF2lfkUFGw309BBe1Hxm3mvjK3zIN5D
-0dKi9kLXRjCFzuqxiPrxvXaogqf6Hu1ViiLGpbeg3GmCTU/qDob32YGjxBveCMBG
-O4qh5E88h85bhV1CFQqm0xCqhjQHZIcO2rtg1p0vQlsBO0oP5zqK+7aNc5KZLpKC
-CzoGGE0F7mi39rE3B0jvadKiwkXp7fZU+CWqFJTq33U5+N/qMTbbyRU6wNo8kNi/
-XUmmCCYFFnz6Y2KoVCZd
-=Syiu
+iQJ8BAEBCABmBQJSyI0VXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcE54QAKWX8Ao/xjukvWTMK7iRJ0nQ
+blTl5wxzxHmMbh8PkBESRuc/ZDzxQeSH/ZomBb4ZX/NKy9SD+cL16c2tIGill3cr
+c9ZgWM/Z59gl3AyJU0EiVHPNkARDXyuB5hHVP0nIkrRyWRVBKIKTlU5Gfb7+icwr
+xmZS2AoVSgzUsRhawD+A54qwDIUQTCJtNCDpoIOQHEz5uVQ8w/hgAtTH1G8Etm9Z
++jd/wEfH9tNdbwJMeGKQlK73erf3vBof7vyY5u2L+HsEU6KWJTVspjbg4C9M2CjC
+WSEOKHih2WBCMm4f1DmldVV6dxS591aUpmtB17EmlcSPUfUye7ekpslzc+mf6WcB
+PPeO8cQWwJsG7xYl8z+A5EmIWfDwPN898W3MJ0VqY4g+ZkTPB8lE/ul3U84zi42I
+5ehGrsk4NuoI5WMUukS4gojgJ+EhloKCcTBg7wT83A63yJvLmw9DaF3k7ktPHwT1
+Z7zLkU99Yacbnv+waAq6vv+jVwuO7bmzURqtPj2aO6Jf7MPC46lp631Bj3ahnLUV
+RtJcOEiroHDaztRCaDnTuUpkZJ6jL2TSS8BPDwFH06d9MF0lJH/ed9P7mKl0EQYn
+9g36kNftQx7hKsabfSYpeuv7SzIHqjBC1YcmAJCeUv7w+WzV2+XmhycJtcsxOIs4
+yiMTGxqiNkNTMAv/W9cM
+=DSbo
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/files/git-1.8.5-mw-destdir.patch b/dev-vcs/git/files/git-1.8.5-mw-destdir.patch
new file mode 100644
index 000000000000..ea4f1758059f
--- /dev/null
+++ b/dev-vcs/git/files/git-1.8.5-mw-destdir.patch
@@ -0,0 +1,37 @@
+diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
+index f206f96..a4b6f7a 100644
+--- a/contrib/mw-to-git/Makefile
++++ b/contrib/mw-to-git/Makefile
+@@ -18,9 +18,13 @@ SCRIPT_PERL+=git-mw.perl
+ GIT_ROOT_DIR=../..
+ HERE=contrib/mw-to-git/
+ 
++INSTALL = install
++
+ SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
+ INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
+                 -s --no-print-directory instlibdir)
++DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
++INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
+ 
+ all: build
+ 
+@@ -30,7 +34,9 @@ test: all
+ check: perlcritic test
+ 
+ install_pm:
+-	install $(GIT_MEDIAWIKI_PM) $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)
++	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/Git'
++	$(INSTALL) -m 644 $(GIT_MEDIAWIKI_PM) \
++		'$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/$(GIT_MEDIAWIKI_PM)'
+ 
+ build:
+ 	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
+@@ -43,7 +49,6 @@ install: install_pm
+ clean:
+ 	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
+                 clean-perl-script
+-	rm $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)
+ 
+ perlcritic:
+ 	perlcritic -5 $(SCRIPT_PERL)
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 000000000000..54302ef26c91
--- /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 048f393a4764..eed3e55c1982 100644
--- a/dev-vcs/git/git-1.8.5.2.ebuild
+++ b/dev-vcs/git/git-1.8.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.2.ebuild,v 1.1 2013/12/18 12:19:16 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.2.ebuild,v 1.2 2014/01/04 22:35:55 dilfridge Exp $
 
 EAPI=5
 
@@ -40,14 +40,14 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
 	dev-libs/openssl
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl[-build(-)] )
+	perl? ( dev-lang/perl:=[-build(-)] )
 	tk? ( dev-lang/tk )
 	curl? (
 		net-misc/curl
@@ -58,6 +58,7 @@ CDEPEND="
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
+	mediawiki? ( dev-perl/MediaWiki-API )
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
@@ -100,6 +101,7 @@ S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
+	mediawiki? ( perl )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
@@ -222,6 +224,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 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):' \
@@ -329,6 +338,11 @@ src_compile() {
 	cd "${S}"/contrib/subtree
 	git_emake
 	use doc && git_emake doc
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake
+	fi
 }
 
 src_install() {
@@ -390,6 +404,12 @@ src_install() {
 	dodoc git-subtree.txt
 	cd "${S}"
 
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake install
+		cd "${S}"
+	fi
+
 	# git-diffall
 	dobin contrib/diffall/git-diffall
 	newdoc contrib/diffall/README git-diffall.txt
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 4d4ee50fc370..ddf19afb635c 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.50 2013/12/11 10:27:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.51 2014/01/04 22:35:55 dilfridge Exp $
 
 EAPI=5
 
@@ -40,14 +40,14 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
 	dev-libs/openssl
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl[-build(-)] )
+	perl? ( dev-lang/perl:=[-build(-)] )
 	tk? ( dev-lang/tk )
 	curl? (
 		net-misc/curl
@@ -58,6 +58,7 @@ CDEPEND="
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
+	mediawiki? ( dev-perl/MediaWiki-API )
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
@@ -100,6 +101,7 @@ S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
+	mediawiki? ( perl )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
@@ -222,6 +224,10 @@ src_prepare() {
 	# bug #350330 - automagic CVS when we don't want it is bad.
 	epatch "${FILESDIR}"/git-1.8.5-optional-cvs.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):' \
@@ -329,6 +335,11 @@ src_compile() {
 	cd "${S}"/contrib/subtree
 	git_emake
 	use doc && git_emake doc
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake
+	fi
 }
 
 src_install() {
@@ -390,6 +401,12 @@ src_install() {
 	dodoc git-subtree.txt
 	cd "${S}"
 
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake install
+		cd "${S}"
+	fi
+
 	# git-diffall
 	dobin contrib/diffall/git-diffall
 	newdoc contrib/diffall/README git-diffall.txt
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml
index 106f3a85dabe..6f4d4eeaa37f 100644
--- a/dev-vcs/git/metadata.xml
+++ b/dev-vcs/git/metadata.xml
@@ -33,6 +33,7 @@
     <flag name="gpg">Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime!</flag>
     <flag name="gtk">Include the gitview contrib tool</flag>
     <flag name="highlight">GitWeb support for app-text/highlight</flag>
+    <flag name="mediawiki">Support pulling and pushing from MediaWiki</flag>
     <flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag>
     <flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag>
     <flag name="webdav">Adds support for push'ing to HTTP/HTTPS repositories via DAV</flag>