Now installs doc and examples properly, fixing bug #280279

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 51 insertions, 50 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/Manifest b/dev-python/ipython/Manifest
index b3b383c49e64..9df385103790 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 62ipython-gentoo.el 127 RMD160 01a862c77ce09ef0d1613504607db4fa5d840dc1 SHA1 a3650b3e477620e4977820d21a93bf68ab18bfa8 SHA256 b5900b95df4f197aedea20432f3c71de5bc7149fa1022f8417be7a606647b449
 AUX ipython-0.9.1-globalpath.patch 332 RMD160 8ab28812c4b9f3b2b6ccca7cc98cc4931f1f6585 SHA1 5ba9e5a02a429d5c2597db1c7f495996adce83fe SHA256 3e27dc5fce4f5ec594a389960e63e4707687c2306cfb6f4148b4d6d5b7176fcc
 DIST ipython-0.10.tar.gz 5829939 RMD160 819609298bb000aa01c3af6ad2717d91d46e39d8 SHA1 175bbacf74d94336e3fe06e390e04ad2bfff6fd4 SHA256 60d602637dc5f078b083a4ca5ab64364ba816bd72439844012ed11a30f88228c
 DIST ipython-0.9.1.tar.gz 2798383 RMD160 3d522f80290caa72e1c4fc60b2d56369c8c66eba SHA1 2d069416b31ed03eb1cad36f84ef2337362ac6a9 SHA256 5540bc1a01f11ca66c3d7c31a43af670fd0f0044b8e38d142614872956548006
-EBUILD ipython-0.10.ebuild 2382 RMD160 830f7816d9fd720f5dbec4d5ffeec2b15f36d670 SHA1 7c3999b0c7e8321d08d7c548f86500921cc1cafb SHA256 5313a732773b9d36c009cfbdc2bc7fe42fe9a9f1a454b391c214c8b40d32fc1a
-EBUILD ipython-0.9.1.ebuild 2373 RMD160 882039f132dc09604f3ab0b026d7ec600b0c9a4a SHA1 6443dc1c4812f4ae0f028dc8ade142911d816419 SHA256 52c993f463fab30e89ba18629b11c6cb40e85f5c4085aafecc12053ef99f877d
-MISC ChangeLog 10113 RMD160 27f6a9297ba21e462e1d957cca52c3b7dc0cdf19 SHA1 b47326eb9868799d25ce522edf68088145706776 SHA256 66d119df1a4db29c8e435d13e3c240949997d4accb02d348e606ce0cd3044d58
+EBUILD ipython-0.10.ebuild 2306 RMD160 2fd6d36102430510eb32d95f3fe74a9e43c34647 SHA1 33d756b8e1b8bfa0ed16464454b8c27c758d3ac9 SHA256 c9d66463e586adf5cae5f2ee5d793e2b0aaa362bb5826e2ea857c377eee1399c
+EBUILD ipython-0.9.1.ebuild 2307 RMD160 e8d9522726046f775cbf9940e5335f114fbd27b4 SHA1 58b9db9c7fa95ac17db6d6ba60106d0bdca084e6 SHA256 ac8a3be640aba42c3e87871423886785cb28285dbd2a4c43c7849538995ae5b5
+MISC ChangeLog 10276 RMD160 9a7c71a9995bc9a2580330928a79539a13c1a1ca SHA1 67fa3a3066c36749c4e7028cbfb98ba88897fa3d SHA256 75ee67c6b0d74020c23459d394d6ce1137619208a6325e59a6ca75006dc9ac95
 MISC metadata.xml 3270 RMD160 dd5bc6bf36e4cb9594cec539c782c6939299285f SHA1 8b4405d401095acb17021e9b39dbea3ad3102153 SHA256 610b95f90f8d0d0f20db39e8f1e5b71f1236fc6fa518df4bd32afa15806d00eb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqK2xkACgkQ1ycZbhPLE2DxxwCeOTQjbVGpfWD9lQ6zJ23v1H8p
+bSIAnRlIJkGK2dVTqhHztuLCkaTS5UOw
+=g4uA
+-----END PGP SIGNATURE-----
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