From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C607D158091 for ; Sun, 12 Jun 2022 15:56:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3880E088B; Sun, 12 Jun 2022 15:56:44 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AC29FE088B for ; Sun, 12 Jun 2022 15:56:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 89A193417F4 for ; Sun, 12 Jun 2022 15:56:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D3D04FA for ; Sun, 12 Jun 2022 15:56:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1655049390.99b4ed561202399464b793b9ecc9e54cfa4efd4b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/mercurial/mercurial-6.1.3-r1.ebuild dev-vcs/mercurial/mercurial-9999.ebuild X-VCS-Directories: dev-vcs/mercurial/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 99b4ed561202399464b793b9ecc9e54cfa4efd4b X-VCS-Branch: master Date: Sun, 12 Jun 2022 15:56:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6fd89e13-ea45-4f19-8dea-44fd95bb83b4 X-Archives-Hash: 53b07c969ffdffb3d6a6b0dedfc8107f commit: 99b4ed561202399464b793b9ecc9e54cfa4efd4b Author: Sam James gentoo org> AuthorDate: Sun Jun 12 15:48:06 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 12 15:56:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99b4ed56 dev-vcs/mercurial: fix distutils-r1 usage Signed-off-by: Sam James gentoo.org> ...urial-9999.ebuild => mercurial-6.1.3-r1.ebuild} | 159 +++++++++++++++++++-- dev-vcs/mercurial/mercurial-9999.ebuild | 7 +- 2 files changed, 148 insertions(+), 18 deletions(-) diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-6.1.3-r1.ebuild similarity index 56% copy from dev-vcs/mercurial/mercurial-9999.ebuild copy to dev-vcs/mercurial/mercurial-6.1.3-r1.ebuild index 475f63f08987..997b55c94a9b 100644 --- a/dev-vcs/mercurial/mercurial-9999.ebuild +++ b/dev-vcs/mercurial/mercurial-6.1.3-r1.ebuild @@ -3,26 +3,155 @@ EAPI=8 -PYTHON_COMPAT=( python3_{7..11} ) +PYTHON_COMPAT=( python3_{8..11} ) PYTHON_REQ_USE="threads(+)" DISTUTILS_USE_SETUPTOOLS=no CARGO_OPTIONAL=1 -inherit bash-completion-r1 cargo elisp-common distutils-r1 mercurial flag-o-matic multiprocessing +CRATES=" + Inflector-0.11.4 + adler-0.2.3 + aho-corasick-0.7.15 + aliasable-0.1.3 + ansi_term-0.11.0 + atty-0.2.14 + autocfg-1.0.1 + bitflags-1.2.1 + bitmaps-2.1.0 + block-buffer-0.9.0 + byteorder-1.3.4 + bytes-cast-0.2.0 + bytes-cast-derive-0.1.0 + cc-1.0.66 + cfg-if-0.1.10 + cfg-if-1.0.0 + chrono-0.4.19 + clap-2.33.3 + const_fn-0.4.4 + cpufeatures-0.1.4 + cpython-0.7.0 + crc32fast-1.2.1 + crossbeam-channel-0.4.4 + crossbeam-channel-0.5.0 + crossbeam-deque-0.8.0 + crossbeam-epoch-0.9.1 + crossbeam-utils-0.7.2 + crossbeam-utils-0.8.1 + ctor-0.1.16 + derive_more-0.99.11 + difference-2.0.0 + digest-0.9.0 + either-1.6.1 + env_logger-0.7.1 + flate2-1.0.19 + format-bytes-0.3.0 + format-bytes-macros-0.4.0 + generic-array-0.14.4 + getrandom-0.1.15 + getrandom-0.2.4 + glob-0.3.0 + hermit-abi-0.1.17 + hex-0.4.3 + home-0.5.3 + humantime-1.3.0 + im-rc-15.0.0 + itertools-0.9.0 + jobserver-0.1.21 + lazy_static-1.4.0 + libc-0.2.124 + libm-0.2.1 + libz-sys-1.1.2 + log-0.4.11 + maybe-uninit-2.0.0 + memchr-2.3.4 + memmap2-0.4.0 + memoffset-0.6.1 + micro-timer-0.3.1 + micro-timer-macros-0.3.1 + miniz_oxide-0.4.3 + num-integer-0.1.44 + num-traits-0.2.14 + num_cpus-1.13.0 + opaque-debug-0.3.0 + ouroboros-0.15.0 + ouroboros_macro-0.15.0 + output_vt100-0.1.2 + paste-1.0.5 + pkg-config-0.3.19 + ppv-lite86-0.2.10 + pretty_assertions-0.6.1 + proc-macro-error-1.0.4 + proc-macro-error-attr-1.0.4 + proc-macro2-1.0.24 + python27-sys-0.7.0 + python3-sys-0.7.0 + quick-error-1.2.3 + quote-1.0.7 + rand-0.7.3 + rand-0.8.4 + rand_chacha-0.2.2 + rand_chacha-0.3.1 + rand_core-0.5.1 + rand_core-0.6.3 + rand_distr-0.4.2 + rand_hc-0.2.0 + rand_hc-0.3.1 + rand_pcg-0.3.1 + rand_xoshiro-0.4.0 + rayon-1.5.0 + rayon-core-1.9.0 + redox_syscall-0.1.57 + regex-1.4.2 + regex-syntax-0.6.21 + remove_dir_all-0.5.3 + same-file-1.0.6 + scopeguard-1.1.0 + sha-1-0.9.6 + sized-chunks-0.6.2 + stable_deref_trait-1.2.0 + static_assertions-1.1.0 + strsim-0.8.0 + syn-1.0.54 + tempfile-3.1.0 + termcolor-1.1.2 + textwrap-0.11.0 + thread_local-1.0.1 + time-0.1.44 + twox-hash-1.6.0 + typenum-1.12.0 + unicode-width-0.1.8 + unicode-xid-0.2.1 + users-0.11.0 + vcpkg-0.2.11 + vcsgraph-0.2.0 + vec_map-0.8.2 + version_check-0.9.2 + wasi-0.9.0+wasi-snapshot-preview1 + wasi-0.10.0+wasi-snapshot-preview1 + which-4.2.5 + 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 distutils-r1 flag-o-matic multiprocessing DESCRIPTION="Scalable distributed SCM" HOMEPAGE="https://www.mercurial-scm.org/" -EHG_REPO_URI="https://www.mercurial-scm.org/repo/hg" +SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz + rust? ( $(cargo_crate_uris ${CRATES}) )" -LICENSE="GPL-2+" +LICENSE="GPL-2+ + rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT MPL-2.0 PSF-2 Unlicense ZLIB )" SLOT="0" -KEYWORDS="" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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" -BDEPEND=" - dev-python/docutils[${PYTHON_USEDEP}] - rust? ( ${RUST_DEPEND} )" - +BDEPEND="rust? ( ${RUST_DEPEND} )" RDEPEND=" app-misc/ca-certificates gpg? ( app-crypt/gnupg ) @@ -32,17 +161,17 @@ 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() { - mercurial_src_unpack + default_src_unpack if use rust; then local S="${S}/rust/hg-cpython" - cargo_live_src_unpack + cargo_src_unpack fi } @@ -59,7 +188,7 @@ src_compile() { if use rust; then pushd rust/hg-cpython || die cargo_src_compile --no-default-features --features python3 --jobs $(makeopts_jobs) - popd + popd || die fi distutils-r1_src_compile } @@ -74,7 +203,6 @@ python_compile() { python_compile_all() { rm -r contrib/win32 || die - emake doc if use chg; then emake -C contrib/chg fi @@ -92,7 +220,9 @@ 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() { @@ -107,7 +237,6 @@ python_install_all() { 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!" diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild index 475f63f08987..1066ec0ea959 100644 --- a/dev-vcs/mercurial/mercurial-9999.ebuild +++ b/dev-vcs/mercurial/mercurial-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{7..11} ) +PYTHON_COMPAT=( python3_{8..11} ) PYTHON_REQ_USE="threads(+)" DISTUTILS_USE_SETUPTOOLS=no CARGO_OPTIONAL=1 @@ -59,7 +59,7 @@ src_compile() { if use rust; then pushd rust/hg-cpython || die cargo_src_compile --no-default-features --features python3 --jobs $(makeopts_jobs) - popd + popd || die fi distutils-r1_src_compile } @@ -92,7 +92,9 @@ 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() { @@ -107,7 +109,6 @@ python_install_all() { 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!"