gentoo resync : 06.08.2019

4 files changed, 88 insertions, 0 deletions

diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index 8b03b5b1faca..1243783843b9 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -1,5 +1,9 @@
 AUX 50proofgeneral-gentoo.el 68 BLAKE2B 14c41f176f78dee51fdb893f355c2b8cf00456e0b586c7c41c91f2eea6f8d0baaf8d6a04eda385031c96c138d47c0e7e99a75be7cd27ffd0d2087e0a69ded0b2 SHA512 32f3d33d85776f1695d542adadb8e35e372659fcce2805fc205732cd911be186cd5a1a63a8438287467dea744da9ef212f7338c0edb735a525ec30f892f1afca
 AUX proofgeneral-4.2-bytecomp-warn.patch 1150 BLAKE2B 0e4b577a1fcdbf27d2a75055ddbb970945d494ae4de2f01da4c4b1c8fc7c39bd8745a5e62abd3a7f401cb4d2ef5f30452dfae9c1899b85d7929fe4ed87bc3a66 SHA512 ad7f972148cec19c60d58e7ee7808735b92d6f642d178453d123988c68e873824a7bf8ceeded82dfd3b6109e5b50e24bd7fa8753822b5f36cbb2e73ff4e0d30f
+AUX proofgeneral-4.4-desktop.patch 425 BLAKE2B fdefa2835502ded79bc08ffff7906315913a0e740269ba5a1863bf4ef8c602ee56eda1c25fc2ff161cd0131b6c615bbcea3770bc39ef18ae654b892571c92deb SHA512 dc594dc08432fb5a4068b7aabcb85ff58b9e784903f912694da08ef97ec9bfca229dcc4d965ca5286993173083c89dc53805f09f7152eb183829985c3c4c5b22
+AUX proofgeneral-4.4-images-dir.patch 358 BLAKE2B 8c06cd031ff3dca8d9537acb86245ba01ac06e505f0baf6146dbbe89c81dee9dc471b0103f6e2dd0ec5e1c80e72d1a3682393528ea262af187e2548e29c464ef SHA512 06fed75bf855d8cbd8938ca96f9e1cb61cdf01b7f68e58188d4ef287bab847156454dea0c2bc44adfd8979e900b58e5cc7a64b742606e694b3b0717b9a735151
 DIST ProofGeneral-4.2.tgz 1613190 BLAKE2B e12913d67f95b20d99d5bdaa82a36f0dd2b664441a86dc86cb4f8afaac2379691c01e60cfe6af3bbf177f0dc2f82ce34ea4d706ee34c2d5986de3f807ce05045 SHA512 102c56a1bc113439b1fa8aa10efe571d47d68b344d3489fe18ca3bdbf8828bb31fd2302a68a4bd639c59c429d41e82e5d933abddd3444781cb0e8a603db432ab
+DIST proofgeneral-4.4.tar.gz 14105056 BLAKE2B 8d45218cde620411d14ab3c703fea37f0482c0e1f6fc8d104b4de7506140d4d0491b5e23ddbf458bfa3aeb683b71f6e4deea31c2a46b902342fc686c2945162a SHA512 8be7f78b61a225fa4770698bbbb251424a0afe093efc3229f74f3a764317dc8cc00a72cb29e751f755dc5fdab59983906c9185f7828a1644a87d160265f12061
 EBUILD proofgeneral-4.2.ebuild 1385 BLAKE2B 53d5c6afb8058ea87d4b78a23a8bf20d9e7dc2ce84b25eae8f57a16df35508ae9677698f781c8e5ffa5b7aaec306825ffbdd02dba69263ccbe0c7f5dc9faaf58 SHA512 e0e59f6ec4b73a47ee44be048a7139246502f642cda5f1a9a0a5ea3b20f37158c5109b9701ac1eeacb0f154a0b0dba34270f2d2ca418665c9e5e2c2a435b68fc
+EBUILD proofgeneral-4.4.ebuild 1633 BLAKE2B 2f5af9e77e52d28dadf546909633b91edb67dd31baed0a631bcc2255d4fe3d4b9fa9b738ab0c7d36994e5233d47decc182324607ac9dd387b0d4774c352f59bc SHA512 116240b7871c2929b56691e4ab620a08bdfc192a80749b2b72ac206da7292aa0ecefbe8cb2d0b88fd0389bbc4dff085af69192cc2ae8e5330f4f54c8e7d2241f
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
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 000000000000..56937b8394c2
--- /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 000000000000..555837deda0d
--- /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 000000000000..0b9df0133b68
--- /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)"
+}