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

Package-Manager: portage-HEAD/cvs/Linux x86_64

5 files changed, 61 insertions, 142 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/Manifest b/dev-python/pylons/Manifest
index eda7e6e4d6bd..9489ebf7810c 100644
--- a/dev-python/pylons/Manifest
+++ b/dev-python/pylons/Manifest
@@ -1,8 +1,6 @@
-DIST Pylons-0.9.4.1.tar.gz 162010 RMD160 602f34c425a1c68c4197d9c0a96d2e1c7aa956d2 SHA1 91cb56761c08396c577fe09aed9edd9e153fff28 SHA256 77e5a62e3c4772c886abd1d052cbcdeec4ec6627356ad7d00525962f362cac51
-DIST Pylons-0.9.6.2.tar.gz 108994 RMD160 4fa37c53a26fa8f30482c2d80fb4fd68abfde9f0 SHA1 d3ed6ea2618925c99180381ccd08b390acb46142 SHA256 8b9f133ba46e28683724c1f78caacf072faa5ce2dcfdbb48b91deec641cc5eca
 DIST Pylons-0.9.7.tar.gz 204609 RMD160 7c469f0ee0fabd81b71b9aa8efb3a8368ef495c4 SHA1 1a63fc6133aa478f5c81f5c373cb08d1439a8fef SHA256 36a62a184819ef01e65c865364f1b262299e6215ef55d8add6a1a258a9dd6933
-EBUILD pylons-0.9.4.1-r1.ebuild 1597 RMD160 e7f6b9c64d411161ccc90c0c3ff060b0233d0de2 SHA1 9855b25260e3d1a3254711c3d68489c9b48261db SHA256 e6be7c6f275cc4467c15106dc388eec4806d9a50b28485c4d39a1a5150a117bf
-EBUILD pylons-0.9.6.2.ebuild 1595 RMD160 9dab61d4c409ed1e8f86693ae3255e998d6d81eb SHA1 f8f4df22879ade30c5c6851092c9ae8362c150f4 SHA256 4426ee4873a3707e8222a3c699b9a4ef6bf70154bad6f0e9bf4fc2a9215c2e50
+DIST Pylons-1.0.tar.gz 237259 RMD160 7d33c3656096780839ccb723ea2fb9107a82fd63 SHA1 a624fc3c4ef3ab382a23f460b030e331c4320ca0 SHA256 b083c5824bb41cc54d853081078590a9f9ef9760b39cc16776b461d0c3dd9030
 EBUILD pylons-0.9.7.ebuild 1660 RMD160 231cf4f6e8aadb3119271f7fd80a32c585e02719 SHA1 1e3340cfa16b87ecce847727be56efcdf8c4b07a SHA256 d70ba0e30f72ed029467abee4f55768e746746cf60947ae70ff7e58e95925174
-MISC ChangeLog 1325 RMD160 1b80ce498c3cbe6d4f4d334f26397950c4332f7d SHA1 efbd063b2f19e00f04ee1dd23e5ae5247591fa55 SHA256 9d655da1e6d030a2f47ffcbd0eb9fb11de4adbd3c9983c89baff7e1cf2c61388
+EBUILD pylons-1.0.ebuild 1394 RMD160 242e114b4f8b3f236ff4d2aef8077b4db12a6af7 SHA1 cc7218dbc0a45ce6d6a59d6c6c1b137de3188060 SHA256 7f9812b83c9cb4de406c09f791c3a39a931c5754d7b0bc3b6584cf5db2eaa7d9
+MISC ChangeLog 1571 RMD160 21d8e5bad57cb249acd4bfc106dec8c5d2c1d93f SHA1 fe07b65419ba7518a950f38f0df5f15c906becd8 SHA256 708d0a599959ebc6f0914c4d4b2c3524c2f0bcebdef4025a6eb2bf090f96758a
 MISC metadata.xml 498 RMD160 a4f41e8697a7df5fb239f9680cf1c5c4d43dd14d SHA1 0ef93dd0e39ec0339c0f176cdf3290320e86542a SHA256 7111e6f861cc9e52370f960fc6b1d8871b269d8499562e2e6798e893ba6ecdf2
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}"