Attempt to fix startup of git-daemon as non-root user (bug #460370). Added sys-devel/gettext to DEPEND when nls USE flag is enabled

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

11 files changed, 58 insertions, 59 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index ec153b467d17..9a65234b41e0 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.244 2014/02/06 08:41:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.245 2014/02/07 07:59:03 polynomial-c Exp $
+
+  07 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> git-1.8.1.5.ebuild,
+  git-1.8.1.5-r1.ebuild, git-1.8.2.1.ebuild, git-1.8.3.2-r1.ebuild,
+  git-1.8.4.5.ebuild, git-1.8.5.3.ebuild, git-1.8.5.4.ebuild, git-9999.ebuild,
+  files/git-daemon-r1.initd:
+  Attempt to fix startup of git-daemon as non-root user (bug #460370). Added
+  sys-devel/gettext to DEPEND when nls USE flag is enabled.
 
 *git-1.8.5.4 (06 Feb 2014)
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index c8e24d28ad0e..e637efc5a604 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -9,7 +9,7 @@ AUX git-1.8.4-optional-cvs.patch 11737 SHA256 7f8f1bd8f2953044433d90edea2bae7334
 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-r1.initd 467 SHA256 9c88269c88e961b1ad2688b6074dcb54c95447bd994a2d23b06eebb7fd7010ee SHA512 f82ed9bd95ea2a646f71131ea0adf023580236ba0fa0462d304e4a1b767c86fd2c0ae83955c33be244db36f2e72c2bb0084df63a2ee538828efbc9d0905aec23 WHIRLPOOL e38b1f40b3c7e1db81ae3fdc4985b9bf113a3f95ae1dbbdd402d2e5f56dc51564a46d3b807a969e2a2fd87a9ab881ce7aa696e980ce1e3ede4c5c0e3d56f222c
+AUX git-daemon-r1.initd 452 SHA256 fe51fee8e56a5bd2c1821454f5743e16c74283a6d1e0914b6198e82be2a637cf SHA512 23473a6b64e0483d62e65e2ea8d5dd341700199d8a843fd64db88115cb1120b1159a14ae5a5bafe5c482bb9aadd8eae073ee40b0e3a761d4e1d67df2eeb53991 WHIRLPOOL 3de8980015aa29e6495655651fa71e4e88f0536a4caa789f1d54be82043fd9f7ef285cb6e48314ebcd1b1dc9acf58ced644ba9d393dd3505f3faf7836eb22597
 AUX git-daemon.confd 712 SHA256 9bf02170dcf73e930a992adf44326ed7c27159d41a503ca4d9371861ee5030c9 SHA512 bf715ce0d3cd6a5be405d7739bc06252b95f93f9874716dadf666d33063be6ab3e37ae1ee253ed291bfb4f66df268b44d9653672851e1bb40112c0aae08fc4ea WHIRLPOOL 13643f53cd2f9675867ff194d680cd8ffe91bccbd0b15ae41b45471ec7310c09af8335619ff2a1562a835d8449eb44f9a9e9453c3ba15005763497c668d59181
 AUX git-daemon.initd 738 SHA256 48e7e1228c9811079dce8fecc560000cf645de5b4bb697f8f8ad3f906906330b SHA512 2b1cff1e1bf85db1674bd130639a7557fd4bb1ee2e9b2e7d1e2dc28274b6fa6c6c150acf37d0e652173980c640cb0f7ac36332012182955ecc4d21c6258bfd4d WHIRLPOOL c47dd7d0f3b183e14f3ca4e499b1ceef0b88f11675c7f6dee225516f062f556bfd41aa7f87d6cdf490411101ae541ab5fe173069dbfab6b1473a2b3d951ce901
 AUX git-daemon.socket 116 SHA256 66a064b67e441306bf765d3d3115ac55bafa2098400af134f852d4aecf8608d7 SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701 WHIRLPOOL 1098e46b6d2be3c8d758a087408aed91e0c01625542dfc90fbff80ed8b40d2a54ea4ab45b4d003ef0b0b8ed1411e1146a58076b68096389412a61fe2d09214dd
@@ -33,31 +33,31 @@ DIST git-manpages-1.8.3.2.tar.gz 542769 SHA256 599bc8f6c56986a994a237cfebb53b4fa
 DIST git-manpages-1.8.4.5.tar.gz 565177 SHA256 8cf38e3a48425fe74c4a71286633ea895bd03d32481ea5112e9682a6adb3b4bf SHA512 6f9d56da7493ae50275f259ca65649a4dbada3a3d0e32e0a418ed73c2e2661c90f23cfe9a62800cbceec1db86a2bb7b93eccaaf28c282cb5046c2aea3f928774 WHIRLPOOL 1f92c6437214f9d8d998a916cf34399be4f49a5c2dd5fe930850ae3b7ef10da66594c8d4544fa313b485bdcfd9259322c5ba0b83f9403263c80d12b19ca8c5f0
 DIST git-manpages-1.8.5.3.tar.gz 569620 SHA256 3e9d63bad149c9cf795710815db85efda579b262680c24c5ac6e2b7444e12f53 SHA512 5376b3e77bb5e8d4f7bc44c3aa3bdc1510ea39da4d69f658de0faade2522079a0af7d55afc4ebfc10bc6c6ef5769a158e841aad54b91b23f8422f7bf5c69f166 WHIRLPOOL 3b39844be5ead048cbd2ba7911bee728bb21fdb48e0b4c55a49f5175efbfa0dc8104a85cf3e3d6827cf5f486002d90fb44adb08baa6c0f5ec9fa00c7d1e4cf2d
 DIST git-manpages-1.8.5.4.tar.gz 568942 SHA256 bc4e733e9b4833e5bae36f35ea4d0de1005f138f2bc15542179f58b59af0827c SHA512 5f9b8326e5180219dddf00149fc2b59e35b0524c564b760eccf8c8ef2c4fcb527010e132013c5c7043ccd8c84a29fbd43bf9aca7cf5d7b87271cd3ef05a3fb4c WHIRLPOOL 5dcc39b427267b2a1298dcbccefca7a068826bac6f37013dd7a28644cf092520277535f1e6cb43ff7085d0eb168742560989ff78a3eaf4f9d5c97d6e597969c1
-EBUILD git-1.8.1.5-r1.ebuild 17171 SHA256 1080aba41baf4614813a728bdbca5b7d98669b55a60bebc723ea2dd4cdd286b4 SHA512 62550d788e20e9cff45504c97a5c1013eecb90f3152925d6583f548bf94aa1fbd6616ef37d07e35e4f8b2e9af6560be5f3dd1a61a00831b00789298d9e2e86d6 WHIRLPOOL f723df541ca5be8f003a94064a4fcd8feb3b8de29ae5981d53fc24d561c9f4ce7918f29c8a14976d332050f6f43bbbf6da54faa34d0571c83e643d6f5ce3f2c2
-EBUILD git-1.8.1.5.ebuild 17031 SHA256 c81ff14cf88f8b86c7ea8a3d84829315460e17f654f7dd216ba213e8c4e1da58 SHA512 b1e89bb2b5adc5e7f619e768d31e371e68f04c5d7836b7d9d22e33aae785edcfd190033ea98595a7ce80710b942f4f511a7c5bd1835969b840ed6b7e3a30f665 WHIRLPOOL 3064a56be927b339a73e1f641acdb77222e0eaab1652934e620752b74eb98f324e81113a1ba434fe239c56ed092d637ba4b14d933b53395ff5ff6ea287e99cd7
-EBUILD git-1.8.2.1.ebuild 17487 SHA256 0fa72d2c096ef3505dde4bcd364b79cfa89469bc3676bc41353800c895be82cd SHA512 a89e79f347feb9cce64d05d5b71898d76728f6f856cc12164a3083af83e69337af793fca50d75fdf6850991a50bbfab77308acd0d77066272d3f9e4e9b00bf3f WHIRLPOOL 30605f908611f1b1a5650774f4f23fb91df1dba9e02ba737cead541ee6882a5defd7238c1933934c78054c0855621d2da23dbc9f4450102015edb30b9bbcc2eb
-EBUILD git-1.8.3.2-r1.ebuild 17610 SHA256 4a6bac60d8b6c2c26a815c7ff43cbf901fbdd65a918aabeef5073ec9abf8bd0b SHA512 f3e904e99819a4c1a559fef18b842db7fe2026e5fde6a9fe54057a7b21390a616a7efc209b4dbe321eade607f71c748eca0288a7e228b3e87c8fea222f2cbc20 WHIRLPOOL 48b2f86c988cda8e72de801a8ff691173bbae80cf1fee0a7d218463f00edeec57b43d2c7176d5847b08acd36e0232403db2eedb73fea38483a6ea37531c2b563
-EBUILD git-1.8.4.5.ebuild 17914 SHA256 8c65b61768bc1e357efee01b7c1159505a9670ed50e764f9fb5502f4bdc74f43 SHA512 42a97233223af2b2dff012be290700eeb90a692f75228d10313b88e78644739d941ef6e679550541be46dccd8212d8ffad71416e7fbbb8d47ff5f67cc8f7c580 WHIRLPOOL 3984bba232b052949a0ca158085959a4f39679ca562c0154eb7dc286a6921476536aae3f7e590340ec7dddde8ae80f91068d51817db3443592ea39fab706c041
-EBUILD git-1.8.5.3.ebuild 18423 SHA256 0d9c906bae21e853fe2454966489644f746693ec4ae87ce872baf122b3166cfc SHA512 d0c8e8c22a6ea791a64a1440ab4637d1ff5e581eb8ab098aeb5a3a230f50e6376f2e30505e53161bb941ba2cfa02b96855323bff922081b03cdb913662a8be29 WHIRLPOOL 4a0b7f54ed1aeb5bc0566ed41e685a43d86c4e98979b56b36340ccf860b20c3685d18f49227eee6799a0ec1589ba5480bbf8ccffaa0ad5d1d0d833edd28272ab
-EBUILD git-1.8.5.4.ebuild 18423 SHA256 dfe1e5330da2f047e69aaacee30e42c64bc8a68491ca13dfab40ab0b4208a184 SHA512 2b3d1f134d326aff3d271fb031ed891319eb29cf8c23fe493051bc1a4741753f72e9099b30045d1924d1c3ec18272689479e329e54a46507e67e5f38765cd528 WHIRLPOOL fb34c41f8e49015ad46759f9e1b75c1329640928fdf242ae4477bb637727a3a07d022034b44271d486ec4fb0f44eddb9556f5fbb42ae1379d8b250ad8f7218aa
-EBUILD git-9999.ebuild 18272 SHA256 26f5eeec0f191fe9074614e26340bc139ffb405bab4edbde8afa7ae0768d85e3 SHA512 2ff35afe84f1b7a2183dacf0ca3337072b6979fbeb4596ee22025100792b4d25817b832a88b9b65240a758f5e6e398bcc58c93ebfbf0f1f8d2ee695c598665f2 WHIRLPOOL e2fb03dd57a06f464e5c7938720963396cbf286946c626c28a686d32d7df709dcc34b51d4fe2d2b625f874b0526ef057b15465769c461855b054996aa2bd84b4
-MISC ChangeLog 12242 SHA256 54c4252d98640b4dc3aa6e2c50f70ef8364f919bf419bcf242b248c0c3052562 SHA512 35ac0edfb750d70cc2300e352ced2a610e3579d7a2a656e4cbe144ac2ddef16e4ed0c0070cf9f172f6d22effcda902b8bc73e5687cfc886b3502a98985a01e65 WHIRLPOOL 6c691d28c797b48e314f5f9aac3540abd30edf7578b8a9196ccc3a4c482b373b7ac19e88d7250c9ed104dec2e30b116c920dd14a186c5284d3f4f287bb83169c
+EBUILD git-1.8.1.5-r1.ebuild 17197 SHA256 206c79b652d25b4c3f5cbae75b12b852e97e24a4be55c7fd5d6a828ca8e1ce01 SHA512 d6cf74a4327bd6f78b55879a33564d1e9c3233184b5671e8ffccf4b8e35cfd4f9671c8ca383e65d7c9a2ef3bdc646a8cf5582599fb0d9fdad499f08874d4eb96 WHIRLPOOL 104955d39305e9d5e4c184da054e446377e767181737758796074e6cbfda5dd089e26a9718ead81dbd097f7858ab4d902fea0ac83598b6528bc462d42ea8eea0
+EBUILD git-1.8.1.5.ebuild 17056 SHA256 e8a6128228d3dcfa4113e89a2ff72f079321418c2103059e6b86396366bc2feb SHA512 470ec138ba8338da1e4e511304d75c67f32e945d6be8adb00303af558e45e32a5605e85adedf2c4e05d7bb8a7aea9b4bfa6693c0836ed4459efefb95a02159c6 WHIRLPOOL 0af431b0816f25b4ffdb934b353fe79d9be03379a862a040621adc985f7d576b3e254d2a9a55a5a61b14dd4863ce2b4a5561da430a265530760d56cd5a89ffce
+EBUILD git-1.8.2.1.ebuild 17512 SHA256 d0fddbaad76a34ef3cd3f8b356a3d750c24f729156c81cb1cbb4c326a5d2b6d4 SHA512 9a7a31b259320869c07ec21750e8876b679923dd63d25a68bf7a1553a4a6a7fec6a166626ff78b409ce90ea0771561b6e61ed3ab4db41b26313a4a36506c28e8 WHIRLPOOL 4213d45028055d89844d8160031ae7bbf051321942332a7ac9e10f19959c2366c39ee1718a61072649f5474bdfbe89b6ee38c183f400de16540c87e3f24bebd4
+EBUILD git-1.8.3.2-r1.ebuild 17641 SHA256 b72b48b74757308f11fa16afa14d58b68f1dba56aba3eddc07b84d3e29978218 SHA512 8de313dff6abdfedcb54293e5af8b271b39cde9d949ea06a7090e0b046b0a9a0c343cedd2ca47713f7fdcaf94abd7a0ed2b8d3a6cca329dd9250fde286c37f07 WHIRLPOOL 30f51572d904709cd6fbd98348c694bc873a8bb29449daa991a7750fdae4d6cb5f2dc044234209fea7b8e32432c4d6646e7d889d4c21cea9d5802e72c5ae2a60
+EBUILD git-1.8.4.5.ebuild 17939 SHA256 d313fc01d096c23107de80aeb512baf362135d56d99d3ecc753dcddeeeac0f57 SHA512 fe65a8fc2d439f56f332f860e40a5e07161f09abce9dbcd272b460a963414ce05f05b3ddc78162c1c48fb0ee98a391da12a14b9794b6f96a6ae2c223f595ff25 WHIRLPOOL 51d75a2c155e86d715cad75b3fac351636b76dfd9aca2b2cc9439abb6e08839bf1138a5c9b19a3bbc1698d8dd7ae77232397d3141f6718a6dc8330b543e3d7cb
+EBUILD git-1.8.5.3.ebuild 18448 SHA256 1bab8119aeee87d62bdd1f0d03c692aa28bb88a367ed6e3f92c6bba929e61056 SHA512 2337d7bd3e9735369a64f0ef662690a3dfb1b2629ff5fd9a60bc2fa26b39ad35ea7cd16d5f303988faa57790b2f78b6b8a66c34983d87e5adc662bc3eb439d99 WHIRLPOOL 0d9912f48aec275a1a9ac8162718c5e3f5ed6f04a1e18bca16112cf74acc346dda336c3b771f43b50340610d63db81e60adcb3a311bdecab0c223317d9e6bb89
+EBUILD git-1.8.5.4.ebuild 18448 SHA256 d8fa016e7ceeb7d2705b666c82dab3f64a719e32c90f0bd3ae409534367d9fec SHA512 07f7b3844d2c7355e82a3f03ca2b778c43d1b23cf1b7bf09afd318d36540d4e3f99328cd8b592ea0676320182a769e47601742b2232e77c493121b38dded0dd7 WHIRLPOOL 1e3aa1ac370b3659ef79079a44acd663c8fe707893c2c5fabea0480436d3d556cbeea4017f8bbd4f142fccf575ff96856823ade1b4f65cd45afbc730d2ae1b4e
+EBUILD git-9999.ebuild 18297 SHA256 284c79d72116dd4a932da162b4e809a96f0958c170068bc52981e2d042d79ae1 SHA512 25145ff1518af773378156f7008fb2e298eb1bf8cf170a1729f869358f87a524699083021ce3c91165171bc2e48a366d17216a227f5099c3ddf7bbd4ba800cc8 WHIRLPOOL 61f8fa1a851030f898e1d181e54f1a373da5999bf91ab74647a32242d07a2e3e60e46f80c2629f67b6ad99c6cea6aebe488b60caa30906ca87729835bb840d78
+MISC ChangeLog 12630 SHA256 1c39a317402606258c47af5eba0a1cb3cff445f20edff84edb716fcb0de07d27 SHA512 839400d47480eecccadf6046add98c506db3cc5fefdc71b728bdcb722604e00c08140eba60b69b0c210fea074e6f26b233e266e1a498ab3ed8db423dc1613a4d WHIRLPOOL 547b32dff262afaccd50fea425dd9d39e7c1ca9f05512d0728ffa6e29f86f1a7045199aef650368fcce3d2e9622f544ac791177405ebbb8c29fcdd61b3011edf
 MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
 MISC metadata.xml 1877 SHA256 74e93a953d9484c1f5806efc9c80bfa729b4d53415a00168e5ffec255750f7bd SHA512 3ef0d74206f67c27b82cefa40602cd33e432cc0f06ce900766d32f1ebd0a71d6cfa750ae77660531fc61a1117f7959d7df6ec10f439cfa2ee372d54d7ac87c5c WHIRLPOOL b9d97eb6b92a1894d965a5e9fbfbfd0d64625b31318fab2eb11b4dcb331133dbf678f62a7216c12b53a2546fa5d6a07c6240bddfa7784a925eafed602a7ffa75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS80rRAAoJEPiazRVxLXTFK+gQALNtg/EVp1+O0+wUvMEyto3o
-ri/rCtV2Zmm5ue+gmBpVAKV+8mjiUezA57n061jKY5IPk6K4nBJhlu82cEU4BCKX
-ppd5J1PR5Ji8p9iwX7SePFXxYxB2yfErq/rO/pVjvI2LwqSB4jFa/sQijA2yl6CA
-tD38GZVSMphgoj9OxcKI0DiqTenPv+rN5kB2jaiCN0de7mHZdYrWZLdt99SkB7ni
-r5d4zYO+UWz984SFvVO88mOEoOhj0187A+HQd8XPeBQXZ3KoXRGOE7a9KCj4ESZH
-eLEdybOLQ+YrmsMXt5CmdgmHVqSdwbhWpKBZQO1EO/dUUQoyTgSlcJNVLWgzKQRc
-GAEezXgSKbiXvKf50/Q6Z+RnQFHe4nOEfvr9AMJOeCjylyo9qZ2gdx23IMB9d+4s
-WhC/npH/tw2tBNJ5B+L0OU9r8BU4XLzI3ik8+Q7hgCXjjLbQTY+WSqGawPucf7t+
-V51rsu019yBNs+NNMxWTxOp4/hbqwko1tf8eQR1w5bInL8glFZKbaDkke8u9RX3V
-vYBw4fEPP6yLb3i9uz0kYc83Jd5PNbiSXaqMhR+zp8z3T9T85+1nv3LPCb5GBGbE
-bLQJLgpSqc2ST6B2C8KQn0DMcETl7miSO2C2gNb3ynHtkwTwsKmMehe3bxnVeI+V
-0ai88Ds9ZgkHabuCr1Oo
-=LFzH
+iQIcBAEBCAAGBQJS9JJJAAoJEPiazRVxLXTFbakP/1OrHFPpuaNUInNHuMqmW4Ni
+D1JTkTTMmrmCkN29kRF1+EEH0clAJz8+h+3Fu5HEKheEkohQlUSApkif9UYep6aD
+FGBJZgbxr8x5TmStuYCG43CVoJ4CJ7nIUXK9xmJUPCb/Xkq0nnS0fG6RM4nTCOz1
+xisI3iT7KjPHXFjPIQDUmXxwh/cUPksCaJcVf5ObqUTfJdOZ3gA8/XbUlasXP/RD
+Zlz9fEq+AbbPVc1pFrOIeN0VQJQ0w9QLqtQ5blfpjJZpTCOi3iWwCpigvriu87zA
+qBiSTVPmM4HLcP5I4L7QCsPMFTbU8hRYa8Ai77eYrSwCQCMB9MtH9fup5c/L0uvQ
+E71TttQue8FuvU9EATz/NHGczKjn3GoXDSGBaXNIh3veEU9MZCbBcfnC31K45TXi
+yL6E9eMtUizRYwwbLAT0th6R6QGVbRDiTT8iXKEPjeIGiH3YgF3iNFZ7AeLtw6SK
+MoHlEZgYNPdTgODa16jdM0Xx2bZUJGkoHwnBAZRZ5QKa1QVIUStc5y7ktvY+KzVc
+DwvqkpMZ4J49/0sKXYB5bzWmbHOUzi+dtc9Zqgj3RsrDGK3h69wRPlQ/b6DMFl1b
++2pIwK1RRyfzViyIgicnSHQ+M2OQZjFXdPrC7h3S98+/Kj5juoBJf8YiSxEpsJ4c
+2HEmiZq0lKnMyp/GVAaP
+=8lpZ
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/files/git-daemon-r1.initd b/dev-vcs/git/files/git-daemon-r1.initd
index 2bc4af71b324..339b6238bac4 100644
--- a/dev-vcs/git/files/git-daemon-r1.initd
+++ b/dev-vcs/git/files/git-daemon-r1.initd
@@ -1,12 +1,12 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd,v 1.1 2014/02/04 09:36:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd,v 1.2 2014/02/07 07:59:03 polynomial-c Exp $
 
 pidfile="/run/git-daemon.pid"
 command="/usr/bin/git"
-command_args="daemon --pid-file=${pidfile} --user=${GIT_USER} --group=${GIT_GROUP} ${GITDAEMON_OPTS}"
-start_stop_daemon_args="-b -p ${pidfile}"
+command_args="daemon ${GITDAEMON_OPTS}"
+start_stop_daemon_args="-b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
 
 depend() {
 	use logger
diff --git a/dev-vcs/git/git-1.8.1.5-r1.ebuild b/dev-vcs/git/git-1.8.1.5-r1.ebuild
index e0daa292378e..b2303a00d7c5 100644
--- a/dev-vcs/git/git-1.8.1.5-r1.ebuild
+++ b/dev-vcs/git/git-1.8.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.5-r1.ebuild,v 1.9 2014/02/04 09:36:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5-r1.ebuild,v 1.10 2014/02/07 07:59:03 polynomial-c Exp $
 
 EAPI=4
 
@@ -83,9 +83,8 @@ DEPEND="${CDEPEND}
 		sys-apps/texinfo
 		app-text/xmlto
 	)
-	test? (
-		app-crypt/gnupg
-	)"
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
 
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
diff --git a/dev-vcs/git/git-1.8.1.5.ebuild b/dev-vcs/git/git-1.8.1.5.ebuild
index ec16c64c4f7d..0718ff3bf6f1 100644
--- a/dev-vcs/git/git-1.8.1.5.ebuild
+++ b/dev-vcs/git/git-1.8.1.5.ebuild
@@ -1,6 +1,6 @@
 # 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.1.5.ebuild,v 1.15 2014/02/04 09:36:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5.ebuild,v 1.16 2014/02/07 07:59:03 polynomial-c Exp $
 
 EAPI=4
 
@@ -83,9 +83,8 @@ DEPEND="${CDEPEND}
 		sys-apps/texinfo
 		app-text/xmlto
 	)
-	test? (
-		app-crypt/gnupg
-	)"
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
 
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
diff --git a/dev-vcs/git/git-1.8.2.1.ebuild b/dev-vcs/git/git-1.8.2.1.ebuild
index f550b861be67..f1ca174874f9 100644
--- a/dev-vcs/git/git-1.8.2.1.ebuild
+++ b/dev-vcs/git/git-1.8.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.1.ebuild,v 1.7 2014/02/04 09:36:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.2.1.ebuild,v 1.8 2014/02/07 07:59:03 polynomial-c Exp $
 
 EAPI=4
 
@@ -83,9 +83,8 @@ DEPEND="${CDEPEND}
 		sys-apps/texinfo
 		app-text/xmlto
 	)
