gentoo resync : 20.03.2022

3 files changed, 80 insertions, 0 deletions

diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index 2254589ec7f0..37e11f80126c 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -1,6 +1,9 @@
 AUX 50proofgeneral-gentoo.el 68 BLAKE2B 14c41f176f78dee51fdb893f355c2b8cf00456e0b586c7c41c91f2eea6f8d0baaf8d6a04eda385031c96c138d47c0e7e99a75be7cd27ffd0d2087e0a69ded0b2 SHA512 32f3d33d85776f1695d542adadb8e35e372659fcce2805fc205732cd911be186cd5a1a63a8438287467dea744da9ef212f7338c0edb735a525ec30f892f1afca
 AUX proofgeneral-4.4-desktop.patch 425 BLAKE2B fdefa2835502ded79bc08ffff7906315913a0e740269ba5a1863bf4ef8c602ee56eda1c25fc2ff161cd0131b6c615bbcea3770bc39ef18ae654b892571c92deb SHA512 dc594dc08432fb5a4068b7aabcb85ff58b9e784903f912694da08ef97ec9bfca229dcc4d965ca5286993173083c89dc53805f09f7152eb183829985c3c4c5b22
 AUX proofgeneral-4.4-images-dir.patch 358 BLAKE2B 8c06cd031ff3dca8d9537acb86245ba01ac06e505f0baf6146dbbe89c81dee9dc471b0103f6e2dd0ec5e1c80e72d1a3682393528ea262af187e2548e29c464ef SHA512 06fed75bf855d8cbd8938ca96f9e1cb61cdf01b7f68e58188d4ef287bab847156454dea0c2bc44adfd8979e900b58e5cc7a64b742606e694b3b0717b9a735151
+AUX proofgeneral-4.5-paths.patch 762 BLAKE2B 77f7b828dfa1648b6d8818951fca297194192b4c2d6ef2f510c25f33a9cb8d9db8f11a1dbeda5a9235d60063fcaede1ad10efbd2e28e2cbe0f6485af9d90bbcf SHA512 89d7ea239e5530e7dc2b6520bfaeafd68cc77db58ba0786401dad57d52e5fdaa3efe83e9402449581f89c683d044401a2f4aec93dc69c7fcae972d423cab6594
 DIST proofgeneral-4.4.tar.gz 14105056 BLAKE2B 8d45218cde620411d14ab3c703fea37f0482c0e1f6fc8d104b4de7506140d4d0491b5e23ddbf458bfa3aeb683b71f6e4deea31c2a46b902342fc686c2945162a SHA512 8be7f78b61a225fa4770698bbbb251424a0afe093efc3229f74f3a764317dc8cc00a72cb29e751f755dc5fdab59983906c9185f7828a1644a87d160265f12061
+DIST proofgeneral-4.5_pre20220228.tar.gz 1195172 BLAKE2B fe128039d35a46035e3d266871e558e5a65879b04f979d32bd835842683b23645fdcaf2bbe88b62ead675fc7553f83a145a44b926cacf2ef75d8cd0276ea693b SHA512 630f869f8dee90cecd8b61f011d4d8b87681f153f82d8ceda062c234702c098ef9e90cb07590e2c33849103495f84529763084367d68712fe4672ac2f62c7fca
 EBUILD proofgeneral-4.4.ebuild 1630 BLAKE2B f78e6be268f2576d5ca1e01cd1dd20fded60131ada2bc0983ae98a4e416b1ae8eb8692aa6a0bfa2068d639db956a268af4687b05d37e2f8a3ef186628f08a987 SHA512 b81141f5efadb662a269fac178248dede7b5eaeca7394538265ced397a7d9eb89354c87c6cfd8aece39ecadd0ec552e7568183c7e844e8b4fef7eb7edfe2a064
+EBUILD proofgeneral-4.5_pre20220228.ebuild 1493 BLAKE2B 53d54ca00c223c2a86b13d683c6b31e9fa3bf0118c346ccadc4879f889b8ead3b46ad35d49cfa2f66f3b1675f573885b162ba5811667be382a6d10e7bd5a961a SHA512 44f483f80d77628755202839d48a0f6023680a5aa4971914378357fa9710e77f94657f67813b859aa3bfcd20b9423ed5b7d3b8039cb6ab2f82fd4e988ca0e5a8
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
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
+}