8 files changed, 25 insertions, 395 deletions
diff --git a/dev-scheme/chicken/ChangeLog b/dev-scheme/chicken/ChangeLog
index 51b7d5268e68..909bc197fedc 100644
--- a/dev-scheme/chicken/ChangeLog
+++ b/dev-scheme/chicken/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-scheme/chicken
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/ChangeLog,v 1.39 2009/11/02 15:30:28 hkbst Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/ChangeLog,v 1.40 2010/06/01 20:16:38 chiiph Exp $
+
+*chicken-4.5.0 (01 Jun 2010)
+
+  01 Jun 2010; Tomas Touceda <chiiph@gentoo.org> -chicken-3.1.0.ebuild,
+  -chicken-3.2.0.ebuild, -chicken-3.4.0.ebuild, -chicken-4.0.0.ebuild,
+  -chicken-4.1.0.ebuild, -chicken-4.2.0.ebuild, +chicken-4.5.0.ebuild:
+  Version bump. Removed native emacs support, replaced with scheme-complete.
+  Clean up old testing/stable versions, leaving just 3.3.0 and 4.5.0.
 
 *chicken-4.2.0 (02 Nov 2009)
 
diff --git a/dev-scheme/chicken/Manifest b/dev-scheme/chicken/Manifest
index 9e83681f1908..7513d94cff04 100644
--- a/dev-scheme/chicken/Manifest
+++ b/dev-scheme/chicken/Manifest
@@ -1,17 +1,7 @@
 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 chicken-3.2.0.tar.gz 3165645 RMD160 1498804abc494c7727830d8ea719b22a62124525 SHA1 6416d34cde15a3800986082960b302b238e197f4 SHA256 ab8c5b9c11c169e03762af11c1938edc05bd437b6197c674e3cdbcff82d1a22a
 DIST chicken-3.3.0.tar.gz 4228441 RMD160 74035304164d5c8c2f2ed7571662452df86725f2 SHA1 3af69007f664ccdef988863f1c6ac24405c5500c SHA256 5ce2519bac9956de5700a5777b2bbc2cd89202ef2d2252a40a0d1e8c9854bec6
-DIST chicken-3.4.0.tar.gz 4242443 RMD160 e28808de5408753df1e0b050dcac19f540567f13 SHA1 6a73186eb01e2aa952056cf2ccb8fa136f9fab4e SHA256 adf19b15d3f9a21bc9f30704208e1dd6e1714182623541c1f52fa0b7a5dafa51
-DIST chicken-4.0.0.tar.gz 3309221 RMD160 dbeeb88aa05a3dee541a206f8ecbee2b20fa068b SHA1 9d56cc0f34d9f920b59d2576e651b31a530a38ef SHA256 2199d42a714373e02a42112ad699b53a9ab99af933d821249ee9d62c6bc74600
-DIST chicken-4.1.0.tar.gz 3392068 RMD160 e660777fc71aa7d5f73d07c19f9c2857f2ee5b1b SHA1 683b36f84e59b89c0bf877927571e9e0a677d182 SHA256 280516ea373dd3b05e149d72c2cff7bd292a62a60a5b650b9010b2f81443db4c
-DIST chicken-4.2.0.tar.gz 3388152 RMD160 a5d0bbc56ec1acf92628dc82d88c80bf3c069ce1 SHA1 c09922884eb145ad993e0d84116678cc9c98afbe SHA256 8dc3887b9907685c99aac6924980445506cccbe3ada29407aad80a0e34d3bb79
-EBUILD chicken-3.1.0.ebuild 1682 RMD160 9eed7092a4bfae26e80017e2c2ba0b87395321bc SHA1 4c3916849efd9847193c153248802f3689a60169 SHA256 1d9f3d905b9cec711a46b40019152b0f1cf2b68feb1d490eafc9553a550ab5fa
-EBUILD chicken-3.2.0.ebuild 1687 RMD160 cfdc324e1e982c75c5ac829a48030d2ad4a5b1b9 SHA1 5f58ca120c3e31e442f4b29c1e26e876396824bc SHA256 9b670655f18efc976ca55d44c8b14cb946e7f5f0a0480aaf6b793bc19a9dc28c
+DIST chicken-4.5.0.tar.gz 2914920 RMD160 03d511d4a78add4fb3505a3c8eea5594fe9bb705 SHA1 67c1d791b59dc77fe5f41f19dc70fa2d5b86e4c3 SHA256 95919725411268614022ffc2426c826290cbebb6d574c1f2ebcaee5ac3ef9fd9
 EBUILD chicken-3.3.0.ebuild 1569 RMD160 d2592ac4ea39f16e66e3a5ab12ea648dc5595564 SHA1 7f25b5d3b4f3ca71a4fe5ef8d2d247e512050558 SHA256 68e958a02a13039359584927a0d15e5b95280bcf1e12da97bad4dada0e8c17e7
