Add upper bound on sqlalchemy dependency, bug 462260.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

6 files changed, 15 insertions, 158 deletions

diff --git a/net-misc/flexget/ChangeLog b/net-misc/flexget/ChangeLog
index 7d9ce0e8b4b3..f27cf2e6e387 100644
--- a/net-misc/flexget/ChangeLog
+++ b/net-misc/flexget/ChangeLog
@@ -1,6 +1,10 @@
 # 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.37 2013/02/14 19:08:38 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/ChangeLog,v 1.38 2013/03/19 02:25:59 floppym Exp $
+
+  19 Mar 2013; Mike Gilbert <floppym@gentoo.org> -flexget-1.0.3279.ebuild,
+  -flexget-1.0.3344.ebuild, flexget-1.0.3352.ebuild, flexget-9999.ebuild:
+  Add upper bound on sqlalchemy dependency, bug 462260.
 
 *flexget-1.0.3352 (14 Feb 2013)
 
diff --git a/net-misc/flexget/Manifest b/net-misc/flexget/Manifest
index f682604c6af4..d140072724a7 100644
--- a/net-misc/flexget/Manifest
+++ b/net-misc/flexget/Manifest
@@ -1,19 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST FlexGet-1.0.3279.tar.gz 781788 SHA256 616ce08865347a96e8fedf5b79b5893050e35ecf4762167676dfee5ffa5ac4f3 SHA512 55d01871f6c26dbef95c05563b17cb5d29567d98bdf823b8a3d6f4f9c453018ee29f2cde4e829b7c58fa0162dbea8bf5591186baa86ff57e4bb029efadbfe8b7 WHIRLPOOL 8ca2a9747ae300653290e1c6f35e0e8c053c2f7366fe4e6a44209b0fa23a09a9f621a66094feaa6a49e6c2b813ab9574ac27252b40220c0389ed670e79e3c41a
-DIST FlexGet-1.0.3344.tar.gz 708460 SHA256 ef80914abe5134e961460007ad38ceba658547611dd8b038c4c508ba218f721a SHA512 781bc81b068ba9bdd33f2adbbd9b7d90206777059eb50073420250e57978484011af547ea8e9607fa05fd87a6cc202375ea50bab4546b7c61d82d41b832d8c86 WHIRLPOOL 7623607d3f67b36fbc2c440c5d8bae88b5588c228c2d19e3ed7556fd666d746577876dd6fae260e709e70251bc70d34de5920c6585142efa762d543f331b3a3c
 DIST FlexGet-1.0.3352.tar.gz 708236 SHA256 5cce81fe6442c59e278a535f7855b0366065610716b4499e72566ef187f552e7 SHA512 ac063b0419e342f1372198a32579b8cc569a5e34dc279e805fa44fe4ae7c5aa7b91d981dbba1f618c568fa4f0fad51432ab6c301f5829841a98bb0b275556a44 WHIRLPOOL 8bf7c6152421bd5edcbab9c5fa5b86febee3ae1bb0f8b5369620cc88ec28ce1b4bc270ca9c6d9f067a0a90e16a7047855f9e95c29551428dad263ee42b8f66c7
