net-misc/flexget: Update deps. Remove dependency on paver for non-live version.

svn path=/sunrise/; revision=12300

diff --git a/net-misc/flexget/ChangeLog b/net-misc/flexget/ChangeLog
index 98af761ab1e57fb7e3843e2ea2effea522e440c6..7fa272c37c971c5f1365c17745ced645dd94a2ab 100644 (file)
--- a/net-misc/flexget/ChangeLog
+++ b/net-misc/flexget/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*flexget-1.0_beta2296 (02 Aug 2011)
+
+  02 Aug 2011; Mike Gilbert <floppymaster@gmail.com>
+  -flexget-1.0_beta2269.ebuild, +flexget-1.0_beta2296.ebuild,
+  flexget-9999.ebuild:
+  Update deps. Remove dependency on paver for non-live version.
+
 *flexget-1.0_beta2269 (20 Jun 2011)
 
   20 Jun 2011; Mike Gilbert <floppymaster@gmail.com>

diff --git a/net-misc/flexget/Manifest b/net-misc/flexget/Manifest
index d5e700b90f69a9f2c2e2210f2ce2da066a6f52a5..22db35a60ae0bcf645c4024feca11f517e15c4f1 100644 (file)
--- a/net-misc/flexget/Manifest
+++ b/net-misc/flexget/Manifest
@@ -1,5 +1,5 @@
-DIST FlexGet-1.0r2269.tar.gz 638533 RMD160 4fe1632e61894dec1acbfe97c017d60d87428ebe SHA1 87254dcc0b7a63f112eac6c5f58e2fa9bd80ac76 SHA256 efdc69f6a824c378bd4c5f5f4c6e7a40fea5ac289d56dff000ca83718b57ef27
-EBUILD flexget-1.0_beta2269.ebuild 1099 RMD160 e42e4e12a66f6c16a6dc937fe2807184ea39db1c SHA1 0a4755849035a5fba677b573dea4c2f37d57c44a SHA256 1b58d51a043808b1065e92aa9f4cbe4ac1015239e537178a06e4ecaa932cba62
-EBUILD flexget-9999.ebuild 1042 RMD160 3abb4f8069a69818cb3d602382c103eff9fc1f99 SHA1 d75c223b9150f547d13a89b6f0a4ff396ba55db9 SHA256 488c45c512128bbcb2a42f9437d39c3dcb93b47292de483bdf2c28c265923d20
-MISC ChangeLog 2066 RMD160 48b53bdbe5e84551265b5aa3f6554e8746c4d899 SHA1 bb267e6cd29cc1996148ad409279f6cc8e0a8e2e SHA256 17ef70fe1fcece6e44df838686bc614e52645185e4d46bc4b8c589caeb92cf77
+DIST FlexGet-1.0r2296.tar.gz 642147 RMD160 41c72a238d23eb10b51eda6ac31d51c4e3737709 SHA1 16dfc3a8f61be1cc59389433596bc8780244607e SHA256 a0122c737b0c177fed4fbd96b4b1334d33d0421fb996de590e64c5e6f0597d9a
+EBUILD flexget-1.0_beta2296.ebuild 1031 RMD160 e8b1496625913d466b93c40ce2c8599134b083f1 SHA1 08d72b5833594c2fc2881bb6722667d72898bee3 SHA256 43af55ab9ae884fc13662603199c9e4dff564b3aaee6c7f4d2ffa52714fd16e2
+EBUILD flexget-9999.ebuild 1046 RMD160 47e076deefe813df12ffa7ba4d4c7e0c04a2020f SHA1 ecbeaceef09c332129ea268dd172577755f43460 SHA256 73e5b13b956070133458a05e5eaf0969f3bc0b18ef4824543facc5813be5162d
+MISC ChangeLog 2306 RMD160 d7917611488e0b1184896d85ad289ae2ea2aa4f4 SHA1 a2f412404e92b8db02cdf1b7affb88e99f19ccaa SHA256 3a76fd4b37818b0970c075279d95fad60fb3961dd46097fce1d44f9be17bc416
 MISC metadata.xml 236 RMD160 436d0d621f57d67fdc9f26b237dd3fea1250d098 SHA1 47f6942e8f7c8698f50cdefc101c4ba7218cfe60 SHA256 a13a64b5acaf180f7646044ce3ee8b8071157d4e84589641c239d50a59c48981

diff --git a/net-misc/flexget/flexget-1.0_beta2269.ebuild b/net-misc/flexget/flexget-1.0_beta2296.ebuild
similarity index 85%
rename from net-misc/flexget/flexget-1.0_beta2269.ebuild
rename to net-misc/flexget/flexget-1.0_beta2296.ebuild
index 7ca923bc4af5783195cee60ea4b4e4bd3f675e5e..0dd455b984682fe96f05150755af30cd6cffa290 100644 (file)
--- a/net-misc/flexget/flexget-1.0_beta2269.ebuild
+++ b/net-misc/flexget/flexget-1.0_beta2296.ebuild
@@ -23,18 +23,18 @@ IUSE=""
 
 RDEPEND="dev-python/setuptools
        dev-python/feedparser
-       >=dev-python/sqlalchemy-0.6
+       >=dev-python/sqlalchemy-0.7
        dev-python/pyyaml
        dev-python/beautifulsoup
-       >=dev-python/html5lib-0.11
+       dev-python/html5lib
+       dev-python/jinja
        dev-python/PyRSS2Gen
        dev-python/pynzb
        dev-python/progressbar
        dev-python/flask
        dev-python/cherrypy"
 DEPEND="${RDEPEND}
-       dev-python/paver
-       test? ( >=dev-python/nose-0.11 )"
+       test? ( dev-python/nose )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -42,9 +42,6 @@ src_prepare() {
        # Prevent setup from grabbing nose from pypi
        sed -e /setup_requires/d -i pavement.py || die
 
-       # Remove bundled paver
-       rm paver-minilib.zip || die
-
        epatch_user
        distutils_src_prepare
 }

diff --git a/net-misc/flexget/flexget-9999.ebuild b/net-misc/flexget/flexget-9999.ebuild
index 2bd94153c49ec1be3645ba97037da7bc5755d625..f216096ff8241c87a9da80d9a39d206a4a7a7992 100644 (file)
--- a/net-misc/flexget/flexget-9999.ebuild
+++ b/net-misc/flexget/flexget-9999.ebuild
@@ -23,10 +23,11 @@ IUSE=""
 
 RDEPEND="dev-python/setuptools
        dev-python/feedparser
-       >=dev-python/sqlalchemy-0.6
+       >=dev-python/sqlalchemy-0.7
        dev-python/pyyaml
        dev-python/beautifulsoup
-       >=dev-python/html5lib-0.11
+       dev-python/html5lib
+       dev-python/jinja
        dev-python/PyRSS2Gen
        dev-python/pynzb
        dev-python/progressbar
@@ -34,7 +35,7 @@ RDEPEND="dev-python/setuptools
        dev-python/cherrypy"
 DEPEND="${RDEPEND}
        dev-python/paver
-       test? ( >=dev-python/nose-0.11 )"
+       test? ( dev-python/nose )"
 
 src_prepare() {
        # Prevent setup from grabbing nose from pypi