public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-03-25 18:48 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 26+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-03-25 18:48 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/03/25 18:48:42

  Modified:             ChangeLog
  Added:                python-distutils-ng.eclass
  Log:
  Add python-distutils-ng.eclass: new eclass for installing Python, distutils based packages.

Revision  Changes    Path
1.186                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- ChangeLog	25 Mar 2012 15:31:01 -0000	1.185
+++ ChangeLog	25 Mar 2012 18:48:42 -0000	1.186
@@ -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.185 2012/03/25 15:31:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.186 2012/03/25 18:48:42 nelchael Exp $
+
+  25 Mar 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  +python-distutils-ng.eclass:
+  Add python-distutils-ng.eclass: new eclass for installing Python, distutils
+  based packages.
 
   25 Mar 2012; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-python-common.eclass:



1.1                  eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.1 2012/03/25 18:48:42 nelchael Exp $

# @ECLASS: python-distutils-ng
# @MAINTAINER:
# Python herd <python@gentoo.org>
# @AUTHOR:
# Author: Krzysztof Pawlik <nelchael@gentoo.org>
# @BLURB: An eclass for installing Python packages using distutils with proper
# support for multiple Python slots.
# @DESCRIPTION:
# The Python eclass is designed to allow an easier installation of Python
# packages and their incorporation into the Gentoo Linux system.
#
# This eclass provides functions for following phases:
#  - src_prepare - you can define python_prepare_all function that will be run
#    before creating implementation-specific directory and python_prepare
#    function that will be run for each implementation
#  - src_configure - you can define python_configure function that will be run
#    for each implementation
#  - src_compile - you can define python_compile function that will be run for
#    each implementation, default function will run `setup.py build'
#  - src_test - you can define python_test function that will be run for each
#    implementation
#  - src_install - you can define python_install function that will be run for
#    each implementation and python_install_all that will be run in original
#    directory (so it wil lnot contain any implementation-specific files)

# @ECLASS-VARIABLE: PYTHON_COMPAT
# @DESCRIPTION:
# This variable contains a space separated list of implementations (see above) a
# package is compatible to. It must be set before the `inherit' call. The
# default is to enable all implementations.

if [[ -z "${PYTHON_COMPAT}" ]]; then
	# Default: pure python, support all implementations
	PYTHON_COMPAT="  python2_5 python2_6 python2_7"
	PYTHON_COMPAT+=" python3_1 python3_2"
	PYTHON_COMPAT+=" jython2_5"
	PYTHON_COMPAT+=" pypy1_7 pypy1_8"
fi

# @ECLASS-VARIABLE: PYTHON_OPTIONAL
# @DESCRIPTION:
# Set the value to "yes" to make the dependency on a Python interpreter
# optional.

# @ECLASS-VARIABLE: PYTHON_DISABLE_COMPILATION
# @DESCRIPTION:
# Set the value to "yes" to skip compilation and/or optimization of Python
# modules.

EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install

case "${EAPI}" in
	0|1|2|3)
		die "Unsupported EAPI=${EAPI} (too old) for python-distutils-ng.eclass" ;;
	4)
		# EAPI=4 needed for REQUIRED_USE
		S="${S:-${WORKDIR}/${P}}"
		;;
	*)
		die "Unsupported EAPI=${EAPI} (unknown) for python-distutils-ng.eclass" ;;
esac

# @FUNCTION: _python-distutils-ng_generate_depend
# @USAGE: implementation
# @RETURN: Package atom of a Python implementation for *DEPEND.
# @DESCRIPTION:
# This function returns the full package atom of a Python implementation.
#
# `implementation' has to be one of the valid values for PYTHON_COMPAT.
_python-distutils-ng_generate_depend() {
	local impl="${1/_/.}"
	case "${impl}" in
		python?.?)
			echo "dev-lang/${impl::-3}:${impl: -3}" ;;
		jython?.?)
			echo "dev-java/${impl::-3}:${impl: -3}" ;;
		pypy?.?)
			echo "dev-python/${impl::-3}:${impl: -3}" ;;
		*)
			die "Unsupported implementation: ${1}" ;;
	esac
}

# @FUNCTION: _python-distutils-ng_get_binary_for_implementation
# @USAGE: implementation
# @RETURN: Full path to Python binary for given implementation.
# @DESCRIPTION:
# This function returns full path for Python binary for given implementation.
#
# Binary returned by this function should be used instead of simply calling
# `python'.
_python-distutils-ng_get_binary_for_implementation() {
	local impl="${1/_/.}"
	case "${impl}" in
		python?.?|jython?.?)
			echo "/usr/bin/${impl}" ;;
		pypy?.?)
			echo "/usr/bin/pypy-c${impl: -3}" ;;
		*)
			die "Unsupported implementation: ${1}" ;;
	esac
}

required_use_str=" || (
	python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
	python_targets_python3_1 python_targets_python3_2
	python_targets_jython2_5
	python_targets_pypy1_7 python_targets_pypy1_8 )"
if [[ "${PYTHON_OPTIONAL}" = "yes" ]]; then
	IUSE+="python"
	REQUIRED_USE+=" python? ( ${required_use_str} )"
else
	REQUIRED_USE+="${required_use_str}"
fi

for impl in ${PYTHON_COMPAT}; do
	IUSE+=" python_targets_${impl} "
	local dep_str="python_targets_${impl}? ( $(_python-distutils-ng_generate_depend "${impl}") )"

	if [[ "${PYTHON_OPTIONAL}" = "yes" ]]; then
		RDEPEND="${RDEPEND} python? ( ${dep_str} )"
		DEPEND="${DEPEND} python? ( ${dep_str} )"
	else
		RDEPEND="${RDEPEND} ${dep_str}"
		DEPEND="${DEPEND} ${dep_str}"
	fi
done

_PACKAGE_SPECIFIC_S="${S#${WORKDIR}/}"

# @FUNCTION: _python-distutils-ng_run_for_impl
# @USAGE: implementation command_to_run
# @DESCRIPTION:
# Run command_to_run using specified Python implementation.
#
# This will run the command_to_run in implementation-specific working directory.
_python-distutils-ng_run_for_impl() {
	local impl="${1}"
	local command="${2}"

	S="${WORKDIR}/impl_${impl}/${_PACKAGE_SPECIFIC_S}"
	PYTHON="$(_python-distutils-ng_get_binary_for_implementation "${impl}")"
	EPYTHON="${impl/_/.}"

	einfo "Running ${command} in ${S} for ${impl}"

	pushd "${S}" &> /dev/null
	"${command}" "${impl}" "${PYTHON}"
	popd &> /dev/null
}

# @FUNCTION: _python-distutils-ng_run_for_each_impl
# @USAGE: command_to_run
# @DESCRIPTION:
# Run command_to_run for all enabled Python implementations.
#
# See also _python-distutils-ng_run_for_impl
_python-distutils-ng_run_for_each_impl() {
	local command="${1}"

	for impl in ${PYTHON_COMPAT}; do
		use "python_targets_${impl}" ${PYTHON_COMPAT} || continue
		_python-distutils-ng_run_for_impl "${impl}" "${command}"
	done
}

# @FUNCTION: _python-distutils-ng_default_distutils_compile
# @DESCRIPTION:
# Default src_compile for distutils-based packages.
_python-distutils-ng_default_distutils_compile() {
	"${PYTHON}" setup.py build || die
}

# @FUNCTION: _python-distutils-ng_default_distutils_install
# @DESCRIPTION:
# Default src_install for distutils-based packages.
_python-distutils-ng_default_distutils_install() {
	"${PYTHON}" setup.py install --no-compile --root="${D}/" || die
}

# @FUNCTION: _python-distutils-ng_has_compileall
# @USAGE: implementation
# @RETURN: 0 if given implementation has compileall module
# @DESCRIPTION:
# This function is used to decide whenever to compile Python modules for given
# implementation.
_python-distutils-ng_has_compileall() {
	case "${1}" in
		python?_?|jython?_?)
			return 0 ;;
		*)
			return 1 ;;
	esac
}

# @FUNCTION: _python-distutils-ng_has_compileall_opt
# @USAGE: implementation
# @RETURN: 0 if given implementation has compileall module and supports # optimizations
# @DESCRIPTION:
# This function is used to decide whenever to compile and optimize Python
# modules for given implementation.
_python-distutils-ng_has_compileall_opt() {
	case "${1}" in
		python?_?)
			return 0 ;;
		*)
			return 1 ;;
	esac
}

