5 files changed, 7 insertions, 31 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 9ea802f7c98c..116620ccb068 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/compat/Manifest b/app-emacs/compat/Manifest
index afdcb828e350..2b7bf2c9dbc4 100644
--- a/app-emacs/compat/Manifest
+++ b/app-emacs/compat/Manifest
@@ -1,5 +1,5 @@
 DIST compat-30.0.0.0.tar.gz 140329 BLAKE2B 7de4dffc518e521d0c15d3deb0f544972eb6660e19e3028f956b39b9ce355901f3d39339d9f2060a3b7754d67ec9ce92a720cc83afc468f3a2cedc189d8eb922 SHA512 04e2c26f6c1fbb78fc0f2de70913694b3f37614a6992b2a36cec5288c2083481701bdfb7d7e981582c8b22cf61b71e5a3e6011f86c1602331a26ad61c1fe2f66
 DIST compat-30.0.1.0.tar.gz 142477 BLAKE2B dc0f912f8c019846a6dde9c3013527589cb7b8f21cbc3478c16f0dd0edfca15a71f67df91b417ff26a401954b047bc7f6a7fc8efd6d874e3e96e17cf3acd16dd SHA512 cbab795c8ef890307eb6e161d900948a84948ea4b2462056a39ca21e8a4d0aebc985f7ff536658156e9d6e760e33b2b234bc2460f64193b9d07b733a267c1dfe
 EBUILD compat-30.0.0.0.ebuild 1113 BLAKE2B 45e9257dc901aa54c64d0980d5f770c765ab7879f143ea2425b1ae31554e4b24a18722ed0353e41f3e93d39c84e1427f94f8d5cb7546dbe95ff45f7294d06220 SHA512 4ba0df372d3464b20d86d732acc30710dc9eb68110fdb9885a98a7d431d3af846087a8e12ed25b78d164d260126bd86749aba020e58d612cc0bc0ed1aae03e6f
-EBUILD compat-30.0.1.0.ebuild 1117 BLAKE2B ba1e4a97514f042981d9807f41d8b1f8bd6711a5683cd034f76c7f1002547093bc7513640cd06bed6bf0431f2b7bc161366f6dde9d4fb1b61ea4d6d19fabc448 SHA512 19cde0352962224fee026244aea48d26ea36c11466bc0edf962ead5f3cfe40e7b91f0a620e0fb812363889be0fd5ce8d58b9b90dd2d71229bfe8507938a33f0e
+EBUILD compat-30.0.1.0-r1.ebuild 1138 BLAKE2B 05806e8321674c7900f02d8eaa84b644afd5f9b7b2681b137fa453070a83caa8759f33a8a7b3650fec6d1fcfa4defc96cf15aee4b7ab1ab0a983ac318e557e15 SHA512 7af904d00b88c719cefc63aa443f5404d1ec59f7685957ec7c15b73ccfc882101d8125e8cb8921864622b754a4b73adf5a673d0c7a0932d83103fb56b44e8d86
 MISC metadata.xml 510 BLAKE2B 6d189301e592c47ca50f1e1a54b4b8ec6fe8f8883761137562eb1c0c2e898bf9d09c520d4ac4d2edcc851e29ad6896950d412aefb80320913405ee3b0c2b6b9d SHA512 85329976678ef5733a30ffa89fb41a4b8ccbeb8b977b9525c0dbd1b099c5afe12fa40b3c71b403893efdb7a31790ae9a46d01224f949f85ceecc94dcb5ef4fbb
diff --git a/app-emacs/compat/compat-30.0.1.0.ebuild b/app-emacs/compat/compat-30.0.1.0-r1.ebuild
index 0de9f6e50e90..d8d01c6363f8 100644
--- a/app-emacs/compat/compat-30.0.1.0.ebuild
+++ b/app-emacs/compat/compat-30.0.1.0-r1.ebuild
@@ -29,10 +29,6 @@ BDEPEND="
 
 ELISP_TEXINFO="${PN}.texi"
 
