Gentoo Archives: gentoo-commits

From: "Maciej Barć" <xgqt@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/proofgeneral/, app-emacs/proofgeneral/files/
Date: Fri, 04 Mar 2022 10:30:05
Message-Id: 1646389787.592a0cb6cef0eed1ec360e0fda4150da28e8192a.xgqt@gentoo
1 commit: 592a0cb6cef0eed1ec360e0fda4150da28e8192a
2 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 4 09:36:48 2022 +0000
4 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 4 10:29:47 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=592a0cb6
7
8 app-emacs/proofgeneral: bump to 4.5_pre20220228 (2022.02.28 snapshot)
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
12
13 app-emacs/proofgeneral/Manifest | 1 +
14 .../files/proofgeneral-4.5-paths.patch | 19 +++++++
15 .../proofgeneral-4.5_pre20220228.ebuild | 58 ++++++++++++++++++++++
16 3 files changed, 78 insertions(+)
17
18 diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
19 index b9395d6adccb..d64eec430f78 100644
20 --- a/app-emacs/proofgeneral/Manifest
21 +++ b/app-emacs/proofgeneral/Manifest
22 @@ -1 +1,2 @@
23 DIST proofgeneral-4.4.tar.gz 14105056 BLAKE2B 8d45218cde620411d14ab3c703fea37f0482c0e1f6fc8d104b4de7506140d4d0491b5e23ddbf458bfa3aeb683b71f6e4deea31c2a46b902342fc686c2945162a SHA512 8be7f78b61a225fa4770698bbbb251424a0afe093efc3229f74f3a764317dc8cc00a72cb29e751f755dc5fdab59983906c9185f7828a1644a87d160265f12061
24 +DIST proofgeneral-4.5_pre20220228.tar.gz 1195172 BLAKE2B fe128039d35a46035e3d266871e558e5a65879b04f979d32bd835842683b23645fdcaf2bbe88b62ead675fc7553f83a145a44b926cacf2ef75d8cd0276ea693b SHA512 630f869f8dee90cecd8b61f011d4d8b87681f153f82d8ceda062c234702c098ef9e90cb07590e2c33849103495f84529763084367d68712fe4672ac2f62c7fca
25
26 diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.5-paths.patch b/app-emacs/proofgeneral/files/proofgeneral-4.5-paths.patch
27 new file mode 100644
28 index 000000000000..f6213dfdc865
29 --- /dev/null
30 +++ b/app-emacs/proofgeneral/files/proofgeneral-4.5-paths.patch
31 @@ -0,0 +1,19 @@
32 +index 85819882..f69d5f6d 100644
33 +--- a/generic/proof-site.el
34 ++++ b/generic/proof-site.el
35 +@@ -118,13 +118,13 @@ Falls back to consulting the environment variable `PROOFGENERAL_HOME' if
36 + proof-site.el couldn't know where it was executed from.")
37 +
38 + (defcustom proof-images-directory
39 +- (expand-file-name "images/" proof-home-directory)
40 ++ (expand-file-name "@SITEETC@/images/")
41 + "Where Proof General image files are installed. Ends with slash."
42 + :type 'directory
43 + :group 'proof-general-internals)
44 +
45 + (defcustom proof-info-directory
46 +- (expand-file-name "doc/" proof-home-directory)
47 ++ (expand-file-name "@EPREFIX@/usr/share/info/")
48 + "Where Proof General Info files are installed. Ends with slash."
49 + :type 'directory
50 + :group 'proof-general-internals)
51
52 diff --git a/app-emacs/proofgeneral/proofgeneral-4.5_pre20220228.ebuild b/app-emacs/proofgeneral/proofgeneral-4.5_pre20220228.ebuild
53 new file mode 100644
54 index 000000000000..a554b006724d
55 --- /dev/null
56 +++ b/app-emacs/proofgeneral/proofgeneral-4.5_pre20220228.ebuild
57 @@ -0,0 +1,58 @@
58 +# Copyright 1999-2022 Gentoo Authors
59 +# Distributed under the terms of the GNU General Public License v2
60 +
61 +EAPI=8
62 +
63 +H=fe8b9fccb3690178be7fc455202c941c4c674ac3
64 +
65 +inherit wrapper elisp
66 +
67 +DESCRIPTION="A generic interface for proof assistants"
68 +HOMEPAGE="https://proofgeneral.github.io/"
69 +SRC_URI="https://github.com/ProofGeneral/PG/archive/${H}.tar.gz -> ${P}.tar.gz"
70 +S="${WORKDIR}/PG-${H}"
71 +
72 +LICENSE="GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0"
73 +SLOT="0"
74 +KEYWORDS="~amd64 ~ppc ~x86"
75 +
76 +PATCHES=(
77 + "${FILESDIR}"/${PN}-4.4-desktop.patch
78 + "${FILESDIR}"/${PN}-4.5-paths.patch
79 +)
80 +DOCS=( AUTHORS BUGS CHANGES COMPATIBILITY FAQ.md INSTALL README.md )
81 +SITEFILE="50${PN}-gentoo.el"
82 +
83 +src_prepare() {
84 + elisp_src_prepare
85 +
86 + sed -e "s|@EPREFIX@|${EPREFIX}|" \
87 + -e "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" \
88 + -i generic/proof-site.el || die
89 +}
90 +
91 +src_compile() {
92 + emake compile doc.info
93 +}
94 +
95 +src_install() {
96 + emake install-elisp install-bin install-desktop \
97 + PREFIX="${ED}"/usr \
98 + ELISP="${ED}${SITELISP}"/${PN} \
99 + DEST_ELISP="${EPREFIX}${SITELISP}"/${PN}
100 + elisp-site-file-install "${FILESDIR}/${SITEFILE}"
101 +
102 + # move images out of elisp dir
103 + mkdir -p "${ED}${SITEETC}"/${PN}/ || die
104 + mv "${ED}${SITELISP}"/${PN}/images "${ED}${SITEETC}"/${PN}/ || die
105 +
106 + # Create missing script, loosely translated from 4.4 version
107 + make_wrapper ${PN} "${EMACS} \
108 + -eval '(load \"${SITELISP}/${PN}/generic/proof-site.el\")' \
109 + -f proofgeneral \
110 + -f proof-splash-display-screen"
111 +
112 + doinfo doc/*.info*
113 + doman doc/proofgeneral.1
114 + einstalldocs
115 +}