From: Mike Gilbert <floppym@gentoo.org>
Date: Thu, 9 Jun 2016 17:30:19 +0000 (-0400)
Subject: net-p2p/deluge: Override esetup.py
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ddefbab8715efe37c4ac708e1f6a25cf7649e460;p=gentoo.git

net-p2p/deluge: Override esetup.py

Resolves a build failure triggered by a change in distutils-r1.eclass.

Bug: https://bugs.gentoo.org/585454

Package-Manager: portage-2.3.0_rc1_p20
---

diff --git a/net-p2p/deluge/deluge-1.3.12-r3.ebuild b/net-p2p/deluge/deluge-1.3.12-r3.ebuild
index 1327cd2d56f4..92b0c5316fbe 100644
--- a/net-p2p/deluge/deluge-1.3.12-r3.ebuild
+++ b/net-p2p/deluge/deluge-1.3.12-r3.ebuild
@@ -56,11 +56,13 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-_distutils-r1_create_setup_cfg() {
+esetup.py() {
 	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
 	# Override this call from the distutils-r1 eclass.
 	# This does not respect the distutils-r1 API. DONOT copy this example.
-	:
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
 }
 
 python_install_all() {
diff --git a/net-p2p/deluge/deluge-1.3.12.ebuild b/net-p2p/deluge/deluge-1.3.12.ebuild
index c0fec62210a1..221f13c8a0a7 100644
--- a/net-p2p/deluge/deluge-1.3.12.ebuild
+++ b/net-p2p/deluge/deluge-1.3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -55,11 +55,13 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-_distutils-r1_create_setup_cfg() {
+esetup.py() {
 	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
 	# Override this call from the distutils-r1 eclass.
 	# This does not respect the distutils-r1 API. DONOT copy this example.
-	:
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
 }
 
 python_install_all() {
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 579b78ef727a..e11f9c01a2c6 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -56,11 +56,13 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-_distutils-r1_create_setup_cfg() {
+esetup.py() {
 	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
 	# Override this call from the distutils-r1 eclass.
 	# This does not respect the distutils-r1 API. DONOT copy this example.
-	:
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
 }
 
 python_install_all() {