6 files changed, 86 insertions, 71 deletions
diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index b9395d6adccb..1f4f7e2da28c 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -1 +1 @@
-DIST proofgeneral-4.4.tar.gz 14105056 BLAKE2B 8d45218cde620411d14ab3c703fea37f0482c0e1f6fc8d104b4de7506140d4d0491b5e23ddbf458bfa3aeb683b71f6e4deea31c2a46b902342fc686c2945162a SHA512 8be7f78b61a225fa4770698bbbb251424a0afe093efc3229f74f3a764317dc8cc00a72cb29e751f755dc5fdab59983906c9185f7828a1644a87d160265f12061
+DIST proofgeneral-4.5.tar.gz 1198535 BLAKE2B 24f93200d01752fb358ac88531b4b34392b7b968c7dbd7a7b3dcedfe71fa985ca893465bff503e3fc0efd267faeb3f5d8bd3d35f68847a4c90252e3a0bdd456b SHA512 ab2eed43053e3b6749e840a8d742058eaa91bfff7edbe12ea67bc492ffab07e1d77cf6a7772cb8c42ac73cae2cce65b48898b1cd10a77b906089768f8055b366
diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.4-images-dir.patch b/app-emacs/proofgeneral/files/proofgeneral-4.4-images-dir.patch
deleted file mode 100644
index 555837deda0d..000000000000
--- a/app-emacs/proofgeneral/files/proofgeneral-4.4-images-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/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 986088003fe1..8cf3eae5dcc1 100644
--- a/app-emacs/proofgeneral/metadata.xml
+++ b/app-emacs/proofgeneral/metadata.xml
@@ -5,5 +5,14 @@
   <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.4.ebuild b/app-emacs/proofgeneral/proofgeneral-4.4.ebuild
deleted file mode 100644
index 4580a379c0a5..000000000000
--- a/app-emacs/proofgeneral/proofgeneral-4.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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)"
-}
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
+}