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

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

6 files changed, 28 insertions, 178 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/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>