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 6E9C4158020 for ; Thu, 20 Oct 2022 03:17:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77B29E076B; Thu, 20 Oct 2022 03:17:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 54417E076B for ; Thu, 20 Oct 2022 03:17:13 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F23F340D5D for ; Thu, 20 Oct 2022 03:17:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9BA35F6 for ; Thu, 20 Oct 2022 03:17:09 +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: <1666235827.6dc7e9ea1f42dffff921b17194718a9c95068237.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/treemacs/files/, app-emacs/treemacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emacs/treemacs/files/treemacs-2.9.5-tests.patch app-emacs/treemacs/files/treemacs-3.0-tests.patch app-emacs/treemacs/files/treemacs-async-scripts.patch app-emacs/treemacs/files/treemacs-tests.patch app-emacs/treemacs/treemacs-2.10-r1.ebuild app-emacs/treemacs/treemacs-2.10-r2.ebuild app-emacs/treemacs/treemacs-2.9.5-r1.ebuild app-emacs/treemacs/treemacs-2.9.5-r2.ebuild app-emacs/treemacs/treemacs-3.0-r1.ebuild app-emacs/treemacs/treemacs-3.0.ebuild X-VCS-Directories: app-emacs/treemacs/ app-emacs/treemacs/files/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 6dc7e9ea1f42dffff921b17194718a9c95068237 X-VCS-Branch: master Date: Thu, 20 Oct 2022 03:17:09 +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: 75115424-b586-403f-bee7-edffb08f5842 X-Archives-Hash: df6430be68cb569a76b9352a24e635d7 commit: 6dc7e9ea1f42dffff921b17194718a9c95068237 Author: Maciej Barć gentoo org> AuthorDate: Thu Oct 20 03:13:11 2022 +0000 Commit: Maciej Barć gentoo org> CommitDate: Thu Oct 20 03:17:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc7e9ea app-emacs/treemacs: install missing python scripts Signed-off-by: Maciej Barć gentoo.org> .../treemacs/files/treemacs-2.9.5-tests.patch | 11 ++++++++ ...eemacs-tests.patch => treemacs-3.0-tests.patch} | 0 .../treemacs/files/treemacs-async-scripts.patch | 29 ++++++++++++++++++++++ ...macs-2.10-r1.ebuild => treemacs-2.10-r2.ebuild} | 26 ++++++++++++++----- ...reemacs-3.0.ebuild => treemacs-2.9.5-r2.ebuild} | 23 ++++++++++++----- ...macs-2.9.5-r1.ebuild => treemacs-3.0-r1.ebuild} | 27 +++++++++++++++----- 6 files changed, 98 insertions(+), 18 deletions(-) diff --git a/app-emacs/treemacs/files/treemacs-2.9.5-tests.patch b/app-emacs/treemacs/files/treemacs-2.9.5-tests.patch new file mode 100644 index 000000000000..afa46664802d --- /dev/null +++ b/app-emacs/treemacs/files/treemacs-2.9.5-tests.patch @@ -0,0 +1,11 @@ +--- a/test/treemacs-test.el ++++ b/test/treemacs-test.el +@@ -1079,7 +1079,7 @@ + + (describe "treemacs--parse-collapsed-dirs" + +- (it "Finds dirs to flatten in test directory" ++ (xit "Finds dirs to flatten in test directory" + (-let [treemacs-collapse-dirs 3] + (expect (-> treemacs-dir + (treemacs-join-path "test") diff --git a/app-emacs/treemacs/files/treemacs-tests.patch b/app-emacs/treemacs/files/treemacs-3.0-tests.patch similarity index 100% rename from app-emacs/treemacs/files/treemacs-tests.patch rename to app-emacs/treemacs/files/treemacs-3.0-tests.patch diff --git a/app-emacs/treemacs/files/treemacs-async-scripts.patch b/app-emacs/treemacs/files/treemacs-async-scripts.patch new file mode 100644 index 000000000000..0a3ef104c733 --- /dev/null +++ b/app-emacs/treemacs/files/treemacs-async-scripts.patch @@ -0,0 +1,29 @@ +--- a/src/elisp/treemacs-async.el ++++ b/src/elisp/treemacs-async.el +@@ -43,22 +43,22 @@ + (defconst treemacs--dirs-to-collapse.py + (if (member "treemacs-dirs-to-collapse.py" (directory-files treemacs-dir)) + (treemacs-join-path treemacs-dir "treemacs-dirs-to-collapse.py") +- (treemacs-join-path treemacs-dir "src/scripts/treemacs-dirs-to-collapse.py"))) ++ (treemacs-join-path treemacs-dir "@SITEETC@/scripts/treemacs-dirs-to-collapse.py"))) + + (defconst treemacs--git-status.py + (if (member "treemacs-git-status.py" (directory-files treemacs-dir)) + (treemacs-join-path treemacs-dir "treemacs-git-status.py") +- (treemacs-join-path treemacs-dir "src/scripts/treemacs-git-status.py"))) ++ (treemacs-join-path treemacs-dir "@SITEETC@/scripts/treemacs-git-status.py"))) + + (defconst treemacs--single-file-git-status.py + (if (member "treemacs-single-file-git-status.py" (directory-files treemacs-dir)) + (treemacs-join-path treemacs-dir "treemacs-single-file-git-status.py") +- (treemacs-join-path treemacs-dir "src/scripts/treemacs-single-file-git-status.py"))) ++ (treemacs-join-path treemacs-dir "@SITEETC@/scripts/treemacs-single-file-git-status.py"))) + + (defconst treemacs--find-ignored-files.py + (if (member "treemacs-find-ignored-files.py" (directory-files treemacs-dir)) + (treemacs-join-path treemacs-dir "treemacs-find-ignored-files.py") +- (treemacs-join-path treemacs-dir "src/scripts/treemacs-find-ignored-files.py"))) ++ (treemacs-join-path treemacs-dir "@SITEETC@/scripts/treemacs-find-ignored-files.py"))) + + (defvar treemacs--git-cache-max-size 60 + "Maximum size for `treemacs--git-cache'. diff --git a/app-emacs/treemacs/treemacs-2.10-r1.ebuild b/app-emacs/treemacs/treemacs-2.10-r2.ebuild similarity index 61% rename from app-emacs/treemacs/treemacs-2.10-r1.ebuild rename to app-emacs/treemacs/treemacs-2.10-r2.ebuild index ea3b8ab8544a..f15d0971b7dc 100644 --- a/app-emacs/treemacs/treemacs-2.10-r1.ebuild +++ b/app-emacs/treemacs/treemacs-2.10-r2.ebuild @@ -4,13 +4,15 @@ EAPI=8 NEED_EMACS=26.1 +DISTUTILS_USE_PEP517=no +PYTHON_COMPAT=( python3_{8..10} ) -inherit elisp +inherit elisp distutils-r1 DESCRIPTION="Tree style project file explorer" HOMEPAGE="https://github.com/Alexander-Miller/treemacs/" SRC_URI="https://github.com/Alexander-Miller/${PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz" + -> ${P}.tar.gz" LICENSE="GPL-3+" KEYWORDS="~amd64" @@ -33,23 +35,34 @@ BDEPEND=" " DOCS=( Changelog.org Extensions.org README.org screenshots ) -PATCHES=( "${FILESDIR}"/${PN}-icons-icon-directory.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-2.9.5-tests.patch + "${FILESDIR}"/${PN}-async-scripts.patch + "${FILESDIR}"/${PN}-icons-icon-directory.patch +) BYTECOMPFLAGS="-L . -L src/elisp" SITEFILE="50${PN}-gentoo.el" src_prepare() { - elisp_src_prepare + distutils-r1_src_prepare - sed "s|@SITEETC@|${SITEETC}/${PN}|" -i src/elisp/${PN}-icons.el || die + sed "s|@SITEETC@|${SITEETC}/${PN}|g" \ + -i src/elisp/${PN}-icons.el \ + -i src/elisp/${PN}-async.el || die +} + +python_compile() { + python_optimize "${S}"/src/scripts } src_compile() { + distutils-r1_src_compile elisp-compile src/elisp/*.el } src_test() { - buttercup ${BYTECOMPFLAGS} -L test --traceback full || die + buttercup ${BYTECOMPFLAGS} -L test --traceback full || die "tests failed" } src_install() { @@ -58,4 +71,5 @@ src_install() { insinto ${SITEETC}/${PN} doins -r icons + doins -r src/scripts } diff --git a/app-emacs/treemacs/treemacs-3.0.ebuild b/app-emacs/treemacs/treemacs-2.9.5-r2.ebuild similarity index 66% rename from app-emacs/treemacs/treemacs-3.0.ebuild rename to app-emacs/treemacs/treemacs-2.9.5-r2.ebuild index 644642d22cec..75f926af7d1b 100644 --- a/app-emacs/treemacs/treemacs-3.0.ebuild +++ b/app-emacs/treemacs/treemacs-2.9.5-r2.ebuild @@ -4,13 +4,15 @@ EAPI=8 NEED_EMACS=26.1 +DISTUTILS_USE_PEP517=no +PYTHON_COMPAT=( python3_{8..10} ) -inherit elisp +inherit elisp distutils-r1 DESCRIPTION="Tree style project file explorer" HOMEPAGE="https://github.com/Alexander-Miller/treemacs/" SRC_URI="https://github.com/Alexander-Miller/${PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz" + -> ${P}.tar.gz" LICENSE="GPL-3+" KEYWORDS="~amd64" @@ -34,25 +36,33 @@ BDEPEND=" DOCS=( Changelog.org Extensions.org README.org screenshots ) PATCHES=( + "${FILESDIR}"/${PN}-async-scripts.patch "${FILESDIR}"/${PN}-icons-icon-directory.patch - "${FILESDIR}"/${PN}-tests.patch + "${FILESDIR}"/${P}-tests.patch ) BYTECOMPFLAGS="-L . -L src/elisp" SITEFILE="50${PN}-gentoo.el" src_prepare() { - elisp_src_prepare + distutils-r1_src_prepare - sed "s|@SITEETC@|${SITEETC}/${PN}|" -i src/elisp/${PN}-icons.el || die + sed "s|@SITEETC@|${SITEETC}/${PN}|g" \ + -i src/elisp/${PN}-icons.el \ + -i src/elisp/${PN}-async.el || die +} + +python_compile() { + python_optimize "${S}"/src/scripts } src_compile() { + distutils-r1_src_compile elisp-compile src/elisp/*.el } src_test() { - buttercup ${BYTECOMPFLAGS} -L test --traceback full || die + buttercup ${BYTECOMPFLAGS} -L test --traceback full || die "tests failed" } src_install() { @@ -61,4 +71,5 @@ src_install() { insinto ${SITEETC}/${PN} doins -r icons + doins -r src/scripts } diff --git a/app-emacs/treemacs/treemacs-2.9.5-r1.ebuild b/app-emacs/treemacs/treemacs-3.0-r1.ebuild similarity index 60% rename from app-emacs/treemacs/treemacs-2.9.5-r1.ebuild rename to app-emacs/treemacs/treemacs-3.0-r1.ebuild index ea3b8ab8544a..546b9691a6d2 100644 --- a/app-emacs/treemacs/treemacs-2.9.5-r1.ebuild +++ b/app-emacs/treemacs/treemacs-3.0-r1.ebuild @@ -4,13 +4,15 @@ EAPI=8 NEED_EMACS=26.1 +DISTUTILS_USE_PEP517=no +PYTHON_COMPAT=( python3_{8..10} ) -inherit elisp +inherit elisp distutils-r1 DESCRIPTION="Tree style project file explorer" HOMEPAGE="https://github.com/Alexander-Miller/treemacs/" SRC_URI="https://github.com/Alexander-Miller/${PN}/archive/${PV}.tar.gz - -> ${P}.tar.gz" + -> ${P}.tar.gz" LICENSE="GPL-3+" KEYWORDS="~amd64" @@ -33,23 +35,35 @@ BDEPEND=" " DOCS=( Changelog.org Extensions.org README.org screenshots ) -PATCHES=( "${FILESDIR}"/${PN}-icons-icon-directory.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-2.9.5-tests.patch + "${FILESDIR}"/${PN}-async-scripts.patch + "${FILESDIR}"/${PN}-icons-icon-directory.patch + "${FILESDIR}"/${P}-tests.patch +) BYTECOMPFLAGS="-L . -L src/elisp" SITEFILE="50${PN}-gentoo.el" src_prepare() { - elisp_src_prepare + distutils-r1_src_prepare - sed "s|@SITEETC@|${SITEETC}/${PN}|" -i src/elisp/${PN}-icons.el || die + sed "s|@SITEETC@|${SITEETC}/${PN}|g" \ + -i src/elisp/${PN}-icons.el \ + -i src/elisp/${PN}-async.el || die +} + +python_compile() { + python_optimize "${S}"/src/scripts } src_compile() { + distutils-r1_src_compile elisp-compile src/elisp/*.el } src_test() { - buttercup ${BYTECOMPFLAGS} -L test --traceback full || die + buttercup ${BYTECOMPFLAGS} -L test --traceback full || die "tests failed" } src_install() { @@ -58,4 +72,5 @@ src_install() { insinto ${SITEETC}/${PN} doins -r icons + doins -r src/scripts }