-	test? (
-		app-crypt/gnupg
-	)"
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
 
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
diff --git a/dev-vcs/git/git-1.8.3.2-r1.ebuild b/dev-vcs/git/git-1.8.3.2-r1.ebuild
index 271889dfb9e5..7ebc8df63767 100644
--- a/dev-vcs/git/git-1.8.3.2-r1.ebuild
+++ b/dev-vcs/git/git-1.8.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.2-r1.ebuild,v 1.11 2014/01/18 09:26:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.3.2-r1.ebuild,v 1.12 2014/02/07 07:59:03 polynomial-c Exp $
 
 EAPI=5
 
@@ -84,9 +84,8 @@ DEPEND="${CDEPEND}
 		sys-apps/texinfo
 		app-text/xmlto
 	)
-	test? (
-		app-crypt/gnupg
-	)"
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
 
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
diff --git a/dev-vcs/git/git-1.8.4.5.ebuild b/dev-vcs/git/git-1.8.4.5.ebuild
index 5a9d52a01920..d656981fcf56 100644
--- a/dev-vcs/git/git-1.8.4.5.ebuild
+++ b/dev-vcs/git/git-1.8.4.5.ebuild
@@ -1,6 +1,6 @@
 # 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.4.5.ebuild,v 1.3 2014/02/04 09:36:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.4.5.ebuild,v 1.4 2014/02/07 07:59:03 polynomial-c Exp $
 
 EAPI=5
 
