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

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

[Michal Gorny (mgorny)]

mgorny      12/10/15 12:51:20

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Fix missing wrapper symlinks when first supported Python implementation is disabled.

Revision  Changes    Path
1.446                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- ChangeLog	14 Oct 2012 18:18:20 -0000	1.445
+++ ChangeLog	15 Oct 2012 12:51:20 -0000	1.446
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.445 2012/10/14 18:18:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.446 2012/10/15 12:51:20 mgorny Exp $
+
+  15 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Fix missing wrapper symlinks when first supported Python implementation is
+  disabled.
 
   14 Oct 2012; Alexey Shvetsov <alexxy@gentoo.org> openib.eclass:
   Add compat-rdma



1.2                  eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- distutils-r1.eclass	14 Oct 2012 10:58:03 -0000	1.1
+++ distutils-r1.eclass	15 Oct 2012 12:51:20 -0000	1.2
@@ -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/eclass/distutils-r1.eclass,v 1.1 2012/10/14 10:58:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.2 2012/10/15 12:51:20 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -221,8 +221,14 @@
 
 	# note: keep in sync with ...rename_scripts()
 	# also, we assume that each script is installed for all impls
-	local EPYTHON PYTHON
-	_python_set_PYTHON "${PYTHON_COMPAT[0]}"
+	local impl EPYTHON PYTHON
+	for impl in "${PYTHON_COMPAT[@]}"; do
+		if use "python_targets_${impl}"; then
+			_python_set_PYTHON "${impl}"
+			break
+		fi
+	done
+
 	for f in "${D}"/{bin,sbin,usr/bin,usr/sbin}/*-"${EPYTHON}"; do
 		if [[ -x ${f} ]]; then
 			debug-print "${FUNCNAME}: found executable at ${f#${D}/}"

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

[Michal Gorny (mgorny)]

mgorny      12/10/25 17:42:39

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Add games/bin to lookup paths for rename_scripts().

Revision  Changes    Path
1.468                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- ChangeLog	25 Oct 2012 16:47:30 -0000	1.467
+++ ChangeLog	25 Oct 2012 17:42:39 -0000	1.468
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.467 2012/10/25 16:47:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.468 2012/10/25 17:42:39 mgorny Exp $
+
+  25 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Add games/bin to lookup paths for rename_scripts().
 
   25 Oct 2012; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
   Add a note about array brace expansion.



1.7                  eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- distutils-r1.eclass	25 Oct 2012 16:44:54 -0000	1.6
+++ distutils-r1.eclass	25 Oct 2012 17:42:39 -0000	1.7
@@ -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/eclass/distutils-r1.eclass,v 1.6 2012/10/25 16:44:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.7 2012/10/25 17:42:39 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -261,7 +261,7 @@
 		fi
 	done
 
-	for f in "${D}"/{bin,sbin,usr/bin,usr/sbin}/*-"${EPYTHON}"; do
+	for f in "${D}"/{bin,sbin,usr/bin,usr/sbin,games/bin}/*-"${EPYTHON}"; do
 		if [[ -x ${f} ]]; then
 			debug-print "${FUNCNAME}: found executable at ${f#${D}/}"
 

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

[Michal Gorny (mgorny)]

mgorny      12/10/29 09:49:54

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Use find instead of hard-coded executable locations list when linking the wrapper.

Revision  Changes    Path
1.479                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -r1.478 -r1.479
--- ChangeLog	29 Oct 2012 09:47:41 -0000	1.478
+++ ChangeLog	29 Oct 2012 09:49:54 -0000	1.479
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.478 2012/10/29 09:47:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.479 2012/10/29 09:49:54 mgorny Exp $
+
+  29 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Use find instead of hard-coded executable locations list when linking the
+  wrapper.
 
   29 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Use new python-r1 functions.



1.10                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- distutils-r1.eclass	29 Oct 2012 09:47:41 -0000	1.9
+++ distutils-r1.eclass	29 Oct 2012 09:49:54 -0000	1.10
@@ -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/eclass/distutils-r1.eclass,v 1.9 2012/10/29 09:47:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.10 2012/10/29 09:49:54 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -256,15 +256,14 @@
 	local EPYTHON
 	python_export_best EPYTHON
 
-	for f in "${D}"/{bin,sbin,usr/bin,usr/sbin,games/bin}/*-"${EPYTHON}"; do
-		if [[ -x ${f} ]]; then
-			debug-print "${FUNCNAME}: found executable at ${f#${D}/}"
+	local f
+	while IFS= read -r -d '' f; do
+		debug-print "${FUNCNAME}: found executable at ${f#${D}/}"
 
-			local wrapf=${f%-${EPYTHON}}
+		local wrapf=${f%-${EPYTHON}}
 
-			_python_ln_rel "${ED}"/usr/bin/python-exec "${wrapf}" || die
-		fi
-	done
+		_python_ln_rel "${ED}"/usr/bin/python-exec "${wrapf}" || die
+	done < <(find "${D}" -type f -executable -name "*-${EPYTHON}" -print0)
 }
 
 # @FUNCTION: distutils-r1_run_phase

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

[Michal Gorny (mgorny)]

mgorny      12/10/29 09:54:50

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Remove redundant "cd ${BUILD_DIR}" calls.

Revision  Changes    Path
1.481                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -r1.480 -r1.481
--- ChangeLog	29 Oct 2012 09:51:27 -0000	1.480
+++ ChangeLog	29 Oct 2012 09:54:50 -0000	1.481
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.480 2012/10/29 09:51:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.481 2012/10/29 09:54:50 mgorny Exp $
+
+  29 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Remove redundant "cd ${BUILD_DIR}" calls.
 
   29 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
   python-r1.eclass:



1.12                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- distutils-r1.eclass	29 Oct 2012 09:51:27 -0000	1.11
+++ distutils-r1.eclass	29 Oct 2012 09:54:50 -0000	1.12
@@ -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/eclass/distutils-r1.eclass,v 1.11 2012/10/29 09:51:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.12 2012/10/29 09:54:50 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -153,7 +153,6 @@
 distutils-r1_python_compile() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	cd "${BUILD_DIR}" || die
 	set -- "${PYTHON}" setup.py build "${@}"
 	echo "${@}"
 	"${@}" || die
@@ -217,7 +216,6 @@
 
 	unset PYTHONDONTWRITEBYTECODE
 
-	cd "${BUILD_DIR}" || die
 	set -- "${PYTHON}" setup.py install "${flags[@]}" --root="${D}" "${@}"
 	echo "${@}"
 	"${@}" || die

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

[Michal Gorny (mgorny)]

mgorny      12/10/29 13:30:48

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Introduce an esetup.py wrapper function and mydistutilsargs=() for it.

Revision  Changes    Path
1.483                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -r1.482 -r1.483
--- ChangeLog	29 Oct 2012 11:27:30 -0000	1.482
+++ ChangeLog	29 Oct 2012 13:30:48 -0000	1.483
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.482 2012/10/29 11:27:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.483 2012/10/29 13:30:48 mgorny Exp $
+
+  29 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Introduce an esetup.py wrapper function and mydistutilsargs=() for it.
 
   29 Oct 2012; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
   Enable python3.3 support.



1.13                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- distutils-r1.eclass	29 Oct 2012 09:54:50 -0000	1.12
+++ distutils-r1.eclass	29 Oct 2012 13:30:48 -0000	1.13
@@ -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/eclass/distutils-r1.eclass,v 1.12 2012/10/29 09:54:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.13 2012/10/29 13:30:48 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -105,6 +105,37 @@
 # HTML_DOCS=( doc/html/ )
 # @CODE
 
+# @ECLASS-VARIABLE: mydistutilsargs
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array containing options to be passed to setup.py.
+#
+# Example:
+# @CODE
+# python_configure_all() {
+# 	mydistutilsargs=( --enable-my-hidden-option )
+# }
+# @CODE
+
+# @FUNCTION: esetup.py
+# @USAGE: [<args>...]
+# @DESCRIPTION:
+# Run the setup.py using currently selected Python interpreter
+# (if ${PYTHON} is set; fallback 'python' otherwise). The setup.py will
+# be passed default command-line arguments, then ${mydistutilsargs[@]},
+# then any parameters passed to this command.
+#
+# This command dies on failure.
+esetup.py() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	set -- "${PYTHON:-python}" setup.py \
+		"${mydistutilsargs[@]}" "${@}"
+
+	echo "${@}" >&2
+	"${@}" || die
+}
+
 # @FUNCTION: distutils-r1_python_prepare_all
 # @DESCRIPTION:
 # The default python_prepare_all(). It applies the patches from PATCHES
@@ -147,15 +178,12 @@
 # @FUNCTION: distutils-r1_python_compile
 # @USAGE: [additional-args...]
 # @DESCRIPTION:
-# The default python_compile(). Runs 'setup.py build' using the correct
-# Python implementation. Any parameters passed to this function will be
-# passed to setup.py.
+# The default python_compile(). Runs 'esetup.py build'. Any parameters
+# passed to this function will be passed to setup.py.
 distutils-r1_python_compile() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	set -- "${PYTHON}" setup.py build "${@}"
-	echo "${@}"
-	"${@}" || die
+	esetup.py build "${@}"
 }
 
 # @FUNCTION: distutils-r1_python_test
@@ -197,10 +225,9 @@
 # @FUNCTION: distutils-r1_python_install
 # @USAGE: [additional-args...]
 # @DESCRIPTION:
-# The default python_install(). Runs 'setup.py install' using
-# the correct Python implementation, and appending the optimization
-# flags. Then calls distutils-r1_rename_scripts. Any parameters passed
-# to this function will be passed to setup.py.
+# The default python_install(). Runs 'esetup.py install', appending
+# the optimization flags. Then calls distutils-r1_rename_scripts.
+# Any parameters passed to this function will be passed to setup.py.
 distutils-r1_python_install() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -216,9 +243,7 @@
 
 	unset PYTHONDONTWRITEBYTECODE
 
-	set -- "${PYTHON}" setup.py install "${flags[@]}" --root="${D}" "${@}"
-	echo "${@}"
-	"${@}" || die
+	esetup.py install "${flags[@]}" --root="${D}" "${@}"
 
 	distutils-r1_rename_scripts
 }

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

[Michal Gorny (mgorny)]

mgorny      12/11/01 12:19:22

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Export PYTHONPATH for phases in out-of-source builds.

Revision  Changes    Path
1.494                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -r1.493 -r1.494
--- ChangeLog	1 Nov 2012 12:18:31 -0000	1.493
+++ ChangeLog	1 Nov 2012 12:19:22 -0000	1.494
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.493 2012/11/01 12:18:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.494 2012/11/01 12:19:22 mgorny Exp $
+
+  01 Nov 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Export PYTHONPATH for phases in out-of-source builds.
 
   01 Nov 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Explicitly set library build dir in out-of-source builds.



1.17                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- distutils-r1.eclass	1 Nov 2012 12:18:31 -0000	1.16
+++ distutils-r1.eclass	1 Nov 2012 12:19:22 -0000	1.17
@@ -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/eclass/distutils-r1.eclass,v 1.16 2012/11/01 12:18:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.17 2012/11/01 12:19:22 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -332,12 +332,22 @@
 # @USAGE: [<argv>...]
 # @INTERNAL
 # @DESCRIPTION:
-# Run the given command in BUILD_DIR.
+# Run the given command.
+#
+# If out-of-source builds are used, the phase function is run in source
+# directory, with BUILD_DIR pointing at the build directory
+# and PYTHONPATH having an entry for the module build directory.
+#
+# If in-source builds are used, the command is executed in the BUILD_DIR
+# (the directory holding per-implementation copy of sources).
 distutils-r1_run_phase() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
 		pushd "${BUILD_DIR}" &>/dev/null || die
+	else
+		local PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
+		export PYTHONPATH
 	fi
 
 	"${@}" || die "${1} failed."

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

[Michal Gorny (mgorny)]

mgorny      12/12/01 10:52:41

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Use intermediate-root install.

Revision  Changes    Path
1.535                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -r1.534 -r1.535
--- ChangeLog	1 Dec 2012 10:51:48 -0000	1.534
+++ ChangeLog	1 Dec 2012 10:52:40 -0000	1.535
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.534 2012/12/01 10:51:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.535 2012/12/01 10:52:40 mgorny Exp $
+
+  01 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Use intermediate-root install.
 
   01 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Make distutils-r1_rename_scripts private. Rename all matching executables



1.22                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- distutils-r1.eclass	1 Dec 2012 10:51:48 -0000	1.21
+++ distutils-r1.eclass	1 Dec 2012 10:52:40 -0000	1.22
@@ -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/eclass/distutils-r1.eclass,v 1.21 2012/12/01 10:51:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.22 2012/12/01 10:52:40 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -297,9 +297,14 @@
 	local PYTHONDONTWRITEBYTECODE
 	export PYTHONDONTWRITEBYTECODE
 
-	esetup.py install "${flags[@]}" --root="${D}" "${@}"
+	local root=${D}/_${EPYTHON}
 
-	_distutils-r1_rename_scripts "${D}"
+	esetup.py install "${flags[@]}" --root="${root}" "${@}"
+	_distutils-r1_rename_scripts "${root}"
+
+	# merge
+	cp -a -l -n "${root}"/* "${D}"/ || die "Merging ${EPYTHON} image failed."
+	rm -rf "${root}"
 }
 
 # @FUNCTION: distutils-r1_python_install_all

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

[Michal Gorny (mgorny)]

mgorny      12/12/01 10:53:40

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Create the wrapper symlinks directly in _distutils-r1_rename_scripts rather than postponing it to distutils-r1_install_all.

Revision  Changes    Path
1.536                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -r1.535 -r1.536
--- ChangeLog	1 Dec 2012 10:52:40 -0000	1.535
+++ ChangeLog	1 Dec 2012 10:53:40 -0000	1.536
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.535 2012/12/01 10:52:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.536 2012/12/01 10:53:40 mgorny Exp $
+
+  01 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Create the wrapper symlinks directly in _distutils-r1_rename_scripts rather
+  than postponing it to distutils-r1_install_all.
 
   01 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Use intermediate-root install.



1.23                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- distutils-r1.eclass	1 Dec 2012 10:52:40 -0000	1.22
+++ distutils-r1.eclass	1 Dec 2012 10:53:40 -0000	1.23
@@ -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/eclass/distutils-r1.eclass,v 1.22 2012/12/01 10:52:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.23 2012/12/01 10:53:40 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -268,8 +268,11 @@
 			debug-print "${FUNCNAME}: matching shebang: $(head -n 1 "${f}")"
 
 			local newf=${f}-${EPYTHON}
-			debug-print "${FUNCNAME}: renamed to ${newf#${D}/}"
+			debug-print "${FUNCNAME}: renaming to ${newf#${D}/}"
 			mv "${f}" "${newf}" || die
+
+			debug-print "${FUNCNAME}: installing wrapper at ${f#${D}/}"
+			_python_ln_rel "${path}"/usr/bin/python-exec "${f}" || die
 		fi
 	done < <(find "${path}" -type f -executable -print0)
 }
@@ -309,9 +312,7 @@
 
 # @FUNCTION: distutils-r1_python_install_all
 # @DESCRIPTION:
-# The default python_install_all(). It symlinks wrappers
-# for the implementation-suffixed executables and installs
-# documentation.
+# The default python_install_all(). It installs the documentation.
 distutils-r1_python_install_all() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -331,20 +332,6 @@
 	if declare -p HTML_DOCS &>/dev/null; then
 		dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed"
 	fi
-
-	# note: keep in sync with ...rename_scripts()
-	# also, we assume that each script is installed for all impls
-	local EPYTHON
-	python_export_best EPYTHON
-
-	local f
-	while IFS= read -r -d '' f; do
-		debug-print "${FUNCNAME}: found executable at ${f#${D}/}"
-
-		local wrapf=${f%-${EPYTHON}}
-
-		_python_ln_rel "${ED}"/usr/bin/python-exec "${wrapf}" || die
-	done < <(find "${D}" -type f -executable -name "*-${EPYTHON}" -print0)
 }
 
 # @FUNCTION: distutils-r1_run_phase

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

[Michal Gorny (mgorny)]

mgorny      12/12/01 10:54:50

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Support parallel builds using multiprocessing eclass.

Revision  Changes    Path
1.537                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -r1.536 -r1.537
--- ChangeLog	1 Dec 2012 10:53:40 -0000	1.536
+++ ChangeLog	1 Dec 2012 10:54:50 -0000	1.537
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.536 2012/12/01 10:53:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.537 2012/12/01 10:54:50 mgorny Exp $
+
+  01 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Support parallel builds using multiprocessing eclass.
 
   01 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Create the wrapper symlinks directly in _distutils-r1_rename_scripts rather



1.24                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- distutils-r1.eclass	1 Dec 2012 10:53:40 -0000	1.23
+++ distutils-r1.eclass	1 Dec 2012 10:54:50 -0000	1.24
@@ -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/eclass/distutils-r1.eclass,v 1.23 2012/12/01 10:53:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.24 2012/12/01 10:54:50 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -57,7 +57,7 @@
 
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
-inherit eutils python-r1
+inherit eutils multiprocessing python-r1
 
 fi
 
@@ -130,6 +130,29 @@
 # 'build --build-base ${BUILD_DIR}' to enforce keeping & using built
 # files in the specific root.
 
+# @ECLASS-VARIABLE: DISTUTILS_NO_PARALLEL_BUILD
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If set to a non-null value, the parallel build feature will
+# be disabled.
+#
+# When parallel builds are used, the implementation-specific sub-phases
+# for selected Python implementation will be run in parallel. This will
+# increase build efficiency with distutils which does not do parallel
+# builds.
+#
+# This variable can be used to disable the afore-mentioned feature
+# in case it causes issues with the package.
+
+#
+# If in-source builds are used, the eclass will create a copy of package
+# sources for each Python implementation in python_prepare_all(),
+# and work on that copy afterwards.
+#
+# If out-of-source builds are used, the eclass will instead work
+# on the sources directly, prepending setup.py arguments with
+# 'build --build-base ${BUILD_DIR}' to enforce keeping & using built
+# files in the specific root.
 # @ECLASS-VARIABLE: mydistutilsargs
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -356,7 +379,11 @@
 		export PYTHONPATH
 	fi
 
-	"${@}" || die "${1} failed."
+	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
+		"${@}" || die "${1} failed."
+	else
+		multijob_child_init "${@}" || die "${1} failed."
+	fi
 
 	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
 		popd &>/dev/null || die
@@ -373,19 +400,23 @@
 		distutils-r1_python_prepare_all
 	fi
 
+	multijob_init
 	if declare -f python_prepare >/dev/null; then
 		python_foreach_impl distutils-r1_run_phase python_prepare
 	else
 		python_foreach_impl distutils-r1_run_phase distutils-r1_python_prepare
 	fi
+	multijob_finish
 }
 
 distutils-r1_src_configure() {
+	multijob_init
 	if declare -f python_configure >/dev/null; then
 		python_foreach_impl distutils-r1_run_phase python_configure
 	else
 		python_foreach_impl distutils-r1_run_phase distutils-r1_python_configure
 	fi
+	multijob_finish
 
 	if declare -f python_configure_all >/dev/null; then
 		python_configure_all
@@ -395,11 +426,13 @@
 distutils-r1_src_compile() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	multijob_init
 	if declare -f python_compile >/dev/null; then
 		python_foreach_impl distutils-r1_run_phase python_compile
 	else
 		python_foreach_impl distutils-r1_run_phase distutils-r1_python_compile
 	fi
+	multijob_finish
 
 	if declare -f python_compile_all >/dev/null; then
 		python_compile_all
@@ -409,11 +442,13 @@
 distutils-r1_src_test() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	multijob_init
 	if declare -f python_test >/dev/null; then
 		python_foreach_impl distutils-r1_run_phase python_test
 	else
 		python_foreach_impl distutils-r1_run_phase distutils-r1_python_test
 	fi
+	multijob_finish
 
 	if declare -f python_test_all >/dev/null; then
 		python_test_all
@@ -423,11 +458,13 @@
 distutils-r1_src_install() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	multijob_init
 	if declare -f python_install >/dev/null; then
 		python_foreach_impl distutils-r1_run_phase python_install
 	else
 		python_foreach_impl distutils-r1_run_phase distutils-r1_python_install
 	fi
+	multijob_finish
 
 	if declare -f python_install_all >/dev/null; then
 		python_install_all

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

[Michal Gorny (mgorny)]

mgorny      12/12/07 17:56:22

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Do not die when sub-phases return non-true value. This is inconsistent with normal phase behavior and not really useful since phase functions are supposed to die on their own.

Revision  Changes    Path
1.548                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -r1.547 -r1.548
--- ChangeLog	7 Dec 2012 17:55:04 -0000	1.547
+++ ChangeLog	7 Dec 2012 17:56:22 -0000	1.548
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.547 2012/12/07 17:55:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.548 2012/12/07 17:56:22 mgorny Exp $
+
+  07 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Do not die when sub-phases return non-true value. This is inconsistent with
+  normal phase behavior and not really useful since phase functions are
+  supposed to die on their own.
 
   07 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Pass the best Python implementation info to the implementation-common phase



1.26                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- distutils-r1.eclass	7 Dec 2012 17:55:04 -0000	1.25
+++ distutils-r1.eclass	7 Dec 2012 17:56:22 -0000	1.26
@@ -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/eclass/distutils-r1.eclass,v 1.25 2012/12/07 17:55:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.26 2012/12/07 17:56:22 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -380,9 +380,9 @@
 	fi
 
 	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
-		"${@}" || die "${1} failed."
+		"${@}"
 	else
-		multijob_child_init "${@}" || die "${1} failed."
+		multijob_child_init "${@}"
 	fi
 
 	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then

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

[Michal Gorny (mgorny)]

mgorny      12/12/07 17:57:46

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Use multiprocessing post-fork wait mode to avoid early output when all jobs are running.

Revision  Changes    Path
1.549                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.548
retrieving revision 1.549
diff -u -r1.548 -r1.549
--- ChangeLog	7 Dec 2012 17:56:22 -0000	1.548
+++ ChangeLog	7 Dec 2012 17:57:46 -0000	1.549
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.548 2012/12/07 17:56:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.549 2012/12/07 17:57:46 mgorny Exp $
+
+  07 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Use multiprocessing post-fork wait mode to avoid early output when all jobs
+  are running.
 
   07 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Do not die when sub-phases return non-true value. This is inconsistent with



1.27                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- distutils-r1.eclass	7 Dec 2012 17:56:22 -0000	1.26
+++ distutils-r1.eclass	7 Dec 2012 17:57:46 -0000	1.27
@@ -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/eclass/distutils-r1.eclass,v 1.26 2012/12/07 17:56:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.27 2012/12/07 17:57:46 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -382,7 +382,7 @@
 	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
 		"${@}"
 	else
-		multijob_child_init "${@}"
+		multijob_child_init --post "${@}"
 	fi
 
 	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then

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

[Michal Gorny (mgorny)]

mgorny      12/12/07 17:59:12

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Write split build logs for easier debugging.

Revision  Changes    Path
1.550                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.549
retrieving revision 1.550
diff -u -r1.549 -r1.550
--- ChangeLog	7 Dec 2012 17:57:46 -0000	1.549
+++ ChangeLog	7 Dec 2012 17:59:12 -0000	1.550
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.549 2012/12/07 17:57:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.550 2012/12/07 17:59:12 mgorny Exp $
+
+  07 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Write split build logs for easier debugging.
 
   07 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Use multiprocessing post-fork wait mode to avoid early output when all jobs



1.28                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- distutils-r1.eclass	7 Dec 2012 17:57:46 -0000	1.27
+++ distutils-r1.eclass	7 Dec 2012 17:59:12 -0000	1.28
@@ -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/eclass/distutils-r1.eclass,v 1.27 2012/12/07 17:57:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.28 2012/12/07 17:59:12 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -382,7 +382,11 @@
 	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
 		"${@}"
 	else
-		multijob_child_init --post "${@}"
+		(
+			multijob_child_init
+			"${@}" 2>&1 | tee -a "${T}/build-${EPYTHON}.log"
+		) &
+		multijob_post_fork
 	fi
 
 	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then

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

[Michal Gorny (mgorny)]

mgorny      12/12/07 21:09:22

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Report running implementation-common sub-phases verbosely.

Revision  Changes    Path
1.552                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.551
retrieving revision 1.552
diff -u -r1.551 -r1.552
--- ChangeLog	7 Dec 2012 18:00:08 -0000	1.551
+++ ChangeLog	7 Dec 2012 21:09:22 -0000	1.552
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.551 2012/12/07 18:00:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.552 2012/12/07 21:09:22 mgorny Exp $
+
+  07 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Report running implementation-common sub-phases verbosely.
 
   07 Dec 2012; Michał Górny <mgorny@gentoo.org> python-any-r1.eclass:
   Respect user preferences in python-any-r1 (EPYTHON, eselect-python).



1.29                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- distutils-r1.eclass	7 Dec 2012 17:59:12 -0000	1.28
+++ distutils-r1.eclass	7 Dec 2012 21:09:22 -0000	1.29
@@ -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/eclass/distutils-r1.eclass,v 1.28 2012/12/07 17:59:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.29 2012/12/07 21:09:22 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -412,6 +412,7 @@
 
 	export EPYTHON PYTHON PYTHONPATH
 
+	einfo "common: running ${1}"
 	"${@}"
 }
 

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

[Michal Gorny (mgorny)]

mgorny      12/12/07 22:23:04

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Use separate TMPDIR for each Python implementation.

Revision  Changes    Path
1.553                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -r1.552 -r1.553
--- ChangeLog	7 Dec 2012 21:09:22 -0000	1.552
+++ ChangeLog	7 Dec 2012 22:23:04 -0000	1.553
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.552 2012/12/07 21:09:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.553 2012/12/07 22:23:04 mgorny Exp $
+
+  07 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Use separate TMPDIR for each Python implementation.
 
   07 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Report running implementation-common sub-phases verbosely.



1.30                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- distutils-r1.eclass	7 Dec 2012 21:09:22 -0000	1.29
+++ distutils-r1.eclass	7 Dec 2012 22:23:04 -0000	1.30
@@ -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/eclass/distutils-r1.eclass,v 1.29 2012/12/07 21:09:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.30 2012/12/07 22:23:04 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -379,6 +379,10 @@
 		export PYTHONPATH
 	fi
 
+	local TMPDIR=${T}/${EPYTHON}
+
+	mkdir -p "${TMPDIR}" || die
+
 	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
 		"${@}"
 	else

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

[Michal Gorny (mgorny)]

mgorny      12/12/09 20:56:25

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Fix python-exec symlink generation for Prefix. Thanks to Fabian Groffen for help.

Revision  Changes    Path
1.556                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -r1.555 -r1.556
--- ChangeLog	9 Dec 2012 15:37:12 -0000	1.555
+++ ChangeLog	9 Dec 2012 20:56:25 -0000	1.556
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.555 2012/12/09 15:37:12 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.556 2012/12/09 20:56:25 mgorny Exp $
+
+  09 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Fix python-exec symlink generation for Prefix. Thanks to Fabian Groffen for
+  help.
 
   09 Dec 2012; Ian Stakenvicius <axs@gentoo.org> mozcoreconf-2.eclass,
   mozconfig-3.eclass:



1.31                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- distutils-r1.eclass	7 Dec 2012 22:23:04 -0000	1.30
+++ distutils-r1.eclass	9 Dec 2012 20:56:25 -0000	1.31
@@ -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/eclass/distutils-r1.eclass,v 1.30 2012/12/07 22:23:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.31 2012/12/09 20:56:25 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -295,7 +295,7 @@
 			mv "${f}" "${newf}" || die
 
 			debug-print "${FUNCNAME}: installing wrapper at ${f#${D}/}"
-			_python_ln_rel "${path}"/usr/bin/python-exec "${f}" || die
+			_python_ln_rel "${path}${EPREFIX}"/usr/bin/python-exec "${f}" || die
 		fi
 	done < <(find "${path}" -type f -executable -print0)
 }

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

[Michal Gorny (mgorny)]

mgorny      12/12/27 22:57:28

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Pass --build-scripts path to setup.py (when out-of-source builds are used).

Revision  Changes    Path
1.579                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- ChangeLog	27 Dec 2012 22:56:53 -0000	1.578
+++ ChangeLog	27 Dec 2012 22:57:28 -0000	1.579
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.578 2012/12/27 22:56:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.579 2012/12/27 22:57:28 mgorny Exp $
+
+  27 Dec 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Pass --build-scripts path to setup.py (when out-of-source builds are used).
 
   27 Dec 2012; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
   Introduce functions to get the includedir for Python.



1.34                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- distutils-r1.eclass	16 Dec 2012 23:26:15 -0000	1.33
+++ distutils-r1.eclass	27 Dec 2012 22:57:28 -0000	1.34
@@ -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/eclass/distutils-r1.eclass,v 1.33 2012/12/16 23:26:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.34 2012/12/27 22:57:28 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -188,6 +188,8 @@
 			--build-base "${BUILD_DIR}"
 			# using a single directory for them helps us export ${PYTHONPATH}
 			--build-lib "${BUILD_DIR}/lib"
+			# make the ebuild writer lives easier
+			--build-scripts "${BUILD_DIR}/scripts"
 		)
 	fi
 

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

[Mike Gilbert (floppym)]

floppym     13/01/04 03:12:44

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  addpredict /usr/lib/portage/pym in distutils-r1_src_install.

Revision  Changes    Path
1.595                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.594
retrieving revision 1.595
diff -u -r1.594 -r1.595
--- ChangeLog	4 Jan 2013 01:26:22 -0000	1.594
+++ ChangeLog	4 Jan 2013 03:12:44 -0000	1.595
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.594 2013/01/04 01:26:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.595 2013/01/04 03:12:44 floppym Exp $
+
+  04 Jan 2013; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass:
+  addpredict /usr/lib/portage/pym in distutils-r1_src_install.
 
   04 Jan 2013; Mike Gilbert <floppym@gentoo.org> python-r1.eclass:
   Don't tell the user to set USE_PYTHON when a package does not support



1.36                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- distutils-r1.eclass	2 Jan 2013 21:12:44 -0000	1.35
+++ distutils-r1.eclass	4 Jan 2013 03:12:44 -0000	1.36
@@ -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.35 2013/01/02 21:12:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.36 2013/01/04 03:12:44 floppym Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -326,6 +326,7 @@
 	# python likes to compile any module it sees, which triggers sandbox
 	# failures if some packages haven't compiled their modules yet.
 	addpredict "$(python_get_sitedir)"
+	addpredict /usr/lib/portage/pym
 
 	local root=${D}/_${EPYTHON}
 

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

[Michal Gorny (mgorny)]

mgorny      13/01/05 10:00:31

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Always write split logs, even in non-parallel builds.

Revision  Changes    Path
1.599                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.598
retrieving revision 1.599
diff -u -r1.598 -r1.599
--- ChangeLog	5 Jan 2013 02:27:16 -0000	1.598
+++ ChangeLog	5 Jan 2013 10:00:30 -0000	1.599
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.598 2013/01/05 02:27:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.599 2013/01/05 10:00:30 mgorny Exp $
+
+  05 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Always write split logs, even in non-parallel builds.
 
   05 Jan 2013; Zac Medico <zmedico@gentoo.org> autotools.eclass:
   Avoid unsafe nested multijob_finish_one in eautoreconf for bug #426512.



1.37                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- distutils-r1.eclass	4 Jan 2013 03:12:44 -0000	1.36
+++ distutils-r1.eclass	5 Jan 2013 10:00:30 -0000	1.37
@@ -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.36 2013/01/04 03:12:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.37 2013/01/05 10:00:30 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -389,7 +389,7 @@
 	mkdir -p "${TMPDIR}" || die
 
 	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
-		"${@}"
+		"${@}" 2>&1 | tee -a "${T}/build-${EPYTHON}.log"
 	else
 		(
 			multijob_child_init

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

[Michal Gorny (mgorny)]

mgorny      13/01/05 10:02:44

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Support overriding job-count for parallel build.

Revision  Changes    Path
1.601                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.600
retrieving revision 1.601
diff -u -r1.600 -r1.601
--- ChangeLog	5 Jan 2013 10:01:20 -0000	1.600
+++ ChangeLog	5 Jan 2013 10:02:44 -0000	1.601
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.600 2013/01/05 10:01:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.601 2013/01/05 10:02:44 mgorny Exp $
+
+  05 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Support overriding job-count for parallel build.
 
   05 Jan 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
   Support converting files with python2 and python3 shebangs.



1.38                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- distutils-r1.eclass	5 Jan 2013 10:00:30 -0000	1.37
+++ distutils-r1.eclass	5 Jan 2013 10:02:44 -0000	1.38
@@ -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.37 2013/01/05 10:00:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.38 2013/01/05 10:02:44 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -67,6 +67,14 @@
 RDEPEND=${PYTHON_DEPS}
 DEPEND=${PYTHON_DEPS}
 
+# @ECLASS-VARIABLE: DISTUTILS_JOBS
+# @DEFAULT_UNSET
+# @DECRIPTION:
+# The number of parallel jobs to run for distutils-r1 parallel builds.
+# If unset, the job-count in ${MAKEOPTS} will be used.
+#
+# This variable is intended to be set in make.conf.
+
 # @ECLASS-VARIABLE: PATCHES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -143,15 +151,6 @@
 # This variable can be used to disable the afore-mentioned feature
 # in case it causes issues with the package.
 
-#
-# If in-source builds are used, the eclass will create a copy of package
-# sources for each Python implementation in python_prepare_all(),
-# and work on that copy afterwards.
-#
-# If out-of-source builds are used, the eclass will instead work
-# on the sources directly, prepending setup.py arguments with
-# 'build --build-base ${BUILD_DIR}' to enforce keeping & using built
-# files in the specific root.
 # @ECLASS-VARIABLE: mydistutilsargs
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -425,6 +424,23 @@
 	"${@}"
 }
 
+# @FUNCTION: _distutils-r1_multijob_init
+# @INTERNAL
+# @DESCRIPTION:
+# Init multijob, taking the job-count from ${DISTUTILS_JOBS}.
+_distutils-r1_multijob_init() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	local opts
+	if [[ ${DISTUTILS_JOBS} ]]; then
+		opts=-j${DISTUTILS_JOBS}
+	else
+		opts=${MAKEOPTS}
+	fi
+
+	multijob_init "${opts}"
+}
+
 distutils-r1_src_prepare() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -435,7 +451,7 @@
 		distutils-r1_python_prepare_all
 	fi
 
-	multijob_init
+	_distutils-r1_multijob_init
 	if declare -f python_prepare >/dev/null; then
 		python_foreach_impl distutils-r1_run_phase python_prepare
 	else
@@ -445,7 +461,7 @@
 }
 
 distutils-r1_src_configure() {
-	multijob_init
+	_distutils-r1_multijob_init
 	if declare -f python_configure >/dev/null; then
 		python_foreach_impl distutils-r1_run_phase python_configure
 	else
@@ -461,7 +477,7 @@
 distutils-r1_src_compile() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	multijob_init
+	_distutils-r1_multijob_init
 	if declare -f python_compile >/dev/null; then
 		python_foreach_impl distutils-r1_run_phase python_compile
 	else
@@ -477,7 +493,7 @@
 distutils-r1_src_test() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	multijob_init
+	_distutils-r1_multijob_init
 	if declare -f python_test >/dev/null; then
 		python_foreach_impl distutils-r1_run_phase python_test
 	else
@@ -493,7 +509,7 @@
 distutils-r1_src_install() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	multijob_init
+	_distutils-r1_multijob_init
 	if declare -f python_install >/dev/null; then
 		python_foreach_impl distutils-r1_run_phase python_install
 	else

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

[Michal Gorny (mgorny)]

mgorny      13/01/10 22:09:30

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Use locks to avoid race conditions when merging (bug #449760). Use tar instead of cp on FreeBSD due to bug when copying broken symlinks (bug #447370).

Revision  Changes    Path
1.606                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.605
retrieving revision 1.606
diff -u -r1.605 -r1.606
--- ChangeLog	9 Jan 2013 17:26:55 -0000	1.605
+++ ChangeLog	10 Jan 2013 22:09:30 -0000	1.606
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.605 2013/01/09 17:26:55 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.606 2013/01/10 22:09:30 mgorny Exp $
+
+  10 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Use locks to avoid race conditions when merging (bug #449760). Use tar
+  instead of cp on FreeBSD due to bug when copying broken symlinks (bug
+  #447370).
 
   09 Jan 2013; Ian Stakenvicius <axs@gentoo.org> git-2.eclass:
   added documentation for an undocumented override variable



1.39                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- distutils-r1.eclass	5 Jan 2013 10:02:44 -0000	1.38
+++ distutils-r1.eclass	10 Jan 2013 22:09:30 -0000	1.39
@@ -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.38 2013/01/05 10:02:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.39 2013/01/10 22:09:30 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -332,9 +332,40 @@
 	esetup.py install "${flags[@]}" --root="${root}" "${@}"
 	_distutils-r1_rename_scripts "${root}"
 
-	# merge
-	cp -a -l -n "${root}"/* "${D}"/ || die "Merging ${EPYTHON} image failed."
-	rm -rf "${root}"
+	_distutils-r1_merge_root "${root}" "${D}"
+}
+
+# @FUNCTION: distutils-r1_merge_root
+# @USAGE: <src-root> <dest-root>
+# @INTERNAL
+# @DESCRIPTION:
+# Merge the directory tree from <src-root> to <dest-root>, removing
+# the <src-root> in the process.
+_distutils-r1_merge_root() {
+	local src=${1}
+	local dest=${2}
+
+	local lockfile=${T}/distutils-r1-merge-lock
+
+	if type -P lockf &>/dev/null; then
+		# On BSD, we have 'lockf' wrapper.
+		tar -C "${src}" -f - -c . \
+			| lockf "${lockfile}" tar -x -f - -C "${dest}"
+	else
+		if type -P flock &>/dev/null; then
+			# On Linux, we have 'flock' which can lock fd.
+			local lock_fd
+			redirect_alloc_fd lock_fd "${lockfile}" '>>'
+			flock ${lock_fd}
+		else
+			ewarn "distutils-r1: no locking service found, please report."
+		fi
+
+		cp -a -l -n "${src}"/. "${dest}"/
+	fi
+	[[ ${?} == 0 ]] || die "Merging ${EPYTHON} image failed."
+
+	rm -rf "${src}"
 }
 
 # @FUNCTION: distutils-r1_python_install_all

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

[Mike Gilbert (floppym)]

floppym     13/01/11 01:06:37

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Close the lock file explicitly instead of relying on the subshell created by the pipe to tee in distutils-r1_run_phase.

Revision  Changes    Path
1.607                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.606
retrieving revision 1.607
diff -u -r1.606 -r1.607
--- ChangeLog	10 Jan 2013 22:09:30 -0000	1.606
+++ ChangeLog	11 Jan 2013 01:06:37 -0000	1.607
@@ -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.606 2013/01/10 22:09:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.607 2013/01/11 01:06:37 floppym Exp $
+
+  11 Jan 2013; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass:
+  Close the lock file explicitly instead of relying on the subshell created by
+  the pipe to tee in distutils-r1_run_phase.
 
   10 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Use locks to avoid race conditions when merging (bug #449760). Use tar



1.40                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- distutils-r1.eclass	10 Jan 2013 22:09:30 -0000	1.39
+++ distutils-r1.eclass	11 Jan 2013 01:06:37 -0000	1.40
@@ -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.39 2013/01/10 22:09:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.40 2013/01/11 01:06:37 floppym Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -352,9 +352,9 @@
 		tar -C "${src}" -f - -c . \
 			| lockf "${lockfile}" tar -x -f - -C "${dest}"
 	else
+		local lock_fd
 		if type -P flock &>/dev/null; then
 			# On Linux, we have 'flock' which can lock fd.
-			local lock_fd
 			redirect_alloc_fd lock_fd "${lockfile}" '>>'
 			flock ${lock_fd}
 		else
@@ -362,6 +362,12 @@
 		fi
 
 		cp -a -l -n "${src}"/. "${dest}"/
+
+		if [[ ${lock_fd} ]]; then
+			# Close the lock file when we are done with it.
+			# Prevents deadlock if we aren't in a subshell.
+			eval "exec ${lock_fd}>&-"
+		fi
 	fi
 	[[ ${?} == 0 ]] || die "Merging ${EPYTHON} image failed."
 

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

[Michal Gorny (mgorny)]

mgorny      13/01/12 23:13:14

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Do not call dummy phases unnecessarily.

Revision  Changes    Path
1.610                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.609
retrieving revision 1.610
diff -u -r1.609 -r1.610
--- ChangeLog	12 Jan 2013 14:35:48 -0000	1.609
+++ ChangeLog	12 Jan 2013 23:13:14 -0000	1.610
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.609 2013/01/12 14:35:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.610 2013/01/12 23:13:14 mgorny Exp $
+
+  12 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Do not call dummy phases unnecessarily.
 
   12 Jan 2013; Justin Lecher <jlec@gentoo.org> flag-o-matic.eclass:
   Don't check for twice, but check for redirect support, #445244; thanks Andrey



1.41                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- distutils-r1.eclass	11 Jan 2013 01:06:37 -0000	1.40
+++ distutils-r1.eclass	12 Jan 2013 23:13:14 -0000	1.41
@@ -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.40 2013/01/11 01:06:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.41 2013/01/12 23:13:14 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -491,8 +491,6 @@
 	_distutils-r1_multijob_init
 	if declare -f python_prepare >/dev/null; then
 		python_foreach_impl distutils-r1_run_phase python_prepare
-	else
-		python_foreach_impl distutils-r1_run_phase distutils-r1_python_prepare
 	fi
 	multijob_finish
 }
@@ -501,8 +499,6 @@
 	_distutils-r1_multijob_init
 	if declare -f python_configure >/dev/null; then
 		python_foreach_impl distutils-r1_run_phase python_configure
-	else
-		python_foreach_impl distutils-r1_run_phase distutils-r1_python_configure
 	fi
 	multijob_finish
 
@@ -533,8 +529,6 @@
 	_distutils-r1_multijob_init
 	if declare -f python_test >/dev/null; then
 		python_foreach_impl distutils-r1_run_phase python_test
-	else
-		python_foreach_impl distutils-r1_run_phase distutils-r1_python_test
 	fi
 	multijob_finish
 

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

[Michal Gorny (mgorny)]

mgorny      13/01/12 23:13:44

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Support specifying directories in DOCS.

Revision  Changes    Path
1.611                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.610
retrieving revision 1.611
diff -u -r1.610 -r1.611
--- ChangeLog	12 Jan 2013 23:13:14 -0000	1.610
+++ ChangeLog	12 Jan 2013 23:13:44 -0000	1.611
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.610 2013/01/12 23:13:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.611 2013/01/12 23:13:44 mgorny Exp $
+
+  12 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Support specifying directories in DOCS.
 
   12 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Do not call dummy phases unnecessarily.



1.42                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- distutils-r1.eclass	12 Jan 2013 23:13:14 -0000	1.41
+++ distutils-r1.eclass	12 Jan 2013 23:13:44 -0000	1.42
@@ -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.41 2013/01/12 23:13:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.42 2013/01/12 23:13:44 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -381,7 +381,7 @@
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if declare -p DOCS &>/dev/null; then
-		dodoc "${DOCS[@]}" || die "dodoc failed"
+		dodoc -r "${DOCS[@]}" || die "dodoc failed"
 	else
 		local f
 		# same list as in PMS

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

[Michal Gorny (mgorny)]

mgorny      13/01/12 23:17:22

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Pass arguments to setup.py in an predictable order, especially do not prepend commands before user options.

Revision  Changes    Path
1.612                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.611
retrieving revision 1.612
diff -u -r1.611 -r1.612
--- ChangeLog	12 Jan 2013 23:13:44 -0000	1.611
+++ ChangeLog	12 Jan 2013 23:17:22 -0000	1.612
@@ -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.611 2013/01/12 23:13:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.612 2013/01/12 23:17:22 mgorny Exp $
+
+  12 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Pass arguments to setup.py in an predictable order, especially do not prepend
+  commands before user options.
 
   12 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Support specifying directories in DOCS.



1.43                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- distutils-r1.eclass	12 Jan 2013 23:13:44 -0000	1.42
+++ distutils-r1.eclass	12 Jan 2013 23:17:22 -0000	1.43
@@ -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.42 2013/01/12 23:13:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.43 2013/01/12 23:17:22 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -168,20 +168,21 @@
 # @DESCRIPTION:
 # Run the setup.py using currently selected Python interpreter
 # (if ${PYTHON} is set; fallback 'python' otherwise). The setup.py will
-# be passed default command-line arguments, then ${mydistutilsargs[@]},
-# then any parameters passed to this command.
+# be passed default ${mydistutilsargs[@]}, then any parameters passed
+# to this command and optionally a standard option set (e.g. the build
+# directory in an ebuild using out-of-source builds).
 #
 # This command dies on failure.
 esetup.py() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	local args=()
+	local add_args=()
 	if [[ ! ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
 		if [[ ! ${BUILD_DIR} ]]; then
 			die 'Out-of-source build requested, yet BUILD_DIR unset.'
 		fi
 
-		args+=(
+		add_args+=(
 			build
 			--build-base "${BUILD_DIR}"
 			# using a single directory for them helps us export ${PYTHONPATH}
@@ -192,7 +193,7 @@
 	fi
 
 	set -- "${PYTHON:-python}" setup.py \
-		"${args[@]}" "${mydistutilsargs[@]}" "${@}"
+		"${mydistutilsargs[@]}" "${@}" "${add_args[@]}"
 
 	echo "${@}" >&2
 	"${@}" || die
@@ -228,9 +229,7 @@
 
 # @FUNCTION: distutils-r1_python_prepare
 # @DESCRIPTION:
-# The default python_prepare(). Currently it is a no-op
-# but in the future it may apply implementation-specific quirks
-# to the build system.
+# The default python_prepare(). A no-op.
 distutils-r1_python_prepare() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -239,7 +238,7 @@
 
 # @FUNCTION: distutils-r1_python_configure
 # @DESCRIPTION:
-# The default python_configure(). Currently a no-op.
+# The default python_configure(). A no-op.
 distutils-r1_python_configure() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -250,7 +249,8 @@
 # @USAGE: [additional-args...]
 # @DESCRIPTION:
 # The default python_compile(). Runs 'esetup.py build'. Any parameters
-# passed to this function will be passed to setup.py.
+# passed to this function will be appended to setup.py invocation,
+# i.e. passed as options to the 'build' command.
 distutils-r1_python_compile() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -259,7 +259,7 @@
 
 # @FUNCTION: distutils-r1_python_test
 # @DESCRIPTION:
-# The default python_test(). Currently a no-op.
+# The default python_test(). A no-op.
 distutils-r1_python_test() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -304,7 +304,8 @@
 # @DESCRIPTION:
 # The default python_install(). Runs 'esetup.py install', appending
 # the optimization flags. Then renames the installed scripts.
-# Any parameters passed to this function will be passed to setup.py.
+# Any parameters passed to this function will be appended
+# to the setup.py invocation (i.e. as options to the 'install' command).
 distutils-r1_python_install() {
 	debug-print-function ${FUNCNAME} "${@}"
 

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

[Michal Gorny (mgorny)]

mgorny      13/01/12 23:18:20

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Provide best implementation's build dir in python_*_all() as BUILD_DIR to make use of esetup.py easier.

Revision  Changes    Path
1.613                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -r1.612 -r1.613
--- ChangeLog	12 Jan 2013 23:17:22 -0000	1.612
+++ ChangeLog	12 Jan 2013 23:18:20 -0000	1.613
@@ -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.612 2013/01/12 23:17:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.613 2013/01/12 23:18:20 mgorny Exp $
+
+  12 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Provide best implementation's build dir in python_*_all() as BUILD_DIR to
+  make use of esetup.py easier.
 
   12 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Pass arguments to setup.py in an predictable order, especially do not prepend



1.44                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- distutils-r1.eclass	12 Jan 2013 23:17:22 -0000	1.43
+++ distutils-r1.eclass	12 Jan 2013 23:18:20 -0000	1.44
@@ -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.43 2013/01/12 23:17:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.44 2013/01/12 23:18:20 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -451,9 +451,11 @@
 # @DESCRIPTION:
 # Run the given command, restoring the best-implementation state.
 _distutils-r1_run_common_phase() {
+	local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR}
+
 	local EPYTHON=${_DISTUTILS_BEST_IMPL[0]}
 	local PYTHON=${_DISTUTILS_BEST_IMPL[1]}
-	local BEST_BUILD_DIR=${_DISTUTILS_BEST_IMPL[2]}
+	local BUILD_DIR=${_DISTUTILS_BEST_IMPL[2]}
 	local PYTHONPATH=${_DISTUTILS_BEST_IMPL[3]}
 
 	export EPYTHON PYTHON PYTHONPATH

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

[Michal Gorny (mgorny)]

mgorny      13/01/20 21:41:08

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Do not redirect stderr of pushd&popd. Thanks to vapier for catching that.

Revision  Changes    Path
1.628                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -r1.627 -r1.628
--- ChangeLog	20 Jan 2013 11:42:30 -0000	1.627
+++ ChangeLog	20 Jan 2013 21:41:08 -0000	1.628
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.627 2013/01/20 11:42:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.628 2013/01/20 21:41:08 mgorny Exp $
+
+  20 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Do not redirect stderr of pushd&popd. Thanks to vapier for catching that.
 
   20 Jan 2013; Pacho Ramos <pacho@gentoo.org> +readme.gentoo.eclass:
   Finally commit readme.gentoo.eclass to create a README.gentoo doc file



1.46                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- distutils-r1.eclass	15 Jan 2013 11:10:17 -0000	1.45
+++ distutils-r1.eclass	20 Jan 2013 21:41:08 -0000	1.46
@@ -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.45 2013/01/15 11:10:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.46 2013/01/20 21:41:08 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -415,7 +415,7 @@
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
-		pushd "${BUILD_DIR}" &>/dev/null || die
+		pushd "${BUILD_DIR}" >/dev/null || die
 	else
 		local PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
 		export PYTHONPATH
@@ -436,7 +436,7 @@
 	fi
 
 	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
-		popd &>/dev/null || die
+		popd >/dev/null || die
 	fi
 
 	# Store them for reuse.

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

[Michal Gorny (mgorny)]

mgorny      13/01/27 16:37:28

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Support making dependency and phase function enforcement optional.

Revision  Changes    Path
1.649                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.648
retrieving revision 1.649
diff -u -r1.648 -r1.649
--- ChangeLog	27 Jan 2013 16:36:21 -0000	1.648
+++ ChangeLog	27 Jan 2013 16:37:28 -0000	1.649
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.648 2013/01/27 16:36:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.649 2013/01/27 16:37:28 mgorny Exp $
+
+  27 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Support making dependency and phase function enforcement optional.
 
   27 Jan 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
   Introduce run_in_build_dir() function as used by GNOME ebuilds.



1.47                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- distutils-r1.eclass	20 Jan 2013 21:41:08 -0000	1.46
+++ distutils-r1.eclass	27 Jan 2013 16:37:28 -0000	1.47
@@ -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.46 2013/01/20 21:41:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.47 2013/01/27 16:37:28 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -54,18 +54,34 @@
 		;;
 esac
 
+# @ECLASS-VARIABLE: DISTUTILS_OPTIONAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If set to a non-null value, distutils part in the ebuild will
+# be considered optional. No dependencies will be added and no phase
+# functions will be exported.
+#
+# If you enable DISTUTILS_OPTIONAL, you have to set proper dependencies
+# for your package (using ${PYTHON_DEPS}) and to either call
+# distutils-r1 default phase functions or call the build system
+# manually.
+
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
 inherit eutils multiprocessing python-r1
 
 fi
 
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
+if [[ ! ${DISTUTILS_OPTIONAL} ]]; then
+	EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
+fi
 
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
-RDEPEND=${PYTHON_DEPS}
-DEPEND=${PYTHON_DEPS}
+if [[ ! ${DISTUTILS_OPTIONAL} ]]; then
+	RDEPEND=${PYTHON_DEPS}
+	DEPEND=${PYTHON_DEPS}
+fi
 
 # @ECLASS-VARIABLE: DISTUTILS_JOBS
 # @DEFAULT_UNSET

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

[Michal Gorny (mgorny)]

mgorny      13/01/27 16:39:23

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Support using distutils-r1 along with python-single-r1.

Revision  Changes    Path
1.650                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.649
retrieving revision 1.650
diff -u -r1.649 -r1.650
--- ChangeLog	27 Jan 2013 16:37:28 -0000	1.649
+++ ChangeLog	27 Jan 2013 16:39:23 -0000	1.650
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.649 2013/01/27 16:37:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.650 2013/01/27 16:39:23 mgorny Exp $
+
+  27 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Support using distutils-r1 along with python-single-r1.
 
   27 Jan 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Support making dependency and phase function enforcement optional.



1.48                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- distutils-r1.eclass	27 Jan 2013 16:37:28 -0000	1.47
+++ distutils-r1.eclass	27 Jan 2013 16:39:23 -0000	1.48
@@ -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.47 2013/01/27 16:37:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.48 2013/01/27 16:39:23 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -66,9 +66,26 @@
 # distutils-r1 default phase functions or call the build system
 # manually.
 
+# @ECLASS-VARIABLE: DISTUTILS_SINGLE_IMPL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If set to a non-null value, the ebuild will support setting a single
+# Python implementation only. It will effectively replace the python-r1
+# eclass inherit with python-single-r1.
+#
+# Note that inheriting python-single-r1 will cause pkg_setup()
+# to be exported. It must be run in order for the eclass functions
+# to function properly.
+
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
-inherit eutils multiprocessing python-r1
+inherit eutils
+
+if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+	inherit multiprocessing python-r1
+else
+	inherit python-single-r1
+fi
 
 fi
 
@@ -237,7 +254,8 @@
 		fi
 	fi
 
-	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
+	if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
+	then
 		# create source copies for each implementation
 		python_copy_sources
 	fi
@@ -345,11 +363,14 @@
 	addpredict /usr/lib/portage/pym
 
 	local root=${D}/_${EPYTHON}
+	[[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D}
 
 	esetup.py install "${flags[@]}" --root="${root}" "${@}"
-	_distutils-r1_rename_scripts "${root}"
 
-	_distutils-r1_merge_root "${root}" "${D}"
+	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+		_distutils-r1_rename_scripts "${root}"
+		_distutils-r1_merge_root "${root}" "${D}"
+	fi
 }
 
 # @FUNCTION: distutils-r1_merge_root
@@ -431,7 +452,9 @@
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
-		pushd "${BUILD_DIR}" >/dev/null || die
+		if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+			pushd "${BUILD_DIR}" >/dev/null || die
+		fi
 	else
 		local PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
 		export PYTHONPATH
@@ -441,7 +464,8 @@
 
 	mkdir -p "${TMPDIR}" || die
 
-	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
+	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} || ${DISTUTILS_SINGLE_IMPL} ]]
+	then
 		"${@}" 2>&1 | tee -a "${T}/build-${EPYTHON}.log"
 	else
 		(
@@ -451,7 +475,8 @@
 		multijob_post_fork
 	fi
 
-	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
+	if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
+	then
 		popd >/dev/null || die
 	fi
 
@@ -487,14 +512,53 @@
 _distutils-r1_multijob_init() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	local opts
-	if [[ ${DISTUTILS_JOBS} ]]; then
-		opts=-j${DISTUTILS_JOBS}
-	else
-		opts=${MAKEOPTS}
+	if [[ ! ${DISTUTILS_NO_PARALLEL_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
+	then
+		local opts
+		if [[ ${DISTUTILS_JOBS} ]]; then
+			opts=-j${DISTUTILS_JOBS}
+		else
+			opts=${MAKEOPTS}
+		fi
+
+		multijob_init "${opts}"
+	fi
+}
+
+# @FUNCTION: _distutils-r1_multijob_finish
+# @INTERNAL
+# @DESCRIPTION:
+# Finish multijob if used.
+_distutils-r1_multijob_finish() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	if [[ ! ${DISTUTILS_NO_PARALLEL_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
+	then
+		multijob_finish
 	fi
+}
 
-	multijob_init "${opts}"
+# @FUNCTION: _distutils-r1_run_foreach_impl
+# @INTERNAL
+# @DESCRIPTION:
+# Run the given phase for each implementation if multiple implementations
+# are enabled, once otherwise.
+_distutils-r1_run_foreach_impl() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	set -- distutils-r1_run_phase "${@}"
+
+	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+		python_foreach_impl "${@}"
+	else
+		if [[ ! ${EPYTHON} ]]; then
+			die "EPYTHON unset, python-single-r1_pkg_setup not called?!"
+		fi
+		local BUILD_DIR=${BUILD_DIR:-${S}}
+		BUILD_DIR=${BUILD_DIR%%/}_${EPYTHON}
+
+		"${@}"
+	fi
 }
 
 distutils-r1_src_prepare() {
@@ -509,17 +573,17 @@
 
 	_distutils-r1_multijob_init
 	if declare -f python_prepare >/dev/null; then
-		python_foreach_impl distutils-r1_run_phase python_prepare
+		_distutils-r1_run_foreach_impl python_prepare
 	fi
-	multijob_finish
+	_distutils-r1_multijob_finish
 }
 
 distutils-r1_src_configure() {
 	_distutils-r1_multijob_init
 	if declare -f python_configure >/dev/null; then
-		python_foreach_impl distutils-r1_run_phase python_configure
+		_distutils-r1_run_foreach_impl python_configure
 	fi
-	multijob_finish
+	_distutils-r1_multijob_finish
 
 	if declare -f python_configure_all >/dev/null; then
 		_distutils-r1_run_common_phase python_configure_all
@@ -531,11 +595,11 @@
 
 	_distutils-r1_multijob_init
 	if declare -f python_compile >/dev/null; then
-		python_foreach_impl distutils-r1_run_phase python_compile
+		_distutils-r1_run_foreach_impl python_compile
 	else
-		python_foreach_impl distutils-r1_run_phase distutils-r1_python_compile
+		_distutils-r1_run_foreach_impl distutils-r1_python_compile
 	fi
-	multijob_finish
+	_distutils-r1_multijob_finish
 
 	if declare -f python_compile_all >/dev/null; then
 		_distutils-r1_run_common_phase python_compile_all
@@ -547,9 +611,9 @@
 
 	_distutils-r1_multijob_init
 	if declare -f python_test >/dev/null; then
-		python_foreach_impl distutils-r1_run_phase python_test
+		_distutils-r1_run_foreach_impl python_test
 	fi
-	multijob_finish
+	_distutils-r1_multijob_finish
 
 	if declare -f python_test_all >/dev/null; then
 		_distutils-r1_run_common_phase python_test_all
@@ -561,11 +625,11 @@
 
 	_distutils-r1_multijob_init
 	if declare -f python_install >/dev/null; then
-		python_foreach_impl distutils-r1_run_phase python_install
+		_distutils-r1_run_foreach_impl python_install
 	else
-		python_foreach_impl distutils-r1_run_phase distutils-r1_python_install
+		_distutils-r1_run_foreach_impl distutils-r1_python_install
 	fi
-	multijob_finish
+	_distutils-r1_multijob_finish
 
 	if declare -f python_install_all >/dev/null; then
 		_distutils-r1_run_common_phase python_install_all

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

[Michal Gorny (mgorny)]

mgorny      13/02/10 11:38:17

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Error out if "tests" package is installed. This is a common mistake and a source of file collisions.

Revision  Changes    Path
1.667                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.666
retrieving revision 1.667
diff -u -r1.666 -r1.667
--- ChangeLog	8 Feb 2013 20:51:35 -0000	1.666
+++ ChangeLog	10 Feb 2013 11:38:17 -0000	1.667
@@ -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.666 2013/02/08 20:51:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.667 2013/02/10 11:38:17 mgorny Exp $
+
+  10 Feb 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Error out if "tests" package is installed. This is a common mistake and a
+  source of file collisions.
 
   08 Feb 2013; Michał Górny <mgorny@gentoo.org> vcs-snapshot.eclass:
   Document the src_unpack() function. Requested in bug #456160.



1.49                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- distutils-r1.eclass	27 Jan 2013 16:39:23 -0000	1.48
+++ distutils-r1.eclass	10 Feb 2013 11:38:17 -0000	1.49
@@ -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.48 2013/01/27 16:39:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.49 2013/02/10 11:38:17 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -367,6 +367,10 @@
 
 	esetup.py install "${flags[@]}" --root="${root}" "${@}"
 
+	if [[ -d ${root}$(python_get_sitedir)/tests ]]; then
+		die "Package installs 'tests' package, file collisions likely."
+	fi
+
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 		_distutils-r1_rename_scripts "${root}"
 		_distutils-r1_merge_root "${root}" "${D}"

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

[Michal Gorny (mgorny)]

mgorny      13/02/10 11:39:42

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Override egg-info write location in out-of-source builds.

Revision  Changes    Path
1.668                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.667
retrieving revision 1.668
diff -u -r1.667 -r1.668
--- ChangeLog	10 Feb 2013 11:38:17 -0000	1.667
+++ ChangeLog	10 Feb 2013 11:39:42 -0000	1.668
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.667 2013/02/10 11:38:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.668 2013/02/10 11:39:42 mgorny Exp $
+
+  10 Feb 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Override egg-info write location in out-of-source builds.
 
   10 Feb 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Error out if "tests" package is installed. This is a common mistake and a



1.50                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- distutils-r1.eclass	10 Feb 2013 11:38:17 -0000	1.49
+++ distutils-r1.eclass	10 Feb 2013 11:39:42 -0000	1.50
@@ -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.49 2013/02/10 11:38:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.50 2013/02/10 11:39:42 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -215,6 +215,13 @@
 			die 'Out-of-source build requested, yet BUILD_DIR unset.'
 		fi
 
+		# if setuptools is used, adjust egg_info path as well
+		if "${PYTHON:-python}" setup.py --help egg_info &>/dev/null; then
+			add_args+=(
+				egg_info --egg-base "${BUILD_DIR}"
+			)
+		fi
+
 		add_args+=(
 			build
 			--build-base "${BUILD_DIR}"

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

[Michal Gorny (mgorny)]

mgorny      13/02/10 11:41:07

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Introduce a function to install package for running tests, solving all the issues with PyPy, setuptools and namespaces.

Revision  Changes    Path
1.669                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.668
retrieving revision 1.669
diff -u -r1.668 -r1.669
--- ChangeLog	10 Feb 2013 11:39:42 -0000	1.668
+++ ChangeLog	10 Feb 2013 11:41:07 -0000	1.669
@@ -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.668 2013/02/10 11:39:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.669 2013/02/10 11:41:07 mgorny Exp $
+
+  10 Feb 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Introduce a function to install package for running tests, solving all the
+  issues with PyPy, setuptools and namespaces.
 
   10 Feb 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Override egg-info write location in out-of-source builds.



1.51                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- distutils-r1.eclass	10 Feb 2013 11:39:42 -0000	1.50
+++ distutils-r1.eclass	10 Feb 2013 11:41:07 -0000	1.51
@@ -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.50 2013/02/10 11:39:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.51 2013/02/10 11:41:07 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -239,6 +239,60 @@
 	"${@}" || die
 }
 
+# @FUNCTION: distutils_install_for_testing
+# @USAGE: [<args>...]
+# @DESCRIPTION:
+# Install the package into a temporary location for running tests.
+# Update PYTHONPATH appropriately and set TEST_DIR to the test
+# installation root. The Python packages will be installed in 'lib'
+# subdir, and scripts in 'scripts' subdir (like in BUILD_DIR).
+#
+# Please note that this function should be only used if package uses
+# namespaces (and therefore proper install needs to be done to enforce
+# PYTHONPATH) or tests rely on the results of install command.
+# For most of the packages, tests built in BUILD_DIR are good enough.
+distutils_install_for_testing() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	# A few notes:
+	# 1) because of namespaces, we can't use 'install --root',
+	# 2) 'install --home' is terribly broken on pypy, so we need
+	#    to override --install-lib and --install-scripts,
+	# 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.
+
+	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
+		# use 'build' subdirectory to reduce the risk of collisions
+		local BUILD_DIR=${BUILD_DIR}/build
+	fi
+
+	TEST_DIR=${BUILD_DIR}/test
+	local bindir=${TEST_DIR}/scripts
+	local libdir=${TEST_DIR}/lib
+	PYTHONPATH=${libdir}:${PYTHONPATH}
+
+	local add_args=(
+		install
+			--home="${TEST_DIR}"
+			--install-lib="${libdir}"
+			--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[@]}"
+}
+
 # @FUNCTION: distutils-r1_python_prepare_all
 # @DESCRIPTION:
 # The default python_prepare_all(). It applies the patches from PATCHES

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

[Michal Gorny (mgorny)]

mgorny      13/02/10 16:15:05

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Temporarily disable egg_info since it causes problems with installing scripts.

Revision  Changes    Path
1.673                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.672
retrieving revision 1.673
diff -u -r1.672 -r1.673
--- ChangeLog	10 Feb 2013 11:44:55 -0000	1.672
+++ ChangeLog	10 Feb 2013 16:15:05 -0000	1.673
@@ -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.672 2013/02/10 11:44:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.673 2013/02/10 16:15:05 mgorny Exp $
+
+  10 Feb 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Temporarily disable egg_info since it causes problems with installing
+  scripts.
 
   10 Feb 2013; Michał Górny <mgorny@gentoo.org> +cmake-multilib.eclass:
   Introduce cmake-utils wrapper eclass for multilib.



1.52                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- distutils-r1.eclass	10 Feb 2013 11:41:07 -0000	1.51
+++ distutils-r1.eclass	10 Feb 2013 16:15:05 -0000	1.52
@@ -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.51 2013/02/10 11:41:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.52 2013/02/10 16:15:05 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -216,11 +216,12 @@
 		fi
 
 		# if setuptools is used, adjust egg_info path as well
-		if "${PYTHON:-python}" setup.py --help egg_info &>/dev/null; then
-			add_args+=(
-				egg_info --egg-base "${BUILD_DIR}"
-			)
-		fi
+		# (disabled since it causes build not to install scripts)
+#		if "${PYTHON:-python}" setup.py --help egg_info &>/dev/null; then
+#			add_args+=(
+#				egg_info --egg-base "${BUILD_DIR}"
+#			)
+#		fi
 
 		add_args+=(
 			build

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

[Michal Gorny (mgorny)]

mgorny      13/02/21 23:18:56

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Support EXAMPLES to install examples in a consistent manner.

Revision  Changes    Path
1.679                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.678
retrieving revision 1.679
diff -u -r1.678 -r1.679
--- ChangeLog	18 Feb 2013 09:43:18 -0000	1.678
+++ ChangeLog	21 Feb 2013 23:18:56 -0000	1.679
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.678 2013/02/18 09:43:18 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.679 2013/02/21 23:18:56 mgorny Exp $
+
+  21 Feb 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Support EXAMPLES to install examples in a consistent manner.
 
   18 Feb 2013; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin.eclass:
   vdr-plugin.eclass, add eerror to get .eclass depricated



1.54                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- distutils-r1.eclass	11 Feb 2013 09:46:07 -0000	1.53
+++ distutils-r1.eclass	21 Feb 2013 23:18:56 -0000	1.54
@@ -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.53 2013/02/11 09:46:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.54 2013/02/21 23:18:56 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -151,7 +151,25 @@
 #
 # Example:
 # @CODE
-# HTML_DOCS=( doc/html/ )
+# HTML_DOCS=( doc/html/. )
+# @CODE
+
+# @ECLASS-VARIABLE: EXAMPLES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array containing examples installed into 'examples' doc
+# subdirectory. The files and directories listed there must exist
+# in the directory from which distutils-r1_python_install_all() is run
+# (${S} by default).
+#
+# The 'examples' subdirectory will be marked not to be compressed
+# automatically.
+#
+# If unset, no examples will be installed.
+#
+# Example:
+# @CODE
+# EXAMPLES=( examples/. demos/. )
 # @CODE
 
 # @ECLASS-VARIABLE: DISTUTILS_IN_SOURCE_BUILD
@@ -487,7 +505,7 @@
 	if declare -p DOCS &>/dev/null; then
 		# an empty list == don't install anything
 		if [[ ${DOCS[@]} ]]; then
-			dodoc -r "${DOCS[@]}" || die "dodoc failed"
+			dodoc -r "${DOCS[@]}"
 		fi
 	else
 		local f
@@ -495,13 +513,20 @@
 		for f in README* ChangeLog AUTHORS NEWS TODO CHANGES \
 				THANKS BUGS FAQ CREDITS CHANGELOG; do
 			if [[ -s ${f} ]]; then
-				dodoc "${f}" || die "(default) dodoc ${f} failed"
+				dodoc "${f}"
 			fi
 		done
 	fi
 
 	if declare -p HTML_DOCS &>/dev/null; then
-		dohtml -r "${HTML_DOCS[@]}" || die "dohtml failed"
+		dohtml -r "${HTML_DOCS[@]}"
+	fi
+
+	if declare -p EXAMPLES &>/dev/null; then
+		local DOCDESTTREE=examples
+		dodoc -r "${EXAMPLES[@]}"
+
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
 

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

[Michal Gorny (mgorny)]

mgorny      13/02/26 14:34:32

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Re-use python_parallel_foreach_impl() in distutils-r1.

Revision  Changes    Path
1.687                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.686
retrieving revision 1.687
diff -u -r1.686 -r1.687
--- ChangeLog	26 Feb 2013 14:33:45 -0000	1.686
+++ ChangeLog	26 Feb 2013 14:34:32 -0000	1.687
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.686 2013/02/26 14:33:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.687 2013/02/26 14:34:32 mgorny Exp $
+
+  26 Feb 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Re-use python_parallel_foreach_impl() in distutils-r1.
 
   26 Feb 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
   python-r1.eclass:



1.56                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- distutils-r1.eclass	26 Feb 2013 14:33:45 -0000	1.55
+++ distutils-r1.eclass	26 Feb 2013 14:34:32 -0000	1.56
@@ -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.55 2013/02/26 14:33:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.56 2013/02/26 14:34:32 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -550,16 +550,7 @@
 
 	mkdir -p "${TMPDIR}" || die
 
-	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} || ${DISTUTILS_SINGLE_IMPL} ]]
-	then
-		"${@}" 2>&1 | tee -a "${T}/build-${EPYTHON}.log"
-	else
-		(
-			multijob_child_init
-			"${@}" 2>&1 | tee -a "${T}/build-${EPYTHON}.log"
-		) &
-		multijob_post_fork
-	fi
+	"${@}"
 
 	if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
 	then
@@ -591,39 +582,6 @@
 	"${@}"
 }
 
-# @FUNCTION: _distutils-r1_multijob_init
-# @INTERNAL
-# @DESCRIPTION:
-# Init multijob, taking the job-count from ${DISTUTILS_JOBS}.
-_distutils-r1_multijob_init() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	if [[ ! ${DISTUTILS_NO_PARALLEL_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
-	then
-		local opts
-		if [[ ${DISTUTILS_JOBS} ]]; then
-			opts=-j${DISTUTILS_JOBS}
-		else
-			opts=${MAKEOPTS}
-		fi
-
-		multijob_init "${opts}"
-	fi
-}
-
-# @FUNCTION: _distutils-r1_multijob_finish
-# @INTERNAL
-# @DESCRIPTION:
-# Finish multijob if used.
-_distutils-r1_multijob_finish() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	if [[ ! ${DISTUTILS_NO_PARALLEL_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
-	then
-		multijob_finish
-	fi
-}
-
 # @FUNCTION: _distutils-r1_run_foreach_impl
 # @INTERNAL
 # @DESCRIPTION:
@@ -635,7 +593,12 @@
 	set -- distutils-r1_run_phase "${@}"
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
-		python_foreach_impl "${@}"
+		if [[ ${DISTUTILS_NO_PARALLEL_BUILD} || ${DISTUTILS_SINGLE_IMPL} ]]
+		then
+			python_foreach_impl "${@}"
+		else
+			python_parallel_foreach_impl "${@}"
+		fi
 	else
 		if [[ ! ${EPYTHON} ]]; then
 			die "EPYTHON unset, python-single-r1_pkg_setup not called?!"
@@ -657,19 +620,15 @@
 		distutils-r1_python_prepare_all
 	fi
 
-	_distutils-r1_multijob_init
 	if declare -f python_prepare >/dev/null; then
 		_distutils-r1_run_foreach_impl python_prepare
 	fi
-	_distutils-r1_multijob_finish
 }
 
 distutils-r1_src_configure() {
-	_distutils-r1_multijob_init
 	if declare -f python_configure >/dev/null; then
 		_distutils-r1_run_foreach_impl python_configure
 	fi
-	_distutils-r1_multijob_finish
 
 	if declare -f python_configure_all >/dev/null; then
 		_distutils-r1_run_common_phase python_configure_all
@@ -679,13 +638,11 @@
 distutils-r1_src_compile() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	_distutils-r1_multijob_init
 	if declare -f python_compile >/dev/null; then
 		_distutils-r1_run_foreach_impl python_compile
 	else
 		_distutils-r1_run_foreach_impl distutils-r1_python_compile
 	fi
-	_distutils-r1_multijob_finish
 
 	if declare -f python_compile_all >/dev/null; then
 		_distutils-r1_run_common_phase python_compile_all
@@ -695,11 +652,9 @@
 distutils-r1_src_test() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	_distutils-r1_multijob_init
 	if declare -f python_test >/dev/null; then
 		_distutils-r1_run_foreach_impl python_test
 	fi
-	_distutils-r1_multijob_finish
 
 	if declare -f python_test_all >/dev/null; then
 		_distutils-r1_run_common_phase python_test_all
@@ -709,13 +664,11 @@
 distutils-r1_src_install() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	_distutils-r1_multijob_init
 	if declare -f python_install >/dev/null; then
 		_distutils-r1_run_foreach_impl python_install
 	else
 		_distutils-r1_run_foreach_impl distutils-r1_python_install
 	fi
-	_distutils-r1_multijob_finish
 
 	if declare -f python_install_all >/dev/null; then
 		_distutils-r1_run_common_phase python_install_all

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

[Michal Gorny (mgorny)]

mgorny      13/03/02 07:13:32

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  In-source builds: append "build/" subdir to the BUILD_DIR variable. It can be used alike in out-of-source builds now.

Revision  Changes    Path
1.696                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.695
retrieving revision 1.696
diff -u -r1.695 -r1.696
--- ChangeLog	27 Feb 2013 23:23:11 -0000	1.695
+++ ChangeLog	2 Mar 2013 07:13:32 -0000	1.696
@@ -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.695 2013/02/27 23:23:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.696 2013/03/02 07:13:32 mgorny Exp $
+
+  02 Mar 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  In-source builds: append "build/" subdir to the BUILD_DIR variable. It can be
+  used alike in out-of-source builds now.
 
   27 Feb 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
   Enable x32 ABI support.



1.58                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- distutils-r1.eclass	27 Feb 2013 21:02:59 -0000	1.57
+++ distutils-r1.eclass	2 Mar 2013 07:13:32 -0000	1.58
@@ -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.57 2013/02/27 21:02:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.58 2013/03/02 07:13:32 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -285,11 +285,6 @@
 	# 5) 'install' needs to go before 'bdist_egg' or the latter would
 	#    re-set install paths.
 
-	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
-		# use 'build' subdirectory to reduce the risk of collisions
-		local BUILD_DIR=${BUILD_DIR}/build
-	fi
-
 	TEST_DIR=${BUILD_DIR}/test
 	local bindir=${TEST_DIR}/scripts
 	local libdir=${TEST_DIR}/lib
@@ -540,8 +535,9 @@
 # directory, with BUILD_DIR pointing at the build directory
 # and PYTHONPATH having an entry for the module build directory.
 #
-# If in-source builds are used, the command is executed in the BUILD_DIR
-# (the directory holding per-implementation copy of sources).
+# If in-source builds are used, the command is executed in the directory
+# holding the per-implementation copy of sources. BUILD_DIR points
+# to the 'build' subdirectory.
 distutils-r1_run_phase() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -549,6 +545,7 @@
 		if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 			pushd "${BUILD_DIR}" >/dev/null || die
 		fi
+		local BUILD_DIR=${BUILD_DIR}/build
 	else
 		local PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
 		export PYTHONPATH

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

[Michal Gorny (mgorny)]

mgorny      13/03/02 07:16:43

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Override build locations and set PYTHONPATH in in-source builds, to increase compatibility with out-of-source builds.

Revision  Changes    Path
1.697                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.696
retrieving revision 1.697
diff -u -r1.696 -r1.697
--- ChangeLog	2 Mar 2013 07:13:32 -0000	1.696
+++ ChangeLog	2 Mar 2013 07:16:43 -0000	1.697
@@ -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.696 2013/03/02 07:13:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.697 2013/03/02 07:16:43 mgorny Exp $
+
+  02 Mar 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Override build locations and set PYTHONPATH in in-source builds, to increase
+  compatibility with out-of-source builds.
 
   02 Mar 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   In-source builds: append "build/" subdir to the BUILD_DIR variable. It can be



1.59                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- distutils-r1.eclass	2 Mar 2013 07:13:32 -0000	1.58
+++ distutils-r1.eclass	2 Mar 2013 07:16:43 -0000	1.59
@@ -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.58 2013/03/02 07:13:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.59 2013/03/02 07:16:43 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -228,11 +228,7 @@
 	debug-print-function ${FUNCNAME} "${@}"
 
 	local add_args=()
-	if [[ ! ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
-		if [[ ! ${BUILD_DIR} ]]; then
-			die 'Out-of-source build requested, yet BUILD_DIR unset.'
-		fi
-
+	if [[ ${BUILD_DIR} ]]; then
 		# if setuptools is used, adjust egg_info path as well
 		# (disabled since it causes build not to install scripts)
 #		if "${PYTHON:-python}" setup.py --help egg_info &>/dev/null; then
@@ -249,6 +245,8 @@
 			# make the ebuild writer lives easier
 			--build-scripts "${BUILD_DIR}/scripts"
 		)
+	elif [[ ! ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
+		die 'Out-of-source build requested, yet BUILD_DIR unset.'
 	fi
 
 	set -- "${PYTHON:-python}" setup.py \
@@ -546,10 +544,8 @@
 			pushd "${BUILD_DIR}" >/dev/null || die
 		fi
 		local BUILD_DIR=${BUILD_DIR}/build
-	else
-		local PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
-		export PYTHONPATH
 	fi
+	local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
 
 	local TMPDIR=${T}/${EPYTHON}
 

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

[Michal Gorny (mgorny)]

mgorny      13/03/02 07:17:50

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Run *_all() phases in best-impl sources, in an in-source build.

Revision  Changes    Path
1.698                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.697
retrieving revision 1.698
diff -u -r1.697 -r1.698
--- ChangeLog	2 Mar 2013 07:16:43 -0000	1.697
+++ ChangeLog	2 Mar 2013 07:17:50 -0000	1.698
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.697 2013/03/02 07:16:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.698 2013/03/02 07:17:50 mgorny Exp $
+
+  02 Mar 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Run *_all() phases in best-impl sources, in an in-source build.
 
   02 Mar 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Override build locations and set PYTHONPATH in in-source builds, to increase



1.60                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- distutils-r1.eclass	2 Mar 2013 07:16:43 -0000	1.59
+++ distutils-r1.eclass	2 Mar 2013 07:17:50 -0000	1.60
@@ -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.59 2013/03/02 07:16:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.60 2013/03/02 07:17:50 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -578,6 +578,9 @@
 # @INTERNAL
 # @DESCRIPTION:
 # Run the given command, restoring the best-implementation state.
+#
+# If in-source build is used, the command will be run in the copy
+# of sources made for the best Python interpreter.
 _distutils-r1_run_common_phase() {
 	local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR}
 
@@ -588,8 +591,16 @@
 
 	export EPYTHON PYTHON PYTHONPATH
 
+	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
+		pushd "${BUILD_DIR}"/.. >/dev/null || die
+	fi
+
 	einfo "common: running ${1}"
 	"${@}"
+
+	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
+		popd >/dev/null || die
+	fi
 }
 
 # @FUNCTION: _distutils-r1_multijob_init

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

[Michal Gorny (mgorny)]

mgorny      13/03/04 19:29:43

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Use multilib_for_best_variant() for the *_all() phases.

Revision  Changes    Path
1.711                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.710
retrieving revision 1.711
diff -u -r1.710 -r1.711
--- ChangeLog	4 Mar 2013 19:28:47 -0000	1.710
+++ ChangeLog	4 Mar 2013 19:29:43 -0000	1.711
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.710 2013/03/04 19:28:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.711 2013/03/04 19:29:43 mgorny Exp $
+
+  04 Mar 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Use multilib_for_best_variant() for the *_all() phases.
 
   04 Mar 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
   python-r1.eclass:



1.62                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- distutils-r1.eclass	4 Mar 2013 19:28:47 -0000	1.61
+++ distutils-r1.eclass	4 Mar 2013 19:29:43 -0000	1.62
@@ -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.61 2013/03/04 19:28:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.62 2013/03/04 19:29:43 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -549,11 +549,6 @@
 	then
 		popd >/dev/null || die
 	fi
-
-	# Store them for reuse.
-	_DISTUTILS_BEST_IMPL=(
-		"${EPYTHON}" "${PYTHON}" "${BUILD_DIR}" "${PYTHONPATH}"
-	)
 }
 
 # @FUNCTION: _distutils-r1_run_common_phase
@@ -567,23 +562,11 @@
 _distutils-r1_run_common_phase() {
 	local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR}
 
-	local EPYTHON=${_DISTUTILS_BEST_IMPL[0]}
-	local PYTHON=${_DISTUTILS_BEST_IMPL[1]}
-	local BUILD_DIR=${_DISTUTILS_BEST_IMPL[2]}
-	local PYTHONPATH=${_DISTUTILS_BEST_IMPL[3]}
-
-	export EPYTHON PYTHON PYTHONPATH
-
-	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
-		pushd "${BUILD_DIR}"/.. >/dev/null || die
-	fi
+	local MULTIBUILD_VARIANTS
+	_python_obtain_impls
 
-	einfo "common: running ${1}"
-	"${@}"
-
-	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
-		popd >/dev/null || die
-	fi
+	multibuild_for_best_variant _python_multibuild_wrapper \
+		distutils-r1_run_phase "${@}"
 }
 
 # @FUNCTION: _distutils-r1_run_foreach_impl

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

[Michal Gorny (mgorny)]

mgorny      13/03/09 13:13:02

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Use doins instead of dodoc to install examples, due to PMS limitations. Bug #460516.

Revision  Changes    Path
1.721                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.720
retrieving revision 1.721
diff -u -r1.720 -r1.721
--- ChangeLog	9 Mar 2013 12:07:50 -0000	1.720
+++ ChangeLog	9 Mar 2013 13:13:02 -0000	1.721
@@ -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.720 2013/03/09 12:07:50 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.721 2013/03/09 13:13:02 mgorny Exp $
+
+  09 Mar 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Use doins instead of dodoc to install examples, due to PMS limitations. Bug
+  #460516.
 
   09 Mar 2013; Sven Vermeulen <swift@gentoo.org> selinux-policy-2.eclass:
   Do not load unconfined module with strict policy



1.63                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- distutils-r1.eclass	4 Mar 2013 19:29:43 -0000	1.62
+++ distutils-r1.eclass	9 Mar 2013 13:13:02 -0000	1.63
@@ -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.62 2013/03/04 19:29:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.63 2013/03/09 13:13:02 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -508,10 +508,9 @@
 	fi
 
 	if declare -p EXAMPLES &>/dev/null; then
-		local DOCDESTTREE=examples
-		dodoc -r "${EXAMPLES[@]}"
-
-		docompress -x /usr/share/doc/${PF}/examples
+		local INSDESTTREE=/usr/share/doc/${PF}/examples
+		doins -r "${EXAMPLES[@]}"
+		docompress -x "${INSDESTTREE}"
 	fi
 }
 

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

[Mike Gilbert (floppym)]

floppym     13/03/13 21:51:05

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Reverse order of $add_args and $@ in esetup.py. Remove duplicate build command from distutils-r1_python_compile.

Revision  Changes    Path
1.737                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.736
retrieving revision 1.737
diff -u -r1.736 -r1.737
--- ChangeLog	13 Mar 2013 11:03:12 -0000	1.736
+++ ChangeLog	13 Mar 2013 21:51:05 -0000	1.737
@@ -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.736 2013/03/13 11:03:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.737 2013/03/13 21:51:05 floppym Exp $
+
+  13 Mar 2013; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass:
+  Reverse order of $add_args and $@ in esetup.py. Remove duplicate build
+  command from distutils-r1_python_compile.
 
   13 Mar 2013; Justin Lecher <jlec@gentoo.org> fortran-2.eclass:
   Fix fortran-2.eclass for bash-3.2 compatibility, #461544



1.64                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- distutils-r1.eclass	9 Mar 2013 13:13:02 -0000	1.63
+++ distutils-r1.eclass	13 Mar 2013 21:51:05 -0000	1.64
@@ -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.63 2013/03/09 13:13:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.64 2013/03/13 21:51:05 floppym Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -209,11 +209,13 @@
 # @FUNCTION: esetup.py
 # @USAGE: [<args>...]
 # @DESCRIPTION:
-# Run the setup.py using currently selected Python interpreter
-# (if ${PYTHON} is set; fallback 'python' otherwise). The setup.py will
-# be passed default ${mydistutilsargs[@]}, then any parameters passed
-# to this command and optionally a standard option set (e.g. the build
-# directory in an ebuild using out-of-source builds).
+# Run setup.py using currently selected Python interpreter
+# (if ${PYTHON} is set; fallback 'python' otherwise).
+#
+# setup.py will be passed the following, in order:
+# 1. ${mydistutilsargs[@]}
+# 2. The 'build' command and standard build options including ${BUILD_DIR}
+# 3. Any additional arguments passed to the esetup.py function.
 #
 # This command dies on failure.
 esetup.py() {
@@ -242,7 +244,7 @@
 	fi
 
 	set -- "${PYTHON:-python}" setup.py \
-		"${mydistutilsargs[@]}" "${@}" "${add_args[@]}"
+		"${mydistutilsargs[@]}" "${add_args[@]}" "${@}"
 
 	echo "${@}" >&2
 	"${@}" || die
@@ -353,7 +355,7 @@
 distutils-r1_python_compile() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	esetup.py build "${@}"
+	esetup.py "${@}"
 }
 
 # @FUNCTION: distutils-r1_python_test

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

[Michal Gorny (mgorny)]

mgorny      13/03/19 06:13:41

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Pass --build-platlib and --build-purelib separately to distutils. This allows to change them to different locations if necessary (bug #455332).

Revision  Changes    Path
1.744                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.743
retrieving revision 1.744
diff -u -r1.743 -r1.744
--- ChangeLog	18 Mar 2013 10:07:44 -0000	1.743
+++ ChangeLog	19 Mar 2013 06:13:41 -0000	1.744
@@ -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.743 2013/03/18 10:07:44 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.744 2013/03/19 06:13:41 mgorny Exp $
+
+  19 Mar 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Pass --build-platlib and --build-purelib separately to distutils. This allows
+  to change them to different locations if necessary (bug #455332).
 
   18 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
   Update the maintainer to systemd@.



1.65                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- distutils-r1.eclass	13 Mar 2013 21:51:05 -0000	1.64
+++ distutils-r1.eclass	19 Mar 2013 06:13:41 -0000	1.65
@@ -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.64 2013/03/13 21:51:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.65 2013/03/19 06:13:41 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -234,8 +234,17 @@
 		add_args+=(
 			build
 			--build-base "${BUILD_DIR}"
-			# using a single directory for them helps us export ${PYTHONPATH}
-			--build-lib "${BUILD_DIR}/lib"
+
+			# using a single directory for them helps us export
+			# ${PYTHONPATH} and ebuilds find the sources independently
+			# of whether the package installs extensions or not
+			#
+			# note: due to some packages (wxpython) relying on separate
+			# platlib & purelib dirs, we do not set --build-lib (which
+			# can not be overriden with --build-*lib)
+			--build-platlib "${BUILD_DIR}/lib"
+			--build-purelib "${BUILD_DIR}/lib"
+
 			# make the ebuild writer lives easier
 			--build-scripts "${BUILD_DIR}/scripts"
 		)

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

[Michal Gorny (mgorny)]

mgorny      13/04/10 15:38:59

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Move the egg_info code into a more realistic location for future testing.

Revision  Changes    Path
1.783                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.782
retrieving revision 1.783
diff -u -r1.782 -r1.783
--- ChangeLog	10 Apr 2013 15:10:18 -0000	1.782
+++ ChangeLog	10 Apr 2013 15:38:59 -0000	1.783
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.782 2013/04/10 15:10:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.783 2013/04/10 15:38:59 mgorny Exp $
+
+  10 Apr 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Move the egg_info code into a more realistic location for future testing.
 
   10 Apr 2013; Jeroen Roovers <jer@gentoo.org> nvidia-driver.eclass:
   Update documentation URL.



1.67                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- distutils-r1.eclass	1 Apr 2013 09:17:53 -0000	1.66
+++ distutils-r1.eclass	10 Apr 2013 15:38:59 -0000	1.67
@@ -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.66 2013/04/01 09:17:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.67 2013/04/10 15:38:59 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -223,14 +223,6 @@
 
 	local add_args=()
 	if [[ ${BUILD_DIR} ]]; then
-		# if setuptools is used, adjust egg_info path as well
-		# (disabled since it causes build not to install scripts)
-#		if "${PYTHON:-python}" setup.py --help egg_info &>/dev/null; then
-#			add_args+=(
-#				egg_info --egg-base "${BUILD_DIR}"
-#			)
-#		fi
-
 		add_args+=(
 			build
 			--build-base "${BUILD_DIR}"
@@ -248,6 +240,14 @@
 			# make the ebuild writer lives easier
 			--build-scripts "${BUILD_DIR}/scripts"
 		)
+
+		# if setuptools is used, adjust egg_info path as well
+		# (disabled since it causes build not to install scripts)
+#		if "${PYTHON:-python}" setup.py --help egg_info &>/dev/null; then
+#			add_args+=(
+#				egg_info --egg-base "${BUILD_DIR}"
+#			)
+#		fi
 	elif [[ ! ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
 		die 'Out-of-source build requested, yet BUILD_DIR unset.'
 	fi

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

[Michal Gorny (mgorny)]

mgorny      13/04/13 14:01:10

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Unmask the egg_info block for further testing. Feel free to comment it out if you can reproduce the earlier issues.

Revision  Changes    Path
1.784                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.783
retrieving revision 1.784
diff -u -r1.783 -r1.784
--- ChangeLog	10 Apr 2013 15:38:59 -0000	1.783
+++ ChangeLog	13 Apr 2013 14:01:10 -0000	1.784
@@ -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.783 2013/04/10 15:38:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.784 2013/04/13 14:01:10 mgorny Exp $
+
+  13 Apr 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Unmask the egg_info block for further testing. Feel free to comment it out if
+  you can reproduce the earlier issues.
 
   10 Apr 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Move the egg_info code into a more realistic location for future testing.



1.68                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- distutils-r1.eclass	10 Apr 2013 15:38:59 -0000	1.67
+++ distutils-r1.eclass	13 Apr 2013 14:01:10 -0000	1.68
@@ -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.67 2013/04/10 15:38:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.68 2013/04/13 14:01:10 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -242,12 +242,11 @@
 		)
 
 		# if setuptools is used, adjust egg_info path as well
-		# (disabled since it causes build not to install scripts)
-#		if "${PYTHON:-python}" setup.py --help egg_info &>/dev/null; then
-#			add_args+=(
-#				egg_info --egg-base "${BUILD_DIR}"
-#			)
-#		fi
+		if "${PYTHON:-python}" setup.py --help egg_info &>/dev/null; then
+			add_args+=(
+				egg_info --egg-base "${BUILD_DIR}"
+			)
+		fi
 	elif [[ ! ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
 		die 'Out-of-source build requested, yet BUILD_DIR unset.'
 	fi

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

[Michal Gorny (mgorny)]

mgorny      13/04/18 15:47:29

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Fix python_*_all() phases with DISTUTILS_SINGLE_IMPL.

Revision  Changes    Path
1.794                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.793
retrieving revision 1.794
diff -u -r1.793 -r1.794
--- ChangeLog	17 Apr 2013 20:59:24 -0000	1.793
+++ ChangeLog	18 Apr 2013 15:47:28 -0000	1.794
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.793 2013/04/17 20:59:24 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.794 2013/04/18 15:47:28 mgorny Exp $
+
+  18 Apr 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Fix python_*_all() phases with DISTUTILS_SINGLE_IMPL.
 
   17 Apr 2013; Tom Wijsman <TomWij@gentoo.org> kernel-2.eclass:
   Reverted .tmp_gas_check patch, see bug #336732.



1.69                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- distutils-r1.eclass	13 Apr 2013 14:01:10 -0000	1.68
+++ distutils-r1.eclass	18 Apr 2013 15:47:28 -0000	1.69
@@ -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.68 2013/04/13 14:01:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.69 2013/04/18 15:47:28 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -532,11 +532,16 @@
 _distutils-r1_run_common_phase() {
 	local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR}
 
-	local MULTIBUILD_VARIANTS
-	_python_obtain_impls
+	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+		local MULTIBUILD_VARIANTS
+		_python_obtain_impls
 
-	multibuild_for_best_variant _python_multibuild_wrapper \
-		distutils-r1_run_phase "${@}"
+		multibuild_for_best_variant _python_multibuild_wrapper \
+			distutils-r1_run_phase "${@}"
+	else
+		# semi-hack, be careful.
+		_distutils-r1_run_foreach_impl "${@}"
+	fi
 }
 
 # @FUNCTION: _distutils-r1_run_foreach_impl

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

[Mike Gilbert (floppym)]

floppym     13/07/09 01:57:07

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Stub-out ez_setup.py and distribute_setup.py to prevent packages from downloading their own copy of setuptools.

Revision  Changes    Path
1.873                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.872
retrieving revision 1.873
diff -u -r1.872 -r1.873
--- ChangeLog	6 Jul 2013 07:57:14 -0000	1.872
+++ ChangeLog	9 Jul 2013 01:57:07 -0000	1.873
@@ -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.872 2013/07/06 07:57:14 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.873 2013/07/09 01:57:07 floppym Exp $
+
+  09 Jul 2013; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass:
+  Stub-out ez_setup.py and distribute_setup.py to prevent packages from
+  downloading their own copy of setuptools.
 
   06 Jul 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Update SRC_URI. Drop support for EAPI 3.



1.72                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- distutils-r1.eclass	21 May 2013 01:31:02 -0000	1.71
+++ distutils-r1.eclass	9 Jul 2013 01:57:07 -0000	1.72
@@ -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.71 2013/05/21 01:31:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.72 2013/07/09 01:57:07 floppym Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -308,6 +308,12 @@
 	esetup.py "${add_args[@]}"
 }
 
+_disable_ez_setup() {
+	local stub="def use_setuptools(*args, **kwargs): pass"
+	[[ -f ez_setup.py ]] && echo "${stub}" > ez_setup.py
+	[[ -f distribute_setup.py ]] && echo "${stub}" > distribute_setup.py
+}
+
 # @FUNCTION: distutils-r1_python_prepare_all
 # @DESCRIPTION:
 # The default python_prepare_all(). It applies the patches from PATCHES
@@ -330,6 +336,9 @@
 		fi
 	fi
 
+	# Prevent packages from downloading their own copy of setuptools
+	_disable_ez_setup
+
 	if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
 	then
 		# create source copies for each implementation

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

[Michal Gorny (mgorny)]

mgorny      13/07/21 19:00:56

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Replace local+export with "local -x".

Revision  Changes    Path
1.886                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.885
retrieving revision 1.886
diff -u -r1.885 -r1.886
--- ChangeLog	21 Jul 2013 09:23:44 -0000	1.885
+++ ChangeLog	21 Jul 2013 19:00:56 -0000	1.886
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.885 2013/07/21 09:23:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.886 2013/07/21 19:00:56 mgorny Exp $
+
+  21 Jul 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Replace local+export with "local -x".
 
   21 Jul 2013; Pacho Ramos <pacho@gentoo.org> db.eclass, db-use.eclass:
   Cleanup due #231248



1.73                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- distutils-r1.eclass	9 Jul 2013 01:57:07 -0000	1.72
+++ distutils-r1.eclass	21 Jul 2013 19:00:56 -0000	1.73
@@ -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.72 2013/07/09 01:57:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.73 2013/07/21 19:00:56 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -441,8 +441,7 @@
 	debug-print "${FUNCNAME}: [${EPYTHON}] flags: ${flags}"
 
 	# enable compilation for the install phase.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
+	local -x PYTHONDONTWRITEBYTECODE
 
 	# python likes to compile any module it sees, which triggers sandbox
 	# failures if some packages haven't compiled their modules yet.

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

[Michal Gorny (mgorny)]

mgorny      13/08/01 13:02:32

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Shout QA warnings when _all() phases do not call the default impls. Bug #478442.

Revision  Changes    Path
1.909                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.908
retrieving revision 1.909
diff -u -r1.908 -r1.909
--- ChangeLog	1 Aug 2013 12:49:42 -0000	1.908
+++ ChangeLog	1 Aug 2013 13:02:32 -0000	1.909
@@ -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.908 2013/08/01 12:49:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.909 2013/08/01 13:02:32 mgorny Exp $
+
+  01 Aug 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Shout QA warnings when _all() phases do not call the default impls. Bug
+  #478442.
 
   01 Aug 2013; Michał Górny <mgorny@gentoo.org> python-any-r1.eclass:
   python-any-r1: bail out on invalid PYTHON_COMPAT.



1.74                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- distutils-r1.eclass	21 Jul 2013 19:00:56 -0000	1.73
+++ distutils-r1.eclass	1 Aug 2013 13:02:32 -0000	1.74
@@ -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.73 2013/07/21 19:00:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.74 2013/08/01 13:02:32 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -344,6 +344,8 @@
 		# create source copies for each implementation
 		python_copy_sources
 	fi
+
+	_DISTUTILS_DEFAULT_CALLED=1
 }
 
 # @FUNCTION: distutils-r1_python_prepare
@@ -494,6 +496,8 @@
 		doins -r "${EXAMPLES[@]}"
 		docompress -x "${INSDESTTREE}"
 	fi
+
+	_DISTUTILS_DEFAULT_CALLED=1
 }
 
 # @FUNCTION: distutils-r1_run_phase
@@ -586,6 +590,8 @@
 distutils-r1_src_prepare() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local _DISTUTILS_DEFAULT_CALLED
+
 	# common preparations
 	if declare -f python_prepare_all >/dev/null; then
 		python_prepare_all
@@ -593,6 +599,10 @@
 		distutils-r1_python_prepare_all
 	fi
 
+	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
+		eqawarn "QA warning: python_prepare_all() didn't call distutils-r1_python_prepare_all"
+	fi
+
 	if declare -f python_prepare >/dev/null; then
 		_distutils-r1_run_foreach_impl python_prepare
 	fi
@@ -643,11 +653,17 @@
 		_distutils-r1_run_foreach_impl distutils-r1_python_install
 	fi
 
+	local _DISTUTILS_DEFAULT_CALLED
+
 	if declare -f python_install_all >/dev/null; then
 		_distutils-r1_run_common_phase python_install_all
 	else
 		_distutils-r1_run_common_phase distutils-r1_python_install_all
 	fi
+
+	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
+		eqawarn "QA warning: python_install_all() didn't call distutils-r1_python_install_all"
+	fi
 }
 
 _DISTUTILS_R1=1

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

[Michal Gorny (mgorny)]

mgorny      13/08/25 21:12:36

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Namespace, clean up and describe _disable_ez_setup.

Revision  Changes    Path
1.934                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.933
retrieving revision 1.934
diff -u -r1.933 -r1.934
--- ChangeLog	25 Aug 2013 18:12:24 -0000	1.933
+++ ChangeLog	25 Aug 2013 21:12:36 -0000	1.934
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.933 2013/08/25 18:12:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.934 2013/08/25 21:12:36 mgorny Exp $
+
+  25 Aug 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Namespace, clean up and describe _disable_ez_setup.
 
   25 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org> gnome-games.eclass:
   Fix indentation and trailing whitespaces.



1.75                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- distutils-r1.eclass	1 Aug 2013 13:02:32 -0000	1.74
+++ distutils-r1.eclass	25 Aug 2013 21:12:36 -0000	1.75
@@ -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.74 2013/08/01 13:02:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.75 2013/08/25 21:12:36 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -308,10 +308,19 @@
 	esetup.py "${add_args[@]}"
 }
 
-_disable_ez_setup() {
+# @FUNCTION: _distutils-r1_disable_ez_setup
+# @INTERNAL
+# @DESCRIPTION:
+# Stub out ez_setup.py and distribute_setup.py to prevent packages
+# from trying to download a local copy of setuptools.
+_distutils-r1_disable_ez_setup() {
 	local stub="def use_setuptools(*args, **kwargs): pass"
-	[[ -f ez_setup.py ]] && echo "${stub}" > ez_setup.py
-	[[ -f distribute_setup.py ]] && echo "${stub}" > distribute_setup.py
+	if [[ -f ez_setup.py ]]; then
+		echo "${stub}" > ez_setup.py || die
+	fi
+	if [[ -f distribute_setup.py ]]; then
+		echo "${stub}" > distribute_setup.py || die
+	fi
 }
 
 # @FUNCTION: distutils-r1_python_prepare_all
@@ -336,8 +345,7 @@
 		fi
 	fi
 
-	# Prevent packages from downloading their own copy of setuptools
-	_disable_ez_setup
+	_distutils-r1_disable_ez_setup
 
 	if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
 	then

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

[Michal Gorny (mgorny)]

mgorny      13/08/25 21:13:52

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Copy bundled egg-info files for reuse in python_compile(). This solves issues that caused some of the files not to be installed in broken packages.

Revision  Changes    Path
1.935                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.934
retrieving revision 1.935
diff -u -r1.934 -r1.935
--- ChangeLog	25 Aug 2013 21:12:36 -0000	1.934
+++ ChangeLog	25 Aug 2013 21:13:52 -0000	1.935
@@ -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.934 2013/08/25 21:12:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.935 2013/08/25 21:13:52 mgorny Exp $
+
+  25 Aug 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Copy bundled egg-info files for reuse in python_compile(). This solves issues
+  that caused some of the files not to be installed in broken packages.
 
   25 Aug 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Namespace, clean up and describe _disable_ez_setup.



1.76                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- distutils-r1.eclass	25 Aug 2013 21:12:36 -0000	1.75
+++ distutils-r1.eclass	25 Aug 2013 21:13:52 -0000	1.76
@@ -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.75 2013/08/25 21:12:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.76 2013/08/25 21:13:52 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -323,6 +323,17 @@
 	fi
 }
 
+# @FUNCTION: _distutils-r1_copy_egg_info
+# @DESCRIPTION:
+# Copy egg-info files to the ${BUILD_DIR} (that's going to become
+# egg-base in esetup.py). This way, we respect whatever's in upstream
+# egg-info.
+_distutils-r1_copy_egg_info() {
+	mkdir -p "${BUILD_DIR}" || die
+	# stupid freebsd can't do 'cp -t ${BUILD_DIR} {} +'
+	find -name '*.egg-info' -type d -exec cp -pr {} "${BUILD_DIR}"/ ';' || die
+}
+
 # @FUNCTION: distutils-r1_python_prepare_all
 # @DESCRIPTION:
 # The default python_prepare_all(). It applies the patches from PATCHES
@@ -383,6 +394,8 @@
 distutils-r1_python_compile() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	_distutils-r1_copy_egg_info
+
 	esetup.py "${@}"
 }
 

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

[Michal Gorny (mgorny)]

mgorny      13/08/25 21:15:28

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Mark _copy-egg-info as internal.

Revision  Changes    Path
1.936                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.935
retrieving revision 1.936
diff -u -r1.935 -r1.936
--- ChangeLog	25 Aug 2013 21:13:52 -0000	1.935
+++ ChangeLog	25 Aug 2013 21:15:28 -0000	1.936
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.935 2013/08/25 21:13:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.936 2013/08/25 21:15:28 mgorny Exp $
+
+  25 Aug 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Mark _copy-egg-info as internal.
 
   25 Aug 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Copy bundled egg-info files for reuse in python_compile(). This solves issues



1.77                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- distutils-r1.eclass	25 Aug 2013 21:13:52 -0000	1.76
+++ distutils-r1.eclass	25 Aug 2013 21:15:28 -0000	1.77
@@ -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.76 2013/08/25 21:13:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.77 2013/08/25 21:15:28 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -324,6 +324,7 @@
 }
 
 # @FUNCTION: _distutils-r1_copy_egg_info
+# @INTERNAL
 # @DESCRIPTION:
 # Copy egg-info files to the ${BUILD_DIR} (that's going to become
 # egg-base in esetup.py). This way, we respect whatever's in upstream

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

[Michal Gorny (mgorny)]

mgorny      13/09/17 17:33:39

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Use einstalldocs.

Revision  Changes    Path
1.973                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.972
retrieving revision 1.973
diff -u -r1.972 -r1.973
--- ChangeLog	17 Sep 2013 17:28:04 -0000	1.972
+++ ChangeLog	17 Sep 2013 17:33:39 -0000	1.973
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.972 2013/09/17 17:28:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.973 2013/09/17 17:33:39 mgorny Exp $
+
+  17 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Use einstalldocs.
 
   17 Sep 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
   Rename variables in _python_ln_rel to make it less confusing.



1.80                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- distutils-r1.eclass	17 Sep 2013 13:33:55 -0000	1.79
+++ distutils-r1.eclass	17 Sep 2013 17:33:39 -0000	1.80
@@ -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.79 2013/09/17 13:33:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.80 2013/09/17 17:33:39 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -510,25 +510,7 @@
 distutils-r1_python_install_all() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	if declare -p DOCS &>/dev/null; then
-		# an empty list == don't install anything
-		if [[ ${DOCS[@]} ]]; then
-			dodoc -r "${DOCS[@]}"
-		fi
-	else
-		local f
-		# same list as in PMS
-		for f in README* ChangeLog AUTHORS NEWS TODO CHANGES \
-				THANKS BUGS FAQ CREDITS CHANGELOG; do
-			if [[ -s ${f} ]]; then
-				dodoc "${f}"
-			fi
-		done
-	fi
-
-	if declare -p HTML_DOCS &>/dev/null; then
-		dohtml -r "${HTML_DOCS[@]}"
-	fi
+	einstalldocs
 
 	if declare -p EXAMPLES &>/dev/null; then
 		local INSDESTTREE=/usr/share/doc/${PF}/examples

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

[Michal Gorny (mgorny)]

mgorny      13/09/18 22:48:10

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Fix accepting arguments in distutils_install_for_testing.

Revision  Changes    Path
1.978                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.977
retrieving revision 1.978
diff -u -r1.977 -r1.978
--- ChangeLog	18 Sep 2013 18:47:59 -0000	1.977
+++ ChangeLog	18 Sep 2013 22:48:10 -0000	1.978
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.977 2013/09/18 18:47:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.978 2013/09/18 22:48:10 mgorny Exp $
+
+  18 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Fix accepting arguments in distutils_install_for_testing.
 
   18 Sep 2013; Michał Górny <mgorny@gentoo.org> python.eclass:
   Add a note not to add new Python versions to python.eclass.



1.81                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- distutils-r1.eclass	17 Sep 2013 17:33:39 -0000	1.80
+++ distutils-r1.eclass	18 Sep 2013 22:48:10 -0000	1.81
@@ -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.80 2013/09/17 17:33:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.81 2013/09/18 22:48:10 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -305,7 +305,7 @@
 	fi
 
 	mkdir -p "${libdir}" || die
-	esetup.py "${add_args[@]}"
+	esetup.py "${add_args[@]}" "${@}"
 }
 
 # @FUNCTION: _distutils-r1_disable_ez_setup

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

[Michal Gorny (mgorny)]

mgorny      13/09/26 11:58:41

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Wrap symlinks installed to PYTHON_SCRIPTDIR as well.

Revision  Changes    Path
1.989                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.988
retrieving revision 1.989
diff -u -r1.988 -r1.989
--- ChangeLog	26 Sep 2013 11:24:30 -0000	1.988
+++ ChangeLog	26 Sep 2013 11:58:41 -0000	1.989
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.988 2013/09/26 11:24:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.989 2013/09/26 11:58:41 mgorny Exp $
+
+  26 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Wrap symlinks installed to PYTHON_SCRIPTDIR as well.
 
   26 Sep 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
   python-single-r1.eclass, python-utils-r1.eclass:



1.83                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- distutils-r1.eclass	19 Sep 2013 17:36:50 -0000	1.82
+++ distutils-r1.eclass	26 Sep 2013 11:58:41 -0000	1.83
@@ -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.82 2013/09/19 17:36:50 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.83 2013/09/26 11:58:41 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -430,6 +430,8 @@
 		local basename=${f##*/}
 		debug-print "${FUNCNAME}: found executable at ${f#${path}/}"
 
