From 141af78047306cc611e80849400949915d8624c9 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Sat, 20 Mar 2010 14:59:54 +0000 Subject: [PATCH] Fixed building with new setuptools, bug #308199 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-python/envisagecore/ChangeLog | 8 ++++++-- dev-python/envisagecore/Manifest | 10 +++++----- dev-python/envisagecore/envisagecore-3.1.1.ebuild | 7 +++++-- dev-python/envisageplugins/Manifest | 10 +++++----- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dev-python/envisagecore/ChangeLog b/dev-python/envisagecore/ChangeLog index ee3c121b8aa3..ceff10517518 100644 --- a/dev-python/envisagecore/ChangeLog +++ b/dev-python/envisagecore/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/envisagecore -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/envisagecore/ChangeLog,v 1.3 2009/09/06 15:39:25 arfrever Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/envisagecore/ChangeLog,v 1.4 2010/03/20 14:59:54 bicatali Exp $ + + 20 Mar 2010; Sébastien Fabbro + envisagecore-3.1.1.ebuild: + Fixed building with new setuptools, bug #308199 *envisagecore-3.1.1 (06 Sep 2009) diff --git a/dev-python/envisagecore/Manifest b/dev-python/envisagecore/Manifest index 5b0cda9ab556..3b4159267529 100644 --- a/dev-python/envisagecore/Manifest +++ b/dev-python/envisagecore/Manifest @@ -2,13 +2,13 @@ Hash: SHA1 DIST EnvisageCore-3.1.1.tar.gz 255710 RMD160 bf9d5ba12025fe40fea280783f3bc4c0deb98b5d SHA1 4bfe0addd3a5a9cfdad9f3fd5cbac335238f458a SHA256 8e9d564efb044fda97fb055a3061d533086e1514678094a1cadc2b2a8374646a -EBUILD envisagecore-3.1.1.ebuild 1579 RMD160 37dea63ddf969825bf793ed8adbca125506a79aa SHA1 a8e13cea032422e3a806ee673432463ce0a0cc12 SHA256 d8e709ca140391c3a4f18fdf8eca487a493a9ba5459e5dca28b315a1f98b83b9 -MISC ChangeLog 718 RMD160 a01c0d9d0a9f59b54bef2fc847f467f06eee871b SHA1 10df7f3cbaca9a5bdb8085b06f444b7e1fe79954 SHA256 92413a892955fdd3aefdac67d1444dc613c21cac403e47f1aa9d081a091a24ea +EBUILD envisagecore-3.1.1.ebuild 1615 RMD160 f320e27dbb342ddf3209677f9c7e2306f3308cc6 SHA1 725e623e7f19d777cf410c1af9485e7c343f2fa7 SHA256 84e26ccb06d600c220cd89582d91d0f9bb99823185cb02dab40a2ba5f2437119 +MISC ChangeLog 853 RMD160 2dd8686ea74da5e79672a8792eac3e2bfcde8645 SHA1 778cf555b1b3a5111209ec4a6972e67f28c3f4d8 SHA256 02d02397c14d63b4350baa792c7418c2340357c91ce933122a25944e7d899b22 MISC metadata.xml 785 RMD160 e85b340ace50ac50febf531cffda6275bad54614 SHA1 e0908a622e51e091fc346025744ec62a13bcdc29 SHA256 bb815b297b6481597f1700c05f5f98bd830ef6075be10e74cd6d2fcd56086121 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuf3TEACgkQ1ycZbhPLE2DgYACeObwthIfW2E3P5v2dSTm7MBwA -vPoAoKhg2bzYNLA0lJ1E3LA/pxDDRek8 -=5890 +iEYEARECAAYFAkuk4vMACgkQ1ycZbhPLE2CnnQCgrvo5xvK6Mr2OGVFD1XSN83Ap +6kcAn19kw9haR3wGsXaO/5C/kMYSXNZL +=18uG -----END PGP SIGNATURE----- diff --git a/dev-python/envisagecore/envisagecore-3.1.1.ebuild b/dev-python/envisagecore/envisagecore-3.1.1.ebuild index c26ff8b35e7f..222458ccb716 100644 --- a/dev-python/envisagecore/envisagecore-3.1.1.ebuild +++ b/dev-python/envisagecore/envisagecore-3.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/envisagecore/envisagecore-3.1.1.ebuild,v 1.2 2010/02/06 14:45:53 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/envisagecore/envisagecore-3.1.1.ebuild,v 1.3 2010/03/20 14:59:54 bicatali Exp $ EAPI="2" PYTHON_DEPEND="2" @@ -34,7 +34,10 @@ S="${WORKDIR}/${MY_P}" PYTHON_MODNAME="enthought" src_prepare() { - sed -e "s/self.run_command('build_docs')/pass/" -i setup.py || die + sed -i \ + -e "s/self.run_command('build_docs')/pass/" \ + -e "s/setupdocs>=1.0//" \ + setup.py || die } src_compile() { diff --git a/dev-python/envisageplugins/Manifest b/dev-python/envisageplugins/Manifest index 5746a1e5f9d8..1c7b60d6d02d 100644 --- a/dev-python/envisageplugins/Manifest +++ b/dev-python/envisageplugins/Manifest @@ -2,13 +2,13 @@ Hash: SHA1 DIST EnvisagePlugins-3.1.1.tar.gz 334457 RMD160 3a4c8fee113f7c9f5a7fedbdde8ce48fe93dbf42 SHA1 c4cd4d213ddaab1ee5af419eb32ef0725101d86d SHA256 14e106fd4c48fffd69b1bba9822dbd0fcd756c461e387dce99e9acafbf55f855 -EBUILD envisageplugins-3.1.1.ebuild 1335 RMD160 2fb06d5d2b5503a19c149046a0ea26cdd471ca52 SHA1 c22b5ff4995d535df18466d44438b5947321e870 SHA256 bff19f18afcaae59a946fe64221f44255e763d2195eb53ae129d8b1dfc9f0da4 -MISC ChangeLog 745 RMD160 40397d2d53b721c9148e41021055d0b892633ba7 SHA1 8384706ddb6551aa2511c9d42079303d0b8cc773 SHA256 66ecd579474ba54499e74e84d3de52cfe817b6ca2f6bbc9a204ef29cb6ed83f2 +EBUILD envisageplugins-3.1.1.ebuild 1371 RMD160 8a643adaa9229697289f6c192dfaa38b2da95fa1 SHA1 213abdc5a3ef8d33022186714b20635feb1bd7e6 SHA256 3bb95d292cbdf3037331012a2792250b80aeabc06a1024a4e2fcc10fc89da1e3 +MISC ChangeLog 883 RMD160 7376d3b6270854ba5e492ae78ce1c6c035133344 SHA1 bf3a6b565d8000fad0da6e83f32f04824c7112b1 SHA256 f7d39f9ec848254a6b56f6da132c3d2b3252003a25a6684dc3c066853a3f906c MISC metadata.xml 1249 RMD160 290548e3f4c2c1273fa86ea4d3896e5c401df991 SHA1 012d0426e04afe57a7db58142fbfcbc8034682e3 SHA256 55302527e34848c854feb0b1665ab540312ff8a095b763b838564b0c566eec3d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuf3VsACgkQ1ycZbhPLE2AG+wCeOZl4VZa5nUlb/bT0SpEW8+ie -kNoAn3plHrjbnC7xvx+HYx46BeCl/0J7 -=gJES +iEYEARECAAYFAkuk44UACgkQ1ycZbhPLE2A9uwCbBzjVCWyroSwwYAWPwTP5pySg +3QsAn3J+fm+8Mc5pmhOyHCgCVmyJBIKM +=wRkW -----END PGP SIGNATURE----- -- 2.26.2