app-emacs/racket-mode: instead of setq apply a patch

to overwrite the "racket--rkt-source-dir" variable, also remove
unnecessary setting of "racket--run.rkt" variable (that has been
dropped in 2021)

Signed-off-by: Maciej Barć <xgqt@gentoo.org>

6 files changed, 58 insertions, 13 deletions

diff --git a/app-emacs/racket-mode/files/50racket-mode-gentoo.el b/app-emacs/racket-mode/files/50racket-mode-gentoo.el
index abebbf987f6f..eccbdd83a2b2 100644
--- a/app-emacs/racket-mode/files/50racket-mode-gentoo.el
+++ b/app-emacs/racket-mode/files/50racket-mode-gentoo.el
@@ -12,6 +12,3 @@
 (add-to-list 'auto-mode-alist '("\\.rkt\\'"  . racket-mode))
 (add-to-list 'auto-mode-alist '("\\.rktd\\'" . racket-mode))
 (add-to-list 'auto-mode-alist '("\\.rktl\\'" . racket-mode))
-
-(setq racket--rkt-source-dir (expand-file-name "./racket/" "@SITEETC@"))
-(setq racket--run.rkt (expand-file-name "main.rkt" racket--rkt-source-dir))
diff --git a/app-emacs/racket-mode/files/racket-mode-rkt-source-dir.patch b/app-emacs/racket-mode/files/racket-mode-rkt-source-dir.patch
new file mode 100644
index 000000000000..0dbc7acb2366
--- /dev/null
+++ b/app-emacs/racket-mode/files/racket-mode-rkt-source-dir.patch
@@ -0,0 +1,11 @@
+--- a/racket-util.el
++++ b/racket-util.el
+@@ -90,7 +90,7 @@ When installed as a package, this can be found from the variable
+ .el buffer file name.")
+ 
+ (defvar racket--rkt-source-dir
+-  (expand-file-name "./racket/" racket--el-source-dir)
++  (expand-file-name "./racket/" "@SITEETC@")
+   "Path to dir of our Racket source files. ")
+ 
+ (defun racket--restoring-current-buffer (proc)
diff --git a/app-emacs/racket-mode/racket-mode-20220219.ebuild b/app-emacs/racket-mode/racket-mode-20220219-r1.ebuild
index 0bd72bea7cf5..a503897480e0 100644
--- a/app-emacs/racket-mode/racket-mode-20220219.ebuild
+++ b/app-emacs/racket-mode/racket-mode-20220219-r1.ebuild
@@ -11,7 +11,7 @@ inherit elisp
 DESCRIPTION="Emacs modes for Racket: edit, REPL, check-syntax, debug, profile, and more"
 HOMEPAGE="https://github.com/greghendershott/racket-mode/"
 SRC_URI="https://github.com/greghendershott/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${H}"
+S="${WORKDIR}"/${PN}-${H}
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -20,22 +20,32 @@ KEYWORDS="amd64 ~x86"
 RDEPEND="dev-scheme/racket:=[-minimal]"
 BDEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-rkt-source-dir.patch )
+
 DOCS=( CONTRIBUTING.md README.md THANKS.md )
+
 ELISP_TEXINFO="doc/racket-mode.texi"
 SITEFILE="50${PN}-gentoo.el"
 
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${SITEETC}/${PN}|" -i racket-util.el || die
+}
+
 src_compile() {
 	elisp_src_compile
 
 	# Equivalent to compiling from Emacs with "racket-mode-start-faster",
-	# as this is installed globally we compile it now.
+	# 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() {
-	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/racket-mode/racket-mode-20220411.ebuild b/app-emacs/racket-mode/racket-mode-20220411-r1.ebuild
index 7660d6f56ec0..0777c1053a90 100644
--- a/app-emacs/racket-mode/racket-mode-20220411.ebuild
+++ b/app-emacs/racket-mode/racket-mode-20220411-r1.ebuild
@@ -20,22 +20,31 @@ KEYWORDS="amd64 ~x86"
 RDEPEND="dev-scheme/racket:=[-minimal]"
 BDEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-rkt-source-dir.patch )
+
 DOCS=( CONTRIBUTING.md README.md THANKS.md )
+
 ELISP_TEXINFO="doc/racket-mode.texi"
 SITEFILE="50${PN}-gentoo.el"
 
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${SITEETC}/${PN}|" -i racket-util.el || die
+}
+
 src_compile() {
 	elisp_src_compile
 
 	# Equivalent to compiling from Emacs with "racket-mode-start-faster",
-	# as this is installed globally we compile it now.
+	# 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 dir to evade writing to ~
+	# Set "PLTUSERHOME" to a safe temp directory to prevent writing to ~.
 	PLTUSERHOME="${T}"/racket-mode/test-racket emake test-racket
 }
 
diff --git a/app-emacs/racket-mode/racket-mode-20220505.ebuild b/app-emacs/racket-mode/racket-mode-20220505-r1.ebuild
index 272895d371b3..f88a71dda156 100644
--- a/app-emacs/racket-mode/racket-mode-20220505.ebuild
+++ b/app-emacs/racket-mode/racket-mode-20220505-r1.ebuild
@@ -20,22 +20,31 @@ KEYWORDS="amd64 ~x86"
 RDEPEND="dev-scheme/racket:=[-minimal]"
 BDEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-rkt-source-dir.patch )
+
 DOCS=( CONTRIBUTING.md README.md THANKS.md )
+
 ELISP_TEXINFO="doc/racket-mode.texi"
 SITEFILE="50${PN}-gentoo.el"
 
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${SITEETC}/${PN}|" -i racket-util.el || die
+}
+
 src_compile() {
 	elisp_src_compile
 
 	# Equivalent to compiling from Emacs with "racket-mode-start-faster",
-	# as this is installed globally we compile it now.
+	# 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 dir to evade writing to ~
+	# Set "PLTUSERHOME" to a safe temp directory to prevent writing to ~.
 	PLTUSERHOME="${T}"/racket-mode/test-racket emake test-racket
 }
 
diff --git a/app-emacs/racket-mode/racket-mode-20220628.ebuild b/app-emacs/racket-mode/racket-mode-20220628-r1.ebuild
index 3d6c29530ffe..2d3780799ccf 100644
--- a/app-emacs/racket-mode/racket-mode-20220628.ebuild
+++ b/app-emacs/racket-mode/racket-mode-20220628-r1.ebuild
@@ -20,10 +20,19 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="dev-scheme/racket:=[-minimal]"
 BDEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-rkt-source-dir.patch )
+
 DOCS=( CONTRIBUTING.md README.md THANKS.md )
+
 ELISP_TEXINFO="doc/racket-mode.texi"
 SITEFILE="50${PN}-gentoo.el"
 
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${SITEETC}/${PN}|" -i racket-util.el || die
+}
+
 src_compile() {
 	elisp_src_compile