# @FUNCTION: python-distutils-ng_doscript
# @USAGE: script_file_name [destination_directory]
# @DESCRIPTION:
# Install given script file in destination directory (for default value check
# python-distutils-ng_newscript) for all enabled implementations using original
# script name as a base name.
#
# See also python-distutils-ng_newscript for more details.
python-distutils-ng_doscript() {
	python-distutils-ng_newscript "${1}" "$(basename "${1}")" "${2}"
}

# @FUNCTION: python-distutils-ng_newscript
# @USAGE: script_file_name new_file_name [destination_directory]
# @DESCRIPTION:
# Install given script file in destination directory for all enabled
# implementations using new_file_name as a base name.
#
# Destination directory defaults to /usr/bin.
#
# If only one Python implementation is enabled the script will be installed
# as-is. Otherwise each script copy will have the name mangled to
# "new_file_name-IMPLEMENTATION". For every installed script new hash-bang line
# will be inserted to reference specific Python interpreter.
#
# In case of multiple implementations there will be also a symlink with name
# equal to new_file_name that will be a symlink to default implementation, which
# defaults to value of PYTHON_DEFAULT_IMPLEMENTATION, if not specified the
# function will pick default implementation: it will the be first enabled one
# from the following list:
#   python2_7, python2_6, python2_5, python3_2, python3_1, pypy1_8, pypy1_7, jython2_5
python-distutils-ng_newscript() {
	[[ -n "${1}" ]] || die "Missing source file name"
	[[ -n "${2}" ]] || die "Missing destination file name"
	local source_file="${1}"
	local destination_file="${2}"
	local default_impl="${PYTHON_DEFAULT_IMPLEMENTATION}"
	local enabled_impls=0
	local destination_directory="/usr/bin"
	[[ -n "${3}" ]] && destination_directory="${3}"

	for impl in ${PYTHON_COMPAT}; do
		use "python_targets_${impl}" || continue
		enabled_impls=$((enabled_impls + 1))
	done

	if [[ -z "${default_impl}" ]]; then
		for impl in python{2_7,2_6,2_5,3_2,3_1} pypy{1_8,1_7} jython2_5; do
			use "python_targets_${impl}" || continue
			default_impl="${impl}"
			break
		done
	else
		use "python_targets_${impl}" || \
			die "default implementation ${default_impl} not enabled"
	fi

	[[ -n "${default_impl}" ]] || die "Could not select default implementation"

	dodir "${destination_directory}"
	insinto "${destination_directory}"
	if [[ "${enabled_impls}" = "1" ]]; then
		einfo "Installing ${source_file} for single implementation (${default_impl}) in ${destination_directory}"
		newins "${source_file}" "${destination_file}"
		fperms 755 "${destination_directory}/${destination_file}"
		sed -i \
			-e "1i#!$(_python-distutils-ng_get_binary_for_implementation "${impl}")" \
			"${D}${destination_directory}/${destination_file}" || die
	else
		einfo "Installing ${source_file} for multiple implementations (default: ${default_impl}) in ${destination_directory}"
		for impl in ${PYTHON_COMPAT}; do
			use "python_targets_${impl}" ${PYTHON_COMPAT} || continue

			newins "${source_file}" "${destination_file}-${impl}"
			fperms 755 "${destination_directory}/${destination_file}-${impl}"
			sed -i \
				-e "1i#!$(_python-distutils-ng_get_binary_for_implementation "${impl}")" \
				"${D}${destination_directory}/${destination_file}-${impl}" || die
		done

		dosym "${destination_file}-${default_impl}" "${destination_directory}/${destination_file}"
	fi
}

# Phase function: src_prepare
python-distutils-ng_src_prepare() {
	[[ "${PYTHON_OPTIONAL}" = "yes" ]] && { use python || return; }

	# Try to run binary for each implementation:
	for impl in ${PYTHON_COMPAT}; do
		use "python_targets_${impl}" ${PYTHON_COMPAT} || continue
		$(_python-distutils-ng_get_binary_for_implementation "${impl}") \
			-c "import sys" || die
	done

	# Run prepare shared by all implementations:
	if type python_prepare_all &> /dev/null; then
		einfo "Running python_prepare_all in ${S} for all"
		python_prepare_all
	fi

	# Create a copy of S for each implementation:
	for impl in ${PYTHON_COMPAT}; do
		use "python_targets_${impl}" ${PYTHON_COMPAT} || continue

		einfo "Creating copy for ${impl} in ${WORKDIR}/impl_${impl}"
		mkdir -p "${WORKDIR}/impl_${impl}" || die
		cp -pr "${S}" "${WORKDIR}/impl_${impl}/${_PACKAGE_SPECIFIC_S}" || die
	done

	# Run python_prepare for each implementation:
	if type python_prepare &> /dev/null; then
		_python-distutils-ng_run_for_each_impl python_prepare
	fi
}

# Phase function: src_configure
python-distutils-ng_src_configure() {
	[[ "${PYTHON_OPTIONAL}" = "yes" ]] && { use python || return; }

	if type python_configure &> /dev/null; then
		_python-distutils-ng_run_for_each_impl python_configure
	fi
}

# Phase function: src_compile
python-distutils-ng_src_compile() {
	[[ "${PYTHON_OPTIONAL}" = "yes" ]] && { use python || return; }

	if type python_compile &> /dev/null; then
		_python-distutils-ng_run_for_each_impl python_compile
	else
		_python-distutils-ng_run_for_each_impl \
			_python-distutils-ng_default_distutils_compile
	fi
}

# Phase function: src_test
python-distutils-ng_src_test() {
	[[ "${PYTHON_OPTIONAL}" = "yes" ]] && { use python || return; }

	if type python_test &> /dev/null; then
		_python-distutils-ng_run_for_each_impl python_test
	fi
}

# Phase function: src_install
python-distutils-ng_src_install() {
	[[ "${PYTHON_OPTIONAL}" = "yes" ]] && { use python || return; }

	if type python_install &> /dev/null; then
		_python-distutils-ng_run_for_each_impl python_install
	else
		_python-distutils-ng_run_for_each_impl \
			_python-distutils-ng_default_distutils_install
	fi

	S="${WORKDIR}/${_PACKAGE_SPECIFIC_S}"
	if type python_install_all &> /dev/null; then
		einfo "Running python_install_all in ${S} for all"
		python_install_all
	fi

	for impl in ${PYTHON_COMPAT}; do
		[[ "${PYTHON_DISABLE_COMPILATION}" = "yes" ]] && continue
		use "python_targets_${impl}" ${PYTHON_COMPAT} || continue

		PYTHON="$(_python-distutils-ng_get_binary_for_implementation "${impl}")"
		for accessible_path in $(${PYTHON} -c 'import sys; print " ".join(sys.path)'); do
			[[ -d "${D}/${accessible_path}" ]] || continue

			_python-distutils-ng_has_compileall "${impl}" || continue
			ebegin "Compiling ${accessible_path} for ${impl}"
			${PYTHON} \
				-m compileall -q -f "${D}/${accessible_path}" || die
			eend $?

			_python-distutils-ng_has_compileall_opt "${impl}" || continue
			ebegin "Optimizing ${accessible_path} for ${impl}"
			PYTHONOPTIMIZE=1 ${PYTHON} \
				-m compileall -q -f "${D}/${accessible_path}" || die
			eend $?
		done;
	done
}






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-03-26  6:12 Justin Lecher (jlec)
  0 siblings, 0 replies; 26+ messages in thread
