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
commitb9a900711e4ae59f914f854ac172a710b75a75c4 (patch)
tree21d9f630ebb95d1128afad26f58e86e1a5f4df0f /app-emacs
parenttest release for bug #263956 (diff)
downloadhistorical-b9a900711e4ae59f914f854ac172a710b75a75c4.tar.gz
historical-b9a900711e4ae59f914f854ac172a710b75a75c4.tar.bz2
historical-b9a900711e4ae59f914f854ac172a710b75a75c4.zip
Require Emacs version 23 at least. Don't compile and install bundled mmm-mode; depend on app-emacs/mmm-mode instead. Bug 347822.
Package-Manager: portage-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/Manifest10
-rw-r--r--app-emacs/proofgeneral/proofgeneral-4.0.ebuild17
3 files changed, 23 insertions, 10 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/Manifest b/app-emacs/proofgeneral/Manifest
index 9fc23a1d3cbd..0744e960715b 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -5,13 +5,13 @@ AUX 50proofgeneral-gentoo.el 68 RMD160 f88b8933267aaeb02694c155223c910bfbde8103
DIST ProofGeneral-3.7.1.tgz 2023176 RMD160 57740365463b0049f9409e9dc1e97bf66a81fb90 SHA1 8bfa5b8c8f670ac992628aa05824f4bf514673a2 SHA256 e613aa2f24564465f450b06b2d804e6815b220652c9f778e3d3471b644fdaa93
DIST ProofGeneral-4.0.tgz 1351482 RMD160 1c89da5fb4ac718f5ac9ff2a940c1e2222f18236 SHA1 af3a821ce6b4d3d86a1eaa8b27e3e5902da384c7 SHA256 b8aeefd5619683216ff57bae81236dfab71d43d6eefa371d38749fc43415cfaa
EBUILD proofgeneral-3.7.1.ebuild 1344 RMD160 35cffe13a96d86d24a5586112b85822137a56229 SHA1 8c79e7ddcba6ed75e9b28ada8089ab8a0ae733d8 SHA256 0199b19bf18c0c20cfa5719dcfbec325511013d00f777c2b1c25ee72719806ba
-EBUILD proofgeneral-4.0.ebuild 1403 RMD160 4b5388be291f7a11986257705d3d03b65e5d75be SHA1 af5b91d6d6e5a0a2c238be64ef96e7ea350879f9 SHA256 eaeb7304c5d637c99b8ed1fddaa1b1d10178b47bc4312080b4dd75a3e62dc064
-MISC ChangeLog 4529 RMD160 989b9f660950463fee27e1071fbda9a00d054733 SHA1 b5f01d1efbcce079ebfebd2d83b64353d49981e7 SHA256 ccc0493f1f239d142cb40ef63b0adeddeed95d220d015594dce22d47c4f9a766
+EBUILD proofgeneral-4.0.ebuild 1528 RMD160 d10607b1bfa8cdadaede24f9497f52b2ddf9b23e SHA1 178ce52828fd9934a533b0bdb2cb60ec8a458622 SHA256 8d9e9a1e1c800a7333eb75fd8ab4113817d28be3f19452aacf06d2af4699263f
+MISC ChangeLog 4733 RMD160 863eb032f842c667e62d9a9aee34402490f320b0 SHA1 88e67380373d8b466cd7308de15ce58654466d59 SHA256 5e088dea714f3a7eb8b455487f24f6fb051883d51bbef2650f72189a4e9c2d95
MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkz9N+YACgkQNQqtfCuFneNFIQCdEDZURzsl4Bo9SmAAGFf8O8Oy
-ohsAn3NhdksXwRzcMi+9Wy5ggp7elN8X
-=XX/6
+iEYEARECAAYFAkz9k80ACgkQOeoy/oIi7uzqRQCeLyNInqXMuYTWs0ryY2ut/PAn
+A4cAnjBNyf7+yVk4i1Uht8rjTZ7z/HCg
+=EBnc
-----END PGP SIGNATURE-----
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"