gentoo auto-resync : 15:04:2024 - 12:04:02

2 files changed, 33 insertions, 16 deletions

diff --git a/app-emacs/elpy/Manifest b/app-emacs/elpy/Manifest
index 9ce651fa4159..a8b578684aaa 100644
--- a/app-emacs/elpy/Manifest
+++ b/app-emacs/elpy/Manifest
@@ -2,5 +2,5 @@ AUX 50elpy-gentoo.el 220 BLAKE2B e2a2f6e0db08776665bd7e71ceebac1abee5a2d8e399fa3
 AUX elpy-elpy-rpc.el-elpy-rpc-pythonpath.patch 453 BLAKE2B 80a2421d3c25209ed4c6cd2d87021ef994ff1745e9b5a447ea86b7d8c8e22b7511e7f11462a424c0d7fb5ad9c8d60b9f6f34f9cd6e9fc18e17a5af59c707bb86 SHA512 4a354bfc4e16188b91ecb4a33ad9cf7802693b641a3f5753632cee23f8a4beeb716654b872aba6db00d11c45b1ed2e0ef8247649e8fc115f3b0d5cf971205269
 AUX elpy-elpy.el-yas-snippet-dirs.patch 495 BLAKE2B 62aa75ae47c98a20501210d5b53a468298ba7fe7b15cf05785565fa0d706a0bbcdeaf90c49d03a35138fa7752a7d476b323affb864dcf47f63c3299e3148523c SHA512 bda0ded2f6097f5f058c34eb2c0c978318118e9c22260a7efc54c1d92d2cfa10aeaa497a77f2be040c41f47a69e41755ae076a4ba5c1c26544ab86759791d9ae
 DIST elpy-1.35.0_p20220627.tar.gz 177246 BLAKE2B ded88f89949683000c9be606f3b5d2fc65a943c97e0369505713ecbd4f595a43a7ce560b699ebbdfd4a756703c5fa8fb21af5b4e8a1aa6dbb8a55fe4b7dcc468 SHA512 b9a4588eb83edef69661568b936e278621abad316ae160a00737c546b5eb26abd8ac089b369be212abbe16b66b590d9df73986995d36201c1010da7dc9706f79
-EBUILD elpy-1.35.0_p20220627.ebuild 1755 BLAKE2B cff742ee32847288147c59fd82d1e4557027d008d7893563b0ba832ac0772e30ff57688e1a58afdf199c3da1c61b8cf3ad442eec4caf40645362c07760d82216 SHA512 d39b6b4a1b35f37a48ef8dd288feae5713ea137a3f28214914d254fd90562e964e60d89192e9ddf4357955eefca4a750e3a5a8aee50c3b882dd81db62b9eb0d4
+EBUILD elpy-1.35.0_p20220627-r1.ebuild 2068 BLAKE2B 275f2d0b2a7b4bb84e405ff2d90b509918c83dadcf4a7f57fcd1b158d6d124a3e261faf60759652d755933eb13046250bbb014b7e33799d4eeba4b0b06a976fa SHA512 6206afe6acc2a85ddb04e480e117014e8947c6c394bc0ba2e6be8d21dbeca4ba03dddfef6faa6f50990040176550cb71ae1fd9970b1c9569c17d6338eea35084
 MISC metadata.xml 427 BLAKE2B 8711ffb7b4aadb742844dd478544e141159550c8ac041dea7702be583d8ab2ac48793762d70c6a7da0523052585bad40a31438d48d84dc735f827b36b3b42c60 SHA512 8fd5918a278dde43c85186cc67f6634d71cfe7e92d91c2a5adc3dfa86fd77d0d483f72e4c95dacea819da4c946beda835f828bb5e9067a79e7cc6434812d6293
diff --git a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild b/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
 }