From e71c4f308401a08c15d12d126122a9d50ea54509 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sat, 17 Jul 2010 22:56:34 +0000 Subject: [PATCH] Fix parallel installation (bug #328009). Package-Manager: portage-HEAD/cvs/Linux x86_64 --- dev-lang/python/ChangeLog | 6 +++++- dev-lang/python/Manifest | 4 ++-- dev-lang/python/python-3.1.2-r4.ebuild | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index c629aeb668e5..b75a90818000 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/python # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.479 2010/07/15 21:20:57 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.480 2010/07/17 22:56:34 arfrever Exp $ + + 17 Jul 2010; Arfrever Frehtes Taifersar Arahesis + python-3.1.2-r4.ebuild: + Fix parallel installation (bug #328009). 15 Jul 2010; Arfrever Frehtes Taifersar Arahesis python-3.1.2-r4.ebuild: diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index ae3d521af987..991177a1ef8c 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -26,6 +26,6 @@ EBUILD python-2.6.5-r2.ebuild 9457 RMD160 fb08e8c4752c4315bf13c5b48e72c3b07b9ea7 EBUILD python-2.6.5-r3.ebuild 9452 RMD160 992d239730bbb901eb186b996f2cdeb0b7bc2b3d SHA1 aeb39e95a7b8ac219ce1d99eddeef3e7ec556564 SHA256 6564b86e7de3374a976f127343ee62c9cd4abbd2bcc7d0de32685520c6d48404 EBUILD python-2.7.ebuild 9743 RMD160 43381e34f2e2494b348c4e26365e8579642deac8 SHA1 5061119a80c0992bd83805210029c5dad88cdfbb SHA256 92bc8e51588d143647f42b52cf867efdcc57a044c1b06f285ee6b7fe3f414af3 EBUILD python-3.1.2-r3.ebuild 9256 RMD160 98cc9afd66714d449f272fac82fcaff9d74e499f SHA1 382ee98785de1f57cff37ef63efb9477e7c96413 SHA256 e39e3dde3e40b6fca08cf681a32fdb126be1ae8f6f7ff4ac75c207d7a5e893ba -EBUILD python-3.1.2-r4.ebuild 9410 RMD160 a9511b42b5886c328535510c3b4f1a927dc42f81 SHA1 a4b1fff88bdcc28e3dc053cfd9d5093d8a39a285 SHA256 a496169774d4db2afbcfdc527996d77de6075833c343af9ddc1719f69ed366d0 -MISC ChangeLog 85497 RMD160 e70f9abb907ed93f1aaf34239b49aef972574c3f SHA1 50c927393b3830e79460acf8766fba6d1154e52f SHA256 d12dd83a85a4704122ab299bc83733270a3beab9ae4fda50dfccf7b35e4b3a8b +EBUILD python-3.1.2-r4.ebuild 9536 RMD160 dfc70f977eebdc524743cc8557528ffb32955a78 SHA1 7bcdfef9fcf3383c75d357b94f2ea9957ad05665 SHA256 382cd63966012d18beec23b3a0a1de27b095ae0a3bb1869bb3f6964b3ab6b9cb +MISC ChangeLog 85640 RMD160 873848b2560317fa97e21e25575332993d87184b SHA1 3e66fe7de7f595e6ab7e49ed2072b152991f7811 SHA256 b2da87c0c30af6b4af045b0b3240aebb82bba34ffc3fe4f8f50625cb22cf7b18 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 diff --git a/dev-lang/python/python-3.1.2-r4.ebuild b/dev-lang/python/python-3.1.2-r4.ebuild index f78448ed1cbc..192922b9abad 100644 --- a/dev-lang/python/python-3.1.2-r4.ebuild +++ b/dev-lang/python/python-3.1.2-r4.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-lang/python/python-3.1.2-r4.ebuild,v 1.2 2010/07/15 21:20:57 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r4.ebuild,v 1.3 2010/07/17 22:56:34 arfrever Exp $ EAPI="3" @@ -92,6 +92,9 @@ src_prepare() { # that stdin is a tty for bug #248081. sed -e "s:'osf1V5':'osf1V5' and sys.stdin.isatty():" -i Lib/test/test_file.py || die "sed failed" + # Fix parallel installation (bug #328009). + sed -e "s/^sharedinstall:/& sharedmods/" -i Makefile.pre.in || die "sed failed" + eautoreconf } -- 2.26.2