summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-11-02 21:45:55 +0000
committerMike Gilbert <floppym@gentoo.org>2012-11-02 21:45:55 +0000
commit06cd0b4409af5d4cbc457d15038341066ca891c8 (patch)
tree44c2bcbda9ce14c8ea95e2137f60cf97819abced
parentSetting tests to restricted wrt Bug 422953 by flameeyes (diff)
downloadgentoo-2-06cd0b4409af5d4cbc457d15038341066ca891c8.tar.gz
gentoo-2-06cd0b4409af5d4cbc457d15038341066ca891c8.tar.bz2
gentoo-2-06cd0b4409af5d4cbc457d15038341066ca891c8.zip
Call distutils-r1_python_prepare_all from python_prepare_all.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
-rw-r--r--net-misc/flexget/ChangeLog6
-rw-r--r--net-misc/flexget/flexget-1.0_beta3181.ebuild6
-rw-r--r--net-misc/flexget/flexget-9999.ebuild6
3 files changed, 11 insertions, 7 deletions
diff --git a/net-misc/flexget/ChangeLog b/net-misc/flexget/ChangeLog
index e3dfef4d2d12..736c1eb5ffb5 100644
--- a/net-misc/flexget/ChangeLog
+++ b/net-misc/flexget/ChangeLog
@@ -1,6 +1,10 @@
# 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.27 2012/11/01 04:48:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/ChangeLog,v 1.28 2012/11/02 21:45:55 floppym Exp $
+
+ 02 Nov 2012; Mike Gilbert <floppym@gentoo.org> flexget-1.0_beta3181.ebuild,
+ flexget-9999.ebuild:
+ Call distutils-r1_python_prepare_all from python_prepare_all.
*flexget-1.0_beta3181 (01 Nov 2012)
diff --git a/net-misc/flexget/flexget-1.0_beta3181.ebuild b/net-misc/flexget/flexget-1.0_beta3181.ebuild
index 56882536da01..d17cb7392f47 100644
--- a/net-misc/flexget/flexget-1.0_beta3181.ebuild
+++ b/net-misc/flexget/flexget-1.0_beta3181.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-1.0_beta3181.ebuild,v 1.1 2012/11/01 04:48:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-1.0_beta3181.ebuild,v 1.2 2012/11/02 21:45:55 floppym Exp $
EAPI=4
@@ -61,12 +61,12 @@ python_prepare_all() {
-e '/beautifulsoup4/s/, <4.2//' \
-i pavement.py || die
- epatch_user
-
if [[ ${PV} == 9999 ]]; then
# Generate setup.py
paver generate_setup || die
fi
+
+ distutils-r1_python_prepare_all
}
python_test() {
diff --git a/net-misc/flexget/flexget-9999.ebuild b/net-misc/flexget/flexget-9999.ebuild
index 6a9b920cfba1..a238e5cd2fe1 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.25 2012/11/01 04:48:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/flexget/flexget-9999.ebuild,v 1.26 2012/11/02 21:45:55 floppym Exp $
EAPI=4
@@ -61,12 +61,12 @@ python_prepare_all() {
-e '/beautifulsoup4/s/, <4.2//' \
-i pavement.py || die
- epatch_user
-
if [[ ${PV} == 9999 ]]; then
# Generate setup.py
paver generate_setup || die
fi
+
+ distutils-r1_python_prepare_all
}
python_test() {