Version bump.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 77 insertions, 75 deletions

diff --git a/net-misc/flexget/ChangeLog b/net-misc/flexget/ChangeLog
index 1d6db1bece07..497855a184bd 100644
--- a/net-misc/flexget/ChangeLog
+++ b/net-misc/flexget/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/flexget
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/ChangeLog,v 1.35 2013/02/10 02:55:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/ChangeLog,v 1.36 2013/02/10 03:01:55 floppym Exp $
+
+*flexget-1.0.3344 (10 Feb 2013)
+
+  10 Feb 2013; Mike Gilbert <floppym@gentoo.org> +flexget-1.0.3344.ebuild,
+  -flexget-1.0.3240.ebuild:
+  Version bump.
 
   10 Feb 2013; Mike Gilbert <floppym@gentoo.org> flexget-9999.ebuild:
   Add more PYTHON_USEDEP.
diff --git a/net-misc/flexget/flexget-1.0.3240.ebuild b/net-misc/flexget/flexget-1.0.3240.ebuild
deleted file mode 100644
index cd1e8f0bbb9f..000000000000
--- a/net-misc/flexget/flexget-1.0.3240.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-1.0.3240.ebuild,v 1.1 2013/01/08 21:22:32 floppym Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit distutils-r1 eutils
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P="FlexGet-${PV}"
-	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"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
-HOMEPAGE="http://flexget.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-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
-	dev-python/pynzb
-	dev-python/progressbar
-	dev-python/flask
-	dev-python/cherrypy
-	dev-python/python-dateutil
-	=dev-python/requests-0.14*
-	dev-python/setuptools
-	virtual/python-argparse[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-DEPEND+=" test? ( dev-python/nose )"
-
-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 \
-		-e '/SQLAlchemy/s/, <0.8//' \
-		-e '/BeautifulSoup/s/, <3.3//' \
-		-e '/beautifulsoup4/s/, <4.2//' \
-		-i pavement.py || die
-
-	if [[ ${PV} == 9999 ]]; then
-		# Generate setup.py
-		paver generate_setup || die
-	fi
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/net-misc/flexget/flexget-1.0.3344.ebuild b/net-misc/flexget/flexget-1.0.3344.ebuild
new file mode 100644
index 000000000000..4f08cc2491dc
--- /dev/null
+++ b/net-misc/flexget/flexget-1.0.3344.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-1.0.3344.ebuild,v 1.1 2013/02/10 03:01:55 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit distutils-r1 eutils
+
+if [[ ${PV} != 9999 ]]; then
+	MY_P="FlexGet-${PV}"
+	SRC_URI="http://download.flexget.com/${MY_P}.tar.gz
+		http://download.flexget.com/archive/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
+		https://github.com/Flexget/Flexget.git"
+fi
+
+DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
+HOMEPAGE="http://flexget.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+DEPEND="
+	>=dev-python/feedparser-5.1.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.7
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/PyRSS2Gen[${PYTHON_USEDEP}]
+	dev-python/pynzb[${PYTHON_USEDEP}]
+	dev-python/progressbar[${PYTHON_USEDEP}]
+	dev-python/flask
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0[${PYTHON_USEDEP}]
+	<dev-python/requests-1.99
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/python-argparse[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-python/paver"
+else
+	S="${WORKDIR}/${MY_P}"
+fi
+
+python_prepare_all() {
+	# 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//' \
+		-i pavement.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}