Now installs doc and examples properly, fixing bug #280279

(Portage version: 2.2_rc38/cvs/Linux x86_64)

3 files changed, 38 insertions, 47 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index 2ae71f7ef6a6..adccf394266b 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/ipython
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.64 2009/08/17 14:53:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.65 2009/08/18 16:47:06 bicatali Exp $
+
+  18 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org> ipython-0.9.1.ebuild,
+  ipython-0.10.ebuild:
+  Now installs doc and examples properly, fixing bug #280279
 
 *ipython-0.10 (17 Aug 2009)
 
diff --git a/dev-python/ipython/ipython-0.10.ebuild b/dev-python/ipython/ipython-0.10.ebuild
index 40a35d42746f..18d4ad9404ae 100644
--- a/dev-python/ipython/ipython-0.10.ebuild
+++ b/dev-python/ipython/ipython-0.10.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.10.ebuild,v 1.1 2009/08/17 14:53:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.10.ebuild,v 1.2 2009/08/18 16:47:06 bicatali Exp $
 
 NEED_PYTHON=2.4
-
-inherit distutils elisp-common
+EAPI=2
+inherit eutils distutils elisp-common
 
 DESCRIPTION="An advanced interactive shell for Python."
 HOMEPAGE="http://ipython.scipy.org/"
@@ -30,17 +30,22 @@ DEPEND="${CDEPEND}
 PYTHON_MODNAME="IPython"
 SITEFILE="62ipython-gentoo.el"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.9.1-globalpath.patch
-
 	sed -i \
-		-e '/examfiles)/d' \
-		-e '/manfiles)/d' \
-		-e '/manstatic)/d' \
-		-e 's/^docfiles.*/docfiles=""/' \
-		setup.py || die "sed failed"
+		-e "s:share/doc/ipython:share/doc/${PF}:" \
+		setupbase.py || die "sed failed"
+	if ! use doc; then
+		sed -i \
+			-e '/extensions/d' \
+			-e 's/+ manual_files//' \
+			setupbase.py || die "sed failed"
+	fi
+	if ! use examples; then
+		sed -i \
+			-e 's/+ example_files//' \
+			setupbase.py || die "sed failed"
+	fi
 }
 
 src_compile() {
@@ -67,21 +72,8 @@ src_test() {
 src_install() {
 	DOCS="docs/source/changes.txt"
 	distutils_src_install
-
-	cd docs
-	insinto "/usr/share/doc/${PF}"
-
-	if use doc; then
-		doins -r dist/* || die "doc install failed"
-		doins "${S}"/IPython/Extensions/igrid_help* || die
-	fi
-
-	if use examples ; then
-		doins -r examples || die "examples install failed"
-	fi
-
 	if use emacs ; then
-		pushd emacs
+		pushd docs/emacs
 		elisp-install ${PN} ${PN}.el* || die "elisp-install failed"
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 		popd
diff --git a/dev-python/ipython/ipython-0.9.1.ebuild b/dev-python/ipython/ipython-0.9.1.ebuild
index 083754f2ff53..6d537a550a9e 100644
--- a/dev-python/ipython/ipython-0.9.1.ebuild
+++ b/dev-python/ipython/ipython-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.9.1.ebuild,v 1.10 2009/08/01 12:18:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.9.1.ebuild,v 1.11 2009/08/18 16:47:06 bicatali Exp $
 
 NEED_PYTHON=2.4
 
@@ -34,13 +34,20 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-globalpath.patch
-
 	sed -i \
-		-e '/examfiles)/d' \
-		-e '/manfiles)/d' \
-		-e '/manstatic)/d' \
-		-e 's/^docfiles.*/docfiles=""/' \
-		setup.py || die "sed failed"
+		-e "s:share/doc/ipython:share/doc/${PF}:" \
+		setupbase.py || die "sed failed"
+	if ! use doc; then
+		sed -i \
+			-e '/extensions/d' \
+			-e 's/+ manual_files//' \
+			setupbase.py || die "sed failed"
+	fi
+	if ! use examples; then
+		sed -i \
+			-e 's/+ example_files//' \
+			setupbase.py || die "sed failed"
+	fi
 }
 
 src_compile() {
@@ -68,20 +75,8 @@ src_install() {
 	DOCS="docs/source/changes.txt"
 	distutils_src_install
 
-	cd docs
-	insinto "/usr/share/doc/${PF}"
-
-	if use doc; then
-		doins -r dist/* || die "doc install failed"
-		doins "${S}"/IPython/Extensions/igrid_help* || die
-	fi
-
-	if use examples ; then
-		doins -r examples || die "examples install failed"
-	fi
-
 	if use emacs ; then
-		pushd emacs
+		pushd docs/emacs
 		elisp-install ${PN} ${PN}.el* || die "elisp-install failed"
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 		popd