+		[[ -d ${f} ]] && die "Unexpected directory: ${f}"
+
 		local shebang
 		read -r shebang < "${f}"
 		if [[ ${shebang} == '#!'*${EPYTHON}* ]]; then
@@ -450,7 +452,7 @@
 			debug-print "${FUNCNAME}: moving to /usr/bin/${basename}"
 			mv "${f}" "${path}${EPREFIX}/usr/bin/${basename}" || die
 		fi
-	done < <(find "${path}${PYTHON_SCRIPTDIR}" -type f -print0)
+	done < <(find "${path}${PYTHON_SCRIPTDIR}" -mindepth 1 -print0)
 }
 
 # @FUNCTION: distutils-r1_python_install

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

[Michal Gorny (mgorny)]

mgorny      13/09/27 19:19:57

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Make HOME per-implementation.

Revision  Changes    Path
1.993                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.992
retrieving revision 1.993
diff -u -r1.992 -r1.993
--- ChangeLog	27 Sep 2013 16:22:28 -0000	1.992
+++ ChangeLog	27 Sep 2013 19:19:57 -0000	1.993
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.992 2013/09/27 16:22:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.993 2013/09/27 19:19:57 mgorny Exp $
+
+  27 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Make HOME per-implementation.
 
   27 Sep 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
   Always fetch all branches when doing non-shallow fetch.



1.84                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- distutils-r1.eclass	26 Sep 2013 11:58:41 -0000	1.83
+++ distutils-r1.eclass	27 Sep 2013 19:19:57 -0000	1.84
@@ -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.83 2013/09/26 11:58:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.84 2013/09/27 19:19:57 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -547,9 +547,10 @@
 	fi
 	local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
 
-	local TMPDIR=${T}/${EPYTHON}
+	local -x TMPDIR=${T}/${EPYTHON}
+	local -x HOME=${TMPDIR}/home
 
-	mkdir -p "${TMPDIR}" || die
+	mkdir -p "${TMPDIR}" "${HOME}" || die
 
 	"${@}"
 

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

[Michal Gorny (mgorny)]

mgorny      13/09/27 19:21:43

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Use pydistutils.cfg to set build-dirs instead of passing commands explicitly. This should reduce the amount of implicit behavior.

Revision  Changes    Path
1.994                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.993
retrieving revision 1.994
diff -u -r1.993 -r1.994
--- ChangeLog	27 Sep 2013 19:19:57 -0000	1.993
+++ ChangeLog	27 Sep 2013 19:21:43 -0000	1.994
@@ -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.993 2013/09/27 19:19:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.994 2013/09/27 19:21:43 mgorny Exp $
+
+  27 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Use pydistutils.cfg to set build-dirs instead of passing commands explicitly.
+  This should reduce the amount of implicit behavior.
 
   27 Sep 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Make HOME per-implementation.



