Fix deps and skip a faulty doctest.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 33 insertions, 10 deletions

diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog
index 1cae5dfdce12..afb49bb56912 100644
--- a/dev-python/logilab-common/ChangeLog
+++ b/dev-python/logilab-common/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/logilab-common
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.129 2013/08/26 11:25:27 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.130 2013/09/02 17:31:51 floppym Exp $
+
+  02 Sep 2013; Mike Gilbert <floppym@gentoo.org>
+  +files/logilab-common-0.60.0-skip-doctest.patch, logilab-common-0.60.0.ebuild:
+  Fix deps and skip a faulty doctest.
 
   26 Aug 2013; Dirkjan Ochtman <djc@gentoo.org> -logilab-common-0.55.2.ebuild,
   -logilab-common-0.57.1.ebuild, -logilab-common-0.57.2.ebuild,
diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
index a9fa50da7cb7..e879febc85dc 100644
--- a/dev-python/logilab-common/Manifest
+++ b/dev-python/logilab-common/Manifest
@@ -4,18 +4,19 @@ Hash: SHA256
 AUX logilab-common-0.59.0-syntax.patch 520 SHA256 77a17ccefe982a2cc64a39b678b9b75253e19ad4f4e9550d7b360c4b3fc5d41a SHA512 deb6d7e4b44dfa8092bd531362a64dfb51fee841e4b4123fb18a7c4cc4f6ce41d222be508c73a2aa62cc8cffd347febd04a648b939b510740316a3f668e3f435 WHIRLPOOL 1840b91834bda4eee3d96e85a6a85d6486a219a82904b606fa29c2d6b4807ef01826e990f1fac2a00f5a03d02fdac16f80a426b2fcfa2707045ed90119fd649d
 AUX logilab-common-0.59.0-utf8-test.patch 1198 SHA256 d4cc82d7430efb8415c45cd0d85fa7cc37175627c6f430720f03647d2c5990e5 SHA512 427d5ea7068f43d92c15f21f353aca261c0d1672c0fc0597152db2fbe3eb73ea70d1fbd71817037908714f2a0d4131e015ebbea5f2ddcfef3b1b9391d17d7c9d WHIRLPOOL 6ec162a5514167dd76fd9762ebd2af3756d4a23bf348b4e6a5931660d58ed2c69e74f9173363ea3d2453172cc3da82d2475fe44bdb7f91ab95ebf7c92ce0be5c
 AUX logilab-common-0.59.1-zipsafe.patch 398 SHA256 a589b3107bbabc18f14d69410ba6a5f0affc8a1f373825cb4e7603ee4a215386 SHA512 d97177abe8deb3af46abf586cb034a2d0d16e924b2419ada49ab097acd9bb8820aec41b81dc5a0cd6a36f02849638a221b3e71ada077b3bd256fc9677e2bac57 WHIRLPOOL 8819196d91dfc6893ecef141a71b48425df837d8ca495da1ed9f70ea3a6f39fd673f29e0fe1da19573498bfe716b7cea64336c044dd067a4465bb947274acd37
