bump; add patch for tests to import six from the system, rm disused patches and old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

7 files changed, 59 insertions, 175 deletions

diff --git a/dev-python/imapclient/ChangeLog b/dev-python/imapclient/ChangeLog
index d78b2b534f57..3d7b6eb2dbce 100644
--- a/dev-python/imapclient/ChangeLog
+++ b/dev-python/imapclient/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/imapclient
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imapclient/ChangeLog,v 1.4 2014/12/12 11:52:02 idella4 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imapclient/ChangeLog,v 1.5 2015/01/17 01:36:17 idella4 Exp $
+
+*imapclient-0.12 (17 Jan 2015)
+
+  17 Jan 2015; Ian Delaney <idella4@gentoo.org> +files/0.12-tests.patch,
+  +imapclient-0.12.ebuild, -files/imapclient-0.10.2-system-six.patch,
+  -files/imapclient-0.11-system-six.patch, -imapclient-0.10.2.ebuild,
+  -imapclient-0.11.ebuild:
+  bump; add patch for tests to import six from the system, rm disused patches
+  and old
 
   12 Dec 2014; Ian Delaney <idella4@gentoo.org> imapclient-0.11.ebuild:
   drop py3.2 add py3.4, tidy deps fix test phase, fixes Bug #530524 by pacho2
diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index 6904c0bcb800..7fe078f2a2c6 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX imapclient-0.10.2-system-six.patch 2413 SHA256 5028cd2fedfa214cec616a4af6b06ad986920a967633a9619d067de47de237c5 SHA512 26fc1ab642aa0fc82d78e7e435b58507f2d4fd69edf6119a3b2a54c4e6de61cceecc340791f6469391842edba65acf2bf4dcb25b75314074ee06d52227fcee1e WHIRLPOOL a1b10c87bb5e6760e78a0d46db7b9386c6eb093bb1d567f27d117dc6f203fecfe8e369885f452997c3973781d89d3fccc119a43eb5b9c5dfad79c032adee8f5e
-AUX imapclient-0.11-system-six.patch 762 SHA256 a5dbff30120982fcb9c8f278b36fb328c03088099290be669ef0d0515a2b75b2 SHA512 d6d4ee27b936bfc8680bc3db48c1abd2aea4ab3c5f38fa276ea6808c0db07cdf5f01ccac560180363c4b01c6cffb5bc470a255d1966c7ff7eafc6a19bbf0a507 WHIRLPOOL 6790d8b4f970c88ff54172dbddc7921644611efb06baf97a462017bb6596f36a9d299d84a515db56e4b6248a827436b7980e7e57637b4bcf345ddc3a6fdc2382
-DIST IMAPClient-0.10.2.tar.gz 79185 SHA256 c60d7f59feaf00db1474960310592be5fd19f0f0b76e9a1add5099886e3b4e8e SHA512 0d78769bd7614dccf03326f3f8f3716b23c2d09973a1b3857f89bf0945987aae6d32d7f4e597de64f27caa4263c6cc406b07a65784b3465562b9343f4847c26d WHIRLPOOL c4c02f8bcaaa2bca0fe3e324ee5fcba0a9cb88e6d7eba93a85339b749b2fdb9fd373864bdf2f82469e770ac47af9224d585e76c1dcb0c0c2d5cd6d4fbdbf22c2
-DIST IMAPClient-0.11.tar.gz 93209 SHA256 7631b6f7afd75c50df09734e277553d1eb3d8febe6feafde330e17f11f82a4f0 SHA512 1a7a5711abb5772e70bfb8f943b7b3d30ead6818993a975ba2f5f05cfc5bad175c58c4882798fb2809d3f929f9df376704355b2ed95c5c119dd86929b8c27562 WHIRLPOOL bcab1a2516374693609e33e8c7460599cf3b6808470f07a703841ee76905642ce418c6c3a099ec5150001ba289092b246f25d817303356546c4edde1e97b5f32
-EBUILD imapclient-0.10.2.ebuild 1519 SHA256 993feb245647933bdf7d975c4fb2b15a1ac3fc2f08aa2e9c261511f75f88b91f SHA512 4525d9ab0ec8f56f1ea6104187844ce6d46a7fef73bffb29b0fef423ac3f19d2c5ac2903159f3e24a1e9345481a0956aa855120d8cc32198c566adfb33cb86e0 WHIRLPOOL 3797774173f72332237a6ccf7bd894393a9faaa1bafaf27a980eb50d1dee2684ce0e32deed98eb6f9f51c7f873feee08193c3e18c7e0ca3d92ca9a0ca9e77393
-EBUILD imapclient-0.11.ebuild 1837 SHA256 98cb1541cf7ef6b641add2f755d7fc23fcb144545235d2b8261fba68c57e7e72 SHA512 dd95bbe0e3e96e90d2f6e58aa00813f9fd03e44626cbc7a968b885aedfa8383d1474a9e6febf7aa552e7207f455178e1614e88e1f8c578e2608404fc99303213 WHIRLPOOL 1a6224523634f4f18f0adb64b3e96608b2963c394b52abd92ee1a6e49a65e73818de1a2a208f8ed969f60c0545ae95a1ced6d92ccbfe8d5c31a06adca2d9f10c
-MISC ChangeLog 871 SHA256 7ef800e17384ff2d5b00ef269eb2f7467097ce4de0ccdc9cf506dfe903f118f7 SHA512 78e60757997868ceebe9a23ffdb8bd5ef7ca247b4def4b2b5c5e4cbaf7e5a35de3d8fdc3d676d17c99e8162743b8068e7944e2d0928ea59de65605dbff6c3d8c WHIRLPOOL 54dc19501d598f06467281649941756b35ae2d66dceac575556099cb7aea59ebbaf2cec1c760621377dbd9fc89ad19f00ea8f0deb7de17c00e4cef782ffd2862
+AUX 0.12-tests.patch 1596 SHA256 91c2baa7ea8dbf9e3557080c2cc288a8594b0a704e4586dfe219ca98542b7e47 SHA512 87cd44146f273bf4d77df34eeb4f921eaaa36bfed951769b7c7b8b729b21ca078f8e7a907d98529f917c88754c48b5cc08acb53ac7786dd6b205b567a50d2c0d WHIRLPOOL 5e6bff85ff08ee76a843034221dcda8668a655be7b6ce88ae87ed8fab82bad46f5f153339fd0faca423bad3e364069d1b0ab983792e6d91b35a76a0855fab53c
+DIST IMAPClient-0.12.tar.gz 100698 SHA256 037ff008f1454287c1ed8684e1cf40b2ced382a875c5157dce380562f3566e15 SHA512 bd7d3e3911ff5ef1cc4a66f20e261955851562e76228f941d35f16a4680678be6a3741d520cc3133925a2dba9e8b6b5b988d7a740ff8abb63c14db1cf962acda WHIRLPOOL 134bf4db98806dbaf98bd780b92b8be2a2dbbcfec1ae83320f52a83bf0952f139bebd99d686d212830d25c08886217062577576a76205af54085628b03d7dbeb
+EBUILD imapclient-0.12.ebuild 1832 SHA256 71a29219fe9589cd612de3301d60ddcbdeafe7eaa63f9d049b7ea8d055f7afc5 SHA512 65a38694278df2364acbafad81de9645357191460200817947a87fb385f51074d7617cae650caa7b37afdda858b710ca93c825089a1f18c5701406de20d74613 WHIRLPOOL b3ceed1fc58f3ba1cd11dddf516f27dedb4d3a0e4f835766e007491e901b3d78de04c6c01c2418c0303f853c9d4125c6896bd1b6efbe47a9f5deaa18ec5f6679
+MISC ChangeLog 1232 SHA256 eb68603d7e7212b0e91c0e39f90b78e73fa8bf007c2ac9c19d65515423ed2fff SHA512 99d981aa93dee8056cbc485548c960c81b97b9a9a6d4e90eca98c32677f51c798be34e69f3c9f4583909ad31eebd4ff188396c6af4a2717635c004268c781236 WHIRLPOOL 694c31757202efb3c24e6eedf34e159852ce70d4aa44758858f590e7e49a2f03d8160a6ca0226ef7c51db1578f63c413611d4ad7ebd63a5720ef98fb888d81a8
 MISC metadata.xml 233 SHA256 b2408371331f97e13fbdf0df83c5af632f93997f85c3715ed6247c2fe86da981 SHA512 539bba1bae79e03add1fdecd1ff0914f6b4d79e20a9fb76557019b3489733c5d408dc07084ae40f3d76972a1479905e7c96a526243556cba0da9530fa148c13d WHIRLPOOL 924b3bc4880b04e717ade016d4808484d7215fe6cbfca1d2bbe8316ce6c0819bc061c61d82cf24a220f05351d2ab23df5dac928361c5f309064e082be8c1bc9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSK1vIACgkQso7CE7gHKw3qkQCfTkDfXDlqglRPQcy8H8YKbESh