1.85                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- distutils-r1.eclass	27 Sep 2013 19:19:57 -0000	1.84
+++ distutils-r1.eclass	27 Sep 2013 19:21:43 -0000	1.85
@@ -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.84 2013/09/27 19:19:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.85 2013/09/27 19:21:43 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -215,45 +215,13 @@
 #
 # setup.py will be passed the following, in order:
 # 1. ${mydistutilsargs[@]}
-# 2. The 'build' command and standard build options including ${BUILD_DIR}
-# 3. Any additional arguments passed to the esetup.py function.
+# 2. additional arguments passed to the esetup.py function.
 #
 # This command dies on failure.
 esetup.py() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	local add_args=()
-	if [[ ${BUILD_DIR} ]]; then
-		add_args+=(
-			build
-			--build-base "${BUILD_DIR}"
-
-			# using a single directory for them helps us export
-			# ${PYTHONPATH} and ebuilds find the sources independently
-			# of whether the package installs extensions or not
-			#
-			# note: due to some packages (wxpython) relying on separate
-			# platlib & purelib dirs, we do not set --build-lib (which
-			# can not be overriden with --build-*lib)
-			--build-platlib "${BUILD_DIR}/lib"
-			--build-purelib "${BUILD_DIR}/lib"
-
-			# make the ebuild writer lives easier
-			--build-scripts "${BUILD_DIR}/scripts"
-		)
-
-		# if setuptools is used, adjust egg_info path as well
-		if "${PYTHON:-python}" setup.py --help egg_info &>/dev/null; then
-			add_args+=(
-				egg_info --egg-base "${BUILD_DIR}"
-			)
-		fi
-	elif [[ ! ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
-		die 'Out-of-source build requested, yet BUILD_DIR unset.'
-	fi
-
-	set -- "${PYTHON:-python}" setup.py \
-		"${mydistutilsargs[@]}" "${add_args[@]}" "${@}"
+	set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
 
 	echo "${@}" >&2
 	"${@}" || die
@@ -323,18 +291,6 @@
 	fi
 }
 
-# @FUNCTION: _distutils-r1_copy_egg_info
-# @INTERNAL
-# @DESCRIPTION:
-# Copy egg-info files to the ${BUILD_DIR} (that's going to become
-# egg-base in esetup.py). This way, we respect whatever's in upstream
-# egg-info.
-_distutils-r1_copy_egg_info() {
-	mkdir -p "${BUILD_DIR}" || die
-	# stupid freebsd can't do 'cp -t ${BUILD_DIR} {} +'
-	find -name '*.egg-info' -type d -exec cp -pr {} "${BUILD_DIR}"/ ';' || die
-}
-
 # @FUNCTION: distutils-r1_python_prepare_all
 # @DESCRIPTION:
 # The default python_prepare_all(). It applies the patches from PATCHES
@@ -386,6 +342,46 @@
 	:
 }
 