@@ -84,9 +84,8 @@ DEPEND="${CDEPEND}
 		sys-apps/texinfo
 		app-text/xmlto
 	)
-	test? (
-		app-crypt/gnupg
-	)"
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
 
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
diff --git a/dev-vcs/git/git-1.8.5.3.ebuild b/dev-vcs/git/git-1.8.5.3.ebuild
index f98c91e29a09..9c41d97d2c9b 100644
--- a/dev-vcs/git/git-1.8.5.3.ebuild
+++ b/dev-vcs/git/git-1.8.5.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.2 2014/02/04 09:36:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.3.ebuild,v 1.3 2014/02/07 07:59:03 polynomial-c Exp $
 
 EAPI=5
 
@@ -88,9 +88,8 @@ DEPEND="${CDEPEND}
 		sys-apps/texinfo
 		app-text/xmlto
 	)
-	test? (
-		app-crypt/gnupg
-	)"
+	nls? ( sys-devel/gettext )
+	test? ( app-crypt/gnupg	)"
 
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
diff --git a/dev-vcs/git/git-1.8.5.4.ebuild b/dev-vcs/git/git-1.8.5.4.ebuild
index 40d7c01d14df..6ec26069e95e 100644
--- a/dev-vcs/git/git-1.8.5.4.ebuild
+++ b/dev-vcs/git/git-1.8.5.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.1 2014/02/06 08:41:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.4.ebuild,v 1.2 2014/02/07 07:59:03 polynomial-c Exp $
 
 EAPI=5
 
@@ -88,9 +88,8 @@ DEPEND="${CDEPEND}
 		sys-apps/texinfo
 		app-text/xmlto
 	)
-	test? (
-		app-crypt/gnupg
-	)"
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg )"
 
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index dcc8a91a37b8..5d27b0fd35c6 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.53 2014/02/04 09:36:35 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.54 2014/02/07 07:59:03 polynomial-c Exp $
 
 EAPI=5
 
@@ -88,9 +88,8 @@ DEPEND="${CDEPEND}
 		sys-apps/texinfo
 		app-text/xmlto
 	)
-	test? (
-		app-crypt/gnupg
-	)"
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
 
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then