Version bump.

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

4 files changed, 92 insertions, 10 deletions

diff --git a/net-misc/flexget/ChangeLog b/net-misc/flexget/ChangeLog
index eb7e63376665..d5dbae16a211 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.23 2012/08/16 03:28:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/ChangeLog,v 1.24 2012/09/07 19:22:43 floppym Exp $
+
+*flexget-1.0_beta3139 (07 Sep 2012)
+
+  07 Sep 2012; Mike Gilbert <floppym@gentoo.org> +flexget-1.0_beta3139.ebuild,
+  flexget-9999.ebuild:
+  Version bump.
 
 *flexget-1.0_beta3085 (16 Aug 2012)
 
diff --git a/net-misc/flexget/Manifest b/net-misc/flexget/Manifest
index 25ddc733d18d..7bf610b924f5 100644
--- a/net-misc/flexget/Manifest
+++ b/net-misc/flexget/Manifest
@@ -3,15 +3,17 @@ Hash: SHA256
 
 DIST FlexGet-1.0r2881.tar.gz 703232 SHA256 9e29e1fd85c24c525118d3eb3a4b4b422b81b94fe640265565ace5088556b480 SHA512 2cd7ccf6a30cd2eee79a91917baaf5fe15f2b12993b648bca672f1df8c57c94c99fbb5fde485405a388558a728999500f1fd97347ea17e0bf4fc5a78dd9dc2a5 WHIRLPOOL d66b19a9b87256d047215e436008a2f2ebd923c2ea7630008a892f2f00847bbeb74c4e9602be29ad90e6a193c2a8231838f9b399c80acf0040541f968ab6da15
 DIST FlexGet-1.0r3085.tar.gz 713132 SHA256 1ad1b69ecc065a60cd39378e5db4746e0d4ec2d5bd3191304190ea4d81f03275 SHA512 19b03626742f5c2a72c5e13f2a90ce404368186e4f9d405965277ecd4021feb7bedae5a459139662fa356b07b8027aaa2c0ab9043456336f9e0786dc4a630eec WHIRLPOOL fc718389b9b2127d074081d37c9cf2babc80f4d47e7da7dfe04d1356227bebffa37b2aecd5114cf56b977b25ff3d51f618e2f2caf71bd9db9238b581d47650c1
+DIST FlexGet-1.0r3139.tar.gz 713854 SHA256 21d591a5ae27a33b173e0988ce77e2003d6a3509464b1a458c96e7949da27d3c SHA512 cd9e5072434fdb923468287da7b6d34cf423b8d35c61858b1a95a646e9f6bf2223d3b88eb3748f74b314ad6caa895c578dc6d0d926c646f6e6bc7db735646209 WHIRLPOOL 47c9b5c073e5ef0eacde5b097e9ffd686802e081181f4f68994f94a25421d15bda6f3eeee001357eb753fec6c46cf24b8b0c1a974b20a1106f0e444a7b4556e6
 EBUILD flexget-1.0_beta2881.ebuild 1709 SHA256 3856ac581e1478912f93c8c889994e4085105e5028881aac506eaddd8ca7eab5 SHA512 96a8474f71a634d45bb950f8e4b8741f64c57a41e8044fb27a86d0282088c45159fa3eb6b0197120b93501f89ae18dc98010bd39f00eb7dd866f364e3d82f72f WHIRLPOOL 7d60693fe69f9aa904cac3c0b0f8f02dd914cfb15811046c51a233e449b9a529473540233d5be0d08b7219fcfaea1d275987a1807eb665e9f02a26271ce4fec7
 EBUILD flexget-1.0_beta3085.ebuild 1767 SHA256 85fc28b1d3037c37965fb25a0120be606ec07355a1c82629c379ea791567724f SHA512 956d8fbec5e5ad94c558a392528fc4794f8e48e82aa8600358b871b5e011f2ca93cd3dd7520d7de9453aff32b69190027e749339500bcc5a939271944f79964c WHIRLPOOL 9ae688f20005bc21d49f0fa78c609bd8dfa45a53a980714a97766b6ac8ed5d2e10229522c1d60a3d360ba5b5c6a94f6e0c022dbf8ba97f52ef31ba5e121ff829
