11 files changed, 30 insertions, 403 deletions
diff --git a/dev-scheme/chicken/ChangeLog b/dev-scheme/chicken/ChangeLog
index 20b22989f17c..b3baea4033b5 100644
--- a/dev-scheme/chicken/ChangeLog
+++ b/dev-scheme/chicken/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for dev-scheme/chicken
-=======
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/ChangeLog,v 1.26 2008/04/18 17:19:36 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/ChangeLog,v 1.27 2008/04/22 11:48:22 ulm Exp $
+
+  22 Apr 2008; Ulrich Mueller <ulm@gentoo.org> -chicken-1.89.ebuild,
+  -chicken-2.2.ebuild, -chicken-2.3.ebuild, -chicken-2.5.ebuild,
+  -chicken-2.6.ebuild, -chicken-2.731.ebuild, -chicken-3.0.0.ebuild,
+  chicken-3.1.0.ebuild:
+  Fix Emacs support. Don't install scheme-complete.el with USE=emacs; a	newer
+  version is now provided by app-emacs/scheme-complete, bug 218630. Remove old
+  ebuilds as requested by hkbst.
 
   18 Apr 2008; nixnut <nixnut@gentoo.org> chicken-3.1.0.ebuild:
   Stable on ppc wrt bug 217408
diff --git a/dev-scheme/chicken/Manifest b/dev-scheme/chicken/Manifest
index 938953880616..57024d6e06fb 100644
--- a/dev-scheme/chicken/Manifest
+++ b/dev-scheme/chicken/Manifest
@@ -1,20 +1,15 @@
-AUX 50hen-gentoo.el 146 RMD160 7a368feca7da93e10e0e32cb994d795c49fa1ade SHA1 b68ab6de230a1411e9bc6eb038c1be18d5774901 SHA256 e793ef4259ec936e3fa3a26c14d32bcf9c67e15dbb87947c643bdc9a5d1ac56a
-DIST chicken-1.89.tar.gz 3881868 RMD160 dab4f487db6599958b7d4106d948222ddf4554fa SHA1 3827964c057bb2008ae2e1e8f39b75ba883d862c SHA256 2cadc0eae458bc40b1a44c614ac9d7228e12e865293f6ec0e5cdda59ba0f3116
-DIST chicken-2.2.tar.gz 3604051 RMD160 4cf88ca4c2ccd0b85cbc12b0f8211f1c5e1e0154 SHA1 216692d24dcc6962bdfa83dee527335d9800b523 SHA256 ad810c2fa3401287d3bebe508be0af7d5d7d661e8a0f84e2c1aaaabaec4dcc8e
-DIST chicken-2.3.tar.gz 3906266 RMD160 cca291aacef699b06c9fb197bea735cd28892d38 SHA1 0ceb0cdea495f753f091cd06ac196b48eadc0b11 SHA256 530791fa60ecb5420fb038fa063fd752db49673e40cfff27352311eeb2ef4cfd
-DIST chicken-2.5.tar.gz 3013368 RMD160 12beb80e77b9468d90605a27c96555053b3af9a3 SHA1 5f0e160d5b803d4b51c649a3028124008507d4b6 SHA256 34d3b185e84e05b2b404637f99f0beddcee6382374000fba4171ae2ac3d487b7
-DIST chicken-2.6.tar.gz 3517981 RMD160 0af0d79e85ee017d2ad2bfde79f4561f257c852c SHA1 4010d21db1b0d2df3b3ab392503be4bb19073bbd SHA256 32385c5393c7376035f911f3e887351b1ce8fb6e56498cc4258815bc6db06326
-DIST chicken-2.731.tar.gz 4006455 RMD160 6a3db236263d8be7005220289cf10361e2ffb317 SHA1 97ac4ba113502ec2eaf0288ffc593b0cb37eafb3 SHA256 afff045e0c4d8e4aa0885ac2539d62a1de6bc2410da4abb9ad9f6aae0f9dc40e
-DIST chicken-3.0.0.tar.gz 4056471 RMD160 d015a13bdf7ad627dc7bc03e6880f7aa38f46f37 SHA1 d57578a85dcdcb31d8b6cc8a0a4f797e4068edd5 SHA256 e471990352c5ab875b54e7975c8a444a3951af08051be7489affd9f34b5bf1c4
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 50hen-gentoo.el 145 RMD160 88e497b36f696f5a575c02e16b86fc610f4d066c SHA1 eed85cf1aff39a5541e51c3582bef1121dbc8e9d SHA256 5b58b0cc226fd167fa8f2523846fa980c74df77513703dbd63f7f82167ec0f52
 DIST chicken-3.1.0.tar.gz 4005073 RMD160 1e1b6dc51f7f876f49b2981c2ff6045461de1854 SHA1 a5529645df74751a611895e9d32bef78d23a276c SHA256 7f1fa18d48a77401fd307b3352fe45ac135245a5e0cbef5ce0b27ab2eb39a1b2
