summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-04-21 11:27:40 +0000
committerMichał Górny <mgorny@gentoo.org>2014-04-21 11:27:40 +0000
commit60591223953677a82592da66c2d578fc5ffa5b41 (patch)
tree1c74c79696f738dfc37366201baa400c8c1fd627 /dev-python/mock
parentFix wrong BINHOST, reported by ulm. (diff)
downloadhistorical-60591223953677a82592da66c2d578fc5ffa5b41.tar.gz
historical-60591223953677a82592da66c2d578fc5ffa5b41.tar.bz2
historical-60591223953677a82592da66c2d578fc5ffa5b41.zip
Require unittest2 for Python 2.7 as well, bug #482488.
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'dev-python/mock')
-rw-r--r--dev-python/mock/ChangeLog5
-rw-r--r--dev-python/mock/Manifest26
-rw-r--r--dev-python/mock/mock-1.0.1-r2.ebuild8
3 files changed, 26 insertions, 13 deletions
diff --git a/dev-python/mock/ChangeLog b/dev-python/mock/ChangeLog
index 4e647fdf14e1..d1b4749345d0 100644
--- a/dev-python/mock/ChangeLog
+++ b/dev-python/mock/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/mock
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/ChangeLog,v 1.75 2014/04/11 02:00:05 sdamashek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/ChangeLog,v 1.76 2014/04/21 11:27:38 mgorny Exp $
+
+ 21 Apr 2014; Michał Górny <mgorny@gentoo.org> mock-1.0.1-r2.ebuild:
+ Require unittest2 for Python 2.7 as well, bug #482488.
*mock-1.0.1-r2 (11 Apr 2014)
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index 2106f18edb29..33784924932c 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -12,18 +12,26 @@ EBUILD mock-0.7.2.ebuild 1047 SHA256 1ff4dd64ab006add9cdb71f49190908cb83a5cf85e8
EBUILD mock-0.8.0.ebuild 1046 SHA256 75173a2ecf34f023d8f24ea71db460a2327ad0ebefe183e04f05579722226a0d SHA512 886cc1333a303620e0e7b79688347d684064c9797f3d7de7e3d3a18e5edf1f35c5c924b116d217cef36e7cd836a55394ebae6048cebb08200d483938e4fefbea WHIRLPOOL b65cbd2638470debd16665170736791bbcd66734ba575f487e83e47e60932b2ef28ea5b74e883ba205f84cbe9d83ff8f770097a52bf2e69b50e29d34a972c908
EBUILD mock-1.0.0.ebuild 1057 SHA256 c61a6ccfb1a2e6c125ca9a79f3cba6789887212a60074e2e5aa220c61cdc3e99 SHA512 9dee7d02c6a0a9970d818f48e0840f5a0b3c06104ba7b8412cbf39b0f5a7812dd97dd444617fa255fc94151d71a22d7f361f904088a7378ad23537f55b518b23 WHIRLPOOL 6dc5870098d3429bd56fb0b3ba81f623249b0d5e7766b15b8c608b8dbfe3048f27581219e64addf7ea92106bbfcebdd2fa0e00fe7cc6ae272244ee0fd89179b7
EBUILD mock-1.0.1-r1.ebuild 1136 SHA256 97de0fdc907ce52038ddd29fe17c2466259ef5a7c9a691191854dedc57803555 SHA512 6332b1fbcff0e0ce14cb9a0496ae06f919ff4183f8b705f27934af5be884c9649b9bda661ca62c7e60ae1d7b6bcfcc989118e11371a466abc2e90bdbe3a96b44 WHIRLPOOL 96f117ba9e7bc7edf2fd153b5e4a21ed4b576b130fa33ffa82062c967e61604314ed1aa02469babbef978699ce429e08a8502e516aa27d728bb3f097b9775de8
-EBUILD mock-1.0.1-r2.ebuild 1216 SHA256 4a66ce8a7b28a302ea7951f1773ffc2362cdc5f3a534d4cd6bb561b113c33f7f SHA512 1d4992a475fefbccaa722927dc0d1b5a4493d05ac740c147ccca0ea5f3d4d34de96fbd945d99e34ec22c8fc3e3aef076dcd6f9a1b4e59519610b3664843be99c WHIRLPOOL db81d0c62440d3894a80b7f81dea785a014f323e30f238a6e23784cb8185b0305beb8e292c27113a90d38bbc4c4558824b6d3b6b93c107d19a342bace88934ff
+EBUILD mock-1.0.1-r2.ebuild 1246 SHA256 1b74e9d3bc6ce5bf10fe773eee37617893a294251938c68cae4e3b92301c8c89 SHA512 6782abdbb71971eb41e47d9509665bf594219760ddb85d379b2713f055c9b7b4f3d55f882578d4cbcbed22b749671b6564839b0003f9da04af7b3e54d99c6ae2 WHIRLPOOL 0fd56144997d1b6a8474151a16d92747c30216740455716654091eb21ac83ad4209a042e569d77bb42566deacf972012ee8afe0375388dc4ec39e3eba9c5a935
EBUILD mock-1.0.1.ebuild 1081 SHA256 8e042e77b61d0a06ac4be2a6eb1dc96b1bb87a8c7e2563085e64fa644a543562 SHA512 5b89e6b2db12589231e219671a9ad86a81aad97c7d60e9f9bc667aba5bf1a3d15adefa1b77bd9492619a5cf7cf2f9232ba501fdab9a244027760111ffc96b9f1 WHIRLPOOL 17800c0aee6bc53c28aff843c5729b4aa0278498c3d503a05e0a48ed01c4390b8f0add58f3d4b954c423a6fc4174137a0574d325a1cf678c2aec297bf8a9c6b9
-MISC ChangeLog 8615 SHA256 933ed411e10043902c1f5497e7f4f95c8b71e77031db19f9ce6f4cba65b11836 SHA512 6cec76ab2fb5e2419613406f9abfadce089672e8dd9afb060f5afeaebf59378ec3cab182f6aa47bf0abea611a919db00beef54ac11c36eda3b183dd16e0ef8d5 WHIRLPOOL 871463f6062a4eaa6529d55992a1081559997c8e833c097ae7d1cf810588150494919f5a0a906c52085b8003c969f3f01d7f2f526037b47b935987f44b282615
+MISC ChangeLog 8742 SHA256 9ffd715a580f419d6496a5124654c0627af8ccf138af5681bfef15ebc0cb1acf SHA512 4bdbe07591dda97306a71d400a9a5a4fc1f01a9ed5b626d56390747b76fe62d363719838fd5cd8f3df37fec1f03d01393082c99024f0cb3e45d2eae8d0d6c230 WHIRLPOOL 096511a89e658d9688d31a084ddadf19832a3918e4ce491c0bbd5f0149e6f69335a42afd491b029cf725123a0acedfa40de268e8c6e27736056e5ec6c98caf6c
MISC metadata.xml 227 SHA256 0df81518323132374e9107018a8ba84576833f8cbb9e9570e1ed449909f537f0 SHA512 12a8567e73ff8d3c2f0808ace03005abb52df5c0470f77747c7ea3225c8614b01180c62fec4a414d5d0d26a77472da32fe879926e64478596571cb6c63b20168 WHIRLPOOL 23d248d9cab8febf4ab6f11472ae95de01f1897350134adba6fd16a7ff0f032611189210cb425a9692093f8d8488f4226d233b1422653edd75d66aaf8d5fc69e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJTR0ymAAoJEGw+uP08RytW5gsH/0JhHOk3tmyojlnAZERJ1Nh6
-S3BHvnllF3Y6ovrLGzwl2kPPjVBMaUAEUspmPqHAZk/tuRCBOzWFm0XPODmc6jLS
-yyQBlWqmJmPpdP6+en31Z+jjyU3utBPgdYYeOSdXaCtIjKQUbEtL/Q7ettXoYBoP
-HlirJILPvQPBge5Q21uHNRPiyoEYeIXWa2hx5jLU7fo34AnSc0uSgSQtq3ipio2Y
-z742rA9yFtsk+Ao51j0kU0IqX6wumFmeu+aJfrkLPidgTW1Do6bzXnBBa4w8WNQ1
-AH4xy2WpGeugr5jjKtIwEZ5F8lzaedRxS1mLwJrFpdDoCyPO30q4ss4RRDZZUrU=
-=FVkq
+iQJ8BAEBCABmBQJTVQCsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOmhcP/2eL7TcJGbPG6YAmh4eB6FVs
+9dd1FfAHIvlqcO4OPkM2tl2RUNmQ76lNNOVlS5ZVLoEi6tDgWGhmfJw6ClZDVFq0
+QNTlhvAiVv36AYM6wDQTE+iqw5gyoJf48bAE/MDhW3dso0Kop6hohkpQ202MUdv4
+rZFCzunwP95Go4H0KXsOB55QY134967xAXaUnK8zb6kbuDYqJqDTGrMNrF14NYJz
+LXoUN7h+7QBsPp9lnPS9/k7GrvxMRQBPJX3i+j8+JUA2wMAntwHrt7oGCRIUM7a3
+jJEGGTjGX8x3VgNgt0IZvvceLtETVpKhQjtMFenPgI4TMA8uBBWf9CL3sGdvLQ0S
+6epNr38EtcTtGcLTrs1w1BcCKbysZifkCW1e1B/U4bQ5C1iLBps0hzoWEUwVrhcX
+6h8cRW2vcIQhbRMOSgBW/jq96A8pcnSCmOxMV58cZMJPmCKXMmkUCvfFITF3jXaJ
+N9o12+WR9k6vtLHJxBQFVK58RqfGuINVXLQGi8F1tZvf2/79306lz3deb8IQUWRY
+hImq+Biw70z4aIyO3WsawVsKwVKjdpXo1sJNNNWP3zoCjQkgZBdNdojWElGfSBYu
+59LZxD0AetDL24pRK+I1p9J0osLnxSkzQY304CFdKV0rqSeOlakHHeH83kfAskqm
+YyQ1Cx5MQ6Nvul1V4N4F
+=0+/r
-----END PGP SIGNATURE-----
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild
index d2ee79f0f2ec..601951dab64a 100644
--- a/dev-python/mock/mock-1.0.1-r2.ebuild
+++ b/dev-python/mock/mock-1.0.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.0.1-r2.ebuild,v 1.1 2014/04/11 02:00:05 sdamashek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-1.0.1-r2.ebuild,v 1.2 2014/04/21 11:27:38 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -18,8 +18,10 @@ IUSE="doc test"
# dev-python/unittest2 is not required with Python >=3.2.
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}]
- virtual/python-unittest2[${PYTHON_USEDEP}] )"
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2*)
+ )"
RDEPEND=""
src_prepare() {