Fix Emacs support (bug #234920, by Ulrich Müller)

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64

5 files changed, 69 insertions, 6 deletions

diff --git a/dev-libs/librep/ChangeLog b/dev-libs/librep/ChangeLog
index 1c3b60fa9b3e..584cea3be2cd 100644
--- a/dev-libs/librep/ChangeLog
+++ b/dev-libs/librep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/librep
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/librep/ChangeLog,v 1.49 2008/01/14 20:04:29 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/librep/ChangeLog,v 1.50 2008/08/21 19:43:18 truedfx Exp $
+
+  21 Aug 2008; Harald van Dijk <truedfx@gentoo.org>
+  +files/librep-0.17_p20070101-disable-elisp.patch,
+  +files/50librep-gentoo.el, librep-0.17_p20070101.ebuild:
+  Fix Emacs support (bug #234920, by Ulrich Müller)
 
   14 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   librep-0.17_p20070101.ebuild:
diff --git a/dev-libs/librep/Manifest b/dev-libs/librep/Manifest
index 06088a13e968..6e29dae5d757 100644
--- a/dev-libs/librep/Manifest
+++ b/dev-libs/librep/Manifest
@@ -1,3 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 50librep-gentoo.el 180 RMD160 cb21ceb070220fa6af24359c78c311dc54bc54c7 SHA1 d9ee9d25d841889f772ab636f1f96fceadb4b60a SHA256 ceacafb54b535167f7ec2208e2eebbe07961c919dcea492eb88b535687070148
+AUX librep-0.17_p20070101-disable-elisp.patch 879 RMD160 9b69e46a40ad98fc84ddcee480722cf7a06c5b40 SHA1 4e2662f4167c16d4ef63bca579240192f29aebeb SHA256 b30ecd65c9f3135204a59b1c1d4faada3a2f09bcbc87f5e4b0b9296f7c41e435
 AUX librep-0.17_p20070101-libtool.patch 2979 RMD160 eb48410fe509542ece0436360486594342cf1033 SHA1 a9edd56b2b0716e0fe91db5d115758e27dee4dd7 SHA256 3c49148e998e5cbc403e06ff563c296d686838fcd0093d64de0e057241ab99ba
 AUX libtool.patch 3037 RMD160 a22b51f2db852493cfada58b020d6d34f7ee08eb SHA1 16399cc495654fd49bf26407cedcabb1dd4c4ee7 SHA256 101eb68c95e79c32640fb9889056c1f6de072f7f0a23360ec2b1f2bb6561c3d7
 AUX rep_file_fdopen.patch 219 RMD160 250cfc73ac11ee9e112f01f98535bdafbee2993c SHA1 d025412ed9b7e40eac54c917d23ec1e0e258a048 SHA256 f35170a6571ab68e089c0408207fbe35141a5ca02376bad009374e24c974872c
@@ -5,6 +10,13 @@ DIST librep-0.17.tar.gz 1195890 RMD160 2239837386700ed4893fa91b684192cb8721a2d1
 DIST librep-0.17_p20070101.patch.bz2 6838 RMD160 1f2155e4a85e0b172b8c6b87dd14063ce5c6a80d SHA1 49c907b0dd63efce9859b35d7fc841ad52b59480 SHA256 6ca454c29e72acd55876651384529bf969a50b11e5c9799dc4392c04099323b9
 EBUILD librep-0.17-r1.ebuild 1377 RMD160 877c3d70b30cb60887d6a4fb8bee1d45391a0e70 SHA1 b7f3ed1c650aa310abb6ba7f6d1f3935a542001c SHA256 e0adfb8950406eda7e76a10dfc1e91ffa2134c5af49116f0bfbf7b386f847031
 EBUILD librep-0.17-r2.ebuild 1452 RMD160 cafc6975f5b05c7bd003e99561440180cc1275f5 SHA1 d7b361b8e78da5155a246cefcfc45b338395fd87 SHA256 3d4c19e13722ef7f67f7f9a1266c784401ed1b0c6b22278d4ba85c356ceefe3e
-EBUILD librep-0.17_p20070101.ebuild 1308 RMD160 674c67cd2b3164272a30163f8c0ad86fc5ca17d4 SHA1 2c5e0c2e515f994c5fb6cf184c40e69a730031f5 SHA256 ffb32208edae89b960956b3cda1e2199eb3e95a98a5eb4e42050d0a7fb219ec8
-MISC ChangeLog 6611 RMD160 8be8115cf1f41372218376db7c7484e553960281 SHA1 427ee55d843b15127470927e158a26a1ea009a2d SHA256 0fa8e4f2c1733395ee3ff24a0778e222dd6cbd9d8395b602af513375df78a221
+EBUILD librep-0.17_p20070101.ebuild 1780 RMD160 d4449de4188b3594d42e1fc9c534cfc9038c36df SHA1 2800bc307bed2625096d520ea3ba8ef6a093dd7b SHA256 0f2f18c9de23471c1fdeffbbf105ce3e26cf865a3e173f7bbdcc4ee92a3c5411
+MISC ChangeLog 6825 RMD160 2173a07ff357e93aff3f1535b0783cedecf1e009 SHA1 81abdcbedefa4fbaef635740df7d0cbbfb514ee1 SHA256 0eb0137c2f2e8a755dd119e28850953ffbdc263f74ee832b2b9600ceec1295f4
 MISC metadata.xml 254 RMD160 940d6b81a826bb5b68913b5d74d85e07ead097c2 SHA1 9038151f64b69146ad3d94df2de79526ec39bac4 SHA256 868da977e11bacdc7d84da577aa56926af06185576b49104ed1f19e6f8e68b83
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkitxWEACgkQwnQyISwouHzdSgCfYQpL7G6h3SuO4J9AWfaaHkvc
+pZoAmwQa3r8fOwQEBeppkFy4xanOgEE0
+=NHrY
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/librep/files/50librep-gentoo.el b/dev-libs/librep/files/50librep-gentoo.el
new file mode 100644
index 000000000000..59025bbb9d0e
--- /dev/null
+++ b/dev-libs/librep/files/50librep-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; librep site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'rep-debugger "rep-debugger"
+  "Run the rep debugger on program FILE in buffer *gud-FILE*." t)
diff --git a/dev-libs/librep/files/librep-0.17_p20070101-disable-elisp.patch b/dev-libs/librep/files/librep-0.17_p20070101-disable-elisp.patch
new file mode 100644
index 000000000000..b41e19d15afd
--- /dev/null
+++ b/dev-libs/librep/files/librep-0.17_p20070101-disable-elisp.patch
@@ -0,0 +1,20 @@
+--- librep-0.17-orig/Makefile.in	2003-09-04 07:57:43.000000000 +0200
++++ librep-0.17/Makefile.in	2008-08-16 13:16:41.000000000 +0200
+@@ -53,7 +53,6 @@
+ 	$(INSTALL_SCRIPT) libtool $(DESTDIR)$(repcommonexecdir)
+ 	$(INSTALL_DATA) rules.mk $(DESTDIR)$(repcommonexecdir)
+ 	$(INSTALL_SCRIPT) install-aliases $(DESTDIR)$(repcommonexecdir)
+-	$(INSTALL_DATA) rep-debugger.el $(DESTDIR)$(emacssitelispdir)
+ 
+ 	@echo "---------------------------------------------------------"
+ 	@echo "Trying to install rep.m4 in $(DESTDIR)$(aclocaldir);"
+@@ -64,8 +63,7 @@
+ installdirs : mkinstalldirs
+ 	$(SHELL) $< $(DESTDIR)$(repdir)/$(version) \
+ 	  $(DESTDIR)$(bindir) $(DESTDIR)$(aclocaldir) \
+-	  $(DESTDIR)$(repcommonexecdir) $(DESTDIR)$(repexecdir) \
+-	  $(DESTDIR)$(emacssitelispdir)
++	  $(DESTDIR)$(repcommonexecdir) $(DESTDIR)$(repexecdir)
+ 
+ uninstall :
+ 	-for dir in $(INSTALL_SUBDIRS); do \
diff --git a/dev-libs/librep/librep-0.17_p20070101.ebuild b/dev-libs/librep/librep-0.17_p20070101.ebuild
index cb9cb271913d..f548c79f9c70 100644
--- a/dev-libs/librep/librep-0.17_p20070101.ebuild
+++ b/dev-libs/librep/librep-0.17_p20070101.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/librep/librep-0.17_p20070101.ebuild,v 1.4 2008/01/14 20:04:29 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/librep/librep-0.17_p20070101.ebuild,v 1.5 2008/08/21 19:43:18 truedfx Exp $
 
 MY_P=${P%_*}
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-inherit autotools eutils toolchain-funcs multilib
+inherit autotools eutils toolchain-funcs multilib elisp-common
 
 DESCRIPTION="Shared library implementing a Lisp dialect"
 HOMEPAGE="http://librep.sourceforge.net/"
@@ -17,9 +17,10 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ia64 ppc ~ppc64 sparc x86"
-IUSE="readline"
+IUSE="emacs readline"
 
 RDEPEND=">=sys-libs/gdbm-1.8.0
+	emacs? ( virtual/emacs )
 	readline? ( sys-libs/readline )"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo"
@@ -32,6 +33,7 @@ src_unpack() {
 	epatch "${DISTDIR}"/${P}.patch.bz2
 	epatch "${FILESDIR}"/${P}-libtool.patch
 	epatch "${FILESDIR}"/rep_file_fdopen.patch
+	epatch "${FILESDIR}"/${P}-disable-elisp.patch
 	eautoreconf || die "eautoreconf failed"
 }
 
@@ -43,6 +45,10 @@ src_compile() {
 		$(use_with readline) || die "configure failed"
 
 	LC_ALL=C emake || die "make failed"
+
+	if use emacs; then
+		elisp-compile rep-debugger.el || die "elisp-compile failed"
+	fi
 }
 
 src_install() {
@@ -50,4 +56,18 @@ src_install() {
 	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO TREE
 	docinto doc
 	dodoc doc/*
+
+	if use emacs; then
+		elisp-install ${PN} rep-debugger.{el,elc} || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
 }