* [gentoo-commits] repo/gentoo:master commit in: app-emacs/treemacs/files/, app-emacs/treemacs/
@ 2022-05-09 20:07 Maciej Barć
0 siblings, 0 replies; 3+ messages in thread
From: Maciej Barć @ 2022-05-09 20:07 UTC (permalink / raw
To: gentoo-commits
commit: acd80ab96c0e29e3e1e4386bc5a81cd7e38e1252
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 20:07:17 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon May 9 20:07:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acd80ab9
app-emacs/treemacs: autoload "treemacs" entry-point
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
app-emacs/treemacs/files/50treemacs-gentoo.el | 2 ++
app-emacs/treemacs/{treemacs-2.10.ebuild => treemacs-2.10-r1.ebuild} | 0
app-emacs/treemacs/{treemacs-2.9.5.ebuild => treemacs-2.9.5-r1.ebuild} | 0
3 files changed, 2 insertions(+)
diff --git a/app-emacs/treemacs/files/50treemacs-gentoo.el b/app-emacs/treemacs/files/50treemacs-gentoo.el
index 431f7e90ae73..296e01d5b8b4 100644
--- a/app-emacs/treemacs/files/50treemacs-gentoo.el
+++ b/app-emacs/treemacs/files/50treemacs-gentoo.el
@@ -1 +1,3 @@
(add-to-list 'load-path "@SITELISP@")
+(autoload 'treemacs "treemacs"
+ "Initialise or toggle treemacs." t)
diff --git a/app-emacs/treemacs/treemacs-2.10.ebuild b/app-emacs/treemacs/treemacs-2.10-r1.ebuild
similarity index 100%
rename from app-emacs/treemacs/treemacs-2.10.ebuild
rename to app-emacs/treemacs/treemacs-2.10-r1.ebuild
diff --git a/app-emacs/treemacs/treemacs-2.9.5.ebuild b/app-emacs/treemacs/treemacs-2.9.5-r1.ebuild
similarity index 100%
rename from app-emacs/treemacs/treemacs-2.9.5.ebuild
rename to app-emacs/treemacs/treemacs-2.9.5-r1.ebuild
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emacs/treemacs/files/, app-emacs/treemacs/
@ 2022-09-14 16:03 Maciej Barć
0 siblings, 0 replies; 3+ messages in thread
From: Maciej Barć @ 2022-09-14 16:03 UTC (permalink / raw
To: gentoo-commits
commit: 893c051b1cb83e231d56140046498363078503bc
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 15:33:54 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 16:03:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893c051b
app-emacs/treemacs: bump to 3.0
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
app-emacs/treemacs/Manifest | 1 +
app-emacs/treemacs/files/treemacs-tests.patch | 31 +++++++++++++
app-emacs/treemacs/treemacs-3.0.ebuild | 64 +++++++++++++++++++++++++++
3 files changed, 96 insertions(+)
diff --git a/app-emacs/treemacs/Manifest b/app-emacs/treemacs/Manifest
index e3daff3ffdcf..1ff141dac693 100644
--- a/app-emacs/treemacs/Manifest
+++ b/app-emacs/treemacs/Manifest
@@ -1,2 +1,3 @@
DIST treemacs-2.10.tar.gz 4137468 BLAKE2B 0f832d02f8b0f96f7000c57b1842319155face5cb50c44ff4286f7f28dd74b38739079de9c387dbddbf93af37a5c750c45a598100ed5053674a565b4ec34f0c6 SHA512 9326a3f66c1b38eb7ef39e90900c2ef71d20c6c3478213f61c144ca4face562dccf00d6d400315c264627468a0c3319a24f0ec6cddb795b54e1b7f3c235d1c71
DIST treemacs-2.9.5.tar.gz 4134227 BLAKE2B 1fbdb278e9524fdb14cbc7699bc787ab694b00d37a91ec3e91e106079bc02f6b8b39207608873d45c70fd6355a22553bf1a0636a948b79df77adfe0b4a3f799f SHA512 adc026d7ad459418fae531c5a1a7df7f9308e63dec82240c1c5e278eb00fdf8d6dff1ee2112ea73d5a05c4266efe24623bb84f8819a6f07fbb4fde6e644ca9ad
+DIST treemacs-3.0.tar.gz 4552082 BLAKE2B d12dff7aa667916ba586dcf47d642b36987ec1612a5dd276a513eef551c7b81a463d55531dacc48eac49ffc7390b1dd48a7e07285d188d4d40e779b9bc0b09f5 SHA512 981eb40973c86aec683ad6f0436c853e9254bfa10e77a60d3c36ef8b18d76dce358d68dee06355e63b4040c816e4f0064a3e722a414db0f9d3d007e5d252d753
diff --git a/app-emacs/treemacs/files/treemacs-tests.patch b/app-emacs/treemacs/files/treemacs-tests.patch
new file mode 100644
index 000000000000..d7bc67dc3e54
--- /dev/null
+++ b/app-emacs/treemacs/files/treemacs-tests.patch
@@ -0,0 +1,31 @@
+Disable bad tests.
+
+--- a/test/treemacs-test.el
++++ b/test/treemacs-test.el
+@@ -372,7 +372,7 @@
+
+ (describe "treemacs--parent"
+
+- (it "Fails on nil input"
++ (xit "Fails on nil input"
+ (expect (treemacs--parent nil) :to-throw))
+
+ (it "Returns nil when input is empty"
+@@ -393,14 +393,14 @@
+ (it "Returns directory extension of extension sub-item node."
+ (expect (treemacs--parent '("/test1" "a" "b")) :to-equal '("/test1" "a")))
+
+- (it "Returns directory of a directory extension node."
++ (xit "Returns directory of a directory extension node."
+ (expect (treemacs--parent '("/test1" "a")) :to-equal "/test1"))
+
+- (it "Returns project extension of a project sub-item node."
++ (xit "Returns project extension of a project sub-item node."
+ (let ((p (treemacs-project->create! :path "/A" :path-status 'local-readable)))
+ (expect (treemacs--parent (list p "a" "b")) :to-equal (list p "a"))))
+
+- (it "Returns project of a project extension node."
++ (xit "Returns project of a project extension node."
+ (let ((p (treemacs-project->create! :path "/A" :path-status 'local-readable)))
+ (expect (treemacs--parent (list p "a")) :to-equal "/A"))))
+
diff --git a/app-emacs/treemacs/treemacs-3.0.ebuild b/app-emacs/treemacs/treemacs-3.0.ebuild
new file mode 100644
index 000000000000..644642d22cec
--- /dev/null
+++ b/app-emacs/treemacs/treemacs-3.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+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"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-emacs/ace-window
+ app-emacs/cfrs
+ app-emacs/dash
+ app-emacs/ht
+ app-emacs/hydra
+ app-emacs/pfuture
+ app-emacs/s
+"
+BDEPEND="
+ ${RDEPEND}
+ test? ( app-emacs/buttercup )
+"
+
+DOCS=( Changelog.org Extensions.org README.org screenshots )
+PATCHES=(
+ "${FILESDIR}"/${PN}-icons-icon-directory.patch
+ "${FILESDIR}"/${PN}-tests.patch
+)
+
+BYTECOMPFLAGS="-L . -L src/elisp"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed "s|@SITEETC@|${SITEETC}/${PN}|" -i src/elisp/${PN}-icons.el || die
+}
+
+src_compile() {
+ elisp-compile src/elisp/*.el
+}
+
+src_test() {
+ buttercup ${BYTECOMPFLAGS} -L test --traceback full || die
+}
+
+src_install() {
+ elisp-install ${PN} src/elisp/*.el{,c}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ insinto ${SITEETC}/${PN}
+ doins -r icons
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-emacs/treemacs/files/, app-emacs/treemacs/
@ 2022-10-20 3:17 Maciej Barć
0 siblings, 0 replies; 3+ messages in thread
From: Maciej Barć @ 2022-10-20 3:17 UTC (permalink / raw
To: gentoo-commits
commit: 6dc7e9ea1f42dffff921b17194718a9c95068237
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 03:13:11 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> 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ć <xgqt <AT> 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
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-20 3:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-09 20:07 [gentoo-commits] repo/gentoo:master commit in: app-emacs/treemacs/files/, app-emacs/treemacs/ Maciej Barć
-- strict thread matches above, loose matches on Subject: below --
2022-09-14 16:03 Maciej Barć
2022-10-20 3:17 Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox