diff --git a/dev-vcs/git-cvs/Manifest b/dev-vcs/git-cvs/Manifest index 1f4700283..1585e804b 100644 --- a/dev-vcs/git-cvs/Manifest +++ b/dev-vcs/git-cvs/Manifest @@ -1,7 +1,7 @@ DIST git-2.12.0-Gentoo-patches.tar.gz 5037 SHA256 23f0f746acc407e63a87cd6f956f0549ef42dacbf70895ec57ba2ab0220736b6 SHA512 d48da7b5df727ec08d66606084049708f1a3efe650f3a43ff659ed466e9a6c68bc5de57a95c8a580d521a7322f37eb5e29d5829fd98f7b7631836cfa2bc292b0 WHIRLPOOL 22d88c7dabd0a8b7bf989ee035fcea6fc76980f452a6501f5bcd9d3cafe6d2971ca8bfd56724c7015fd082b3bbe9f1fd3398b4b1372684691a634e2521e5ee4c -DIST git-2.13.3.tar.xz 4754532 SHA256 91aa23be428f67eb19616f43fa0229d567e9acf4f08fba33eb0b627e4d323e62 SHA512 8a8db4d675c9d8d0e834620c5c7ce7937edd7f4bf1d8a176e1218e5773960e2635c48cb931dfe206b237e2da8371e521acf9c2776847605bea13f8a7304c9f9b WHIRLPOOL 117f84d13f9a6366f5323c136df0ae7aef7d038bb34c392f9852c5e38d2b98535a5ea9e77985aa0b25939eafc4a1441655bd38af007bb832e847ec4c6bcf4c69 DIST git-2.14.1.tar.xz 4791876 SHA256 6f724c6d0e9e13114ab35db6f67e1b2c1934b641e89366e6a0e37618231f2cc6 SHA512 bee35ad9c6a0d0588045ec2fe5f6987cb1eeb3961cdf33cd9b51ae52017969131ea4ec09908f9b30944f85b0daa99614fb42c248c9c8dac5f21a90e2866c33b4 WHIRLPOOL 4ca338a3b39f3a787bc4054f26a4510918ef8dd1bad834e6fc0889358b56e22a4eb98a642fe7d96e60e210aa0e946da160d1716a1ee14e8c853ea6af15b609b7 -DIST git-htmldocs-2.13.3.tar.xz 1109392 SHA256 c5f8ad546724b8712286dd7814ea46abf829b14f2de8f6e565b8775469880c66 SHA512 6ac9bd2f401bc3330d5a23a4f48afbe224c6d558154281737f6cd83b8ae6b73c32e7fcb491c642f926a9c5f95019964cbe7902c0ec18456b53847fd6c3b7e292 WHIRLPOOL cef80aa25644993fc95458fedcfde2672da22b8d9e5853e4149cc0196782812008f2876c32f6e857abc65d30545767c9b822913f42b1470342b72a7573347d90 +DIST git-2.14.2.tar.xz 4800208 SHA256 50e9723996114ad1eec4dda89960d9fe34461749ae42031008a261fedd03c7a1 SHA512 fe99486e0aef8d73dace3081bbd62bc6d08bc13868b98c905f7833458fdfc464eea504ae2961f4a2f38892cb0e76b533a50a2cacdf07c9ad9f8106e7ac1c353c WHIRLPOOL af0d166fc00aea8a4a77984e8bf92f6fb3abc854263316961683e5e27c8adbe1d73a3384b4d14c2ce762d75fd95f67da9a95a3fd3eca4d6747eb1850ab7b084e DIST git-htmldocs-2.14.1.tar.xz 1115176 SHA256 9c1970c7f87f37c8b3044e01e0500d84d8bc4eb4dfa5ca881c32c351f20769fb SHA512 c4d8de9d402b00c6856936bbd1fffc213e156a7dee09d740159ee5de3231bcc3dee426c640e2dac6c837b7a3f69779be4093664fd55ef18e671f76e2d11280b5 WHIRLPOOL 1a85338c397ddedd5db01a65b0b173f4876551348b7892872c10b706e59419a2eb5937ca43df1018102a56e973ce756b6ca128e3df4e0e99adc1a9ba7719be52 -DIST git-manpages-2.13.3.tar.xz 407640 SHA256 1128db0302a41b55132bfd507863a7921b995d9ad308396ff2c4ca91177481c2 SHA512 9c81335f3d882df1220801ea6fdedea90533c904a1e4dd0394b42721aa31392e6c923568a81c05479fe77a89a974e02fd40b4bcff397c4f739306ba4cb874501 WHIRLPOOL f735c2657fd63a2b7b8bca5e511c789680b615f519ac1d9aa7b67c0aead5607f534021494a03ade9752274c932a22eb82457d243c5328d3dbe8613ac44e8c595 +DIST git-htmldocs-2.14.2.tar.xz 1115940 SHA256 a36661e81e5b21e788cd84e11860bcd0cafa402eff06e6371415a5a0e0b80dfb SHA512 c5dda319713a98b9f655a04fbb4dfcba4cc60fe22586bae73a88111d96cd8da989060b8450549a32a5c5bf5bc8ce735e73055ce72b8bf5d3b4fcec2040fa196b WHIRLPOOL 1b47b798ae00f29e84862b973f4e284076eba84992f52b92903b56d50f0a463aac011fdcb3ea0b4859d2cf8661eb24c5faf4569ed22de952e293df95ca9a0438 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 diff --git a/dev-vcs/git-cvs/git-cvs-2.13.3.ebuild b/dev-vcs/git-cvs/git-cvs-2.14.2.ebuild similarity index 89% rename from dev-vcs/git-cvs/git-cvs-2.13.3.ebuild rename to dev-vcs/git-cvs/git-cvs-2.14.2.ebuild index 76621800b..eb6505f95 100644 --- a/dev-vcs/git-cvs/git-cvs-2.13.3.ebuild +++ b/dev-vcs/git-cvs/git-cvs-2.14.2.ebuild @@ -6,9 +6,23 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-r3" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_BRANCH=maint +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 SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.12.0-Gentoo-patches.tar.gz" ) inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} @@ -71,7 +85,7 @@ REQUIRED_USE=" exportmakeopts() { local myopts - # broken assumptions, because of broken build system ... + # broken assumptions, because of static build system ... myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" myopts+=" INSTALL=install TAR=tar" myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" @@ -87,6 +101,8 @@ exportmakeopts() { myopts+=" INSTALLDIRS=vendor" myopts+=" NO_SVN_TESTS=YesPlease" + grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ + myopts+=" HAVE_GETDELIM=1" has_version '>=app-text/asciidoc-8.0' \ && myopts+=" ASCIIDOC8=YesPlease" diff --git a/dev-vcs/git-gui-tools/Manifest b/dev-vcs/git-gui-tools/Manifest index f72509dee..7fe7e12db 100644 --- a/dev-vcs/git-gui-tools/Manifest +++ b/dev-vcs/git-gui-tools/Manifest @@ -1,3 +1,3 @@ DIST git-2.12.0-Gentoo-patches.tar.gz 5037 SHA256 23f0f746acc407e63a87cd6f956f0549ef42dacbf70895ec57ba2ab0220736b6 SHA512 d48da7b5df727ec08d66606084049708f1a3efe650f3a43ff659ed466e9a6c68bc5de57a95c8a580d521a7322f37eb5e29d5829fd98f7b7631836cfa2bc292b0 WHIRLPOOL 22d88c7dabd0a8b7bf989ee035fcea6fc76980f452a6501f5bcd9d3cafe6d2971ca8bfd56724c7015fd082b3bbe9f1fd3398b4b1372684691a634e2521e5ee4c -DIST git-2.13.3.tar.xz 4754532 SHA256 91aa23be428f67eb19616f43fa0229d567e9acf4f08fba33eb0b627e4d323e62 SHA512 8a8db4d675c9d8d0e834620c5c7ce7937edd7f4bf1d8a176e1218e5773960e2635c48cb931dfe206b237e2da8371e521acf9c2776847605bea13f8a7304c9f9b WHIRLPOOL 117f84d13f9a6366f5323c136df0ae7aef7d038bb34c392f9852c5e38d2b98535a5ea9e77985aa0b25939eafc4a1441655bd38af007bb832e847ec4c6bcf4c69 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 diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.13.3.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.14.2.ebuild similarity index 86% rename from dev-vcs/git-gui-tools/git-gui-tools-2.13.3.ebuild rename to dev-vcs/git-gui-tools/git-gui-tools-2.14.2.ebuild index a752cd030..2cbbfd1db 100644 --- a/dev-vcs/git-gui-tools/git-gui-tools-2.13.3.ebuild +++ b/dev-vcs/git-gui-tools/git-gui-tools-2.14.2.ebuild @@ -9,9 +9,23 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-r3" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_BRANCH=maint +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 SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.12.0-Gentoo-patches.tar.gz" ) inherit sab-patches toolchain-funcs eutils python-single-r1 ${SCM} @@ -71,7 +85,7 @@ exportmakeopts() { myopts+=" NO_EXPAT=YesPlease" myopts+=" NO_CURL=YesPlease" - # broken assumptions, because of broken build system ... + # broken assumptions, because of static build system ... myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" myopts+=" INSTALL=install TAR=tar" myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" @@ -86,6 +100,8 @@ exportmakeopts() { sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile myopts+=" NO_PERL=YesPlease" + grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ + myopts+=" HAVE_GETDELIM=1" # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' diff --git a/dev-vcs/git-subversion/Manifest b/dev-vcs/git-subversion/Manifest index 1f4700283..1585e804b 100644 --- a/dev-vcs/git-subversion/Manifest +++ b/dev-vcs/git-subversion/Manifest @@ -1,7 +1,7 @@ DIST git-2.12.0-Gentoo-patches.tar.gz 5037 SHA256 23f0f746acc407e63a87cd6f956f0549ef42dacbf70895ec57ba2ab0220736b6 SHA512 d48da7b5df727ec08d66606084049708f1a3efe650f3a43ff659ed466e9a6c68bc5de57a95c8a580d521a7322f37eb5e29d5829fd98f7b7631836cfa2bc292b0 WHIRLPOOL 22d88c7dabd0a8b7bf989ee035fcea6fc76980f452a6501f5bcd9d3cafe6d2971ca8bfd56724c7015fd082b3bbe9f1fd3398b4b1372684691a634e2521e5ee4c -DIST git-2.13.3.tar.xz 4754532 SHA256 91aa23be428f67eb19616f43fa0229d567e9acf4f08fba33eb0b627e4d323e62 SHA512 8a8db4d675c9d8d0e834620c5c7ce7937edd7f4bf1d8a176e1218e5773960e2635c48cb931dfe206b237e2da8371e521acf9c2776847605bea13f8a7304c9f9b WHIRLPOOL 117f84d13f9a6366f5323c136df0ae7aef7d038bb34c392f9852c5e38d2b98535a5ea9e77985aa0b25939eafc4a1441655bd38af007bb832e847ec4c6bcf4c69 DIST git-2.14.1.tar.xz 4791876 SHA256 6f724c6d0e9e13114ab35db6f67e1b2c1934b641e89366e6a0e37618231f2cc6 SHA512 bee35ad9c6a0d0588045ec2fe5f6987cb1eeb3961cdf33cd9b51ae52017969131ea4ec09908f9b30944f85b0daa99614fb42c248c9c8dac5f21a90e2866c33b4 WHIRLPOOL 4ca338a3b39f3a787bc4054f26a4510918ef8dd1bad834e6fc0889358b56e22a4eb98a642fe7d96e60e210aa0e946da160d1716a1ee14e8c853ea6af15b609b7 -DIST git-htmldocs-2.13.3.tar.xz 1109392 SHA256 c5f8ad546724b8712286dd7814ea46abf829b14f2de8f6e565b8775469880c66 SHA512 6ac9bd2f401bc3330d5a23a4f48afbe224c6d558154281737f6cd83b8ae6b73c32e7fcb491c642f926a9c5f95019964cbe7902c0ec18456b53847fd6c3b7e292 WHIRLPOOL cef80aa25644993fc95458fedcfde2672da22b8d9e5853e4149cc0196782812008f2876c32f6e857abc65d30545767c9b822913f42b1470342b72a7573347d90 +DIST git-2.14.2.tar.xz 4800208 SHA256 50e9723996114ad1eec4dda89960d9fe34461749ae42031008a261fedd03c7a1 SHA512 fe99486e0aef8d73dace3081bbd62bc6d08bc13868b98c905f7833458fdfc464eea504ae2961f4a2f38892cb0e76b533a50a2cacdf07c9ad9f8106e7ac1c353c WHIRLPOOL af0d166fc00aea8a4a77984e8bf92f6fb3abc854263316961683e5e27c8adbe1d73a3384b4d14c2ce762d75fd95f67da9a95a3fd3eca4d6747eb1850ab7b084e DIST git-htmldocs-2.14.1.tar.xz 1115176 SHA256 9c1970c7f87f37c8b3044e01e0500d84d8bc4eb4dfa5ca881c32c351f20769fb SHA512 c4d8de9d402b00c6856936bbd1fffc213e156a7dee09d740159ee5de3231bcc3dee426c640e2dac6c837b7a3f69779be4093664fd55ef18e671f76e2d11280b5 WHIRLPOOL 1a85338c397ddedd5db01a65b0b173f4876551348b7892872c10b706e59419a2eb5937ca43df1018102a56e973ce756b6ca128e3df4e0e99adc1a9ba7719be52 -DIST git-manpages-2.13.3.tar.xz 407640 SHA256 1128db0302a41b55132bfd507863a7921b995d9ad308396ff2c4ca91177481c2 SHA512 9c81335f3d882df1220801ea6fdedea90533c904a1e4dd0394b42721aa31392e6c923568a81c05479fe77a89a974e02fd40b4bcff397c4f739306ba4cb874501 WHIRLPOOL f735c2657fd63a2b7b8bca5e511c789680b615f519ac1d9aa7b67c0aead5607f534021494a03ade9752274c932a22eb82457d243c5328d3dbe8613ac44e8c595 +DIST git-htmldocs-2.14.2.tar.xz 1115940 SHA256 a36661e81e5b21e788cd84e11860bcd0cafa402eff06e6371415a5a0e0b80dfb SHA512 c5dda319713a98b9f655a04fbb4dfcba4cc60fe22586bae73a88111d96cd8da989060b8450549a32a5c5bf5bc8ce735e73055ce72b8bf5d3b4fcec2040fa196b WHIRLPOOL 1b47b798ae00f29e84862b973f4e284076eba84992f52b92903b56d50f0a463aac011fdcb3ea0b4859d2cf8661eb24c5faf4569ed22de952e293df95ca9a0438 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 diff --git a/dev-vcs/git-subversion/git-subversion-2.13.3.ebuild b/dev-vcs/git-subversion/git-subversion-2.14.2.ebuild similarity index 91% rename from dev-vcs/git-subversion/git-subversion-2.13.3.ebuild rename to dev-vcs/git-subversion/git-subversion-2.14.2.ebuild index ee9c4cfb0..4c51b676c 100644 --- a/dev-vcs/git-subversion/git-subversion-2.13.3.ebuild +++ b/dev-vcs/git-subversion/git-subversion-2.14.2.ebuild @@ -6,9 +6,23 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-r3" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_BRANCH=maint +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 SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.12.0-Gentoo-patches.tar.gz" ) inherit sab-patches toolchain-funcs eutils multilib python-single-r1 ${SCM} @@ -71,7 +85,7 @@ REQUIRED_USE=" exportmakeopts() { local myopts - # broken assumptions, because of broken build system ... + # broken assumptions, because of static build system ... myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" myopts+=" INSTALL=install TAR=tar" myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" @@ -92,6 +106,8 @@ exportmakeopts() { myopts+=" INSTALLDIRS=vendor" myopts+=" NO_SVN_TESTS=YesPlease" myopts+=" NO_CVS=YesPlease" + grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ + myopts+=" HAVE_GETDELIM=1" has_version '>=app-text/asciidoc-8.0' \ && myopts+=" ASCIIDOC8=YesPlease" diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 1f4700283..1585e804b 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -1,7 +1,7 @@ DIST git-2.12.0-Gentoo-patches.tar.gz 5037 SHA256 23f0f746acc407e63a87cd6f956f0549ef42dacbf70895ec57ba2ab0220736b6 SHA512 d48da7b5df727ec08d66606084049708f1a3efe650f3a43ff659ed466e9a6c68bc5de57a95c8a580d521a7322f37eb5e29d5829fd98f7b7631836cfa2bc292b0 WHIRLPOOL 22d88c7dabd0a8b7bf989ee035fcea6fc76980f452a6501f5bcd9d3cafe6d2971ca8bfd56724c7015fd082b3bbe9f1fd3398b4b1372684691a634e2521e5ee4c -DIST git-2.13.3.tar.xz 4754532 SHA256 91aa23be428f67eb19616f43fa0229d567e9acf4f08fba33eb0b627e4d323e62 SHA512 8a8db4d675c9d8d0e834620c5c7ce7937edd7f4bf1d8a176e1218e5773960e2635c48cb931dfe206b237e2da8371e521acf9c2776847605bea13f8a7304c9f9b WHIRLPOOL 117f84d13f9a6366f5323c136df0ae7aef7d038bb34c392f9852c5e38d2b98535a5ea9e77985aa0b25939eafc4a1441655bd38af007bb832e847ec4c6bcf4c69 DIST git-2.14.1.tar.xz 4791876 SHA256 6f724c6d0e9e13114ab35db6f67e1b2c1934b641e89366e6a0e37618231f2cc6 SHA512 bee35ad9c6a0d0588045ec2fe5f6987cb1eeb3961cdf33cd9b51ae52017969131ea4ec09908f9b30944f85b0daa99614fb42c248c9c8dac5f21a90e2866c33b4 WHIRLPOOL 4ca338a3b39f3a787bc4054f26a4510918ef8dd1bad834e6fc0889358b56e22a4eb98a642fe7d96e60e210aa0e946da160d1716a1ee14e8c853ea6af15b609b7 -DIST git-htmldocs-2.13.3.tar.xz 1109392 SHA256 c5f8ad546724b8712286dd7814ea46abf829b14f2de8f6e565b8775469880c66 SHA512 6ac9bd2f401bc3330d5a23a4f48afbe224c6d558154281737f6cd83b8ae6b73c32e7fcb491c642f926a9c5f95019964cbe7902c0ec18456b53847fd6c3b7e292 WHIRLPOOL cef80aa25644993fc95458fedcfde2672da22b8d9e5853e4149cc0196782812008f2876c32f6e857abc65d30545767c9b822913f42b1470342b72a7573347d90 +DIST git-2.14.2.tar.xz 4800208 SHA256 50e9723996114ad1eec4dda89960d9fe34461749ae42031008a261fedd03c7a1 SHA512 fe99486e0aef8d73dace3081bbd62bc6d08bc13868b98c905f7833458fdfc464eea504ae2961f4a2f38892cb0e76b533a50a2cacdf07c9ad9f8106e7ac1c353c WHIRLPOOL af0d166fc00aea8a4a77984e8bf92f6fb3abc854263316961683e5e27c8adbe1d73a3384b4d14c2ce762d75fd95f67da9a95a3fd3eca4d6747eb1850ab7b084e DIST git-htmldocs-2.14.1.tar.xz 1115176 SHA256 9c1970c7f87f37c8b3044e01e0500d84d8bc4eb4dfa5ca881c32c351f20769fb SHA512 c4d8de9d402b00c6856936bbd1fffc213e156a7dee09d740159ee5de3231bcc3dee426c640e2dac6c837b7a3f69779be4093664fd55ef18e671f76e2d11280b5 WHIRLPOOL 1a85338c397ddedd5db01a65b0b173f4876551348b7892872c10b706e59419a2eb5937ca43df1018102a56e973ce756b6ca128e3df4e0e99adc1a9ba7719be52 -DIST git-manpages-2.13.3.tar.xz 407640 SHA256 1128db0302a41b55132bfd507863a7921b995d9ad308396ff2c4ca91177481c2 SHA512 9c81335f3d882df1220801ea6fdedea90533c904a1e4dd0394b42721aa31392e6c923568a81c05479fe77a89a974e02fd40b4bcff397c4f739306ba4cb874501 WHIRLPOOL f735c2657fd63a2b7b8bca5e511c789680b615f519ac1d9aa7b67c0aead5607f534021494a03ade9752274c932a22eb82457d243c5328d3dbe8613ac44e8c595 +DIST git-htmldocs-2.14.2.tar.xz 1115940 SHA256 a36661e81e5b21e788cd84e11860bcd0cafa402eff06e6371415a5a0e0b80dfb SHA512 c5dda319713a98b9f655a04fbb4dfcba4cc60fe22586bae73a88111d96cd8da989060b8450549a32a5c5bf5bc8ce735e73055ce72b8bf5d3b4fcec2040fa196b WHIRLPOOL 1b47b798ae00f29e84862b973f4e284076eba84992f52b92903b56d50f0a463aac011fdcb3ea0b4859d2cf8661eb24c5faf4569ed22de952e293df95ca9a0438 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 diff --git a/dev-vcs/git/git-2.13.3.ebuild b/dev-vcs/git/git-2.14.2.ebuild similarity index 93% rename from dev-vcs/git/git-2.13.3.ebuild rename to dev-vcs/git/git-2.14.2.ebuild index 0346bcb3f..d951a6d22 100644 --- a/dev-vcs/git/git-2.13.3.ebuild +++ b/dev-vcs/git/git-2.14.2.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 SAB_PATCHES_SRC=( "mirror://sabayon/dev-vcs/git/git-2.12.0-Gentoo-patches.tar.gz" ) inherit sab-patches toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} @@ -46,7 +53,7 @@ sab-patches_update_SRC_URI LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -54,7 +61,10 @@ CDEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib - pcre? ( dev-libs/libpcre ) + pcre? ( + pcre-jit? ( dev-libs/libpcre2[jit(+)] ) + !pcre-jit? ( dev-libs/libpcre ) + ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( @@ -111,6 +121,7 @@ REQUIRED_USE=" mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) + pcre-jit? ( pcre ) python? ( ${PYTHON_REQUIRED_USE} ) " @@ -144,7 +155,7 @@ exportmakeopts() { myopts+=" NO_CURL=YesPlease" fi - # broken assumptions, because of broken build system ... + # broken assumptions, because of static build system ... myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" myopts+=" INSTALL=install TAR=tar" myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" @@ -164,9 +175,16 @@ exportmakeopts() { || myopts+=" NO_GETTEXT=YesPlease" use tk \ || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" + if use pcre; then + if use pcre-jit; then + myopts+=" USE_LIBPCRE2=YesPlease" + extlibs+=" -lpcre2-8" + else + myopts+=" USE_LIBPCRE1=YesPlease" + myopts+=" NO_LIBPCRE1_JIT=YesPlease" + extlibs+=" -lpcre" + fi + fi use perl \ && myopts+=" INSTALLDIRS=vendor" \ || myopts+=" NO_PERL=YesPlease" @@ -199,7 +217,8 @@ exportmakeopts() { if [[ ${CHOST} == *-solaris* ]]; then myopts+=" NEEDS_LIBICONV=YesPlease" myopts+=" HAVE_CLOCK_MONOTONIC=1" - myopts+=" HAVE_GETDELIM=1" + grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ + myopts+=" HAVE_GETDELIM=1" fi has_version '>=app-text/asciidoc-8.0' \ @@ -360,7 +379,6 @@ src_compile() { cd "${S}"/contrib/diff-highlight || die git_emake - use doc && git_emake doc if use mediawiki ; then cd "${S}"/contrib/mw-to-git @@ -557,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 \ diff --git a/www-apps/gitweb/Manifest b/www-apps/gitweb/Manifest index 28f430dea..d13c25431 100644 --- a/www-apps/gitweb/Manifest +++ b/www-apps/gitweb/Manifest @@ -1,2 +1,2 @@ -DIST git-2.13.3.tar.xz 4754532 SHA256 91aa23be428f67eb19616f43fa0229d567e9acf4f08fba33eb0b627e4d323e62 SHA512 8a8db4d675c9d8d0e834620c5c7ce7937edd7f4bf1d8a176e1218e5773960e2635c48cb931dfe206b237e2da8371e521acf9c2776847605bea13f8a7304c9f9b WHIRLPOOL 117f84d13f9a6366f5323c136df0ae7aef7d038bb34c392f9852c5e38d2b98535a5ea9e77985aa0b25939eafc4a1441655bd38af007bb832e847ec4c6bcf4c69 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 diff --git a/www-apps/gitweb/gitweb-2.13.3.ebuild b/www-apps/gitweb/gitweb-2.14.2.ebuild similarity index 87% rename from www-apps/gitweb/gitweb-2.13.3.ebuild rename to www-apps/gitweb/gitweb-2.14.2.ebuild index 012cfcb2a..e328a8530 100644 --- a/www-apps/gitweb/gitweb-2.13.3.ebuild +++ b/www-apps/gitweb/gitweb-2.14.2.ebuild @@ -5,9 +5,23 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no -[[ ${PV} == *9999 ]] && SCM="git-r3" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_BRANCH=maint +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 ${SCM} @@ -36,7 +50,6 @@ CDEPEND=" ~dev-vcs/git-${PV} sys-libs/zlib dev-lang/perl:=[-build(-)] - dev-libs/libpcre dev-lang/tk:=" RDEPEND="${CDEPEND}