+# @FUNCTION: _distutils-r1_create_setup_cfg
+# @INTERNAL
+# @DESCRIPTION:
+# Create implementation-specific configuration file for distutils,
+# setting proper build-dir paths.
+_distutils-r1_create_setup_cfg() {
+	cat >> "${HOME}"/.pydistutils.cfg <<-_EOF_ || die
+		[build]
+		build-base = ${BUILD_DIR}
+
+		# using a single directory for them helps us export
+		# ${PYTHONPATH} and ebuilds find the sources independently
+		# of whether the package installs extensions or not
+		#
+		# note: due to some packages (wxpython) relying on separate
+		# platlib & purelib dirs, we do not set --build-lib (which
+		# can not be overriden with --build-*lib)
+		build-platlib = %(build-base)s/lib
+		build-purelib = %(build-base)s/lib
+
+		# make the ebuild writer lives easier
+		build-scripts = %(build-base)s/scripts
+
+		[egg_info]
+		egg-base = ${BUILD_DIR}
+	_EOF_
+}
+
+# @FUNCTION: _distutils-r1_copy_egg_info
+# @INTERNAL
+# @DESCRIPTION:
+# Copy egg-info files to the ${BUILD_DIR} (that's going to become
+# egg-base in esetup.py). This way, we respect whatever's in upstream
+# egg-info.
+_distutils-r1_copy_egg_info() {
+	mkdir -p "${BUILD_DIR}" || die
+	# stupid freebsd can't do 'cp -t ${BUILD_DIR} {} +'
+	find -name '*.egg-info' -type d -exec cp -pr {} "${BUILD_DIR}"/ ';' || die
+}
+
 # @FUNCTION: distutils-r1_python_compile
 # @USAGE: [additional-args...]
 # @DESCRIPTION:
