Ebuild cleanup.

7 files changed, 14 insertions, 135 deletions

diff --git a/app-emacs/ilisp/ChangeLog b/app-emacs/ilisp/ChangeLog
index 21c835837a08..2b8bc19b38fa 100644
--- a/app-emacs/ilisp/ChangeLog
+++ b/app-emacs/ilisp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/ilisp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ilisp/ChangeLog,v 1.10 2004/06/24 22:15:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ilisp/ChangeLog,v 1.11 2004/11/03 07:50:16 usata Exp $
+
+  03 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> -ilisp-5.12.0-r2.ebuild,
+  ilisp-5.12.0-r3.ebuild, -ilisp-5.12.0.ebuild:
+  Ebuild cleanup.
 
   11 Nov 2003; <mkennedy@gentoo.org> ilisp-5.12.0-r3.ebuild,
   files/50ilispclc-gentoo.el:
diff --git a/app-emacs/ilisp/Manifest b/app-emacs/ilisp/Manifest
index df8fc6a475f0..d67ee44bbb22 100644
--- a/app-emacs/ilisp/Manifest
+++ b/app-emacs/ilisp/Manifest
@@ -1,12 +1,8 @@
 MD5 86edfa9d38f4fc62994f386bad99b15f ilisp-5.12.0-r1.ebuild 977
-MD5 ce3a3f5363db7d72c37e00dad1a2834e ilisp-5.12.0-r3.ebuild 2239
-MD5 528aea5aa9f80f594ec2521e013b339f ilisp-5.12.0.ebuild 962
-MD5 00f955078474b6f51abc4a0f3804af2c ilisp-5.12.0-r2.ebuild 2095
-MD5 cb56bb417ce43ed473fae31992fe0985 ChangeLog 1404
+MD5 9e22f2f42ec5f22b9f3c5b9fba8a55bd ilisp-5.12.0-r3.ebuild 2192
+MD5 47004a57cd1f9113cbc3ef6c3d48bb66 ChangeLog 1542
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 MD5 9b253aa445c6c9f0a5583cfae4b471de files/50ilisp-gentoo.el 4832
 MD5 dd5718993606fbd26e5e7a9d01baefcb files/digest-ilisp-5.12.0-r1 64
-MD5 6c70bb0b337045f1832106bb673b135f files/digest-ilisp-5.12.0-r2 79
 MD5 5c3294f5ca7bb7c6ef341170ed1ee54e files/digest-ilisp-5.12.0-r3 79
-MD5 dd5718993606fbd26e5e7a9d01baefcb files/digest-ilisp-5.12.0 64
 MD5 5ca477f60456b29d61f0ed9ea0d698c1 files/50ilispclc-gentoo.el 750
