Version bump. Convert to distutils-r1. Remove old.

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

7 files changed, 36 insertions, 192 deletions

diff --git a/net-misc/flexget/ChangeLog b/net-misc/flexget/ChangeLog
index 4a718dc222b5..e3dfef4d2d12 100644
--- a/net-misc/flexget/ChangeLog
+++ b/net-misc/flexget/ChangeLog
@@ -1,6 +1,13 @@
 # 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.26 2012/10/29 16:38:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/ChangeLog,v 1.27 2012/11/01 04:48:06 floppym Exp $
+
+*flexget-1.0_beta3181 (01 Nov 2012)
+
+  01 Nov 2012; Mike Gilbert <floppym@gentoo.org> +flexget-1.0_beta3181.ebuild,
+  -flexget-1.0_beta2881.ebuild, -flexget-1.0_beta3085.ebuild,
+  -flexget-1.0_beta3139.ebuild, flexget-9999.ebuild, metadata.xml:
+  Version bump. Convert to distutils-r1. Remove old.
 
   29 Oct 2012; Michał Górny <mgorny@gentoo.org> flexget-1.0_beta3085.ebuild,
   flexget-1.0_beta3139.ebuild, flexget-9999.ebuild:
diff --git a/net-misc/flexget/Manifest b/net-misc/flexget/Manifest
index ab0b549f61e3..e833d2035aaa 100644
--- a/net-misc/flexget/Manifest
+++ b/net-misc/flexget/Manifest
@@ -1,21 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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 1743 SHA256 8e99b146a01ffa89dd7cd23472006b443c7128a8e04d3b5e55364d6afdddb9e4 SHA512 82c39a05dc3f20136c84c9ac9230bc85413b159b9ba346f9d8447a0e3490dcb5ed2c36b6b35cc83d6e3926ebfc53c819aed1aa991e4c51432cde66d93096dded WHIRLPOOL e526636ee19de135816a525abe3023be484b507bbee5699ac0637548a4cec29ec8d80fac0a37e2862a58d6d1339108fa45507a5442249bfb7e21389a58297140
-EBUILD flexget-1.0_beta3139.ebuild 1680 SHA256 406222fc9050e1051e70d620eddd7028b8d2a2b7889787ce773e390d72f4227a SHA512 c7935860f77fb2eb175765f503c4201aee6b5964567b93ec68e2b7bf214580da07fc834ce54ca7f609e0da7533c6c52bde262615942d1a63a1decf51fc1f8504 WHIRLPOOL 1a8a2033763722ce197818b1b70ccb5697df5cd7dda293a356a9deefce2e3ce5ba693833896691a945b564ee6cf3708fd58fee15904951fda78c6627e21af419
-EBUILD flexget-9999.ebuild 1673 SHA256 cc96e3932b3761fdc9338804f76bf2b34512e7c16b0ed37dcf20bc8d6686956b SHA512 3dab1bf69875d25ab6379a5b2fa4118d90092cf306f1130af64472ae0cab78a19650eb0a471f8dc59c4bc984a07ac2e7ee2a16c8516dac33f123e4d2a3779fc7 WHIRLPOOL 7922c84204ae07d5aeefc66993331ce23bce743a6a0816221626b442d59ce11100ccd0a97d57a0efb87954f31c2570fd4f576e8b725c8833c1493d46f7a250b7
-MISC ChangeLog 4036 SHA256 e0208d613d77c8a6b9428dcc80302469b52ce442913d8bf0a52d5abe753e8e2f SHA512 e7d9d16841188b6bf4351617eae196e9f90759ac5131d98bc61bc85b0f648405048795bc1421affd488c3e285ff28909dcbb94fe59fbf3d98ba41fa71ea2ae02 WHIRLPOOL d544b508692ac4e4a5dc642690742cb146f1a9c54608c42b9bf5ac8b47ead4cadd9933a0fd7986a274738dbb2c44f965002ec6ff43c8be9f28178d7efa5aa926
-MISC metadata.xml 373 SHA256 4a20f680d59d0bb9ac4d770f1551af536d56c59c9bcd9c6ad702613f90636e6c SHA512 ea20ac2466cc3bff926f1eceaff16c26b6a80d360b2e367f84d859153be62188579f4c89799e822e23e3f75c0225f5eb03d832bf36696f117c639460be782f71 WHIRLPOOL 60a3557f49564308053567fd38a5162a7e9d72423c3a5794ed5c4a46950c5bde5b15162a4fe67e1df0ba8943950fc989b75cefe6d26f0fdb224b4950437e85f7
+DIST FlexGet-1.0r3181.tar.gz 728696 SHA256 78effc7c9565f82e58f700d9d545053081e3c950c89e687de86a88b9295947ae SHA512 aa1b08f97db4f05110b077251dbda183910cb42a348bdc808a9cca675e4bd6452845198ed55e3cfafd2e9c99dd6a447c9c3768b569b481ae4863a4b3ad763f50 WHIRLPOOL 4ebe0ccd968dfb3fd5f9068ff1a5baca59a80597c6a4b9451fa9c90b0bd00441a8c4eb18ff0e566885d64275caec340473980cdec851be967ad9f5db4831310c
+EBUILD flexget-1.0_beta3181.ebuild 1633 SHA256 40cd5dc5aa244732858783302137d4dd2401bf53f5daa98b0fff7d06931e1ad8 SHA512 7e7727ab3989a4f5715a60202fbe7698dd6392be5d7cbd8fea162d2a25c9327bd15af4853866eeac1788284a020f921c0edcf6b37260eb94c4b4a4621691965c WHIRLPOOL d129a29ef297490382a2920d458967790906b06364ac878ad67be7f807510f56d180252282dec852fe0ab88e4b4d8cff6b9539bf40c1243ce7261d45fb0a0e56
+EBUILD flexget-9999.ebuild 1626 SHA256 bd91e866dc45beb2a4eba13385ec86a221d93d4d63d82d86bba400665c99987f SHA512 510d3a34b9b1192bc7fc3ca57ef5a390f5996e70cea8cbfedacc77f6b825126eac69feb063c219eafc06f3be06eccde277f08bd1f0a4496259d74f912e150ec9 WHIRLPOOL e53afc344c43939b2a7e3066f7fd298891d66495df1f2145853abe43cff5d8b8797747c44996dfb46750f010b7f770055b9cb4b1fdfa86508d931a462de58366
+MISC ChangeLog 4336 SHA256 5b67e483355cda5a8a5dfa78251192fe038a05e2cd4aa729591b20a1e8e6c6bd SHA512 c3765915d49a93b0ceb257c9f52190424259207df4119c9d8650a87b20790552636ac52ad453bc19c44f2f6ed05f66af46b714dc177ccc0d93aa50b02894526e WHIRLPOOL f1754d0a0b04c89c7d0b1d63f828b2f36f8827c1d766fd2f0deb3745beefd7d275da1965c851a1f5033b61666d3a00cae0922c6c3a0119032c6ca401643c20e2
+MISC metadata.xml 232 SHA256 8e0308eed9efea18755c3fc2161057faa2b438c4d31895e776d2d5cd5ff109df SHA512 0ec524315be6762228ff54bca53ec039e93672dcef379ef6ef0087656d5e11644aebabcc08663af4f18bdb1b254e71f2b2d3f91277e2867022b93f00d975ae88 WHIRLPOOL bd96dd794e9fdf37bea367be6ada6deb0cf7b98f1978c9e23746f98b1fc2fef931077dd59f6bff7d64856ed284d39f638fb8e0517c61b42f6a0605db09297047
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlCOsS0ACgkQfXuS5UK5QB0FRQP/QWCFX935YRbsqfibPa8e5pqw
-FFr679cEQm8i/vaUucqggvc5QmbfTq9pyR72xnNK7mYSoo1gwS3zD2BA8fPk/Oj+
-YYpAv07qIr25xJBvGV+R3vBWSNgOK4ZhV4raJHDZYPNP2RnDXf4gSlfhcl+3zyAN
-QTKPm2ugIqA6EZ3U33U=
-=kA62
+iF4EAREIAAYFAlCR/woACgkQC77qH+pIQ6RwigD/Xh6KkVXsmHST9BvTnsoXsfPr
+/vjKdRJuI9u4EL8tVCsBALavaYD3FXl6U4Z2z5khm5XTVBzRWQsN88vbORqXcMtK
+=y8gU
 -----END PGP SIGNATURE-----