+AUX logilab-common-0.60.0-skip-doctest.patch 313 SHA256 bfa9b4a9e6beb7e681ca9a6efd3b66e81e69bc8bcc6e5aa6acec47a00eb353a4 SHA512 74135bd0dc609244bd746abe75e2bcf427c38eff195cc25790b0cce478c71ff30b59291f5b2e7631d901a776aded1decfad30e5b63bbe13ad0f13a0a19592331 WHIRLPOOL 2e4f9b1481c7d1188e8bb895013d2e9b2dd4b31102ad65a198989d12e217a2520a865ee4ab2aea3a55fea65bc8c3d23abfca48af5c39e8d836f174363823521b
 DIST logilab-common-0.58.1.tar.gz 193990 SHA256 2fadd2fa938fd033c8a7e126cfe835f6b790de918b0f0d2c631b49962e9e7ff9 SHA512 b70bdf2b00ac75c34e74b341886008b0069c96f38308af62c093756fdbb218bbbcbb6b95827099f2c0da2c43744eb9029f3dc546947bfc7e0b32a9ed8df6dc7b WHIRLPOOL f059b457d286db7d3b71b4f6e1f9a659a151a8930ff65565a617345151e467e587aae2524846b24190437bfc634523210868dd160cf65db674cd03606ae8e5fb
 DIST logilab-common-0.59.1.tar.gz 200699 SHA256 734dd2823341686b27b21d3e4b4ebc89c6c0d1b0960e587157aee0a5fd7c3973 SHA512 22785a9e2bbf7fb019a23b8cd096f560ea84d566cac0643078bcf235534ea51e510e85e5ee7303c7369a77da7bb907bdd569cf29a67611ac7e689b67ad84e9fb WHIRLPOOL 0d6c5e8500ba0d1185b8d79fbc3958277f371363c2d4e9622c4cd5400e84bfe2f171a7ba490383112c52c4059c6eafac8a51e8401c40da0b94337d053a5f2bbb
 DIST logilab-common-0.60.0.tar.gz 202530 SHA256 93739a1c6b850b2e9f50f327e3997aff9e7ede00695d8d5510e94b2856f91e90 SHA512 c9b3baddb3f2464442009f6ac9187f10811a740e2dc2257626b291664c0ed82c1c589b90721b7d0553d446896ef833995c96366336dd968f056e2af1dd9e3ef7 WHIRLPOOL 1639c8a169a1e8437f05d9c5bc93aa28ef9bf9a09a848bda355f215da326b97ddf40cfe01ba6f6c28c94363143472fb7f71b333ba067995687f04dde3aa2523b
 EBUILD logilab-common-0.58.1.ebuild 2099 SHA256 4a117044779e7de41aa23b420c05f42ae64c8cfd593473897f8ff8f4d2ee1d9b SHA512 ea3b1c25c7dcb62859209f3b93374a58a7f84d502ce72fb22753099ad0295919af4ec45f5f779c7feb152b38669016c67ac11fa6a38c63cf1482b697dc6dbfde WHIRLPOOL 64435bf497d7bd92e0a59c34fb3809f4339e176179a830a044aad007b0e20018d110a4d31a8c2c18185cafea76fbcd77b626274f01c3deffb8a013b3cb744f7a
 EBUILD logilab-common-0.59.1.ebuild 2101 SHA256 ed975499a0ee6982b0329493c43f30acf31a5cbd0adf13e58f36142a2097e6c7 SHA512 026b35deb63fb10e9fa512a0692668d91896831a01147898c4dd31d09ab6b227913d0bd02e2cb63f00924a257997fe21d90d11f806a5e34f0b8cf338c714e8e2 WHIRLPOOL 1654b19fb98680378b14b05de8d8e7c81c324e36dd371f25a88dac45e65007ed6030c09e24117c374627d4daee990abe8ebb4ea20d9db1b0fa71b6be02f563c2
-EBUILD logilab-common-0.60.0.ebuild 2100 SHA256 70812d643b27be364401d8f782d63f15fec986006eaedbc93dbaf688c36c8f4b SHA512 c8cbbbcbe8fb7c9736d5ee51a41401821383545225b42dcd143f9fdf552dbaf185ccee6ae594d3f0d6245c6b293f8d089fb96b69c50b5edb21bf05e1a7ad89a6 WHIRLPOOL e71857b78ca16ccc5b988825012ca8acf5d032c32c9efc7d3b6bd911791d38120e2365206412178607c9ec21e169d566e370fcff44c20167c263d8e7fd66ead7
-MISC ChangeLog 21002 SHA256 c1ab318228b804cf0895be6c628e56fd014550f50d78ff8f6407d787088094f9 SHA512 9db41a2223aea223e0cd6c63345cabf5f4937ecf2e484ba3e1674b4d589a9d4038debb24c6b08cae3d6cf53afe7e41d0ad337e5dd4e646074547eb0aa080d821 WHIRLPOOL 0b71593f3355b8380776febc03507290ff5a0949c48b2c12082c86717b6ce83bff9303f33210552979572b4e89c1e7abf34962138b04f9119dc6a980a2ef40d6
+EBUILD logilab-common-0.60.0.ebuild 2281 SHA256 019a271d8c26d6ee2a0f77eb92b4b7e82eb495137b1b67224945f13a3c2f78ad SHA512 74776114c7784fb88e96400f5fbf6602420d6789938cffb91cf426871001aa3821e560ad30fbc6154bc30c20fef3998a2f0f2f7fad39e7bdc2070a8220767efe WHIRLPOOL 989b9dccacdc911a386387c60fa9a459646f68ef484114d992f5f688e6fb220af08493d9d68cfa194b5db5af48b9c157c4a60034c5d66f36b992e27d72fd2446
+MISC ChangeLog 21175 SHA256 0da8ce65aedf90a60fc329d682a497c5fa0dbc65b3a4a51abc8a25584b2f8fbb SHA512 4569d7ef981532d55c07b57ee911da13a93122c4212460fecf30b246faf51af338f0b34a7766d193056db5a2c486cc773c73c8f127c6b7e423b11c8afc5d275d WHIRLPOOL e68989685bf0b347a3b84dc84fe24b11b671c149e16f0d3324491440bbacd9af5757e817a7c948d4fe091d09b72a30e6131d79115b40f9626f445be7a1efac56
 MISC metadata.xml 237 SHA256 523ae42d51ae087b615a63e6b30e3c6c1d3910f2ccc0c03685d6939756660c16 SHA512 74f7a5fc9ffe80a474f05ed5ab7fe94511ea85f65325d3f16c5cb9af5b072b9aaab5ddf99464e34d12a47dd4861a76e16486fc8815a502036530ed74c73047db WHIRLPOOL d95ffbf06f4021d81c7b5f17bc1c240e47db7a3344526c053ae504d8442658d93ffc13d9f89e91991d6327fc92b31bd9499a9ec3f57830dd9834ca3b349b1e1f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlIbOzMACgkQxeMuLWsGW/tWUgCfa7qRvI9yxC/g2rzEtSUhKtyn
