Don't install scheme-complete.el, bug 218630. Remove old.

(Portage version: 2.1.5_rc5)

10 files changed, 17 insertions, 385 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/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)