-src_compile() {
-	emake compile "${PN}.info"
-}
-
 src_test() {
 	local has_json="$("${EMACS}" ${EMACSFLAGS} --eval "(princ (fboundp 'json-parse-string))")"
 	if [[ "${has_json}" != t ]] ; then
@@ -49,3 +45,9 @@ src_test() {
 		emake test
 	fi
 }
+
+src_install() {
+	rm ./compat-tests.el || die
+
+	elisp_src_install
+}
diff --git a/app-emacs/lsp-java/Manifest b/app-emacs/lsp-java/Manifest
index e9bb3051d0c5..21289ef67d91 100644
--- a/app-emacs/lsp-java/Manifest
+++ b/app-emacs/lsp-java/Manifest
@@ -1,5 +1,4 @@
 AUX lsp-java-icons-3.1_p20240328.patch 878 BLAKE2B 61d8ad92d2df357cd63a75078ad279de784ac8ab3b6f4bbfe45134df8f67879266c520952386c2a2ad7118aa325fbd9598a108239e8cd5a4de88800b853daf37 SHA512 715665c589c090ddbda2a5c58140dcd99343ae7e03ff9502f8343d70c4ae687fd06f0e1fb7b5e9243ac570a987918f527e7a97419b514bbc0b1c463a2a85e6fc
-AUX lsp-java-icons.patch 912 BLAKE2B e00bf73b8c3d99bbc597783ed97ce3a4f556da59843b37d526c6600fb87b8c40e45ef1cce5643a18ef507b96c8e0d82637d1b809bae60cf1e8eb78318739631e SHA512 d27a5c13e271b6363bae22dabeaf2b21981fb22991004996b2022d5cd12419bbe78b0e6e6a474c7909a9c7fe7e8cee0b5853505d85abd3a44898d4f56b99ef33
 DIST lsp-java-3.1_p20240328.tar.gz 833134 BLAKE2B 5e87c2b120e0e07e33fdf5b47b42fa01fc146d7ee00cc7f35cd023ce42e16726e0b2d50a15e12b200a6a22ef47be43daf8f6ce7ef92acc7f558d53fc5b31ed08 SHA512 68ef39f81f278d469443416e6c8754e5b00ce22c6512301e6d37f51daf3123a32fe52347ab1f9c252fc7711099e61dac3ba3566def03d04a59f93d5d575c6bf4
 EBUILD lsp-java-3.1_p20240328.ebuild 1159 BLAKE2B b1678406dbe5c08900c25db039a5fa905ee7013f894380fb1952bc65fa963ec14de24f5ff6c61c7e4a91cdc9e6afb92620aafc2ea71017800c71971ccad7d791 SHA512 753c3e44437e497bc79e3acf2802d4211146d3525fb9b63dc1aa893163e68890c2908e1a215d94e55c372e7485ae38cabd02f71bed2b1376d1cbeecdaf922c83
 MISC metadata.xml 425 BLAKE2B aa0b126c8b256673f723f9454f8cf4592f61619f0d5774f0b4c6267259eccb8040d257f6261981ac75aeac86e15b6e53eb2f16e242fcc410c9a538cdaf3678b7 SHA512 d22e69f9ca8e65c4b9db4f8b7801fb059348fc22c59f7814ee1a1032d53ae26a61efc3fa2d6ed90178490fb42f75c5963583b06cfa8be6218b568c695318e5e6
diff --git a/app-emacs/lsp-java/files/lsp-java-icons.patch b/app-emacs/lsp-java/files/lsp-java-icons.patch
deleted file mode 100644
index 5c89490d8688..000000000000
--- a/app-emacs/lsp-java/files/lsp-java-icons.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-index b7f8083..571a19e 100644
---- a/lsp-java.el
-+++ b/lsp-java.el
-@@ -78,7 +78,7 @@ Use http://download.eclipse.org/che/che-ls-jdt/snapshots/che-jdt-language-server
-   :risky t
-   :type 'directory)
- 
--(defcustom lsp-java-themes-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons")
-+(defcustom lsp-java-themes-directory "@SITEETC@/icons"
-   "Directory containing themes."
-   :type 'directory
-   :group 'lsp-java)
-diff --git a/lsp-jt.el b/lsp-jt.el
-index 4aecfd9..ea05a51 100644
---- a/lsp-jt.el
-+++ b/lsp-jt.el
-@@ -185,7 +185,7 @@
-   (-uniq (gethash 'jdtls (lsp-session-server-id->folders (lsp-session)))))
- 
- (treemacs-modify-theme "Default"
--  :icon-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons/vscode")
-+  :icon-directory "@SITEETC@/icons/vscode/"
-   :config
-   (progn
-     (treemacs-create-icon :file "class.png" :extensions (java-test-class) :fallback "-")