From: Justin Lecher (jlec) @ 2012-03-26  6:12 UTC (permalink / raw
  To: gentoo-commits

jlec        12/03/26 06:12:53

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Add missing space to new python.eclass

Revision  Changes    Path
1.187                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- ChangeLog	25 Mar 2012 18:48:42 -0000	1.186
+++ ChangeLog	26 Mar 2012 06:12:53 -0000	1.187
@@ -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.186 2012/03/25 18:48:42 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.187 2012/03/26 06:12:53 jlec Exp $
+
+  26 Mar 2012; Justin Lecher <jlec@gentoo.org> python-distutils-ng.eclass:
+  Add missing space to new python.eclass
 
   25 Mar 2012; Krzysztof Pawlik <nelchael@gentoo.org>
   +python-distutils-ng.eclass:



1.2                  eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-distutils-ng.eclass	25 Mar 2012 18:48:42 -0000	1.1
+++ python-distutils-ng.eclass	26 Mar 2012 06:12:53 -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/python-distutils-ng.eclass,v 1.1 2012/03/25 18:48:42 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.2 2012/03/26 06:12:53 jlec Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -114,7 +114,7 @@
 	IUSE+="python"
 	REQUIRED_USE+=" python? ( ${required_use_str} )"
 else
-	REQUIRED_USE+="${required_use_str}"
+	REQUIRED_USE+=" ${required_use_str}"
 fi
 
 for impl in ${PYTHON_COMPAT}; do






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-03-26 16:24 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 26+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-03-26 16:24 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/03/26 16:24:31

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Include only valid values in REQUIRED_USE.

Revision  Changes    Path
1.188                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- ChangeLog	26 Mar 2012 06:12:53 -0000	1.187
+++ ChangeLog	26 Mar 2012 16:24:31 -0000	1.188
@@ -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.187 2012/03/26 06:12:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.188 2012/03/26 16:24:31 nelchael Exp $
+
+  26 Mar 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  python-distutils-ng.eclass:
+  Include only valid values in REQUIRED_USE.
 
   26 Mar 2012; Justin Lecher <jlec@gentoo.org> python-distutils-ng.eclass:
   Add missing space to new python.eclass



1.3                  eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-distutils-ng.eclass	26 Mar 2012 06:12:53 -0000	1.2
+++ python-distutils-ng.eclass	26 Mar 2012 16:24:31 -0000	1.3
@@ -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/python-distutils-ng.eclass,v 1.2 2012/03/26 06:12:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.3 2012/03/26 16:24:31 nelchael Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -105,11 +105,11 @@
 	esac
 }
 
-required_use_str=" || (
-	python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
-	python_targets_python3_1 python_targets_python3_2
-	python_targets_jython2_5
-	python_targets_pypy1_7 python_targets_pypy1_8 )"
+required_use_str=""
+for impl in ${PYTHON_COMPAT}; do
+	required_use_str="${required_use_str} python_targets_${impl}"
+done
+required_use_str=" || ( ${required_use_str} )"
 if [[ "${PYTHON_OPTIONAL}" = "yes" ]]; then
 	IUSE+="python"
 	REQUIRED_USE+=" python? ( ${required_use_str} )"






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-03-26 18:27 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 26+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-03-26 18:27 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/03/26 18:27:59

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Small fixes: use +=, cleanup used variables, white space.

Revision  Changes    Path
1.189                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- ChangeLog	26 Mar 2012 16:24:31 -0000	1.188
+++ ChangeLog	26 Mar 2012 18:27:58 -0000	1.189
@@ -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.188 2012/03/26 16:24:31 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.189 2012/03/26 18:27:58 nelchael Exp $
+
+  26 Mar 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  python-distutils-ng.eclass:
+  Small fixes: use +=, cleanup used variables, white space.
 
   26 Mar 2012; Krzysztof Pawlik <nelchael@gentoo.org>
   python-distutils-ng.eclass:



1.4                  eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-distutils-ng.eclass	26 Mar 2012 16:24:31 -0000	1.3
+++ python-distutils-ng.eclass	26 Mar 2012 18:27:58 -0000	1.4
@@ -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/python-distutils-ng.eclass,v 1.3 2012/03/26 16:24:31 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.4 2012/03/26 18:27:58 nelchael Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -107,19 +107,20 @@
 
 required_use_str=""
 for impl in ${PYTHON_COMPAT}; do
-	required_use_str="${required_use_str} python_targets_${impl}"
+	required_use_str+=" python_targets_${impl}"
 done
 required_use_str=" || ( ${required_use_str} )"
 if [[ "${PYTHON_OPTIONAL}" = "yes" ]]; then
-	IUSE+="python"
+	IUSE+=" python"
 	REQUIRED_USE+=" python? ( ${required_use_str} )"
 else
 	REQUIRED_USE+=" ${required_use_str}"
 fi
+unset required_use_str
 
 for impl in ${PYTHON_COMPAT}; do
-	IUSE+=" python_targets_${impl} "
-	local dep_str="python_targets_${impl}? ( $(_python-distutils-ng_generate_depend "${impl}") )"
+	IUSE+=" python_targets_${impl}"
+	dep_str="python_targets_${impl}? ( $(_python-distutils-ng_generate_depend "${impl}") )"
 
 	if [[ "${PYTHON_OPTIONAL}" = "yes" ]]; then
 		RDEPEND="${RDEPEND} python? ( ${dep_str} )"
@@ -128,6 +129,7 @@
 		RDEPEND="${RDEPEND} ${dep_str}"
 		DEPEND="${DEPEND} ${dep_str}"
 	fi
+	unset dep_str
 done
 
 _PACKAGE_SPECIFIC_S="${S#${WORKDIR}/}"






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-03-26 19:12 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 26+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-03-26 19:12 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/03/26 19:12:29

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Avoid ${impl::-3} parameter expansion, this is not supported by older bash and caused issues with cache generation.

Revision  Changes    Path
1.190                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- ChangeLog	26 Mar 2012 18:27:58 -0000	1.189
+++ ChangeLog	26 Mar 2012 19:12:28 -0000	1.190
@@ -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.189 2012/03/26 18:27:58 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.190 2012/03/26 19:12:28 nelchael Exp $
+
+  26 Mar 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  python-distutils-ng.eclass:
+  Avoid ${impl::-3} parameter expansion, this is not supported by older bash
+  and caused issues with cache generation.
 
   26 Mar 2012; Krzysztof Pawlik <nelchael@gentoo.org>
   python-distutils-ng.eclass:



1.5                  eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-distutils-ng.eclass	26 Mar 2012 18:27:58 -0000	1.4
+++ python-distutils-ng.eclass	26 Mar 2012 19:12:28 -0000	1.5
@@ -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/python-distutils-ng.eclass,v 1.4 2012/03/26 18:27:58 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.5 2012/03/26 19:12:28 nelchael Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -75,11 +75,11 @@
 	local impl="${1/_/.}"
 	case "${impl}" in
 		python?.?)
-			echo "dev-lang/${impl::-3}:${impl: -3}" ;;
+			echo "dev-lang/python:${impl: -3}" ;;
 		jython?.?)
-			echo "dev-java/${impl::-3}:${impl: -3}" ;;
+			echo "dev-java/jython:${impl: -3}" ;;
 		pypy?.?)
-			echo "dev-python/${impl::-3}:${impl: -3}" ;;
+			echo "dev-python/pypy:${impl: -3}" ;;
 		*)
 			die "Unsupported implementation: ${1}" ;;
 	esac






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-03-26 20:33 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 26+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-03-26 20:33 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/03/26 20:33:42

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  _python-distutils-ng_generate_depend was used only in one place, inline it.

Revision  Changes    Path
1.191                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- ChangeLog	26 Mar 2012 19:12:28 -0000	1.190
+++ ChangeLog	26 Mar 2012 20:33:42 -0000	1.191
@@ -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.190 2012/03/26 19:12:28 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.191 2012/03/26 20:33:42 nelchael Exp $
+
+  26 Mar 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  python-distutils-ng.eclass:
+  _python-distutils-ng_generate_depend was used only in one place, inline it.
 
   26 Mar 2012; Krzysztof Pawlik <nelchael@gentoo.org>
   python-distutils-ng.eclass:



1.6                  eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-distutils-ng.eclass	26 Mar 2012 19:12:28 -0000	1.5
+++ python-distutils-ng.eclass	26 Mar 2012 20:33:42 -0000	1.6
@@ -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/python-distutils-ng.eclass,v 1.5 2012/03/26 19:12:28 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.6 2012/03/26 20:33:42 nelchael Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -64,27 +64,6 @@
 		die "Unsupported EAPI=${EAPI} (unknown) for python-distutils-ng.eclass" ;;
 esac
 
-# @FUNCTION: _python-distutils-ng_generate_depend
-# @USAGE: implementation
-# @RETURN: Package atom of a Python implementation for *DEPEND.
-# @DESCRIPTION:
-# This function returns the full package atom of a Python implementation.
-#
-# `implementation' has to be one of the valid values for PYTHON_COMPAT.
-_python-distutils-ng_generate_depend() {
-	local impl="${1/_/.}"
-	case "${impl}" in
-		python?.?)
-			echo "dev-lang/python:${impl: -3}" ;;
-		jython?.?)
-			echo "dev-java/jython:${impl: -3}" ;;
-		pypy?.?)
-			echo "dev-python/pypy:${impl: -3}" ;;
-		*)
-			die "Unsupported implementation: ${1}" ;;
-	esac
-}
-
 # @FUNCTION: _python-distutils-ng_get_binary_for_implementation
 # @USAGE: implementation
 # @RETURN: Full path to Python binary for given implementation.
@@ -120,7 +99,18 @@
 
 for impl in ${PYTHON_COMPAT}; do
 	IUSE+=" python_targets_${impl}"
