fix GNU Emacs support, see bug 192977

Package-Manager: portage-2.1.3.19

5 files changed, 88 insertions, 8 deletions

diff --git a/dev-lang/ucblogo/ChangeLog b/dev-lang/ucblogo/ChangeLog
index cdfccac44a4e..f4cc8902db63 100644
--- a/dev-lang/ucblogo/ChangeLog
+++ b/dev-lang/ucblogo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ucblogo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ChangeLog,v 1.6 2007/07/22 08:37:29 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ChangeLog,v 1.7 2007/11/20 12:59:17 opfer Exp $
+
+*ucblogo-5.5-r1 (20 Nov 2007)
+
+  20 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/50ucblogo-gentoo.el, +ucblogo-5.5-r1.ebuild:
+  fix GNU Emacs support, see bug 192977
 
   22 Jul 2007; Hans de Graaff <graaff@gentoo.org> ucblogo-5.5.ebuild:
   Drop virtual/x11 references.
diff --git a/dev-lang/ucblogo/Manifest b/dev-lang/ucblogo/Manifest
index 79f8c82481d9..a3a9a7f176ee 100644
--- a/dev-lang/ucblogo/Manifest
+++ b/dev-lang/ucblogo/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 50ucblogo-gentoo.el 418 RMD160 19c855f024d34c70ab50e61d6c6188577def8edd SHA1 f3a01ac39998b3ee4ae8a69d37a55a58ea18d60e SHA256 b0324881732db00599033e0d4845398be10970c225562c964248c9b5264d7497
+MD5 f8963e104d2a2413bd9de13ff0b854cc files/50ucblogo-gentoo.el 418
+RMD160 19c855f024d34c70ab50e61d6c6188577def8edd files/50ucblogo-gentoo.el 418
+SHA256 b0324881732db00599033e0d4845398be10970c225562c964248c9b5264d7497 files/50ucblogo-gentoo.el 418
 AUX ucblogo-5.5-destdir.patch 3166 RMD160 4e884e5077e0d998e1cb8bcd65dfd65503cc46a9 SHA1 844bed4a0376cb7ac058e85769161b9cf6f27730 SHA256 38d8825bef0c9f6268a15aadb688944035ab176085d095d9af0f3d572a0f2f6f
 MD5 a461104c9a6fd37c96ece07cc2c0b78c files/ucblogo-5.5-destdir.patch 3166
 RMD160 4e884e5077e0d998e1cb8bcd65dfd65503cc46a9 files/ucblogo-5.5-destdir.patch 3166
@@ -18,14 +22,18 @@ MD5 70abf438d09b4b589b732ca8bd6b9a69 files/ucblogo-5.5-no-emacs.patch 1035
 RMD160 98b365589332f9c6ec3cb3680f571fb3a04c4cc7 files/ucblogo-5.5-no-emacs.patch 1035
 SHA256 2379c386d42492924e75b1517d0f89f86206cf2733fb245f9a9528a0dc3a4787 files/ucblogo-5.5-no-emacs.patch 1035
 DIST ucblogo-5.5.tar.gz 1290273 RMD160 f1e3adf901c0641b12bb5905860af4d77b46eef9 SHA1 77445ae2328e39f3ea84bf8faa6170a1c1baa55a SHA256 a2922e065113274dd701ba3b03448134cceb047f3d6cadbe5322e23061e2ff9d
+EBUILD ucblogo-5.5-r1.ebuild 1156 RMD160 a7ec5e809f630453a098be11e1b1962be936ef25 SHA1 4c3455b6a02cd58397c0d04d9b547cb499cdc121 SHA256 582b9c3660158c80586b633da92fa3f10ce1a4409e73733a9aca15c74f3ad1fa
+MD5 977c74ed79b78d8f8a1e97a35259c23b ucblogo-5.5-r1.ebuild 1156
+RMD160 a7ec5e809f630453a098be11e1b1962be936ef25 ucblogo-5.5-r1.ebuild 1156
+SHA256 582b9c3660158c80586b633da92fa3f10ce1a4409e73733a9aca15c74f3ad1fa ucblogo-5.5-r1.ebuild 1156
 EBUILD ucblogo-5.5.ebuild 949 RMD160 56dd2d7c8d36160f891cca7e55839342ab8d70c5 SHA1 30d0985ce0df4dc629c0d9aad3103c97350825d7 SHA256 4e84b41ee7af202a2850a53d941b63ba518d71b047ce25c17b7b22d088ba372b
 MD5 4e35c6cbbf46c7fba9b20af2f2db528e ucblogo-5.5.ebuild 949
 RMD160 56dd2d7c8d36160f891cca7e55839342ab8d70c5 ucblogo-5.5.ebuild 949
 SHA256 4e84b41ee7af202a2850a53d941b63ba518d71b047ce25c17b7b22d088ba372b ucblogo-5.5.ebuild 949