-DIST syntax-case.egg 90522 RMD160 fbfbd56fd3169c30f6558e04a80362704c689b80 SHA1 896086124a78321b72d3915375d2caa12c0b8fe1 SHA256 aef8d4d618e11931102762907d54f545a47d61a63eb4a19e027bf1725b714260
-EBUILD chicken-1.89.ebuild 984 RMD160 98cc4b920e375bd3f03f71702bad2aab9510ab48 SHA1 75df0b223e27b80f9b24a9cd5c8f4a8666f24edd SHA256 f4fe6ff0a509160ed41689f1daaf0d864ace9fee207541121ffa794e452fd81b
-EBUILD chicken-2.2.ebuild 1206 RMD160 5bef8f4db6a4197f3e2bd48d876e271ab640a6b9 SHA1 4aad2b71aad853938cdca253b18a22786acb3a7c SHA256 f9574ce46f7d3b2fb686b373c771b1c19787e1d1232eb489b219df977e393f3c
-EBUILD chicken-2.3.ebuild 1206 RMD160 629aacfcf51a146783d1f42901a400dec8befa26 SHA1 e42139785b92c6b9e105e65cfb7bf6b6ab11426d SHA256 d4527746a380ee433cfd6d8e9278fb75587238696964e939a9d208972b92da15
-EBUILD chicken-2.5.ebuild 1203 RMD160 7baec765acfb5b565117dc2898f20729d58f0f3d SHA1 ff8389b08751af43b9f0f956598d33da772c2601 SHA256 a49ce52fcaa292c19363b27e2e7b2e36c8da8255aa04bb11e0fe9990ff104d52
-EBUILD chicken-2.6.ebuild 1750 RMD160 e775b00ac0efb564a407c07cdfb1fff03496376e SHA1 7ba553d10172e52c6c2cef9d96d612b61a07d989 SHA256 7cb8a5682331064b3d1ff2cac423a0c838c0e95183b9d16bab0020fae4f2cf9d
-EBUILD chicken-2.731.ebuild 1588 RMD160 59f75ecb8b4a3cc9f8bb37095c40f0fcd16b54be SHA1 08776f07854dfa125f6662ef693c8aa2a5fb9676 SHA256 8494f99d2f3dff348c7cb26922d3a6bbc48fb3c6edad7ba723d6c53d85e9ebd5
-EBUILD chicken-3.0.0.ebuild 1625 RMD160 1e9064dbd156766f7a8abbbce5a60c8bda766490 SHA1 ae082d145f5f63b8a9a4adcb9e5d1c9cc90f548f SHA256 cbb73eff4ef1291f92450548deaeb2e8cf15ebab18a2793bad635232ccf94922
-EBUILD chicken-3.1.0.ebuild 1624 RMD160 ec034919866779b7a60d8a68a0d68355602744e7 SHA1 35fd526971226b4d1a110dbbb344280d0f749b9e SHA256 ecab0eb75c88f59ce0f1b1c105aed7a8fea10ebfa0c199466f92025a4f89f516
-MISC ChangeLog 3556 RMD160 7759d6fea991c308426abcb5a613a2d418bd3e1e SHA1 1420bb2f7246551e7c8cfc8f0771c031247fd3a1 SHA256 af28d792bfb73641ad32896da53464b87c15471972c54d7966658336de7bc242
+EBUILD chicken-3.1.0.ebuild 1659 RMD160 9eef8692604c1db63ad9e0edf93965544599cdbd SHA1 8d78f7998d26bfbe1eda10ff8d71fabfd05c9dd4 SHA256 f3d03969850a7aa5dfba7423adb5313eb4000c356064f5ff0738c3380ac40c5e
+MISC ChangeLog 3963 RMD160 202e0c8d0a9448214c6344b202ef8f8cbc5f251a SHA1 151196f859c11ede1de7bf50fb72237b42a1f443 SHA256 75537aefbb4b056f5bd1e82f75a2b6480632f4fed9ddf4e40d5815b1747f3d31
 MISC metadata.xml 525 RMD160 82f9c47c5af5d6924874670ce17c44c025b130d4 SHA1 935f520a583ad4f32663522537dbbfb1e9af7f07 SHA256 59bdf730d4d0fdfa81186f0876abb06ccfb034bec3dec9dfadcfe2d4321cffc8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkgN0GQACgkQOeoy/oIi7uz51QCgmJpVEgYzQ82llKH8tM1yynTF
+uI4An2smyK5HA1WMJuBcOVMKx++OF9bg
+=Emov
+-----END PGP SIGNATURE-----
diff --git a/dev-scheme/chicken/chicken-1.89.ebuild b/dev-scheme/chicken/chicken-1.89.ebuild
deleted file mode 100644
index c5df30eab67a..000000000000
--- a/dev-scheme/chicken/chicken-1.89.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-1.89.ebuild,v 1.4 2005/06/06 22:33:27 mkennedy Exp $
-
-inherit multilib
-
-DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
-SRC_URI="http://www.call-with-current-continuation.org/${P}.tar.gz"
-HOMEPAGE="http://www.call-with-current-continuation.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	make || die
-	make check || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc COPYING ChangeLog AUTHORS NEWS README THANKS TODO
-	dodir /usr/share/doc/${PF}/html
-	mv ${D}/usr/share/chicken/doc/manual/ ${D}/usr/share/doc/${PF}/html/
-	rm -rf ${D}/usr/share/chicken/doc
-}
diff --git a/dev-scheme/chicken/chicken-2.2.ebuild b/dev-scheme/chicken/chicken-2.2.ebuild
deleted file mode 100644
index 2a5e0349e139..000000000000
--- a/dev-scheme/chicken/chicken-2.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-2.2.ebuild,v 1.1 2005/09/30 18:57:58 mkennedy Exp $
-
-inherit multilib elisp-common
-
-DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
-SRC_URI="http://www.call-with-current-continuation.org/${P}.tar.gz"
-HOMEPAGE="http://www.call-with-current-continuation.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="emacs"
-
-DEPEND="dev-libs/libpcre
-	emacs? ( virtual/emacs )"
-
-SITEFILE=50hen-gentoo.el
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	make || die
-	make check || die
-	use emacs && elisp-comp hen.el
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc ChangeLog* README NEWS TASKS
-	dohtml chicken.html
-	rm -rf ${D}/usr/share/chicken/doc
-	if use emacs; then
-		elisp-install ${PN} *.{el,elc}
-		elisp-site-file-install ${FILESDIR}/${SITEFILE}
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/chicken/chicken-2.3.ebuild b/dev-scheme/chicken/chicken-2.3.ebuild
deleted file mode 100644
index e7f47b757d3c..000000000000
--- a/dev-scheme/chicken/chicken-2.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-2.3.ebuild,v 1.1 2006/05/11 16:52:55 mkennedy Exp $
-
-inherit multilib elisp-common
-
-DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
-SRC_URI="http://www.call-with-current-continuation.org/${P}.tar.gz"
-HOMEPAGE="http://www.call-with-current-continuation.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="emacs"
-
-DEPEND="dev-libs/libpcre
-	emacs? ( virtual/emacs )"
-
-SITEFILE=50hen-gentoo.el
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	make || die
-	make check || die
-	use emacs && elisp-comp hen.el
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc ChangeLog* README NEWS TASKS
-	dohtml chicken.html
-	rm -rf ${D}/usr/share/chicken/doc
-	if use emacs; then
-		elisp-install ${PN} *.{el,elc}
-		elisp-site-file-install ${FILESDIR}/${SITEFILE}
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/chicken/chicken-2.5.ebuild b/dev-scheme/chicken/chicken-2.5.ebuild
deleted file mode 100644
index db7a3064ccb8..000000000000
--- a/dev-scheme/chicken/chicken-2.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-2.5.ebuild,v 1.1 2007/01/12 18:47:10 hkbst Exp $
-
-inherit multilib elisp-common
-
-DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
-SRC_URI="http://www.call-with-current-continuation.org/${P}.tar.gz"
-HOMEPAGE="http://www.call-with-current-continuation.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="emacs"
-
-DEPEND="dev-libs/libpcre
-	emacs? ( virtual/emacs )"
-
-SITEFILE=50hen-gentoo.el
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	make || die
-	make check || die
-	use emacs && elisp-comp hen.el
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc ChangeLog* README NEWS TASKS
-	dohtml chicken.html
-	rm -rf ${D}/usr/share/chicken/doc
-	if use emacs; then
-		elisp-install ${PN} *.{el,elc}
-		elisp-site-file-install ${FILESDIR}/${SITEFILE}
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/chicken/chicken-2.6.ebuild b/dev-scheme/chicken/chicken-2.6.ebuild
deleted file mode 100644
index f85d867ae006..000000000000
--- a/dev-scheme/chicken/chicken-2.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-2.6.ebuild,v 1.7 2008/02/14 10:42:34 jer Exp $
-
-inherit multilib elisp-common
-
-DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
-SRC_URI="http://www.call-with-current-continuation.org/${P}.tar.gz
-		 http://www.call-with-current-continuation.org/eggs/syntax-case.egg"
-HOMEPAGE="http://www.call-with-current-continuation.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emacs"
-
-DEPEND="dev-libs/libpcre
-		|| ( dev-libs/g-wrap dev-libs/libffi )
-		emacs? ( virtual/emacs )"
-
-SITEFILE=50hen-gentoo.el
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	mkdir ${S}/syntax-case && tar xzf ${DISTDIR}/syntax-case.egg -C ${S}/syntax-case
-#	sed -e "s_csi_../csi_g" -e "s_csc_../csc_g" -i ${S}/syntax-case/syntax-case.setup
-}
-
-src_compile() {
-	econf --disable-apply-hook --disable-procedure-tables || die "configure failed"
-	emake || die "make failed"
-
-	use emacs && elisp-comp hen.el
-}
-
-# chicken doesn't seem to honor CHICKEN_PREFIX CHICKEN_HOME or LD_LIBRARY_PATH=${S}/.libs/
-RESTRICT=test
-#src_test() {
-#	cd tests
-#	bash runtests.sh
-#}
-
-src_install() {
-	emake DESTDIR=${D} install || die "make install failed"
-	dodoc ChangeLog* README NEWS
-	dohtml -r html/
-	rm -rf ${D}/usr/share/chicken/doc
-
-	if use emacs; then
-		elisp-install ${PN} *.{el,elc}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-}
-
-pkg_postinst() {
-	chicken-setup -v -local "${S}" syntax-case
-	use emacs && elisp-site-regen
-}
-
-pkg_prerm() {
-	rm -rf /usr/$(get_libdir)/chicken/1/*
-#	chicken-setup -v -uninstall syntax-case
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/chicken/chicken-2.731.ebuild b/dev-scheme/chicken/chicken-2.731.ebuild
deleted file mode 100644
index c0a3fe3dc3d8..000000000000
--- a/dev-scheme/chicken/chicken-2.731.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-2.731.ebuild,v 1.3 2008/02/14 10:42:34 jer Exp $
-
-inherit multilib elisp-common
-
-DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
-#SRC_URI="http://www.call-with-current-continuation.org/${P}.tar.gz"
-SRC_URI="http://chicken.wiki.br/dev-snapshots/2007/10/30/${P}.tar.gz"
-#		 http://www.call-with-current-continuation.org/eggs/syntax-case.egg"
-HOMEPAGE="http://www.call-with-current-continuation.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emacs"
-
-DEPEND="sys-apps/texinfo emacs? ( virtual/emacs )"
-
-SITEFILE=50hen-gentoo.el
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-#	cp defaults.make defaults.make.old
-	sed "s,/lib,/$(get_libdir),g" -i defaults.make
-#	diff -u defaults.make.old defaults.make
-}
-
-src_compile() {
-	OPTIONS="PLATFORM=linux PREFIX=/usr"
-
-	emake ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="$CFLAGS" || die
-
-	use emacs && elisp-comp hen.el
-}
-
-# chicken doesn't seem to honor CHICKEN_PREFIX CHICKEN_HOME or LD_LIBRARY_PATH=${S}/.libs/
-RESTRICT=test
-#src_test() {
-#	cd tests
-#	bash runtests.sh
-#}
-
-src_install() {
-	emake ${OPTIONS} DESTDIR="${D}" install || die
-	dodoc ChangeLog* NEWS
-	dohtml -r html/
-	rm -rf "${D}"/usr/share/chicken/doc
-
-	if use emacs; then
-		elisp-install ${PN} *.{el,elc}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/chicken/chicken-3.0.0.ebuild b/dev-scheme/chicken/chicken-3.0.0.ebuild
deleted file mode 100644
index 723e704689c2..000000000000
--- a/dev-scheme/chicken/chicken-3.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-3.0.0.ebuild,v 1.2 2008/02/14 10:42:34 jer Exp $
-
-inherit multilib elisp-common
-
-DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
-#SRC_URI="http://www.call-with-current-continuation.org/${P}.tar.gz"
-SRC_URI="http://chicken.wiki.br/dev-snapshots/2008/01/29/${P}.tar.gz"
-#		 http://www.call-with-current-continuation.org/eggs/syntax-case.egg"
-HOMEPAGE="http://www.call-with-current-continuation.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emacs"
-
-DEPEND="dev-libs/libpcre sys-apps/texinfo emacs? ( virtual/emacs )"
-
-SITEFILE=50hen-gentoo.el
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-#	cp defaults.make defaults.make.old
-	sed "s,/lib,/$(get_libdir),g" -i defaults.make
-#	diff -u defaults.make.old defaults.make
-}
-
-src_compile() {
-	OPTIONS="PLATFORM=linux PREFIX=/usr"
-
-	emake ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="$CFLAGS" \
-		USE_HOST_PCRE=1 || die
-
-	use emacs && elisp-comp hen.el
-}
-
-# chicken doesn't seem to honor CHICKEN_PREFIX CHICKEN_HOME or LD_LIBRARY_PATH=${S}/.libs/
-RESTRICT=test
-#src_test() {
-#	cd tests
-#	bash runtests.sh
-#}
-
-src_install() {
-	emake ${OPTIONS} DESTDIR="${D}" install || die
-	dodoc ChangeLog* NEWS
-	dohtml -r html/
-	rm -rf "${D}"/usr/share/chicken/doc
-
-	if use emacs; then
-		elisp-install ${PN} *.{el,elc}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/chicken/chicken-3.1.0.ebuild b/dev-scheme/chicken/chicken-3.1.0.ebuild
index b30c95be8a66..f179e341d0fa 100644
--- a/dev-scheme/chicken/chicken-3.1.0.ebuild
+++ b/dev-scheme/chicken/chicken-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-3.1.0.ebuild,v 1.5 2008/04/18 17:19:36 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-3.1.0.ebuild,v 1.6 2008/04/22 11:48:22 ulm Exp $
 
 inherit multilib elisp-common
 
@@ -32,7 +32,9 @@ src_compile() {
 	echo $OPTIONS
 	emake ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" || die
 
-	use emacs && elisp-comp hen.el
+	if use emacs; then
+		elisp-compile hen.el || die
+	fi
 }
 
 # chicken doesn't seem to honor CHICKEN_PREFIX CHICKEN_HOME or LD_LIBRARY_PATH=${S}/.libs/
@@ -58,8 +60,8 @@ src_install() {
 	keepdir /usr/$(get_libdir)/chicken/3
 
 	if use emacs; then
-		elisp-install ${PN} *.{el,elc}
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+		elisp-install ${PN} hen.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 	fi
 }
 
diff --git a/dev-scheme/chicken/files/50hen-gentoo.el b/dev-scheme/chicken/files/50hen-gentoo.el
index 30ca0425b253..712b287ded9f 100644
--- a/dev-scheme/chicken/files/50hen-gentoo.el
+++ b/dev-scheme/chicken/files/50hen-gentoo.el
@@ -1,5 +1,5 @@
 
-;; site-lisp configuration for hen.el
+;;; chicken site-lisp configuration
 
 (add-to-list 'load-path "@SITELISP@")
-(autoload 'hen-mode "hen" "Major mode for Chicken Scheme source." t)
-\ No newline at end of file
+(autoload 'hen-mode "hen" "Major mode for Chicken Scheme source." t)