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

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

6 files changed, 52 insertions, 165 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/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