Use standard elisp-common compile method. Don't require caml-font in site file. Other minor changes.

Package-Manager: portage-2.1.2.7

5 files changed, 41 insertions, 74 deletions

diff --git a/app-emacs/ocaml-mode/ChangeLog b/app-emacs/ocaml-mode/ChangeLog
index 28adb69036a9..2a5c700df74b 100644
--- a/app-emacs/ocaml-mode/ChangeLog
+++ b/app-emacs/ocaml-mode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/ocaml-mode
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ChangeLog,v 1.9 2007/03/30 16:29:50 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ChangeLog,v 1.10 2007/05/12 09:04:34 ulm Exp $
+
+  12 May 2007; Ulrich Mueller <ulm@gentoo.org> files/50ocaml-mode-gentoo.el,
+  ocaml-mode-3.08.1.ebuild, ocaml-mode-3.09.3.ebuild:
+  Correct LICENSE. Use standard method of elisp-common.eclass for compiling.
+  Install README* files. Remove redundant pkg_postinst and pkg_postrm
+  functions. Don't require caml-font in site file.
 
 *ocaml-mode-3.09.3 (30 Mar 2007)
 
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
index 8e0f59cb5d67..037b79a4c511 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 50ocaml-mode-gentoo.el 314 RMD160 edccb50a30d30e05eb733e078fdea6ea7fdc5f9b SHA1 c7a0a74cc868cbfcb726795ab58950a7557d1349 SHA256 203759ea4e57dc137eb7209ab75d448f0499555979abc5e2646bb21918d2ed7e
-MD5 b600db1a8ff25f5c6f12f15ff60ad7e5 files/50ocaml-mode-gentoo.el 314
-RMD160 edccb50a30d30e05eb733e078fdea6ea7fdc5f9b files/50ocaml-mode-gentoo.el 314
-SHA256 203759ea4e57dc137eb7209ab75d448f0499555979abc5e2646bb21918d2ed7e files/50ocaml-mode-gentoo.el 314
+AUX 50ocaml-mode-gentoo.el 299 RMD160 568684c10a18e0367ada1a2fded0086e40050b7e SHA1 007b7ebed60200e31e6bdccdc037ba32e57ef3c2 SHA256 ef2e1df7fc897d7bed7e0cfb4b2e256f5ec8fd1df113afb865c665a96286d148
+MD5 175568d95bfe7b9a859732dea58f5b8c files/50ocaml-mode-gentoo.el 299
+RMD160 568684c10a18e0367ada1a2fded0086e40050b7e files/50ocaml-mode-gentoo.el 299
+SHA256 ef2e1df7fc897d7bed7e0cfb4b2e256f5ec8fd1df113afb865c665a96286d148 files/50ocaml-mode-gentoo.el 299
 DIST ocaml-3.07.tar.gz 2537449 RMD160 3e9e3f0c1a3a4afb40cf4f6a8b8958ca71539268 SHA1 7a5ecdcbfcce8a507cf9c15ab993a6cead4f0589 SHA256 f6bee46311906849dd6958e196ee39f42c4f8713e8c5f1b7763c8971ba1756d6
 DIST ocaml-3.08.1.tar.bz2 2050084 RMD160 4c06876304890cab020ff1a7ffc0cbcbd86a1b6f SHA1 936d131fd2e32a6bc9eb29fca0c2e9f339a2545f SHA256 b8a31dc75521e172beffbd896bc4003635ae3abfb82ff3636d0c332d220caedc
 DIST ocaml-3.09.3.tar.bz2 2038617 RMD160 fdc124218c556c62c897ee6720970279e2d5426b SHA1 5d63c6e0d13463f85c0d5147d641d2bceef87d6b SHA256 607842b4f4917a759f19541a421370a834f5b948855ca54cef40d22b19a0934f
@@ -12,18 +12,18 @@ EBUILD ocaml-mode-3.07.ebuild 1047 RMD160 09290ef767412aa7753af33a5396cfa61ae866
 MD5 4e0d5005a58e18a5c26a52b11b7d0513 ocaml-mode-3.07.ebuild 1047
 RMD160 09290ef767412aa7753af33a5396cfa61ae866ac ocaml-mode-3.07.ebuild 1047
 SHA256 8b71247aa4eb743644104d10ee19babd562097d8d86ffc9b0f4938eebb8a1476 ocaml-mode-3.07.ebuild 1047