-	dep_str="python_targets_${impl}? ( $(_python-distutils-ng_generate_depend "${impl}") )"
+	dep_str="${impl/_/.}"
+	case "${dep_str}" in
+		python?.?)
+			dep_str="dev-lang/python:${impl: -3}" ;;
+		jython?.?)
+			dep_str="dev-java/jython:${impl: -3}" ;;
+		pypy?.?)
+			dep_str="dv-python/pypy:${impl: -3}" ;;
+		*)
+			die "Unsupported implementation: ${impl}" ;;
+	esac
+	dep_str="python_targets_${impl}? ( ${dep_str} )"
 
 	if [[ "${PYTHON_OPTIONAL}" = "yes" ]]; then
 		RDEPEND="${RDEPEND} python? ( ${dep_str} )"






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-03-28 14:21 Marien Zwart (marienz)
  0 siblings, 0 replies; 26+ messages in thread
From: Marien Zwart (marienz) @ 2012-03-28 14:21 UTC (permalink / raw
  To: gentoo-commits

marienz     12/03/28 14:21:55

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Try to unbreak dependency generation.

Revision  Changes    Path
1.192                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- ChangeLog	26 Mar 2012 20:33:42 -0000	1.191
+++ ChangeLog	28 Mar 2012 14:21:55 -0000	1.192
@@ -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.191 2012/03/26 20:33:42 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.192 2012/03/28 14:21:55 marienz Exp $
+
+  28 Mar 2012; Marien Zwart <marienz@gentoo.org> python-distutils-ng.eclass:
+  Try to unbreak dependency generation.
 
   26 Mar 2012; Krzysztof Pawlik <nelchael@gentoo.org>
   python-distutils-ng.eclass:



1.8                  eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-distutils-ng.eclass	27 Mar 2012 15:08:00 -0000	1.7
+++ python-distutils-ng.eclass	28 Mar 2012 14:21:55 -0000	1.8
@@ -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/python-distutils-ng.eclass,v 1.7 2012/03/27 15:08:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.8 2012/03/28 14:21:55 marienz Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -102,11 +102,11 @@
 	dep_str="${impl/_/.}"
 	case "${dep_str}" in
 		python?.?)
-			dep_str="dev-lang/python:${impl: -3}" ;;
+			dep_str="dev-lang/python:${dep_str: -3}" ;;
 		jython?.?)
-			dep_str="dev-java/jython:${impl: -3}" ;;
+			dep_str="dev-java/jython:${dep_str: -3}" ;;
 		pypy?.?)
-			dep_str="dev-python/pypy:${impl: -3}" ;;
+			dep_str="dev-python/pypy:${dep_str: -3}" ;;
 		*)
 			die "Unsupported implementation: ${impl}" ;;
 	esac






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-03-30 16:41 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 26+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-03-30 16:41 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/03/30 16:41:40

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Fix two small issues, spotted by Sławomir Nizio <slawomir.nizio@sabayon.org>.

Revision  Changes    Path
1.195                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- ChangeLog	29 Mar 2012 15:35:04 -0000	1.194
+++ ChangeLog	30 Mar 2012 16:41:40 -0000	1.195
@@ -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.194 2012/03/29 15:35:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.195 2012/03/30 16:41:40 nelchael Exp $
+
+  30 Mar 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  python-distutils-ng.eclass:
+  Fix two small issues, spotted by Sławomir Nizio
+  <slawomir.nizio@sabayon.org>.
 
   29 Mar 2012; Patrick Lauer <patrick@gentoo.org> apache-2.eclass:
   Sanitizing directory permissions #398899



1.9                  eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-distutils-ng.eclass	28 Mar 2012 14:21:55 -0000	1.8
+++ python-distutils-ng.eclass	30 Mar 2012 16:41:40 -0000	1.9
@@ -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/python-distutils-ng.eclass,v 1.8 2012/03/28 14:21:55 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.9 2012/03/30 16:41:40 nelchael Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -25,7 +25,7 @@
 #    implementation
 #  - src_install - you can define python_install function that will be run for
 #    each implementation and python_install_all that will be run in original
-#    directory (so it wil lnot contain any implementation-specific files)
+#    directory (so it will not contain any implementation-specific files)
 
 # @ECLASS-VARIABLE: PYTHON_COMPAT
 # @DESCRIPTION:
@@ -257,7 +257,7 @@
 			break
 		done
 	else
-		use "python_targets_${impl}" || \
+		use "python_targets_${default_impl}" || \
 			die "default implementation ${default_impl} not enabled"
 	fi
 






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-04-03 19:12 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 26+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-04-03 19:12 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/04/03 19:12:46

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Add detection of collision-protect in FEATURES.

Revision  Changes    Path
1.200                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- ChangeLog	3 Apr 2012 10:32:09 -0000	1.199
+++ ChangeLog	3 Apr 2012 19:12:46 -0000	1.200
@@ -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.199 2012/04/03 10:32:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.200 2012/04/03 19:12:46 nelchael Exp $
+
+  03 Apr 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  python-distutils-ng.eclass:
+  Add detection of collision-protect in FEATURES.
 
   03 Apr 2012; Pacho Ramos <pacho@gentoo.org> git-2.eclass:
   Reorder git-2.eclass maintainers to get bugs assigned to most active



1.10                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-distutils-ng.eclass	30 Mar 2012 16:41:40 -0000	1.9
+++ python-distutils-ng.eclass	3 Apr 2012 19:12:46 -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/python-distutils-ng.eclass,v 1.9 2012/03/30 16:41:40 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.10 2012/04/03 19:12:46 nelchael Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -51,7 +51,7 @@
 # Set the value to "yes" to skip compilation and/or optimization of Python
 # modules.
 
-EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
+EXPORT_FUNCTIONS pkg_pretend src_prepare src_configure src_compile src_test src_install
 
 case "${EAPI}" in
 	0|1|2|3)
@@ -288,6 +288,17 @@
 	fi
 }
 
+# Phase function: pkg_pretend
+python-distutils-ng_pkg_pretend() {
+	if has "collision-protect" ${FEATURES}; then
+		eerror "Due to previous eclass compiling Python files outside of src_install"
+		eerror "(and not recording resulting .pyc and .pyo files as owned by any package)"
+		eerror "merging this package with \"collision-protect\" in FEATURES will result"
+		eerror "in an error, please switch to using \"protect-owned\" instead."
+		die "\"collision-protect\" in FEATURES detected"
+	fi
+}
+
 # Phase function: src_prepare
 python-distutils-ng_src_prepare() {
 	[[ "${PYTHON_OPTIONAL}" = "yes" ]] && { use python || return; }






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-04-03 19:21 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 26+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-04-03 19:21 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/04/03 19:21:45

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Add function that makes it easier to properly install Python scripts that get installed automatically by distutils.

Revision  Changes    Path
1.202                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- ChangeLog	3 Apr 2012 19:16:29 -0000	1.201
+++ ChangeLog	3 Apr 2012 19:21:45 -0000	1.202
@@ -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.201 2012/04/03 19:16:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.202 2012/04/03 19:21:45 nelchael Exp $
+
+  03 Apr 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  python-distutils-ng.eclass:
+  Add function that makes it easier to properly install Python scripts that get
+  installed automatically by distutils.
 
   03 Apr 2012; Krzysztof Pawlik <nelchael@gentoo.org> mercurial.eclass:
   Rename ESCM_OFFLINE to EVCS_OFFLINE, see bug #410469.



1.11                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-distutils-ng.eclass	3 Apr 2012 19:12:46 -0000	1.10
+++ python-distutils-ng.eclass	3 Apr 2012 19:21:45 -0000	1.11
@@ -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/python-distutils-ng.eclass,v 1.10 2012/04/03 19:12:46 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.11 2012/04/03 19:21:45 nelchael Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -204,6 +204,19 @@
 	esac
 }
 
+# @FUNCTION: python-distutils-ng_redoscript
+# @USAGE: script_file_path [destination_directory]
+# @DESCRIPTION:
+# Reinstall script installed already by setup.py. This works by first moving the
+# script to ${T} directory and later running python-distutils-ng_doscript on it.
+# script_file_path has to be a full path relative to ${D}.
+python-distutils-ng_redoscript() {
+	local sbn="$(basename "${1}")"
+	mkdir -p "${T}/_${sbn}/" || die "failed to create directory"
+	mv "${D}/${1}" "${T}/_${sbn}/${sbn}" || die "failed to move file"
+	python-distutils-ng_doscript "${T}/_${sbn}/${sbn}" "${2}"
+}
+
 # @FUNCTION: python-distutils-ng_doscript
 # @USAGE: script_file_name [destination_directory]
 # @DESCRIPTION:






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-04-30  8:25 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 26+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-04-30  8:25 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/04/30 08:25:31

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Correctly chdir to ${S}, see bug #411563.

