Fixes #6555

3 files changed, 31 insertions, 10 deletions

diff --git a/dev-lisp/cmucl-bin/ChangeLog b/dev-lisp/cmucl-bin/ChangeLog
index 9d5bd6d40201..0cbc76c99ebb 100644
--- a/dev-lisp/cmucl-bin/ChangeLog
+++ b/dev-lisp/cmucl-bin/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lisp/cmucl-bin
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl-bin/ChangeLog,v 1.2 2002/07/13 05:34:11 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl-bin/ChangeLog,v 1.3 2002/08/18 00:05:46 karltk Exp $
+
+*cmucl-bin-18d-r1 (18 Aug 2002)
+
+  18 Aug 2002; Karl Trygve Kalleberg <karltk@gentoo.org> cmucl-bin-18d-r1.ebuild files/digest-cmucl-bin-18d-r1:
+
+  Man pages are not installed properly. Renamed /usr/bin/cmucl to 
+  /usr/bin/lisp, to be legacy-compatible. This may change without notice in
+  the future! Fixes #6555.
+
+  Removed cmucl-bin-18d.ebuild files/digest-cmucl-bin-18d
 
 *cmucl-bin-18d (07 Jun 2002)
 
diff --git a/dev-lisp/cmucl-bin/cmucl-bin-18d.ebuild b/dev-lisp/cmucl-bin/cmucl-bin-18d-r1.ebuild
index 43abd5762834..d3ab65890916 100644
--- a/dev-lisp/cmucl-bin/cmucl-bin-18d.ebuild
+++ b/dev-lisp/cmucl-bin/cmucl-bin-18d-r1.ebuild
@@ -1,28 +1,37 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl-bin/cmucl-bin-18d.ebuild,v 1.3 2002/07/13 18:55:17 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl-bin/cmucl-bin-18d-r1.ebuild,v 1.1 2002/08/18 00:05:46 karltk Exp $
 
 DESCRIPTION="CMUCL Lisp. This conforms to the ANSI Common Lisp Standard"
 HOMEPAGE="http://www.cons.org/cmucl/index.html"
-LICENSE="PD"
+LICENSE="public-domain"
 DEPEND=""
 RDEPEND="$DEPEND"
 SLOT="0"
-SRC_ROOT="ftp://ftp.cn.freebsd.org/pub/cmucl/release/18d/"
-SRC_URI="$SRC_ROOT/cmucl-18d-x86-linux.tar.bz2
-	$SRC_ROOT/cmucl-18d-x86-linux.extra.tar.bz2"
-S=${WORKDIR}
+SRC_URI="ftp://ftp.cn.freebsd.org/pub/cmucl/release/18d/cmucl-18d-x86-linux.tar.bz2
+	ftp://ftp.cn.freebsd.org/pub/cmucl/release/18d/cmucl-18d-x86-linux.extra.tar.bz2"
+S=${WORKDIR}/${P}
 KEYWORDS="x86"
 
+src_unpack() {
+	mkdir ${P}
+	cd ${P}
+	unpack cmucl-18d-x86-linux.tar.bz2
+	unpack cmucl-18d-x86-linux.extra.tar.bz2
+	patch -p1 < ${FILESDIR}/${PV}/wrapper.patch || die "Failed to apply patch"
+}
+
 src_install () {
-	patch -p1 < ${FILESDIR}/wrapper.patch || die "Failed to apply patch"
 	into /opt/cmucl  || die
 	dobin bin/*  || die
 	dodoc doc/cmucl/*  || die
 	find lib -type f | xargs dolib || die
-	mv lib/cmucl/sample-wrapper cmucl || die "Failed to copy wrapper script"
 	exeinto /usr/bin
-	doexe cmucl || die "Failed to insert executable"
+
+	# 2002-08-18: karltk
+	# Not quite happy with us naming it 'lisp'. We should
+	# probably name it 'cmucl' and change the man pages.
+	newexe lib/cmucl/sample-wrapper lisp
 
 	#some tweaks to make it actually work; details in #4756
 	dosym /opt/cmucl/lib /opt/cmucl/lib/subsystems
@@ -30,5 +39,7 @@ src_install () {
 	fperms 755 /opt/cmucl/lib/config
 	#add short README on necessary environment for config
 	dodoc ${FILESDIR}/README.config
+
+	doman man/man1/*.1
 }
 
diff --git a/dev-lisp/cmucl-bin/files/digest-cmucl-bin-18d b/dev-lisp/cmucl-bin/files/digest-cmucl-bin-18d-r1
index cd71ad8a1ece..cd71ad8a1ece 100644
--- a/dev-lisp/cmucl-bin/files/digest-cmucl-bin-18d
+++ b/dev-lisp/cmucl-bin/files/digest-cmucl-bin-18d-r1