Bump

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

10 files changed, 244 insertions, 10 deletions

diff --git a/dev-python/simplejson/ChangeLog b/dev-python/simplejson/ChangeLog
index 635019db2a7e..337e515f8bcd 100644
--- a/dev-python/simplejson/ChangeLog
+++ b/dev-python/simplejson/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/simplejson
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/ChangeLog,v 1.67 2012/05/29 19:58:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/ChangeLog,v 1.68 2012/06/28 07:36:02 patrick Exp $
+
+*simplejson-2.6.0 (28 Jun 2012)
+
+  28 Jun 2012; Patrick Lauer <patrick@gentoo.org> +simplejson-2.6.0.ebuild:
+  Bump
 
   29 May 2012; Brent Baude <ranger@gentoo.org> simplejson-2.5.0.ebuild:
   Marking simplejson-2.5.0 ppc for bug 415881
@@ -274,4 +279,3 @@
   03 Feb 2007; Tiziano Müller <dev-zero@gentoo.org> -simplejson-1.4.ebuild,
   +simplejson-1.5.ebuild, +metadata.xml:
   Initial ebuild for bug #129346 (thanks to Brad Walker)
-
diff --git a/dev-python/simplejson/simplejson-2.6.0.ebuild b/dev-python/simplejson/simplejson-2.6.0.ebuild
new file mode 100644
index 000000000000..94849c268d00
--- /dev/null
+++ b/dev-python/simplejson/simplejson-2.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-2.6.0.ebuild,v 1.1 2012/06/28 07:36:02 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="http://undefined.org/python/#simplejson http://pypi.python.org/pypi/simplejson"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+src_test() {
+	testing() {
+		if [[ "$(python_get_implementation)" != "Jython" ]]; then
+			ln -fs ../$(ls -d build-${PYTHON_ABI}/lib*)/simplejson/_speedups.so simplejson/_speedups.so || return 1
+		fi
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" simplejson/tests/__init__.py
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	delete_tests() {
+		rm -fr "${ED}$(python_get_sitedir)/simplejson/tests"
+	}
+	python_execute_function -q delete_tests
+}
diff --git a/dev-python/sqlalchemy/ChangeLog b/dev-python/sqlalchemy/ChangeLog
index 26296b2b3f91..ee613aadfde5 100644
--- a/dev-python/sqlalchemy/ChangeLog
+++ b/dev-python/sqlalchemy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/sqlalchemy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.80 2012/05/21 09:34:42 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.81 2012/06/28 07:40:03 patrick Exp $
+
+*sqlalchemy-0.7.8 (28 Jun 2012)
+
+  28 Jun 2012; Patrick Lauer <patrick@gentoo.org> +sqlalchemy-0.7.8.ebuild:
+  Bump
 
   21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> sqlalchemy-0.7.6.ebuild:
   x86 stable wrt bug #415849
@@ -375,4 +380,3 @@
   +sqlalchemy-0.2.7.ebuild:
   initial ebuild. based on ebuild from gentoo-sunrise submitted by Tiziano
   Müller (dev-zero) (#132037)
-
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.7.8.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.7.8.ebuild
new file mode 100644
index 000000000000..9f21533adad1
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-0.7.8.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.7.8.ebuild,v 1.1 2012/06/28 07:40:03 patrick Exp $
+
+EAPI="4"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_TESTS_RESTRICTED_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit distutils
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ http://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples firebird mssql mysql postgres +sqlite test"
+
+RDEPEND="dev-python/setuptools
+	firebird? ( dev-python/kinterbasdb )
+	mssql? ( dev-python/pymssql )
+	mysql? ( dev-python/mysql-python )
+	postgres? ( >=dev-python/psycopg-2 )
+	sqlite? (
+		>=dev-db/sqlite-3.3.13
+		|| ( >=dev-lang/python-2.5[sqlite] dev-python/pysqlite )
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-db/sqlite-3.3.13
+		>=dev-python/nose-0.10.4
+		|| ( >=dev-lang/python-2.5[sqlite] dev-python/pysqlite )
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+DISTUTILS_GLOBAL_OPTIONS=("2.*-cpython --with-cextensions")
+PYTHON_MODNAME="sqlalchemy"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -fr test/aaa_profiling
+}
+
+src_test() {
+	testing() {
+		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" sqla_nose.py
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		pushd doc > /dev/null
+		rm -fr build
+		dohtml -r [a-z]* _images _static
+		popd > /dev/null
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/sqlobject/ChangeLog b/dev-python/sqlobject/ChangeLog
index 7b81c96192ac..aa056ff2b532 100644
--- a/dev-python/sqlobject/ChangeLog
+++ b/dev-python/sqlobject/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/sqlobject
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.47 2012/04/19 10:03:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.48 2012/06/28 07:38:40 patrick Exp $
+
+*sqlobject-1.3.1 (28 Jun 2012)
+
+  28 Jun 2012; Patrick Lauer <patrick@gentoo.org> +sqlobject-1.3.1.ebuild:
+  Bump
 
 *sqlobject-1.3.0 (19 Apr 2012)
 
@@ -251,4 +256,3 @@
   07 Oct 2004; Rob Cakebread <pythonhead@gentoo.org> +sqlobject-0.6.ebuild:
   Initial commit. Thanks Marlon Jabbur <msjabbur@uol.com.br> for the ebuild
   bug #42470
-
diff --git a/dev-python/sqlobject/sqlobject-1.3.1.ebuild b/dev-python/sqlobject/sqlobject-1.3.1.ebuild
new file mode 100644
index 000000000000..4192435e24a2
--- /dev/null
+++ b/dev-python/sqlobject/sqlobject-1.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-1.3.1.ebuild,v 1.1 2012/06/28 07:38:40 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils
+
+MY_PN="SQLObject"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Object-Relational Manager, aka database wrapper"
+HOMEPAGE="http://sqlobject.org/ http://pypi.python.org/pypi/SQLObject"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc firebird mysql postgres sqlite"
+
+RDEPEND=">=dev-python/formencode-0.2.2
+		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
+		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
+		postgres? ( dev-python/psycopg )
+		sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite ) )"
+DEPEND="${RDEPEND}
+		dev-python/setuptools"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		pushd docs
+		dodoc *.txt || die "dodoc failed"
+		dohtml -r presentation-2004-11 || die "dohtml failed"
+		insinto /usr/share/doc/${PF}
+		doins -r europython || die "doins failed"
+		popd
+	fi
+}
diff --git a/dev-python/tox/ChangeLog b/dev-python/tox/ChangeLog
index 863db47e7fae..788764996a8a 100644
--- a/dev-python/tox/ChangeLog
+++ b/dev-python/tox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/tox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tox/ChangeLog,v 1.2 2012/02/15 11:32:00 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tox/ChangeLog,v 1.3 2012/06/28 07:42:28 patrick Exp $
+
+*tox-1.4 (28 Jun 2012)
+
+  28 Jun 2012; Patrick Lauer <patrick@gentoo.org> +tox-1.4.ebuild:
+  Bump
 
   15 Feb 2012; Dirkjan Ochtman <djc@gentoo.org> tox-1.3.ebuild:
   Depend on pytest-2.2.3 and pip (bug 403763).
@@ -9,4 +14,3 @@
 
   14 Feb 2012; Dirkjan Ochtman <djc@gentoo.org> +tox-1.3.ebuild, +metadata.xml:
   Initial version of tox. Ebuild contributed by nicolas.pinto@gmail.com.
-
diff --git a/dev-python/tox/tox-1.4.ebuild b/dev-python/tox/tox-1.4.ebuild
new file mode 100644
index 000000000000..5fddc5e7f18b
--- /dev/null
+++ b/dev-python/tox/tox-1.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tox/tox-1.4.ebuild,v 1.1 2012/06/28 07:42:28 patrick Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="*"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="http://tox.testrun.org http://pypi.python.org/pypi/tox"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools
+		dev-python/virtualenv
+		dev-python/pip
+		>=dev-python/pytest-2.2.3"
+RDEPEND="${DEPEND}"
+
+#src_test() {
+#	testing() {
+#		py.test -x
+#	}
+#	python_execute_function testing
+#}
diff --git a/dev-python/w3lib/ChangeLog b/dev-python/w3lib/ChangeLog
index bac3464b38e2..40c1f7a06b39 100644
--- a/dev-python/w3lib/ChangeLog
+++ b/dev-python/w3lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/w3lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/w3lib/ChangeLog,v 1.2 2012/04/20 03:17:29 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/w3lib/ChangeLog,v 1.3 2012/06/28 07:46:40 patrick Exp $
+
+*w3lib-1.2 (28 Jun 2012)
+
+  28 Jun 2012; Patrick Lauer <patrick@gentoo.org> +w3lib-1.2.ebuild:
+  Bump
 
 *w3lib-1.1 (20 Apr 2012)
 
@@ -14,4 +19,3 @@
   +w3lib-1.0.ebuild:
   Add dev-python/w3lib-1.0, bug #398641. Thanks to Guillaume Bandet
   <guillaume.bandet@m4x.org>
-
diff --git a/dev-python/w3lib/w3lib-1.2.ebuild b/dev-python/w3lib/w3lib-1.2.ebuild
new file mode 100644
index 000000000000..a99ee1a7c4e0
--- /dev/null
+++ b/dev-python/w3lib/w3lib-1.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/w3lib/w3lib-1.2.ebuild,v 1.1 2012/06/28 07:46:40 patrick Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS=1
+PYTHON_DEPEND="2"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="Python library of web-related functions"
+HOMEPAGE="http://github.com/scrapy/w3lib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""