summaryrefslogtreecommitdiff
path: root/dev-vcs/git
diff options
context:
space:
mode:
Diffstat (limited to 'dev-vcs/git')
-rw-r--r--dev-vcs/git/Manifest8
-rw-r--r--dev-vcs/git/git-2.15.0_rc1.ebuild (renamed from dev-vcs/git/git-2.14.1.ebuild)29
2 files changed, 22 insertions, 15 deletions
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 7640f7157f4f..d3c20ced5f37 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -13,20 +13,20 @@ AUX git-daemon.xinetd 260 SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7
AUX git-daemon_at-r1.service 340 SHA256 980b2b2234fc672065286244cd4e690c92865d39a02001936801cb013b7d2dce SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9 WHIRLPOOL fd89d61e15bf499404b0a17a2e47257962c671cab09a3af53cb378758cf7a5f979026831a8da2270ea54fa8897e132def17307d03729ef2e30dfe7950c59b1b3
DIST git-2.13.5.tar.xz 4756436 SHA256 21c9e29caac86d244ac7af78bc3422746dabb903cb3952a1ceefd801020ad1a1 SHA512 4a0b55d19f15cf0ca388d43b650c1ccadbc32964925e5d0a3107ae84c38506af957335ceb0cbb5468ffbe0f5283f8e188aa51c9e915b3249126eb37c304be9ec WHIRLPOOL 7a3c9971f37de366801be6a6d1d28a1d02b2f3fe98a508465c01d600913efd0ae4d241fb690686beb2ae9b0321ba4f7eb5b313ec47fb04eb7d0e0e51170c6750
DIST git-2.13.6.tar.xz 4756820 SHA256 bce97e403bea34f50378e90ade10c12666b2382cc247551b63dc5604e03b2523 SHA512 ed39784205e1077f886eebdfb34a205fb0433071de29f673a79ea32bca31a2ba9bdabba208c9679ea2f6f295bafad52a7e7852b5bd2ccb1e6c99a1d2e76e8ada WHIRLPOOL aeadb595a3fc9b74b143478436f4511d15735e5e01bbaf84bc60ef6c3bb91d94aa29ea1bd700a08d3aea3341de4cee5c4d5ced0b550a223faaadd37774cd3492
-DIST git-2.14.1.tar.xz 4791876 SHA256 6f724c6d0e9e13114ab35db6f67e1b2c1934b641e89366e6a0e37618231f2cc6 SHA512 bee35ad9c6a0d0588045ec2fe5f6987cb1eeb3961cdf33cd9b51ae52017969131ea4ec09908f9b30944f85b0daa99614fb42c248c9c8dac5f21a90e2866c33b4 WHIRLPOOL 4ca338a3b39f3a787bc4054f26a4510918ef8dd1bad834e6fc0889358b56e22a4eb98a642fe7d96e60e210aa0e946da160d1716a1ee14e8c853ea6af15b609b7
DIST git-2.14.2.tar.xz 4800208 SHA256 50e9723996114ad1eec4dda89960d9fe34461749ae42031008a261fedd03c7a1 SHA512 fe99486e0aef8d73dace3081bbd62bc6d08bc13868b98c905f7833458fdfc464eea504ae2961f4a2f38892cb0e76b533a50a2cacdf07c9ad9f8106e7ac1c353c WHIRLPOOL af0d166fc00aea8a4a77984e8bf92f6fb3abc854263316961683e5e27c8adbe1d73a3384b4d14c2ce762d75fd95f67da9a95a3fd3eca4d6747eb1850ab7b084e
+DIST git-2.15.0.rc1.tar.xz 4839236 SHA256 50081dca7fc77c4cb93057d4825df6c91b29c74e53a2aaebd8d7be301280fa98 SHA512 5c773be8f94f1c4fa2d4c000c14a6ccc0b560207ac59a9c60dcff0a81decdebff64a00ff045864d0ea527a61b9258c039110422f479df4314bf0164400767ecc WHIRLPOOL 32a34d871a96d2b8fde0461f47d9206ca5bc10af707b2d2d0ef7aacedf019d54f44a90ade64fa5e6f9b075f00f4cdea55bd7796e7640ed7fae1ab2bbf00e8bf5
DIST git-htmldocs-2.13.5.tar.xz 1110236 SHA256 f5f10d821544446547dc91798772f36d7515a824c9a28f22521f0094e1a4dc08 SHA512 0ba006ddc35325052be4d969a3a966ec1be7954dcc1676b9914953720e56f3c9a4522541d964c6ff08a921c35f983213eacd00b99db5d97b97ea8f5c1181ed73 WHIRLPOOL 020963c8544dba6acc4b0e681a844b6a9f332b3b3469c056d678791afacab54f4badd956137b21d3a5d2ea465a83f05d815a2c066f71fade41a58e8f802088bd
DIST git-htmldocs-2.13.6.tar.xz 1110668 SHA256 cdc39ecc8d1ce09f7b865832ebbc466441beb61d1aad4c7796514520220dabf0 SHA512 9eb26f04836620bf4486d3bb2a170ab2b0af319f7f53e2677f4c1445767f5c3521cfdbb274dcc4df2bfd2fc5bf0ca18c6a4a9ca0b9f957c53f66e530684af6cc WHIRLPOOL 126d8ae25c71dc4e6a6eb20ba611cd2eaf94ea8f4f89fde82b2d05044e93f425d9812559db5599b557a1a8f5832cc41d0651b421d265219c257351fe7fb41f2b
-DIST git-htmldocs-2.14.1.tar.xz 1115176 SHA256 9c1970c7f87f37c8b3044e01e0500d84d8bc4eb4dfa5ca881c32c351f20769fb SHA512 c4d8de9d402b00c6856936bbd1fffc213e156a7dee09d740159ee5de3231bcc3dee426c640e2dac6c837b7a3f69779be4093664fd55ef18e671f76e2d11280b5 WHIRLPOOL 1a85338c397ddedd5db01a65b0b173f4876551348b7892872c10b706e59419a2eb5937ca43df1018102a56e973ce756b6ca128e3df4e0e99adc1a9ba7719be52
DIST git-htmldocs-2.14.2.tar.xz 1115940 SHA256 a36661e81e5b21e788cd84e11860bcd0cafa402eff06e6371415a5a0e0b80dfb SHA512 c5dda319713a98b9f655a04fbb4dfcba4cc60fe22586bae73a88111d96cd8da989060b8450549a32a5c5bf5bc8ce735e73055ce72b8bf5d3b4fcec2040fa196b WHIRLPOOL 1b47b798ae00f29e84862b973f4e284076eba84992f52b92903b56d50f0a463aac011fdcb3ea0b4859d2cf8661eb24c5faf4569ed22de952e293df95ca9a0438
+DIST git-htmldocs-2.15.0.rc1.tar.xz 1133728 SHA256 0b062ae4ac8997e13d6beaeb572251d98bbf56c4473119c3e91a0422fcc81514 SHA512 935c21d12b9334aebbcf208131f46e62391111e78b4e3de67f044766301aa28b528d525d80cc9fbd4c889b01e25a0550d7bfe4af419dd13bfa4e789a7fd658a1 WHIRLPOOL f1e1c88cd312961bc289044d0d73ed27baca1b1a808b2254fbb34095c401ab5335aef591f9d896c6966b3ab0bcc2c0d1242074c3d16f0bffefef33c5b6de27ae
DIST git-manpages-2.13.5.tar.xz 407640 SHA256 1dde688dda9162605ae27e4ad1b55c65c056b3e7cd70972b7e1d6bd2b743394d SHA512 42637b264b4a1a73defe22f314cb8ca0bc171fd722252cd926a9fd74a8f89d129da0648ed85b72f44948795c6ae1f33f4f141f11b07688533c8654be0983fbc0 WHIRLPOOL 9b4a3440c4d1da7089d020e146de7401502cdbae0d82a0052f665cfab84d48de5aa5602d78b8d2f29507e280a16ab4bc2ea4a753fc948a7102eef0240ab3ab2d
DIST git-manpages-2.13.6.tar.xz 407660 SHA256 9c92ed09c3343c770a1afd9dbb1192b00ebb1b3d3e25e21a2dcb1a4e9a494d1d SHA512 b24a96053e348e1d2ebf5c66d968074bc73471f07ac3a680d8b16fd211b69b5fdfad6a087473edf9941ad08493e4d7ff0a916b85ce40ebe19b3e3dad6a4baf5f WHIRLPOOL f25b4b20462806a722067aecb7aa0526f00536630c8f71bd7be1ecc0ff4fec07db2fa79d69d911f3e1a2eaca9fe73ad76e76e7ef7afbb83698db42a540e4cfef
-DIST git-manpages-2.14.1.tar.xz 410400 SHA256 7ebce1e0e862af1367e24f14765c7b67f08b63fb01b80949f55479c562d414f2 SHA512 53641232a4fa7c8e5da14f7ba46d84e6cc4281ed8e9979153e9de13ae6550d863e823c3a2f71ab9232a57314fb19b9443913518a3a072d227c2067430d5108f7 WHIRLPOOL 6b4796ebd3070c66404920091298717d1c743403454a62c5e49bd8f8af16b3dc47345a8c8e64fec670b8bd9ed34ddbfa3916f904696e9209522cbc8ae5dcfdb1
DIST git-manpages-2.14.2.tar.xz 411160 SHA256 6dd350d1e9d00159a549f0fad08a9f954b1d12576fc8d5865fbed9dee15105fc SHA512 64f9e22ed98cde1dec9afb719c2f7254d5da1eceab2e7d3291d37792fa1b9fc83633ac42a4f47961a6721b325d58818e67ffb14085d5e8f9bed1b691f22d79d7 WHIRLPOOL 902889bed82289773c029ac7c9625f4972559e0365cc04dfb661ae14fd7e1757d3820d75b3591d72dded98107ad7a1e2e31590452699858ca3a94fcc375ac0eb
+DIST git-manpages-2.15.0.rc1.tar.xz 412748 SHA256 deffc4779d5a652591f211daf25dd2b9d815a6e6f4e0696a5930e2067241c7f6 SHA512 a5d3a5a3d77c2278d36a9f2cc38d181177a5ff22488f48d1cdd2b00fe40f3feba236169d65f68ff924f08619af62403895dc85ca858d933f58a3a267ea413f29 WHIRLPOOL e9646c531666e6971cff80d12c4bbefc370659fb1d55a31091d6624204e5781937aaba13a3993b2fdd70414ca5582f51e714103c2c958502aa81344ed8ff5e98
EBUILD git-2.13.5.ebuild 19016 SHA256 60f7549d88e55d94f090293c78c841565b8a11f8db61526abbd2c4de650dbac2 SHA512 4741a465efa6fbdc86775abc4088a9512971658988154a5da2f410e1e243b6f6a1e7c5bece23582f3a47e1ddd587685ebfc32c7b00c8ff325d2e92996e4d840d WHIRLPOOL 1372327523438351e0368978141e4c80d7ab3f0d3f816d9c2b749287caccab69870dd26db28b75f5244b69012fc0951b7894c442d5aae006167435511e5890c9
EBUILD git-2.13.6.ebuild 19019 SHA256 c9c5d7cdd8d928e906d0c925e001a3783094590796adfd20b649902bdc612f34 SHA512 ca1e07833367a03037009b4e4726c13539dea89a6259245a65ac35165920bd65234168c7ecfba23a816af5521ece1c41d30b78d62078d9d64ca8b1479f23c15a WHIRLPOOL 04263d41376789794bcd1ecfdba3278f4a28666b6ecfeb14096ccf4d3f670f0067db4809a2a41f1022de768e05221e3c1dcad03118fb6c409476207fe5d04b5c
-EBUILD git-2.14.1.ebuild 19320 SHA256 1ecc45be91062d9442750bd22c8fdba490b5c7fff54368b4ab1e3d5e935011ec SHA512 a49a979067f1f7c9c207f1faf522229d3b2b4ae0cf04f7881822b486b6a891f2f5464fcbb6dde14b919c71c007f36e2892ef12bcd45e42ccebd82eeb29d28384 WHIRLPOOL e16b1d0ef5c946dfd2001b98dc2e89891dacf152760d2e095d24f10ef6c69193570bcd936fd666bcee7de90d2aa928b3ba7ef87028ddb9bba0360ae3d95402e1
EBUILD git-2.14.2.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
+EBUILD git-2.15.0_rc1.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
EBUILD git-9999-r1.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
EBUILD git-9999-r2.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
EBUILD git-9999-r3.ebuild 19492 SHA256 7ffc88887aa46a21a50af75c177e551ef40ffbb1b12b651a9c0c3111d9f3fc6c SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8 WHIRLPOOL 332d2dbb55610ca410fd04e2fc595e1e65fc6edd95d9a412d7dad14b266707d2c0e760b2d5aa54fb7dd7d1f0b2d21d19b561d5060418037f1de24c53b32ad52b
diff --git a/dev-vcs/git/git-2.14.1.ebuild b/dev-vcs/git/git-2.15.0_rc1.ebuild
index f650073b5ca7..d079a65a75eb 100644
--- a/dev-vcs/git/git-2.14.1.ebuild
+++ b/dev-vcs/git/git-2.15.0_rc1.ebuild
@@ -7,17 +7,24 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-# See https://git-scm.com/docs/gitworkflows#_graduation
-# In order of stability:
-# 9999-r0: maint
-# 9999-r1: master
-# 9999-r2: next
-# 9999-r3: pu
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_BRANCH=maint
PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+ SCM="git-r3"
+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+ # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+ # See https://git-scm.com/docs/gitworkflows#_graduation
+ # In order of stability:
+ # 9999-r0: maint
+ # 9999-r1: master
+ # 9999-r2: next
+ # 9999-r3: pu
+ case "${PVR}" in
+ 9999) EGIT_BRANCH=maint ;;
+ 9999-r1) EGIT_BRANCH=master ;;
+ 9999-r2) EGIT_BRANCH=next;;
+ 9999-r3) EGIT_BRANCH=pu ;;
+ esac
+fi
inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
@@ -568,7 +575,7 @@ src_install() {
}
src_test() {
- local disabled=""
+ local disabled="t9128-git-svn-cmd-branch.sh"
local tests_cvs="t9200-git-cvsexportcommit.sh \
t9400-git-cvsserver-server.sh \
t9401-git-cvsserver-crlf.sh \