[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass

[Michal Gorny (mgorny)]

mgorny      13/12/02 13:14:09

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Override bdist_egg->build_dir via pydistutils.cfg rather than extra command. Fixes bug #489842.

Revision  Changes    Path
1.1077               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1077&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1077&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1076&r2=1.1077

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1076
retrieving revision 1.1077
diff -u -r1.1076 -r1.1077
--- ChangeLog	2 Dec 2013 09:42:38 -0000	1.1076
+++ ChangeLog	2 Dec 2013 13:14:09 -0000	1.1077
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1076 2013/12/02 09:42:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1077 2013/12/02 13:14:09 mgorny Exp $
+
+  02 Dec 2013; Michał Górny <mgorny@g.o> distutils-r1.eclass:
+  Override bdist_egg->build_dir via pydistutils.cfg rather than extra command.
+  Fixes bug #489842.
 
   02 Dec 2013; Sergey Popov <pinkbyte@g.o> +qmake-utils.eclass:
   Add qmake-utils eclass from Qt overlay



1.92                 eclass/distutils-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.91&r2=1.92

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- distutils-r1.eclass	11 Nov 2013 15:58:40 -0000	1.91
+++ distutils-r1.eclass	2 Dec 2013 13:14:09 -0000	1.92
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.91 2013/11/11 15:58:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.92 2013/12/02 13:14:09 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -249,10 +249,8 @@
 	# 3) non-root 'install' complains about PYTHONPATH and missing dirs,
 	#    so we need to set it properly and mkdir them,
 	# 4) it runs a bunch of commands which write random files to cwd,
-	#    in order to avoid that, we need to run them ourselves to pass
-	#    alternate build paths,
-	# 5) 'install' needs to go before 'bdist_egg' or the latter would
-	#    re-set install paths.
+	#    in order to avoid that, we add the necessary path overrides
+	#    in _distutils-r1_create_setup_cfg.
 
 	TEST_DIR=${BUILD_DIR}/test
 	local bindir=${TEST_DIR}/scripts
@@ -266,12 +264,6 @@
 			--install-scripts="${bindir}"
 	)
 
-	if "${PYTHON:-python}" setup.py --help bdist_egg &>/dev/null; then
-		add_args+=(
-			bdist_egg --dist-dir="${TEST_DIR}"
-		)
-	fi
-
 	mkdir -p "${libdir}" || die
 	esetup.py "${add_args[@]}" "${@}"
 }
@@ -367,6 +359,11 @@
 
 		[egg_info]
 		egg-base = ${BUILD_DIR}
+
+		# this is needed by distutils_install_for_testing since
+		# setuptools like to create .egg files for install --home.
+		[bdist_egg]
+		dist-dir = ${BUILD_DIR}/dist
 	_EOF_
 }