-EBUILD flexget-9999.ebuild 1760 SHA256 7ba8c11a6b0cc3c024ff07e30461b6afde06b8ded4cfa56ead34eede1b93fa4b SHA512 f0e78035de0c4d6c531aae6a1c92201406d46e907fd81cb8b8cf40afd5cfef29e281002b5d6e6567b6bda64785927aee57308849843f701c10d563c37005de15 WHIRLPOOL d227910e28f2ef3cf0e4b17ffeeccecd9946bc9367567666fc5f1e34a6bead49e55ede6a2fa18e0259869df406276a08a82ef7bb40d15b5bfdbec02c4e7a1f8e
-MISC ChangeLog 3572 SHA256 93ca67d258be2402f8cb6b2be35288373c3ed0aa54a1e17f6b2c8697c4f5e395 SHA512 da48e2a33256d814ee12acfbe82ee28b37295b2a7994fbdc83b008a7d1b5d3bb00ea3c0ab9e0baa238d5e31c02641025e587ed25bd0117636464f9641ded86fd WHIRLPOOL 5fcee8bea7d24a1d0478f6dcd6e0fb7095fb43106bf72789b60641f93c92ba611cf60722a69924a50edcd182dcfcbe3328335a57efae5e81e3e2b01fbd0e979b
+EBUILD flexget-1.0_beta3139.ebuild 1737 SHA256 c732e00433986776fc714a61a47c9e4141faaa1ef5baf606e26ccc5fa1b5f80b SHA512 25e91b33651979c3412e388bd33adab5ebdaed57cca3a6c7eba64ab25d2f8dae8be325695e0bb121391c54f40e79d2fc4b7a939cc91021aae0d6dd5be9f47384 WHIRLPOOL b66f622129698261ef069f5a5818d66f8120bf9eb08ae058b6dce1621ab3e9659d928cbd794e43a604070fc43a5e13aaa1163da99c9535e86f6499db98d3888c
+EBUILD flexget-9999.ebuild 1730 SHA256 86144e5405789e8f4419437f3380b25ef2b019d9999b415372bb417d9b1caf7b SHA512 d7b0904b56ca89ca9a357e371964d22718a2cf7f0cc472072d91d74f928595a0c0f1d42ff835d2c5f60761be287faf097d69f5cd5350239206ea4569e3b85f75 WHIRLPOOL afcc126eed074ebaa477a0d6a4c7dd1e22ea685ecb8c407347c054eb178a8bd76fa58bcb2e2675a522a3c199aeb6e8bcb03172be7860ca452c6d87eded7dea44
+MISC ChangeLog 3728 SHA256 e29928245dcf785a78719a9b80a873f0e809e077579cfee232daa5a30e88cdda SHA512 182b0daa505b298b2f80ff62b5f1d3ef3311f75ec6960f6f5c29ffc2d316d8a585b7de73661c5606a52ac7d73fc87cd5287febba678fb8bb72de349bc3bf0f48 WHIRLPOOL ace9114c7ffa3a0360a626810882c297cfdbd7d7d734b1a21702d226d0fa3ba4ebbcb1e65dcd731f8ad6edeff6d16d445bbcce64fe5d8f32a2ee6ef9ffb66915
 MISC metadata.xml 373 SHA256 4a20f680d59d0bb9ac4d770f1551af536d56c59c9bcd9c6ad702613f90636e6c SHA512 ea20ac2466cc3bff926f1eceaff16c26b6a80d360b2e367f84d859153be62188579f4c89799e822e23e3f75c0225f5eb03d832bf36696f117c639460be782f71 WHIRLPOOL 60a3557f49564308053567fd38a5162a7e9d72423c3a5794ed5c4a46950c5bde5b15162a4fe67e1df0ba8943950fc989b75cefe6d26f0fdb224b4950437e85f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAsaOAACgkQC77qH+pIQ6RyWwEAun6j0bFQ20rxop8TCtdiFLUP
-5tG/Ub2l3lnTc6W9q8kA/3H6w2ysgl8H5gXjTsRi1ZpYLtBCpOmp3mWOtq9qjp6y
-=9VeJ
+iF4EAREIAAYFAlBKSYoACgkQC77qH+pIQ6SkMgD/aK2BjAeDg8/aj2BHppUSL4/5
+BMO2Ndouj8yPZDP1M0QBAMQ6e6qP8uXTpjOAGsoZxkMSI8HtMskL6ko3TrqTUAxa
+=uyKd
 -----END PGP SIGNATURE-----
diff --git a/net-misc/flexget/flexget-1.0_beta3139.ebuild b/net-misc/flexget/flexget-1.0_beta3139.ebuild
new file mode 100644
index 000000000000..35cdfebfa9ec
--- /dev/null
+++ b/net-misc/flexget/flexget-1.0_beta3139.ebuild
@@ -0,0 +1,75 @@
+# 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_beta3139.ebuild,v 1.1 2012/09/07 19:22:43 floppym Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 *-pypy-* 3.*"
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit distutils eutils
+
+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"
+	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.0
+	|| ( dev-lang/python:2.7 dev-python/argparse )
+	dev-python/setuptools
+"
+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//' \
+		-e '/requests/s/, <0.15//' \
+		-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 6f5384fe6850..de7df79b25da 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.21 2012/08/16 03:28:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-9999.ebuild,v 1.22 2012/09/07 19:22:43 floppym Exp $
 
 EAPI=4
 
@@ -43,8 +43,7 @@ DEPEND="
 	dev-python/flask
 	dev-python/cherrypy
 	dev-python/python-dateutil
-	>=dev-python/requests-0.10.0
-	!=dev-python/requests-0.10.1
+	>=dev-python/requests-0.14.0
 	|| ( dev-lang/python:2.7 dev-python/argparse )
 	dev-python/setuptools
 "
@@ -63,7 +62,7 @@ src_prepare() {
 		-e '/SQLAlchemy/s/, <0.8//' \
 		-e '/BeautifulSoup/s/, <3.3//' \
 		-e '/beautifulsoup4/s/, <4.2//' \
-		-e '/requests/s/, <0.11//' \
+		-e '/requests/s/, <0.15//' \
 		-i pavement.py || die
 
 	if [[ ${PV} == 9999 ]]; then