Revision  Changes    Path
1.229                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- ChangeLog	29 Apr 2012 23:25:05 -0000	1.228
+++ ChangeLog	30 Apr 2012 08:25:31 -0000	1.229
@@ -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.228 2012/04/29 23:25:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.229 2012/04/30 08:25:31 nelchael Exp $
+
+  30 Apr 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  python-distutils-ng.eclass:
+  Correctly chdir to ${S}, see bug #411563.
 
   29 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org> sgml-catalog.eclass:
   Fix infinite look if the catalog is corrupted.



1.12                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-distutils-ng.eclass	3 Apr 2012 19:21:45 -0000	1.11
+++ python-distutils-ng.eclass	30 Apr 2012 08:25:31 -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/python-distutils-ng.eclass,v 1.11 2012/04/03 19:21:45 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.12 2012/04/30 08:25:31 nelchael Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -388,7 +388,9 @@
 	S="${WORKDIR}/${_PACKAGE_SPECIFIC_S}"
 	if type python_install_all &> /dev/null; then
 		einfo "Running python_install_all in ${S} for all"
+		pushd "${S}" &> /dev/null
 		python_install_all
+		popd &> /dev/null
 	fi
 
 	for impl in ${PYTHON_COMPAT}; do






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-05-02 21:40 Mike Gilbert (floppym)
  0 siblings, 0 replies; 26+ messages in thread
From: Mike Gilbert (floppym) @ 2012-05-02 21:40 UTC (permalink / raw
  To: gentoo-commits

floppym     12/05/02 21:40:42

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Fix bytecode generation with Python 3, bug 413771. Patch by James Rowe.

Revision  Changes    Path
1.234                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- ChangeLog	2 May 2012 21:05:38 -0000	1.233
+++ ChangeLog	2 May 2012 21:40:42 -0000	1.234
@@ -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.233 2012/05/02 21:05:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.234 2012/05/02 21:40:42 floppym Exp $
+
+  02 May 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
+  Fix bytecode generation with Python 3, bug 413771. Patch by James Rowe.
 
   02 May 2012; Gilles Dartiguelongue <eva@gentoo.org> gnome2-utils.eclass,
   gnome2.eclass:



1.14                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- python-distutils-ng.eclass	30 Apr 2012 09:51:00 -0000	1.13
+++ python-distutils-ng.eclass	2 May 2012 21:40:42 -0000	1.14
@@ -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/python-distutils-ng.eclass,v 1.13 2012/04/30 09:51:00 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.14 2012/05/02 21:40:42 floppym Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -397,7 +397,7 @@
 		use "python_targets_${impl}" ${PYTHON_COMPAT} || continue
 
 		PYTHON="$(_python-distutils-ng_get_binary_for_implementation "${impl}")"
-		for accessible_path in $(${PYTHON} -c 'import sys; print " ".join(sys.path)'); do
+		for accessible_path in $(${PYTHON} -c 'import sys; print(" ".join(sys.path))'); do
 			[[ -d "${D}/${accessible_path}" ]] || continue
 
 			_python-distutils-ng_has_compileall "${impl}" || continue






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-05-03  0:31 Mike Gilbert (floppym)
  0 siblings, 0 replies; 26+ messages in thread
From: Mike Gilbert (floppym) @ 2012-05-03  0:31 UTC (permalink / raw
  To: gentoo-commits

floppym     12/05/03 00:31:58

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Declare local S in _python-distutils-ng_run_for_impl.

Revision  Changes    Path
1.235                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- ChangeLog	2 May 2012 21:40:42 -0000	1.234
+++ ChangeLog	3 May 2012 00:31:58 -0000	1.235
@@ -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.234 2012/05/02 21:40:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.235 2012/05/03 00:31:58 floppym Exp $
+
+  03 May 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
+  Declare local S in _python-distutils-ng_run_for_impl.
 
   02 May 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
   Fix bytecode generation with Python 3, bug 413771. Patch by James Rowe.



1.15                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- python-distutils-ng.eclass	2 May 2012 21:40:42 -0000	1.14
+++ python-distutils-ng.eclass	3 May 2012 00:31:58 -0000	1.15
@@ -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/python-distutils-ng.eclass,v 1.14 2012/05/02 21:40:42 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.15 2012/05/03 00:31:58 floppym Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -134,7 +134,7 @@
 	local impl="${1}"
 	local command="${2}"
 
-	S="${WORKDIR}/impl_${impl}/${_PACKAGE_SPECIFIC_S}"
+	local S="${WORKDIR}/impl_${impl}/${_PACKAGE_SPECIFIC_S}"
 	PYTHON="$(_python-distutils-ng_get_binary_for_implementation "${impl}")"
 	EPYTHON="${impl/_/.}"
 
@@ -384,7 +384,6 @@
 			_python-distutils-ng_default_distutils_install
 	fi
 
-	S="${WORKDIR}/${_PACKAGE_SPECIFIC_S}"
 	if type python_install_all &> /dev/null; then
 		einfo "Running python_install_all in ${S} for all"
 		pushd "${S}" &> /dev/null






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-05-04  8:31 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 26+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-05-04  8:31 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/05/04 08:31:43

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Let distutils compile python modules, see bug #413957.

Revision  Changes    Path
1.236                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- ChangeLog	3 May 2012 00:31:58 -0000	1.235
+++ ChangeLog	4 May 2012 08:31:43 -0000	1.236
@@ -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.235 2012/05/03 00:31:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.236 2012/05/04 08:31:43 nelchael Exp $
+
+  04 May 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  python-distutils-ng.eclass:
+  Let distutils compile python modules, see bug #413957.
 
   03 May 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
   Declare local S in _python-distutils-ng_run_for_impl.



1.16                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- python-distutils-ng.eclass	3 May 2012 00:31:58 -0000	1.15
+++ python-distutils-ng.eclass	4 May 2012 08:31:43 -0000	1.16
@@ -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/python-distutils-ng.eclass,v 1.15 2012/05/03 00:31:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.16 2012/05/04 08:31:43 nelchael Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -171,37 +171,17 @@
 # @DESCRIPTION:
 # Default src_install for distutils-based packages.
 _python-distutils-ng_default_distutils_install() {
-	"${PYTHON}" setup.py install --no-compile --root="${D}/" || die
-}
+	local compile_flags="--compile -O2"
 
-# @FUNCTION: _python-distutils-ng_has_compileall
-# @USAGE: implementation
-# @RETURN: 0 if given implementation has compileall module
-# @DESCRIPTION:
-# This function is used to decide whenever to compile Python modules for given
-# implementation.
-_python-distutils-ng_has_compileall() {
 	case "${1}" in
-		python?_?|jython?_?)
-			return 0 ;;
-		*)
-			return 1 ;;
+		jython*)
+			# Jython does not support optimizations
+			compile_flags="--compile" ;;
 	esac
-}
 
-# @FUNCTION: _python-distutils-ng_has_compileall_opt
-# @USAGE: implementation
-# @RETURN: 0 if given implementation has compileall module and supports # optimizations
-# @DESCRIPTION:
-# This function is used to decide whenever to compile and optimize Python
-# modules for given implementation.
-_python-distutils-ng_has_compileall_opt() {
-	case "${1}" in
-		python?_?)
-			return 0 ;;
-		*)
-			return 1 ;;
-	esac
+	unset PYTHONDONTWRITEBYTECODE
+	[[ -n "${PYTHON_DISABLE_COMPILATION}" ]] && compile_flags="--no-compile"
+	"${PYTHON}" setup.py install ${compile_flags} --root="${D%/}/" || die
 }
 
 # @FUNCTION: python-distutils-ng_redoscript
@@ -390,26 +370,4 @@
 		python_install_all
 		popd &> /dev/null
 	fi
