Version bump. Merge normal and live ebuilds.

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

3 files changed, 62 insertions, 23 deletions

diff --git a/net-misc/flexget/ChangeLog b/net-misc/flexget/ChangeLog
index bf505c37b09a..ba32f7e60e1f 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.15 2012/03/01 04:37:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/ChangeLog,v 1.16 2012/03/06 03:25:48 floppym Exp $
+
+*flexget-1.0_beta2784 (06 Mar 2012)
+
+  06 Mar 2012; Mike Gilbert <floppym@gentoo.org> +flexget-1.0_beta2784.ebuild,
+  -flexget-1.0_beta2484.ebuild, flexget-9999.ebuild:
+  Version bump. Merge normal and live ebuilds.
 
   01 Mar 2012; Mike Gilbert <floppym@gentoo.org> flexget-9999.ebuild:
   Depend on dev-python/python-dateutil.
diff --git a/net-misc/flexget/flexget-1.0_beta2484.ebuild b/net-misc/flexget/flexget-1.0_beta2784.ebuild
index 11d8aab0c30b..5deb9d21134e 100644
--- a/net-misc/flexget/flexget-1.0_beta2484.ebuild
+++ b/net-misc/flexget/flexget-1.0_beta2784.ebuild
@@ -1,28 +1,36 @@
 # 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_beta2484.ebuild,v 1.3 2012/02/27 03:27:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-1.0_beta2784.ebuild,v 1.1 2012/03/06 03:25:48 floppym Exp $
 
 EAPI=4
 
-PYTHON_DEPEND="2:2.5"
+PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 *-pypy-* 3.*"
+RESTRICT_PYTHON_ABIS="2.4 2.5 *-pypy-* 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"
+if [[ ${PV} != 9999 ]]; then
+	MY_P="FlexGet-${PV/_beta/r}"
+	SRC_URI="http://download.flexget.com/unstable/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit subversion
+	SRC_URI=""
+	ESVN_REPO_URI="http://svn.flexget.com/trunk"
+fi
+
+DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
 HOMEPAGE="http://flexget.com/"
-SRC_URI="http://download.flexget.com/unstable/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="deluge test transmission"
 
 RDEPEND="
-	dev-python/feedparser
+	>=dev-python/feedparser-5.1
 	>=dev-python/sqlalchemy-0.7
 	dev-python/pyyaml
 	dev-python/beautifulsoup:python-2
@@ -33,6 +41,9 @@ RDEPEND="
 	dev-python/progressbar
 	dev-python/flask
 	dev-python/cherrypy
+	dev-python/python-dateutil:python-2
+	>=dev-python/requests-0.10.0
+	!=dev-python/requests-0.10.1
 "
 DEPEND="
 	dev-python/setuptools
@@ -44,12 +55,22 @@ RDEPEND+="
 	transmission? ( dev-python/transmissionrpc )
 "
 
-S="${WORKDIR}/${MY_P}"
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-python/paver"
+else
+	S="${WORKDIR}/${MY_P}"
+fi
+
 
 src_prepare() {
 	# Prevent setup from grabbing nose from pypi
 	sed -e /setup_requires/d -i pavement.py || die
 
+	if [[ ${PV} == 9999 ]]; then
+		# Generate setup.py
+		paver generate_setup || die
+	fi
+
 	epatch_user
 	distutils_src_prepare
 }
diff --git a/net-misc/flexget/flexget-9999.ebuild b/net-misc/flexget/flexget-9999.ebuild
index cb8d29027fa7..bb1e264beb98 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.14 2012/03/01 04:37:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-9999.ebuild,v 1.15 2012/03/06 03:25:48 floppym Exp $
 
 EAPI=4
 
@@ -9,12 +9,20 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4 2.5 *-pypy-* 3.*"
 DISTUTILS_SRC_TEST="setup.py"
 
-inherit distutils eutils subversion
+inherit distutils eutils
 
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics, etc"
+if [[ ${PV} != 9999 ]]; then
+	MY_P="FlexGet-${PV/_beta/r}"
+	SRC_URI="http://download.flexget.com/unstable/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit subversion
+	SRC_URI=""
+	ESVN_REPO_URI="http://svn.flexget.com/trunk"
+fi
+
+DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
 HOMEPAGE="http://flexget.com/"
-SRC_URI=""
-ESVN_REPO_URI="http://svn.flexget.com/trunk"
 
 LICENSE="MIT"
 SLOT="0"
@@ -23,8 +31,7 @@ IUSE="deluge test transmission"
 
 RDEPEND="
 	>=dev-python/feedparser-5.1
-	>=dev-python/sqlalchemy-0.7.4
-	!=dev-python/sqlalchemy-0.7.5
+	>=dev-python/sqlalchemy-0.7
 	dev-python/pyyaml
 	dev-python/beautifulsoup:python-2
 	dev-python/html5lib
@@ -40,7 +47,6 @@ RDEPEND="
 "
 DEPEND="
 	dev-python/setuptools
-	dev-python/paver
 	test? ( ${RDEPEND} dev-python/nose )
 "
 RDEPEND+="
@@ -49,15 +55,21 @@ RDEPEND+="
 	transmission? ( dev-python/transmissionrpc )
 "
 
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-python/paver"
+else
+	S="${WORKDIR}/${MY_P}"
+fi
+
+
 src_prepare() {
 	# Prevent setup from grabbing nose from pypi
 	sed -e /setup_requires/d -i pavement.py || die
 
-	# Silly upstream...
-	sed -e "s/SQLAlchemy==0.7.4/SQLAlchemy>=0.7.4/" -i pavement.py || die
-
-	# Generate setup.py
-	paver generate_setup || die
+	if [[ ${PV} == 9999 ]]; then
+		# Generate setup.py
+		paver generate_setup || die
+	fi
 
 	epatch_user
 	distutils_src_prepare