-m1sAnRA82NuzbH5S/M3dTGUrhNqsydwA
-=2uM9
+iF4EAREIAAYFAlIky4kACgkQC77qH+pIQ6RI8QD/Tfo22ichwdkqYzOX0NyvIVpi
+uuABnGUyAdpLDVP1lk0A/ju/XEWr9QzBnhLdj3SdiH3Pqf+IRMOgKiLBT93xev3r
+=54R9
 -----END PGP SIGNATURE-----
diff --git a/dev-python/logilab-common/files/logilab-common-0.60.0-skip-doctest.patch b/dev-python/logilab-common/files/logilab-common-0.60.0-skip-doctest.patch
new file mode 100644
index 000000000000..019ce619ac6a
--- /dev/null
+++ b/dev-python/logilab-common/files/logilab-common-0.60.0-skip-doctest.patch
@@ -0,0 +1,13 @@
+http://www.logilab.org/ticket/174440
+diff --git a/textutils.py b/textutils.py
+--- a/textutils.py
++++ b/textutils.py
+@@ -287,7 +287,7 @@
+     >>> text_to_dict('''multiple=1
+     ... multiple= 2
+     ... single =3
+-    ... ''')
++    ... ''') # doctest: +SKIP
+     {'single': '3', 'multiple': ['1', '2']}
+ 
+     """
diff --git a/dev-python/logilab-common/logilab-common-0.60.0.ebuild b/dev-python/logilab-common/logilab-common-0.60.0.ebuild
index de38e8b56a82..0dd4825530d8 100644
--- a/dev-python/logilab-common/logilab-common-0.60.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.60.0.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.60.0.ebuild,v 1.1 2013/08/10 10:00:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.60.0.ebuild,v 1.2 2013/09/02 17:31:51 floppym Exp $
 
 EAPI=5
-# broken with python3.3, bug #449276
+
+# 0.60.0 fails unittest_umessage with python3.3
+# http://www.logilab.org/ticket/149345
 PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy{1_9,2_0} )
 
 inherit distutils-r1 eutils
@@ -26,7 +28,7 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 # Python2 only.
 DEPEND="${RDEPEND}
 	test? (
-		dev-python/egenix-mx-base[$(python_gen_usedep 'python2*')]
+		$(python_gen_cond_dep dev-python/egenix-mx-base[$(python_gen_usedep 'python2*')] 'python2*')
 		!dev-python/psycopg[-mxdatetime]
 	)
 	doc? ( dev-python/epydoc )"
@@ -35,6 +37,9 @@ PATCHES=(
 	# Make sure setuptools does not create a zip file in python_test;
 	# this is buggy and causes tests to fail.
 	"${FILESDIR}/${PN}-0.59.1-zipsafe.patch"
+
+	# Depends on order of dictionary keys
+	"${FILESDIR}/logilab-common-0.60.0-skip-doctest.patch"
 )
 
 python_prepare_all() {