From 2eaeac15b2585509adea2065243cb95725d6f721 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 17 Sep 2013 22:00:30 -0400 Subject: [PATCH] bump(virtual/python-argparse): sync with upstream --- .../virtual/python-argparse/ChangeLog | 15 ++++++++++- .../virtual/python-argparse/Manifest | 26 ++++++++++++++----- .../python-argparse/python-argparse-0.ebuild | 23 +++------------- .../python-argparse/python-argparse-1.ebuild | 17 +++++------- 4 files changed, 43 insertions(+), 38 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/virtual/python-argparse/ChangeLog b/sdk_container/src/third_party/portage-stable/virtual/python-argparse/ChangeLog index 3858909757..98e9674d6b 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/python-argparse/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/virtual/python-argparse/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for virtual/python-argparse # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/ChangeLog,v 1.11 2013/02/17 20:49:09 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/ChangeLog,v 1.14 2013/09/13 21:41:27 mgorny Exp $ + + 13 Sep 2013; Michał Górny python-argparse-0.ebuild, + python-argparse-1.ebuild: + Use python_gen_cond_dep and python_gen_usedep. This guarantees clean upgrade + after disabling old implementations. + + 05 Sep 2013; Michał Górny python-argparse-0.ebuild, + python-argparse-1.ebuild: + Clean up after py2.5+3.1 removal. Inline the deps. + + 07 Aug 2013; Michał Górny python-argparse-0.ebuild, + python-argparse-1.ebuild: + Drop removed Python implementations from PYTHON_COMPAT. 17 Feb 2013; Zac Medico python-argparse-1.ebuild: Add ~arm-linux keyword. diff --git a/sdk_container/src/third_party/portage-stable/virtual/python-argparse/Manifest b/sdk_container/src/third_party/portage-stable/virtual/python-argparse/Manifest index 700c3ed22b..0a6c79dc62 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/python-argparse/Manifest +++ b/sdk_container/src/third_party/portage-stable/virtual/python-argparse/Manifest @@ -1,14 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -EBUILD python-argparse-0.ebuild 1033 SHA256 7ad13a42a758c6ddf61b91764392569e5c3112c1a63d7cf94cef3af1a9d23c09 SHA512 abfe4aaaa000b75b92edc3fb9de790e8ac8b2bfe122ecf88bb23b8ed706f6c76a369a77a778f0e0f8937d9a9b226db0ad91f667adf6e536b407fce16f83efb7c WHIRLPOOL 4499348d930bba0859d2ff029bdb273af6f4d39dd11a150437db068e04437ad71a511a89243b4b8ebada4ac9f0f901ccc0ff0585997843e1ca3edd71f8a7e245 -EBUILD python-argparse-1.ebuild 874 SHA256 5d1363d8d812d64c22625b8e3392e40316354223d04d169efbefe705bcb4c4ab SHA512 da60500d068671600cd7c9f3645a0e81f5db947237ce42d4e0fd9e279f0d34958402994603c55a6afdc8ec45ef7502273d2300a1b9902d207b73efcafeb7234a WHIRLPOOL cf885c5fc37acf16a2640c3a005850d76a077405e84b642e656f6c66ce6f0e93043dd693413be888664b51e864c35d49043a3bbdaea5cca369d0bc6fa24911f0 -MISC ChangeLog 1715 SHA256 a5943f461ef625c1b1feba130619f927332e8099ec3ee9a66aaf60ff95ccd887 SHA512 d22735ee98b57559f1f08af201734e3115dd6c167270f8f0e18168219b193aedfd1097d0e4bd27b6a4948c85308383857b4f99c9b04ac4171e7046c70d00649f WHIRLPOOL cb4d46007b1775d9be33453a2cca97ae68025bcc2e26198fad145fa1f58e662ecf3938fa40c1fbc7811648b6564fee378226f8cced7b63627c60fbaac73c99b4 +EBUILD python-argparse-0.ebuild 747 SHA256 22f67d2f852d2ddbe070ad3f34af558c4911d919f8d0599989cfdbc8f50b21d1 SHA512 85f1eec2eb8fed3d276f327241b450062e9269c59503e623f91821a8ed5483a68a15fa4ff28c95c0061d1614c569771d96f58bcaf02057b4b4f33a3bd05b4b27 WHIRLPOOL dd0550cc5fcabe733763f0c0aa82066e47f71e0466ba0fe64d9559f31d4086dfedf24c5d21bfc10839e44db5a745d4e96c60ee23ecbf84e13c7b6ce692494043 +EBUILD python-argparse-1.ebuild 789 SHA256 0764b426e2f75d08fb72090245c388fc241bc63e34cb395bc9499243cba65220 SHA512 3cb718a080a29ae28e74fc939769b3334ca40cf12abb03d6ed2c83a8589328d8e467174031deb5da84c7aa6d534d73510551ce1e21e710b97e3c417a69a36ac0 WHIRLPOOL f145c664e44c40fbbd1ba9335d145a2aa8c50a3fdf754cfdc558d6c9389b84f47b6e98ad2ace1787cc230404ed84740748005032dad110f433e6e313c8cc65e9 +MISC ChangeLog 2258 SHA256 1950831bf9ecd20971fbd2f7b7311d61ea9d2dbb28302cfd6d912833fa754a4e SHA512 f1079600eb125ed5975ad785a0d7043eca1d7f1552bec9a590a4edecaab8c052eddac2507edeb1090f442f3f5452e4a8a5950ba9934e7d2fc53b94ec4282cfa0 WHIRLPOOL f1c40cc05a0e2c96a01189c0ea0046df98f5dfae03883e8daf06309edf11c9d3c294fe07eb406eaa0dafa147eb8913e335ab0fb59c918ae7b5c774e4cc68f495 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.21 (GNU/Linux) -iEYEAREIAAYFAlEhQkcACgkQ/ejvha5XGaOSMgCffqQ7OuGL7W3UzXM89l5skOkC -RDsAnRmxh0tWH1zXatQN8mHCz49ueMBJ -=D0O6 +iQJ8BAEBCABmBQJSM4apXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOqREP/RGethZpJp+hT/5s4LFT8WTc ++LbyRXQuLSyY3bTLaUg40cNOpeTc/P90fO99w6gTMALSm5hKY2ZUauZs5k163i2v +Bfkdci88jJVZDyyVVv69SnaTYHRVgDK10lf1H8z3wkol23xFlAmRrGgpQxBGW/Co +bRBIb8Ddczq3OPu5scjS1QrZU/BYZbJz7CWbcvf4HMGapN/44t04TG4tRro6jmtm +Q5mc3BdoBqH8IjBcBF81htcbNb4k0prq7oY9ZCoOccNcMOB77VwKK6fXX9nGDzfA +unsItkvjKaBF9uJ5OkgpFrKArQopDDZCoiPRgg3rDhx+NnpYFmSV6YIWOn08JMeu +dzdiS9eKThhhyDO6efqNkKIwPthK+jHoyitvDPLYHXc2Pr+Y0qeltPCUS5RchqjN +Malb8OijQtJw7HFIwMjdU+Agq3XVFuumR2AHXk+on9zO+ddQyM5oKOJaE/Wg/WZX +xHoLyWAOg9OzHtd67WTUdZWv8HjlyR+RNN5112L1fDOSEPyzb4F8gimMPmkV2mTJ +uJzIOmP+tI2414M4ArQ3baS0xdJC01ZViz/kmdDR9VvxiKgm+VgnnfvtJ1rn3lH4 +PwsgZtih8LYBuQcYnZfFtG3FWiztnoG7IAyzWaLH0WPq/bl6t9RK+8xI65ZTvD8u +kXqKYRjLhwD3DCGdJtsr +=pBUS -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/virtual/python-argparse/python-argparse-0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/python-argparse/python-argparse-0.ebuild index c21ea745ec..98afeacefa 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/python-argparse/python-argparse-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/python-argparse/python-argparse-0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-0.ebuild,v 1.3 2013/01/06 01:23:28 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-0.ebuild,v 1.6 2013/09/13 21:41:27 mgorny Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} jython2_5 ) +PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) inherit python-r1 DESCRIPTION="A virtual for the Python argparse module" @@ -15,20 +15,5 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris" IUSE="" -setup_globals() { - local i - - RDEPEND= - for i in "${PYTHON_COMPAT[@]}"; do - case "${i}" in - python2_5|python2_6|python3_1|jython2_5) - # Note: add USE-deps when dev-python/argparse starts - # supporting PYTHON_TARGETS - RDEPEND+=" python_targets_${i}? ( dev-python/argparse )" - ;; - *) - ;; - esac - done -} -setup_globals +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep "dev-python/argparse" python2_6)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/python-argparse/python-argparse-1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/python-argparse/python-argparse-1.ebuild index 3184da7830..633e5e6e78 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/python-argparse/python-argparse-1.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/python-argparse/python-argparse-1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-1.ebuild,v 1.10 2013/02/17 20:49:09 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-1.ebuild,v 1.13 2013/09/13 21:41:27 mgorny Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} ) +PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 ) inherit python-r1 DESCRIPTION="A virtual for the Python argparse module" @@ -15,12 +15,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris" IUSE="" -setup_globals() { - local flag - - RDEPEND="${PYTHON_DEPS}" - for flag in python_targets_python{2_5,2_6,3_1}; do - RDEPEND+=" ${flag}? ( dev-python/argparse[${flag}] )" - done -} -setup_globals +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep \ + "dev-python/argparse[$(python_gen_usedep python2_6)]" \ + python2_6)"