Add proper support for emacs. Closes #194604

Package-Manager: portage-2.1.3.11

4 files changed, 50 insertions, 18 deletions

diff --git a/dev-lang/mozart/ChangeLog b/dev-lang/mozart/ChangeLog
index 20382dc7ca67..6fdff4de850e 100644
--- a/dev-lang/mozart/ChangeLog
+++ b/dev-lang/mozart/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mozart
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.8 2007/09/29 05:49:54 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.9 2007/10/04 06:22:39 keri Exp $
+
+  04 Oct 2007; keri <keri@gentoo.org> +files/50mozart-gentoo.el,
+  mozart-1.3.2.ebuild:
+  Add proper support for emacs. Reported and fixed by Ulrich Mueller in bug
+  #194604
 
   29 Sep 2007; keri <keri@gentoo.org> +files/mozart-1.3.2-ri-fpe.patch,
   mozart-1.3.2.ebuild:
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index bc252df61d97..7a99a8c314d2 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -1,3 +1,7 @@
+AUX 50mozart-gentoo.el 482 RMD160 6c2b385419c73cadbd69ffa8de537b758c895592 SHA1 50e36c277313e19b9ebca416ccc878fe40a61b8f SHA256 0e008cf41eb34bf0d679215c08aeb6b8beb5c1466f62a1af490525e07bad8731
+MD5 86c54485c0c9a70eb8f132832887d9f2 files/50mozart-gentoo.el 482
+RMD160 6c2b385419c73cadbd69ffa8de537b758c895592 files/50mozart-gentoo.el 482
+SHA256 0e008cf41eb34bf0d679215c08aeb6b8beb5c1466f62a1af490525e07bad8731 files/50mozart-gentoo.el 482
 AUX mozart-1.3.2-contrib.patch 12448 RMD160 00201c0d8c7e661136d26d92f6814c62fd3a131b SHA1 cc33953732d9818319d4be27087431e13d153215 SHA256 f4a81774f7335d05d2c708763ee7d21366dc376728ee94f5cd33e1649682bfb7
 MD5 cd217533b3cc0dc5cc08c0cbafa3fe7e files/mozart-1.3.2-contrib.patch 12448
 RMD160 00201c0d8c7e661136d26d92f6814c62fd3a131b files/mozart-1.3.2-contrib.patch 12448
@@ -28,14 +32,14 @@ RMD160 d8741090acc8fe4bf67c55f873ad141bda01796b files/mozart-1.3.2-ri-fpe.patch
 SHA256 544b2bdc701a80f69541417aeb05885155edc7111f2fd17581c1a0801eaee211 files/mozart-1.3.2-ri-fpe.patch 1158
 DIST mozart-1.3.2.20060615-doc.tar.gz 3890265 RMD160 450721bb64cbcc5cefddbaf9c3b0cdfe6261ae5f SHA1 28dfd9f92ba6ee698acb7363146b4a1c0ab4199f SHA256 b169418dd02fb6024d897778908928a6aa800e8ea96b6c76515b064bfac3b84e
 DIST mozart-1.3.2.20060615-src.tar.gz 10798680 RMD160 22dd1f639b6ea525744564b37be009bd599d60ad SHA1 aa980f4de7dcb2b4c2db511a464a5b6497b98109 SHA256 a09acd3365911348fd7b351d73ae1b2ad76ae96ffd335ee08746f5dcca3a55bf
-EBUILD mozart-1.3.2.ebuild 2424 RMD160 85e64159cc7923024b49a882159aab24977affd7 SHA1 df94da854d69e826ebde620b21b4d9f3477899e1 SHA256 cea3618f5f46af451e06ce4e7cc4f8c685b9fb6a0fa646b03c78d1831f4b3bd2
-MD5 6ce0ec0a0bf2d630c0f030c8b4d55def mozart-1.3.2.ebuild 2424
-RMD160 85e64159cc7923024b49a882159aab24977affd7 mozart-1.3.2.ebuild 2424
-SHA256 cea3618f5f46af451e06ce4e7cc4f8c685b9fb6a0fa646b03c78d1831f4b3bd2 mozart-1.3.2.ebuild 2424
-MISC ChangeLog 1399 RMD160 edc0b9814f1b554398bca2d1f008de2287d7c783 SHA1 46e92fd350334dca9cb38ea49d2e8a485944a1e7 SHA256 34d807c1f566d747e1be25e98fae7466b4106481de470635d5ca1ad973e3bc98
-MD5 64755379e9a60159c33b94883fc986df ChangeLog 1399
-RMD160 edc0b9814f1b554398bca2d1f008de2287d7c783 ChangeLog 1399
-SHA256 34d807c1f566d747e1be25e98fae7466b4106481de470635d5ca1ad973e3bc98 ChangeLog 1399
+EBUILD mozart-1.3.2.ebuild 2671 RMD160 9602bf25f42b903261d58a51dde12d4faff41ebb SHA1 b662c99996e6514126dea5d336b03e219ac1be9f SHA256 2b064eab7b4961191abb962ba4b4db75792eed44e35edda38309f532e2fdd441
+MD5 3460d4a64459206c25918514aea9d61e mozart-1.3.2.ebuild 2671
+RMD160 9602bf25f42b903261d58a51dde12d4faff41ebb mozart-1.3.2.ebuild 2671
+SHA256 2b064eab7b4961191abb962ba4b4db75792eed44e35edda38309f532e2fdd441 mozart-1.3.2.ebuild 2671
+MISC ChangeLog 1574 RMD160 8b943552820c3395005fdcfdf9b3dcaeda26a484 SHA1 92e27a3e479b17485071bf47b7ff32d0456258cc SHA256 9ad4f8c04d45b98f95a63432bd198477087351463c1badcade1a062f46a2f9c3
+MD5 48d6be3693bd6e7a08f78c806ea2a8a7 ChangeLog 1574
+RMD160 8b943552820c3395005fdcfdf9b3dcaeda26a484 ChangeLog 1574
+SHA256 9ad4f8c04d45b98f95a63432bd198477087351463c1badcade1a062f46a2f9c3 ChangeLog 1574
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
diff --git a/dev-lang/mozart/files/50mozart-gentoo.el b/dev-lang/mozart/files/50mozart-gentoo.el
new file mode 100644
index 000000000000..64f65c54a682
--- /dev/null
+++ b/dev-lang/mozart/files/50mozart-gentoo.el
@@ -0,0 +1,11 @@
+
+;;; mozart site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(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-1.3.2.ebuild b/dev-lang/mozart/mozart-1.3.2.ebuild
index 0606f593e9c5..870f1d4c9449 100644
--- a/dev-lang/mozart/mozart-1.3.2.ebuild
+++ b/dev-lang/mozart/mozart-1.3.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild,v 1.6 2007/09/29 05:49:54 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild,v 1.7 2007/10/04 06:22:39 keri Exp $
 
-inherit eutils
+inherit elisp-common eutils
 
 MY_P="mozart-${PV}.20060615"
 
@@ -21,12 +21,15 @@ DEPEND="dev-lang/perl
 	sys-devel/bison
 	sys-devel/flex
 	sys-libs/zlib
+	emacs? ( virtual/emacs )
 	gdbm? ( sys-libs/gdbm  )
 	tcl? ( tk? (
 			dev-lang/tk
 			dev-lang/tcl ) )"
 RDEPEND="${DEPEND}"
 
+SITEFILE=50${PN}-gentoo.el
+
 S="${WORKDIR}"/${MY_P}
 
 src_unpack() {
@@ -47,12 +50,6 @@ src_compile() {
 			--without-global-oz \
 			--enable-opt=none"
 
-	if use emacs ; then
-		myconf="${myconf} --enable-compile-elisp"
-	else
-		myconf="${myconf} --disable-compile-elisp"
-	fi
-
 	if use tcl && use tk ; then
 		myconf="${myconf} --enable-wish"
 	else
@@ -77,22 +74,37 @@ src_compile() {
 		--disable-doc \
 		$(use_enable doc contrib-doc) \
 		$(use_enable gdbm contrib-gdbm) \
+		$(use_enable emacs compile-elisp) \
 		$(use_enable static link-static) \
 		$(use_enable threads threaded) \
 		|| die "econf failed"
 
-	emake bootstrap || die "emake bootstrap failed"
+	emake -j1 bootstrap || die "emake bootstrap failed"
 }
 
 src_install() {
 	emake -j1 \
 		PREFIX="${D}"/usr/lib/mozart \
 		BINDIR="${D}"/usr/bin \
+		ELISPDIR="${D}${SITELISP}/${PN}" \
 		install || die "emake install failed"
 
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
 	if use doc ; then
 		dohtml -r "${WORKDIR}"/mozart/doc/*
 	fi
 
 	dodoc README
 }
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}