public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-emacs/proofgeneral/, app-emacs/proofgeneral/files/
@ 2019-09-05 15:05 Ulrich Müller
  0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Müller @ 2019-09-05 15:05 UTC (permalink / raw
  To: gentoo-commits

commit:     0cc699e224d4923fdb05ee14d73c20dd0b09afe4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  5 14:37:29 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Sep  5 15:05:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc699e2

app-emacs/proofgeneral: Bump to version 4.4.

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-emacs/proofgeneral/Manifest                    |  1 +
 .../files/proofgeneral-4.4-desktop.patch           | 14 +++++
 .../files/proofgeneral-4.4-images-dir.patch        | 11 ++++
 app-emacs/proofgeneral/proofgeneral-4.4.ebuild     | 59 ++++++++++++++++++++++
 4 files changed, 85 insertions(+)

diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index 60a383039cc..29da9a184a2 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -1 +1,2 @@
 DIST ProofGeneral-4.2.tgz 1613190 BLAKE2B e12913d67f95b20d99d5bdaa82a36f0dd2b664441a86dc86cb4f8afaac2379691c01e60cfe6af3bbf177f0dc2f82ce34ea4d706ee34c2d5986de3f807ce05045 SHA512 102c56a1bc113439b1fa8aa10efe571d47d68b344d3489fe18ca3bdbf8828bb31fd2302a68a4bd639c59c429d41e82e5d933abddd3444781cb0e8a603db432ab
+DIST proofgeneral-4.4.tar.gz 14105056 BLAKE2B 8d45218cde620411d14ab3c703fea37f0482c0e1f6fc8d104b4de7506140d4d0491b5e23ddbf458bfa3aeb683b71f6e4deea31c2a46b902342fc686c2945162a SHA512 8be7f78b61a225fa4770698bbbb251424a0afe093efc3229f74f3a764317dc8cc00a72cb29e751f755dc5fdab59983906c9185f7828a1644a87d160265f12061

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 00000000000..56937b8394c
--- /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.4-images-dir.patch b/app-emacs/proofgeneral/files/proofgeneral-4.4-images-dir.patch
new file mode 100644
index 00000000000..555837deda0
--- /dev/null
+++ b/app-emacs/proofgeneral/files/proofgeneral-4.4-images-dir.patch
@@ -0,0 +1,11 @@
+--- PG-4.4-orig/generic/proof-site.el
++++ PG-4.4/generic/proof-site.el
+@@ -127,7 +127,7 @@
+   :group 'proof-general-internals)
+ 
+ (defcustom proof-images-directory
+-  (concat proof-home-directory "images/")
++  "@SITEETC@/images/"
+     "Where Proof General image files are installed.  Ends with slash."
+   :type 'directory
+   :group 'proof-general-internals)

diff --git a/app-emacs/proofgeneral/proofgeneral-4.4.ebuild b/app-emacs/proofgeneral/proofgeneral-4.4.ebuild
new file mode 100644
index 00000000000..0b9df0133b6
--- /dev/null
+++ b/app-emacs/proofgeneral/proofgeneral-4.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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"
+
+LICENSE="GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=app-emacs/mmm-mode-0.4.8-r2"
+BDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/PG-${PV}"
+ELISP_PATCHES="${P}-images-dir.patch
+	${P}-desktop.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+	sed -i -e "s:@SITEETC@:${EPREFIX}${SITEETC}/${PN}:" \
+		generic/proof-site.el || die
+	sed -i -e '/^OTHER_ELISP/s:contrib/mmm::' Makefile || die
+}
+
+src_compile() {
+	#emake clean		# remove precompiled lisp files
+	emake -j1 compile doc.info EMACS=emacs
+}
+
+src_install() {
+	emake -j1 install-elisp install-bin install-desktop \
+		EMACS=emacs \
+		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
+
+	doinfo doc/*.info*
+	doman doc/proofgeneral.1
+	dodoc AUTHORS BUGS CHANGES COMPATIBILITY FAQ.md INSTALL README.md REGISTER
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	# Already in REGISTER, so no need to install README.gentoo
+	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)"
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emacs/proofgeneral/, app-emacs/proofgeneral/files/
@ 2022-03-04 10:30 Maciej Barć
  0 siblings, 0 replies; 2+ messages in thread
From: Maciej Barć @ 2022-03-04 10:30 UTC (permalink / raw
  To: gentoo-commits

commit:     592a0cb6cef0eed1ec360e0fda4150da28e8192a
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  4 09:36:48 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Fri Mar  4 10:29:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=592a0cb6

app-emacs/proofgeneral: bump to 4.5_pre20220228 (2022.02.28 snapshot)

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 app-emacs/proofgeneral/Manifest                    |  1 +
 .../files/proofgeneral-4.5-paths.patch             | 19 +++++++
 .../proofgeneral-4.5_pre20220228.ebuild            | 58 ++++++++++++++++++++++
 3 files changed, 78 insertions(+)

diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index b9395d6adccb..d64eec430f78 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -1 +1,2 @@
 DIST proofgeneral-4.4.tar.gz 14105056 BLAKE2B 8d45218cde620411d14ab3c703fea37f0482c0e1f6fc8d104b4de7506140d4d0491b5e23ddbf458bfa3aeb683b71f6e4deea31c2a46b902342fc686c2945162a SHA512 8be7f78b61a225fa4770698bbbb251424a0afe093efc3229f74f3a764317dc8cc00a72cb29e751f755dc5fdab59983906c9185f7828a1644a87d160265f12061
+DIST proofgeneral-4.5_pre20220228.tar.gz 1195172 BLAKE2B fe128039d35a46035e3d266871e558e5a65879b04f979d32bd835842683b23645fdcaf2bbe88b62ead675fc7553f83a145a44b926cacf2ef75d8cd0276ea693b SHA512 630f869f8dee90cecd8b61f011d4d8b87681f153f82d8ceda062c234702c098ef9e90cb07590e2c33849103495f84529763084367d68712fe4672ac2f62c7fca

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/proofgeneral-4.5_pre20220228.ebuild b/app-emacs/proofgeneral/proofgeneral-4.5_pre20220228.ebuild
new file mode 100644
index 000000000000..a554b006724d
--- /dev/null
+++ b/app-emacs/proofgeneral/proofgeneral-4.5_pre20220228.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=fe8b9fccb3690178be7fc455202c941c4c674ac3
+
+inherit wrapper elisp
+
+DESCRIPTION="A generic interface for proof assistants"
+HOMEPAGE="https://proofgeneral.github.io/"
+SRC_URI="https://github.com/ProofGeneral/PG/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/PG-${H}"
+
+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/proofgeneral.1
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-03-04 10:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-04 10:30 [gentoo-commits] repo/gentoo:master commit in: app-emacs/proofgeneral/, app-emacs/proofgeneral/files/ Maciej Barć
  -- strict thread matches above, loose matches on Subject: below --
2019-09-05 15:05 Ulrich Müller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox