Merge updates from master

8 files changed, 135 insertions, 16 deletions

diff --git a/app-emacs/kaolin-themes/Manifest b/app-emacs/kaolin-themes/Manifest
new file mode 100644
index 000000000000..24e5c47e870b
--- /dev/null
+++ b/app-emacs/kaolin-themes/Manifest
@@ -0,0 +1 @@
+DIST kaolin-themes-1.6.9.tar.gz 48032 BLAKE2B 827ca8d99372bc92fa5966c3702d9899af67827108a8a0f6373688c61784ed7eb490a4c7270ae16254ce9eb1d741c9659fc47d1e630fcd4e00f8b555dc511816 SHA512 c57a4df7dbac952228b3423aa543964f73e4cee6d3e96328cd5397f960d89c3fd7faa8421f54cb7370d911c17bcf9c72f34c0448cdd0ed10c9b219edc0774cd2
diff --git a/app-emacs/kaolin-themes/kaolin-themes-1.6.9.ebuild b/app-emacs/kaolin-themes/kaolin-themes-1.6.9.ebuild
new file mode 100644
index 000000000000..2d483b0db1ca
--- /dev/null
+++ b/app-emacs/kaolin-themes/kaolin-themes-1.6.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Set of eye pleasing themes for GNU Emacs"
+HOMEPAGE="https://github.com/ogdenwebb/emacs-kaolin-themes"
+
+MY_PN="emacs-${PN}"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URL="https://github.com/ogdenwebb/${MY_PN}.git"
+else
+	SRC_URI="https://github.com/ogdenwebb/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+RDEPEND="app-emacs/autothemer"
+BDEPEND="${RDEPEND}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-compile *.el themes/*.el
+}
+
+src_install() {
+	elisp-install ${PN} *.el *.elc themes/*.el themes/*.elc
+	elisp-make-site-file "${SITEFILE}"
+}
diff --git a/app-emacs/kaolin-themes/metadata.xml b/app-emacs/kaolin-themes/metadata.xml
new file mode 100644
index 000000000000..2d27a57d42ce
--- /dev/null
+++ b/app-emacs/kaolin-themes/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>kacper.slominski72@gmail.com</email>
+    <name>Kacper Słomiński</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ogdenwebb/emacs-kaolin-themes</remote-id>
+    <bugs-to>https://github.com/ogdenwebb/emacs-kaolin-themes/issues/</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/racket-mode/Manifest b/app-emacs/racket-mode/Manifest
index 9995554c6eb0..885a7cfba5c3 100644
--- a/app-emacs/racket-mode/Manifest
+++ b/app-emacs/racket-mode/Manifest
@@ -1,2 +1,2 @@
-DIST racket-mode-1_p20230506.tar.gz 323446 BLAKE2B 087377a6491014c6d29728a4c3a29e75069b729eddfa339d5cd347102f884dc7eb069097b0bf0864779b861e64a132b497ea0eb202238b06fa3741d4a42a5003 SHA512 6b3d37901e3126d8b3597ab83b5c47869873e4fccf536eed4d9ff1ed1695af7ab551bad5807b37438d20950529032b7dc75f9079d95bcf5b088ff097454c48ae
 DIST racket-mode-1_p20230905.tar.gz 323536 BLAKE2B 449655a43346d0f000396781302461bc229b7769b68e6f8268e295a0c0fdea2786d7c759fd2e002dfd993b4cab087d1f497c53da29a5a3c7635e8807536b3d8d SHA512 ade32d446816024eefcf84f5e1939cbd8ba561bb58454c543f6d49f118e4a937a069cb7e62bff5f9b1c2479175e5cd8c380bc81f14fadaa139110956cd129cf4
+DIST racket-mode-1_p20231214.tar.gz 372054 BLAKE2B 8ce9db064038780e5e8bcff3f3b71d00c19cac385e4afec22437e1d5d1fa751d050b887f4a22bbe35961c852d98b5894ed8eef99d52b7764fe9a741247730ead SHA512 74c7e588799e0dc34501a575c10474d071bebd8773f44df388bcb4ab9be452610f7263a7393794dd8288362d852e12d3e57a54fd389eededeaab98a28f24ffdd
diff --git a/app-emacs/racket-mode/racket-mode-1_p20230506.ebuild b/app-emacs/racket-mode/racket-mode-1_p20231214.ebuild
index 7690b9a62668..24a659b6fa6a 100644
--- a/app-emacs/racket-mode/racket-mode-1_p20230506.ebuild
+++ b/app-emacs/racket-mode/racket-mode-1_p20231214.ebuild
@@ -3,34 +3,49 @@
 
 EAPI=8
 
-[[ ${PV} == *_p20230506 ]] && COMMIT=c2fe266c18bb6e55a13c7ba795b0a5f7372b6c13
+[[ "${PV}" == *_p20231214 ]] && COMMIT=e6c2906316861e151fac9f7c0fa4ce443a1ba1fa
 
-inherit elisp
+inherit elisp # virtualx
 
 DESCRIPTION="Emacs modes for Racket: edit, REPL, check-syntax, debug, profile, and more"
 HOMEPAGE="https://www.racket-mode.com/
 	https://github.com/greghendershott/racket-mode/"
-SRC_URI="https://github.com/greghendershott/${PN}/archive/${COMMIT}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${COMMIT}
 
-LICENSE="GPL-2+"
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/greghendershott/${PN}.git"
+else
+	SRC_URI="https://github.com/greghendershott/${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 )"
 
-RDEPEND="dev-scheme/racket:=[-minimal]"
-BDEPEND="${RDEPEND}"
+RDEPEND="
+	dev-scheme/racket:=[-minimal]
+"
+BDEPEND="
+	${RDEPEND}
+"
 
-PATCHES=( "${FILESDIR}"/${PN}-rkt-source-dir.patch )
+ELISP_REMOVE="test/racket/hash-lang-test.rkt"
+PATCHES=( "${FILESDIR}/${PN}-rkt-source-dir.patch" )
 
 DOCS=( CONTRIBUTING.org README.org THANKS.org )
-ELISP_TEXINFO="doc/racket-mode.texi"
+ELISP_TEXINFO="doc/${PN}.texi"
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
 	elisp_src_prepare
 
-	sed "s|@SITEETC@|${SITEETC}/${PN}|" -i "${S}"/racket-util.el || die
+	sed "s|@SITEETC@|${SITEETC}/${PN}|" -i "${S}/racket-util.el" || die
 }
 
 src_compile() {
@@ -39,13 +54,13 @@ src_compile() {
 	# Equivalent to compiling from Emacs with "racket-mode-start-faster",
 	# because this is installed globally we have to compile it now.
 	ebegin "Compiling Racket source files"
-	find "${S}"/racket -type f -name "*.rkt" -exec raco make -v {} +
+	find "${S}/racket" -type f -name "*.rkt" -exec raco make -v {} +
 	eend $? "failed to compile Racket source files" || die
 }
 
 src_test() {
-	# Set "PLTUSERHOME" to a safe temp directory to prevent writing to ~.
-	PLTUSERHOME="${T}"/racket-mode/test-racket emake test-racket
+	# Set "PLTUSERHOME" to a safe temp directory to prevent writing to "~".
+	PLTUSERHOME="${T}/racket-mode/test-racket" emake test-racket
 }
 
 src_install() {
diff --git a/app-emacs/ws-butler/Manifest b/app-emacs/ws-butler/Manifest
new file mode 100644
index 000000000000..75a9fdfeb457
--- /dev/null
+++ b/app-emacs/ws-butler/Manifest
@@ -0,0 +1 @@
+DIST ws-butler-0.6_p20201117.tar.gz 6652 BLAKE2B 76f43420ea7221d76cbf914ed3c96ba210b2a08418ca68872d7745c709c400ddbe32f71cefc81f0ee928286f83a64472f8fb354b1ca420b403cd6e6e61a79a8b SHA512 7e2e0d0bc9c6715d8ad8f61d1aa75e5fa9eb26acb8da951a01867143d9c67fbe809da8eb49c39fab0bdd52250b9e9006ff30439c97036ffb85e8a33ac65c2f8d
diff --git a/app-emacs/ws-butler/metadata.xml b/app-emacs/ws-butler/metadata.xml
new file mode 100644
index 000000000000..d646ed1ec6c7
--- /dev/null
+++ b/app-emacs/ws-butler/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>kacper.slominski72@gmail.com</email>
+    <name>Kacper Słomiński</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lewang/ws-butler</remote-id>
+    <bugs-to>https://github.com/lewang/ws-butler/issues/</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/ws-butler/ws-butler-0.6_p20201117.ebuild b/app-emacs/ws-butler/ws-butler-0.6_p20201117.ebuild
new file mode 100644
index 000000000000..70f6e26edd04
--- /dev/null
+++ b/app-emacs/ws-butler/ws-butler-0.6_p20201117.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+COMMIT_HASH="e3a38d93e01014cd47bf5af4924459bd145fd7c4"
+
+DESCRIPTION="Unobtrusively trim extraneous white-space *ONLY* in lines edited"
+HOMEPAGE="https://github.com/lewang/ws-butler"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URL="https://github.com/lewang/${PN}.git"
+else
+	SRC_URI="https://github.com/lewang/${PN}/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"