From 62f67115b5c46134c34f88f4b1cbdacc19384c0a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Sep 2018 11:19:18 +0100 Subject: gentoo resync : 30.09.2018 --- dev-vcs/Manifest.gz | Bin 13639 -> 13637 bytes dev-vcs/fossil/Manifest | 2 +- dev-vcs/fossil/fossil-2.6.ebuild | 2 +- dev-vcs/git-lfs/Manifest | 4 +- dev-vcs/git-lfs/git-lfs-2.5.2.ebuild | 40 ++++++++ dev-vcs/git-lfs/git-lfs-9999.ebuild | 22 ++--- dev-vcs/mercurial/Manifest | 1 + dev-vcs/mercurial/mercurial-4.7.1-r1.ebuild | 139 ++++++++++++++++++++++++++++ 8 files changed, 192 insertions(+), 18 deletions(-) create mode 100644 dev-vcs/git-lfs/git-lfs-2.5.2.ebuild create mode 100644 dev-vcs/mercurial/mercurial-4.7.1-r1.ebuild (limited to 'dev-vcs') diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index 1ab6b12a78ef..5cbfe52187b0 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest index d129cde3aec1..cbafccadc256 100644 --- a/dev-vcs/fossil/Manifest +++ b/dev-vcs/fossil/Manifest @@ -3,5 +3,5 @@ DIST fossil-src-2.5.tar.gz 5036719 BLAKE2B b25067ee79793343a017dee28d3ee2b5eb257 DIST fossil-src-2.6.tar.gz 5083119 BLAKE2B 7d5cbeb072c72574b9f4fcbc87f9aeaa1db7964f961aa206a04bf64d73782bd6d51f2a19973fa4125969c864031cf78790a67acd32c5e8f209fe1211410a6af4 SHA512 a4f3b2ee696a7f156a295672c17e8ec63737a85cee5d47b1f66a9d45a6011006ed0a075082b5e06e5d75d59babef493d1815ec45f8ae99f42ed1a1c7a2447b1c EBUILD fossil-2.4.ebuild 1488 BLAKE2B 02539210e2eb47e7aecfd9aa0e46a9b9e6061501d3252e997f5ecef94a50fc54b9b8d2e4e96c33c464e92b419fec5bd07938329f044515cedcf4bfae5bc93d69 SHA512 fb5ec8634fc9e147d962840d8000871d42f93edc58a361253ec5e5d287ba2aa59e99d24cc1555f0eb090e02ee0626233a11b357b90c41ef2b8006d2038db88ef EBUILD fossil-2.5.ebuild 1537 BLAKE2B 6f1f97c89e738ec97c41090c366f28eafed84459c6465ef80905e1fca8e4a0f62641d1e328a589ae768a02cda42158fe0be2936c1d3d5f0796cd26ef1417618f SHA512 77eace4a15a198040d85e7b2defdfb38f8cb1c4cc37c678911da6c5db0e425c4ad52ac558ac0923dab485ab126d3ea522032d851c52fda842ca29b752b05d8d9 -EBUILD fossil-2.6.ebuild 1534 BLAKE2B 8caa1744523ce9199c8dedea306d710606b83d4578f204e2417371728350f6fe8ec06636a1d5b70da7da4198c1ab2ca4f69682a7e52deddadfee193ad9caaa80 SHA512 c72fd31a1b07208c15738df9bab18722e65ce335b8cdf94d1972262d64967e269ad84e45687569ab2f48b2989b07e059e2d16034c786ff8fab43b6f4f8655aa8 +EBUILD fossil-2.6.ebuild 1533 BLAKE2B d4a50902e83e8540a4f73b3868bfa6422154bc0450c0da25a334765cd7bbbf4a0acc06c1c49a630ab0227405a1753d7b078b411ef7a0970ec2bf9f9ed70de91d SHA512 edfb8a357970407e3d4fde08ea8df40d3c1787ede0ed2983e6a9ec20683846fd025edfb681ac414810a79296da1e066d5a38b48fe7bcd118c06fb724b7bae74f MISC metadata.xml 1165 BLAKE2B c370f1370c7250945135e56514558acd016742f6d8a9c51e98b9533e094b47dbdc07808abbb1341ad1e987dac6f5f13d2e2f0fef45587935accf082c15227330 SHA512 6ef05c3722bb110e403294b002c253eb1ae4f29a4f5306dccee3abd52ce61c8ae04ed2255f551298d94b8b99d96c799f05bd6df7a9d4e9af08e4c10ce306d0ab diff --git a/dev-vcs/fossil/fossil-2.6.ebuild b/dev-vcs/fossil/fossil-2.6.ebuild index 7aba1e9aecb4..348bc29bb019 100644 --- a/dev-vcs/fossil/fossil-2.6.ebuild +++ b/dev-vcs/fossil/fossil-2.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.fossil-scm.org/index.html/uv/fossil-src-${PV}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 ~x86" +KEYWORDS="amd64 ~arm ppc ppc64 x86" IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks" diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest index f486e93c7ac1..f49afce27ecb 100644 --- a/dev-vcs/git-lfs/Manifest +++ b/dev-vcs/git-lfs/Manifest @@ -1,4 +1,6 @@ DIST git-lfs-2.4.2.tar.gz 791443 BLAKE2B 6c613ad5b644f609b36a6a5c569c3512713d0f5fc925be759b20a01ca0e57573246557e887e086b52c5703db9db4d8a49fe91761efec48410738724256cac9e9 SHA512 c89a15c36b9d52091eb6e89f8e1db23b03f35333794467432ee49728ba83fc5d25d238f5df49bf736a4a3079778d70a527db01c2299ecd96a7b5f70059616967 +DIST git-lfs-2.5.2.tar.gz 947150 BLAKE2B 08949f14d6292689a00ba693123373b7317a96165fcbd8bf560e81a7e1d03a1ac809cc5273efecce85f017d576107c5e651f2f30331130ecf154c9799394d590 SHA512 58475f833e0ef69d37ece91f3792b43f2a589cce94d1eba22a0534aa40257b236f9f9aab633c8b800bec129eb86fbc38e9ab6b5e52144595a27cd13bee5cb33e EBUILD git-lfs-2.4.2.ebuild 969 BLAKE2B 4e7349b225cdae63ab30312a30a8c58deec1d89cc238dfecf505986ce1f798607b3fb63dd1b5ad22dc74bc8428d51e0532580cdf6b37628afa730e7b104445f3 SHA512 73e9130ecf33dc94f5067353d183306643167897f5ff450185d057ca8b7089cec2bd173b08e97042df2483b500136654d1f62275d7242b25857bd4ad7f5f2584 -EBUILD git-lfs-9999.ebuild 1153 BLAKE2B 6c67ac1d61b9be2021bea634c5a2a7d4f50b3044d1ddf1ebdcdb21580bc723d5fe8890b098dcb12f5719d415be4fb187ca51414ab2efdbeb54bee72828b2d276 SHA512 317104891a95804da6b28e29b0930aad843597d1d9996518a18e7c71290753ac86405364426693adefc2f103a7b393a97e7d79589dfa05e58a8ed5d6a32a61b1 +EBUILD git-lfs-2.5.2.ebuild 815 BLAKE2B 7598fa75771f1294d39de2557b972b48d2abb97db24077ada954cafff45c088cea4a5c6a5e418a95801e5ac12c049aaef2cd168e8d68758246e97d1e54b79ebe SHA512 3a24bd2d5dc65727069e5ec49984fe4db4de86092a4a8653c0437ed9b1886692894cecdf05b81ea980dcf3f62b3e0b8868697f3e7b07d24e228aa8f02a0bc3aa +EBUILD git-lfs-9999.ebuild 814 BLAKE2B cf8f2f87805383310a9bf7d8fafbb3ac528ea6cc11403833023bcff0704d20b9f31f6c465e87077bff99a4592b9a8760c0136c40326c39101dfef2fbd54a2bb2 SHA512 668a206862c0d6efc69bd4cf7361c530b2e266c9187c960e36e51569b2db1170528d97a7cc4a9fa68af09b92f6c15e0388f71ba562ce52dda9a20a621e7964c6 MISC metadata.xml 331 BLAKE2B ec49bde06277ccbdacd3b6c50e0e32c5b14464ad015e1a7a57446e905d0ed9b3b0b71650a455a3b77c5e0ac2530874f37327b1fef3c924577b08c1e1c815c201 SHA512 51f68466f5396fe0326aab5f3a5fa70761647d722d02339fd6072d21976dfd27fdafa1ee44680be98dd0c1b80b29801eb7ed1508aa850104bed564c5f1a38011 diff --git a/dev-vcs/git-lfs/git-lfs-2.5.2.ebuild b/dev-vcs/git-lfs/git-lfs-2.5.2.ebuild new file mode 100644 index 000000000000..ea0c66755207 --- /dev/null +++ b/dev-vcs/git-lfs/git-lfs-2.5.2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="github.com/${PN}/${PN}" + +if [[ ${PV} == *9999 ]]; then + inherit golang-build golang-vcs +else + SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + inherit golang-build golang-vcs-snapshot +fi + +DESCRIPTION="command line extension and specification for managing large files with Git" +HOMEPAGE="https://git-lfs.github.com/" + +LICENSE="MIT BSD BSD-2 BSD-4 Apache-2.0" +SLOT="0" +IUSE="+doc" + +DEPEND="doc? ( app-text/ronn )" + +RDEPEND="dev-vcs/git" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +src_compile() { + golang-build_src_compile + + if use doc; then + ronn docs/man/*.ronn || die "man building failed" + fi +} + +src_install() { + dobin git-lfs + use doc && doman docs/man/*.1 +} diff --git a/dev-vcs/git-lfs/git-lfs-9999.ebuild b/dev-vcs/git-lfs/git-lfs-9999.ebuild index 7a32ca36cc92..90878f67a22a 100644 --- a/dev-vcs/git-lfs/git-lfs-9999.ebuild +++ b/dev-vcs/git-lfs/git-lfs-9999.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -EGO_PN="github.com/git-lfs/${PN}" +EGO_PN="github.com/${PN}/${PN}" if [[ ${PV} == *9999 ]]; then - inherit golang-vcs + inherit golang-build golang-vcs else SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" - inherit golang-vcs-snapshot + inherit golang-build golang-vcs-snapshot fi DESCRIPTION="command line extension and specification for managing large files with Git" @@ -20,20 +20,13 @@ LICENSE="MIT BSD BSD-2 BSD-4 Apache-2.0" SLOT="0" IUSE="+doc" -# since version 2.0.2 git-lfs uses time.Until that was introduced in golang >=1.8 -# https://github.com/golang/go/commit/67ea710792eabdae1182e2bf4845f512136cccce -DEPEND=">=dev-lang/go-1.8.1:= - doc? ( app-text/ronn )" - +DEPEND="doc? ( app-text/ronn )" RDEPEND="dev-vcs/git" S="${WORKDIR}/${P}/src/${EGO_PN}" src_compile() { - # can't use golang-build_src_compile for go generate - # and others steps executed by build.go - GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ - go run script/*.go -cmd build || die "build failed" + golang-build_src_compile if use doc; then ronn docs/man/*.ronn || die "man building failed" @@ -41,7 +34,6 @@ src_compile() { } src_install() { - dobin bin/git-lfs - + dobin git-lfs use doc && doman docs/man/*.1 } diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index e8ee494f21ab..040d6264489c 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -7,6 +7,7 @@ DIST mercurial-4.7.1.tar.gz 6480135 BLAKE2B de34cdd34d5fa2a6f4e1f24730c99b5764b9 DIST mercurial-4.7.tar.gz 6476268 BLAKE2B e13458729f06a2516e885abf767989e8df7f3cc743f7f57aa44ca41c6c2c4542a28e6172a7e109395fb76057afc04c2318b10f8b21ae90cb5c9efe6188da0483 SHA512 a08dfc4e296b5d162097769ab38ab85b7c5de16710bce0b6dce2a39f56cb517455c0ed634f689d07e9bd082fb7641501b7da51963844aee7ab28233cf721dec8 EBUILD mercurial-4.5.2.ebuild 3536 BLAKE2B 6ad1f105178987b408397b9593ac8c980435363597625402a0e67afdc10d55cc4477ca85dea764d860cecdb8bd68ee13afc66cf6203ae96f1a3b5363b93e0e74 SHA512 766576864da5700f107a530f1a06fbf33d1d593597ad236ad841d3ba59774c4aedf3e43dda00a86b1894f99c03f7af228d8026363d81a2c3b0b8ab98f22c246a EBUILD mercurial-4.6.2.ebuild 3537 BLAKE2B 7f4c2e4c579ab768dd629d53b2fdf1062980405242376c727b05a8a474d6bc8afb4db0f82e22252dde24b6909f9ab87d8650ed73600e6dc01ae4ef2fdcfc71cd SHA512 1549175116f2496ae8bac35360b142c9ae95d458b764496648eeb9165fd79fd030bfcb0386df61a568a7d8536f8e846a9b127f22fe2937ccac5982135e89cf14 +EBUILD mercurial-4.7.1-r1.ebuild 3627 BLAKE2B e79df29d0ad4e456659c4c512d886e3ec280bf028d0ab0284341af1afde6007fba4de660521fd2233b51cbfd0a86a304e83f16cd58f4e0fdf307dc14e48c00d6 SHA512 b5f9c365852750077c263727674bbba1a2cd9fe2d384e5063244fa33592e6254a48d5da382845cd4d845c712d7fee37f24e4ae3eb16710cf914afe7d35588d79 EBUILD mercurial-4.7.1.ebuild 3493 BLAKE2B 9145b0af45da7e9ec4f78e470928a77f0a6aa553283873e406a07940221d386aa95b4b43c0c1a79930d447fd215bcdf8422494e1e6e4f94bce8399d363050011 SHA512 00baba63605300fa052f578186a2e061d98058b59d75b2ed5394af398c8afa86209f450612ea3d39bc3da17111dffea5bd6bb02ddcd21d47f32dc0ec86f937a2 EBUILD mercurial-4.7.ebuild 3493 BLAKE2B 9145b0af45da7e9ec4f78e470928a77f0a6aa553283873e406a07940221d386aa95b4b43c0c1a79930d447fd215bcdf8422494e1e6e4f94bce8399d363050011 SHA512 00baba63605300fa052f578186a2e061d98058b59d75b2ed5394af398c8afa86209f450612ea3d39bc3da17111dffea5bd6bb02ddcd21d47f32dc0ec86f937a2 EBUILD mercurial-9999.ebuild 4131 BLAKE2B 55328bbb7ccca04843b595d18c44dbbf5a51e4808a4e9d517355c38f89270551017fdeca45471972210e7246aa970dfa4ae4f5951cd4ff5d33e9ae696ef45b41 SHA512 0f6ee4a02c89c9e08e0a18e1f11169836eb336cf18af01df22d0a8b189c8fa61f0de5fd0b28105f83df55b23f840ad4ea934fac779c64ba5156c042106169c08 diff --git a/dev-vcs/mercurial/mercurial-4.7.1-r1.ebuild b/dev-vcs/mercurial/mercurial-4.7.1-r1.ebuild new file mode 100644 index 000000000000..6bf897f16bfa --- /dev/null +++ b/dev-vcs/mercurial/mercurial-4.7.1-r1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="threads" + +inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic + +DESCRIPTION="Scalable distributed SCM" +HOMEPAGE="https://www.mercurial-scm.org/" +SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~mips ~sparc ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="bugzilla emacs gpg test tk" + +RDEPEND="app-misc/ca-certificates + dev-python/zstandard[${PYTHON_USEDEP}] + bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) + gpg? ( app-crypt/gnupg ) + tk? ( dev-lang/tk )" + +DEPEND="emacs? ( virtual/emacs ) + test? ( app-arch/unzip + dev-python/pygments[${PYTHON_USEDEP}] )" + +SITEFILE="70${PN}-gentoo.el" + +PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" ) + +python_prepare_all() { + # fix up logic that won't work in Gentoo Prefix (also won't outside in + # certain cases), bug #362891 + sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die + + # Don't use bundled zstandard (#666972) + rm -r contrib/python-zstandard || die + sed '/contrib\/python-zstandard/d;/setup_zstd/d' -i setup.py || die + + distutils-r1_python_prepare_all +} + +python_configure_all() { + strip-flags -ftracer -ftree-vectorize + # Note: make it impl-conditional if py3 is supported + append-flags -fno-strict-aliasing + + "${PYTHON}" setup.py build_mo || die +} + +python_compile_all() { + rm -r contrib/win32 || die + if use emacs; then + cd contrib || die + elisp-compile mercurial.el || die "elisp-compile failed!" + fi +} + +python_install_all() { + distutils-r1_python_install_all + + newbashcomp contrib/bash_completion hg + + insinto /usr/share/zsh/site-functions + newins contrib/zsh_completion _hg + + rm -f doc/*.?.txt + dodoc CONTRIBUTORS + cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die + + dobin hgeditor + dobin contrib/hgk + python_foreach_impl python_doscript contrib/hg-ssh + + if use emacs; then + elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} + fi + + local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix plan9 *.el) + for f in ${RM_CONTRIB[@]}; do + rm -r contrib/$f || die + done + + dodoc -r contrib + docompress -x /usr/share/doc/${PF}/contrib + doman doc/*.? + + insinto /etc/mercurial/hgrc.d + doins "${FILESDIR}/cacerts.rc" +} + +src_test() { + pushd tests &>/dev/null || die + rm -rf *svn* # Subversion tests fail with 1.5 + rm -f test-archive* # Fails due to verbose tar output changes + rm -f test-convert-baz* # GNU Arch baz + rm -f test-convert-cvs* # CVS + rm -f test-convert-darcs* # Darcs + rm -f test-convert-git* # git + rm -f test-convert-mtn* # monotone + rm -f test-convert-tla* # GNU Arch tla + #rm -f test-doctest* # doctest always fails with python 2.5.x + rm -f test-largefiles* # tends to time out + + popd &>/dev/null || die + distutils-r1_src_test +} + +python_test() { + local TEST_DIR + + rm -rf "${TMPDIR}"/test + distutils_install_for_testing + cd tests || die + "${PYTHON}" run-tests.py --verbose \ + --tmpdir="${TMPDIR}"/test \ + --with-hg="${TEST_DIR}"/scripts/hg \ + || die "Tests fail with ${EPYTHON}" +} + +pkg_postinst() { + use emacs && elisp-site-regen + + elog "If you want to convert repositories from other tools using convert" + elog "extension please install correct tool:" + elog " dev-vcs/cvs" + elog " dev-vcs/darcs" + elog " dev-vcs/git" + elog " dev-vcs/monotone" + elog " dev-vcs/subversion" +} + +pkg_postrm() { + use emacs && elisp-site-regen +} -- cgit v1.2.3