[gentoo-commits] dev/prometheanfire:master commit in: www-apps/pelican/files/, dev-python/feedgenerator/, www-apps/pelican/

[gentoo-commits] dev/prometheanfire:master commit in: www-apps/pelican/files/, dev-python/feedgenerator/, www-apps/pelican/

[Matt Thode]

commit:     1ea0b53a9c54a4b919a070da9ee7002c8c0f2361
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Wed Jul 18 17:28:49 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Jul 18 17:28:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=1ea0b53a

using non-webhelper feedgenerator

---
 dev-python/feedgenerator/Manifest                  |    2 +
 .../feedgenerator/feedgenerator-1.2.1.ebuild       |   32 ++++++++++++++++++++
 www-apps/pelican/Manifest                          |    2 +-
 www-apps/pelican/files/webhelpers-2.8.1.patch      |   13 --------
 www-apps/pelican/pelican-2.8.1.ebuild              |   20 +++++-------
 5 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
new file mode 100644
index 0000000..1b5d278
--- /dev/null
+++ b/dev-python/feedgenerator/Manifest
@@ -0,0 +1,2 @@
+DIST feedgenerator-1.2.1.tar.gz 5555 RMD160 2c903b94084f563efa19765ba5ed17f64142b3af SHA1 eea4932a955ee8cac626e1e2b986bd1984c72147 SHA256 e099309847086ac6092ac498cf0bcc0abf9cdaa037fc3a6d245a03429cbb78e7
+EBUILD feedgenerator-1.2.1.ebuild 636 RMD160 ba3c1e9ac334d6c6af259720e5a421711cf1c4d5 SHA1 7343eee0dc0f8debadc4fc08032c5ebf1c6391d1 SHA256 5690ca7e04f35c088d8803c6c7325e05c54faabf7fde02171ea98299f8ea27f6

diff --git a/dev-python/feedgenerator/feedgenerator-1.2.1.ebuild b/dev-python/feedgenerator/feedgenerator-1.2.1.ebuild
new file mode 100644
index 0000000..68cd15b
--- /dev/null
+++ b/dev-python/feedgenerator/feedgenerator-1.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="Standalone version of django.utils.feedgenerator"
+HOMEPAGE="http://pypi.python.org/pypi/feedgenerator"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="dev-lang/python"
+RDEPEND="${DEPEND}"
+
+#DOCS="AUTHORS.txt CHANGES.txt README.txt"
+
+src_test() {
+	cd tests
+	testing() {
+		"$(PYTHON)" runtests.py
+	}
+	python_execute_function testing
+}

diff --git a/www-apps/pelican/Manifest b/www-apps/pelican/Manifest
index 1dfae3a..68476d3 100644
--- a/www-apps/pelican/Manifest
+++ b/www-apps/pelican/Manifest
@@ -1,4 +1,4 @@
 AUX webhelpers-2.8.1.patch 556 RMD160 ad5ccdf438c46ad9998d694c0e8c3799effde939 SHA1 324cd4afd45c42290a0538b38073dca018a5ac4c SHA256 1c5c363170ed7dcf6cee207d318fceaeec377e71779d2cf823636ef0ed0e7517
-EBUILD pelican-2.8.1.ebuild 1041 RMD160 91f936e633352cbd1a3e6a9888e42683584f526d SHA1 bab08afd0e02f87a56a21cf4b182c1662e219a61 SHA256 1b3f865a281666a9ac2a0b39ce5d42230c396bd6f4fa1186737e3fa01046871b
+EBUILD pelican-2.8.1.ebuild 1057 RMD160 28270ddccae9a6c5e56f3064efa239e0f0456a3e SHA1 8c96ed3ff3549b04accb89a0e61aa59436b2a94c SHA256 63628c0be83f1c95fdea30d3047074fd563e4ab4d2266e383b166587dcd73a13
 MISC ChangeLog 247 RMD160 40814594875e58fc54d00b677ddde3031979a5f7 SHA1 e75a44cd73287ad99b46ab606afd67d56f0fe34f SHA256 fc7d45ce726ad7f99f14030269ded9940f619d7edd8286bca2e5f12bcb67b885
 MISC metadata.xml 865 RMD160 07f1aee25b01466217e446e4f0ba962bc0478199 SHA1 4450f172eedb886dec0937bdfd1bc121e7303670 SHA256 e61060d6999ee9f6ff9ed0412eae8bee526717c375bff83cc5dc39026d39c594

diff --git a/www-apps/pelican/files/webhelpers-2.8.1.patch b/www-apps/pelican/files/webhelpers-2.8.1.patch
deleted file mode 100644
index 7f27f58..0000000
--- a/www-apps/pelican/files/webhelpers-2.8.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-switch out feedgenerator for webhelpers.feedgenerator
-diff -Naur pelican.orig//writers.py pelican//writers.py
---- pelican.orig//writers.py	2012-07-17 22:40:12.973442602 -0500
-+++ pelican//writers.py	2012-07-18 10:04:03.483348436 -0500
-@@ -8,7 +8,7 @@
- 
- from codecs import open
- from functools import partial
--from feedgenerator import Atom1Feed, Rss201rev2Feed
-+from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed
- from jinja2 import Markup
- from pelican.paginator import Paginator
- from pelican.utils import get_relative_path, set_date_tzinfo

diff --git a/www-apps/pelican/pelican-2.8.1.ebuild b/www-apps/pelican/pelican-2.8.1.ebuild
index b7f8a2d..f350209 100644
--- a/www-apps/pelican/pelican-2.8.1.ebuild
+++ b/www-apps/pelican/pelican-2.8.1.ebuild
@@ -3,6 +3,9 @@
 # $Header: $
 
 EAPI=4
+PYTHON_DEPEND="2:2.7"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit distutils eutils git-2
 
@@ -13,29 +16,24 @@ EGIT_REPO_URI="git://github.com/ametaireau/pelican.git
 	https://github.com/ametaireau/pelican.git"
 EGIT_COMMIT="2.8.1"
 
-LICENSE="GPL-3"
+LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="examples +markdown +pygments +rst"
+IUSE="examples +markdown"
 
-DEPEND=">=dev-lang/python-2.7
+DEPEND="dev-lang/python:2.7
 	dev-python/beautifulsoup
 	dev-python/blinker
 	dev-python/docutils
+	dev-python/feedgenerator
 	dev-python/jinja
+	dev-python/pygments
 	dev-python/pytz
-	dev-python/webhelpers
-	markdown? ( dev-python/markdown )
-	pygments? ( dev-python/pygments )
-	rst? ( dev-python/docutils )"
+	markdown? ( dev-python/markdown )"
 RDEPEND="$RDEPEND"
 
 DOCS="README.rst LICENSE THANKS"
 
-src_prepare() {
-	epatch "${FILESDIR}/webhelpers-${PV}.patch"
-}
-
 src_install() {
 	distutils_src_install