gentoo auto-resync : 20:10:2022 - 07:59:49

7 files changed, 104 insertions, 22 deletions

diff --git a/app-emacs/treemacs/Manifest b/app-emacs/treemacs/Manifest
index 4a9a989c45ca..12b6a6f882be 100644
--- a/app-emacs/treemacs/Manifest
+++ b/app-emacs/treemacs/Manifest
@@ -1,10 +1,12 @@
 AUX 50treemacs-gentoo.el 107 BLAKE2B 8f0b4ae5390e6552c14ab55dbd71ac7e93477d0ab111cd5ae921f33800a15606606b96246e6a3fa1dc1e0aa42df0b3cc50f29602f72685fec47520e53db18c04 SHA512 5098445176a1b4730439e1d3f55d2dd2a27ec095f721b40318fe181f5a89276f0e2b6269505db4248160ca3769981ccecdd2fa0ea89667579faa920ea8d40bf0
+AUX treemacs-2.9.5-tests.patch 342 BLAKE2B c3ea6362372e732c6ab12621ddb4522a0dc0239b52782ea03711e721b2d89a2ed135aed17b17d31896855ea538798526eff99900dd5cba8c3e098ef3ac8cfeb6 SHA512 9511abf9cfede4db029835d911efb90e846b08f869e63eb2736e0016c0c8c11f92cc62fb29e4cfadb72cfa672b02b6bf04befd005b72ef7e0dcd0ef3fdff4d49
+AUX treemacs-3.0-tests.patch 1186 BLAKE2B ec452399ef3e971f442050504725b17030ea567e95708fc9f0d27fe197dca27dc84c2f04cef55870cb9d59ee7376664af8d3692e664fb1157d11397458b35ee7 SHA512 3ff8aa536fdae945a855a66d101355325c6527a282f9677d315f4561b15bb38f9d6256a81dae696999dfb40d95d338a379247179c8f8f716f8b1d1592f7b9398
+AUX treemacs-async-scripts.patch 1651 BLAKE2B bd6aecaff19f87e843c3feb17a7a6b63186779d259933a647c66fd9dd26884e729baf726e038aba13fbcc3c41f56d2159379c3001fe91b009f9c51f3728a54d7 SHA512 94094629d2b78fd88da344e0078ddc043c2edce18f1a373116da2db977a2f6d4141801b8d02c64e67ad41f6c9bec966a88ba3aea33a80021d171a3ae862146e0
 AUX treemacs-icons-icon-directory.patch 415 BLAKE2B d53b7bfcca7ab85953e1d98a71d58d273f625e095c72417d0c3e1bcfa65d4e5b9a34a60f1295f68a22f663643a6460adddfd2b03c38f7a10a0c3edfae232fb61 SHA512 c76ead6a99de0494769f35af8e3a5154fed728736e41d9cfe08c04f947959a972488e9d6e871e05b10763551fdcbda8e31e9b1bc308a043b5b315ea0a6e475f9
-AUX treemacs-tests.patch 1186 BLAKE2B ec452399ef3e971f442050504725b17030ea567e95708fc9f0d27fe197dca27dc84c2f04cef55870cb9d59ee7376664af8d3692e664fb1157d11397458b35ee7 SHA512 3ff8aa536fdae945a855a66d101355325c6527a282f9677d315f4561b15bb38f9d6256a81dae696999dfb40d95d338a379247179c8f8f716f8b1d1592f7b9398
 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
-EBUILD treemacs-2.10-r1.ebuild 1183 BLAKE2B ee2b86534058b02c39baebfa771e23dfc41292cf4f2a7020c697cdc353b361b74d33cce3c51dbce61fb53bf97bf4b031699682aaef3c8f60c977a4f9b3b51517 SHA512 42511cfe992fbd4e5b00962ef4c2851e884f871b3b9ca14b4ed0ecc7db67b8a595eb12edf4426b5c0c8075392eb172055ba0d50c3a9c8716b9e9d62f82ea719c
-EBUILD treemacs-2.9.5-r1.ebuild 1183 BLAKE2B ee2b86534058b02c39baebfa771e23dfc41292cf4f2a7020c697cdc353b361b74d33cce3c51dbce61fb53bf97bf4b031699682aaef3c8f60c977a4f9b3b51517 SHA512 42511cfe992fbd4e5b00962ef4c2851e884f871b3b9ca14b4ed0ecc7db67b8a595eb12edf4426b5c0c8075392eb172055ba0d50c3a9c8716b9e9d62f82ea719c
-EBUILD treemacs-3.0.ebuild 1217 BLAKE2B 3e3a6ed17c184f9192fcb51d90ca2a91e6860cf9f9dce34dffeacc81b2c50e7a2d6e8aec4994989209ba95bdfb1fd318adce02c75f47a3f31b0d9582c03ba5e6 SHA512 29ff8e5c9247401a77ab6c8efb362a15ce76ef5890e14094f0c2d3046334ec211c1d3b0bdbd0cf49b55401d35955e5fe13afc12773d7673dd758db98887efad7
+EBUILD treemacs-2.10-r2.ebuild 1517 BLAKE2B b32d94ceb809be770c2c4ba30bc0cabb59ffdd04bc2ab6cb6e73ccb202c298a045679149e1b2fb4ba8c488b3caa226ce919ce9aeb1dc211b8e712d9a5d5d9c44 SHA512 c1fac2c59f3b59b83260f8c66c3b970d5b69cea99ec90755b473a556da65d86777b567432884bb1347c834959c1180964d9c2ffbf87e162fe12323003ce89374
+EBUILD treemacs-2.9.5-r2.ebuild 1510 BLAKE2B 69178d89e2b8bf33c66c82fd86f82e2ac33153add1b7792bc6114d2eb91bcecd8e972e3a542f903a99e983f61260d1901b4f712d0020b86bcc04f850b3a13d42 SHA512 64e40089dfafa9b70079cf23bd9a78145810d33d75060b88a46a18b1ba71935deb0847de74838f73e5a1f0e6f271b8979b509431161948ad616a787354e04340
+EBUILD treemacs-3.0-r1.ebuild 1549 BLAKE2B 3655f01ce0a82e856cb89be055d5b4c9c3025bfeb45c7fc4a00b7bb8ff924c4c89e8f8748e6bcf792a92202fa23aee5ec90afa36db2937435e9938d4b959bdbe SHA512 34087d54219938efeadf27efa45afc2df24b35a84e3fcccff19f6ae25b4d6a3a77de0e7d6c85ebeef6387a4327646e109318d8d3766d09a54bedaea450360601
 MISC metadata.xml 439 BLAKE2B a5536ef58177b5a4802017b81c68951ff5585a745ebc38f036bf2ee98bf6f51b0586ff5022cd1da55dbca13430b1811d8ac60e5b920caec7ea15f83f62ed3cad SHA512 cb6043bf4aa0e741f19630393ec1a25ab74e4ac2f17a41d932fce8d6f95663534cf28c277912c1800b252a98f1dc5ba13d6623f12251486e93dc33df1b77f443
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
index d7bc67dc3e54..d7bc67dc3e54 100644
--- a/app-emacs/treemacs/files/treemacs-tests.patch
+++ b/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
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
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
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
 }