-2+sAoNnJRFATHSKQZkpPUwHf8EQM8CR/
-=soa5
+iEYEAREIAAYFAlS5vKIACgkQso7CE7gHKw2RUgCggY4nc+1241r7RwUMr0uEIlOD
+xF4An3pqBY7p7erIfckue10eVv4dkmvK
+=Oupp
 -----END PGP SIGNATURE-----
diff --git a/dev-python/imapclient/files/0.12-tests.patch b/dev-python/imapclient/files/0.12-tests.patch
new file mode 100644
index 000000000000..0bd0d001e6e1
--- /dev/null
+++ b/dev-python/imapclient/files/0.12-tests.patch
@@ -0,0 +1,36 @@
+diff -ur IMAPClient-0.12.orig/imapclient/test/test_imapclient.py IMAPClient-0.12/imapclient/test/test_imapclient.py
+--- imapclient/test/test_imapclient.py	2015-01-12 19:36:18.000000000 +0800
++++ imapclient/test/test_imapclient.py	2015-01-17 08:42:46.669121934 +0800
+@@ -10,7 +10,7 @@
+ from datetime import datetime
+ from mock import patch, sentinel, Mock
+ 
+-from imapclient import six
++import six
+ from imapclient.fixed_offset import FixedOffset
+ from .testable_imapclient import TestableIMAPClient as IMAPClient
+ from .imapclient_test import IMAPClientTest
+diff -ur IMAPClient-0.12.orig/imapclient/test/test_imap_utf7.py IMAPClient-0.12/imapclient/test/test_imap_utf7.py
+--- imapclient/test/test_imap_utf7.py	2015-01-12 19:36:18.000000000 +0800
++++ imapclient/test/test_imap_utf7.py	2015-01-17 08:43:23.893392410 +0800
+@@ -4,7 +4,7 @@
+ 
+ from __future__ import unicode_literals
+ 
+-from imapclient.six import text_type, binary_type, int2byte, unichr
++from six import text_type, binary_type, int2byte, unichr
+ from imapclient.imap_utf7 import decode, encode
+ from imapclient.test.util import unittest
+ 
+diff -ur IMAPClient-0.12.orig/imapclient/test/test_response_lexer.py IMAPClient-0.12/imapclient/test/test_response_lexer.py
+--- imapclient/test/test_response_lexer.py	2015-01-12 19:36:18.000000000 +0800
++++ imapclient/test/test_response_lexer.py	2015-01-17 08:42:14.749747748 +0800
+@@ -5,7 +5,7 @@
+ from __future__ import unicode_literals
+ 
+ from imapclient.response_lexer import TokenSource
+-from imapclient.six import next
++from six import next
+ from imapclient.test.util import unittest
+ 
+ 
diff --git a/dev-python/imapclient/files/imapclient-0.10.2-system-six.patch b/dev-python/imapclient/files/imapclient-0.10.2-system-six.patch
deleted file mode 100644
index 560fb875ef3c..000000000000
--- a/dev-python/imapclient/files/imapclient-0.10.2-system-six.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- IMAPClient-0.10.2/imapclient/imapclient.py
-+++ IMAPClient-0.10.2/imapclient/imapclient.py
-@@ -22,7 +22,7 @@
- 
- from .imap_utf7 import encode as encode_utf7, decode as decode_utf7
- from .fixed_offset import FixedOffset
--from .six import moves, iteritems, text_type, integer_types, PY3, binary_type
-+from six import moves, iteritems, text_type, integer_types, PY3, binary_type
- xrange = moves.xrange
- 
- if PY3:
---- IMAPClient-0.10.2/imapclient/imap_utf7.py
-+++ IMAPClient-0.10.2/imapclient/imap_utf7.py
-@@ -24,7 +24,7 @@
- 
- from __future__ import unicode_literals
- 
--from .six import text_type, binary_type, iteritems
-+from six import text_type, binary_type, iteritems
- 
- PRINTABLE = set(range(0x20, 0x26)) | set(range(0x27, 0x7f))
- 
---- IMAPClient-0.10.2/imapclient/livetest.py
-+++ IMAPClient-0.10.2/imapclient/livetest.py
-@@ -14,7 +14,7 @@
- from email.utils import make_msgid
- 
- from .imapclient import IMAPClient, DELETED, to_unicode
--from .six import binary_type, text_type, PY3
-+from six import binary_type, text_type, PY3
- from .test.util import unittest
- from .config import parse_config_file, create_client_from_config
- 
---- IMAPClient-0.10.2/imapclient/response_lexer.py
-+++ IMAPClient-0.10.2/imapclient/response_lexer.py
-@@ -16,7 +16,7 @@
- 
- from __future__ import unicode_literals
- 
--from . import six
-+import six
- 
- __all__ = ["Lexer"]
- 
---- IMAPClient-0.10.2/imapclient/response_parser.py
-+++ IMAPClient-0.10.2/imapclient/response_parser.py
-@@ -17,7 +17,7 @@
- from collections import defaultdict
- from datetime import datetime
- 
--from . import six
-+import six
- xrange = six.moves.xrange
- 
- from .fixed_offset import FixedOffset
---- IMAPClient-0.10.2/imapclient/test/test_imapclient.py
-+++ IMAPClient-0.10.2/imapclient/test/test_imapclient.py
-@@ -10,7 +10,7 @@
- from datetime import datetime
- from mock import patch, sentinel, Mock
- 
--from imapclient import six
-+import six
- from imapclient.fixed_offset import FixedOffset
- from imapclient.imapclient import datetime_to_imap
- from imapclient.test.testable_imapclient import TestableIMAPClient as IMAPClient
---- IMAPClient-0.10.2/imapclient/test/test_imap_utf7.py
-+++ IMAPClient-0.10.2/imapclient/test/test_imap_utf7.py
-@@ -4,7 +4,7 @@
- 
- from __future__ import unicode_literals
- 
--from imapclient.six import text_type, PY3
-+from six import text_type, PY3
- from imapclient.imap_utf7 import decode, encode
- from imapclient.test.util import unittest
- 
diff --git a/dev-python/imapclient/files/imapclient-0.11-system-six.patch b/dev-python/imapclient/files/imapclient-0.11-system-six.patch
deleted file mode 100644
index 928a04e9d4ad..000000000000
--- a/dev-python/imapclient/files/imapclient-0.11-system-six.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- IMAPClient-0.11/imapclient/test/test_imapclient.py
-+++ IMAPClient-0.11/imapclient/test/test_imapclient.py
-@@ -10,7 +10,7 @@
- from datetime import datetime
- from mock import patch, sentinel, Mock
- 
--from imapclient import six
-+import six
- from imapclient.fixed_offset import FixedOffset
- from imapclient.imapclient import datetime_to_imap
- from imapclient.test.testable_imapclient import TestableIMAPClient as IMAPClient
---- IMAPClient-0.11/imapclient/test/test_imap_utf7.py
-+++ IMAPClient-0.11/imapclient/test/test_imap_utf7.py
-@@ -4,7 +4,7 @@
- 
- from __future__ import unicode_literals
- 
--from imapclient.six import text_type, PY3
-+from six import text_type, PY3
- from imapclient.imap_utf7 import decode, encode
- from imapclient.test.util import unittest
- 
diff --git a/dev-python/imapclient/imapclient-0.10.2.ebuild b/dev-python/imapclient/imapclient-0.10.2.ebuild
deleted file mode 100644
index 458a382e0da2..000000000000
--- a/dev-python/imapclient/imapclient-0.10.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imapclient/imapclient-0.10.2.ebuild,v 1.2 2014/03/31 21:15:12 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-MY_PN="IMAPClient"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library"
-HOMEPAGE="http://imapclient.freshfoo.com/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	# use system setuptools
-	sed -i '/use_setuptools/d' setup.py || die
-
-	# drop explicit mock version test dep
-	sed -i "/tests_require/s:'mock==.\+':'mock':" setup.py || die
-
-	# use system six library
-	rm imapclient/six.py || die
-	epatch "${FILESDIR}"/${P}-system-six.patch
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# don't install examples and tests in module dir
-	rm -r "${ED}"$(python_get_sitedir)/imapclient/{examples,test} || die
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS HACKING.rst NEWS.rst README.rst THANKS )
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-	use examples && dodoc -r ${PN}/examples
-}
diff --git a/dev-python/imapclient/imapclient-0.11.ebuild b/dev-python/imapclient/imapclient-0.12.ebuild
index b4f8470cf627..ab3ee33cbb18 100644
--- a/dev-python/imapclient/imapclient-0.11.ebuild
+++ b/dev-python/imapclient/imapclient-0.12.ebuild
@@ -1,6 +1,6 @@
-# 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/imapclient/imapclient-0.11.ebuild,v 1.2 2014/12/12 11:52:02 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imapclient/imapclient-0.12.ebuild,v 1.1 2015/01/17 01:36:17 idella4 Exp $
 
 EAPI=5
 
@@ -37,7 +37,7 @@ python_prepare_all() {
 	# use system six library. patch proven less preferable to use of sed (< maintenance)
 	# but a copy of the working hunks from prior version works fine for now.
 	rm imapclient/six.py || die
-	epatch "${FILESDIR}"/${P}-system-six.patch
+	epatch "${FILESDIR}"/0.12-tests.patch
 	sed -e 's:from .six:from six:g' \
 		-e 's:from . import six:import six:g' \
 		-i ${PN}/*.py || die
@@ -52,11 +52,11 @@ python_test() {
 python_install() {
 	distutils-r1_python_install
 	# don't install examples and tests in module dir
-	rm -r "${ED}"$(python_get_sitedir)/imapclient/{examples,test} || die
+	rm -r "${D}"$(python_get_sitedir)/imapclient/{examples,test} || die
 }
 
 python_install_all() {
-	local DOCS=( AUTHORS HACKING.rst NEWS.rst README.rst THANKS )
+#	local DOCS=( AUTHORS HACKING.rst NEWS.rst README.rst THANKS )
 	use doc && local HTML_DOCS=( doc/html/. )
 	distutils-r1_python_install_all
 	use examples && dodoc -r ${PN}/examples