-
-	for impl in ${PYTHON_COMPAT}; do
-		[[ "${PYTHON_DISABLE_COMPILATION}" = "yes" ]] && continue
-		use "python_targets_${impl}" ${PYTHON_COMPAT} || continue
-
-		PYTHON="$(_python-distutils-ng_get_binary_for_implementation "${impl}")"
-		for accessible_path in $(${PYTHON} -c 'import sys; print(" ".join(sys.path))'); do
-			[[ -d "${D}/${accessible_path}" ]] || continue
-
-			_python-distutils-ng_has_compileall "${impl}" || continue
-			ebegin "Compiling ${accessible_path} for ${impl}"
-			${PYTHON} \
-				-m compileall -q -f "${D}/${accessible_path}" || die
-			eend $?
-
-			_python-distutils-ng_has_compileall_opt "${impl}" || continue
-			ebegin "Optimizing ${accessible_path} for ${impl}"
-			PYTHONOPTIMIZE=1 ${PYTHON} \
-				-m compileall -q -f "${D}/${accessible_path}" || die
-			eend $?
-		done;
-	done
 }






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-05-05 18:00 Mike Gilbert (floppym)
  0 siblings, 0 replies; 26+ messages in thread
From: Mike Gilbert (floppym) @ 2012-05-05 18:00 UTC (permalink / raw
  To: gentoo-commits

floppym     12/05/05 18:00:21

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Simplify ${D%/}/ to ${D}; PMS says ${D} always has a trailing slash, and it works without a trailing slash anyway.

Revision  Changes    Path
1.238                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- ChangeLog	4 May 2012 15:39:29 -0000	1.237
+++ ChangeLog	5 May 2012 18:00:21 -0000	1.238
@@ -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.237 2012/05/04 15:39:29 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.238 2012/05/05 18:00:21 floppym Exp $
+
+  05 May 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
+  Simplify ${D%/}/ to ${D}; PMS says ${D} always has a trailing slash, and it
+  works without a trailing slash anyway.
 
   04 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   xorg-2.eclass:



1.17                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- python-distutils-ng.eclass	4 May 2012 08:31:43 -0000	1.16
+++ python-distutils-ng.eclass	5 May 2012 18:00:21 -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/python-distutils-ng.eclass,v 1.16 2012/05/04 08:31:43 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.17 2012/05/05 18:00:21 floppym Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -181,7 +181,7 @@
 
 	unset PYTHONDONTWRITEBYTECODE
 	[[ -n "${PYTHON_DISABLE_COMPILATION}" ]] && compile_flags="--no-compile"
-	"${PYTHON}" setup.py install ${compile_flags} --root="${D%/}/" || die
+	"${PYTHON}" setup.py install ${compile_flags} --root="${D}" || die
 }
 
 # @FUNCTION: python-distutils-ng_redoscript






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-05-05 18:03 Mike Gilbert (floppym)
  0 siblings, 0 replies; 26+ messages in thread