diff --git a/app-emacs/ilisp/files/digest-ilisp-5.12.0 b/app-emacs/ilisp/files/digest-ilisp-5.12.0
deleted file mode 100644
index 4d3bce010edf..000000000000
--- a/app-emacs/ilisp/files/digest-ilisp-5.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 24af2a60c24aed577234c01434ff0873 ilisp-5.12.0.tar.gz 246570
diff --git a/app-emacs/ilisp/files/digest-ilisp-5.12.0-r2 b/app-emacs/ilisp/files/digest-ilisp-5.12.0-r2
deleted file mode 100644
index 42022856e3c5..000000000000
--- a/app-emacs/ilisp/files/digest-ilisp-5.12.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 995f985bf70d3f467437212f4128ca74 ilisp_5.12.0+cvs.2003.06.05.tar.gz 293430
diff --git a/app-emacs/ilisp/ilisp-5.12.0-r2.ebuild b/app-emacs/ilisp/ilisp-5.12.0-r2.ebuild
deleted file mode 100644
index a87ba3699faa..000000000000
--- a/app-emacs/ilisp/ilisp-5.12.0-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ilisp/ilisp-5.12.0-r2.ebuild,v 1.7 2004/06/24 22:15:28 agriffis Exp $
-
-inherit elisp
-
-# good idea to be very compatible with Debian since this is what users
-# will expect in Gentoo (Debian is the only other distribution which
-# supports Emacs and Common Lisp well)
-
-DEBCVS=cvs.2003.06.05
-
-DESCRIPTION="A comprehensive Emacs interface for an inferior Common Lisp, or other Lisp based languages."
-HOMEPAGE="http://sourceforge.net/projects/ilisp/"
-SRC_URI="mirror://debian/pool/main/i/ilisp/${PN}_${PV}+${DEBCVS}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="virtual/emacs
-	dev-lisp/common-lisp-controller
-	app-text/texi2html"
-
-S="${WORKDIR}/${P}+${DEBCVS}"
-
-src_compile() {
-	make EMACS=emacs SHELL=/bin/sh || die
-	cd extra && for i in *.el ; do
-		emacs --batch --no-site-file --eval "(byte-compile-file \"$i\")" *.el
-	done
-	make -C ${S}/docs info ilisp.html
-}
-
-src_install() {
-	insinto /usr/share/emacs/site-lisp/ilisp
-	doins *.el *.elc
-	insinto /usr/share/emacs/site-lisp/ilisp/extra
-	doins extra/*.el extra/*.elc
-
-	insinto /etc/ilisp
-	doins debian/ilisp*.el
-
-	insinto /usr/share/common-lisp/source/ilisp
-	doins *.lisp debian/ilisp.asd
-	dodir /usr/share/common-lisp/systems
-	dosym /usr/share/common-lisp/source/ilisp/ilisp.asd /usr/share/common-lisp/systems/ilisp.asd
-
-	dodir /usr/lib/ilisp
-	for i in ${D}/usr/share/common-lisp/source/ilisp/*.lisp ; do
-		l=`basename $i`
-		dosym /usr/share/common-lisp/source/ilisp/$l /usr/lib/ilisp/$l
-	done
-
-	insinto /usr/share/${PN}
-	doins *.scm
-
-	doinfo docs/*.info*
-	dohtml docs/*.html
-
-	insinto /usr/share/emacs/site-lisp
-	doins ${FILESDIR}/50ilispclc-gentoo.el
-	dodoc ACKNOWLEDGMENTS GETTING-ILISP HISTORY INSTALLATION README Welcome
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	chown -R cl-builder:cl-builder /usr/lib/ilisp
-	/usr/sbin/register-common-lisp-source ${PN}
-	clc-autobuild-library ilisp yes
-
-}
-
-pkg_postrm() {
-	/usr/sbin/unregister-common-lisp-source ${PN}
-	elisp-site-regen
-}
diff --git a/app-emacs/ilisp/ilisp-5.12.0-r3.ebuild b/app-emacs/ilisp/ilisp-5.12.0-r3.ebuild
index a9b653eafaa6..85208ded9cff 100644
--- a/app-emacs/ilisp/ilisp-5.12.0-r3.ebuild
+++ b/app-emacs/ilisp/ilisp-5.12.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ilisp/ilisp-5.12.0-r3.ebuild,v 1.8 2004/06/24 22:15:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ilisp/ilisp-5.12.0-r3.ebuild,v 1.9 2004/11/03 07:50:16 usata Exp $
 
 inherit elisp
 
@@ -19,8 +19,7 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="virtual/emacs
-	dev-lisp/common-lisp-controller
+DEPEND="dev-lisp/common-lisp-controller
 	sys-apps/texinfo
 	virtual/tetex
 	app-text/texi2html"
@@ -32,10 +31,10 @@ CLPACKAGE=ilisp
 
 src_compile() {
 	make EMACS=emacs SHELL=/bin/sh || die
-	cd extra && for i in *.el ; do
-		emacs --batch --no-site-file --eval "(byte-compile-file \"$i\")" *.el
-	done
-	make -C ${S}/docs
+	cd extra
+	elisp-comp *.el || die "elisp-comp failed"
+	cd -
+	make -C ${S}/docs || die "make docs failed"
 }
 
 src_install() {
@@ -66,7 +65,7 @@ src_install() {
 	elisp-site-file-install ${FILESDIR}/50ilispclc-gentoo.el
 	dodoc ACKNOWLEDGMENTS GETTING-ILISP HISTORY INSTALLATION README Welcome
 
-	sed -i "s,@HYPERSPEC@,${P}/HyperSpec,g" ${D}/usr/share/emacs/site-lisp/50ilispclc-gentoo.el
+	dosed "s,@HYPERSPEC@,${P}/HyperSpec,g" /usr/share/emacs/site-lisp/50ilispclc-gentoo.el
 }
 
 pkg_preinst() {
diff --git a/app-emacs/ilisp/ilisp-5.12.0.ebuild b/app-emacs/ilisp/ilisp-5.12.0.ebuild
deleted file mode 100644
index e0a340ade2e4..000000000000
--- a/app-emacs/ilisp/ilisp-5.12.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ilisp/ilisp-5.12.0.ebuild,v 1.6 2004/06/24 22:15:28 agriffis Exp $
-
-inherit elisp
-
-DESCRIPTION="A comprehensive (X)Emacs interface for an inferior Common Lisp, or other Lisp based languages."
-HOMEPAGE="http://sourceforge.net/projects/ilisp/"
-SRC_URI="mirror://sourceforge/ilisp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/emacs"
-
-src_compile() {
-	make EMACS=emacs SHELL=/bin/sh || die
-	cd extra
-	for i in *.el
-	do
-		emacs -batch -eval "(byte-compile-file \"$i\")"
-	done
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-	elisp-install ${PN}/extra extra/*.el extra/*.elc
-	elisp-site-file-install ${FILESDIR}/50ilisp-gentoo.el
-	dodoc ACKNOWLEDGMENTS GETTING-ILISP HISTORY INSTALLATION README Welcome
-}
-
-pkg_postinst() {
-	elisp-site-regen
-}
-
-pkg_postrm() {
-	elisp-site-regen
-}