[gentoo-commits] gentoo-x86 commit in dev-python/argparse: argparse-1.2.1-r1.ebuild ChangeLog

["Michal Gorny (mgorny)" <mgorny@gentoo.org>]

mgorny      12/11/02 21:31:36

  Modified:             argparse-1.2.1-r1.ebuild ChangeLog
  Log:
  Re-enable all Python implementations but warn if the package is not useful, requesting people to depclean it.
  
  (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)

Revision  Changes    Path
1.2                  dev-python/argparse/argparse-1.2.1-r1.ebuild

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

Index: argparse-1.2.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/argparse/argparse-1.2.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- argparse-1.2.1-r1.ebuild	29 Oct 2012 13:50:04 -0000	1.1
+++ argparse-1.2.1-r1.ebuild	2 Nov 2012 21:31:36 -0000	1.2
@@ -1,10 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argparse/argparse-1.2.1-r1.ebuild,v 1.1 2012/10/29 13:50:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argparse/argparse-1.2.1-r1.ebuild,v 1.2 2012/11/02 21:31:36 mgorny Exp $
 
 EAPI=4
-# Newer versions provide built-in argparse.
-PYTHON_COMPAT=( python2_5 python2_6 python3_1 jython2_5 )
+PYTHON_COMPAT_REAL=(
+	# actual targets
+	python{2_5,2_6,3_1} jython2_5
+)
+PYTHON_COMPAT=(
+	${PYTHON_COMPAT_REAL[@]}
+	# these versions provide built-in argparse
+	# but we still list them to warn user to migrate
+	python{2_7,3_2,3_3} pypy{1_8,1_9}
+)
 
 inherit distutils-r1
 
@@ -19,6 +27,30 @@
 
 DEPEND="dev-python/setuptools"
 
+pkg_pretend() {
+	local x
+	for x in ${PYTHON_COMPAT_REAL[@]}; do
+		if use python_targets_${x}; then
+			return
+		fi
+	done
+
+	ewarn 'You have installed this version of argparse only for Python'
+	ewarn 'implementations which provide the argparse module already.'
+	ewarn 'Most likely, this means that something in your system depends on'
+	ewarn 'dev-python/argparse instead of virtual/python-argparse.'
+	ewarn
+	ewarn 'Please try running the following command or an equivalent one:'
+	ewarn
+	ewarn '	emerge --verbose --depclean dev-python/argparse'
+	ewarn
+	ewarn 'If your package manager refuses to uninstall the package due to'
+	ewarn 'unsatisfied dependencies, please first try re-installing the listed'
+	ewarn 'packages and running --depclean again. If that does not help, please'
+	ewarn 'report a bug against the package, requesting its maintainer to fix'
+	ewarn 'the dependency on argparse to use virtual/argparse.'
+}
+
 python_test() {
 	COLUMNS=80 PYTHONPATH="${BUILD_DIR}/lib" \
 		"${PYTHON}" test/test_argparse.py



1.34                 dev-python/argparse/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/argparse/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog	29 Oct 2012 13:50:04 -0000	1.33
+++ ChangeLog	2 Nov 2012 21:31:36 -0000	1.34
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/argparse
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argparse/ChangeLog,v 1.33 2012/10/29 13:50:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argparse/ChangeLog,v 1.34 2012/11/02 21:31:36 mgorny Exp $
+
+  02 Nov 2012; Michał Górny <mgorny@gentoo.org> argparse-1.2.1-r1.ebuild:
+  Re-enable all Python implementations but warn if the package is not useful,
+  requesting people to depclean it.
 
 *argparse-1.2.1-r1 (29 Oct 2012)