diff --git a/net-misc/flexget/flexget-1.0_beta2881.ebuild b/net-misc/flexget/flexget-1.0_beta2881.ebuild
deleted file mode 100644
index 3c8464c52aa8..000000000000
--- a/net-misc/flexget/flexget-1.0_beta2881.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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_beta2881.ebuild,v 1.1 2012/05/20 01:55:33 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="deluge test transmission"
-
-RDEPEND="
-	>=dev-python/feedparser-5.1
-	>=dev-python/sqlalchemy-0.7
-	dev-python/pyyaml
-	dev-python/beautifulsoup:python-2
-	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.10.0
-	!=dev-python/requests-0.10.1
-"
-DEPEND="
-	dev-python/setuptools
-	test? ( ${RDEPEND} dev-python/nose )
-"
-RDEPEND+="
-	dev-python/setuptools
-	deluge? ( net-p2p/deluge )
-	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 \
-		-e '/requests/s/, <0.11//' \
-		-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-1.0_beta3085.ebuild b/net-misc/flexget/flexget-1.0_beta3085.ebuild
deleted file mode 100644
index c39ebf201fe5..000000000000
--- a/net-misc/flexget/flexget-1.0_beta3085.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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_beta3085.ebuild,v 1.2 2012/10/29 16:38:09 mgorny 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.10.0
-	!=dev-python/requests-0.10.1
-	dev-python/setuptools
-	virtual/python-argparse
-"
-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.11//' \
-		-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-1.0_beta3139.ebuild b/net-misc/flexget/flexget-1.0_beta3181.ebuild
index 71e153cbf164..56882536da01 100644
--- a/net-misc/flexget/flexget-1.0_beta3139.ebuild
+++ b/net-misc/flexget/flexget-1.0_beta3181.ebuild
@@ -1,15 +1,12 @@
 # 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.3 2012/10/29 16:38:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-1.0_beta3181.ebuild,v 1.1 2012/11/01 04:48:06 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"
