From 1c382dc5dbc52576ac2300fee0498af8af44e7b4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 14 Jun 2023 15:21:15 +0100 Subject: Revert "gentoo auto-resync : 14:06:2023 - 15:13:45" This reverts commit b9e8f3cc44aed3b6da71c7510c6287bf7bbbc66b. --- dev-vcs/Manifest.gz | Bin 11514 -> 11511 bytes dev-vcs/gitolite/Manifest | 2 +- dev-vcs/gitolite/gitolite-3.6.12.ebuild | 4 +- dev-vcs/mercurial/Manifest | 6 +- dev-vcs/mercurial/mercurial-6.4.4.ebuild | 346 ------------------------------- dev-vcs/mercurial/mercurial-6.4.ebuild | 346 +++++++++++++++++++++++++++++++ dev-vcs/mercurial/mercurial-9999.ebuild | 4 +- 7 files changed, 354 insertions(+), 354 deletions(-) delete mode 100644 dev-vcs/mercurial/mercurial-6.4.4.ebuild create mode 100644 dev-vcs/mercurial/mercurial-6.4.ebuild (limited to 'dev-vcs') diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz index b7e75f628fe4..7ea56834062b 100644 Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest index 87400e77adbe..88b36029a61c 100644 --- a/dev-vcs/gitolite/Manifest +++ b/dev-vcs/gitolite/Manifest @@ -3,5 +3,5 @@ DIST gitolite-3.6.11.tar.gz 198340 BLAKE2B 9daf1e2cb2ebdca652d87aaa67b433174d35e DIST gitolite-3.6.12.tar.gz 203704 BLAKE2B b70bd8108f6c9d0e6d8776ab4338c523b0f27db305974fa40a0e074908302f8a8803fcf2f88a4c3e9972311b400142d7e3f9569d7ebd86f7343e2b70e3701d6e SHA512 f6a7f4daf8a6f73db823a95cd677c1c436e04a05460a239b5844468cf0f3e6f8da1b1cd86d98c84bb8e80e5ca446c9afd0ca221cce622398c0d0a3ce18062c22 EBUILD gitolite-2.3.1-r2.ebuild 1448 BLAKE2B 5635d6b5666137d57635d399edf6c9d8715f509019848cadaa69f297d7c340361ea2c12e5b22b3f5ecf877cf4e231268142a0e50da25d92defdfec6c3dd3854e SHA512 1a313c4ad8bf4dc6c61c569cdf0ca1ba3f8f566f2156756c6fd3f4881b7330b299f8e6a6e4b1b774dabfb6f271323ea686d093f928d19a69f173362c500baeb2 EBUILD gitolite-3.6.11-r1.ebuild 2287 BLAKE2B 24af50177b11371b4fb2094c14abcaf7a956d65eb5a4c291effa16ad8e3699696e54460719f547e569309ec500ba40cd0861ff7481c8195aab6b10d848efb8a4 SHA512 7cc604adfc2640b91f55920c7fc757b29790bde29ca8c71fe2fea2614090528498e89a0f1f68b08b351312f10d84636b2f002c6624a05e04bc27fa4d80ba95cd -EBUILD gitolite-3.6.12.ebuild 2229 BLAKE2B 260921d1efe98e811bff14d4af8cb820943a8261422493de18d12e25526b1445a1dd79bc6310ddcc3c8e18ccf688a13810612b3f46c7b6276573ba1df68798c3 SHA512 6db7fcf4bc9c2ca4a8ac9ee5ba1476bb9494077f36924bcce347c728fcc22b714d3372bae0feab138a93acf0bf3c7d961560033d25348accf0a8e881c1e4e37c +EBUILD gitolite-3.6.12.ebuild 2232 BLAKE2B 25d8c01b2be10e2cd44f34d20092ac74f5ce90f46260f3539b1a76d5e119f9873a56a1b92e07a5cec2e2cc4a4d8a13f70d037e405a17a203c637adbfabbdb625 SHA512 7fed40fe0e4002c7ef7748b0d9bb986d20f176bf01e346a8346c9a8a903c43141e74c8fc8e8976e9eba0dd14a967b5143f30247bd932757f77d5ef0b9389d740 MISC metadata.xml 782 BLAKE2B 4200d317ed8e94aec00251d532408b25ac3b93433f136870bd2d991517eb3360064a5a2514f4d8fa12a53b699107a971aed65ee474d9391b0436c34a85625412 SHA512 e0bec70e3165fb253fa01a57133f5dc592117e8a5679a545902b18266b137bca1083998af8fa771c826a89915cd3c0bb2ea7b848c453bdc740d25a83f595dcc4 diff --git a/dev-vcs/gitolite/gitolite-3.6.12.ebuild b/dev-vcs/gitolite/gitolite-3.6.12.ebuild index f3da6586996a..99fac58cfa00 100644 --- a/dev-vcs/gitolite/gitolite-3.6.12.ebuild +++ b/dev-vcs/gitolite/gitolite-3.6.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/sitaramc/${PN}.git" else SRC_URI="https://github.com/sitaramc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm x86" + KEYWORDS="~amd64 ~arm ~x86" fi LICENSE="GPL-2" diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index b14f362d7471..67cd773c60a8 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -125,7 +125,7 @@ DIST memoffset-0.6.1.crate 7706 BLAKE2B 351e6ff24a61b1016e7749571e1e66dae370c587 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f DIST mercurial-6.2.3.tar.gz 8058864 BLAKE2B 72d710985298f17b2940b0a5cda896e8cadb881db0c9293c2c32ff3c2100dc2291fa314157b433eb05a5a25a442c0e0ae021a5abf7c477885a1e39201f5b0b0a SHA512 0d82582e6d40ceabcc32419bf0423dd9f49b72b72c91a0f575181f92b355699a88f0426a192c46ca47f3105e47cb45dc3ac1a6499f4c83e01fa31e31c1ffdfbb DIST mercurial-6.3.2.tar.gz 8092710 BLAKE2B c64759736719af4a675abddd0f4d3578c815fc11a1644c52d7aaddfafb547faf018253d9a47e6ac869e7c1de91ca518b0106e77104e998deed9cbeadd6d3cee2 SHA512 5ca7e448bf336c2a2d4db174c4f486f66f41eef33db14f152abb09b8d82416124d251784cb5898499580083ca104113d0763e27baa9b77feb90ba2fd96d40be5 -DIST mercurial-6.4.4.tar.gz 8182450 BLAKE2B 620d20c64830b6eebe153b786e4e656140760e05f369931173f88702651073bd285144dccfcc2455e1169278c8eb7c673a9051a128a8698f18f7eb2982fd36e5 SHA512 6b97eaa10d2367dc583160170e74535e2c863ccc02e3d5527467769ce0b2db78a5496a48bad0f812a1bff5a9afec7751eea88edcefb06d052b9632a16da08c0f +DIST mercurial-6.4.tar.gz 8169322 BLAKE2B 37fa6e1af0928bffff706dc023d23880af6248df25c8725b0bd769efc7b24364318971d1f8c89212a58489e0e231e5e7755f13bee71c0db6875eab2b9d6490aa SHA512 a7810eddd0fd2a331215a5f7e9c81df4d860cf695aec3c5e3984821827b5427b5a01b68c07b9711e86db2f9b0ef5b5d3d6251a7dc76f99375c457920ce36c96f DIST micro-timer-0.4.0.crate 3513 BLAKE2B cc189b0db3d6fff554dec8548243894f70ea0445e095179bbe5b0d06dae4de6c09bcded31f00507d2f238523a3ef300e25054102d37cc4768aeef569ee7fc6a0 SHA512 33f1b5c65d9fb293fd86d52509687b7f9adb7af6bdcb3904f24740a9ad58ba9b30987d2a63fc19afcd6a55467f294ab098401f53bafafbd15c48b30d87232585 DIST micro-timer-macros-0.4.0.crate 2929 BLAKE2B df30df7ca02b79c13d375b71efdedfe33feb836f52b7889ea842e6d98441434022554986a4cc69e995203ca5906ccc9676653015ac7e1015d55cfa62b7bba908 SHA512 e1f141a0d331078be270cb9ad623348c39e18d355b32822f5285f29e325f1cc5d07d8833c130f03a43783590ccc4076d950d96b10468999f4285bcb521e194d0 DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7 @@ -246,6 +246,6 @@ DIST zstd-sys-1.4.18+zstd.1.4.7.crate 1883425 BLAKE2B 4441515efe6ef0042306917290 DIST zstd-sys-2.0.7+zstd.1.5.4.crate 732100 BLAKE2B 1859d1feb7c31d53df56b198b88a391bf09e221d09d449878043dc780ae6e3b3a0ad05fe3fb4980e849ab914f68d281d41f51f7bbceec6e1403d9b4e25572b4c SHA512 dcddc4f0d7486ee144df4e2173536dc02c9714b6f702edb9a9e04b4c02f4d347b5a70fbc020c1d08c079d38a423c4dc8b6b86e7e43ec3ccfcc8e3ff9861be11b EBUILD mercurial-6.2.3.ebuild 6971 BLAKE2B 569c1827e157add852cedba5b554f667d5cdeeb57cb7cec190514cd8f40e820bc19a4130f460e1f78a92d8a7567b512919c1ffbef3a28e7ff8fce690687ef22a SHA512 bdffcbe0119e2cf2277942be9cb12e69bd0b423e6e7bd72fe051fee2a28d18b2f7ace5eaf6cf9dec450ae07f67271d17303f55ac94b87f72b32954008562832c EBUILD mercurial-6.3.2.ebuild 7068 BLAKE2B aefdad4370973fe554b98c32853aed22b2e73569dadbae3975c31de14539a58a588387d197fe0229464b881b50591e0637f14cdadc96f9c05161f2362cac7d6f SHA512 325a7a9c393a73ec9196e05ab139d9ef8bcf779ce6d17641e83ade8ea9d36a981e88ac5eef077d2db79d2bd33bc930d3157714d5d09a15ec6ac42094fc753c89 -EBUILD mercurial-6.4.4.ebuild 7493 BLAKE2B 0d12207458c9bc95ee3469018331740d9ddbb1acb9ae7747e5880c8f4c1a619696270d9bb0a29128de4345a78bfa88418352b50ebc2f5c9197d9ad97a7fa367e SHA512 63fbb42278e1d6f45389ccdf649a383d7a8fe606caabef620660da634a6118cf30c423b4070a00b9f1d7698b04fb0cba2971701a3e54fc95fa8bab4536ab0748 -EBUILD mercurial-9999.ebuild 4333 BLAKE2B 019501d9b0753e69b9f0796b1569790a23b544bbc1a5d75e3e55ab335cc60d983024689462b1d3f384e8b8e51d710b16ec0578657e99c9ae961640312c168e7c SHA512 244d34ddf4f95a4c783e5d4b4a28e9bf803ea79d8165099fdeddbe379ec1420b1d55bdac0f51fa3121d66f9efb4716f3b63c0c3ce03ea08ad4c05c3ec6f84b81 +EBUILD mercurial-6.4.ebuild 7493 BLAKE2B 2e6af527623d9edb086215a048312ca4787c4281961aee517e3d8bca3f252d85f3a87a6bb761d922cfea7bf9863f8dd40ca91eb7b7297997e5423ec73442d23f SHA512 e05016c9f9fe2f3a58cea61a52b60eb6b2b8959dd517c19bc65457063e00db211252b94b93e6b678cdffc50d5771c4eb4cfb01b5482681010634014c654de947 +EBUILD mercurial-9999.ebuild 4352 BLAKE2B 69b81c1d9b36ca5d5866e74409e53e8aa72605bbd3f77d94a90a56a211e8ab00c7df7fb8372732f5aa1af747e05677147a056b322fa5bf917cf15329eb28eee4 SHA512 348de31e06db802e2b27dceea6fb441a88a1a97bda2745746a00018b508da7da6206acb138ec1b307f02baca186360bc0f3bf42640955bbde70ef29d2c6c74b6 MISC metadata.xml 543 BLAKE2B 648353ce40bb4e93585e0f34b7bd7eba764b421ae9962835d2e00ae6e893e1b0c9f7e94e1e3548f098a57f5901840986784e5c7e163679b41f6475ff9ba190ce SHA512 e6850e1b5088298ad42f2a9ce5313a4c974562242ee77e7af5c53bcb91bddb1676a24690a14d67dbac911735aaef462d70019b6fb764e1e17556df29b0ac7e1b diff --git a/dev-vcs/mercurial/mercurial-6.4.4.ebuild b/dev-vcs/mercurial/mercurial-6.4.4.ebuild deleted file mode 100644 index 74741a745c30..000000000000 --- a/dev-vcs/mercurial/mercurial-6.4.4.ebuild +++ /dev/null @@ -1,346 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CARGO_OPTIONAL=1 -DISTUTILS_EXT=1 -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python3_{9..12} ) -PYTHON_REQ_USE="threads(+)" - -CRATES=" - Inflector-0.11.4 - adler-1.0.2 - ahash-0.8.2 - aho-corasick-0.7.19 - aliasable-0.1.3 - android_system_properties-0.1.5 - atty-0.2.14 - autocfg-1.1.0 - bitflags-1.3.2 - bitmaps-2.1.0 - block-buffer-0.9.0 - block-buffer-0.10.3 - bumpalo-3.11.1 - byteorder-1.4.3 - bytes-cast-0.3.0 - bytes-cast-derive-0.2.0 - cc-1.0.76 - cfg-if-1.0.0 - chrono-0.4.23 - clap-4.0.24 - clap_derive-4.0.21 - clap_lex-0.3.0 - codespan-reporting-0.11.1 - convert_case-0.4.0 - core-foundation-sys-0.8.3 - cpufeatures-0.2.5 - cpython-0.7.1 - crc32fast-1.3.2 - crossbeam-channel-0.5.6 - crossbeam-deque-0.8.2 - crossbeam-epoch-0.9.11 - crossbeam-utils-0.8.12 - crypto-common-0.1.6 - ctor-0.1.26 - cxx-1.0.81 - cxx-build-1.0.81 - cxxbridge-flags-1.0.81 - cxxbridge-macro-1.0.81 - derive_more-0.99.17 - diff-0.1.13 - digest-0.9.0 - digest-0.10.5 - either-1.8.0 - env_logger-0.9.3 - fastrand-1.8.0 - flate2-1.0.24 - format-bytes-0.3.0 - format-bytes-macros-0.4.0 - generic-array-0.14.6 - getrandom-0.1.16 - getrandom-0.2.8 - hashbrown-0.13.1 - heck-0.4.0 - hermit-abi-0.1.19 - hex-0.4.3 - home-0.5.4 - humantime-2.1.0 - iana-time-zone-0.1.53 - iana-time-zone-haiku-0.1.1 - im-rc-15.1.0 - instant-0.1.12 - itertools-0.10.5 - jobserver-0.1.25 - js-sys-0.3.60 - lazy_static-1.4.0 - libc-0.2.137 - libm-0.2.6 - libz-sys-1.1.8 - link-cplusplus-1.0.7 - log-0.4.17 - logging_timer-1.1.0 - logging_timer_proc_macros-1.1.0 - memchr-2.5.0 - memmap2-0.5.8 - memoffset-0.6.5 - miniz_oxide-0.5.4 - num-integer-0.1.45 - num-traits-0.2.15 - num_cpus-1.14.0 - once_cell-1.16.0 - opaque-debug-0.3.0 - os_str_bytes-6.4.0 - ouroboros-0.15.5 - ouroboros_macro-0.15.5 - output_vt100-0.1.3 - paste-1.0.9 - pkg-config-0.3.26 - ppv-lite86-0.2.17 - pretty_assertions-1.3.0 - proc-macro-error-1.0.4 - proc-macro-error-attr-1.0.4 - proc-macro2-1.0.47 - python3-sys-0.7.1 - quote-1.0.21 - rand-0.7.3 - rand-0.8.5 - rand_chacha-0.2.2 - rand_chacha-0.3.1 - rand_core-0.5.1 - rand_core-0.6.4 - rand_distr-0.4.3 - rand_hc-0.2.0 - rand_pcg-0.3.1 - rand_xoshiro-0.6.0 - rayon-1.7.0 - rayon-core-1.11.0 - redox_syscall-0.2.16 - regex-1.7.0 - regex-syntax-0.6.28 - remove_dir_all-0.5.3 - rustc_version-0.4.0 - same-file-1.0.6 - scopeguard-1.1.0 - scratch-1.0.2 - semver-1.0.14 - sha-1-0.9.8 - sha-1-0.10.0 - sized-chunks-0.6.5 - stable_deref_trait-1.2.0 - static_assertions-1.1.0 - strsim-0.10.0 - syn-1.0.103 - tempfile-3.3.0 - termcolor-1.1.3 - thread_local-1.1.4 - time-0.1.44 - twox-hash-1.6.3 - typenum-1.15.0 - unicode-ident-1.0.5 - unicode-width-0.1.10 - users-0.11.0 - vcpkg-0.2.15 - vcsgraph-0.2.0 - version_check-0.9.4 - wasi-0.9.0+wasi-snapshot-preview1 - wasi-0.10.0+wasi-snapshot-preview1 - wasi-0.11.0+wasi-snapshot-preview1 - wasm-bindgen-0.2.83 - wasm-bindgen-backend-0.2.83 - wasm-bindgen-macro-0.2.83 - wasm-bindgen-macro-support-0.2.83 - wasm-bindgen-shared-0.2.83 - which-4.3.0 - 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 - yansi-0.5.1 - zstd-0.12.3+zstd.1.5.2 - zstd-safe-6.0.4+zstd.1.5.4 - zstd-sys-2.0.7+zstd.1.5.4 -" - -inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing - -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 MPL-2.0 PSF-2 Unicode-DFS-2016 Unlicense ZLIB )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+chg emacs gpg test tk rust" - -BDEPEND="rust? ( ${RUST_DEPEND} )" -RDEPEND=" - app-misc/ca-certificates - gpg? ( app-crypt/gnupg ) - tk? ( dev-lang/tk )" - -DEPEND="emacs? ( >=app-editors/emacs-23.1:* ) - test? ( - app-arch/unzip - dev-python/pygments[${PYTHON_USEDEP}] - )" - -SITEFILE="70${PN}-gentoo.el" - -RESTRICT="!test? ( 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 - - distutils-r1_python_prepare_all -} - -src_compile() { - if use rust; then - pushd rust/hg-cpython || die - cargo_src_compile --no-default-features --jobs $(makeopts_jobs) - popd || die - fi - distutils-r1_src_compile -} - -python_compile() { - filter-flags -ftracer -ftree-vectorize - if use rust; then - local -x HGWITHRUSTEXT="cpython" - fi - distutils-r1_python_compile build_ext -} - -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 - python_doscript contrib/hg-ssh -} - -python_install_all() { - distutils-r1_python_install_all - - newbashcomp contrib/bash_completion hg - - insinto /usr/share/zsh/site-functions - newins contrib/zsh_completion _hg - - dobin hgeditor - if use tk; then - dobin contrib/hgk - fi - - 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 - rm -f test-https* # requires to support tls1.0 - rm -rf test-removeemptydirs* # requires access to access parent directories - 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() { - if [[ ${EPYTHON} == python3.10 ]]; then - einfo "Skipping tests for unsupported Python 3.10" - return - fi - distutils_install_for_testing - cd tests || die - PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py \ - --jobs $(makeopts_jobs) \ - --timeout 0 \ - || 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-6.4.ebuild b/dev-vcs/mercurial/mercurial-6.4.ebuild new file mode 100644 index 000000000000..13b63deaf00c --- /dev/null +++ b/dev-vcs/mercurial/mercurial-6.4.ebuild @@ -0,0 +1,346 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CARGO_OPTIONAL=1 +DISTUTILS_EXT=1 +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="threads(+)" + +CRATES=" + Inflector-0.11.4 + adler-1.0.2 + ahash-0.8.2 + aho-corasick-0.7.19 + aliasable-0.1.3 + android_system_properties-0.1.5 + atty-0.2.14 + autocfg-1.1.0 + bitflags-1.3.2 + bitmaps-2.1.0 + block-buffer-0.9.0 + block-buffer-0.10.3 + bumpalo-3.11.1 + byteorder-1.4.3 + bytes-cast-0.3.0 + bytes-cast-derive-0.2.0 + cc-1.0.76 + cfg-if-1.0.0 + chrono-0.4.23 + clap-4.0.24 + clap_derive-4.0.21 + clap_lex-0.3.0 + codespan-reporting-0.11.1 + convert_case-0.4.0 + core-foundation-sys-0.8.3 + cpufeatures-0.2.5 + cpython-0.7.1 + crc32fast-1.3.2 + crossbeam-channel-0.5.6 + crossbeam-deque-0.8.2 + crossbeam-epoch-0.9.11 + crossbeam-utils-0.8.12 + crypto-common-0.1.6 + ctor-0.1.26 + cxx-1.0.81 + cxx-build-1.0.81 + cxxbridge-flags-1.0.81 + cxxbridge-macro-1.0.81 + derive_more-0.99.17 + diff-0.1.13 + digest-0.9.0 + digest-0.10.5 + either-1.8.0 + env_logger-0.9.3 + fastrand-1.8.0 + flate2-1.0.24 + format-bytes-0.3.0 + format-bytes-macros-0.4.0 + generic-array-0.14.6 + getrandom-0.1.16 + getrandom-0.2.8 + hashbrown-0.13.1 + heck-0.4.0 + hermit-abi-0.1.19 + hex-0.4.3 + home-0.5.4 + humantime-2.1.0 + iana-time-zone-0.1.53 + iana-time-zone-haiku-0.1.1 + im-rc-15.1.0 + instant-0.1.12 + itertools-0.10.5 + jobserver-0.1.25 + js-sys-0.3.60 + lazy_static-1.4.0 + libc-0.2.137 + libm-0.2.6 + libz-sys-1.1.8 + link-cplusplus-1.0.7 + log-0.4.17 + logging_timer-1.1.0 + logging_timer_proc_macros-1.1.0 + memchr-2.5.0 + memmap2-0.5.8 + memoffset-0.6.5 + miniz_oxide-0.5.4 + num-integer-0.1.45 + num-traits-0.2.15 + num_cpus-1.14.0 + once_cell-1.16.0 + opaque-debug-0.3.0 + os_str_bytes-6.4.0 + ouroboros-0.15.5 + ouroboros_macro-0.15.5 + output_vt100-0.1.3 + paste-1.0.9 + pkg-config-0.3.26 + ppv-lite86-0.2.17 + pretty_assertions-1.3.0 + proc-macro-error-1.0.4 + proc-macro-error-attr-1.0.4 + proc-macro2-1.0.47 + python3-sys-0.7.1 + quote-1.0.21 + rand-0.7.3 + rand-0.8.5 + rand_chacha-0.2.2 + rand_chacha-0.3.1 + rand_core-0.5.1 + rand_core-0.6.4 + rand_distr-0.4.3 + rand_hc-0.2.0 + rand_pcg-0.3.1 + rand_xoshiro-0.6.0 + rayon-1.7.0 + rayon-core-1.11.0 + redox_syscall-0.2.16 + regex-1.7.0 + regex-syntax-0.6.28 + remove_dir_all-0.5.3 + rustc_version-0.4.0 + same-file-1.0.6 + scopeguard-1.1.0 + scratch-1.0.2 + semver-1.0.14 + sha-1-0.9.8 + sha-1-0.10.0 + sized-chunks-0.6.5 + stable_deref_trait-1.2.0 + static_assertions-1.1.0 + strsim-0.10.0 + syn-1.0.103 + tempfile-3.3.0 + termcolor-1.1.3 + thread_local-1.1.4 + time-0.1.44 + twox-hash-1.6.3 + typenum-1.15.0 + unicode-ident-1.0.5 + unicode-width-0.1.10 + users-0.11.0 + vcpkg-0.2.15 + vcsgraph-0.2.0 + version_check-0.9.4 + wasi-0.9.0+wasi-snapshot-preview1 + wasi-0.10.0+wasi-snapshot-preview1 + wasi-0.11.0+wasi-snapshot-preview1 + wasm-bindgen-0.2.83 + wasm-bindgen-backend-0.2.83 + wasm-bindgen-macro-0.2.83 + wasm-bindgen-macro-support-0.2.83 + wasm-bindgen-shared-0.2.83 + which-4.3.0 + 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 + yansi-0.5.1 + zstd-0.12.3+zstd.1.5.2 + zstd-safe-6.0.4+zstd.1.5.4 + zstd-sys-2.0.7+zstd.1.5.4 +" + +inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing + +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 MPL-2.0 PSF-2 Unicode-DFS-2016 Unlicense ZLIB )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+chg emacs gpg test tk rust" + +BDEPEND="rust? ( ${RUST_DEPEND} )" +RDEPEND=" + app-misc/ca-certificates + gpg? ( app-crypt/gnupg ) + tk? ( dev-lang/tk )" + +DEPEND="emacs? ( >=app-editors/emacs-23.1:* ) + test? ( + app-arch/unzip + dev-python/pygments[${PYTHON_USEDEP}] + )" + +SITEFILE="70${PN}-gentoo.el" + +RESTRICT="!test? ( 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 + + distutils-r1_python_prepare_all +} + +src_compile() { + if use rust; then + pushd rust/hg-cpython || die + cargo_src_compile --no-default-features --jobs $(makeopts_jobs) + popd || die + fi + distutils-r1_src_compile +} + +python_compile() { + filter-flags -ftracer -ftree-vectorize + if use rust; then + local -x HGWITHRUSTEXT="cpython" + fi + distutils-r1_python_compile build_ext +} + +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 + python_doscript contrib/hg-ssh +} + +python_install_all() { + distutils-r1_python_install_all + + newbashcomp contrib/bash_completion hg + + insinto /usr/share/zsh/site-functions + newins contrib/zsh_completion _hg + + dobin hgeditor + if use tk; then + dobin contrib/hgk + fi + + 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 + rm -f test-https* # requires to support tls1.0 + rm -rf test-removeemptydirs* # requires access to access parent directories + 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() { + if [[ ${EPYTHON} == python3.10 ]]; then + einfo "Skipping tests for unsupported Python 3.10" + return + fi + distutils_install_for_testing + cd tests || die + PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py \ + --jobs $(makeopts_jobs) \ + --timeout 0 \ + || 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 13d27e773bce..5de63a36d19e 100644 --- a/dev-vcs/mercurial/mercurial-9999.ebuild +++ b/dev-vcs/mercurial/mercurial-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="threads(+)" DISTUTILS_USE_SETUPTOOLS=no CARGO_OPTIONAL=1 @@ -58,7 +58,7 @@ python_prepare_all() { src_compile() { if use rust; then pushd rust/hg-cpython || die - cargo_src_compile --no-default-features --jobs $(makeopts_jobs) + cargo_src_compile --no-default-features --features python3 --jobs $(makeopts_jobs) popd || die fi distutils-r1_src_compile -- cgit v1.2.3