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 9F9FD158043 for ; Sat, 13 Apr 2024 22:56:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C4C0E2A34; Sat, 13 Apr 2024 22:56:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 62DC8E2A34 for ; Sat, 13 Apr 2024 22:56:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 AADA934339F for ; Sat, 13 Apr 2024 22:56:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D451016E3 for ; Sat, 13 Apr 2024 22:56:29 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1713048948.de2d3b0c5f990d885aa2247aacd776393b203586.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/elpy/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emacs/elpy/elpy-1.35.0_p20220627-r1.ebuild app-emacs/elpy/elpy-1.35.0_p20220627.ebuild X-VCS-Directories: app-emacs/elpy/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: de2d3b0c5f990d885aa2247aacd776393b203586 X-VCS-Branch: master Date: Sat, 13 Apr 2024 22:56:29 +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: 72eb91c6-9b35-48b8-8af6-842e1738d51e X-Archives-Hash: ef3f4b1a606cb9f51aa9f9c45084c3fe commit: de2d3b0c5f990d885aa2247aacd776393b203586 Author: Maciej Barć gentoo org> AuthorDate: Sat Apr 13 22:06:07 2024 +0000 Commit: Maciej Barć gentoo org> CommitDate: Sat Apr 13 22:55:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2d3b0c app-emacs/elpy: enable py3.12 compat Closes: https://bugs.gentoo.org/929303 Closes: https://bugs.gentoo.org/885897 Signed-off-by: Maciej Barć gentoo.org> ...0627.ebuild => elpy-1.35.0_p20220627-r1.ebuild} | 47 +++++++++++++++------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild b/app-emacs/elpy/elpy-1.35.0_p20220627-r1.ebuild similarity index 52% rename from app-emacs/elpy/elpy-1.35.0_p20220627.ebuild rename to app-emacs/elpy/elpy-1.35.0_p20220627-r1.ebuild index eab92e1f5156..dbb7bd8ac1ba 100644 --- a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild +++ b/app-emacs/elpy/elpy-1.35.0_p20220627-r1.ebuild @@ -1,25 +1,33 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -[[ ${PV} == *_p20220627 ]] && COMMIT=de31d30003c515c25ff7bfd3a361c70c298f78bb - DISTUTILS_SINGLE_IMPL=ON DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 elisp DESCRIPTION="Emacs Python Development Environment" HOMEPAGE="https://github.com/jorgenschaefer/elpy/" -SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${COMMIT}.tar.gz - -> ${P}.tar.gz" -S="${WORKDIR}"/${PN}-${COMMIT} + +if [[ "${PV}" == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/jorgenschaefer/${PN}.git" +else + [[ "${PV}" == *_p20220627 ]] && COMMIT=de31d30003c515c25ff7bfd3a361c70c298f78bb + + SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${COMMIT}.tar.gz + -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + + KEYWORDS="~amd64 ~x86" +fi LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" @@ -29,7 +37,9 @@ RDEPEND=" app-emacs/pyvenv app-emacs/s app-emacs/yasnippet - $(python_gen_cond_dep 'dev-python/flake8[${PYTHON_USEDEP}]') + $(python_gen_cond_dep ' + dev-python/flake8[${PYTHON_USEDEP}] + ') " BDEPEND=" ${RDEPEND} @@ -42,9 +52,13 @@ BDEPEND=" ) " +ELISP_REMOVE=" + elpy/tests/test_black.py + elpy/tests/test_yapf.py +" PATCHES=( - "${FILESDIR}"/${PN}-elpy.el-yas-snippet-dirs.patch - "${FILESDIR}"/${PN}-elpy-rpc.el-elpy-rpc-pythonpath.patch + "${FILESDIR}/${PN}-elpy.el-yas-snippet-dirs.patch" + "${FILESDIR}/${PN}-elpy-rpc.el-elpy-rpc-pythonpath.patch" ) DOCS=( CONTRIBUTING.rst README.rst ) @@ -60,10 +74,13 @@ pkg_setup() { src_prepare() { distutils-r1_src_prepare - rm elpy/tests/test_black.py || die - sed -i "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" ${PN}.el || die - sed -i "s|@PYTHONLIB@|${EPREFIX}/usr/lib/${EPYTHON}|" ${PN}-rpc.el || die + sed -i "${PN}.el" -e "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" || die + sed -i "${PN}-rpc.el" -e "s|@PYTHONLIB@|${EPREFIX}/usr/lib/${EPYTHON}|" || die + + rm ${ELISP_REMOVE} || die + sed -i elpy/tests/support.py \ + -e "s|test_should_get_oneline_docstring_for_modules|disabled_&|" || die } src_compile() { @@ -79,6 +96,6 @@ src_install() { distutils-r1_src_install elisp_src_install - insinto ${SITEETC}/${PN} + insinto "${SITEETC}/${PN}" doins -r snippets }