summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2011-12-14 23:05:44 +0000
committerMike Gilbert <floppym@gentoo.org>2011-12-14 23:05:44 +0000
commit85f9a5c1ebc41ff91deb0ad69ae07619f7f4b7bf (patch)
tree19dad3b898dd6b9696b45ec4d0cdcc45e99f03ac /dev-lang
parentMerge category dev-php5 into dev-php (bug #324665) (diff)
downloadgentoo-2-85f9a5c1ebc41ff91deb0ad69ae07619f7f4b7bf.tar.gz
gentoo-2-85f9a5c1ebc41ff91deb0ad69ae07619f7f4b7bf.tar.bz2
gentoo-2-85f9a5c1ebc41ff91deb0ad69ae07619f7f4b7bf.zip
Apply linux3 platform workaround. Fixes bug 394143.
(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/python/ChangeLog5
-rw-r--r--dev-lang/python/python-2.5.4-r4.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 808c78e64072..f25177b8e0cc 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/python
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.562 2011/12/13 18:10:35 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.563 2011/12/14 23:05:44 floppym Exp $
+
+ 14 Dec 2011; Mike Gilbert <floppym@gentoo.org> python-2.5.4-r4.ebuild:
+ Apply linux3 platform workaround. Fixes bug 394143.
13 Dec 2011; Dirkjan Ochtman <djc@gentoo.org> files/linux2.patch:
Prune back linux2.patch to prevent race conditions (bug 394547).
diff --git a/dev-lang/python/python-2.5.4-r4.ebuild b/dev-lang/python/python-2.5.4-r4.ebuild
index 77d8226026e4..5dbd4aee97c6 100644
--- a/dev-lang/python/python-2.5.4-r4.ebuild
+++ b/dev-lang/python/python-2.5.4-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.30 2011/10/27 13:56:55 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r4.ebuild,v 1.31 2011/12/14 23:05:44 floppym Exp $
EAPI="1"
@@ -102,6 +102,9 @@ src_unpack() {
rm Lib/distutils/command/wininst-*.exe
fi
+ # Linux-3 compat. Bug #374579 (upstream issue12571)
+ cp -r "${S}/Lib/plat-linux2" "${S}/Lib/plat-linux3" || die
+
eautoreconf
}