summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-12-07 01:50:23 +0000
committerUlrich Müller <ulm@gentoo.org>2010-12-07 01:50:23 +0000
commit16e0a0347c04117805eeaea3e70aee477f59c463 (patch)
tree4874ddc66eee82d15b5a2f989e1d65cd06cb1c99 /app-emacs
parenttest release for bug #263956 (diff)
downloadgentoo-2-16e0a0347c04117805eeaea3e70aee477f59c463.tar.gz
gentoo-2-16e0a0347c04117805eeaea3e70aee477f59c463.tar.bz2
gentoo-2-16e0a0347c04117805eeaea3e70aee477f59c463.zip
Require Emacs version 23 at least. Don't compile and install bundled mmm-mode; depend on app-emacs/mmm-mode instead. Bug 347822.
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/proofgeneral/ChangeLog6
-rw-r--r--app-emacs/proofgeneral/proofgeneral-4.0.ebuild17
2 files changed, 18 insertions, 5 deletions
diff --git a/app-emacs/proofgeneral/ChangeLog b/app-emacs/proofgeneral/ChangeLog
index 8a37102d6704..afb314374afd 100644
--- a/app-emacs/proofgeneral/ChangeLog
+++ b/app-emacs/proofgeneral/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emacs/proofgeneral
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/ChangeLog,v 1.31 2010/12/06 19:20:13 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/ChangeLog,v 1.32 2010/12/07 01:50:23 ulm Exp $
+
+ 07 Dec 2010; Ulrich Mueller <ulm@gentoo.org> proofgeneral-4.0.ebuild:
+ Require Emacs version 23 at least. Don't compile and install bundled
+ mmm-mode; depend on app-emacs/mmm-mode instead. Bug 347822.
*proofgeneral-4.0 (06 Dec 2010)
diff --git a/app-emacs/proofgeneral/proofgeneral-4.0.ebuild b/app-emacs/proofgeneral/proofgeneral-4.0.ebuild
index 9c9d5b66ef08..8adc93707055 100644
--- a/app-emacs/proofgeneral/proofgeneral-4.0.ebuild
+++ b/app-emacs/proofgeneral/proofgeneral-4.0.ebuild
@@ -1,6 +1,9 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/proofgeneral-4.0.ebuild,v 1.1 2010/12/06 19:20:13 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/proofgeneral-4.0.ebuild,v 1.2 2010/12/07 01:50:23 ulm Exp $
+
+EAPI=3
+NEED_EMACS=23
inherit elisp
@@ -14,12 +17,18 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
+DEPEND=">=app-emacs/mmm-mode-0.4.8-r2"
+RDEPEND="${DEPEND}"
+
S="${WORKDIR}/${MY_PN}-${PV}"
SITEFILE="50${PN}-gentoo.el"
+src_prepare() {
+ sed -i -e '/^OTHER_ELISP/s:contrib/mmm::' Makefile || die
+}
+
src_compile() {
- # 4.0 ships precompiled lisp files which need to be moved out of the
- # way
+ # removed precompiled lisp files shipped with 4.0
emake clean
emake -j1 compile EMACS=emacs || die
}
@@ -31,7 +40,7 @@ src_install() {
doinfo doc/*.info* || die
doman doc/proofgeneral.1 || die
dohtml doc/ProofGeneral/*.html doc/PG-adapting/*.html || die
- dodoc AUTHORS BUGS CHANGES COMPATIBILITY FAQ FUTURE INSTALL README REGISTER
+ dodoc AUTHORS BUGS CHANGES COMPATIBILITY FAQ INSTALL README REGISTER
# clean up
rm -rf "${D}/usr/share/emacs/site-lisp/site-start.d"