Version bump. Merge normal and live ebuilds.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 69 insertions, 30 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/Manifest b/net-misc/flexget/Manifest
index 69e5e9e6ac71..85f4707d6bff 100644
--- a/net-misc/flexget/Manifest
+++ b/net-misc/flexget/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST FlexGet-1.0r2484.tar.gz 662910 RMD160 1d738ce3e44850ced9ea5602cf77cb63e45ef2b7 SHA1 f4720a2912d1d7d55cb864024e96be8e032a7506 SHA256 b1439076497bcd81ab42de7f232dba15f38b045fc6b9b0cb47103ac049fd9345
-EBUILD flexget-1.0_beta2484.ebuild 1295 RMD160 971f7f234183b814c5f5173bf8e7edcb52e194b0 SHA1 5e7b23b2e97fcb1fac112c53e7ff7643e9457e00 SHA256 0808feba5b94c67ea022d42800b0d96d59d33d23d20f054d074534540f1e13b4
-EBUILD flexget-9999.ebuild 1531 RMD160 694646a94980e7bab6500c0e02a3049d3fee1c0c SHA1 1583b5616ab759b683e1571fdf4d5ce276ef9cef SHA256 ce21922330846e6cb7c0789c5a5b25fceb609cf88c5f09ccc2dab4d54c5950fb
-MISC ChangeLog 2368 RMD160 c93d8e4110c45604d2bcc017c1ab1d7deedbc40c SHA1 3d68cd69a6473cc066a285940fc5953200b1f7fa SHA256 dccd74002f10e760d67c17e648e746f4b4ee2dfcc131a107f5dacc87928162e3
+DIST FlexGet-1.0r2784.tar.gz 704457 RMD160 3bed76e0ce16b910a7e5977f506fd3e9a9cf60b6 SHA1 84dbe58f552b7a7c09c0a36f5c7b56a0d1666617 SHA256 29c6bfac8b2d10f2b46739180e9641e40c76fc9d5b1f2e5d7020b76c0e98c9db
+EBUILD flexget-1.0_beta2784.ebuild 1683 RMD160 be94eb8e776309baed8a00d0e18b5a510bd58e00 SHA1 81d8793ad047ca32741386ca59cb54b9b8e470fa SHA256 72954d3fefafcf195488e4ca69309b49b0db6d7052bb41a2e663d6737e3156dc
+EBUILD flexget-9999.ebuild 1676 RMD160 4bc2e01b875fa036ed80dc49c36a5de9f1fecd14 SHA1 ea6278276c24f667f602d3b2ee658c8fb2c403a0 SHA256 2aa30888f4e89b845faccb5656aecf8e3aa36da21c2fa619251512a3bdc6574a
+MISC ChangeLog 2585 RMD160 9d722800059bf0820386b33a8dbcc97d48a4f7d0 SHA1 d24f902a42ee2597c7876c39288016fb9dd34bf0 SHA256 8c5aa1820288784d6ddf9dbab1754b89e2d0e181d92b44782eed11a6e4f218e7
 MISC metadata.xml 373 RMD160 099515b7a2624b59b802598220793df0c97b53f0 SHA1 bbacda0d653b483b3779382211c11bd4817b72c2 SHA256 4a20f680d59d0bb9ac4d770f1551af536d56c59c9bcd9c6ad702613f90636e6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9O/PcACgkQC77qH+pIQ6RGKAD/aZAQAU37XhvwX4Ea8WRKYtl1
-pf97gM2+gOc2ZorWCDIA/RjGyCrVe4D1YQoGw60/P8gbgA1C4y5ALz7bkRSgeyko
-=vGSi
+iF4EAREIAAYFAk9Vg8IACgkQC77qH+pIQ6SWBwD+MjZasb7nvo0gpXsBeicr4iBk
+J9RCp4fAaxFOIAh0MEQA/iRthholzOHvYAyNxToMV6Ts/J2twPMwCBG+o+gRvFxa
+=SdMF
 -----END PGP SIGNATURE-----
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