-MISC ChangeLog 1050 RMD160 d8848d3f6d78df2ae586e15af50ea32bc1a4a2fa SHA1 a82d354caea7322bce43d24c5c45b2bf57bd0565 SHA256 bd4a1404c72f44e7bf223e700d186cd3b895e49377461df1cce83cc256ca4e89
-MD5 4ca4daaf498d1171700936ee42698e9e ChangeLog 1050
-RMD160 d8848d3f6d78df2ae586e15af50ea32bc1a4a2fa ChangeLog 1050
-SHA256 bd4a1404c72f44e7bf223e700d186cd3b895e49377461df1cce83cc256ca4e89 ChangeLog 1050
+MISC ChangeLog 1230 RMD160 5d7943ef8bbc9b601aa12250a1d8ed01ecd63bc5 SHA1 86cb5555786a178ca882bb83585ff2b3d50fde5e SHA256 11da7534618b6740c034189ec5dbfc710e143e672607fad25ff25f51d3b5070d
+MD5 b7753f8511863e2758a344ccbfce3de1 ChangeLog 1230
+RMD160 5d7943ef8bbc9b601aa12250a1d8ed01ecd63bc5 ChangeLog 1230
+SHA256 11da7534618b6740c034189ec5dbfc710e143e672607fad25ff25f51d3b5070d ChangeLog 1230
 MISC metadata.xml 675 RMD160 5842c7519ead360fc810ae76f8ceb91ec6e931e7 SHA1 147551df2a38bc7eff756f3a9302c59d372c87a6 SHA256 5a1d21493fbeb97b176265c9937a3d60eabff13960ccda1b9dbdb2371f4f91d1
 MD5 45622ded96e0bd4c5795b3427472dddd metadata.xml 675
 RMD160 5842c7519ead360fc810ae76f8ceb91ec6e931e7 metadata.xml 675
@@ -33,10 +41,13 @@ SHA256 5a1d21493fbeb97b176265c9937a3d60eabff13960ccda1b9dbdb2371f4f91d1 metadata
 MD5 6eacc358649bd87cc1791cbb83b36f08 files/digest-ucblogo-5.5 238
 RMD160 42a94239f5e59328cc27c0109b4e0a750b2e9bc6 files/digest-ucblogo-5.5 238
 SHA256 fffbc4decbc5e1c5dfd736d8cd8c7799bdfb6c71790faa132ed17fd4a4e9a46a files/digest-ucblogo-5.5 238
+MD5 6eacc358649bd87cc1791cbb83b36f08 files/digest-ucblogo-5.5-r1 238
+RMD160 42a94239f5e59328cc27c0109b4e0a750b2e9bc6 files/digest-ucblogo-5.5-r1 238
+SHA256 fffbc4decbc5e1c5dfd736d8cd8c7799bdfb6c71790faa132ed17fd4a4e9a46a files/digest-ucblogo-5.5-r1 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGoxdH0BM77Tkv120RAnYJAJ0UfdjGthnp3/wL1Ih8u1PytNrMqACfafXB
-DoX/C1D5MqbTisnHpP4N4yc=
-=U3Rk
+iD8DBQFHQtprNQqtfCuFneMRAk2YAJ9/kjQpUd4WugLnrE4vwf8P/kp4lACfY3hR
+WtUyVrWc3E0eof8V3sh8gb4=
+=2rrF
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ucblogo/files/50ucblogo-gentoo.el b/dev-lang/ucblogo/files/50ucblogo-gentoo.el
new file mode 100644
index 000000000000..b9d2c3eba074
--- /dev/null
+++ b/dev-lang/ucblogo/files/50ucblogo-gentoo.el
@@ -0,0 +1,12 @@
+
+;;; ucblogo site-lisp configuration
+
+(add-to-list 'load-path "/usr/lib/logo/emacs")
+(autoload 'logo-mode "logo" nil t)
+(add-to-list 'auto-mode-alist '("\\.lgo?\\'" . logo-mode))
+
+(setq logo-help-path "/usr/lib/logo/helpfiles/")
+(setq logo-tutorial-path "/usr/lib/logo/emacs/")
+(setq logo-info-file "/usr/share/info/ucblogo.info")
+;; font/color defaults are intrusive, disable them
+(setq dont-mess-with-logo-colors t)
diff --git a/dev-lang/ucblogo/files/digest-ucblogo-5.5-r1 b/dev-lang/ucblogo/files/digest-ucblogo-5.5-r1
new file mode 100644
index 000000000000..05d4fe26434a
--- /dev/null
+++ b/dev-lang/ucblogo/files/digest-ucblogo-5.5-r1
@@ -0,0 +1,3 @@
+MD5 caf68577630645718492fd7d10fd4927 ucblogo-5.5.tar.gz 1290273
+RMD160 f1e3adf901c0641b12bb5905860af4d77b46eef9 ucblogo-5.5.tar.gz 1290273
+SHA256 a2922e065113274dd701ba3b03448134cceb047f3d6cadbe5322e23061e2ff9d ucblogo-5.5.tar.gz 1290273
diff --git a/dev-lang/ucblogo/ucblogo-5.5-r1.ebuild b/dev-lang/ucblogo/ucblogo-5.5-r1.ebuild
new file mode 100644
index 000000000000..8e1e6041a806
--- /dev/null
+++ b/dev-lang/ucblogo/ucblogo-5.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ucblogo/ucblogo-5.5-r1.ebuild,v 1.1 2007/11/20 12:59:17 opfer Exp $
+
+inherit eutils elisp-common
+
+DESCRIPTION="a reflective, functional programming language"
+HOMEPAGE="http://www.cs.berkeley.edu/~bh/logo.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs X"
+
+DEPEND="emacs? ( virtual/emacs )
+	X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 )"
+
+SITEFILE=50${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-destdir.patch
+	epatch "${FILESDIR}"/${P}-fhs.patch
+	epatch "${FILESDIR}"/${P}-dont-require-tetex.patch
+	use emacs || epatch "${FILESDIR}"/${P}-no-emacs.patch
+#	use emacs || echo 'all install:' > emacs/makefile
+}
+
+src_compile() {
+	econf $(use_with X x) || die
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}