+PYTHON_COMPAT=( python2_{6,7} )
 
-inherit distutils eutils
+inherit distutils-r1 eutils
 
 if [[ ${PV} != 9999 ]]; then
 	MY_P="FlexGet-${PV/_beta/r}"
@@ -45,7 +42,7 @@ DEPEND="
 	dev-python/python-dateutil
 	=dev-python/requests-0.14*
 	dev-python/setuptools
-	virtual/python-argparse
+	virtual/python-argparse[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 DEPEND+=" test? ( dev-python/nose )"
@@ -56,7 +53,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-src_prepare() {
+python_prepare_all() {
 	# Prevent setup from grabbing nose from pypi
 	sed -e /setup_requires/d \
 		-e '/SQLAlchemy/s/, <0.8//' \
@@ -64,11 +61,14 @@ src_prepare() {
 		-e '/beautifulsoup4/s/, <4.2//' \
 		-i pavement.py || die
 
+	epatch_user
+
 	if [[ ${PV} == 9999 ]]; then
 		# Generate setup.py
 		paver generate_setup || die
 	fi
+}
 
-	epatch_user
-	distutils_src_prepare
+python_test() {
+	esetup.py test
 }
diff --git a/net-misc/flexget/flexget-9999.ebuild b/net-misc/flexget/flexget-9999.ebuild
index e17af5079d01..6a9b920cfba1 100644
--- a/net-misc/flexget/flexget-9999.ebuild
+++ b/net-misc/flexget/flexget-9999.ebuild
@@ -1,15 +1,12 @@
 # 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.24 2012/10/29 16:38:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-9999.ebuild,v 1.25 2012/11/01 04:48:06 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"
+PYTHON_COMPAT=( python2_{6,7} )
 
-inherit distutils eutils
+inherit distutils-r1 eutils
 
 if [[ ${PV} != 9999 ]]; then
 	MY_P="FlexGet-${PV/_beta/r}"
@@ -45,7 +42,7 @@ DEPEND="
 	dev-python/python-dateutil
 	=dev-python/requests-0.14*
 	dev-python/setuptools
-	virtual/python-argparse
+	virtual/python-argparse[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 DEPEND+=" test? ( dev-python/nose )"
@@ -56,7 +53,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-src_prepare() {
+python_prepare_all() {
 	# Prevent setup from grabbing nose from pypi
 	sed -e /setup_requires/d \
 		-e '/SQLAlchemy/s/, <0.8//' \
@@ -64,11 +61,14 @@ src_prepare() {
 		-e '/beautifulsoup4/s/, <4.2//' \
 		-i pavement.py || die
 
+	epatch_user
+
 	if [[ ${PV} == 9999 ]]; then
 		# Generate setup.py
 		paver generate_setup || die
 	fi
+}
 
-	epatch_user
-	distutils_src_prepare
+python_test() {
+	esetup.py test
 }
diff --git a/net-misc/flexget/metadata.xml b/net-misc/flexget/metadata.xml
index b894b18316de..09ddbff14dbf 100644
--- a/net-misc/flexget/metadata.xml
+++ b/net-misc/flexget/metadata.xml
@@ -5,8 +5,4 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
-	<use>
-		<flag name="deluge">Enable deluge output plugin</flag>
-		<flag name="transmission">Enable transmission output plugin</flag>
-	</use>
 </pkgmetadata>