Use elisp-compile instead of elisp-comp, #235579. Drop old.

(Portage version: -svn.wrabbit)

5 files changed, 9 insertions, 159 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index 90136424a934..c93abc562137 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/ipython
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.51 2008/07/18 13:28:25 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.52 2008/08/25 08:46:32 hawking Exp $
+
+  25 Aug 2008; Ali Polatel <hawking@gentoo.org> -ipython-0.8.1-r1.ebuild,
+  ipython-0.8.2.ebuild, -ipython-0.8.4.ebuild, ipython-0.8.4-r1.ebuild:
+  Use elisp-compile instead of elisp-comp, #235579. Drop old.
 
   18 Jul 2008; Olivier Crête <tester@gentoo.org> ipython-0.8.2.ebuild:
   Stable on amd64, bug #212241
diff --git a/dev-python/ipython/ipython-0.8.1-r1.ebuild b/dev-python/ipython/ipython-0.8.1-r1.ebuild
deleted file mode 100644
index 2fe7faba07ed..000000000000
--- a/dev-python/ipython/ipython-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.8.1-r1.ebuild,v 1.1 2007/10/24 17:20:06 hawking Exp $
-
-NEED_PYTHON=2.3
-
-inherit distutils elisp-common
-
-DESCRIPTION="An advanced interactive shell for Python."
-HOMEPAGE="http://ipython.scipy.org/"
-SRC_URI="http://ipython.scipy.org/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~x86"
-IUSE="doc examples emacs gnuplot"
-
-RDEPEND="gnuplot? ( dev-python/gnuplot-py )
-	emacs? ( virtual/emacs
-		app-emacs/python-mode )
-	dev-python/pexpect"
-DEPEND="${RDEPEND}"
-
-PYTHON_MODNAME="IPython"
-SITEFILE="62ipython-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e '/examfiles/d' -e '/examples/d' \
-		-e "/'manual'/d" -e '/manfiles)/d' \
-		-e 's/^docfiles.*/docfiles=""/' \
-		setup.py || die "sed failed"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use emacs ; then
-		cd doc
-		elisp-comp ipython.el || die "elisp-comp failed"
-	fi
-}
-
-src_install() {
-	DOCS="doc/ChangeLog"
-	distutils_src_install
-
-	cd doc
-	insinto /usr/share/doc/${PF}
-
-	if use doc ; then
-		dohtml manual/*
-		doins *.pdf
-	fi
-	if use examples ; then
-		doins -r examples
-	fi
-	if use emacs ; then
-		elisp-install ${PN} ipython.el ipython.elc || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/ipython/ipython-0.8.2.ebuild b/dev-python/ipython/ipython-0.8.2.ebuild
index 743df3f5842d..bdd28200fb1a 100644
--- a/dev-python/ipython/ipython-0.8.2.ebuild
+++ b/dev-python/ipython/ipython-0.8.2.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-python/ipython/ipython-0.8.2.ebuild,v 1.6 2008/07/18 13:28:25 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.8.2.ebuild,v 1.7 2008/08/25 08:46:32 hawking Exp $
 
 NEED_PYTHON=2.3
 
@@ -38,8 +38,7 @@ src_unpack() {
 src_compile() {
 	distutils_src_compile
 	if use emacs ; then
-		cd doc
-		elisp-comp ipython.el || die "elisp-comp failed"
+		elisp-compile doc/ipython.el || die "elisp-compile failed"
 	fi
 }
 
diff --git a/dev-python/ipython/ipython-0.8.4-r1.ebuild b/dev-python/ipython/ipython-0.8.4-r1.ebuild
index 95678929244f..0e738e3def3a 100644
--- a/dev-python/ipython/ipython-0.8.4-r1.ebuild
+++ b/dev-python/ipython/ipython-0.8.4-r1.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-python/ipython/ipython-0.8.4-r1.ebuild,v 1.1 2008/07/06 08:41:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.8.4-r1.ebuild,v 1.2 2008/08/25 08:46:32 hawking Exp $
 
 NEED_PYTHON=2.3
 
@@ -40,8 +40,7 @@ src_unpack() {
 src_compile() {
 	distutils_src_compile
 	if use emacs ; then
-		cd doc
-		elisp-comp ipython.el || die "elisp-comp failed"
+		elisp-compile doc/ipython.el || die "elisp-compile failed"
 	fi
 }
 
diff --git a/dev-python/ipython/ipython-0.8.4.ebuild b/dev-python/ipython/ipython-0.8.4.ebuild
deleted file mode 100644
index aaef3fa72c57..000000000000
--- a/dev-python/ipython/ipython-0.8.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.8.4.ebuild,v 1.1 2008/06/26 14:12:04 bicatali Exp $
-
-NEED_PYTHON=2.3
-
-inherit eutils distutils elisp-common
-
-DESCRIPTION="An advanced interactive shell for Python."
-HOMEPAGE="http://ipython.scipy.org/"
-SRC_URI="http://ipython.scipy.org/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~x86"
-IUSE="doc examples emacs gnuplot"
-
-RDEPEND="gnuplot? ( dev-python/gnuplot-py )
-	emacs? ( app-emacs/python-mode virtual/emacs )
-	dev-python/pexpect"
-DEPEND="${RDEPEND}"
-
-PYTHON_MODNAME="IPython"
-SITEFILE="62ipython-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-globalpath.patch
-
-	sed -i \
-		-e '/examfiles/d' -e '/examples/d' \
-		-e "/'manual'/d" -e '/manfiles)/d' \
-		-e 's/^docfiles.*/docfiles=""/' \
-		setup.py || die "sed failed"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use emacs ; then
-		cd doc
-		elisp-comp ipython.el || die "elisp-comp failed"
-	fi
-}
-
-src_test() {
-	PYTHONPATH=build/lib
-}
-
-src_install() {
-	DOCS="doc/ChangeLog"
-	distutils_src_install
-
-	cd doc
-	insinto /usr/share/doc/${PF}
-
-	if use doc ; then
-		dohtml manual/*
-		doins *.pdf
-	fi
-	if use examples ; then
-		doins -r examples
-	fi
-	if use emacs ; then
-		elisp-install ${PN} ipython.el ipython.elc || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}