gentoo resync : 29.06.2021

3 files changed, 26 insertions, 2 deletions

diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index 6b945cb75b64..e4407a372fe5 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -1,4 +1,5 @@
+AUX 50mozart-gentoo.el 592 BLAKE2B 4bac647ce0e16ef481c3907a183f5559fb2644edddc8c4bd3864fef572c2064b0f4f0d6a66de3995c894fc9b4c6d813f82cc98dd5ccff38fbf8d91dbea0ca8bd SHA512 b8f50633ea7b249aadc096b3533f9dbfc65e4e2ef6d3afe39910b42a2f98ea44b133c55e308d3808f7373df835fa9653c229104035eb3b6ec24ede4968fdd254
 DIST mozart-2.0.1-gentoo-patchset-1.tar.gz 39069 BLAKE2B 7490d13665314b3a998fb21bd8a342f262d92a395c3b0bbfa9a7813c044220c82ac02eb0103409127862c9bb4e4c44765b1228a7bdea2cb247492c94264f4fe0 SHA512 ce3cdb8ffebd95d6065439432905ad68b9cd8b86f58478092ab55df7ae7c72498a3e29bda462f3305aff6c99d010c45d786f905e2e906550ee61656ba122bbc6
 DIST mozart-2.0.1.tar.gz 2281261 BLAKE2B 7f071e9ec130a0b482b299f4dac15d64f632702d6ecf55b7af0993087064e533b4de80f77520a725f69f68648a9ce763c8c8826bb24e52af49eda8c3ccfba0b5 SHA512 a72a6fa68296d06af72327fd11310b3be152e5ad9a56f1fc4200ac7b89cd177e9a23a38c6721e1885d4f2ed0870065e919fb9fe3c9a2833fcd8e4ac0fd43aeb4
-EBUILD mozart-2.0.1.ebuild 1724 BLAKE2B 7c7e64baaecc2f7c06b54ec818ba723c9b9bf1e22f44db7868a3d6024aa86e6e0f328f2c07e876c46854a93f4537244ec275b14726ede5dbb206090d438b9155 SHA512 17a9fe7d8980dbb54d2e3a666192e2138b00a05fd0f9c8b5bcab33a7168a817ec9571b50f2dbf9fb02302380e540f2378621a48479126f80b6fbcf33d5c7057c
+EBUILD mozart-2.0.1.ebuild 1973 BLAKE2B 1ceb81b2ca9eefc4b3be3ba2e2deba83d684fac4e7c4f799f7c78cdb26361d066f9605beb800d19e278bb7dfe5c69b698fdc9b0dd782cd27d378ff19022b3c81 SHA512 a8c25fecd52f5ae4f7ff5fe70cadd497d000befa0fd06f2261bc7309c9adfd89b651686ff6447727c4e8897d59ef6e7ee8210d04bbf1580666cc9160992c3e21
 MISC metadata.xml 248 BLAKE2B 15dcca8e423036aaf3d73f9557507d39f7a22a6fa36d83405d8180df441adc50b9d61f8dd720a9d0045f5b3e6ebc9785fcf8f1340c253b2d277404672d395c1b SHA512 b296da55efb17a1040203bc1f5f3bfa8160711fdb72f0543739e6efe48b75427c082eb6c405d99b3256e8d536d3d29f71fdd0fd8d281cb9a9967060ea467a034
diff --git a/dev-lang/mozart/files/50mozart-gentoo.el b/dev-lang/mozart/files/50mozart-gentoo.el
new file mode 100644
index 000000000000..3533d49d693b
--- /dev/null
+++ b/dev-lang/mozart/files/50mozart-gentoo.el
@@ -0,0 +1,13 @@
+;;; mozart site-lisp configuration
+
+(or (getenv "OZHOME")
+    (setenv "OZHOME" "/usr"))
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'run-oz' "oz" "Start Mozart as a sub-process" t)
+(autoload 'oz-mode "oz" "Major mode for editing Oz code." t)
+(autoload 'oz-gump-mode "oz"
+  "Major mode for editing Oz code with embedded Gump specifications." t)
+(autoload 'ozm-mode "mozart" "Major mode for displaying Oz machine code." t)
+(add-to-list 'auto-mode-alist '("\\.oz$" . oz-mode))
+(add-to-list 'auto-mode-alist '("\\.ozg$" . oz-gump-mode))
+(add-to-list 'auto-mode-alist '("\\.ozm$" . ozm-mode))
diff --git a/dev-lang/mozart/mozart-2.0.1.ebuild b/dev-lang/mozart/mozart-2.0.1.ebuild
index d469901f25b6..510d6729b40b 100644
--- a/dev-lang/mozart/mozart-2.0.1.ebuild
+++ b/dev-lang/mozart/mozart-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake java-pkg-2 java-ant-2
+inherit cmake elisp-common java-pkg-2 java-ant-2
 
 PATCHSET_VER="1"
 
@@ -30,6 +30,8 @@ DEPEND="${RDEPEND}
 	dev-lang/scala:2.12
 	test? ( dev-cpp/gtest:= )"
 
+SITEFILE="50${PN}-gentoo.el"
+
 S="${WORKDIR}/${PN}2-${PV}"
 
 src_prepare() {
@@ -71,12 +73,19 @@ src_install() {
 
 	dolib.so "${BUILD_DIR}"/vm/vm/main/libmozartvm.so
 	dolib.so "${BUILD_DIR}"/vm/boostenv/main/libmozartvmboost.so
+
+	if use emacs; then
+		elisp-install ${PN} "${S}"/opi/emacs/*.el
+		elisp-site-file-install "${FILESDIR}"/"${SITEFILE}" \
+			|| die "elsip-site-file-install failed"
+	fi
 }
 
 pkg_postinst() {
 	if use emacs; then
 		xdg_icon_cache_update
 		xdg_desktop_database_update
+		elisp-site-regen
 	fi
 }
 
@@ -84,5 +93,6 @@ pkg_postrm() {
 	if use emacs; then
 		xdg_icon_cache_update
 		xdg_desktop_database_update
+		elisp-site-regen
 	fi
 }