Version bump. Properly install site file, fixes bug 211658.

Package-Manager: portage-2.1.4.4

diff --git a/app-emacs/proofgeneral/ChangeLog b/app-emacs/proofgeneral/ChangeLog
index d2b6de5df640958a708beff372c98c9a4446d3bb..9f48aa5e5b52b6077d6648f96753e3cc9fa8a69b 100644 (file)
--- a/app-emacs/proofgeneral/ChangeLog
+++ b/app-emacs/proofgeneral/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/proofgeneral
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/ChangeLog,v 1.18 2007/10/16 06:27:25 opfer Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/ChangeLog,v 1.19 2008/02/27 21:26:46 ulm Exp $
+
+*proofgeneral-3.7 (27 Feb 2008)
+
+  27 Feb 2008; Ulrich Mueller <ulm@gentoo.org>
+  files/50proofgeneral-gentoo.el, +proofgeneral-3.7.ebuild:
+  Version bump. Use our own site file and install it in the proper location,
+  fixes bug 211658. Some cleanup of the ebuild.
 
   16 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
   proofgeneral-3.5-r1.ebuild:

diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index 8d111878ab486ca41650a9841dea9f36378787d8..c3754ef41674731e24e33c78de13a834a398ebfe 100644 (file)
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -1,6 +1,18 @@
-AUX 50proofgeneral-gentoo.el 104 RMD160 a91af8e503dcb7163c771fdddb593d5b8bd3c622 SHA1 90e1dfe5f8a1c4f2849b114b829bd1db9cc1efb7 SHA256 5c0ae01c325879234ab8b841f921f54ee2f915cab803c8800c82419300d2c83a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 50proofgeneral-gentoo.el 111 RMD160 47c0b68c0797346cb0c8f19b2113e31786697e89 SHA1 ed5d5b15645a86fe1eb000f5fb74ccc599459ee9 SHA256 e57baa810a64b4fdaa5602d183001b86ece583981fc4374575fc4716de468eac
 AUX proofgeneral-3.5_isabelle-non-interactive.patch 1257 RMD160 b7cfdbb46f0384b645ee4304242fdcfa89b4b4c7 SHA1 2882d83ea7671449d1c428aa4aea96af84b3d16f SHA256 29908bd6941981167cce1a26a6e8e3d1522ab704e509b86f12c858c8f5b07fb1
 DIST ProofGeneral-3.5.tar.gz 1799956 RMD160 08025f894cecc04b50003aee28270001eea5d198 SHA1 79464e6c5db46eb86c8a0a612045b412ad8ab9db SHA256 6c044a44dc4457a0b6d7660afb9ae0a36240c22fc9f5475a90ff5bb685875a0b
+DIST ProofGeneral-3.7.tgz 1981651 RMD160 3a7730e49ecd6f5a82f72e36851079c85c0e73ed SHA1 eca137e02e33e379ed8c807f7f0097c190295a1c SHA256 2bdd9ef83d836391f779c41883b3ecdd5da7256cfa25d10c1442ba00cefd3e8e
 EBUILD proofgeneral-3.5-r1.ebuild 1342 RMD160 3c0147e2316f436c76dab7b6974d62d0d98ab743 SHA1 445d3f7e43c97c33d2262af7ccf96591e5d41775 SHA256 f3bc2686405cb388bba975b9ab988f148a78aef1f0de02ef5bed3825aaf18803
-MISC ChangeLog 2684 RMD160 0982e915bc1cb7123b3af7536ee1c533978f1b76 SHA1 e8d58fe3adfe54a24afd952ad5e1b16a8d2b3cfe SHA256 cffb27108c5cd0f09e759defb4e068462596b79fa6bbb3b6352c2f4879673677
+EBUILD proofgeneral-3.7.ebuild 1250 RMD160 ab121b21beb055840460bf8c4ce4c13612b2bb4e SHA1 9d3414ddccb475c4630d93044a278df036184929 SHA256 da0e9f1ae3aaefe0cc56e849fd3613849e03c493b7eb232899caaa3fb52c2af6
+MISC ChangeLog 2948 RMD160 f91874879e3fd21980ac2154f7406248eb7c8883 SHA1 a22b8ef1c0e9203874521261ba279fabba3a06b6 SHA256 38c7bbd60f32498ef177a6120f294d17a3e0d87ee69d0de1bc8de1cc11b98c56
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.8 (GNU/Linux)
+
+iEYEARECAAYFAkfF1U4ACgkQOeoy/oIi7uwPSgCeJIr9XHFhtG6x2zCJLxgy0ROc
+ynMAn0LgwF/vWKdVLN08ZtQcr+B+EZro
+=nT9j
+-----END PGP SIGNATURE-----

diff --git a/app-emacs/proofgeneral/files/50proofgeneral-gentoo.el b/app-emacs/proofgeneral/files/50proofgeneral-gentoo.el
index 6ed74ee44facc4162047c83ecf7e174f147ff198..f6d697ff5c3e64873bfa8115c6bbfe7af6a9c7e1 100644 (file)
--- a/app-emacs/proofgeneral/files/50proofgeneral-gentoo.el
+++ b/app-emacs/proofgeneral/files/50proofgeneral-gentoo.el
@@ -1,4 +1,5 @@
 
-;;; Proof General site-lisp configuration
+;;; proofgeneral site-lisp configuration
 
-(add-to-list 'load-path "@SITELISP@/generic/proof-site.el")
+(add-to-list 'load-path "@SITELISP@/generic")
+(require 'proof-site)

diff --git a/app-emacs/proofgeneral/proofgeneral-3.7.ebuild b/app-emacs/proofgeneral/proofgeneral-3.7.ebuild
new file mode 100644 (file)
index 0000000..ab15747
--- /dev/null
+++ b/app-emacs/proofgeneral/proofgeneral-3.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/proofgeneral-3.7.ebuild,v 1.1 2008/02/27 21:26:46 ulm Exp $
+
+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"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+SITEFILE=50${PN}-gentoo.el
+
+src_compile() {
+       emake compile EMACS=emacs
+}
+
+src_install() {
+       emake install EMACS=emacs PREFIX="${D}"/usr
+
+       dohtml doc/*.html doc/*.jpg
+       doinfo doc/*.info*
+       dodoc AUTHORS BUGS CHANGES COMPATIBILITY FAQ INSTALL README REGISTER TODO
+
+       elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${MY_PN} \
+               || die "elisp-site-file-install failed"
+
+       # 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)"
+}