3 files changed, 8 insertions, 29 deletions
diff --git a/dev-python/pympler/ChangeLog b/dev-python/pympler/ChangeLog
index aec139037932..d2f38aa347d7 100644
--- a/dev-python/pympler/ChangeLog
+++ b/dev-python/pympler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pympler
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pympler/ChangeLog,v 1.17 2013/09/23 17:42:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pympler/ChangeLog,v 1.18 2013/11/10 09:43:59 jlec Exp $
+
+  10 Nov 2013; Justin Lecher <jlec@gentoo.org> -pympler-0.2.0.ebuild,
+  pympler-0.3.1.ebuild:
+  Always build serially, #490792
 
   23 Sep 2013; Agostino Sarubbo <ago@gentoo.org> pympler-0.3.1.ebuild:
   Stable for ppc64, wrt bug #481896
diff --git a/dev-python/pympler/pympler-0.2.0.ebuild b/dev-python/pympler/pympler-0.2.0.ebuild
deleted file mode 100644
index 7040c5e81241..000000000000
--- a/dev-python/pympler/pympler-0.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pympler/pympler-0.2.0.ebuild,v 1.8 2013/02/02 22:29:56 ago Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="memory profiling for Python applications"
-HOMEPAGE="http://code.google.com/p/pympler/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="Apache-2.0"
-IUSE=""
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" setup.py test
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" run.py --test --clean
-	}
-	python_execute_function testing
-}
diff --git a/dev-python/pympler/pympler-0.3.1.ebuild b/dev-python/pympler/pympler-0.3.1.ebuild
index 0c09f1c0206e..50b20c7ced37 100644
--- a/dev-python/pympler/pympler-0.3.1.ebuild
+++ b/dev-python/pympler/pympler-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pympler/pympler-0.3.1.ebuild,v 1.9 2013/09/23 17:42:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pympler/pympler-0.3.1.ebuild,v 1.10 2013/11/10 09:43:59 jlec Exp $
 
 EAPI=5
 
@@ -25,8 +25,9 @@ DEPEND="test? ( ${RDEPEND} )"
 
 S="${WORKDIR}"/${MY_P}
 
+DISTUTILS_NO_PARALLEL_BUILD=true
+
 python_prepare_all() {
-	use test && DISTUTILS_NO_PARALLEL_BUILD=true
 	rm pympler/util/bottle.py || die
 	sed \
 		-e '/import bottle/s:^.*$:import bottle:g' \