@@ -395,9 +391,10 @@
 distutils-r1_python_compile() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	_distutils-r1_create_setup_cfg
 	_distutils-r1_copy_egg_info
 
-	esetup.py "${@}"
+	esetup.py build "${@}"
 }
 
 # @FUNCTION: distutils-r1_python_test

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

[Mike Gilbert (floppym)]

floppym     13/09/28 19:11:05

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Truncate .pydistutils.cfg in case we call distutils-r1_python_compile more than once.

Revision  Changes    Path
1.996                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.995
retrieving revision 1.996
diff -u -r1.995 -r1.996
--- ChangeLog	28 Sep 2013 16:22:29 -0000	1.995
+++ ChangeLog	28 Sep 2013 19:11:05 -0000	1.996
@@ -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.995 2013/09/28 16:22:29 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.996 2013/09/28 19:11:05 floppym Exp $
+
+  28 Sep 2013; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass:
+  Truncate .pydistutils.cfg in case we call distutils-r1_python_compile more
+  than once.
 
   28 Sep 2013; Christoph Junghans <ottxor@gentoo.org> cvs.eclass:
   added prefix support



1.86                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- distutils-r1.eclass	27 Sep 2013 19:21:43 -0000	1.85
+++ distutils-r1.eclass	28 Sep 2013 19:11:05 -0000	1.86
@@ -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.85 2013/09/27 19:21:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.86 2013/09/28 19:11:05 floppym Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -348,7 +348,7 @@
 # Create implementation-specific configuration file for distutils,
 # setting proper build-dir paths.
 _distutils-r1_create_setup_cfg() {
-	cat >> "${HOME}"/.pydistutils.cfg <<-_EOF_ || die
+	cat > "${HOME}"/.pydistutils.cfg <<-_EOF_ || die
 		[build]
 		build-base = ${BUILD_DIR}
 

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

[Michal Gorny (mgorny)]

mgorny      13/10/10 06:10:00

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Do not alter HOME and TMPDIR when single impl is being used. This may work-around bug #487260.

Revision  Changes    Path
1.1018               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1017
retrieving revision 1.1018
diff -u -r1.1017 -r1.1018
--- ChangeLog	9 Oct 2013 19:08:18 -0000	1.1017
+++ ChangeLog	10 Oct 2013 06:10:00 -0000	1.1018
@@ -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.1017 2013/10/09 19:08:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1018 2013/10/10 06:10:00 mgorny Exp $
+
+  10 Oct 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Do not alter HOME and TMPDIR when single impl is being used. This may
+  work-around bug #487260.
 
   09 Oct 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
   Fix pypy dependency.



1.87                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- distutils-r1.eclass	28 Sep 2013 19:11:05 -0000	1.86
+++ distutils-r1.eclass	10 Oct 2013 06:10:00 -0000	1.87
@@ -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.86 2013/09/28 19:11:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.87 2013/10/10 06:10:00 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -544,10 +544,12 @@
 	fi
 	local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
 
-	local -x TMPDIR=${T}/${EPYTHON}
-	local -x HOME=${TMPDIR}/home
+	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+		local -x TMPDIR=${T}/${EPYTHON}
+		local -x HOME=${TMPDIR}/home
 
-	mkdir -p "${TMPDIR}" "${HOME}" || die
+		mkdir -p "${TMPDIR}" "${HOME}" || die
+	fi
 
 	"${@}"
 

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

[Michal Gorny (mgorny)]

mgorny      13/10/22 15:15:51

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Support installing Python scripts with custom --install-scripts argument. Bug #487788.

Revision  Changes    Path
1.1031               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1030
retrieving revision 1.1031
diff -u -r1.1030 -r1.1031
--- ChangeLog	22 Oct 2013 15:14:40 -0000	1.1030
+++ ChangeLog	22 Oct 2013 15:15:51 -0000	1.1031
@@ -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.1030 2013/10/22 15:14:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1031 2013/10/22 15:15:51 mgorny Exp $
+
+  22 Oct 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Support installing Python scripts with custom --install-scripts argument. Bug
+  #487788.
 
   22 Oct 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
   Add systemd_enable_ntpunit wrt bug #458132.



1.88                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- distutils-r1.eclass	10 Oct 2013 06:10:00 -0000	1.87
+++ distutils-r1.eclass	22 Oct 2013 15:15:51 -0000	1.88
@@ -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.87 2013/10/10 06:10:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.88 2013/10/22 15:15:51 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -407,21 +407,21 @@
 }
 
 # @FUNCTION: _distutils-r1_wrap_scripts
-# @USAGE: <path>
+# @USAGE: <path> <bindir>
 # @INTERNAL
 # @DESCRIPTION:
 # Moves and wraps all installed scripts/executables as necessary.
 _distutils-r1_wrap_scripts() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${#} -eq 2 ]] || die "usage: ${FUNCNAME} <path> <bindir>"
 	local path=${1}
-	[[ ${path} ]] || die "${FUNCNAME}: no path given"
+	local bindir=${2}
 
 	if ! _python_want_python_exec2; then
-		local PYTHON_SCRIPTDIR=${EPREFIX}/usr/bin
+		local PYTHON_SCRIPTDIR=${bindir}
 	fi
 
-	mkdir -p "${path}${EPREFIX}/usr/bin" || die
 	local f
 	while IFS= read -r -d '' f; do
 		local basename=${f##*/}
@@ -429,6 +429,7 @@
 
 		[[ -d ${f} ]] && die "Unexpected directory: ${f}"
 
+		mkdir -p "${path}${bindir}" || die
 		local shebang
 		read -r shebang < "${f}"
 		if [[ ${shebang} == '#!'*${EPYTHON}* ]]; then
@@ -440,14 +441,14 @@
 				mv "${f}" "${newf}" || die
 			fi
 
-			debug-print "${FUNCNAME}: installing wrapper at /usr/bin/${basename}"
+			debug-print "${FUNCNAME}: installing wrapper at ${bindir}/${basename}"
 			_python_ln_rel "${path}${EPREFIX}"$(_python_get_wrapper_path) \
-				"${path}${EPREFIX}/usr/bin/${basename}" || die
+				"${path}${bindir}/${basename}" || die
 		elif _python_want_python_exec2; then
 			debug-print "${FUNCNAME}: non-matching shebang: ${shebang}"
 
-			debug-print "${FUNCNAME}: moving to /usr/bin/${basename}"
-			mv "${f}" "${path}${EPREFIX}/usr/bin/${basename}" || die
+			debug-print "${FUNCNAME}: moving to ${bindir}/${basename}"
+			mv "${f}" "${path}${bindir}/${basename}" || die
 		fi
 	done < <(find "${path}${PYTHON_SCRIPTDIR}" -mindepth 1 -print0)
 }
@@ -491,14 +492,33 @@
 		flags+=( --install-scripts="${PYTHON_SCRIPTDIR}" )
 	fi
 
-	esetup.py install "${flags[@]}" "${@}"
+	esetup.py install "${@}" "${flags[@]}"
 
 	if [[ -d ${root}$(python_get_sitedir)/tests ]]; then
 		die "Package installs 'tests' package, file collisions likely."
 	fi
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
-		_distutils-r1_wrap_scripts "${root}"
+		# user may override --install-scripts
+		# note: this is poor but distutils argv parsing is dumb
+		local scriptdir=${EPREFIX}/usr/bin
+		set -- "${mydistutilsargs[@]}" "${@}"
+		while [[ ${@} ]]; do
+			local a=${1}
+			shift
+
+			case "${a}" in
+				--install-scripts=*)
+					scriptdir=${a#--install-scripts=}
+					;;
+				--install-scripts)
+					scriptdir=${1}
+					shift
+					;;
+			esac
+		done
+
+		_distutils-r1_wrap_scripts "${root}" "${scriptdir}"
 		multibuild_merge_root "${root}" "${D}"
 	fi
 }

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

[Michal Gorny (mgorny)]