-EBUILD ocaml-mode-3.08.1.ebuild 1175 RMD160 4fc7c7b706dd21c6342d4cacb49bcfd69d22ba25 SHA1 777febf3740ddb1ac8beb965661dd7e4e0f5c1df SHA256 8083eef8c4af2eb6eb8aa04d6e5d51c7693188d823413aa73c9bf4300cfa9a31
-MD5 5ce4a50e92831e0e702836fd0ea1f26e ocaml-mode-3.08.1.ebuild 1175
-RMD160 4fc7c7b706dd21c6342d4cacb49bcfd69d22ba25 ocaml-mode-3.08.1.ebuild 1175
-SHA256 8083eef8c4af2eb6eb8aa04d6e5d51c7693188d823413aa73c9bf4300cfa9a31 ocaml-mode-3.08.1.ebuild 1175
-EBUILD ocaml-mode-3.09.3.ebuild 1181 RMD160 2feee644601a33b182b01f39571109d9d1d9c89c SHA1 9b201ed85fcd330245da7eb9565fd13958823dc2 SHA256 e8ec320a09abb0b0106cc9a35f675eb39964cac7c4d4fbc7260f650a2a8d206e
-MD5 53120d7b34797c82a1b3840d7f510fed ocaml-mode-3.09.3.ebuild 1181
-RMD160 2feee644601a33b182b01f39571109d9d1d9c89c ocaml-mode-3.09.3.ebuild 1181
-SHA256 e8ec320a09abb0b0106cc9a35f675eb39964cac7c4d4fbc7260f650a2a8d206e ocaml-mode-3.09.3.ebuild 1181
-MISC ChangeLog 1487 RMD160 cf943872113cf6953d79f5dbfe359424c4a663b2 SHA1 da6cdc50243cfd75bcc098cfc6152b5b2703a122 SHA256 7798ddb709911b1ea96ec311eb11013d31b4667fe8dcd868651753bb24d9ddd9
-MD5 9db12c16b444d7c7755b35c518277a0c ChangeLog 1487
-RMD160 cf943872113cf6953d79f5dbfe359424c4a663b2 ChangeLog 1487
-SHA256 7798ddb709911b1ea96ec311eb11013d31b4667fe8dcd868651753bb24d9ddd9 ChangeLog 1487
+EBUILD ocaml-mode-3.08.1.ebuild 720 RMD160 4b613b43e5f2966331f67d699afc0d4c95621385 SHA1 bd4aa4d7b943a55bf20d4b7aa337ef749a4e65de SHA256 209c60b9fc5e410c49051f2f19d52488b10b8f8bfcd65623113fd62acd7921a9
+MD5 a3a8f8b91c9b8e7e687218596478d90c ocaml-mode-3.08.1.ebuild 720
+RMD160 4b613b43e5f2966331f67d699afc0d4c95621385 ocaml-mode-3.08.1.ebuild 720
+SHA256 209c60b9fc5e410c49051f2f19d52488b10b8f8bfcd65623113fd62acd7921a9 ocaml-mode-3.08.1.ebuild 720
+EBUILD ocaml-mode-3.09.3.ebuild 720 RMD160 2dcb54f510cbddf3bc8cede0927271a002e770e6 SHA1 2abd84b53a3a5383f8ab3f67a6f8e0ad74842a47 SHA256 7d750dd32506c1d84cb079b1301dc61ecc1bf98da267483680a7dfc57b78986a
+MD5 b13a6981d7afadc1da0bd07f21ff924e ocaml-mode-3.09.3.ebuild 720
+RMD160 2dcb54f510cbddf3bc8cede0927271a002e770e6 ocaml-mode-3.09.3.ebuild 720
+SHA256 7d750dd32506c1d84cb079b1301dc61ecc1bf98da267483680a7dfc57b78986a ocaml-mode-3.09.3.ebuild 720
+MISC ChangeLog 1816 RMD160 6d3ad2599541f997047696e2028192d3a9270c1d SHA1 789c3a7f795fe1494f58ae2094bd30a6287e28c5 SHA256 49f73ef5574bb03268582552adbd768224e085007626d24eda33b46af46dd0e4
+MD5 eb17dc0f8961592217fd9f372467b47e ChangeLog 1816
+RMD160 6d3ad2599541f997047696e2028192d3a9270c1d ChangeLog 1816
+SHA256 49f73ef5574bb03268582552adbd768224e085007626d24eda33b46af46dd0e4 ChangeLog 1816
 MISC metadata.xml 178 RMD160 28954a9655a0ae3552166e7bb58e31900ba673b6 SHA1 f5dee29039a284f0807e09a60b8cec97006b6b19 SHA256 5d35d79a4a6edb5b03e1c36de7d1c0a97a1a2e2704b3711acaf38929def2f9f5
 MD5 81377dd0b004dbd067148ec7adc1a4a2 metadata.xml 178
 RMD160 28954a9655a0ae3552166e7bb58e31900ba673b6 metadata.xml 178
@@ -38,9 +38,9 @@ MD5 71f3dc5bc2ee57a403689b56bc1a85c1 files/digest-ocaml-mode-3.09.3 244
 RMD160 e7f0898889b94faae3b1481555bac42e9298b370 files/digest-ocaml-mode-3.09.3 244
 SHA256 19708f759185ed39623e03921462ba20fb6f3533268673d2bcd7dd07cef57350 files/digest-ocaml-mode-3.09.3 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGDTsPNQqtfCuFneMRAlYJAJ9NWKBbHdSVcEWYdypwzJ8Yb9KtIgCeOYXj
