Version bump. Set EAPI=4. Add deps for deluge and transmission.

(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)

5 files changed, 42 insertions, 62 deletions

diff --git a/net-misc/flexget/ChangeLog b/net-misc/flexget/ChangeLog
index 1f669aac86e9..5bca3d1f1fb2 100644
--- a/net-misc/flexget/ChangeLog
+++ b/net-misc/flexget/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/flexget
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/ChangeLog,v 1.2 2011/09/26 03:56:13 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/ChangeLog,v 1.3 2011/10/18 03:24:39 floppym Exp $
+
+*flexget-1.0_beta2435 (18 Oct 2011)
+
+  18 Oct 2011; Mike Gilbert <floppym@gentoo.org> -flexget-1.0_beta2323.ebuild,
+  -flexget-1.0_beta2385.ebuild, +flexget-1.0_beta2435.ebuild,
+  flexget-9999.ebuild, metadata.xml:
+  Version bump. Set EAPI=4. Add deps for deluge and transmission.
 
 *flexget-1.0_beta2385 (26 Sep 2011)
 
diff --git a/net-misc/flexget/flexget-1.0_beta2385.ebuild b/net-misc/flexget/flexget-1.0_beta2385.ebuild
deleted file mode 100644
index 49be861a9e07..000000000000
--- a/net-misc/flexget/flexget-1.0_beta2385.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-1.0_beta2385.ebuild,v 1.1 2011/09/26 03:56:13 floppym Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils eutils
-
-MY_P="FlexGet-${PV/_beta/r}"
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics, etc"
-HOMEPAGE="http://flexget.com/"
-SRC_URI="http://download.flexget.com/unstable/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/setuptools
-	dev-python/feedparser
-	>=dev-python/sqlalchemy-0.7
-	dev-python/pyyaml
-	dev-python/beautifulsoup
-	dev-python/html5lib
-	dev-python/jinja
-	dev-python/PyRSS2Gen
-	dev-python/pynzb
-	dev-python/progressbar
-	dev-python/flask
-	dev-python/cherrypy"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Prevent setup from grabbing nose from pypi
-	sed -e /setup_requires/d -i pavement.py || die
-
-	epatch_user
-	distutils_src_prepare
-}
diff --git a/net-misc/flexget/flexget-1.0_beta2323.ebuild b/net-misc/flexget/flexget-1.0_beta2435.ebuild
index 2c8bbb8cf766..6473a70aaff7 100644
--- a/net-misc/flexget/flexget-1.0_beta2323.ebuild
+++ b/net-misc/flexget/flexget-1.0_beta2435.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-1.0_beta2323.ebuild,v 1.2 2011/08/31 06:46:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-1.0_beta2435.ebuild,v 1.1 2011/10/18 03:24:39 floppym Exp $
 
-EAPI="3"
+EAPI=4
 
 PYTHON_DEPEND="2:2.5"
 SUPPORT_PYTHON_ABIS="1"
@@ -19,9 +19,9 @@ SRC_URI="http://download.flexget.com/unstable/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="deluge test transmission"
 
-RDEPEND="dev-python/setuptools
+RDEPEND="
 	dev-python/feedparser
 	>=dev-python/sqlalchemy-0.7
 	dev-python/pyyaml
@@ -32,9 +32,17 @@ RDEPEND="dev-python/setuptools
 	dev-python/pynzb
 	dev-python/progressbar
 	dev-python/flask
-	dev-python/cherrypy"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose )"
+	dev-python/cherrypy
+"
+DEPEND="
+	dev-python/setuptools
+	test? ( ${RDEPEND} dev-python/nose )
+"
+RDEPEND+="
+	dev-python/setuptools
+	deluge? ( net-p2p/deluge )
+	transmission? ( dev-python/transmissionrpc )
+"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-misc/flexget/flexget-9999.ebuild b/net-misc/flexget/flexget-9999.ebuild
index 5a5f3a8addc0..29eec69957fa 100644
--- a/net-misc/flexget/flexget-9999.ebuild
+++ b/net-misc/flexget/flexget-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.2 2011/08/31 06:46:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-9999.ebuild,v 1.3 2011/10/18 03:24:39 floppym Exp $
 
-EAPI="3"
+EAPI=4
 
 PYTHON_DEPEND="2:2.5"
 SUPPORT_PYTHON_ABIS="1"
@@ -19,9 +19,9 @@ ESVN_REPO_URI="http://svn.flexget.com/trunk"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="deluge test transmission"
 
-RDEPEND="dev-python/setuptools
+RDEPEND="
 	dev-python/feedparser
 	>=dev-python/sqlalchemy-0.7
 	dev-python/pyyaml
@@ -32,10 +32,18 @@ RDEPEND="dev-python/setuptools
 	dev-python/pynzb
 	dev-python/progressbar
 	dev-python/flask
-	dev-python/cherrypy"
-DEPEND="${RDEPEND}
+	dev-python/cherrypy
+"
+DEPEND="
+	dev-python/setuptools
 	dev-python/paver
-	test? ( dev-python/nose )"
+	test? ( ${RDEPEND} dev-python/nose )
+"
+RDEPEND+="
+	dev-python/setuptools
+	deluge? ( net-p2p/deluge )
+	transmission? ( dev-python/transmissionrpc )
+"
 
 src_prepare() {
 	# Prevent setup from grabbing nose from pypi
diff --git a/net-misc/flexget/metadata.xml b/net-misc/flexget/metadata.xml
index 09ddbff14dbf..b894b18316de 100644
--- a/net-misc/flexget/metadata.xml
+++ b/net-misc/flexget/metadata.xml
@@ -5,4 +5,8 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<use>
+		<flag name="deluge">Enable deluge output plugin</flag>
+		<flag name="transmission">Enable transmission output plugin</flag>
+	</use>
 </pkgmetadata>