From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- dev-vcs/mercurial/Manifest | 12 +- dev-vcs/mercurial/mercurial-5.3.2-r1.ebuild | 4 +- dev-vcs/mercurial/mercurial-5.4.2-r1.ebuild | 4 +- dev-vcs/mercurial/mercurial-5.5.2.ebuild | 4 +- dev-vcs/mercurial/mercurial-5.6.1-r1.ebuild | 294 ++++++++++++++++++++++++++++ dev-vcs/mercurial/mercurial-5.6.ebuild | 294 ---------------------------- dev-vcs/mercurial/mercurial-9999.ebuild | 4 +- 7 files changed, 308 insertions(+), 308 deletions(-) create mode 100644 dev-vcs/mercurial/mercurial-5.6.1-r1.ebuild delete mode 100644 dev-vcs/mercurial/mercurial-5.6.ebuild (limited to 'dev-vcs/mercurial') diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index 108caeaf367d..c17440f82324 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -43,7 +43,7 @@ DIST memoffset-0.5.6.crate 7382 BLAKE2B 42ebb93b567b339822201e31830971c32452b3d6 DIST mercurial-5.3.2.tar.gz 7514256 BLAKE2B 250ecd5c0a64138cbcda599513efba7b040c0fed0f020c73ade2525e0ef8a9ad06c10c5df4e16eb9bbeb3ab0f2cbb622a65f6d4827b269654c662810ef0385fb SHA512 b0afcf82b51676d2e7592eb9b29f9611d59816399166400027b6c8b29c10c9ddc96b57f7913e78f938b1345bb7ac29ecd4ddc793165b7cf192c3c7a95712cc99 DIST mercurial-5.4.2.tar.gz 7730738 BLAKE2B 689a50e1675f678436bb805a5de1379646943f865734a85ef39187f4d90007125c33d6f8dfa6256510fc4214c82153060c671c601fe4b7810f1df77f5b542ed2 SHA512 92d730e330dcf333b2c8f6b784582e3a639759bcad594ac06b4e92f567a70c6938e33a3c322286d6b3ccccaedb634ad3febd2cf927702b3826013a76af2a9c15 DIST mercurial-5.5.2.tar.gz 7761053 BLAKE2B af823bc80844a7a6f9b173caf73aa298c141638e4f3b6ee4d37c9472d77f1cd79c1e5f6875de699904037468815ae42fe32b5537e50eb94373258683f45e919a SHA512 e154592deed6168a32e7fd075fa034908ca72826ae49a92c84a6ad82b820753906578f064ac623018442d83d125a551eecc057179e66ac7217398a192e903629 -DIST mercurial-5.6.tar.gz 7840943 BLAKE2B d4628fb0854fc53630a369bfb209326c0ef1abf23829b14c713e3be70a77fec1eaf669acb6afc8e88e0caab6820c255004883535c356facd68d344af0f45b69d SHA512 fb0dcbeda972ec7c74d88d3a525e36d07d0b0c20809d58552d9187482863eb079b8f3e374cba3bde24685bde8a603cd5a580cf3cf52acdafcc841b05c81c0f81 +DIST mercurial-5.6.1.tar.gz 7836342 BLAKE2B 8880a501168eec9ccdbc33cd7c51791acecec5e8e462f6998ffff59fc03bd4f0ac18d72c4c962cd84dc336657371384ab0ccb4cdd44690d8023e51997050943c SHA512 d84d7d9ae4c738e3cb62b26c4dc7f3943abc1b1a55ccc46a4e3435896f715efb30d4d6ff4df6d02a8bef7bd6ead2d21a44342fb8a2101e8fe04211d21efc13b1 DIST micro-timer-0.3.1.crate 3357 BLAKE2B 13c518d2b3de6fa683078b9906b719498da2e2be5a23e7a2511f3d1d69730769031ed6b488927bec845c0405782f55cfe5af8610d56d92e716ff5d9056650f5a SHA512 197beadbdf35dd0892f6e0c1a09b6b57472166ecaec3e10be12c436e1381540100092c9e717684db44b53375390cf2c245fdc6fdb376117fdf5b4405ade73cf7 DIST micro-timer-macros-0.3.1.crate 2928 BLAKE2B 148639d1f22965c7487fefd19b1413797aad0f9e0c4eb8ee7be181e7b6bd39e03a6d3d68131b05e09f87a3ef653d6eda643952025983b49736a9c6ddb778aafa SHA512 9c9ffc8432c9377d2de3fce931f398d7f77012f496dd6c011718abd46535205766d9f5a7c97ff14ecd87bb172039d8e92a8c45cfd9c14d220a368448da1b7917 DIST miniz_oxide-0.4.2.crate 46206 BLAKE2B 0da9fd14549b88dafd5d53e997034cdad99a424bb19bb78061527f4dbf27d1dc258d618955f894564a1676adc75a49d5bc9d562f26ace4e61634693e7db6b8ff SHA512 e33c81926e7a78ad68014f3e89471755c20bb594b11c94f214094bdb65000b5ec71369a537f12e7956f55cbcae1d7752bf954aac527e41b9878503dd6ad3e95c @@ -100,9 +100,9 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e DIST zstd-0.5.3+zstd.1.4.5.crate 26013 BLAKE2B 033e839622b8403268a1a98c2f525b4f6dc624378e64fd644e09cd1b11a8751c1097f134a5f40793a8a6b57635ad28ba3534dfc48e7ec818873dd4819311c80b SHA512 cb6d2adbb3d400ffec19ce7c942b47a0e5826ed62bb8de195b0e8817b4a1e00c1569a080457452180cf869b7bd99fdb150e4a981a992f977b2dbd03eb5a073ff DIST zstd-safe-2.0.5+zstd.1.4.5.crate 9002 BLAKE2B bf92884b629d5685dd563e481e63c67dd4c6aff52a402e0ec4f675cb40dad1f9e5ab675b45d4f326bfd0f75a22673ad8538b2924c4bb6220cb1fe23fce2262fe SHA512 cb4b33059da628e103a0fc9a83217fe96f5201cc9db0572b3c2d102b181dc29c346aea12ddec902ecf36886fcb6a2177155791d00ee2fbb267ddf84a48d3c2c6 DIST zstd-sys-1.4.17+zstd.1.4.5.crate 2046794 BLAKE2B 40584094797d4cc479cff9d1b89abd1f7e800f774725dc03c531b67078027d5b82464984d4e2a76cabcd9d336234d245f93692d0111e2469ef21ca1ea6260d77 SHA512 89439b20e4e0bce6455d982fb7467c45436ee68572395db662d056eb2e09e95ad600947bf11c27ba60b161c2e2511e04cac8dcfacc5f85fcf9222d4a206bdc30 -EBUILD mercurial-5.3.2-r1.ebuild 4072 BLAKE2B 9414c83df4e7d7a4e0930abea611c433324990e6f52e7c914d9db806d17757ccb165acd231b07126b9de3f31354839639ea60ffecdc6e6772f49c032af711c15 SHA512 3b172157144bbe2fe89ac88f41c624dac5dea4597bbe530fe35e943d7615faf8a742ae86083d01ac80d474088a507cb3777d6bba4a7296e75157cb57c44dd7f2 -EBUILD mercurial-5.4.2-r1.ebuild 4081 BLAKE2B ad40c0b4611597ff7fb085c3fea64bde4e7ad6a2d69671b960457aa7f728fe0bdc854954bfda5abde773afa8ca44b3263cd127017e7cf317e6f06090ab71a7fc SHA512 0a2770e62099dbab1af3bd10b489be91fbc976a90b41e2c8ad7aa8b9d1b43e41f99253b8f5c0614b5dfb584cb941d0a145fd7ee69d68f623f8152a14e983cc19 -EBUILD mercurial-5.5.2.ebuild 4085 BLAKE2B da9d6a41b6322841a629dea9f4870d1d5104e2ef257170766ae87d4c24e03d1d906a5f8c00218c4ea1423b8f6052e131b28ea2060e6cc15f00447254f7274167 SHA512 61a610f0ad35c3bf4a6011910a818a8e6d0fa3560f30e0b3893a51560a9f02dfe2fb4bffa31bcfa11efeb77dfb13be7ba3d14bbba9236a86419a4f0795aba376 -EBUILD mercurial-5.6.ebuild 6450 BLAKE2B a24ee6981169effa85779c9f8e88b8798bd3d77f14dbe62e20960de9a79f385d2e7242806894051b52717c497ac89272d8b84bdbe4ea4aaaf105d2d94fcf42f1 SHA512 84f16ce17c7c6502b284142bcc327e952193d66f0704a3d71185ca9bf10aba39c326b40c6d405c4bb31a508ef30efc9743db13d1684af0b68f414bf6ecf38621 -EBUILD mercurial-9999.ebuild 4513 BLAKE2B 85b06df2426c259da319dc4a77769e4bf548bc214cbc82a8a1839c5f16a2f451482b9a00594f31481e060ffc0ed9f691dde17130fee4fa6d037b04a34e9915df SHA512 e546ab2e43ad77f09e21fcc56e694788e2b0131d25f04efab9201e5738912b6ee0ea31f69395d7775ecaa9bdd259ab3cdb4a88d7b01b65a3283a8d9799e61784 +EBUILD mercurial-5.3.2-r1.ebuild 4061 BLAKE2B 1135129a08a06458507b03f4eaa79c0868129838b1f640a663bac5e004acb97eb046ec85ff27305f64bcbf90f31c9ef3df5e204372ea7c47ab710bf5eda43e05 SHA512 9b56c6ff01ac0d2d915972b8e31f8f3fecf60819876980486207a22e11e33cb8d8578c012fb874e5c7eb4778a773c377558a98132099432f3c9d1f2bb518db79 +EBUILD mercurial-5.4.2-r1.ebuild 4070 BLAKE2B c591b7b7e2ec5edf47919096b3fcd4582f91c957f20e941740f4f159252e7126cc6d1eac617bc8ee3771e1de4ae09d0ba42712c0296f7fed8d5f33d0f9e5ef23 SHA512 7f14eda309b98f1a504f54b049672c9adc685b4b367fcf5e52fb0c0c6b35e9bb1fa7cad051d972e491c2fcdfe583338f5cb1482031ba65225f080926717505e6 +EBUILD mercurial-5.5.2.ebuild 4068 BLAKE2B 4779f0acc1c1cf18f72ce02f4a0f79068c94339fad43da91675e96e5345bf904755c3e6158953aebe4ec2f50c60d2971b3824e69f41dd78aeeb69d08ffb3de73 SHA512 2f225325f467bfe8f7a1ff10d7ce68346491f94d79e1934e90bd8a958d71c6704cc1f99d17572cbfaf712dbe383314aef7cf5962e6c462555067159719d6e341 +EBUILD mercurial-5.6.1-r1.ebuild 6452 BLAKE2B 4d5f10dc12eb85436a06a547adda636df7f65606896d8d00f69a0c5dc1596f4ad7a4df78fbb5e0084fec914db8ec14b6643cf6155b2abbfc9340764eeaa6a845 SHA512 34a51b64187d3c789aa66434b3465616e7dd8d53b04166d23954bc1a91816c4db37199490f261893d90ca2dd076238400197ac07b4ec56089195ef5140d8bfcd +EBUILD mercurial-9999.ebuild 4526 BLAKE2B 210c4f0d5baa666940306705bb8af3ec440b70b1c77e28a1d33df65c39bae44dba7177315bc56477f1a474ce56ed91d2a9f4adc067b59cd8c5f20d18c3ce10ad SHA512 9036efd4e9797021527384ea21b5bcb2016d19515197a7617c5b3c4b55e7525eb17c05e4cf41e841dc3f52d4f4ddbb1b2e5356e5d3d745b9c30a2fbfed9dd283 MISC metadata.xml 531 BLAKE2B a9536112ae921c160f7ac8535c50cb25743fa72bfa92529874eb5888c7d968d68080e4516c531143870cefdc7d78efa7e816b042c540bd0c7785a34dfcc133f9 SHA512 ee4dae2ce506e6c5968f1d917e43839366eefec2ba7ad3119b8a61ee527449fbeb87b51bea2b826ef184bfa322825b4e8bf7693d26d063e117773ac9d15fbc08 diff --git a/dev-vcs/mercurial/mercurial-5.3.2-r1.ebuild b/dev-vcs/mercurial/mercurial-5.3.2-r1.ebuild index 9af5663d506d..3ca9f5afad92 100644 --- a/dev-vcs/mercurial/mercurial-5.3.2-r1.ebuild +++ b/dev-vcs/mercurial/mercurial-5.3.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+chg emacs gpg test tk zsh-completion" RDEPEND=" diff --git a/dev-vcs/mercurial/mercurial-5.4.2-r1.ebuild b/dev-vcs/mercurial/mercurial-5.4.2-r1.ebuild index 3ef8953a826d..c459e7ba7c89 100644 --- a/dev-vcs/mercurial/mercurial-5.4.2-r1.ebuild +++ b/dev-vcs/mercurial/mercurial-5.4.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+chg emacs gpg test tk zsh-completion" RDEPEND=" diff --git a/dev-vcs/mercurial/mercurial-5.5.2.ebuild b/dev-vcs/mercurial/mercurial-5.5.2.ebuild index 55e3867a5aeb..319588387d15 100644 --- a/dev-vcs/mercurial/mercurial-5.5.2.ebuild +++ b/dev-vcs/mercurial/mercurial-5.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+chg emacs gpg test tk zsh-completion" RDEPEND=" diff --git a/dev-vcs/mercurial/mercurial-5.6.1-r1.ebuild b/dev-vcs/mercurial/mercurial-5.6.1-r1.ebuild new file mode 100644 index 000000000000..b01721363053 --- /dev/null +++ b/dev-vcs/mercurial/mercurial-5.6.1-r1.ebuild @@ -0,0 +1,294 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..8} ) +PYTHON_REQ_USE="threads(+)" +DISTUTILS_USE_SETUPTOOLS=no +CARGO_OPTIONAL=1 + +CRATES=" +adler-0.2.3 +aho-corasick-0.7.13 +ansi_term-0.11.0 +atty-0.2.14 +autocfg-1.0.1 +bitflags-1.2.1 +byteorder-1.3.4 +cc-1.0.60 +cfg-if-0.1.10 +clap-2.33.3 +cpython-0.4.1 +crc32fast-1.2.0 +crossbeam-0.7.3 +crossbeam-channel-0.4.4 +crossbeam-deque-0.7.3 +crossbeam-epoch-0.8.2 +crossbeam-queue-0.2.3 +crossbeam-utils-0.7.2 +ctor-0.1.16 +difference-2.0.0 +either-1.6.1 +env_logger-0.7.1 +flate2-1.0.17 +fuchsia-cprng-0.1.1 +gcc-0.3.55 +getrandom-0.1.15 +glob-0.3.0 +hermit-abi-0.1.16 +hex-0.4.2 +humantime-1.3.0 +itertools-0.9.0 +jobserver-0.1.21 +lazy_static-1.4.0 +libc-0.2.77 +libz-sys-1.1.2 +log-0.4.11 +maybe-uninit-2.0.0 +memchr-2.3.3 +memmap-0.7.0 +memoffset-0.5.6 +micro-timer-0.3.1 +micro-timer-macros-0.3.1 +miniz_oxide-0.4.2 +num-traits-0.2.12 +num_cpus-1.13.0 +output_vt100-0.1.2 +pkg-config-0.3.18 +ppv-lite86-0.2.9 +pretty_assertions-0.6.1 +proc-macro2-1.0.21 +python27-sys-0.4.1 +python3-sys-0.4.1 +quick-error-1.2.3 +quote-1.0.7 +rand-0.3.23 +rand-0.4.6 +rand-0.7.3 +rand_chacha-0.2.2 +rand_core-0.3.1 +rand_core-0.4.2 +rand_core-0.5.1 +rand_distr-0.2.2 +rand_hc-0.2.0 +rand_pcg-0.2.1 +rayon-1.4.0 +rayon-core-1.8.1 +rdrand-0.4.0 +redox_syscall-0.1.57 +regex-1.3.9 +regex-syntax-0.6.18 +remove_dir_all-0.5.3 +rust-crypto-0.2.36 +rustc-serialize-0.3.24 +same-file-1.0.6 +scopeguard-1.1.0 +strsim-0.8.0 +syn-1.0.41 +tempfile-3.1.0 +termcolor-1.1.0 +textwrap-0.11.0 +thread_local-1.0.1 +time-0.1.44 +twox-hash-1.5.0 +unicode-width-0.1.8 +unicode-xid-0.2.1 +vcpkg-0.2.10 +vec_map-0.8.2 +wasi-0.10.0+wasi-snapshot-preview1 +wasi-0.9.0+wasi-snapshot-preview1 +winapi-0.3.9 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-util-0.1.5 +winapi-x86_64-pc-windows-gnu-0.4.0 +zstd-0.5.3+zstd.1.4.5 +zstd-safe-2.0.5+zstd.1.4.5 +zstd-sys-1.4.17+zstd.1.4.5 +" + +inherit bash-completion-r1 cargo 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 + rust? ( $(cargo_crate_uris ${CRATES}) )" + +LICENSE="GPL-2+ + rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT PSF-2 Unlicense )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+chg emacs gpg test tk rust zsh-completion" + +BDEPEND="rust? ( ${RUST_DEPEND} )" +RDEPEND=" + app-misc/ca-certificates + dev-python/zstandard[${PYTHON_USEDEP}] + gpg? ( app-crypt/gnupg ) + tk? ( dev-lang/tk ) + zsh-completion? ( app-shells/zsh )" + +DEPEND="emacs? ( >=app-editors/emacs-23.1:* ) + test? ( app-arch/unzip + dev-python/pygments[${PYTHON_USEDEP}] )" + +SITEFILE="70${PN}-gentoo.el" + +# Too many tests fail #608720 +RESTRICT="test" + +src_unpack() { + default_src_unpack + if use rust; then + local S="${S}/rust/hg-cpython" + cargo_src_unpack + fi +} + +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 + sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die + # Use absolute import for zstd + sed -i -e 's/from \.* import zstd/import zstandard as zstd/' \ + mercurial/utils/compression.py \ + mercurial/wireprotoframing.py || die + + distutils-r1_python_prepare_all +} + +src_compile() { + if use rust; then + pushd rust/hg-cpython || die + cargo_src_compile --no-default-features --features python3 + popd + fi + distutils-r1_src_compile +} + +python_compile() { + filter-flags -ftracer -ftree-vectorize + python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" + if use rust; then + local -x HGWITHRUSTEXT="cpython" + fi + distutils-r1_python_compile build_ext --no-zstd +} + +python_compile_all() { + rm -r contrib/win32 || die + if use chg; then + emake -C contrib/chg + fi + if use emacs; then + cd contrib || die + elisp-compile mercurial.el || die "elisp-compile failed!" + fi +} + +src_install() { + distutils-r1_src_install +} + +python_install() { + if use rust; then + local -x HGWITHRUSTEXT="cpython" + fi + distutils-r1_python_install build_ext --no-zstd +} + +python_install_all() { + distutils-r1_python_install_all + + newbashcomp contrib/bash_completion hg + + if use zsh-completion ; then + insinto /usr/share/zsh/site-functions + newins contrib/zsh_completion _hg + fi + + dobin hgeditor + if use tk; then + dobin contrib/hgk + fi + 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 plan9 *.el ) + + if use chg; then + dobin contrib/chg/chg + doman contrib/chg/chg.1 + RM_CONTRIB+=( chg ) + fi + + for f in ${RM_CONTRIB[@]}; do + rm -rf contrib/${f} || die + done + + dodoc -r contrib + docompress -x /usr/share/doc/${PF}/contrib + doman doc/*.? + dodoc CONTRIBUTORS hgweb.cgi + + 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-largefiles* # tends to time out + if [[ ${EUID} -eq 0 ]]; then + einfo "Removing tests which require user privileges to succeed" + rm -f test-convert* + rm -f test-lock-badness* + rm -f test-permissions* + rm -f test-pull-permission* + rm -f test-journal-exists* + rm -f test-repair-strip* + fi + + 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-5.6.ebuild b/dev-vcs/mercurial/mercurial-5.6.ebuild deleted file mode 100644 index 771b89bb678e..000000000000 --- a/dev-vcs/mercurial/mercurial-5.6.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..8} ) -PYTHON_REQ_USE="threads(+)" -DISTUTILS_USE_SETUPTOOLS=no -CARGO_OPTIONAL=1 - -CRATES=" -adler-0.2.3 -aho-corasick-0.7.13 -ansi_term-0.11.0 -atty-0.2.14 -autocfg-1.0.1 -bitflags-1.2.1 -byteorder-1.3.4 -cc-1.0.60 -cfg-if-0.1.10 -clap-2.33.3 -cpython-0.4.1 -crc32fast-1.2.0 -crossbeam-0.7.3 -crossbeam-channel-0.4.4 -crossbeam-deque-0.7.3 -crossbeam-epoch-0.8.2 -crossbeam-queue-0.2.3 -crossbeam-utils-0.7.2 -ctor-0.1.16 -difference-2.0.0 -either-1.6.1 -env_logger-0.7.1 -flate2-1.0.17 -fuchsia-cprng-0.1.1 -gcc-0.3.55 -getrandom-0.1.15 -glob-0.3.0 -hermit-abi-0.1.16 -hex-0.4.2 -humantime-1.3.0 -itertools-0.9.0 -jobserver-0.1.21 -lazy_static-1.4.0 -libc-0.2.77 -libz-sys-1.1.2 -log-0.4.11 -maybe-uninit-2.0.0 -memchr-2.3.3 -memmap-0.7.0 -memoffset-0.5.6 -micro-timer-0.3.1 -micro-timer-macros-0.3.1 -miniz_oxide-0.4.2 -num-traits-0.2.12 -num_cpus-1.13.0 -output_vt100-0.1.2 -pkg-config-0.3.18 -ppv-lite86-0.2.9 -pretty_assertions-0.6.1 -proc-macro2-1.0.21 -python27-sys-0.4.1 -python3-sys-0.4.1 -quick-error-1.2.3 -quote-1.0.7 -rand-0.3.23 -rand-0.4.6 -rand-0.7.3 -rand_chacha-0.2.2 -rand_core-0.3.1 -rand_core-0.4.2 -rand_core-0.5.1 -rand_distr-0.2.2 -rand_hc-0.2.0 -rand_pcg-0.2.1 -rayon-1.4.0 -rayon-core-1.8.1 -rdrand-0.4.0 -redox_syscall-0.1.57 -regex-1.3.9 -regex-syntax-0.6.18 -remove_dir_all-0.5.3 -rust-crypto-0.2.36 -rustc-serialize-0.3.24 -same-file-1.0.6 -scopeguard-1.1.0 -strsim-0.8.0 -syn-1.0.41 -tempfile-3.1.0 -termcolor-1.1.0 -textwrap-0.11.0 -thread_local-1.0.1 -time-0.1.44 -twox-hash-1.5.0 -unicode-width-0.1.8 -unicode-xid-0.2.1 -vcpkg-0.2.10 -vec_map-0.8.2 -wasi-0.10.0+wasi-snapshot-preview1 -wasi-0.9.0+wasi-snapshot-preview1 -winapi-0.3.9 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.5 -winapi-x86_64-pc-windows-gnu-0.4.0 -zstd-0.5.3+zstd.1.4.5 -zstd-safe-2.0.5+zstd.1.4.5 -zstd-sys-1.4.17+zstd.1.4.5 -" - -inherit bash-completion-r1 cargo 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 - rust? ( $(cargo_crate_uris ${CRATES}) )" - -LICENSE="GPL-2+ - rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT PSF-2 Unlicense )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+chg emacs gpg test tk rust zsh-completion" - -BDEPEND="rust? ( ${RUST_DEPEND} )" -RDEPEND=" - app-misc/ca-certificates - dev-python/zstandard[${PYTHON_USEDEP}] - gpg? ( app-crypt/gnupg ) - tk? ( dev-lang/tk ) - zsh-completion? ( app-shells/zsh )" - -DEPEND="emacs? ( >=app-editors/emacs-23.1:* ) - test? ( app-arch/unzip - dev-python/pygments[${PYTHON_USEDEP}] )" - -SITEFILE="70${PN}-gentoo.el" - -# Too many tests fail #608720 -RESTRICT="test" - -src_unpack() { - default_src_unpack - if use rust; then - local S="${S}/rust/hg-cpython" - cargo_src_unpack - fi -} - -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 - sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die - # Use absolute import for zstd - sed -i -e 's/from \.* import zstd/import zstd/' \ - mercurial/utils/compression.py \ - mercurial/wireprotoframing.py || die - - distutils-r1_python_prepare_all -} - -src_compile() { - if use rust; then - pushd rust/hg-cpython || die - cargo_src_compile --no-default-features --features python3 - popd - fi - distutils-r1_src_compile -} - -python_compile() { - filter-flags -ftracer -ftree-vectorize - python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" - if use rust; then - local -x HGWITHRUSTEXT="cpython" - fi - distutils-r1_python_compile build_ext --no-zstd -} - -python_compile_all() { - rm -r contrib/win32 || die - if use chg; then - emake -C contrib/chg - fi - if use emacs; then - cd contrib || die - elisp-compile mercurial.el || die "elisp-compile failed!" - fi -} - -src_install() { - distutils-r1_src_install -} - -python_install() { - if use rust; then - local -x HGWITHRUSTEXT="cpython" - fi - distutils-r1_python_install build_ext --no-zstd -} - -python_install_all() { - distutils-r1_python_install_all - - newbashcomp contrib/bash_completion hg - - if use zsh-completion ; then - insinto /usr/share/zsh/site-functions - newins contrib/zsh_completion _hg - fi - - dobin hgeditor - if use tk; then - dobin contrib/hgk - fi - 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 plan9 *.el ) - - if use chg; then - dobin contrib/chg/chg - doman contrib/chg/chg.1 - RM_CONTRIB+=( chg ) - fi - - for f in ${RM_CONTRIB[@]}; do - rm -rf contrib/${f} || die - done - - dodoc -r contrib - docompress -x /usr/share/doc/${PF}/contrib - doman doc/*.? - dodoc CONTRIBUTORS hgweb.cgi - - 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-largefiles* # tends to time out - if [[ ${EUID} -eq 0 ]]; then - einfo "Removing tests which require user privileges to succeed" - rm -f test-convert* - rm -f test-lock-badness* - rm -f test-permissions* - rm -f test-pull-permission* - rm -f test-journal-exists* - rm -f test-repair-strip* - fi - - 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-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild index e30523a3f04d..05d2c5893157 100644 --- a/dev-vcs/mercurial/mercurial-9999.ebuild +++ b/dev-vcs/mercurial/mercurial-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -53,7 +53,7 @@ python_prepare_all() { sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die sed -i -e '/ hgenv =/a\' -e ' hgenv.pop("PYTHONPATH", None)' setup.py || die # Use absolute import for zstd - sed -i -e 's/from \.* import zstd/import zstd/' \ + sed -i -e 's/from \.* import zstd/import zstandard as zstd/' \ mercurial/utils/compression.py \ mercurial/wireprotoframing.py || die -- cgit v1.2.3