From: Mike Gilbert (floppym) @ 2012-05-05 18:03 UTC (permalink / raw
  To: gentoo-commits

floppym     12/05/05 18:03:33

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Eliminate another duplicate slash.

Revision  Changes    Path
1.239                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- ChangeLog	5 May 2012 18:00:21 -0000	1.238
+++ ChangeLog	5 May 2012 18:03:33 -0000	1.239
@@ -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.238 2012/05/05 18:00:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.239 2012/05/05 18:03:33 floppym Exp $
+
+  05 May 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
+  Eliminate another duplicate slash.
 
   05 May 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
   Simplify ${D%/}/ to ${D}; PMS says ${D} always has a trailing slash, and it



1.18                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- python-distutils-ng.eclass	5 May 2012 18:00:21 -0000	1.17
+++ python-distutils-ng.eclass	5 May 2012 18:03:33 -0000	1.18
@@ -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/python-distutils-ng.eclass,v 1.17 2012/05/05 18:00:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.18 2012/05/05 18:03:33 floppym Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -193,7 +193,7 @@
 python-distutils-ng_redoscript() {
 	local sbn="$(basename "${1}")"
 	mkdir -p "${T}/_${sbn}/" || die "failed to create directory"
-	mv "${D}/${1}" "${T}/_${sbn}/${sbn}" || die "failed to move file"
+	mv "${D}${1}" "${T}/_${sbn}/${sbn}" || die "failed to move file"
 	python-distutils-ng_doscript "${T}/_${sbn}/${sbn}" "${2}"
 }
 






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-05-06  3:20 Mike Gilbert (floppym)
  0 siblings, 0 replies; 26+ messages in thread
From: Mike Gilbert (floppym) @ 2012-05-06  3:20 UTC (permalink / raw
  To: gentoo-commits

floppym     12/05/06 03:20:45

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Silence eclass-to-manpage warnings.

Revision  Changes    Path
1.240                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- ChangeLog	5 May 2012 18:03:33 -0000	1.239
+++ ChangeLog	6 May 2012 03:20:45 -0000	1.240
@@ -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.239 2012/05/05 18:03:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.240 2012/05/06 03:20:45 floppym Exp $
+
+  06 May 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
+  Silence eclass-to-manpage warnings.
 
   05 May 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
   Eliminate another duplicate slash.



1.19                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- python-distutils-ng.eclass	5 May 2012 18:03:33 -0000	1.18
+++ python-distutils-ng.eclass	6 May 2012 03:20:45 -0000	1.19
@@ -1,14 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.18 2012/05/05 18:03:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.19 2012/05/06 03:20:45 floppym Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
 # Python herd <python@gentoo.org>
 # @AUTHOR:
 # Author: Krzysztof Pawlik <nelchael@gentoo.org>
-# @BLURB: An eclass for installing Python packages using distutils with proper
-# support for multiple Python slots.
+# @BLURB: Install Python packages using distutils.
 # @DESCRIPTION:
 # The Python eclass is designed to allow an easier installation of Python
 # packages and their incorporation into the Gentoo Linux system.
@@ -28,6 +27,7 @@
 #    directory (so it will not contain any implementation-specific files)
 
 # @ECLASS-VARIABLE: PYTHON_COMPAT
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # This variable contains a space separated list of implementations (see above) a
 # package is compatible to. It must be set before the `inherit' call. The
@@ -42,11 +42,13 @@
 fi
 
 # @ECLASS-VARIABLE: PYTHON_OPTIONAL
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set the value to "yes" to make the dependency on a Python interpreter
 # optional.
 
 # @ECLASS-VARIABLE: PYTHON_DISABLE_COMPILATION
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set the value to "yes" to skip compilation and/or optimization of Python
 # modules.






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-05-14 19:23 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 26+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-05-14 19:23 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/05/14 19:23:09

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Block older versions of sys-apps/portage that don't have improved COLLISION_IGNORE handling, see bug #410691.

Revision  Changes    Path
1.252                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- ChangeLog	11 May 2012 10:46:32 -0000	1.251
+++ ChangeLog	14 May 2012 19:23:09 -0000	1.252
@@ -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.251 2012/05/11 10:46:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.252 2012/05/14 19:23:09 nelchael Exp $
+
+  14 May 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  python-distutils-ng.eclass:
+  Block older versions of sys-apps/portage that don't have improved
+  COLLISION_IGNORE handling, see bug #410691.
 
   11 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> nsplugins.eclass:
   Actually check if the plugin file exist before creating symlink. Avoids



1.20                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- python-distutils-ng.eclass	6 May 2012 03:20:45 -0000	1.19
+++ python-distutils-ng.eclass	14 May 2012 19:23:09 -0000	1.20
@@ -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/python-distutils-ng.eclass,v 1.19 2012/05/06 03:20:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.20 2012/05/14 19:23:09 nelchael Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -66,6 +66,8 @@
 		die "Unsupported EAPI=${EAPI} (unknown) for python-distutils-ng.eclass" ;;
 esac
 
+DEPEND="${DEPEND} !<sys-apps/portage-2.1.10.58"
+
 # @FUNCTION: _python-distutils-ng_get_binary_for_implementation
 # @USAGE: implementation
 # @RETURN: Full path to Python binary for given implementation.






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-05-21 17:30 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 26+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-05-21 17:30 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/05/21 17:30:36

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Fix #! line for installed scripts and install them for enabled implementations, see bug #416131.

Revision  Changes    Path
1.258                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- ChangeLog	20 May 2012 20:34:55 -0000	1.257
+++ ChangeLog	21 May 2012 17:30:35 -0000	1.258
@@ -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.257 2012/05/20 20:34:55 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.258 2012/05/21 17:30:35 nelchael Exp $
+
+  21 May 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  python-distutils-ng.eclass:
+  Fix #! line for installed scripts and install them for enabled
+  implementations, see bug #416131.
 
   20 May 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
   strip-linguas check added



1.21                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- python-distutils-ng.eclass	14 May 2012 19:23:09 -0000	1.20
+++ python-distutils-ng.eclass	21 May 2012 17:30:35 -0000	1.21
@@ -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/python-distutils-ng.eclass,v 1.20 2012/05/14 19:23:09 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.21 2012/05/21 17:30:35 nelchael Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -374,4 +374,10 @@
 		python_install_all
 		popd &> /dev/null
 	fi
+
+	if [[ -z "${PYTHON_DISABLE_SCRIPT_REDOS}" ]]; then
+		for script_file in $(find "${D}"{,usr/}{,s}bin/ -type f -executable 2> /dev/null); do
+			python-distutils-ng_redoscript "/${script_file#${D}}"
+		done
+	fi
 }






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-05-21 17:33 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 26+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-05-21 17:33 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/05/21 17:33:09

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Document PYTHON_DISABLE_SCRIPT_REDOS.

Revision  Changes    Path
1.259                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- ChangeLog	21 May 2012 17:30:35 -0000	1.258
+++ ChangeLog	21 May 2012 17:33:09 -0000	1.259
@@ -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.258 2012/05/21 17:30:35 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.259 2012/05/21 17:33:09 nelchael Exp $
+
+  21 May 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  python-distutils-ng.eclass:
+  Document PYTHON_DISABLE_SCRIPT_REDOS.
 
   21 May 2012; Krzysztof Pawlik <nelchael@gentoo.org>
   python-distutils-ng.eclass:



1.22                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-distutils-ng.eclass	21 May 2012 17:30:35 -0000	1.21
+++ python-distutils-ng.eclass	21 May 2012 17:33:09 -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/python-distutils-ng.eclass,v 1.21 2012/05/21 17:30:35 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.22 2012/05/21 17:33:09 nelchael Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -53,6 +53,12 @@
 # Set the value to "yes" to skip compilation and/or optimization of Python
 # modules.
 
+# @ECLASS-VARIABLE: PYTHON_DISABLE_SCRIPT_REDOS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Set to any value to disable automatic reinstallation of scripts in bin
+# directories. See python-distutils-ng_src_install function.
+
 EXPORT_FUNCTIONS pkg_pretend src_prepare src_configure src_compile src_test src_install
 
 case "${EAPI}" in






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-05-21 18:10 Krzysztof Pawlik (nelchael)
  0 siblings, 0 replies; 26+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-05-21 18:10 UTC (permalink / raw
  To: gentoo-commits

nelchael    12/05/21 18:10:34

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Add information about automatic run of python-distutils-ng_redoscript.

Revision  Changes    Path
1.261                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- ChangeLog	21 May 2012 17:34:53 -0000	1.260
+++ ChangeLog	21 May 2012 18:10:33 -0000	1.261
@@ -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.260 2012/05/21 17:34:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.261 2012/05/21 18:10:33 nelchael Exp $
+
+  21 May 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  python-distutils-ng.eclass:
+  Add information about automatic run of python-distutils-ng_redoscript.
 
   21 May 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
   Fix to match autotools.eclass API changes.



1.23                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- python-distutils-ng.eclass	21 May 2012 17:33:09 -0000	1.22
+++ python-distutils-ng.eclass	21 May 2012 18:10:33 -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/python-distutils-ng.eclass,v 1.22 2012/05/21 17:33:09 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.23 2012/05/21 18:10:33 nelchael Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -200,6 +200,8 @@
 # Reinstall script installed already by setup.py. This works by first moving the
 # script to ${T} directory and later running python-distutils-ng_doscript on it.
 # script_file_path has to be a full path relative to ${D}.
+# Warning: this function can be run automatically by the eclass in src_install,
+# see python-distutils-ng_src_install and PYTHON_DISABLE_SCRIPT_REDOS variable.
 python-distutils-ng_redoscript() {
 	local sbn="$(basename "${1}")"
 	mkdir -p "${T}/_${sbn}/" || die "failed to create directory"






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-05-24 18:18 Mike Gilbert (floppym)
  0 siblings, 0 replies; 26+ messages in thread
From: Mike Gilbert (floppym) @ 2012-05-24 18:18 UTC (permalink / raw
  To: gentoo-commits

floppym     12/05/24 18:18:11

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Remove obsolete pkg_pretend function.

Revision  Changes    Path
1.266                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- ChangeLog	23 May 2012 18:16:30 -0000	1.265
+++ ChangeLog	24 May 2012 18:18:11 -0000	1.266
@@ -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.265 2012/05/23 18:16:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.266 2012/05/24 18:18:11 floppym Exp $
+
+  24 May 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
+  Remove obsolete pkg_pretend function.
 
   23 May 2012; Mike Gilbert <floppym@gentoo.org> chromium.eclass:
   Don't elog about icons if the user has installed them. Bug 416773 by pacho.



1.24                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-distutils-ng.eclass	21 May 2012 18:10:33 -0000	1.23
+++ python-distutils-ng.eclass	24 May 2012 18:18:11 -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/python-distutils-ng.eclass,v 1.23 2012/05/21 18:10:33 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.24 2012/05/24 18:18:11 floppym Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -59,7 +59,7 @@
 # Set to any value to disable automatic reinstallation of scripts in bin
 # directories. See python-distutils-ng_src_install function.
 
-EXPORT_FUNCTIONS pkg_pretend src_prepare src_configure src_compile src_test src_install
+EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
 case "${EAPI}" in
 	0|1|2|3)
@@ -293,16 +293,6 @@
 	fi
 }
 
-# Phase function: pkg_pretend
-python-distutils-ng_pkg_pretend() {
-	if has "collision-protect" ${FEATURES}; then
-		ewarn "Due to previous eclass compiling Python files outside of src_install"
-		ewarn "(and not recording resulting .pyc and .pyo files as owned by any package)"
-		ewarn "merging this package with \"collision-protect\" in FEATURES may result"
-		ewarn "in an error, please switch to using \"protect-owned\" instead."
-	fi
-}
-
 # Phase function: src_prepare
 python-distutils-ng_src_prepare() {
 	[[ "${PYTHON_OPTIONAL}" = "yes" ]] && { use python || return; }






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-06-10 14:23 Mike Gilbert (floppym)
  0 siblings, 0 replies; 26+ messages in thread
From: Mike Gilbert (floppym) @ 2012-06-10 14:23 UTC (permalink / raw
  To: gentoo-commits

floppym     12/06/10 14:23:43

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Remove pypy1_7 from default PYTHON_COMPAT due to removal from tree. Add pypy1_9.

Revision  Changes    Path
1.305                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- ChangeLog	10 Jun 2012 14:21:20 -0000	1.304
+++ ChangeLog	10 Jun 2012 14:23:43 -0000	1.305
@@ -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.304 2012/06/10 14:21:20 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.305 2012/06/10 14:23:43 floppym Exp $
+
+  10 Jun 2012; Mike Gilbert <floppym@gentoo.org> python-distutils-ng.eclass:
+  Remove pypy1_7 from default PYTHON_COMPAT due to removal from tree. Add
+  pypy1_9.
 
   10 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
   fixed missing chost tag; fixed append-cppflags warning; added Variable to



1.26                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- python-distutils-ng.eclass	26 May 2012 09:46:23 -0000	1.25
+++ python-distutils-ng.eclass	10 Jun 2012 14:23:43 -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/python-distutils-ng.eclass,v 1.25 2012/05/26 09:46:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.26 2012/06/10 14:23:43 floppym Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -38,7 +38,7 @@
 	PYTHON_COMPAT="  python2_5 python2_6 python2_7"
 	PYTHON_COMPAT+=" python3_1 python3_2"
 	PYTHON_COMPAT+=" jython2_5"
-	PYTHON_COMPAT+=" pypy1_7 pypy1_8"
+	PYTHON_COMPAT+=" pypy1_8 pypy1_9"
 fi
 
 # @ECLASS-VARIABLE: PYTHON_OPTIONAL
@@ -270,7 +270,7 @@
 	done
 
 	if [[ -z "${default_impl}" ]]; then
-		for impl in python{2_7,2_6,2_5,3_2,3_1} pypy{1_8,1_7} jython2_5; do
+		for impl in python{2_7,2_6,2_5,3_2,3_1} pypy{1_9,1_8,1_7} jython2_5; do
 			use "python_targets_${impl}" || continue
 			default_impl="${impl}"
 			break






^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-09-26 12:07 Julian Ospald (hasufell)
  0 siblings, 0 replies; 26+ messages in thread
From: Julian Ospald (hasufell) @ 2012-09-26 12:07 UTC (permalink / raw
  To: gentoo-commits

hasufell    12/09/26 12:07:45

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  add PYTHON_USE wrt #426768

Revision  Changes    Path
1.411                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- ChangeLog	20 Sep 2012 18:04:59 -0000	1.410
+++ ChangeLog	26 Sep 2012 12:07:45 -0000	1.411
@@ -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.410 2012/09/20 18:04:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.411 2012/09/26 12:07:45 hasufell Exp $
+
+  26 Sep 2012; Julian Ospald <hasufell@gentoo.org> python-distutils-ng.eclass:
+  add PYTHON_USE wrt #426768
 
   20 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> autotools.eclass:
   Be more strict about eautoreconfig on aclocal.m4. Fixes bug#424763 and



1.27                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- python-distutils-ng.eclass	10 Jun 2012 14:23:43 -0000	1.26
+++ python-distutils-ng.eclass	26 Sep 2012 12:07:45 -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/python-distutils-ng.eclass,v 1.26 2012/06/10 14:23:43 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.27 2012/09/26 12:07:45 hasufell Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -59,6 +59,18 @@
 # Set to any value to disable automatic reinstallation of scripts in bin
 # directories. See python-distutils-ng_src_install function.
 
+# @ECLASS-VARIABLE: PYTHON_USE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Comma-separated list of useflags needed for all(!) allowed
+# implementations. This is directly substituted into one or more of
+# dev-lang/python[${PYTHON_USE}], dev-python/pypy[${PYTHON_USE}] and
+# dev-java/jython[${PYTHON_USE}].
+# @CODE
+# example 1: PYTHON_USE="xml,sqlite"
+# example 2: PYTHON_USE="xml?,threads?,-foo"
+# @CODE
+
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
 
 case "${EAPI}" in
@@ -107,16 +119,20 @@
 fi
 unset required_use_str
 
+# avoid empty use deps
+_PYTHON_USE="${PYTHON_USE:+[${PYTHON_USE}]}"
+
+# set python DEPEND and RDEPEND
 for impl in ${PYTHON_COMPAT}; do
 	IUSE+=" python_targets_${impl}"
 	dep_str="${impl/_/.}"
 	case "${dep_str}" in
 		python?.?)
-			dep_str="dev-lang/python:${dep_str: -3}" ;;
+			dep_str="dev-lang/python:${dep_str: -3}${_PYTHON_USE}" ;;
 		jython?.?)
-			dep_str="dev-java/jython:${dep_str: -3}" ;;
+			dep_str="dev-java/jython:${dep_str: -3}${_PYTHON_USE}" ;;
 		pypy?.?)
-			dep_str="dev-python/pypy:${dep_str: -3}" ;;
+			dep_str="dev-python/pypy:${dep_str: -3}${_PYTHON_USE}" ;;
 		*)
 			die "Unsupported implementation: ${impl}" ;;
 	esac





^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2012-10-30 17:22 Michal Gorny (mgorny)
  0 siblings, 0 replies; 26+ messages in thread
From: Michal Gorny (mgorny) @ 2012-10-30 17:22 UTC (permalink / raw
  To: gentoo-commits

mgorny      12/10/30 17:22:33

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Fix Prefix support, wrt bug #423323.

Revision  Changes    Path
1.485                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -r1.484 -r1.485
--- ChangeLog	29 Oct 2012 13:34:02 -0000	1.484
+++ ChangeLog	30 Oct 2012 17:22:33 -0000	1.485
@@ -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.484 2012/10/29 13:34:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.485 2012/10/30 17:22:33 mgorny Exp $
+
+  30 Oct 2012; Michał Górny <mgorny@gentoo.org> python-distutils-ng.eclass:
+  Fix Prefix support, wrt bug #423323.
 
   29 Oct 2012; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass:
   Support and use out-of-source builds by default.



1.29                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- python-distutils-ng.eclass	27 Sep 2012 16:35:41 -0000	1.28
+++ python-distutils-ng.eclass	30 Oct 2012 17:22:33 -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/python-distutils-ng.eclass,v 1.28 2012/09/27 16:35:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.29 2012/10/30 17:22:33 mgorny Exp $
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:
@@ -98,9 +98,9 @@
 	local impl="${1/_/.}"
 	case "${impl}" in
 		python?.?|jython?.?)
-			echo "/usr/bin/${impl}" ;;
+			echo "${EPREFIX}/usr/bin/${impl}" ;;
 		pypy?.?)