-EBUILD chicken-3.4.0.ebuild 1588 RMD160 d004f4ae857d61851feafd5ef7c651e51df515d5 SHA1 64cc025fdceadbfb305db6e03f42579fc1b0143b SHA256 815a4644ee264e9e97b8ca554ec68ee92691a5df5872470ee7634045fe11405f
-EBUILD chicken-4.0.0.ebuild 1636 RMD160 9ee472cceb7bbffabadabc6fc843c11bbc859404 SHA1 a0e3c51b0447abdc60e8ee2eb8484e7b9df74f5b SHA256 de772354c0b3bddc45db9cf9c87c61ad01519b436970ab0ecb6e16e8bc57c5a7
-EBUILD chicken-4.1.0.ebuild 1632 RMD160 669fa2dc7667fc93b46ca4fb7c1d513e030f5e34 SHA1 0bc3a5d739b19b3e1897ff8ba87d68fe594fdd58 SHA256 3d85901cb51fcc38642c986e312c08498447abd408956a3ad179c0396ebe3322
-EBUILD chicken-4.2.0.ebuild 1632 RMD160 ec164ca55853618c86e7d2b151cada695f9e2963 SHA1 1451dc290b48c3a6761c152dc104dad3b158e034 SHA256 6fa3d7b535b135426c97130a4b0da128a604fab72513feb8fbb4155f76cbdd81
-MISC ChangeLog 5400 RMD160 685696574a27b8c610a34226887a586bdcc1bde5 SHA1 2b0dd55a99dd26160482a691a9c87070f1d5e943 SHA256 3c1d61c8115a047fe6b2a1bf67fb3ebd3af88197000565d95e22ea4d88ffe866
+EBUILD chicken-4.5.0.ebuild 1324 RMD160 ac153ed0ac37ef732c8221eebb94158cb419fe2a SHA1 b505eed41e9a0bc9012decde96392d7081e71de2 SHA256 67ca271827638720a63b4d4504c1be3773bd7326426e65eac2fb4fca08768d39
+MISC ChangeLog 5793 RMD160 83bad435814649bfb7f3d71e3331e2ce95dcaade SHA1 e6559249a4936a6c36f069cc5b4220c327e1395b SHA256 e60cb5c129df40e34b00fc0a8733da55bb045d6520fa6dd21e746ba86033efc2
 MISC metadata.xml 525 RMD160 82f9c47c5af5d6924874670ce17c44c025b130d4 SHA1 935f520a583ad4f32663522537dbbfb1e9af7f07 SHA256 59bdf730d4d0fdfa81186f0876abb06ccfb034bec3dec9dfadcfe2d4321cffc8
diff --git a/dev-scheme/chicken/chicken-3.1.0.ebuild b/dev-scheme/chicken/chicken-3.1.0.ebuild
deleted file mode 100644
index 59b8f027f4be..000000000000
--- a/dev-scheme/chicken/chicken-3.1.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2009 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.7 2009/09/14 06:36:11 araujo Exp $
-
-inherit multilib elisp-common
-
-DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
-SRC_URI="http://chicken.wiki.br/releases/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.call-with-current-continuation.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86"
-IUSE="emacs"
-
-DEPEND=">=dev-libs/libpcre-7.6
-		sys-apps/texinfo
-		emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-SITEFILE=50hen-gentoo.el
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-	sed "s:/lib:/$(get_libdir):g" -i defaults.make
-}
-
-src_compile() {
-	# $A is used by the makefile so >_>
-	unset A
-
-	OPTIONS="PLATFORM=linux PREFIX=/usr USE_HOST_PCRE=1"
-	echo $OPTIONS
-	emake ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" || die
-
-	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/
-RESTRICT=test
-#src_test() {
-#	cd tests
-#	bash runtests.sh
-#}
-
-src_install() {
-	unset A
-
-	emake ${OPTIONS} DESTDIR="${D}" install || die
-	dodoc ChangeLog* NEWS
-	dohtml -r html/
-	rm -rf "${D}"/usr/share/chicken/doc
-
-	# put a .keep in the default egg repository
-#	touch .keep
-#	insinto /usr/$(get_libdir)/chicken/3
-#	doins .keep
-
-	keepdir /usr/$(get_libdir)/chicken/3
-
-	if use emacs; then
-		elisp-install ${PN} hen.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/chicken/chicken-3.2.0.ebuild b/dev-scheme/chicken/chicken-3.2.0.ebuild
deleted file mode 100644
index 11b55c374680..000000000000
--- a/dev-scheme/chicken/chicken-3.2.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-3.2.0.ebuild,v 1.2 2009/09/14 06:36:11 araujo Exp $
-
-inherit multilib elisp-common
-
-DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
-SRC_URI="http://chicken.wiki.br/releases/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.call-with-current-continuation.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emacs"
-
-DEPEND=">=dev-libs/libpcre-7.6
-		sys-apps/texinfo
-		emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-SITEFILE=50hen-gentoo.el
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-	sed "s:/lib:/$(get_libdir):g" -i defaults.make
-}
-
-src_compile() {
-	# $A is used by the makefile so >_>
-	unset A
-
-	OPTIONS="PLATFORM=linux PREFIX=/usr USE_HOST_PCRE=1"
-	echo $OPTIONS
-	emake ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" || die
-
-	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/
-RESTRICT=test
-#src_test() {
-#	cd tests
-#	bash runtests.sh
-#}
-
-src_install() {
-	unset A
-
-	emake ${OPTIONS} DESTDIR="${D}" install || die
-	dodoc ChangeLog* NEWS
-	dohtml -r html/
-	rm -rf "${D}"/usr/share/chicken/doc
-
-	# put a .keep in the default egg repository
-#	touch .keep
-#	insinto /usr/$(get_libdir)/chicken/3
-#	doins .keep
-
-	keepdir /usr/$(get_libdir)/chicken/3
-
-	if use emacs; then
-		elisp-install ${PN} hen.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/chicken/chicken-3.4.0.ebuild b/dev-scheme/chicken/chicken-3.4.0.ebuild
deleted file mode 100644
index 361f44302001..000000000000
--- a/dev-scheme/chicken/chicken-3.4.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-3.4.0.ebuild,v 1.1 2009/04/06 12:25:56 hkbst Exp $
-
-inherit multilib elisp-common
-
-DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
-SRC_URI="http://chicken.wiki.br/releases/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.call-with-current-continuation.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emacs"
-
-DEPEND=">=dev-libs/libpcre-7.7
-		sys-apps/texinfo
-		emacs? ( virtual/emacs )"
-RDEPEND="emacs? ( virtual/emacs )"
-
-SITEFILE=50hen-gentoo.el
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-	sed "s:/lib:/$(get_libdir):g" -i defaults.make
-}
-
-src_compile() {
-	# $A is used by the makefile so >_>
-	unset A
-
-	OPTIONS="PLATFORM=linux PREFIX=/usr USE_HOST_PCRE=1"
-	echo $OPTIONS
-	emake ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" || die
-
-	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/
-RESTRICT=test
-#src_test() {
-#	cd tests
-#	bash runtests.sh
-#}
-
-src_install() {
-	unset A
-
-	emake ${OPTIONS} DESTDIR="${D}" install || die
-	dodoc ChangeLog* NEWS
-	dohtml -r html/
-	rm -rf "${D}"/usr/share/chicken/doc
-
-	keepdir /usr/$(get_libdir)/chicken/3
-
-	if use emacs; then
-		elisp-install ${PN} hen.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/chicken/chicken-4.0.0.ebuild b/dev-scheme/chicken/chicken-4.0.0.ebuild
deleted file mode 100644
index 7f45b94ccee3..000000000000
--- a/dev-scheme/chicken/chicken-4.0.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-4.0.0.ebuild,v 1.3 2009/08/29 21:41:01 flameeyes 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="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emacs"
-
-DEPEND="sys-apps/texinfo
-		emacs? ( virtual/emacs )"
-RDEPEND="emacs? ( virtual/emacs )"
-
-SITEFILE=50hen-gentoo.el
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-#	cp defaults.make defaults.make.old
-	sed "s,\$(PREFIX)/lib,\$(PREFIX)/$(get_libdir)," -i defaults.make
-	sed "s,\$(DATADIR)/doc,\$(SHAREDIR)/doc/${P}," -i defaults.make
-#	diff -u defaults.make.old defaults.make
-}
-
-src_compile() {
-	OPTIONS="PLATFORM=linux PREFIX=/usr"
-	echo $OPTIONS
-	#upstream does not support parallel builds, bug 265881
-	emake -j1 ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" || die
-
-	if use emacs; then
-		elisp-compile hen.el || die
-	fi
-}
-
-# chicken's testsuite is not runnable before install
-# upstream has been notified of the issue
-RESTRICT=test
-
-src_install() {
-	# bug #283158
-	emake -j1 ${OPTIONS} DESTDIR="${D}" install || die
-
-	rm "${D}"/usr/share/doc/${P}/LICENSE
-	dodoc NEWS
-
-	if use emacs; then
-		elisp-install ${PN} hen.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/chicken/chicken-4.2.0.ebuild b/dev-scheme/chicken/chicken-4.2.0.ebuild
deleted file mode 100644
index e43297129517..000000000000
--- a/dev-scheme/chicken/chicken-4.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-4.2.0.ebuild,v 1.1 2009/11/02 15:30:28 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="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="emacs"
-
-DEPEND="sys-apps/texinfo
-		emacs? ( virtual/emacs )"
-RDEPEND="emacs? ( virtual/emacs )"
-
-SITEFILE=50hen-gentoo.el
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-#	cp defaults.make defaults.make.old
-	sed "s,\$(PREFIX)/lib,\$(PREFIX)/$(get_libdir)," -i defaults.make
-	sed "s,\$(DATADIR)/doc,\$(SHAREDIR)/doc/${P}," -i defaults.make
-#	diff -u defaults.make.old defaults.make
-}
-
-src_compile() {
-	OPTIONS="PLATFORM=linux PREFIX=/usr"
-	echo $OPTIONS
-	#upstream does not support parallel builds, bug 265881
-	emake -j1 ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" || die
-
-	if use emacs; then
-		elisp-compile hen.el || die
-	fi
-}
-
-# chicken's testsuite is not runnable before install
-# upstream has been notified of the issue
-RESTRICT=test
-
-src_install() {
-	# bug #283158
-	emake -j1 ${OPTIONS} DESTDIR="${D}" install || die
-
-	rm "${D}"/usr/share/doc/${P}/LICENSE
-	dodoc NEWS
-
-	if use emacs; then
-		elisp-install ${PN} hen.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-scheme/chicken/chicken-4.1.0.ebuild b/dev-scheme/chicken/chicken-4.5.0.ebuild
index b065cc194dbf..a6eead0679df 100644
--- a/dev-scheme/chicken/chicken-4.1.0.ebuild
+++ b/dev-scheme/chicken/chicken-4.5.0.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-4.1.0.ebuild,v 1.2 2009/11/02 15:30:28 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-4.5.0.ebuild,v 1.1 2010/06/01 20:16:38 chiiph Exp $
+
+EAPI="3"
 
 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/"
+SRC_URI="http://www.call-with-current-continuation.org/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -15,27 +17,18 @@ IUSE="emacs"
 
 DEPEND="sys-apps/texinfo
 		emacs? ( virtual/emacs )"
-RDEPEND="emacs? ( virtual/emacs )"
+RDEPEND="emacs? ( virtual/emacs app-emacs/scheme-complete )"
 
-SITEFILE=50hen-gentoo.el
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-#	cp defaults.make defaults.make.old
+src_prepare() {
 	sed "s,\$(PREFIX)/lib,\$(PREFIX)/$(get_libdir)," -i defaults.make
 	sed "s,\$(DATADIR)/doc,\$(SHAREDIR)/doc/${P}," -i defaults.make
-#	diff -u defaults.make.old defaults.make
 }
 
 src_compile() {
 	OPTIONS="PLATFORM=linux PREFIX=/usr"
-	echo $OPTIONS
 	#upstream does not support parallel builds, bug 265881
-	emake -j1 ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" || die
-
-	if use emacs; then
-		elisp-compile hen.el || die
-	fi
+	emake -j1 ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
+		HOSTSYSTEM="${CBUILD}" || die "emake failed"
 }
 
 # chicken's testsuite is not runnable before install
@@ -44,21 +37,8 @@ RESTRICT=test
 
 src_install() {
 	# bug #283158
-	emake -j1 ${OPTIONS} DESTDIR="${D}" install || die
-
-	rm "${D}"/usr/share/doc/${P}/LICENSE
-	dodoc NEWS
-
-	if use emacs; then
-		elisp-install ${PN} hen.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
+	emake -j1 ${OPTIONS} DESTDIR="${D}" HOSTSYSTEM="${CBUILD}" install || die
 
-pkg_postrm() {
-	use emacs && elisp-site-regen
+	rm "${D}"/usr/share/doc/${P}/LICENSE || die
+	dodoc NEWS || die
 }