From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- dev-vcs/mercurial/Manifest | 2 +- dev-vcs/mercurial/mercurial-4.9-r1.ebuild | 152 ++++++++++++++++++++++++++++++ dev-vcs/mercurial/mercurial-4.9.ebuild | 148 ----------------------------- 3 files changed, 153 insertions(+), 149 deletions(-) create mode 100644 dev-vcs/mercurial/mercurial-4.9-r1.ebuild delete mode 100644 dev-vcs/mercurial/mercurial-4.9.ebuild (limited to 'dev-vcs/mercurial') diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index cbddc946fec1..def28a6c07cf 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -11,6 +11,6 @@ EBUILD mercurial-4.5.2.ebuild 3580 BLAKE2B 38b2b4d0255288f9f9179a1ccdbc7f5274d79 EBUILD mercurial-4.6.2.ebuild 3581 BLAKE2B 9a619b0d2508dca3f8d883ba6845669307d56f262ddb3fd5154a1305c28a4bc63542691f64d9eef731673ec8a6ba11d9bfb9f9c52b76c1a7b796d23396b5ec48 SHA512 96ca6367f5cb5a1bf28a59fdbe408f79719674fc1604b6f3021c1403b22d4afe5427fcd8611a0bbc07f363a4c0140d668153fc8cbd9c2f19d109c1e799699896 EBUILD mercurial-4.7.1.ebuild 3537 BLAKE2B 97176fa1ddffb88942dc6079e6d36a6edf822069079dbf29a4aeebd3ea0054b6ecf4dd4f8fd3ae49256380fe6961d45289c8ce25e61c4ae759d5316e0c1d48d1 SHA512 f37c8bf4060f48acdafb51ae189efefd60e7ad46dca136c419b74e187058b985b69d24eedb2be2d017ef6c948a0bb9216c263fcc7166dbe942b9a1eb56f6453d EBUILD mercurial-4.8.2.ebuild 3812 BLAKE2B 9c0e45cfd188d64aa450011bfca668ddd279b1586a9cce2dd71b62673caa8ee8f50418a23724ee0d456606b33ef474480816bc9d210cbd3731c4337033a5ce82 SHA512 db503fe36beeba90ecb3134832b9ed86c89c246ce459054e5a694be9263d3c2e98aa0ada02e571e16e416741b3327e59c9d99f60474c4ceca75d58eaacbf9664 -EBUILD mercurial-4.9.ebuild 3810 BLAKE2B dad14c962cc89721e33ce3ef009bb481e24fcd50818e3c3731f5618cabd1691d61f905cb63ec5a3ebc600e1ad1e9c0c3133ed3aa6f0a782684e70d856f48eb28 SHA512 c4bf27044e82e1ce5b2b98a055c3e159afb1e88bf0425fe56f011d0c8a1caa1b6c7bf1765a6c28345c42a8362af45053ced5f194307a681253c8e474a0fd2e8c +EBUILD mercurial-4.9-r1.ebuild 3883 BLAKE2B 9bdab668469e0e0037625cf597a192eb817dcc732091bb0a24e13aade8cddf12a2a8d7875a0beb422d8345ccb88f57fdf34472b88362027fa835f92a8e21b9be SHA512 2ccc5e2a47e787a1d4d1f1bdd99534baae8c3196afc39376cbafdfb1084c1d629a36a042eaa006ebb1dcd7b50444fb414f3768409ee9fce1c6c66a609322a234 EBUILD mercurial-9999.ebuild 4175 BLAKE2B 22d6cba47692486bd37371d324a514886dcc378c10868edb67229e6657912ebb846e70573eec1ecbf3cfabeb6211a31bdef4ec154e56aaac6afff410493cc5eb SHA512 457878af1028d7887651b1dae1518f81bdf8825a701ffcfa6e7f60045bf885d1b1703e69cef66b63ccdab082f5b56096ff5ebbcd7d6ae8b4c7a7c5428ed7df0b MISC metadata.xml 456 BLAKE2B d824c2b22d9785c268cfadaa4456794cf423ef6df69767577c4df16e6cebe3bc3c02f40ec7dd799eaaf6bac5754bee28b6b923b11d40f628fcb4a4f85a849de9 SHA512 2bf62b3a98e71ff5acba09c06cc1f29a2cb24d6634a384ff800bb10ab6f5de71a5db440b0fa8a5183db95eafc6ad98444a817c23887baf0dc59f6260402574b1 diff --git a/dev-vcs/mercurial/mercurial-4.9-r1.ebuild b/dev-vcs/mercurial/mercurial-4.9-r1.ebuild new file mode 100644 index 000000000000..d8cadd73e519 --- /dev/null +++ b/dev-vcs/mercurial/mercurial-4.9-r1.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~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" + +# Too many tests fail #608720 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" + "${FILESDIR}/${PN}-4.8.1-unbundle_zstd.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 + + 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 + emake -C contrib/chg + 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 + + dobin contrib/chg/chg + doman contrib/chg/chg.1 + + local RM_CONTRIB=( chg 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" + + # symlink to system zstd + local sitedir=$(python_get_sitedir) + dosym ../zstd.so "${sitedir#${EPREFIX}}"/${PN}/zstd.so +} + +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 +} diff --git a/dev-vcs/mercurial/mercurial-4.9.ebuild b/dev-vcs/mercurial/mercurial-4.9.ebuild deleted file mode 100644 index b30776c59274..000000000000 --- a/dev-vcs/mercurial/mercurial-4.9.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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" - -# Too many tests fail #608720 -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" - "${FILESDIR}/${PN}-4.8.1-unbundle_zstd.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 - - 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" - - # symlink to system zstd - local sitedir=$(python_get_sitedir) - dosym ../zstd.so "${sitedir#${EPREFIX}}"/${PN}/zstd.so -} - -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