diff options
Diffstat (limited to 'app-emacs/proofgeneral')
| -rw-r--r-- | app-emacs/proofgeneral/Manifest | 2 | ||||
| -rw-r--r-- | app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch | 14 | ||||
| -rw-r--r-- | app-emacs/proofgeneral/files/proofgeneral-4.4-desktop.patch | 14 | ||||
| -rw-r--r-- | app-emacs/proofgeneral/files/proofgeneral-4.5-paths.patch | 19 | ||||
| -rw-r--r-- | app-emacs/proofgeneral/metadata.xml | 11 | ||||
| -rw-r--r-- | app-emacs/proofgeneral/proofgeneral-4.2.ebuild | 55 | ||||
| -rw-r--r-- | app-emacs/proofgeneral/proofgeneral-4.5.ebuild | 57 |
7 files changed, 101 insertions, 71 deletions
diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest index 60a383039cc2..1f4f7e2da28c 100644 --- a/app-emacs/proofgeneral/Manifest +++ b/app-emacs/proofgeneral/Manifest @@ -1 +1 @@ -DIST ProofGeneral-4.2.tgz 1613190 BLAKE2B e12913d67f95b20d99d5bdaa82a36f0dd2b664441a86dc86cb4f8afaac2379691c01e60cfe6af3bbf177f0dc2f82ce34ea4d706ee34c2d5986de3f807ce05045 SHA512 102c56a1bc113439b1fa8aa10efe571d47d68b344d3489fe18ca3bdbf8828bb31fd2302a68a4bd639c59c429d41e82e5d933abddd3444781cb0e8a603db432ab +DIST proofgeneral-4.5.tar.gz 1198535 BLAKE2B 24f93200d01752fb358ac88531b4b34392b7b968c7dbd7a7b3dcedfe71fa985ca893465bff503e3fc0efd267faeb3f5d8bd3d35f68847a4c90252e3a0bdd456b SHA512 ab2eed43053e3b6749e840a8d742058eaa91bfff7edbe12ea67bc492ffab07e1d77cf6a7772cb8c42ac73cae2cce65b48898b1cd10a77b906089768f8055b366 diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch b/app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch deleted file mode 100644 index b34321bf392b..000000000000 --- a/app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch +++ /dev/null @@ -1,14 +0,0 @@ -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/files/proofgeneral-4.4-desktop.patch b/app-emacs/proofgeneral/files/proofgeneral-4.4-desktop.patch new file mode 100644 index 000000000000..56937b8394c2 --- /dev/null +++ b/app-emacs/proofgeneral/files/proofgeneral-4.4-desktop.patch @@ -0,0 +1,14 @@ +--- PG-4.4-orig/etc/desktop/proofgeneral.desktop ++++ PG-4.4/etc/desktop/proofgeneral.desktop +@@ -4,9 +4,9 @@ + Name=Proof General + GenericName=Theorem proving environment + Comment=Organise your proofs! +-Icon=proofgeneral.png ++Icon=proofgeneral + TryExec=proofgeneral + Exec=proofgeneral %F + Terminal=false +-Categories=Application;IDE;Development;TextEditor;Math ++Categories=IDE;Development;TextEditor;Math + StartupWMClass=Emacs diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.5-paths.patch b/app-emacs/proofgeneral/files/proofgeneral-4.5-paths.patch new file mode 100644 index 000000000000..f6213dfdc865 --- /dev/null +++ b/app-emacs/proofgeneral/files/proofgeneral-4.5-paths.patch @@ -0,0 +1,19 @@ +index 85819882..f69d5f6d 100644 +--- a/generic/proof-site.el ++++ b/generic/proof-site.el +@@ -118,13 +118,13 @@ Falls back to consulting the environment variable `PROOFGENERAL_HOME' if + proof-site.el couldn't know where it was executed from.") + + (defcustom proof-images-directory +- (expand-file-name "images/" proof-home-directory) ++ (expand-file-name "@SITEETC@/images/") + "Where Proof General image files are installed. Ends with slash." + :type 'directory + :group 'proof-general-internals) + + (defcustom proof-info-directory +- (expand-file-name "doc/" proof-home-directory) ++ (expand-file-name "@EPREFIX@/usr/share/info/") + "Where Proof General Info files are installed. Ends with slash." + :type 'directory + :group 'proof-general-internals) diff --git a/app-emacs/proofgeneral/metadata.xml b/app-emacs/proofgeneral/metadata.xml index c918cdef9591..8cf3eae5dcc1 100644 --- a/app-emacs/proofgeneral/metadata.xml +++ b/app-emacs/proofgeneral/metadata.xml @@ -1,9 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>gnu-emacs@gentoo.org</email> <name>Gentoo GNU Emacs project</name> </maintainer> +<longdescription> + Proof General is a generic Emacs interface for proof assistants. The aim of + the Proof General project is to provide a powerful, generic environment for + using interactive proof assistants. +</longdescription> <stabilize-allarches/> +<upstream> + <bugs-to>https://github.com/ProofGeneral/PG/issues/</bugs-to> + <remote-id type="github">ProofGeneral/PG</remote-id> +</upstream> </pkgmetadata> diff --git a/app-emacs/proofgeneral/proofgeneral-4.2.ebuild b/app-emacs/proofgeneral/proofgeneral-4.2.ebuild deleted file mode 100644 index f3b2ee9fff92..000000000000 --- a/app-emacs/proofgeneral/proofgeneral-4.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit elisp - -MY_PN="ProofGeneral" -DESCRIPTION="A generic interface for proof assistants" -HOMEPAGE="http://proofgeneral.inf.ed.ac.uk/" -SRC_URI="http://proofgeneral.inf.ed.ac.uk/releases/${MY_PN}-${PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -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() { - # remove precompiled lisp files - emake clean - emake -j1 compile EMACS=emacs -} - -src_install() { - emake -j1 install EMACS=emacs PREFIX="${D}"/usr - elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${MY_PN} - - 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 - rm -rf "${D}/usr/share/emacs/site-lisp/site-start.d" - rm -rf "${D}/usr/share/application-registry" - rm -rf "${D}/usr/share/mime-info" -} - -pkg_postinst() { - elisp-site-regen - elog "Please register your use of Proof General on the web at:" - elog " http://proofgeneral.inf.ed.ac.uk/register " - elog "(see the REGISTER file for more information)" -} diff --git a/app-emacs/proofgeneral/proofgeneral-4.5.ebuild b/app-emacs/proofgeneral/proofgeneral-4.5.ebuild new file mode 100644 index 000000000000..021c56340c58 --- /dev/null +++ b/app-emacs/proofgeneral/proofgeneral-4.5.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit wrapper elisp + +DESCRIPTION="A generic interface for proof assistants" +HOMEPAGE="https://proofgeneral.github.io/" +SRC_URI="https://github.com/ProofGeneral/PG/archive/v${PV}.tar.gz + -> ${P}.tar.gz" +S="${WORKDIR}"/PG-${PV} + +LICENSE="GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="amd64 ppc x86" + +PATCHES=( + "${FILESDIR}"/${PN}-4.4-desktop.patch + "${FILESDIR}"/${PN}-4.5-paths.patch +) +DOCS=( AUTHORS BUGS CHANGES COMPATIBILITY FAQ.md INSTALL README.md ) +SITEFILE="50${PN}-gentoo.el" + +src_prepare() { + elisp_src_prepare + + sed -e "s|@EPREFIX@|${EPREFIX}|" \ + -e "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" \ + -i generic/proof-site.el || die +} + +src_compile() { + emake compile doc.info +} + +src_install() { + emake install-elisp install-bin install-desktop \ + PREFIX="${ED}"/usr \ + ELISP="${ED}${SITELISP}"/${PN} \ + DEST_ELISP="${EPREFIX}${SITELISP}"/${PN} + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + + # move images out of elisp dir + mkdir -p "${ED}${SITEETC}"/${PN}/ || die + mv "${ED}${SITELISP}"/${PN}/images "${ED}${SITEETC}"/${PN}/ || die + + # Create missing script, loosely translated from 4.4 version + make_wrapper ${PN} "${EMACS} \ + -eval '(load \"${SITELISP}/${PN}/generic/proof-site.el\")' \ + -f proofgeneral \ + -f proof-splash-display-screen" + + doinfo doc/*.info* + doman doc/${PN}.1 + einstalldocs +} |