-			echo "/usr/bin/pypy-c${impl: -3}" ;;
+			echo "${EPREFIX}/usr/bin/pypy-c${impl: -3}" ;;
 		*)
 			die "Unsupported implementation: ${1}" ;;
 	esac
@@ -400,7 +400,7 @@
 	fi
 
 	if [[ -z "${PYTHON_DISABLE_SCRIPT_REDOS}" ]]; then
-		for script_file in $(find "${D}"{,usr/}{,s}bin/ -type f -executable 2> /dev/null); do
+		for script_file in $(find "${ED}"{,usr/}{,s}bin/ -type f -executable 2> /dev/null); do
 			python-distutils-ng_redoscript "/${script_file#${D}}"
 		done
 	fi





^ permalink raw reply	[flat|nested] 26+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass
@ 2013-09-29 15:04 Michal Gorny (mgorny)
  0 siblings, 0 replies; 26+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-29 15:04 UTC (permalink / raw
  To: gentoo-commits

mgorny      13/09/29 15:04:51

  Modified:             ChangeLog python-distutils-ng.eclass
  Log:
  Last rite python-distutils-ng.

Revision  Changes    Path
1.998                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.997
retrieving revision 1.998
diff -u -r1.997 -r1.998
--- ChangeLog	29 Sep 2013 08:49:53 -0000	1.997
+++ ChangeLog	29 Sep 2013 15:04:51 -0000	1.998
@@ -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.997 2013/09/29 08:49:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.998 2013/09/29 15:04:51 mgorny Exp $
+
+  29 Sep 2013; Michał Górny <mgorny@gentoo.org> python-distutils-ng.eclass:
+  Last rite python-distutils-ng.
 
   29 Sep 2013; Pacho Ramos <pacho@gentoo.org> gnome2.eclass:
   Use einstalldocs (#484876)



1.31                 eclass/python-distutils-ng.eclass

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

Index: python-distutils-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- python-distutils-ng.eclass	27 Jul 2013 11:17:44 -0000	1.30
+++ python-distutils-ng.eclass	29 Sep 2013 15:04:51 -0000	1.31
@@ -1,6 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.30 2013/07/27 11:17:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.31 2013/09/29 15:04:51 mgorny Exp $
+
+# @DEAD
+# Michał Górny <mgorny@gentoo.org> (29 Sep 2013)
+# This eclass has been superseded by distutils-r1 and python-r1 eclasses
+# and will be removed on 2013-10-29. Please modify your ebuilds to use
+# the new eclasses instead. Bug #450770.
 
 # @ECLASS: python-distutils-ng
 # @MAINTAINER:





^ permalink raw reply	[flat|nested] 26+ messages in thread

end of thread, other threads:[~2013-09-29 15:04 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-30 17:22 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-distutils-ng.eclass Michal Gorny (mgorny)
  -- strict thread matches above, loose matches on Subject: below --
2013-09-29 15:04 Michal Gorny (mgorny)
2012-09-26 12:07 Julian Ospald (hasufell)
2012-06-10 14:23 Mike Gilbert (floppym)
2012-05-24 18:18 Mike Gilbert (floppym)
2012-05-21 18:10 Krzysztof Pawlik (nelchael)
2012-05-21 17:33 Krzysztof Pawlik (nelchael)
2012-05-21 17:30 Krzysztof Pawlik (nelchael)
2012-05-14 19:23 Krzysztof Pawlik (nelchael)
2012-05-06  3:20 Mike Gilbert (floppym)
2012-05-05 18:03 Mike Gilbert (floppym)
2012-05-05 18:00 Mike Gilbert (floppym)
2012-05-04  8:31 Krzysztof Pawlik (nelchael)
2012-05-03  0:31 Mike Gilbert (floppym)
2012-05-02 21:40 Mike Gilbert (floppym)
2012-04-30  8:25 Krzysztof Pawlik (nelchael)
2012-04-03 19:21 Krzysztof Pawlik (nelchael)
2012-04-03 19:12 Krzysztof Pawlik (nelchael)
2012-03-30 16:41 Krzysztof Pawlik (nelchael)
2012-03-28 14:21 Marien Zwart (marienz)
2012-03-26 20:33 Krzysztof Pawlik (nelchael)
2012-03-26 19:12 Krzysztof Pawlik (nelchael)
2012-03-26 18:27 Krzysztof Pawlik (nelchael)
2012-03-26 16:24 Krzysztof Pawlik (nelchael)
2012-03-26  6:12 Justin Lecher (jlec)
2012-03-25 18:48 Krzysztof Pawlik (nelchael)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox