[gentoo-commits] repo/gentoo:master commit in: app-emacs/proofgeneral/files/, app-emacs/proofgeneral/

[gentoo-commits] repo/gentoo:master commit in: app-emacs/proofgeneral/files/, app-emacs/proofgeneral/

[Maciej Barć]

commit:     6941dbd2a7392eac22e8cac0f41dc8cf75c77abe
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 11 18:43:42 2025 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Mar 11 18:55:58 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6941dbd2

app-emacs/proofgeneral: replace "which" with "command -v"

Bug: https://github.com/ProofGeneral/PG/pull/812
Closes: https://bugs.gentoo.org/950240
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../files/proofgeneral-4.5-posix-no-which.patch    | 40 ++++++++++++++++++++++
 app-emacs/proofgeneral/proofgeneral-4.5.ebuild     |  4 ++-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.5-posix-no-which.patch b/app-emacs/proofgeneral/files/proofgeneral-4.5-posix-no-which.patch
new file mode 100644
index 000000000000..cd1ed1529407
--- /dev/null
+++ b/app-emacs/proofgeneral/files/proofgeneral-4.5-posix-no-which.patch
@@ -0,0 +1,40 @@
+From 2dac06d9e3f8e66f1619585c86f05a538a75de08 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
+Date: Mon, 24 Feb 2025 19:29:48 +0100
+Subject: [PATCH] Makefile: Replace "which" by POSIX "command -v"
+
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7a5df5602..b9b28aab5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -21,7 +21,7 @@
+ 
+ # Set this according to your version of Emacs.
+ # NB: this is also used to set default install path names below.
+-EMACS=$(shell if [ -z "`which emacs`" ]; then echo "Emacs executable not found"; exit 1; else echo emacs; fi)
++EMACS=$(shell if [ -z "`command -v emacs`" ]; then echo "Emacs executable not found"; exit 1; else echo emacs; fi)
+ 
+ # We default to /usr rather than /usr/local because installs of
+ # desktop and doc files under /usr/local are unlikely to work with
+@@ -273,7 +273,7 @@ scripts: bashscripts perlscripts
+ 
+ .PHONY: bashscripts
+ bashscripts:
+-	(bash="`which bash`";					    \
++	(bash="`command -v bash`";					    \
+ 	 if [ -z "$$bash" ]; then				    \
+ 	   echo "Could not find bash - bash paths not checked" >&2; \
+ 	   exit 0;						    \
+@@ -281,7 +281,7 @@ bashscripts:
+ 
+ .PHONY: perlscripts
+ perlscripts:
+-	(perl="`which perl`";					    \
++	(perl="`command -v perl`";					    \
+ 	 if [ -z "$$perl" ]; then				    \
+ 	   echo "Could not find perl - perl paths not checked" >&2; \
+ 	   exit 0;						    \

diff --git a/app-emacs/proofgeneral/proofgeneral-4.5.ebuild b/app-emacs/proofgeneral/proofgeneral-4.5.ebuild
index 021c56340c58..a5ca4a5d9022 100644
--- a/app-emacs/proofgeneral/proofgeneral-4.5.ebuild
+++ b/app-emacs/proofgeneral/proofgeneral-4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,9 @@ KEYWORDS="amd64 ppc x86"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.4-desktop.patch
 	"${FILESDIR}"/${PN}-4.5-paths.patch
+	"${FILESDIR}"/${PN}-4.5-posix-no-which.patch
 )
+
 DOCS=( AUTHORS BUGS CHANGES COMPATIBILITY FAQ.md INSTALL README.md )
 SITEFILE="50${PN}-gentoo.el"
 

[gentoo-commits] repo/gentoo:master commit in: app-emacs/proofgeneral/files/, app-emacs/proofgeneral/

[Ulrich Müller]

commit:     1252a62f41fad070f515a926448702a5d48c1e60
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 11:15:43 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 11:15:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1252a62f

app-emacs/proofgeneral: Remove old.

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

 app-emacs/proofgeneral/Manifest                    |  1 -
 .../files/proofgeneral-4.2-bytecomp-warn.patch     | 14 ------
 app-emacs/proofgeneral/proofgeneral-4.2.ebuild     | 55 ----------------------
 3 files changed, 70 deletions(-)

diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index 29da9a184a2..b9395d6adcc 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -1,2 +1 @@
-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.2-bytecomp-warn.patch b/app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch
deleted file mode 100644
index b34321bf392..00000000000
--- 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/proofgeneral-4.2.ebuild b/app-emacs/proofgeneral/proofgeneral-4.2.ebuild
deleted file mode 100644
index f3b2ee9fff9..00000000000
--- 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)"
-}