(Portage version: 2.0.51.19)

5 files changed, 44 insertions, 30 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index c0c26cc043c8..60f8f7211fb0 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/erlang
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.15 2004/10/08 18:20:17 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.16 2005/03/20 10:13:02 mkennedy Exp $
+
+  20 Mar 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/50erlang-gentoo.el, erlang-10.2.0.ebuild:
+  USE support for "emacs"; Resolves Bug #78557
 
 *erlang-10.2.0 (07 Oct 2004)
 
diff --git a/dev-lang/erlang/erlang-10.2.0.ebuild b/dev-lang/erlang/erlang-10.2.0.ebuild
index 85c5c9d7f5e8..291f4bc63f0e 100644
--- a/dev-lang/erlang/erlang-10.2.0.ebuild
+++ b/dev-lang/erlang/erlang-10.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.0.ebuild,v 1.2 2004/10/08 18:20:17 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-10.2.0.ebuild,v 1.3 2005/03/20 10:13:02 mkennedy Exp $
 
-inherit eutils gcc flag-o-matic
+inherit eutils gcc flag-o-matic elisp-common
 
 #erlang uses a really weird versioning scheme which caused quite a few problems already
 #Thus we do a slight modification converting all letters to digits to make it more sane (see e.g. #26420)
@@ -17,11 +17,14 @@ SRC_URI="http://www.erlang.org/download/${MY_P}-0.tar.gz"
 LICENSE="EPL"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="X ssl"
+IUSE="X ssl emacs"
 
 DEPEND=">=dev-lang/perl-5.6.1
 	X? ( virtual/x11 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	emacs? ( virtual/emacs )"
+
+SITEFILE=50erlang-gentoo.el
 
 S=${WORKDIR}/${MY_P}_${MyDate}
 
@@ -34,6 +37,12 @@ src_compile() {
 	[ "${ARCH}" = "amd64" ] && CHOST="x86_64-unknown-linux-gnu"
 	econf --enable-threads || die
 	make || die
+
+	if use emacs; then
+		pushd ${D}/lib/tools/emacs
+		elisp-compile *.el
+		popd
+	fi
 }
 
 src_install() {
@@ -57,4 +66,19 @@ src_install() {
 
 	## Clean up the no longer needed files
 	rm ${D}/${ERL_LIBDIR}/Install
+
+	if use emacs; then
+		pushd ${S}
+		elisp-install erlang lib/tools/emacs/*.el
+		elisp-site-file-install ${FILESDIR}/${SITEFILE}
+		popd
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
 }
diff --git a/dev-lang/erlang/files/50erlang-gentoo.el b/dev-lang/erlang/files/50erlang-gentoo.el
new file mode 100644
index 000000000000..439d3b33a94e
--- /dev/null
+++ b/dev-lang/erlang/files/50erlang-gentoo.el
@@ -0,0 +1,4 @@
+;;; erlang site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(load-library "erlang-start")
diff --git a/dev-lisp/cl-terminfo/ChangeLog b/dev-lisp/cl-terminfo/ChangeLog
index 186220bf9597..9e46f700e590 100644
--- a/dev-lisp/cl-terminfo/ChangeLog
+++ b/dev-lisp/cl-terminfo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lisp/cl-terminfo
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-terminfo/ChangeLog,v 1.4 2004/06/24 23:56:05 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-terminfo/ChangeLog,v 1.5 2005/03/20 10:08:47 mkennedy Exp $
+
+  20 Mar 2005; Matthew Kennedy <mkennedy@gentoo.org> metadata.xml:
+  Corrected metadata.xml
 
   09 May 2004; David Holm <dholm@gentoo.org> cl-terminfo-1.2.ebuild:
   Added to ~ppc.
diff --git a/dev-lisp/cl-terminfo/metadata.xml b/dev-lisp/cl-terminfo/metadata.xml
index 2376935ae6b1..f418045b09c8 100644
--- a/dev-lisp/cl-terminfo/metadata.xml
+++ b/dev-lisp/cl-terminfo/metadata.xml
@@ -2,25 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>common-lisp</herd>
-<longdescription>
-Linedit is a readline-style library written in Common Lisp that
-provides customizable line-editing features, licensed under a
-MIT-style license.
-
-Linedit uses UFFI for foreign bindings, so it is a least theoretically
-portable, though REPL-wrapping is currently SBCL specific.  Features
-
- * single-line text reader
- * multi-line form reader
- * completions on packages and symbols in current image
- * completions on directories and filenames
- * apropos-word and describe-word
- * unlimited undo
- * unlimited kill-ring
- * unlimited history
- * multiple histories
- * use in REPL on SBCL
- * paging
- * fully customizable in CL
-</longdescription>
 </pkgmetadata>