| 1 |
mgorny 12/11/02 21:31:36 |
| 2 |
|
| 3 |
Modified: argparse-1.2.1-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Re-enable all Python implementations but warn if the package is not useful, requesting people to depclean it. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 42B9401D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-python/argparse/argparse-1.2.1-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/argparse/argparse-1.2.1-r1.ebuild?rev=1.2&view=markup |
| 13 |
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 |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/argparse/argparse-1.2.1-r1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: argparse-1.2.1-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/argparse/argparse-1.2.1-r1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- argparse-1.2.1-r1.ebuild 29 Oct 2012 13:50:04 -0000 1.1 |
| 23 |
+++ argparse-1.2.1-r1.ebuild 2 Nov 2012 21:31:36 -0000 1.2 |
| 24 |
@@ -1,10 +1,18 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
-# Newer versions provide built-in argparse. |
| 32 |
-PYTHON_COMPAT=( python2_5 python2_6 python3_1 jython2_5 ) |
| 33 |
+PYTHON_COMPAT_REAL=( |
| 34 |
+ # actual targets |
| 35 |
+ python{2_5,2_6,3_1} jython2_5 |
| 36 |
+) |
| 37 |
+PYTHON_COMPAT=( |
| 38 |
+ ${PYTHON_COMPAT_REAL[@]} |
| 39 |
+ # these versions provide built-in argparse |
| 40 |
+ # but we still list them to warn user to migrate |
| 41 |
+ python{2_7,3_2,3_3} pypy{1_8,1_9} |
| 42 |
+) |
| 43 |
|
| 44 |
inherit distutils-r1 |
| 45 |
|
| 46 |
@@ -19,6 +27,30 @@ |
| 47 |
|
| 48 |
DEPEND="dev-python/setuptools" |
| 49 |
|
| 50 |
+pkg_pretend() { |
| 51 |
+ local x |
| 52 |
+ for x in ${PYTHON_COMPAT_REAL[@]}; do |
| 53 |
+ if use python_targets_${x}; then |
| 54 |
+ return |
| 55 |
+ fi |
| 56 |
+ done |
| 57 |
+ |
| 58 |
+ ewarn 'You have installed this version of argparse only for Python' |
| 59 |
+ ewarn 'implementations which provide the argparse module already.' |
| 60 |
+ ewarn 'Most likely, this means that something in your system depends on' |
| 61 |
+ ewarn 'dev-python/argparse instead of virtual/python-argparse.' |
| 62 |
+ ewarn |
| 63 |
+ ewarn 'Please try running the following command or an equivalent one:' |
| 64 |
+ ewarn |
| 65 |
+ ewarn ' emerge --verbose --depclean dev-python/argparse' |
| 66 |
+ ewarn |
| 67 |
+ ewarn 'If your package manager refuses to uninstall the package due to' |
| 68 |
+ ewarn 'unsatisfied dependencies, please first try re-installing the listed' |
| 69 |
+ ewarn 'packages and running --depclean again. If that does not help, please' |
| 70 |
+ ewarn 'report a bug against the package, requesting its maintainer to fix' |
| 71 |
+ ewarn 'the dependency on argparse to use virtual/argparse.' |
| 72 |
+} |
| 73 |
+ |
| 74 |
python_test() { |
| 75 |
COLUMNS=80 PYTHONPATH="${BUILD_DIR}/lib" \ |
| 76 |
"${PYTHON}" test/test_argparse.py |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.34 dev-python/argparse/ChangeLog |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/argparse/ChangeLog?rev=1.34&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/argparse/ChangeLog?rev=1.34&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/argparse/ChangeLog?r1=1.33&r2=1.34 |
| 85 |
|
| 86 |
Index: ChangeLog |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/argparse/ChangeLog,v |
| 89 |
retrieving revision 1.33 |
| 90 |
retrieving revision 1.34 |
| 91 |
diff -u -r1.33 -r1.34 |
| 92 |
--- ChangeLog 29 Oct 2012 13:50:04 -0000 1.33 |
| 93 |
+++ ChangeLog 2 Nov 2012 21:31:36 -0000 1.34 |
| 94 |
@@ -1,6 +1,10 @@ |
| 95 |
# ChangeLog for dev-python/argparse |
| 96 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 97 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argparse/ChangeLog,v 1.33 2012/10/29 13:50:04 mgorny Exp $ |
| 98 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argparse/ChangeLog,v 1.34 2012/11/02 21:31:36 mgorny Exp $ |
| 99 |
+ |
| 100 |
+ 02 Nov 2012; Michał Górny <mgorny@g.o> argparse-1.2.1-r1.ebuild: |
| 101 |
+ Re-enable all Python implementations but warn if the package is not useful, |
| 102 |
+ requesting people to depclean it. |
| 103 |
|
| 104 |
*argparse-1.2.1-r1 (29 Oct 2012) |
Archives