summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-08-16 03:28:22 +0000
committerMike Gilbert <floppym@gentoo.org>2012-08-16 03:28:22 +0000
commit786ec1d1cf19d0cf58e08a8d5dbcb2c6e311daae (patch)
tree4d61958bc645448a8750d0f0b3227f4037c95a29 /net-misc
parentVersion bump, bug #431546 (diff)
downloadgentoo-2-786ec1d1cf19d0cf58e08a8d5dbcb2c6e311daae.tar.gz
gentoo-2-786ec1d1cf19d0cf58e08a8d5dbcb2c6e311daae.tar.bz2
gentoo-2-786ec1d1cf19d0cf58e08a8d5dbcb2c6e311daae.zip
Version bump.
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/flexget/ChangeLog8
-rw-r--r--net-misc/flexget/flexget-1.0_beta3085.ebuild (renamed from net-misc/flexget/flexget-1.0_beta2821.ebuild)23
-rw-r--r--net-misc/flexget/flexget-9999.ebuild6
3 files changed, 23 insertions, 14 deletions
diff --git a/net-misc/flexget/ChangeLog b/net-misc/flexget/ChangeLog
index 0278d9807a13..eb7e63376665 100644
--- a/net-misc/flexget/ChangeLog
+++ b/net-misc/flexget/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/flexget
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/ChangeLog,v 1.22 2012/07/11 04:13:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/ChangeLog,v 1.23 2012/08/16 03:28:22 floppym Exp $
+
+*flexget-1.0_beta3085 (16 Aug 2012)
+
+ 16 Aug 2012; Mike Gilbert <floppym@gentoo.org> +flexget-1.0_beta3085.ebuild,
+ -flexget-1.0_beta2821.ebuild, flexget-9999.ebuild:
+ Version bump.
11 Jul 2012; Mike Gilbert <floppym@gentoo.org> flexget-9999.ebuild:
Update dependencies.
diff --git a/net-misc/flexget/flexget-1.0_beta2821.ebuild b/net-misc/flexget/flexget-1.0_beta3085.ebuild
index 3a8bb8c89cbf..13d7b08c24cf 100644
--- a/net-misc/flexget/flexget-1.0_beta2821.ebuild
+++ b/net-misc/flexget/flexget-1.0_beta3085.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-1.0_beta2821.ebuild,v 1.1 2012/04/01 19:06:47 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-1.0_beta3085.ebuild,v 1.1 2012/08/16 03:28:22 floppym Exp $
EAPI=4
@@ -27,13 +27,14 @@ HOMEPAGE="http://flexget.com/"
LICENSE="MIT"
SLOT="0"
-IUSE="deluge test transmission"
+IUSE="test"
-RDEPEND="
- >=dev-python/feedparser-5.1
+DEPEND="
+ >=dev-python/feedparser-5.1.2
>=dev-python/sqlalchemy-0.7
dev-python/pyyaml
dev-python/beautifulsoup:python-2
+ dev-python/beautifulsoup:4
dev-python/html5lib
dev-python/jinja
dev-python/PyRSS2Gen
@@ -44,16 +45,11 @@ RDEPEND="
dev-python/python-dateutil
>=dev-python/requests-0.10.0
!=dev-python/requests-0.10.1
-"
-DEPEND="
- dev-python/setuptools
- test? ( ${RDEPEND} dev-python/nose )
-"
-RDEPEND+="
+ || ( dev-lang/python:2.7 dev-python/argparse )
dev-python/setuptools
- deluge? ( net-p2p/deluge )
- transmission? ( dev-python/transmissionrpc )
"
+RDEPEND="${DEPEND}"
+DEPEND+=" test? ( dev-python/nose )"
if [[ ${PV} == 9999 ]]; then
DEPEND+=" dev-python/paver"
@@ -64,6 +60,9 @@ fi
src_prepare() {
# Prevent setup from grabbing nose from pypi
sed -e /setup_requires/d \
+ -e '/SQLAlchemy/s/, <0.8//' \
+ -e '/BeautifulSoup/s/, <3.3//' \
+ -e '/beautifulsoup4/s/, <4.2//' \
-e '/requests/s/, <0.11//' \
-i pavement.py || die
diff --git a/net-misc/flexget/flexget-9999.ebuild b/net-misc/flexget/flexget-9999.ebuild
index f125fc8503cc..6f5384fe6850 100644
--- a/net-misc/flexget/flexget-9999.ebuild
+++ b/net-misc/flexget/flexget-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-9999.ebuild,v 1.20 2012/07/11 04:13:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-9999.ebuild,v 1.21 2012/08/16 03:28:22 floppym Exp $
EAPI=4
@@ -34,6 +34,7 @@ DEPEND="
>=dev-python/sqlalchemy-0.7
dev-python/pyyaml
dev-python/beautifulsoup:python-2
+ dev-python/beautifulsoup:4
dev-python/html5lib
dev-python/jinja
dev-python/PyRSS2Gen
@@ -59,6 +60,9 @@ fi
src_prepare() {
# Prevent setup from grabbing nose from pypi
sed -e /setup_requires/d \
+ -e '/SQLAlchemy/s/, <0.8//' \
+ -e '/BeautifulSoup/s/, <3.3//' \
+ -e '/beautifulsoup4/s/, <4.2//' \
-e '/requests/s/, <0.11//' \
-i pavement.py || die