4 files changed, 12 insertions, 50 deletions
diff --git a/dev-python/configobj/ChangeLog b/dev-python/configobj/ChangeLog
index c5bd71758cce..c89d9ab1edbf 100644
--- a/dev-python/configobj/ChangeLog
+++ b/dev-python/configobj/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/configobj
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/ChangeLog,v 1.46 2014/04/03 06:11:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/ChangeLog,v 1.47 2014/04/07 04:05:57 idella4 Exp $
+
+  07 Apr 2014; Ian Delaney <idella4@gentoo.org> -configobj-4.7.2.ebuild,
+  configobj-5.0.1.ebuild, configobj-5.0.2.ebuild:
+  Add py3.4 support & missing rdep, fixes Bug 505964 by Dimas
 
   03 Apr 2014; Tim Harder <radhermit@gentoo.org> configobj-5.0.2.ebuild:
   Add python3_4 support.
diff --git a/dev-python/configobj/configobj-4.7.2.ebuild b/dev-python/configobj/configobj-4.7.2.ebuild
deleted file mode 100644
index dfdb30155eaf..000000000000
--- a/dev-python/configobj/configobj-4.7.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/configobj-4.7.2.ebuild,v 1.8 2011/03/04 20:55:40 xarthisius Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils
-
-DESCRIPTION="Simple config file reader and writer"
-HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html http://code.google.com/p/configobj/ http://pypi.python.org/pypi/configobj"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
-
-PYTHON_MODNAME="configobj.py validate.py"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.7.2-fix_tests.patch"
-	sed -e "s/ \(doctest\.testmod(.*\)/ sys.exit(\1[0] != 0)/" -i validate.py
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" validate.py -v
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		rm -f docs/BSD*
-		insinto /usr/share/doc/${PF}/html
-		doins -r docs/* || die "doins failed"
-	fi
-}
diff --git a/dev-python/configobj/configobj-5.0.1.ebuild b/dev-python/configobj/configobj-5.0.1.ebuild
index a05997fd0184..334d7f42d3a0 100644
--- a/dev-python/configobj/configobj-5.0.1.ebuild
+++ b/dev-python/configobj/configobj-5.0.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/configobj-5.0.1.ebuild,v 1.2 2014/03/31 20:54:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/configobj-5.0.1.ebuild,v 1.3 2014/04/07 04:05:57 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
 
 inherit distutils-r1
 
@@ -15,6 +15,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
+RDEPEND="~dev-python/six-1.5.2[${PYTHON_USEDEP}]"
+
 python_test() {
 	"${PYTHON}" validate.py -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/configobj/configobj-5.0.2.ebuild b/dev-python/configobj/configobj-5.0.2.ebuild
index 0abb72e1784a..75ee579c3910 100644
--- a/dev-python/configobj/configobj-5.0.2.ebuild
+++ b/dev-python/configobj/configobj-5.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/configobj-5.0.2.ebuild,v 1.3 2014/04/03 06:11:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/configobj/configobj-5.0.2.ebuild,v 1.4 2014/04/07 04:05:57 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -15,6 +15,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
+RDEPEND="~dev-python/six-1.5.2[${PYTHON_USEDEP}]"
+
 python_test() {
 	"${PYTHON}" validate.py -v || die "Tests fail with ${EPYTHON}"
 }