mgorny      13/10/22 19:23:47

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Fix failing to pass default install arguments when user passes an additional command. Reported by radhermit.

Revision  Changes    Path
1.1033               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1032
retrieving revision 1.1033
diff -u -r1.1032 -r1.1033
--- ChangeLog	22 Oct 2013 15:16:56 -0000	1.1032
+++ ChangeLog	22 Oct 2013 19:23:47 -0000	1.1033
@@ -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.1032 2013/10/22 15:16:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1033 2013/10/22 19:23:47 mgorny Exp $
+
+  22 Oct 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Fix failing to pass default install arguments when user passes an additional
+  command. Reported by radhermit.
 
   22 Oct 2013; Michał Górny <mgorny@gentoo.org> python-any-r1.eclass,
   python-r1.eclass, python-single-r1.eclass:



1.89                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- distutils-r1.eclass	22 Oct 2013 15:15:51 -0000	1.88
+++ distutils-r1.eclass	22 Oct 2013 19:23:47 -0000	1.89
@@ -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.88 2013/10/22 15:15:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.89 2013/10/22 19:23:47 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -492,7 +492,7 @@
 		flags+=( --install-scripts="${PYTHON_SCRIPTDIR}" )
 	fi
 
-	esetup.py install "${@}" "${flags[@]}"
+	esetup.py install "${@}" install "${flags[@]}"
 
 	if [[ -d ${root}$(python_get_sitedir)/tests ]]; then
 		die "Package installs 'tests' package, file collisions likely."

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

[Michal Gorny (mgorny)]

mgorny      13/10/26 17:47:51

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Fix distutils-r1_python_install to strip --install-scripts= rather than passing "install" twice to override it. Fixes compatibility with dev-python/paver.

Revision  Changes    Path
1.1035               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1034
retrieving revision 1.1035
diff -u -r1.1034 -r1.1035
--- ChangeLog	26 Oct 2013 06:19:13 -0000	1.1034
+++ ChangeLog	26 Oct 2013 17:47:51 -0000	1.1035
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1034 2013/10/26 06:19:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1035 2013/10/26 17:47:51 mgorny Exp $
+
+  26 Oct 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Fix distutils-r1_python_install to strip --install-scripts= rather than
+  passing "install" twice to override it. Fixes compatibility with
+  dev-python/paver.
 
   26 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
   Fix handling relative submodule paths.



1.90                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- distutils-r1.eclass	22 Oct 2013 19:23:47 -0000	1.89
+++ distutils-r1.eclass	26 Oct 2013 17:47:51 -0000	1.90
@@ -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.89 2013/10/22 19:23:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.90 2013/10/26 17:47:51 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -463,6 +463,7 @@
 distutils-r1_python_install() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local args=( "${@}" )
 	local flags
 
 	case "${EPYTHON}" in
@@ -485,39 +486,58 @@
 	[[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D}
 	flags+=( --root="${root}" )
 
-	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]] && _python_want_python_exec2
-	then
-		local PYTHON_SCRIPTDIR
-		python_export PYTHON_SCRIPTDIR
-		flags+=( --install-scripts="${PYTHON_SCRIPTDIR}" )
-	fi
-
-	esetup.py install "${@}" install "${flags[@]}"
-
-	if [[ -d ${root}$(python_get_sitedir)/tests ]]; then
-		die "Package installs 'tests' package, file collisions likely."
-	fi
-
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 		# user may override --install-scripts
 		# note: this is poor but distutils argv parsing is dumb
+		local mydistutilsargs=( "${mydistutilsargs[@]}" )
 		local scriptdir=${EPREFIX}/usr/bin
-		set -- "${mydistutilsargs[@]}" "${@}"
+
+		# construct a list of mydistutilsargs[0] args[0] args[1]...
+		local arg arg_vars
+		[[ ${mydistutilsargs[@]} ]] && eval arg_vars+=(
+			'mydistutilsargs['{0..$(( ${#mydistutilsargs[@]} - 1 ))}']'
+		)
+		[[ ${args[@]} ]] && eval arg_vars+=(
+			'args['{0..$(( ${#args[@]} - 1 ))}']'
+		)
+
+		set -- "${arg_vars[@]}"
 		while [[ ${@} ]]; do
-			local a=${1}
+			local arg_var=${1}
 			shift
+			local a=${!arg_var}
 
 			case "${a}" in
 				--install-scripts=*)
 					scriptdir=${a#--install-scripts=}
+					if _python_want_python_exec2; then
+						unset "${arg_var}"
+					fi
 					;;
 				--install-scripts)
-					scriptdir=${1}
+					scriptdir=${!1}
+					if _python_want_python_exec2; then
+						unset "${arg_var}" "${1}"
+					fi
 					shift
 					;;
 			esac
 		done
 
+		if _python_want_python_exec2; then
+			local PYTHON_SCRIPTDIR
+			python_export PYTHON_SCRIPTDIR
+			flags+=( --install-scripts="${PYTHON_SCRIPTDIR}" )
+		fi
+	fi
+
+	esetup.py install "${flags[@]}" "${args[@]}"
+
+	if [[ -d ${root}$(python_get_sitedir)/tests ]]; then
+		die "Package installs 'tests' package, file collisions likely."
+	fi
+
+	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 		_distutils-r1_wrap_scripts "${root}" "${scriptdir}"
 		multibuild_merge_root "${root}" "${D}"
 	fi

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

[Michal Gorny (mgorny)]

mgorny      13/11/11 15:58:40

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Read all shebangs before moving files to avoid breaking symlinks that are going to be scanned.

Revision  Changes    Path
1.1054               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1053
retrieving revision 1.1054
diff -u -r1.1053 -r1.1054
--- ChangeLog	9 Nov 2013 10:22:06 -0000	1.1053
+++ ChangeLog	11 Nov 2013 15:58:40 -0000	1.1054
@@ -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.1053 2013/11/09 10:22:06 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1054 2013/11/11 15:58:40 mgorny Exp $
+
+  11 Nov 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Read all shebangs before moving files to avoid breaking symlinks that are
+  going to be scanned.
 
   09 Nov 2013; Hans de Graaff <graaff@gentoo.org> ruby-fakegem.eclass:
   Add a yard recipe for creating documentation.



1.91                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- distutils-r1.eclass	26 Oct 2013 17:47:51 -0000	1.90
+++ distutils-r1.eclass	11 Nov 2013 15:58:40 -0000	1.91
@@ -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.90 2013/10/26 17:47:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.91 2013/11/11 15:58:40 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -422,35 +422,48 @@
 		local PYTHON_SCRIPTDIR=${bindir}
 	fi
 
-	local f
-	while IFS= read -r -d '' f; do
-		local basename=${f##*/}
-		debug-print "${FUNCNAME}: found executable at ${f#${path}/}"
-
-		[[ -d ${f} ]] && die "Unexpected directory: ${f}"
-
-		mkdir -p "${path}${bindir}" || die
-		local shebang
-		read -r shebang < "${f}"
-		if [[ ${shebang} == '#!'*${EPYTHON}* ]]; then
-			debug-print "${FUNCNAME}: matching shebang: ${shebang}"
+	local f python_files=() non_python_files=()
+
+	if [[ -d ${path}${PYTHON_SCRIPTDIR} ]]; then
+		for f in "${path}${PYTHON_SCRIPTDIR}"/*; do
+			[[ -d ${f} ]] && die "Unexpected directory: ${f}"
+			debug-print "${FUNCNAME}: found executable at ${f#${path}/}"
+
+			local shebang
+			read -r shebang < "${f}"
+			if [[ ${shebang} == '#!'*${EPYTHON}* ]]; then
+				debug-print "${FUNCNAME}: matching shebang: ${shebang}"
+				python_files+=( "${f}" )
+			elif _python_want_python_exec2; then
+				debug-print "${FUNCNAME}: non-matching shebang: ${shebang}"
+				non_python_files+=( "${f}" )
+			fi
+
+			mkdir -p "${path}${bindir}" || die
+		done
+
+		for f in "${python_files[@]}"; do
+			local basename=${f##*/}
 
 			if ! _python_want_python_exec2; then
 				local newf=${f%/*}/${basename}-${EPYTHON}
-				debug-print "${FUNCNAME}: renaming to ${newf#${path}}"
+				debug-print "${FUNCNAME}: renaming ${f#${path}/} to ${newf#${path}/}"
 				mv "${f}" "${newf}" || die
 			fi
 
 			debug-print "${FUNCNAME}: installing wrapper at ${bindir}/${basename}"
 			_python_ln_rel "${path}${EPREFIX}"$(_python_get_wrapper_path) \
 				"${path}${bindir}/${basename}" || die
-		elif _python_want_python_exec2; then
-			debug-print "${FUNCNAME}: non-matching shebang: ${shebang}"
+		done
+
+		# (non-empty only with python-exec:2)
+		for f in "${non_python_files[@]}"; do
+			local basename=${f##*/}
 
-			debug-print "${FUNCNAME}: moving to ${bindir}/${basename}"
+			debug-print "${FUNCNAME}: moving ${f#${path}/} to ${bindir}/${basename}"
 			mv "${f}" "${path}${bindir}/${basename}" || die
-		fi
-	done < <(find "${path}${PYTHON_SCRIPTDIR}" -mindepth 1 -print0)
+		done
+	fi
 }
 
 # @FUNCTION: distutils-r1_python_install

[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@gentoo.org> distutils-r1.eclass:
+  Override bdist_egg->build_dir via pydistutils.cfg rather than extra command.
+  Fixes bug #489842.
 
   02 Dec 2013; Sergey Popov <pinkbyte@gentoo.org> +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_
 }
 

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

[Mike Gilbert (floppym)]

floppym     13/12/03 20:00:39

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Remove pointless distutils-r1_python_test function.

Revision  Changes    Path
1.1078               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1077
retrieving revision 1.1078
diff -u -r1.1077 -r1.1078
--- ChangeLog	2 Dec 2013 13:14:09 -0000	1.1077
+++ ChangeLog	3 Dec 2013 20:00:39 -0000	1.1078
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1077 2013/12/02 13:14:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1078 2013/12/03 20:00:39 floppym Exp $
+
+  03 Dec 2013; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass:
+  Remove pointless distutils-r1_python_test function.
 
   02 Dec 2013; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Override bdist_egg->build_dir via pydistutils.cfg rather than extra command.



1.93                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- distutils-r1.eclass	2 Dec 2013 13:14:09 -0000	1.92
+++ distutils-r1.eclass	3 Dec 2013 20:00:39 -0000	1.93
@@ -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.92 2013/12/02 13:14:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.93 2013/12/03 20:00:39 floppym Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -394,15 +394,6 @@
 	esetup.py build "${@}"
 }
 
-# @FUNCTION: distutils-r1_python_test
-# @DESCRIPTION:
-# The default python_test(). A no-op.
-distutils-r1_python_test() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	:
-}
-
 # @FUNCTION: _distutils-r1_wrap_scripts
 # @USAGE: <path> <bindir>
 # @INTERNAL

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

[Mike Gilbert (floppym)]

floppym     14/01/18 15:06:56

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Silence sandbox for /usr/local, bug 498232.

Revision  Changes    Path
1.1125               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1124
retrieving revision 1.1125
diff -u -r1.1124 -r1.1125
--- ChangeLog	18 Jan 2014 14:53:07 -0000	1.1124
+++ ChangeLog	18 Jan 2014 15:06:56 -0000	1.1125
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1124 2014/01/18 14:53:07 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1125 2014/01/18 15:06:56 floppym Exp $
+
+  18 Jan 2014; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass:
+  Silence sandbox for /usr/local, bug 498232.
 
   18 Jan 2014; Mike Gilbert <floppym@gentoo.org> kernel-2.eclass:
   Convert to python-any-r1.eclass



1.94                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- distutils-r1.eclass	3 Dec 2013 20:00:39 -0000	1.93
+++ distutils-r1.eclass	18 Jan 2014 15:06:56 -0000	1.94
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.93 2013/12/03 20:00:39 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.94 2014/01/18 15:06:56 floppym Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -482,6 +482,7 @@
 	# failures if some packages haven't compiled their modules yet.
 	addpredict "$(python_get_sitedir)"
 	addpredict /usr/lib/portage/pym
+	addpredict /usr/local # bug 498232
 
 	local root=${D}/_${EPYTHON}
 	[[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D}

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

[Michal Gorny (mgorny)]

mgorny      14/05/11 07:58:35

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Fail when package installs "share" subdirectory to PyPy prefix. This should stop people from adding PyPy support to packages that do not work due to the bug in PyPy.

Revision  Changes    Path
1.1250               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1249
retrieving revision 1.1250
diff -u -r1.1249 -r1.1250
--- ChangeLog	10 May 2014 21:36:49 -0000	1.1249
+++ ChangeLog	11 May 2014 07:58:35 -0000	1.1250
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1249 2014/05/10 21:36:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1250 2014/05/11 07:58:35 mgorny Exp $
+
+  11 May 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Fail when package installs "share" subdirectory to PyPy prefix. This should
+  stop people from adding PyPy support to packages that do not work due to the
+  bug in PyPy.
 
   10 May 2014; Michał Górny <mgorny@gentoo.org> multibuild.eclass:
   Remove the coreutils dependency since the old copying code has been replaced



1.95                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- distutils-r1.eclass	18 Jan 2014 15:06:56 -0000	1.94
+++ distutils-r1.eclass	11 May 2014 07:58:35 -0000	1.95
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.94 2014/01/18 15:06:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.95 2014/05/11 07:58:35 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -538,6 +538,9 @@
 	if [[ -d ${root}$(python_get_sitedir)/tests ]]; then
 		die "Package installs 'tests' package, file collisions likely."
 	fi
+	if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
+		die "Package installs 'share' in PyPy prefix, see bug #465546."
+	fi
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 		_distutils-r1_wrap_scripts "${root}" "${scriptdir}"

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

[Mike Gilbert (floppym)]

floppym     14/05/19 05:00:34

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Work around bash-4.3 bug by setting PYTHONDONTWRITEBYTECODE to an empty string.

Revision  Changes    Path
1.1257               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1256
retrieving revision 1.1257
diff -u -r1.1256 -r1.1257
--- ChangeLog	18 May 2014 19:08:34 -0000	1.1256
+++ ChangeLog	19 May 2014 05:00:34 -0000	1.1257
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1256 2014/05/18 19:08:34 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1257 2014/05/19 05:00:34 floppym Exp $
+
+  19 May 2014; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass:
+  Work around bash-4.3 bug by setting PYTHONDONTWRITEBYTECODE to an empty
+  string.
 
   18 May 2014; Brian Evans <grknight@gentoo.org> mysql_fx.eclass:
   Fix a bug that prevented emerge --config to notice a changed datadir.



1.96                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- distutils-r1.eclass	11 May 2014 07:58:35 -0000	1.95
+++ distutils-r1.eclass	19 May 2014 05:00:34 -0000	1.96
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.95 2014/05/11 07:58:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.96 2014/05/19 05:00:34 floppym Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -476,7 +476,7 @@
 	debug-print "${FUNCNAME}: [${EPYTHON}] flags: ${flags}"
 
 	# enable compilation for the install phase.
-	local -x PYTHONDONTWRITEBYTECODE
+	local -x PYTHONDONTWRITEBYTECODE=
 
 	# python likes to compile any module it sees, which triggers sandbox
 	# failures if some packages haven't compiled their modules yet.

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

[Michal Gorny (mgorny)]

mgorny      14/06/19 12:54:47

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Always set up CC, CXX and friends for distutils builds, bug #513664. Thanks to Arfrever for the explanation.

Revision  Changes    Path
1.1293               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1292
retrieving revision 1.1293
diff -u -r1.1292 -r1.1293
--- ChangeLog	19 Jun 2014 09:28:09 -0000	1.1292
+++ ChangeLog	19 Jun 2014 12:54:47 -0000	1.1293
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1292 2014/06/19 09:28:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1293 2014/06/19 12:54:47 mgorny Exp $
+
+  19 Jun 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Always set up CC, CXX and friends for distutils builds, bug #513664. Thanks
+  to Arfrever for the explanation.
 
   19 Jun 2014; Michał Górny <mgorny@gentoo.org> gstreamer.eclass:
   Bump gstreamer deps to satisfy multilib.



1.97                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- distutils-r1.eclass	19 May 2014 05:00:34 -0000	1.96
+++ distutils-r1.eclass	19 Jun 2014 12:54:47 -0000	1.97
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.96 2014/05/19 05:00:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.97 2014/06/19 12:54:47 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -79,7 +79,7 @@
 
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 	inherit multiprocessing python-r1
@@ -596,6 +596,13 @@
 		mkdir -p "${TMPDIR}" "${HOME}" || die
 	fi
 
+	# Set up build environment, bug #513664.
+	local -x AR=${AR} CC=${CC} CPP=${CPP} CXX=${CXX}
+	tc-export AR CC CPP CXX
+
+	# XXX: portability for -shared?
+	local -x LDSHARED="${CC} -shared" LDCXXSHARED="${CXX} -shared"
+
 	"${@}"
 
 	if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]

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

[Michal Gorny (mgorny)]

mgorny      14/06/22 07:01:37

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Set LD{,CXX}SHARED properly for Darwin, reported by Fabian Groffen on bug #513664.

Revision  Changes    Path
1.1297               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1296
retrieving revision 1.1297
diff -u -r1.1296 -r1.1297
--- ChangeLog	20 Jun 2014 11:40:28 -0000	1.1296
+++ ChangeLog	22 Jun 2014 07:01:37 -0000	1.1297
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1296 2014/06/20 11:40:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1297 2014/06/22 07:01:37 mgorny Exp $
+
+  22 Jun 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Set LD{,CXX}SHARED properly for Darwin, reported by Fabian Groffen on bug
+  #513664.
 
   20 Jun 2014; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
   Fix typo in submodule fetching, reported by Hans Vercammen.



1.99                 eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- distutils-r1.eclass	21 Jun 2014 08:14:18 -0000	1.98
+++ distutils-r1.eclass	22 Jun 2014 07:01:37 -0000	1.99
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.98 2014/06/21 08:14:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.99 2014/06/22 07:01:37 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -600,8 +600,14 @@
 	local -x AR=${AR} CC=${CC} CPP=${CPP} CXX=${CXX}
 	tc-export AR CC CPP CXX
 
-	# XXX: portability for -shared? -- YES!
-	[[ ${CHOST} == *-darwin* ]] || local -x LDSHARED="${CC} -shared" LDCXXSHARED="${CXX} -shared"
+	# How to build Python modules in different worlds...
+	local ldopts
+	case "${CHOST}" in
+		*-darwin*) ldopts='-bundle -undefined dynamic_lookup';;
+		*) ldopts='-shared';;
+	esac
+
+	local -x LDSHARED="${CC} ${ldopts}" LDCXXSHARED="${CXX} ${ldopts}"
 
 	"${@}"
 

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

[Michal Gorny (mgorny)]

mgorny      14/07/08 08:49:10

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Support linking Python modules on aix, thanks to haubi.

Revision  Changes    Path
1.1318               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1317
retrieving revision 1.1318
diff -u -r1.1317 -r1.1318
--- ChangeLog	7 Jul 2014 14:41:56 -0000	1.1317
+++ ChangeLog	8 Jul 2014 08:49:10 -0000	1.1318
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1317 2014/07/07 14:41:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1318 2014/07/08 08:49:10 mgorny Exp $
+
+  08 Jul 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Support linking Python modules on aix, thanks to haubi.
 
   07 Jul 2014; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
   Stop forcing -m0755 on EGIT3_STORE_DIR and parents, bug #516508.



1.101                eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- distutils-r1.eclass	29 Jun 2014 14:24:22 -0000	1.100
+++ distutils-r1.eclass	8 Jul 2014 08:49:10 -0000	1.101
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.100 2014/06/29 14:24:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.101 2014/07/08 08:49:10 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -603,6 +603,9 @@
 	# How to build Python modules in different worlds...
 	local ldopts
 	case "${CHOST}" in
+		# provided by haubi, 2014-07-08
+		*-aix*) ldopts='-shared -Wl,-berok';; # good enough
+		# provided by grobian, 2014-06-22, bug #513664 c7
 		*-darwin*) ldopts='-bundle -undefined dynamic_lookup';;
 		*) ldopts='-shared';;
 	esac

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

[Michal Gorny (mgorny)]

mgorny      14/08/24 13:23:48

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Pass install paths to distutils via setup.cfg.

Revision  Changes    Path
1.1356               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1355
retrieving revision 1.1356
diff -u -r1.1355 -r1.1356
--- ChangeLog	23 Aug 2014 10:37:18 -0000	1.1355
+++ ChangeLog	24 Aug 2014 13:23:48 -0000	1.1356
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1355 2014/08/23 10:37:18 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1356 2014/08/24 13:23:48 mgorny Exp $
+
+  24 Aug 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Pass install paths to distutils via setup.cfg.
 
   23 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-policy-2.eclass:
   Adding relabeling support for SELinux depending packages



