aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-03-08 04:42:45 -0800
committerGregory M. Tuner <gmt@be-evil.net>2014-03-08 04:42:45 -0800
commit0de2df00b9185bf7fc137fb17934f9f7f4a4faa8 (patch)
treee4c1783416169c27c76b555738df73d293c505b4 /dev-vcs
parentdev-vcs/subversion: update manifest (diff)
downloadgmt-0de2df00b9185bf7fc137fb17934f9f7f4a4faa8.tar.gz
gmt-0de2df00b9185bf7fc137fb17934f9f7f4a4faa8.tar.bz2
gmt-0de2df00b9185bf7fc137fb17934f9f7f4a4faa8.zip
dev-vcs/git-1.9.0-r1: revbump/merge
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/git/Manifest10
-rw-r--r--dev-vcs/git/files/git-daemon-r1.initd6
-rw-r--r--dev-vcs/git/git-1.9.0-r1.ebuild (renamed from dev-vcs/git/git-1.8.5.4-r1.ebuild)5
3 files changed, 9 insertions, 12 deletions
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index dcdece8..134ad45 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -7,16 +7,16 @@ AUX git-1.8.5-mw-destdir.patch 1138 SHA256 4f9684b14b93ceae0426cf0ba9a3970c15f63
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-1.9.0_rc3-optional-cvs.patch 11798 SHA256 3ebd298202ef9877114abbfdfccba20b28a8ab01958828079e0b2adf77525aa3 SHA512 308fd4d00803b30e2307d8665f5a5d0a6f2e2022ba462876afea35eb2ebb246ef8d82671467e2ad1744c981d523a156d5825deceaca28f17e43604695edecc60 WHIRLPOOL c4413f0233fcf41463a2ee73567a0743c436c17d14186f1c04fd78eafb38eaba95f685db2824867b6c0e900b4657cf847de5f46fa8136b40f0a0fcdad23122af
-AUX git-daemon-r1.initd 452 SHA256 fe51fee8e56a5bd2c1821454f5743e16c74283a6d1e0914b6198e82be2a637cf SHA512 23473a6b64e0483d62e65e2ea8d5dd341700199d8a843fd64db88115cb1120b1159a14ae5a5bafe5c482bb9aadd8eae073ee40b0e3a761d4e1d67df2eeb53991 WHIRLPOOL 3de8980015aa29e6495655651fa71e4e88f0536a4caa789f1d54be82043fd9f7ef285cb6e48314ebcd1b1dc9acf58ced644ba9d393dd3505f3faf7836eb22597
+AUX git-daemon-r1.initd 485 SHA256 421e68201619bfbf7535d8b1a0030390b7ffab998e025f7cbd7e879c677c2819 SHA512 cd1635bf8bbd39e93d5fd44a7c3f46ad01a57894525da4d8cf05c1d2099bd0dd80440e67eb73848fe26d0442361bef9e551f5180139f46f3c65ca6c9bb739072 WHIRLPOOL c8a14e7c49d03f4c4b189a234fbd991deedf1b8f378f6bdaded8b95060f6f6a8b78f3d5bbe19fa49c1b263ed25ee0a3a9afc8ccec38af801ace207a08d8e6e35
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
AUX git-daemon.xinetd 260 SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c WHIRLPOOL 155bfca2c071d5368de09412d1d937cefd3b5cd28a991b99845551738440b92791c33a67ef41be711dbf06fc4faf4a299cbaf1f410b119fe5deb5a4cd741803d
AUX git-daemon_at.service 395 SHA256 c427e37d3e859c13f9441b20c7cb6aba7bca048cb70809ee1253726e733fac7d SHA512 4931954564ae7d2e21e49c8f251bae7c6be8a420f75e68e23214c85993dceb81b719e5fee11366b82b28ef5fa27a9ae2b2faa5c79c16d367c6d50fb03bbd0cff WHIRLPOOL a18f8fe6755c85e8d332d989637105d7842e8fc107a263dd0252e34e30dca21aaff593041bca3f0a728b995f19310d3cab8c43e2a7524ee9e612cca03c7ffccf
-DIST git-1.8.5.4.tar.gz 4760594 SHA256 ba8551268286530c7b7caa04f9b8fabeb5fb39eb260ca541e36b32596f26fdab SHA512 18178837efdb1e62b790d4810e71fc52d2215b94441f4f912d7699dc197cd4717af3bf8fa500063c755ce4ae60afb4d4d0baecdc1c569a359be68a41b48473ab WHIRLPOOL d640efcf07015a7c650828b3864f5793962a2b9d80764f0e94461b49ca692debcf613b63321e96cbf2febf3d5be769dc9a26ef165684619a6c44a0ce5cc64554
-DIST git-htmldocs-1.8.5.4.tar.gz 2227268 SHA256 e21484ea84f97daafd4c0d65f368c68b6bdf7615d5247e0718a2077bf80c8702 SHA512 714b60c4851797e00880e661fb3e96e38f44bd2b2e79c5a92620bf6d8d0fcf62d2bda08636a055b24643e3c53af884827a957f1df7f8130e43ef5ab2144693f1 WHIRLPOOL 4b004e6f2a8291a25cff05600ef740b6a888482d2148f5cc1d4cc804218a9847267f77d3c355cc3d7be6210f7591385b607430db66f5e4303d77cdfe68213cdd
-DIST git-manpages-1.8.5.4.tar.gz 568942 SHA256 bc4e733e9b4833e5bae36f35ea4d0de1005f138f2bc15542179f58b59af0827c SHA512 5f9b8326e5180219dddf00149fc2b59e35b0524c564b760eccf8c8ef2c4fcb527010e132013c5c7043ccd8c84a29fbd43bf9aca7cf5d7b87271cd3ef05a3fb4c WHIRLPOOL 5dcc39b427267b2a1298dcbccefca7a068826bac6f37013dd7a28644cf092520277535f1e6cb43ff7085d0eb168742560989ff78a3eaf4f9d5c97d6e597969c1
-EBUILD git-1.8.5.4-r1.ebuild 18103 SHA256 b7fc661958503d8c54280b51e68ecb9dab74bca1c5a55e1d20777f2f0eec6ba2 SHA512 bedd2c54339659cfe54275a4c04512e57523d43b2fb1085198b0a0b9f9eafecb84682566640b9a2410222853f79709b407350188966164c551a7e95b34e38bc0 WHIRLPOOL 8881883c99ca1aac8727db100a28e87d15b5477a8a9884bf5a8c70f4daebaa2dfe794d8290424ecfb6b54617acfb1cc61a7560ce0c6a17d19480478fbd347278
+DIST git-1.9.0.tar.gz 4839710 SHA256 d9cdb10e013fce57eecb9287f09b31525fc7bf3ec58ea4b6a9fc2e4f5c662395 SHA512 2a663131b5055c755816522aa15690ebc382ee971f565b6e47eb4e9e0315ab1763fa2db9d543d8e167e933b7a75cc590e7ad10db0ca1914ad81b9b98d596cdb3 WHIRLPOOL e966c2db5f696318fd30d3045b0574404f33caf5b02114bf2a8d59cb1e4cfc95aaff60b3adf8e4c072d51a417af787c17f424a23c19c125d2acfae478cfffb1a
+DIST git-htmldocs-1.9.0.tar.gz 2240600 SHA256 f4a12c748a1940aaa0e69665232222ddfbb451ac751f8e5f0459ab084dd2c60d SHA512 a81561b533413f0feff18c62fedc9ea2bad5d67c6ef1f515d450d91f0b326a643f46589708e84ae8c12b981daa39bf60738255771e26a4f15c9e0dea8fb29fa5 WHIRLPOOL bc808bb9754493df0f82840a20c1f070500d327193b241ede0b8de4fe1277860e1297305b9cb5b8f082c5ca323d32647bdd81f3ae90101c4d995da5a8a311196
+DIST git-manpages-1.9.0.tar.gz 571616 SHA256 8a905a433807ea94e8cd1887f98c7f0d5145c05fa153c93138083532a05a9b63 SHA512 5570c79e7d906c319694788ff192203faed56cd0094f3053cad78fd488f412d81284af5299d4c954ab598ffc81a2a17b1dfbb7f9101c0f57125b5a60b0014b93 WHIRLPOOL 814a8ed7a3f28ec4aa4db49bff3ae70ef73aa2fd7aa106025dec8c15aa73a2ca6e409465785c7daf33d93b4c31ed11814253b137d8457dcdb77e9a6ac01f99d7
+EBUILD git-1.9.0-r1.ebuild 17993 SHA256 c987cd68e4d4b5038466d344bb62391aad92ce5fce527cfc2b484c58f6051e2d SHA512 685790c10130cf7998c58132c79ed49c3dbe2443d28ae20ee0962275336c312496b4fd83d5789efc212bc32b49c0fe32d894dd3734c0deb40418462b111d8767 WHIRLPOOL 619d2bcb1ef7784293c901d1221faef72b67d9950b5aaf9deabed54f70798db076108966504f55fd544ac8409df858256173fb40a7106bff11952442a93aae90
MISC ChangeLog 11470 SHA256 b2632719d4881f9e588e8fcb02d59337b38baa4ccb0c9553e8e9d79e8986e0ab SHA512 17ff383d5b1058f8d57b5b64261226e317bbd8a4ad107e100bb2a4f20be8b06e067c5ca73d01acbb5daa3d7efbc10f4cbd8292b2bcfa5ab5c513bbca3cb377a4 WHIRLPOOL ce9317faa7297629d7c1cd010467b4bc2547b71d25c4b0b44556f8fb34deca09eed5d0299f4a08946f3f75201c5e88c211c6cd36d32e85e437610a3d6fdb18f9
MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
MISC metadata.xml 1877 SHA256 74e93a953d9484c1f5806efc9c80bfa729b4d53415a00168e5ffec255750f7bd SHA512 3ef0d74206f67c27b82cefa40602cd33e432cc0f06ce900766d32f1ebd0a71d6cfa750ae77660531fc61a1117f7959d7df6ec10f439cfa2ee372d54d7ac87c5c WHIRLPOOL b9d97eb6b92a1894d965a5e9fbfbfd0d64625b31318fab2eb11b4dcb331133dbf678f62a7216c12b53a2546fa5d6a07c6240bddfa7784a925eafed602a7ffa75
diff --git a/dev-vcs/git/files/git-daemon-r1.initd b/dev-vcs/git/files/git-daemon-r1.initd
index 339b623..ee9a64e 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.2 2014/02/07 07:59:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd,v 1.4 2014/03/03 19:21:29 polynomial-c Exp $
-pidfile="/run/git-daemon.pid"
+pidfile="/var/run/git-daemon.pid"
command="/usr/bin/git"
command_args="daemon ${GITDAEMON_OPTS}"
-start_stop_daemon_args="-b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
+start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME= -b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
depend() {
use logger
diff --git a/dev-vcs/git/git-1.8.5.4-r1.ebuild b/dev-vcs/git/git-1.9.0-r1.ebuild
index c16d66b..f907212 100644
--- a/dev-vcs/git/git-1.8.5.4-r1.ebuild
+++ b/dev-vcs/git/git-1.9.0-r1.ebuild
@@ -225,10 +225,7 @@ src_unpack() {
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
+ epatch "${FILESDIR}"/git-1.9.0_rc3-optional-cvs.patch
# install mediawiki perl modules also in vendor_dir
# hack, needs better upstream solution