From: Justin Lecher Date: Wed, 6 May 2015 11:58:13 +0000 (+0000) Subject: Backport fix for windows only modules, bug #547928 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5e36c0054504f64ff5fa2e5cc222bdb7c880d1e8;p=gentoo.git Backport fix for windows only modules, bug #547928 Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- diff --git a/dev-python/six/ChangeLog b/dev-python/six/ChangeLog index 97fec5a5ebda..fae7d4f0f955 100644 --- a/dev-python/six/ChangeLog +++ b/dev-python/six/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/six # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/six/ChangeLog,v 1.67 2015/04/08 08:05:18 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/six/ChangeLog,v 1.68 2015/05/06 11:57:45 jlec Exp $ + +*six-1.9.0-r1 (06 May 2015) + + 06 May 2015; Justin Lecher +files/six-1.9.0-winreg.patch, + +six-1.9.0-r1.ebuild, metadata.xml, six-9999.ebuild: + Backport fix for windows only modules, bug #547928 08 Apr 2015; Michał Górny six-1.3.0.ebuild, six-1.6.1.ebuild: diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest index b921c10f7776..6dc62a7f0b2a 100644 --- a/dev-python/six/Manifest +++ b/dev-python/six/Manifest @@ -1,8 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX 1.9.0-mapping.patch 557 SHA256 f2756328651f4451c0f1a953f7ebeff1416bce303740b5638877956ef7fcdfcb SHA512 ed7e8530e8295390823f38adecfacaf5f494b1640b95995d1e150f5b96ab68e3961d241c27ee79309b71688d576b33b76c2817e6f3eab6881e83dfa14059fcb0 WHIRLPOOL 39264737d3be5503a6f7a1b7171575662b4e225d774d3bfea1a69637af2e92eb24e16b692ec57aa6c0ce8883d987a47cc3021d33eb7c947ad0fef963c005efa0 AUX six-1.5.2-mapping.patch 555 SHA256 feef54fedea1ba9b5cd0bea71990c9156d393e4e2abbacb371f3413cdeb8514a SHA512 602b750d5b79d2418c63cd4d21f27749f951322af52e7f9ba8870fa66e4ca1db7f57371c50dba8c1ebc9a8264d6ffa768f96469fd372095b8cf3a047857e35ac WHIRLPOOL 4f0580b747941bf3f842b1c8e0b8a38f4abb054b7244e5fdaf8af2bc9f5c558914f7ff16981ac325c5a145fc43659b6dfdbdebc9b60cb4a1ef9b0f25f336c62c +AUX six-1.9.0-winreg.patch 953 SHA256 607d71d6b76aaf319a763306d6bc01e062382997b096e3a0b46b225ca22a40e9 SHA512 abf36a4199c59e53d393ec800bffcfca654bb87e718a8fc44248efd78ad86b24e8526626417359df6da9be79aba3092a9496b1202f68f1ef43e6e75d339c01c3 WHIRLPOOL 4a325bc7fbddacba7f9d94055247dcfaa5285a635b32e6df46993b9ef3fba534dd26f9412ab7745bace01cd273a82910620fa6453b645050ea5ae79deeb1713e DIST six-1.3.0.tar.gz 17701 SHA256 d59793f9b255bd00de800b97f9a50cce4fc8a44c205f7defa5bb7d691d13b852 SHA512 e8974d4bf62325f98e301e68c237489ca39cfa9ed1066f1cdfa34e18d20d0baf788cb515e44f00f1c823f9f923d2b30f63443dbc5df8c934b1a69b8c68210130 WHIRLPOOL bd259a4e2cd0ae2629a8998a01641874266928d6fe3e65669198a9706cd4f90579902196680932b5c9207db1005376ae8b4cbc7b63f30afabe8993e719df9a5e DIST six-1.6.1.tar.gz 24792 SHA256 d4392a7c8d91b005c002568a85faf617c67241c8cd8399cc395e8f1005aff80d SHA512 bd925295964696dc8632eb0b9d6632f25d4b461fefceb470d2bb537e98b0db9dddf9c2abb363657451b950572e91f1ab5973d12739781823f9b845abe5061057 WHIRLPOOL 54ee9309a0433231530962e64f19246cda75b36c191f6b567ccef4bb4c4cd631785d0641bc958b1cf360bc3eedcbc5bb268bc9ddf645b68c5c54bc80e184b3bc DIST six-1.8.0.tar.gz 26925 SHA256 047bbbba41bac37c444c75ddfdf0573dd6e2f1fbd824e6247bb26fa7d8fa3830 SHA512 e705c0213396d1220f02f2c6f724ddb9d95eefc38459b6d9bc547be859303bd404969965416f7d1614d2eab416d647d0b53502414cdc46bcb597675cf509b9ff WHIRLPOOL 1a84ecd8635e93f104447b78a6beb577639a5eebef79af40fd8c8e9796ae35c1f49dea64546f46ec31e5589c86c4b36c9fc2e28226e0c9540aabd49ebcf7bf07 @@ -10,26 +11,27 @@ DIST six-1.9.0.tar.gz 29127 SHA256 e24052411fc4fbd1f672635537c3fc2330d9481b18c03 EBUILD six-1.3.0.ebuild 966 SHA256 0d605b9320e347dcc43e07c04c5a9736172c5d0d5d4abaafcdcaa9c56b500958 SHA512 795b8273c4f77a4bb3b13dc71ee3bc36143322ab77a3f27122db1bc08d52a0ae40dacd1c4a771c60634330dd3f994857f45d69c4053e57fef9a110b380c77663 WHIRLPOOL 91f089b55bf13a8df1cc30002ba4f72a236f6126e4b67171336b25d6342b5a6cdba531eed7ec3a53799918d07225bfdd970f6cdf99ec73f0b809bc7c4f08c94a EBUILD six-1.6.1.ebuild 1034 SHA256 74ec337d77010cc225d6ee262dee6b7f0db1e034ee57cf0830f2edc8fc645cec SHA512 c36bc13f594a943eca3a8f5834e95df9b008227a3cd7da40c71d07b8d52dbf97162ea9728cab43bb5ea9652d73b0093e076289db5327f982561c38a5947fbb87 WHIRLPOOL 6aafcfa9d876287acecf2382f4acc5c82cfe4a94ac570739b874abd8ad0470a23aa5448b354816e289b16ec89f7364a3e05b90f4ffe48b9d00c7e2db704f7a23 EBUILD six-1.8.0.ebuild 1122 SHA256 dbe3c775e86d859827666a24d6cf79b1f448d1becd6a25f893b42633896b8311 SHA512 85f32f046768c6f4eb1b2d03b0a21139ec55d6cea00c581a8ca5e86aa8d7edf6a4070f6ac1117d14fa2329bfef3a69b76c5678c4bab0fc9bf4a36018711310ee WHIRLPOOL 939925409810af5450566bc88180960fd91c2c5c6f6b0c20730a0912b6fda48d58c568a9720704384440de6b5db63c0dc4327fee8943e3684443200ba3df9d89 +EBUILD six-1.9.0-r1.ebuild 1212 SHA256 5bbb9b1b7a17a1a98e9d38dbe9506dec2ef78979511022bd4257096949ba0315 SHA512 5c895b4b9731ee381d4699782a21559c4541aeeaf8ad858dbf374670f2b332f8a5a14638a159859c337699e2ec7e6e2ef6075a4c059e0be87fddd853ed01ec0d WHIRLPOOL 84dab193ec3b29f0cbdb544b9adbb52b0916a60e24a0f331a90401c63730c69db28cb812cb896e3e86340eea4e13a10e9c8665ff9495e68f7b3db98de9b158cb EBUILD six-1.9.0.ebuild 1128 SHA256 0607125ef91417cfd6fbeef799082c8ef30292a63da7c2dc5c54f9a71e10ce43 SHA512 05cd8f67b8fdb3d84a60e1f7dde084ed3168c50ef2cffd081b31ace03cc1f12692c3cb192506be00a9fa119b862161a18f306ca44667466a8eb1d4242c9dbc84 WHIRLPOOL 5ed9bf53151c7e5e4ea23b0652aab9463e8ab53c5465cf5fa98ffb23dafc76ebc70971c8e5f0f55ac1df3f1f5f31a87b81436176af714b65c6181ea533562bf0 -EBUILD six-9999.ebuild 1096 SHA256 09e10bd9a594959d7d16fd218fd37364d3b1bd21c50686c8ed484fa75c1b2003 SHA512 fe95e80acb29ac39b83ac69a46b0f8c823a79d0da491585c49681857393d457f7682e16241fd004307bec9910f4970b6bd48a319211ef073492f6e0e80ee7628 WHIRLPOOL 2ec5092d906d0004f5aaf92a4b323a903d275a4ca0671c7225d49baa6d2661eff95fddc377272c77a5b51002ab5627cde9753f45b0c152feb77d52bea25a009d -MISC ChangeLog 7805 SHA256 59fecb1661ad3f73f48c65e18d1f887e8216df64729c918ded6442dad921c9b9 SHA512 e707cae2b4e5f879014d55488b9139b68cf1200de1348e692c73031fdea32ad349508e738e1825c4f9992b3d2992819a89be74dc4e1618accfc9ecdd015d28c8 WHIRLPOOL 13974a95ad672837297abd76a9e3fd8c7f96c4dfeb9f4a059d74f3ac23a9215c676a2ddfd7d4164881ab1c45a02447b7ab76f17ed1bda0096e3c8a38e71e3d7e -MISC metadata.xml 226 SHA256 bdafefb27f29ded62ff07b71d48d72d5c385dcc4c0e9c95beed417b16edb07e0 SHA512 25f36880da8494a871b8cd71511742e64a43a9f2e5d34a76016d57d803be151446a3107391e54911303cfda7436398c6dec9fbbe0bec5abac98c11a21e1609e3 WHIRLPOOL 1637b7d2a45c8a664f1bfc565bbfe6942ca737c6801ef11baf9f303cf9e8a982e2875c9f88f235aebdf5d7f500504e6851f2d32585089dbd48a5e71a633d86c8 +EBUILD six-9999.ebuild 930 SHA256 c318f0196a47e738113530cf5f19b077bdf39bbd20bc5bf8aedf3086aeff2f47 SHA512 27d31f55e28586650f8bb9616bbbf39965ea8e383de005d2abc6828d264e2756de84e5006f48ba1e58e20466bd7bd6a1039c1363eaa04d64badef1bf5fad8277 WHIRLPOOL 507c47c37ce30fc861849489d391ac64e56fc86cfd1ffaa3e197da0a4059537bf12bd239fe2f05ef98fe2c68991849162ecc042b1024e2a1b3196c2a9f0e1bd2 +MISC ChangeLog 8019 SHA256 36e8b670f86600fd21b32be80ce2c7dba16bfe2ac0ee3e857a2f7c8adc9ad911 SHA512 321d50ff4cd7175687d2318444a982157b4cef3e928cf949aeb2b7805b8813717e71634c51ea23111fa17b6cfaa46dc0e88e2c1d503a962131ff3e6b75ec30f7 WHIRLPOOL d5cc1214f2b15971b8074b77eb8fa5f1a4433010840d1b158b132cd2867a9005b21dba95bd393782444898a90cfa96d8548f6ce9bc17885c11c0c608b739127c +MISC metadata.xml 231 SHA256 0482e658b6244ec7ee59eded17721992d37b1e576f544c5c2e9203965c8e960a SHA512 e045464564b71216836e362a472c6a4766f22b02413b4ac2c60e8c03838a0a229833ebff2b82b0ae9d78cb4069b8ce9950ff47a0c0360904f47e8d017f33658a WHIRLPOOL 774f9602bcc751a4d7f84659e51078528deac93f97aa52bbd4ef3eb510d1cccd9e761843f4054d0dde0b2d28954b7791b2da63fb4498d9fcd7ccc4d5ba2b7949 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.1 -iQJ8BAEBCABmBQJVJOKUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOloUP+wXECqbaFh6SMdrSf62QU7N2 -NyBgR1PetLKAV6cLLkwD5/aGTf4o+rdf8mVcfkVP9TMRzmTCZlCXr2uIZZWM3qUm -pOUukerAe8zMj78Ss8t3PV/TrsgG8gpfS5jpL1DKtlUiCMcRgaXHS5OPa2U03WpN -jJKWl3l+pi63XRtXlfx+02TphEBo7a96dW7QYegTeVAZYhy1bLEyXvUYizznmUxf -4EyHw0a50mpK00DrpDViY1JSh+5WJqbIPqRZXxueBQ51exdD+rMhdK2++6tMh0I7 -Z/E1nmijMUu3/1fWvmlusf8tVkI0kU6pc6U82hYzMSpGcgbO3SZoMgmCBxjVxWLe -WyPnslPV9NUgRGSS+wFMKvNRxd8TPAz0QMSWRQSiU4kJF+6idiDPGpaK/j6ms3qc -75VTNgbG9ny+luA5aFRTRA2RChy32FdzaN81lhjT8v80TGLm4XFcFWFdmL8/NL26 -ViCEKlSYFfCYu5HQA1rHk5MhJoVj4Chqp2YityU4QwQbxTWMsIXjHxfCmqnDSS6l -JpKdlnUmH5ILUAEKCQJFrkzZQZjKqABn3EKgmIQ7DVEmZieTNGmWtN/byrOhMu3v -LGuHAqbTyu2v7O7QT/8SYZectc8/8wQQdm8GMMVSEpUt0a/7Fib/3aOmhNAfMOdY -vU1xyiTSGrw6Dlx28ZK8 -=5Dl0 +iQJ8BAEBCgBmBQJVSgG6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirpOUQAIIdU+zVdZdSZkCxvuJLik79 +dIOVHQN4hHdJusdRfOgENjYhqquPDdpVdJXP707vaUVLR3v+E8TZ3kr7n+pKMDT1 +qSzMlH428vzkdAoq7+/eAuMWeYaFE9gKsPgZxBiGPQK2p+2hry53EyVdQjZAC3W6 +Jge7J27yluFqYqrJHXNVXIP6729/cvMpqJm2+tj934bWsUFseAU/YiL4E7qpCD/7 +jcWOcic6CXhtOyuD37t3F4gP+rgMrS+i5zWwkQjV/FSQ55+qrJGgaIfLYvfvVDv+ +EhNDvLTPWaEg+J59yM7rpqJ627r3YVEsM86uuNaxx7E+UMD79qKPTOvVXgEL+QSn +tEzIoVbG1DJPZ+sB2G1TZysC4Xl8yoHbfFh6ngN3O1aqi5hMgiTVx96XQ7mHjw/2 +AfjwPWxAVj7CSwQhaLpNFy/EKbg+5oJYQMAiYV8BJn8FuhvCbTQiF8OY6hRubiQp +1wDucKDAkB96/kqdPbv6lcfO0ci/hhpoDYx9rVS5ZLpP2VW/F55LMr3SN6esj4jx +3wvVcaaHDDgDEvo703ZDrcW5GIJOyp2hfuPykTBydETOSMBNqLVxahTJOBwrcwFJ +bOkAPFeA9noL5D/6KcB0CmO2v/6vqyyjnzDnKcQlW0g+LeQKIBSZHDQ03WFcCokl +tvS4bmaoZbFT0cxsahNy +=GLzz -----END PGP SIGNATURE----- diff --git a/dev-python/six/files/six-1.9.0-winreg.patch b/dev-python/six/files/six-1.9.0-winreg.patch new file mode 100644 index 000000000000..57e2074c8268 --- /dev/null +++ b/dev-python/six/files/six-1.9.0-winreg.patch @@ -0,0 +1,27 @@ +# HG changeset patch +# User Benjamin Peterson +# Date 1426865725 18000 +# Node ID c996ed1dc0064f45e691f1664d06001ae07fff00 +# Parent 7638872a6c760448ed8648d692c8eb702a29c361 +# Parent 24dc6a6f7384712152dd1e881c115fb4805be9ea +Merged in mrossini/six (pull request #55) + +_winreg is added to the moves module under windows only + +diff --git a/six.py b/six.py +--- a/six.py ++++ b/six.py +@@ -298,8 +298,12 @@ + MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"), + MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"), + MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"), +- MovedModule("winreg", "_winreg"), + ] ++#Add windows specific modules if needed ++if sys.platform in ('win32', 'cygwin'): ++ _moved_attributes += [ ++ MovedModule("winreg", "_winreg"), ++ ] + for attr in _moved_attributes: + setattr(_MovedItems, attr.name, attr) + if isinstance(attr, MovedModule): diff --git a/dev-python/six/metadata.xml b/dev-python/six/metadata.xml index a2b6424e58e3..f3c6951bce50 100644 --- a/dev-python/six/metadata.xml +++ b/dev-python/six/metadata.xml @@ -1,8 +1,8 @@ - python - - six - + python + + six + diff --git a/dev-python/six/six-1.9.0-r1.ebuild b/dev-python/six/six-1.9.0-r1.ebuild new file mode 100644 index 000000000000..42c07ea156bb --- /dev/null +++ b/dev-python/six/six-1.9.0-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.9.0-r1.ebuild,v 1.1 2015/05/06 11:57:45 jlec Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Python 2 and 3 compatibility library" +HOMEPAGE="https://bitbucket.org/gutworth/six http://pypi.python.org/pypi/six" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" +IUSE="doc test" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx ) + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" + +PATCHES=( + "${FILESDIR}"/${PV}-mapping.patch + "${FILESDIR}"/${P}-winreg.patch + ) + +python_compile_all() { + use doc && emake -C documentation html +} + +python_test() { + py.test -v || die "Testing failed with ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( documentation/_build/html/ ) + distutils-r1_python_install_all +} diff --git a/dev-python/six/six-9999.ebuild b/dev-python/six/six-9999.ebuild index f44b2d8cf600..1322473187cd 100644 --- a/dev-python/six/six-9999.ebuild +++ b/dev-python/six/six-9999.ebuild @@ -1,35 +1,28 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-9999.ebuild,v 1.11 2014/11/25 01:07:11 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-9999.ebuild,v 1.12 2015/05/06 11:57:45 jlec Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) -#if LIVE -EHG_REPO_URI="https://bitbucket.org/gutworth/six" - -inherit mercurial -#endif +PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 ) -inherit distutils-r1 +inherit distutils-r1 mercurial DESCRIPTION="Python 2 and 3 compatibility library" HOMEPAGE="https://bitbucket.org/gutworth/six http://pypi.python.org/pypi/six" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +SRC_URI="" +EHG_REPO_URI="https://bitbucket.org/gutworth/six" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="" IUSE="doc test" -DEPEND="doc? ( dev-python/sphinx ) +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx ) test? ( dev-python/pytest[${PYTHON_USEDEP}] )" -#if LIVE -SRC_URI= -KEYWORDS= -#endif - python_compile_all() { use doc && emake -C documentation html }