1.102                eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- distutils-r1.eclass	8 Jul 2014 08:49:10 -0000	1.101
+++ distutils-r1.eclass	24 Aug 2014 13:23:48 -0000	1.102
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.101 2014/07/08 08:49:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.102 2014/08/24 13:23:48 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -217,6 +217,10 @@
 # 1. ${mydistutilsargs[@]}
 # 2. additional arguments passed to the esetup.py function.
 #
+# Please note that setup.py will respect defaults (unless overriden
+# via command-line options) from setup.cfg that is created
+# in distutils-r1_python_compile and in distutils-r1_python_install.
+#
 # This command dies on failure.
 esetup.py() {
 	debug-print-function ${FUNCNAME} "${@}"
@@ -338,7 +342,7 @@
 # @INTERNAL
 # @DESCRIPTION:
 # Create implementation-specific configuration file for distutils,
-# setting proper build-dir paths.
+# setting proper build-dir (and install-dir) paths.
 _distutils-r1_create_setup_cfg() {
 	cat > "${HOME}"/.pydistutils.cfg <<-_EOF_ || die
 		[build]
@@ -365,6 +369,25 @@
 		[bdist_egg]
 		dist-dir = ${BUILD_DIR}/dist
 	_EOF_
+
+	# we can't refer to ${D} before src_install()
+	if [[ ${EBUILD_PHASE} == install ]]; then
+		cat >> "${HOME}"/.pydistutils.cfg <<-_EOF_ || die
+
+			# installation paths -- allow calling extra install targets
+			# without the default 'install'
+			[install]
+			compile = True
+			optimize = 2
+			root = ${D}
+		_EOF_
+
+		if [[ ! ${DISTUTILS_SINGLE_IMPL} ]] && _python_want_python_exec2; then
+			cat >> "${HOME}"/.pydistutils.cfg <<-_EOF_ || die
+				install-scripts = $(python_get_scriptdir)
+			_EOF_
+		fi
+	fi
 }
 
 # @FUNCTION: _distutils-r1_copy_egg_info
@@ -385,6 +408,9 @@
 # The default python_compile(). Runs 'esetup.py build'. Any parameters
 # passed to this function will be appended to setup.py invocation,
 # i.e. passed as options to the 'build' command.
+#
+# This phase also sets up initial setup.cfg with build directories
+# and copies upstream egg-info files if supplied.
 distutils-r1_python_compile() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -406,8 +432,11 @@
 	local path=${1}
 	local bindir=${2}
 
-	if ! _python_want_python_exec2; then
-		local PYTHON_SCRIPTDIR=${bindir}
+	local PYTHON_SCRIPTDIR
+	if _python_want_python_exec2; then
+		python_export PYTHON_SCRIPTDIR
+	else
+		PYTHON_SCRIPTDIR=${bindir}
 	fi
 
 	local f python_files=() non_python_files=()
@@ -457,37 +486,29 @@
 # @FUNCTION: distutils-r1_python_install
 # @USAGE: [additional-args...]
 # @DESCRIPTION:
-# The default python_install(). Runs 'esetup.py install', appending
-# the optimization flags. Then renames the installed scripts.
+# The default python_install(). Runs 'esetup.py install', doing
+# intermediate root install and handling script wrapping afterwards.
 # Any parameters passed to this function will be appended
 # to the setup.py invocation (i.e. as options to the 'install' command).
+#
+# This phase updates the setup.cfg file with install directories.
 distutils-r1_python_install() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	local args=( "${@}" )
-	local flags
-
-	case "${EPYTHON}" in
-		jython*)
-			flags=(--compile);;
-		*)
-			flags=(--compile -O2);;
-	esac
-	debug-print "${FUNCNAME}: [${EPYTHON}] flags: ${flags}"
 
 	# enable compilation for the install phase.
 	local -x PYTHONDONTWRITEBYTECODE=
 
+	# re-create setup.cfg with install paths
+	_distutils-r1_create_setup_cfg
+
 	# python likes to compile any module it sees, which triggers sandbox
 	# failures if some packages haven't compiled their modules yet.
 	addpredict "$(python_get_sitedir)"
 	addpredict /usr/lib/portage/pym
 	addpredict /usr/local # bug 498232
 
-	local root=${D}/_${EPYTHON}
-	[[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D}
-	flags+=( --root="${root}" )
-
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 		# user may override --install-scripts
 		# note: this is poor but distutils argv parsing is dumb
@@ -525,15 +546,12 @@
 					;;
 			esac
 		done
-
-		if _python_want_python_exec2; then
-			local PYTHON_SCRIPTDIR
-			python_export PYTHON_SCRIPTDIR
-			flags+=( --install-scripts="${PYTHON_SCRIPTDIR}" )
-		fi
 	fi
 
-	esetup.py install "${flags[@]}" "${args[@]}"
+	local root=${D}/_${EPYTHON}
+	[[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D}
+
+	esetup.py install --root="${root}" "${args[@]}"
 
 	if [[ -d ${root}$(python_get_sitedir)/tests ]]; then
 		die "Package installs 'tests' package, file collisions likely."

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

[Mike Gilbert (floppym)]

floppym     14/11/24 01:39:55

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  eqawarn about /usr/lib/pypy/share instead of dying.

Revision  Changes    Path
1.1445               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1444
retrieving revision 1.1445
diff -u -r1.1444 -r1.1445
--- ChangeLog	23 Nov 2014 21:46:29 -0000	1.1444
+++ ChangeLog	24 Nov 2014 01:39:55 -0000	1.1445
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1444 2014/11/23 21:46:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1445 2014/11/24 01:39:55 floppym Exp $
+
+  24 Nov 2014; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass:
+  eqawarn about /usr/lib/pypy/share instead of dying.
 
   23 Nov 2014; Michał Górny <mgorny@gentoo.org> gnome2-utils.eclass:
   Support multilib in gnome2_query_immodules_gtk2() as well.



1.103                eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- distutils-r1.eclass	24 Aug 2014 13:23:48 -0000	1.102
+++ distutils-r1.eclass	24 Nov 2014 01:39:55 -0000	1.103
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.102 2014/08/24 13:23:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.103 2014/11/24 01:39:55 floppym Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -557,7 +557,7 @@
 		die "Package installs 'tests' package, file collisions likely."
 	fi
 	if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
-		die "Package installs 'share' in PyPy prefix, see bug #465546."
+		eqawarn "Package installs 'share' in PyPy prefix, see bug #465546."
 	fi
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then

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

[Michal Gorny (mgorny)]

mgorny      14/12/11 09:07:04

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Restore using separate HOMEs for Python implementations, because of .pydistutils.cfg. Bug #532236.

Revision  Changes    Path
1.1457               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1456
retrieving revision 1.1457
diff -u -r1.1456 -r1.1457
--- ChangeLog	9 Dec 2014 18:38:57 -0000	1.1456
+++ ChangeLog	11 Dec 2014 09:07:04 -0000	1.1457
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1456 2014/12/09 18:38:57 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1457 2014/12/11 09:07:04 mgorny Exp $
+
+  11 Dec 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Restore using separate HOMEs for Python implementations, because of
+  .pydistutils.cfg. Bug #532236.
 
   09 Dec 2014; Manuel Rüger <mrueg@gentoo.org> kde4-base.eclass:
   Sync kde4-base.eclass with overlay.



1.105                eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- distutils-r1.eclass	7 Dec 2014 19:15:19 -0000	1.104
+++ distutils-r1.eclass	11 Dec 2014 09:07:04 -0000	1.105
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.104 2014/12/07 19:15:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.105 2014/12/11 09:07:04 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -593,6 +593,12 @@
 	fi
 	local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}"
 
+	# We need separate home for each implementation, for .pydistutils.cfg.
+	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+		local -x HOME=${HOME}/${EPYTHON}
+		mkdir -p "${HOME}" || die
+	fi
+
 	# Set up build environment, bug #513664.
 	local -x AR=${AR} CC=${CC} CPP=${CPP} CXX=${CXX}
 	tc-export AR CC CPP CXX

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

[Michal Gorny (mgorny)]

mgorny      14/12/11 18:32:30

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Always restore initial directory after sub-phase run. Fixes bug #532168 and possibly more.

Revision  Changes    Path
1.1458               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1457
retrieving revision 1.1458
diff -u -r1.1457 -r1.1458
--- ChangeLog	11 Dec 2014 09:07:04 -0000	1.1457
+++ ChangeLog	11 Dec 2014 18:32:30 -0000	1.1458
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1457 2014/12/11 09:07:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1458 2014/12/11 18:32:30 mgorny Exp $
+
+  11 Dec 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Always restore initial directory after sub-phase run. Fixes bug #532168 and
+  possibly more.
 
   11 Dec 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Restore using separate HOMEs for Python implementations, because of



1.106                eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- distutils-r1.eclass	11 Dec 2014 09:07:04 -0000	1.105
+++ distutils-r1.eclass	11 Dec 2014 18:32:30 -0000	1.106
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.105 2014/12/11 09:07:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.106 2014/12/11 18:32:30 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -587,7 +587,7 @@
 
 	if [[ ${DISTUTILS_IN_SOURCE_BUILD} ]]; then
 		if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
-			pushd "${BUILD_DIR}" >/dev/null || die
+			cd "${BUILD_DIR}" || die
 		fi
 		local BUILD_DIR=${BUILD_DIR}/build
 	fi
@@ -617,10 +617,7 @@
 
 	"${@}"
 
-	if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]]
-	then
-		popd >/dev/null || die
-	fi
+	cd "${_DISTUTILS_INITIAL_CWD}" || die
 }
 
 # @FUNCTION: _distutils-r1_run_common_phase
@@ -635,6 +632,7 @@
 	local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR}
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+		local _DISTUTILS_INITIAL_CWD=${PWD}
 		local MULTIBUILD_VARIANTS
 		_python_obtain_impls
 
@@ -654,6 +652,8 @@
 _distutils-r1_run_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	# store for restoring after distutils-r1_run_phase.
+	local _DISTUTILS_INITIAL_CWD=${PWD}
 	set -- distutils-r1_run_phase "${@}"
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then

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

[Michal Gorny (mgorny)]

mgorny      14/12/27 19:00:10

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Add die-replacements for distutils.eclass functions, to help finding mistakes in conversions.

Revision  Changes    Path
1.1477               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1476
retrieving revision 1.1477
diff -u -r1.1476 -r1.1477
--- ChangeLog	27 Dec 2014 18:26:21 -0000	1.1476
+++ ChangeLog	27 Dec 2014 19:00:10 -0000	1.1477
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1476 2014/12/27 18:26:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1477 2014/12/27 19:00:10 mgorny Exp $
+
+  27 Dec 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Add die-replacements for distutils.eclass functions, to help finding mistakes
+  in conversions.
 
   27 Dec 2014; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
   Add die-replacements for python.eclass functions, to help finding mistakes in



1.107                eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- distutils-r1.eclass	11 Dec 2014 18:32:30 -0000	1.106
+++ distutils-r1.eclass	27 Dec 2014 19:00:10 -0000	1.107
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.106 2014/12/11 18:32:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.107 2014/12/27 19:00:10 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -750,5 +750,39 @@
 	fi
 }
 
+# -- distutils.eclass functions --
+
+distutils_get_intermediate_installation_image() {
+	die "${FUNCNAME}() is invalid for distutils-r1"
+}
+
+distutils_src_unpack() {
+	die "${FUNCNAME}() is invalid for distutils-r1, and you don't want it in EAPI ${EAPI} anyway"
+}
+
+distutils_src_prepare() {
+	die "${FUNCNAME}() is invalid for distutils-r1, you probably want: ${FUNCNAME/_/-r1_}"
+}
+
+distutils_src_compile() {
+	die "${FUNCNAME}() is invalid for distutils-r1, you probably want: ${FUNCNAME/_/-r1_}"
+}
+
+distutils_src_test() {
+	die "${FUNCNAME}() is invalid for distutils-r1, you probably want: ${FUNCNAME/_/-r1_}"
+}
+
+distutils_src_install() {
+	die "${FUNCNAME}() is invalid for distutils-r1, you probably want: ${FUNCNAME/_/-r1_}"
+}
+
+distutils_pkg_postinst() {
+	die "${FUNCNAME}() is invalid for distutils-r1, and pkg_postinst is unnecessary"
+}
+
+distutils_pkg_postrm() {
+	die "${FUNCNAME}() is invalid for distutils-r1, and pkg_postrm is unnecessary"
+}
+
 _DISTUTILS_R1=1
 fi

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

[Michal Gorny (mgorny)]

mgorny      15/01/13 21:34:55

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Support restricting implementations for *_all() phases.

Revision  Changes    Path
1.1509               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1508
retrieving revision 1.1509
diff -u -r1.1508 -r1.1509
--- ChangeLog	13 Jan 2015 21:34:22 -0000	1.1508
+++ ChangeLog	13 Jan 2015 21:34:55 -0000	1.1509
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1508 2015/01/13 21:34:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1509 2015/01/13 21:34:55 mgorny Exp $
+
+  13 Jan 2015; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Support restricting implementations for *_all() phases.
 
   13 Jan 2015; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
   Support restricting accepted implementation list for python_setup.



1.109                eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- distutils-r1.eclass	28 Dec 2014 10:56:55 -0000	1.108
+++ distutils-r1.eclass	13 Jan 2015 21:34:55 -0000	1.109
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.108 2014/12/28 10:56:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.109 2015/01/13 21:34:55 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -181,6 +181,31 @@
 # 'build --build-base ${BUILD_DIR}' to enforce keeping & using built
 # files in the specific root.
 
+# @ECLASS-VARIABLE: DISTUTILS_ALL_SUBPHASE_IMPLS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array of patterns specifying which implementations can be used
+# for *_all() sub-phase functions. If undefined, defaults to '*'
+# (allowing any implementation). If multiple values are specified,
+# implementations matching any of the patterns will be accepted.
+#
+# If the restriction needs to apply conditionally to a USE flag,
+# the variable should be set conditionally as well (e.g. in an early
+# phase function or other convenient location).
+#
+# Please remember to add a matching || block to REQUIRED_USE,
+# to ensure that at least one implementation matching the patterns will
+# be enabled.
+#
+# Example:
+# @CODE
+# REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+#
+# pkg_setup() {
+#     use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+# }
+# @CODE
+
 # @ECLASS-VARIABLE: mydistutilsargs
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -624,24 +649,30 @@
 # @USAGE: [<argv>...]
 # @INTERNAL
 # @DESCRIPTION:
-# Run the given command, restoring the best-implementation state.
+# Run the given command, restoring the state for a most preferred Python
+# implementation matching DISTUTILS_ALL_SUBPHASE_IMPLS.
 #
 # If in-source build is used, the command will be run in the copy
-# of sources made for the best Python interpreter.
+# of sources made for the selected Python interpreter.
 _distutils-r1_run_common_phase() {
 	local DISTUTILS_ORIG_BUILD_DIR=${BUILD_DIR}
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
-		local _DISTUTILS_INITIAL_CWD=${PWD}
-		local MULTIBUILD_VARIANTS
-		_python_obtain_impls
+		local best_impl patterns=( "${DISTUTILS_ALL_SUBPHASE_IMPLS[@]-*}" )
+		_distutils_try_impl() {
+			local pattern
+			for pattern in "${patterns[@]}"; do
+				if [[ ${EPYTHON} == ${pattern} ]]; then
+					best_impl=${MULTIBUILD_VARIANT}
+				fi
+			done
+		}
+		python_foreach_impl _distutils_try_impl
 
-		multibuild_for_best_variant _python_multibuild_wrapper \
-			distutils-r1_run_phase "${@}"
-	else
-		# semi-hack, be careful.
-		_distutils-r1_run_foreach_impl "${@}"
+		local PYTHON_COMPAT=( "${best_impl}" )
 	fi
+
+	_distutils-r1_run_foreach_impl "${@}"
 }
 
 # @FUNCTION: _distutils-r1_run_foreach_impl

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

[Patrick Lauer (patrick)]

patrick     15/01/31 02:49:39

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Fix for setuptools failures #534058 etc.

Revision  Changes    Path
1.1518               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1517
retrieving revision 1.1518
diff -u -r1.1517 -r1.1518
--- ChangeLog	29 Jan 2015 09:59:51 -0000	1.1517
+++ ChangeLog	31 Jan 2015 02:49:39 -0000	1.1518
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1517 2015/01/29 09:59:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1518 2015/01/31 02:49:39 patrick Exp $
+
+  31 Jan 2015; Patrick Lauer <patrick@gentoo.org> distutils-r1.eclass:
+  Fix for setuptools failures #534058 etc.
 
   29 Jan 2015; Pacho Ramos <pacho@gentoo.org> gnome2.eclass:
   Drop support for eapi0 and 1 (#530046)



1.110                eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- distutils-r1.eclass	13 Jan 2015 21:34:55 -0000	1.109
+++ distutils-r1.eclass	31 Jan 2015 02:49:39 -0000	1.110
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.109 2015/01/13 21:34:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.110 2015/01/31 02:49:39 patrick Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -754,11 +754,18 @@
 	fi
 }
 
+_clean_egg_info() {
+	# Work around for setuptools test behavior (bug 534058).
+	# https://bitbucket.org/pypa/setuptools/issue/292
+	rm -rf "${BUILD_DIR}"/lib/*.egg-info
+}
+
 distutils-r1_src_test() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if declare -f python_test >/dev/null; then
 		_distutils-r1_run_foreach_impl python_test
+		_distutils-r1_run_foreach_impl _clean_egg_info
 	fi
 
 	if declare -f python_test_all >/dev/null; then

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

[Michal Gorny (mgorny)]

mgorny      15/07/16 14:29:39

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Forbid also installing "examples" package, bug #555038.

Revision  Changes    Path
1.1712               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1711
retrieving revision 1.1712
diff -u -r1.1711 -r1.1712
--- ChangeLog	16 Jul 2015 06:06:59 -0000	1.1711
+++ ChangeLog	16 Jul 2015 14:29:39 -0000	1.1712
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1711 2015/07/16 06:06:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1712 2015/07/16 14:29:39 mgorny Exp $
+
+  16 Jul 2015; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
+  Forbid also installing "examples" package, bug #555038.
 
   16 Jul 2015; Lars Wendler <polynomial-c@gentoo.org> apache-2.eclass:
   Added slot dependency for openssl. Raised minimum required EAPI version to 5.



1.115                eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- distutils-r1.eclass	4 Jul 2015 15:26:17 -0000	1.114
+++ distutils-r1.eclass	16 Jul 2015 14:29:39 -0000	1.115
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.114 2015/07/04 15:26:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.115 2015/07/16 14:29:39 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -549,9 +549,13 @@
 
 	esetup.py install --root="${root}" "${args[@]}"
 
-	if [[ -d ${root}$(python_get_sitedir)/tests ]]; then
-		die "Package installs 'tests' package, file collisions likely."
-	fi
+	local forbidden_package_names=( examples test tests )
+	local p
+	for p in "${forbidden_package_names[@]}"; do
+		if [[ -d ${root}$(python_get_sitedir)/${p} ]]; then
+			die "Package installs '${p}' package which is forbidden and likely a bug in the build system."
+		fi
+	done
 	if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
 		eqawarn "Package installs 'share' in PyPy prefix, see bug #465546."
 	fi

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

[Mike Gilbert (floppym)]

floppym     15/07/18 00:07:01

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Add entire python directory to SANDBOX_PREDICT, bug 554252.

Revision  Changes    Path
1.1720               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1719
retrieving revision 1.1720
diff -u -r1.1719 -r1.1720
--- ChangeLog	17 Jul 2015 18:36:23 -0000	1.1719
+++ ChangeLog	18 Jul 2015 00:07:01 -0000	1.1720
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1719 2015/07/17 18:36:23 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1720 2015/07/18 00:07:01 floppym Exp $
+
+  18 Jul 2015; Mike Gilbert <floppym@gentoo.org> distutils-r1.eclass:
+  Add entire python directory to SANDBOX_PREDICT, bug 554252.
 
   17 Jul 2015; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
   mozconfig-v6.38.eclass, mozconfig-v6.39.eclass:



1.116                eclass/distutils-r1.eclass

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

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- distutils-r1.eclass	16 Jul 2015 14:29:39 -0000	1.115
+++ distutils-r1.eclass	18 Jul 2015 00:07:01 -0000	1.116
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.115 2015/07/16 14:29:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.116 2015/07/18 00:07:01 floppym Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -505,7 +505,7 @@
 
 	# python likes to compile any module it sees, which triggers sandbox
 	# failures if some packages haven't compiled their modules yet.
-	addpredict "$(python_get_sitedir)"
+	addpredict "${EPREFIX}/usr/$(get_libdir)/${EPYTHON}"
 	addpredict /usr/lib/portage/pym
 	addpredict /usr/local # bug 498232