-U51/PHcevVC2MEKPRQl1+uc=
-=bUEP
+iD8DBQFGRYOlOeoy/oIi7uwRAuxIAKCzD1HlHDYEDfnhmV3VplAll8a6IACfQeyx
+fK+yHe1pXwTLV1QrI8THeJk=
+=jUKw
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el b/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el
index 38b9f1a5821f..8a13cd03addb 100644
--- a/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el
+++ b/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el
@@ -2,8 +2,7 @@
 ;;; ocaml-mode site-lisp configuration
 
 (add-to-list 'load-path "@SITELISP@")
-(setq auto-mode-alist
-    (cons '("\\.ml[iylp]?$" . caml-mode) auto-mode-alist))
+(add-to-list 'auto-mode-alist '("\\.ml[iylp]?\\'" . caml-mode))
 (autoload 'caml-mode "caml" "Major mode for editing Caml code." t)
 (autoload 'run-caml "inf-caml" "Run an inferior Caml process." t)
-(require 'caml-font)
+;;(require 'caml-font)
diff --git a/app-emacs/ocaml-mode/ocaml-mode-3.08.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-3.08.1.ebuild
index 98ef0e448e08..e68751d60815 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-3.08.1.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-3.08.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.08.1.ebuild,v 1.3 2005/07/10 19:58:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.08.1.ebuild,v 1.4 2007/05/12 09:04:34 ulm Exp $
 
 inherit elisp
 
@@ -10,39 +10,20 @@ DESCRIPTION="Emacs mode for OCaml"
 HOMEPAGE="http://www.ocaml.org/"
 SRC_URI="http://caml.inria.fr/distrib/${MY_P}/${MY_P}.tar.bz2"
 
-LICENSE="LGPL-2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
-DEPEND="virtual/emacs"
-
 S="${WORKDIR}/${MY_P}/emacs"
+SITEFILE=50${PN}-gentoo.el
 
 src_compile() {
-	COMPILECMD='(progn
-			  (setq load-path (cons "." load-path))
-			  (byte-compile-file "caml-xemacs.el")
-			  (byte-compile-file "caml-emacs.el")
-			  (byte-compile-file "caml-types.el")
-			  (byte-compile-file "caml-hilit.el")
-			  (byte-compile-file "caml-font.el")
-			  (byte-compile-file "caml.el")
-			  (byte-compile-file "inf-caml.el")
-			  (byte-compile-file "caml-help.el")
-			  (byte-compile-file "camldebug.el"))'
-	emacs -batch -eval "${COMPILECMD}"
+	elisp-comp *.el || die "elisp-comp failed"
 }
 
 src_install() {
 	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install ${FILESDIR}/50ocaml-mode-gentoo.el
-}
-
-pkg_postinst() {
-	elisp-site-regen
-}
-
-pkg_postrm() {
-	elisp-site-regen
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README README.itz || die "dodoc failed"
 }
diff --git a/app-emacs/ocaml-mode/ocaml-mode-3.09.3.ebuild b/app-emacs/ocaml-mode/ocaml-mode-3.09.3.ebuild
index 081d085d4cb4..d5af8ebacd70 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-3.09.3.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-3.09.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.09.3.ebuild,v 1.1 2007/03/30 16:29:50 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.09.3.ebuild,v 1.2 2007/05/12 09:04:34 ulm Exp $
 
 inherit elisp
 
@@ -10,39 +10,20 @@ DESCRIPTION="Emacs mode for OCaml"
 HOMEPAGE="http://www.ocaml.org/"
 SRC_URI="http://caml.inria.fr/distrib/${MY_P}/${MY_P}.tar.bz2"
 
-LICENSE="LGPL-2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
-DEPEND=""
 
 S="${WORKDIR}/${MY_P}/emacs"
-SITEFILE=50ocaml-mode-gentoo.el
+SITEFILE=50${PN}-gentoo.el
 
 src_compile() {
-	COMPILECMD='(progn
-			  (setq load-path (cons "." load-path))
-			  (byte-compile-file "caml-xemacs.el")
-			  (byte-compile-file "caml-emacs.el")
-			  (byte-compile-file "caml-types.el")
-			  (byte-compile-file "caml-hilit.el")
-			  (byte-compile-file "caml-font.el")
-			  (byte-compile-file "caml.el")
-			  (byte-compile-file "inf-caml.el")
-			  (byte-compile-file "caml-help.el")
-			  (byte-compile-file "camldebug.el"))'
-	emacs -batch -eval "${COMPILECMD}"
+	elisp-comp *.el || die "elisp-comp failed"
 }
 
 src_install() {
 	elisp-install ${PN} *.el *.elc
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
-
-pkg_postinst() {
-	elisp-site-regen
-}
-
-pkg_postrm() {
-	elisp-site-regen
+	dodoc README README.itz || die "dodoc failed"
 }