Version bump, bug 379637. Update ebuild to EAPI 4.

(Portage version: 2.1.10.11/cvs/Linux x86_64)

4 files changed, 45 insertions, 20 deletions

diff --git a/app-emacs/tuareg-mode/ChangeLog b/app-emacs/tuareg-mode/ChangeLog
index 980032c883d5..8501083d8ce3 100644
--- a/app-emacs/tuareg-mode/ChangeLog
+++ b/app-emacs/tuareg-mode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/tuareg-mode
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/tuareg-mode/ChangeLog,v 1.34 2010/07/01 13:07:09 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tuareg-mode/ChangeLog,v 1.35 2011/08/18 07:19:56 ulm Exp $
+
+*tuareg-mode-2.0.4 (18 Aug 2011)
+
+  18 Aug 2011; Ulrich Mueller <ulm@gentoo.org> tuareg-mode-2.0.1.ebuild,
+  +tuareg-mode-2.0.4.ebuild:
+  Version bump, bug 379637. Update ebuild to EAPI 4.
 
 *tuareg-mode-2.0.1 (01 Jul 2010)
 
diff --git a/app-emacs/tuareg-mode/files/50tuareg-mode-gentoo.el b/app-emacs/tuareg-mode/files/50tuareg-mode-gentoo.el
index 207be491a627..7eb391baed33 100644
--- a/app-emacs/tuareg-mode/files/50tuareg-mode-gentoo.el
+++ b/app-emacs/tuareg-mode/files/50tuareg-mode-gentoo.el
@@ -1,6 +1,3 @@
-
-;;; tuareg-mode site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (setq auto-mode-alist (cons '("\\.ml\\w?" . tuareg-mode) auto-mode-alist))
 (autoload 'tuareg-mode "tuareg" "Major mode for editing Caml code" t)
diff --git a/app-emacs/tuareg-mode/tuareg-mode-2.0.1.ebuild b/app-emacs/tuareg-mode/tuareg-mode-2.0.1.ebuild
index 32fe069b8a95..54adcc18ac87 100644
--- a/app-emacs/tuareg-mode/tuareg-mode-2.0.1.ebuild
+++ b/app-emacs/tuareg-mode/tuareg-mode-2.0.1.ebuild
@@ -1,30 +1,26 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/tuareg-mode/tuareg-mode-2.0.1.ebuild,v 1.1 2010/07/01 13:07:09 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tuareg-mode/tuareg-mode-2.0.1.ebuild,v 1.2 2011/08/18 07:19:56 ulm Exp $
 
-EAPI=3
+EAPI=4
 
-inherit eutils elisp
+inherit elisp
 
 DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
-HOMEPAGE="https://forge.ocamlcore.org/projects/tuareg/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/410/${P}.tgz"
+HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/410/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-S=${WORKDIR}/tuareg-${PV}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make_install.patch
-}
+S="${WORKDIR}/tuareg-${PV}"
+ELISP_PATCHES="${P}-make_install.patch"
+SITEFILE="50${PN}-gentoo.el"
 
 src_install() {
-	emake DEST="${D}/usr/share/emacs/site-lisp/tuareg-mode" install || die
-	dodoc HISTORY README || die
+	emake DEST="${D}/usr/share/emacs/site-lisp/tuareg-mode" install
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	dodoc HISTORY README
 }
diff --git a/app-emacs/tuareg-mode/tuareg-mode-2.0.4.ebuild b/app-emacs/tuareg-mode/tuareg-mode-2.0.4.ebuild
new file mode 100644
index 000000000000..dc2b463da3f2
--- /dev/null
+++ b/app-emacs/tuareg-mode/tuareg-mode-2.0.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tuareg-mode/tuareg-mode-2.0.4.ebuild,v 1.1 2011/08/18 07:19:56 ulm Exp $
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
+HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/514/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/tuareg-${PV}"
+ELISP_PATCHES="${PN}-2.0.1-make_install.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	emake DEST="${D}/usr/share/emacs/site-lisp/tuareg-mode" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	dodoc HISTORY README
+}