Version bump. Set SUPPORT_PYTHON_ABIS. Fix dependencies (bug #254664).

(Portage version: HEAD/cvs/Linux x86_64)

4 files changed, 58 insertions, 137 deletions

diff --git a/dev-python/pylons/ChangeLog b/dev-python/pylons/ChangeLog
index 4e0002f2f7de..3610c70aa1be 100644
--- a/dev-python/pylons/ChangeLog
+++ b/dev-python/pylons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pylons
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylons/ChangeLog,v 1.7 2010/03/17 03:33:26 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylons/ChangeLog,v 1.8 2010/06/07 23:46:40 arfrever Exp $
+
+*pylons-1.0 (07 Jun 2010)
+
+  07 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -pylons-0.9.4.1-r1.ebuild, -pylons-0.9.6.2.ebuild, +pylons-1.0.ebuild:
+  Version bump. Set SUPPORT_PYTHON_ABIS. Fix dependencies (bug #254664).
 
   17 Mar 2010; Jesus Rivero <neurogeek@gentoo.org> pylons-0.9.7.ebuild:
   Removed doc IUSE as this version doesn't have docs. Closes bug #271462
diff --git a/dev-python/pylons/pylons-0.9.4.1-r1.ebuild b/dev-python/pylons/pylons-0.9.4.1-r1.ebuild
deleted file mode 100644
index 72eb67c81ef7..000000000000
--- a/dev-python/pylons/pylons-0.9.4.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylons/pylons-0.9.4.1-r1.ebuild,v 1.2 2007/07/04 20:19:28 lucass Exp $
-
-NEED_PYTHON=2.3
-
-inherit distutils
-
-KEYWORDS="~amd64 ~x86"
-
-MY_PN=Pylons
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A lightweight web framework emphasizing flexibility and rapid development."
-HOMEPAGE="http://pylonshq.com"
-SRC_URI="http://cheeseshop.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND=">=dev-python/routes-1.6.2
-	>=dev-python/webhelpers-0.2.2
-	>=dev-python/beaker-0.6.2
-	>=dev-python/paste-1.1.1
-	>=dev-python/pastedeploy-1.0
-	>=dev-python/pastescript-1.0
-	>=dev-python/myghty-1.1
-	>=dev-python/formencode-0.6
-	>=dev-python/simplejson-1.4
-	>=dev-python/nose-0.9.1"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc? ( dev-python/pudge dev-python/buildutils )"
-
-# The tests fail, needs further investigation
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	distutils_src_unpack
-
-	sed -i \
-		-e 's|dest =.*|dest = docs/html|' \
-		setup.cfg || die "sed failed"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc ; then
-		einfo "Generating docs as requested..."
-		"${python}" setup.py pudge || die "generating docs failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	use doc && dohtml -r docs/html/*
-}
-
-pkg_postinst() {
-	elog "pylons can make use of many other packages like:"
-	elog " cheetah, genshi, kid or pudge"
-}
-
-src_test() {
-	PYTHONPATH=. "${python}" setup.py nosetests || die "tests failed"
-}
diff --git a/dev-python/pylons/pylons-0.9.6.2.ebuild b/dev-python/pylons/pylons-0.9.6.2.ebuild
deleted file mode 100644
index 239f76562b06..000000000000
--- a/dev-python/pylons/pylons-0.9.6.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylons/pylons-0.9.6.2.ebuild,v 1.1 2009/01/04 19:00:13 patrick Exp $
-
-NEED_PYTHON=2.3
-
-inherit distutils
-
-KEYWORDS="~amd64 ~x86"
-
-MY_PN=Pylons
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A lightweight web framework emphasizing flexibility and rapid development."
-HOMEPAGE="http://pylonshq.com"
-SRC_URI="http://cheeseshop.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND=">=dev-python/routes-1.6.2
-	>=dev-python/webhelpers-0.2.2
-	>=dev-python/beaker-0.6.2
-	>=dev-python/paste-1.1.1
-	>=dev-python/pastedeploy-1.0
-	>=dev-python/pastescript-1.0
-	>=dev-python/myghty-1.1
-	>=dev-python/formencode-0.6
-	>=dev-python/simplejson-1.4
-	>=dev-python/nose-0.9.1"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc? ( dev-python/pudge dev-python/buildutils )"
-
-# The tests fail, needs further investigation
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	distutils_src_unpack
-
-	sed -i \
-		-e 's|dest =.*|dest = docs/html|' \
-		setup.cfg || die "sed failed"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc ; then
-		einfo "Generating docs as requested..."
-		"${python}" setup.py pudge || die "generating docs failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	use doc && dohtml -r docs/html/*
-}
-
-pkg_postinst() {
-	elog "pylons can make use of many other packages like:"
-	elog " cheetah, genshi, kid or pudge"
-}
-
-src_test() {
-	PYTHONPATH=. "${python}" setup.py nosetests || die "tests failed"
-}
diff --git a/dev-python/pylons/pylons-1.0.ebuild b/dev-python/pylons/pylons-1.0.ebuild
new file mode 100644
index 000000000000..5493a7b9d96d
--- /dev/null
+++ b/dev-python/pylons/pylons-1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylons/pylons-1.0.ebuild,v 1.1 2010/06/07 23:46:40 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils
+
+MY_PN="Pylons"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pylons Web Framework"
+HOMEPAGE="http://pylonshq.com/ http://pypi.python.org/pypi/Pylons"
+SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="genshi jinja test"
+
+RDEPEND=">=dev-python/beaker-1.3
+	>=dev-python/decorator-2.3.2
+	>=dev-python/formencode-1.2.1
+	>=dev-python/mako-0.2.4
+	>=dev-python/nose-0.10.4
+	>=dev-python/paste-1.7.2
+	>=dev-python/pastedeploy-1.3.3
+	>=dev-python/pastescript-1.7.3
+	>=dev-python/routes-1.12
+	>=dev-python/simplejson-2.0.8
+	>=dev-python/tempita-0.2
+	>=dev-python/weberror-0.10.1
+	>=dev-python/webhelpers-0.6.4
+	>=dev-python/webob-0.9.6.1
+	>=dev-python/webtest-1.1
+	genshi? ( >=dev-python/genshi-0.4.4 )
+	jinja? ( >=dev-python/jinja-2 )"
+# Dependency on >=dev-python/coverage-2.85 and dev-python/genshi is not with Jython.
+DEPEND="${RDEPEND}
+	dev-python/setuptools
+	test? (
+		>=dev-python/coverage-2.85
+		dev-python/genshi
+		>=dev-python/jinja-2.2.1
+	)"
+
+S="${WORKDIR}/${MY_P}"