diff options
author | 2013-04-22 19:42:12 +0000 | |
---|---|---|
committer | 2013-04-22 19:42:12 +0000 | |
commit | 66045f42fb1fa8e4f86d93555d8f1bc66fd864ea (patch) | |
tree | 730a817ef62ebf952778e34da795e84a28f565f1 /app-emacs | |
parent | Version bump (diff) | |
download | gentoo-2-66045f42fb1fa8e4f86d93555d8f1bc66fd864ea.tar.gz gentoo-2-66045f42fb1fa8e4f86d93555d8f1bc66fd864ea.tar.bz2 gentoo-2-66045f42fb1fa8e4f86d93555d8f1bc66fd864ea.zip |
Version bump, bug 445242. Remove old.
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-emacs')
-rw-r--r-- | app-emacs/proofgeneral/ChangeLog | 10 | ||||
-rw-r--r-- | app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch | 14 | ||||
-rw-r--r-- | app-emacs/proofgeneral/proofgeneral-4.2.ebuild (renamed from app-emacs/proofgeneral/proofgeneral-4.0.ebuild) | 20 |
3 files changed, 33 insertions, 11 deletions
diff --git a/app-emacs/proofgeneral/ChangeLog b/app-emacs/proofgeneral/ChangeLog index 051a20aa6baf..0b53781dbf17 100644 --- a/app-emacs/proofgeneral/ChangeLog +++ b/app-emacs/proofgeneral/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emacs/proofgeneral -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/ChangeLog,v 1.37 2012/07/14 21:14:04 ulm Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/ChangeLog,v 1.38 2013/04/22 19:42:12 ulm Exp $ + +*proofgeneral-4.2 (22 Apr 2013) + + 22 Apr 2013; Ulrich Müller <ulm@gentoo.org> -proofgeneral-4.0.ebuild, + +proofgeneral-4.2.ebuild, +files/proofgeneral-4.2-bytecomp-warn.patch: + Version bump, bug 445242. Remove old. 14 Jul 2012; Ulrich Müller <ulm@gentoo.org> proofgeneral-4.1.ebuild, +files/proofgeneral-4.1-image-load-path.patch: diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch b/app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch new file mode 100644 index 000000000000..b34321bf392b --- /dev/null +++ b/app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/445242 +http://proofgeneral.inf.ed.ac.uk/trac/ticket/458 + +--- ProofGeneral-4.2-orig/Makefile ++++ ProofGeneral-4.2/Makefile +@@ -62,7 +62,7 @@ + # only during compilation. Another idea: put a function in proof-site + # to output the compile-time load path and ELISP_DIRS so these are set + # just in that one place. +-BYTECOMP = $(BATCHEMACS) -eval '(setq load-path (append (mapcar (lambda (d) (concat "${PWD}/" (symbol-name d))) (quote (${ELISP_DIRS}))) load-path))' -eval '(progn (require (quote bytecomp)) (require (quote mouse)) (require (quote tool-bar)) (require (quote fontset)) (setq byte-compile-warnings (remove (quote cl-functions) (remove (quote noruntime) byte-compile-warning-types))) (setq byte-compile-error-on-warn t))' -f batch-byte-compile ++BYTECOMP = $(BATCHEMACS) -eval '(setq load-path (append (mapcar (lambda (d) (concat "${PWD}/" (symbol-name d))) (quote (${ELISP_DIRS}))) load-path))' -eval '(progn (require (quote bytecomp)) (require (quote mouse)) (require (quote tool-bar)) (require (quote fontset)))' -f batch-byte-compile + EL=$(shell for f in $(ELISP_DIRS); do ls $$f/*.el; done) + ELC=$(EL:.el=.elc) + diff --git a/app-emacs/proofgeneral/proofgeneral-4.0.ebuild b/app-emacs/proofgeneral/proofgeneral-4.2.ebuild index 8adc93707055..fbb8174e1e32 100644 --- a/app-emacs/proofgeneral/proofgeneral-4.0.ebuild +++ b/app-emacs/proofgeneral/proofgeneral-4.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2013 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.2 2010/12/07 01:50:23 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/proofgeneral-4.2.ebuild,v 1.1 2013/04/22 19:42:12 ulm Exp $ -EAPI=3 +EAPI=5 NEED_EMACS=23 inherit elisp @@ -21,25 +21,27 @@ DEPEND=">=app-emacs/mmm-mode-0.4.8-r2" RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_PN}-${PV}" +ELISP_PATCHES="${P}-bytecomp-warn.patch" SITEFILE="50${PN}-gentoo.el" src_prepare() { + elisp_src_prepare sed -i -e '/^OTHER_ELISP/s:contrib/mmm::' Makefile || die } src_compile() { - # removed precompiled lisp files shipped with 4.0 + # remove precompiled lisp files emake clean - emake -j1 compile EMACS=emacs || die + emake -j1 compile EMACS=emacs } src_install() { - emake -j1 install EMACS=emacs PREFIX="${D}"/usr || die + emake -j1 install EMACS=emacs PREFIX="${D}"/usr elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${MY_PN} || die - doinfo doc/*.info* || die - doman doc/proofgeneral.1 || die - dohtml doc/ProofGeneral/*.html doc/PG-adapting/*.html || die + doinfo doc/*.info* + doman doc/proofgeneral.1 + dohtml doc/ProofGeneral/*.html doc/PG-adapting/*.html dodoc AUTHORS BUGS CHANGES COMPATIBILITY FAQ INSTALL README REGISTER # clean up |