3 files changed, 6 insertions, 63 deletions
diff --git a/dev-python/ujson/ChangeLog b/dev-python/ujson/ChangeLog
index 1da9b96e5103..bb96bb6e73ae 100644
--- a/dev-python/ujson/ChangeLog
+++ b/dev-python/ujson/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/ujson
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ujson/ChangeLog,v 1.6 2014/05/12 09:02:03 idella4 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ujson/ChangeLog,v 1.7 2015/02/02 00:01:26 mrueg Exp $
+
+  02 Feb 2015; Manuel Rüger <mrueg@gentoo.org> -ujson-1.30-r1.ebuild,
+  -ujson-1.30.ebuild:
+  Remove old.
 
   12 May 2014; Ian Delaney <idella4@gentoo.org> ujson-1.33.ebuild:
   drop py2.6 add py3.4 support
diff --git a/dev-python/ujson/ujson-1.30-r1.ebuild b/dev-python/ujson/ujson-1.30-r1.ebuild
deleted file mode 100644
index 8f8c2199e561..000000000000
--- a/dev-python/ujson/ujson-1.30-r1.ebuild
+++ /dev/null
@@ -1,39 +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/ujson/ujson-1.30-r1.ebuild,v 1.1 2013/04/08 14:33:13 idella4 Exp $
-
-EAPI="5"
-
-# One test; FAIL: test_encodeToUTF8 (__main__.UltraJSONTests) under py2.5. 
-# Fix and repair and re-insert if it's REALLY needed 
-PYTHON_COMPAT=( python{2_6,2_7,3_2} )
-
-inherit distutils-r1
-
-DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="http://pypi.python.org/pypi/ujson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	# See setup.py; line 72. Again "${S}" is used for reading tests
-	# Since py3_2 is first in the queue it needs its own copy 
-	# or else all py2s to follow will be reading read py3 tests
-	if [[ "${EPYTHON}" == 'python3.2' ]]; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -a "${S}"/tests/ .  || die
-		2to3 -w tests/tests.py
-		"${PYTHON}" tests/tests.py || die
-		rm -rf tests/ || die
-	else
-		"${PYTHON}" tests/tests.py || die
-	fi
-}
diff --git a/dev-python/ujson/ujson-1.30.ebuild b/dev-python/ujson/ujson-1.30.ebuild
deleted file mode 100644
index 318439e5ccde..000000000000
--- a/dev-python/ujson/ujson-1.30.ebuild
+++ /dev/null
@@ -1,22 +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/ujson/ujson-1.30.ebuild,v 1.1 2013/02/24 09:56:11 swegener Exp $
-
-EAPI="4"
-
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="*:2.4"
-
-inherit distutils
-
-DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="http://pypi.python.org/pypi/ujson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"