-EBUILD flexget-1.0.3279.ebuild 1653 SHA256 00c1208e0386dc2c89849abbe3f03c56c4d2a69085678fd3d3e71c3dceade354 SHA512 07f5fd0c11d0de88025197c700f5c28588467997b3a340efd2df92b6d7337f767c99ad0ba7293eb84385db7a7a467d4427a77f5bcd70eda703334d284032637d WHIRLPOOL 7bc16ee8a74e43517e385dead216eeac65f59068e700377949ab0d41e5d5c3edf6cf1c9fb03bdb977115f8f20fe4de168776c35e6f6964c02877189e351a054b
-EBUILD flexget-1.0.3344.ebuild 1895 SHA256 f16a24cbc11117b6963d120801807392985c7a6c74dda3e5c30c3c253f5375e7 SHA512 d9083dbc5e9f8ebc43c4af2aeac219962d4b18f72c2cd7820680f40417a7fffa66d540d1c1ab2956990b772b4f661031cd95507e5f84c9253f919ab369e98c4f WHIRLPOOL 15eef980879def444b704ba8a8921f07c78950ce70348fa43aa75e6aa4d2ec59c047d241f2257bfec7a965d0748bd53c6375e6ca09139ff168b0549358ed27a2
-EBUILD flexget-1.0.3352.ebuild 1895 SHA256 62360a258af37c2c04ea78c8f3111c227d01da794df173fd490f0a3e48441096 SHA512 a9b95af71599f610d09a090afb2c94b009de41cb7dbf5b58e3447da8246b74a3ca721bf794c95b8094145373350024247cc89a0fc9358a16f4093d011636a918 WHIRLPOOL e57c95ec879b50e03621df990f379765e8e6f074be488ab1ca0cffee1d6534861115c31807a43fbf7f76101dcd3a8572f9cfddbb3deb8e128fc35e35eb49e8c3
-EBUILD flexget-9999.ebuild 1892 SHA256 aa5f41fa9994a2984cc84093999347291674e6379c995aafac06028dd297739c SHA512 80179d6b34facbfceedd464aa6456a7d888bbf0b80c061910bc7479875eae75d685becae5c997447b7e5df2b580d108eb96d2a413de4cb1f3f808588d7015b99 WHIRLPOOL 982e32e5d5729ada4cc89849b887686ec6585c5eff6bffa67299e868ef8f8b3b98cf0deaa4d9935c52b6618148ad048990b36d1b97124cc96658a76de9dc7b07
-MISC ChangeLog 5799 SHA256 2aa07e7a91355ecb7c2d8d49924a000c82150cbff0e2c4bbb439fb3bbc4c6167 SHA512 6d7c7d67ba3acdd6d9b32a5202319f372121b82fff81d821af5cc60077f8eadd9237b9c19c45260ae2dc837f25a19fdc0360adbe3d4e3a9973ca510097f20f8b WHIRLPOOL dbf39b6f2804ad9ba3978e649dd51e19abc7271e579392ebf1482d537d1efdc4f0cce6df99128ea2bbff940fffa0704eef079ed0efec9af971f963fc4f4ce106
+EBUILD flexget-1.0.3352.ebuild 1926 SHA256 81a40e67785644d6508566bb1766ecdbee3e58ab2e12c2b1746669f8db40d897 SHA512 bf41936a36cc4a9e505cc405bbb2ac2062daacccedfc801435bf6fd973fb39192259d88b3dd666678bf86edade7550387aada87dad87d5fb383c072f95fb1e33 WHIRLPOOL f0fce27140da6c515e5cdbf2dcae0409488e7a509208c5d836dad799b86a8e26748c3dad5d82d2c9fd3dbb70622775d8c0cff3d678fb705a5ee6f68009178422
+EBUILD flexget-9999.ebuild 1923 SHA256 87923a6f2316c0c8bffc8451ac1a3a79a0b0d68c973405e30238970de6cf9c0f SHA512 480dec84d770e96fab45b7f2190cae70d0737089a220fd0d8a992f409dbc0ee5e50b8b8d59d7a9bc09856985bb8897bf8117dc9afba2e2df4cd50367e18506b7 WHIRLPOOL 43ff91d1f98abe11bbb9fa82f20d6ca42e4bf7153846b49dad35c49255c802aa8b7951f1d75820558772fe60512add8aec811e6c2e14d4bd9608d620ecdf09ad
+MISC ChangeLog 6005 SHA256 8513745e15e6d2fdf4c96c7e12c33e134a07a46784aca5ae3c2855d86f5169ed SHA512 90358f4acd7e8375c24df07a835ce9f9de61bd83a4d9444b31a10a18bce3ae1115d7447bd7185b4bd187faecc49bb4216276eec7be2547fd39ccd923e2068540 WHIRLPOOL 07667808d860f7d86822f52dea60b05fc4308fb318d4fdea071bf4358a0e30b4d2dacbe411238a3d6672644f2d8756df96fc144032e68738b66b56230ce44d5f
 MISC metadata.xml 232 SHA256 8e0308eed9efea18755c3fc2161057faa2b438c4d31895e776d2d5cd5ff109df SHA512 0ec524315be6762228ff54bca53ec039e93672dcef379ef6ef0087656d5e11644aebabcc08663af4f18bdb1b254e71f2b2d3f91277e2867022b93f00d975ae88 WHIRLPOOL bd96dd794e9fdf37bea367be6ada6deb0cf7b98f1978c9e23746f98b1fc2fef931077dd59f6bff7d64856ed284d39f638fb8e0517c61b42f6a0605db09297047
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEdNjcACgkQC77qH+pIQ6SICQD8DDNOIUR4JmnjsKN4sgphcXAB
-MMzgHq4BC/L0gvMKACQBAMmC+S69IvGmM6sRbG6zvx7l0I6FfVxtQ+DWUIrCcWHR
-=owsB
+iF4EAREIAAYFAlFHzLgACgkQC77qH+pIQ6QkZgD+P9jXxkHtD4zcL/Gd11MwJmI5
+F/Rt2qx4ru2u8X1dKTUA/RIRhEcVA8w9AD5r0gExU5vlSPhYZ78WUvzMcCnKs+ul
+=Z1as
 -----END PGP SIGNATURE-----
diff --git a/net-misc/flexget/flexget-1.0.3279.ebuild b/net-misc/flexget/flexget-1.0.3279.ebuild
deleted file mode 100644
index dd634905726a..000000000000
--- a/net-misc/flexget/flexget-1.0.3279.ebuild
+++ /dev/null
@@ -1,75 +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.3279.ebuild,v 1.1 2013/01/18 04:03:10 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.3
-	>=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-1.0
-	<dev-python/requests-1.99
-	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
deleted file mode 100644
index 4f08cc2491dc..000000000000
--- a/net-misc/flexget/flexget-1.0.3344.ebuild
+++ /dev/null
@@ -1,70 +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.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
-}
diff --git a/net-misc/flexget/flexget-1.0.3352.ebuild b/net-misc/flexget/flexget-1.0.3352.ebuild
index 655e6f85671d..27b39c147061 100644
--- a/net-misc/flexget/flexget-1.0.3352.ebuild
+++ b/net-misc/flexget/flexget-1.0.3352.ebuild
@@ -1,6 +1,6 @@
 # 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.3352.ebuild,v 1.1 2013/02/14 19:08:38 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-1.0.3352.ebuild,v 1.2 2013/03/19 02:25:59 floppym Exp $
 
 EAPI=5
 
@@ -29,6 +29,7 @@ IUSE="test"
 DEPEND="
 	>=dev-python/feedparser-5.1.3[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-0.7
+	<dev-python/sqlalchemy-0.7.99
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
diff --git a/net-misc/flexget/flexget-9999.ebuild b/net-misc/flexget/flexget-9999.ebuild
index 00cfa3c22353..471266b1b0b0 100644
--- a/net-misc/flexget/flexget-9999.ebuild
+++ b/net-misc/flexget/flexget-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.34 2013/02/10 02:55:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-9999.ebuild,v 1.35 2013/03/19 02:25:59 floppym Exp $
 
 EAPI=5
 
@@ -29,6 +29,7 @@ IUSE="test"
 DEPEND="
 	>=dev-python/feedparser-5.1.3[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-0.7
+	<dev-python/sqlalchemy-0.7.99
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]