[gentoo-commits] repo/gentoo:master commit in: dev-python/cssutils/files/, dev-python/cssutils/

[Justin Lecher]

commit:     560644c4f6e23332c8c972e746ba1f01092821b2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 14:40:01 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 14:42:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=560644c4

dev-python/cssutils: Clear broken lineendings

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=567160

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-python/cssutils/cssutils-1.0.1.ebuild          |  2 +
 .../files/cssutils-1.0.1-pypy-test-backport.patch  | 64 +++++++++++-----------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/dev-python/cssutils/cssutils-1.0.1.ebuild b/dev-python/cssutils/cssutils-1.0.1.ebuild
index c2be49f..d585a63 100644
--- a/dev-python/cssutils/cssutils-1.0.1.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.1.ebuild
@@ -35,6 +35,8 @@ python_prepare_all() {
 		-e '/tests_require/d' \
 		-i setup.py || die
 
+	EPATCH_OPTS="--binary"
+
 	distutils-r1_python_prepare_all
 }
 

diff --git a/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch b/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch
index 89c7608..f5f1bda 100644
--- a/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch
+++ b/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch
@@ -1,32 +1,32 @@
-# HG changeset patch
-# User Daniel <kingdread@×××.de>
-# Date 1448482419 -3600
-# Node ID 01a19d494b6f31e91c54ae39c5a6f43f6292a85d
-# Parent  3a01bd18118a6466ad93aa23caaa4164528b59ac
-Fix tests on PyPy 2
-
-Tests fail because of the extra "u" prefix in the error message
-
-diff --git a/src/cssutils/tests/test_profiles.py b/src/cssutils/tests/test_profiles.py
---- a/src/cssutils/tests/test_profiles.py
-+++ b/src/cssutils/tests/test_profiles.py
-@@ -2,6 +2,7 @@
- __version__ = '$Id: test_cssvalue.py 1443 2008-08-31 13:54:39Z cthedot $'
- 
- import sys
-+import platform
- import basetest
- import cssutils
- 
-@@ -124,6 +125,11 @@
-             expmsg = u"invalid literal for int(): x" 
-         elif sys.platform.startswith('java'):
-             expmsg = u"invalid literal for int() with base 10: x"
-+        # PyPy adds the u prefix, but only in versions lower than Python 3
-+        elif (platform.python_implementation() == "PyPy" and
-+              sys.version_info < (3, 0)):
-+            expmsg = u"invalid literal for int() with base 10: u'x'"
-+
-             
-         self.assertRaisesMsg(Exception, expmsg, 
-                              cssutils.profile.validate, u'-test-funcval', u'x')
+# HG changeset patch
+# User Daniel <kingdread@×××.de>
+# Date 1448482419 -3600
+# Node ID 01a19d494b6f31e91c54ae39c5a6f43f6292a85d
+# Parent  3a01bd18118a6466ad93aa23caaa4164528b59ac
+Fix tests on PyPy 2
+
+Tests fail because of the extra "u" prefix in the error message
+
+diff --git a/src/cssutils/tests/test_profiles.py b/src/cssutils/tests/test_profiles.py
+--- a/src/cssutils/tests/test_profiles.py
++++ b/src/cssutils/tests/test_profiles.py
+@@ -2,6 +2,7 @@
+ __version__ = '$Id: test_cssvalue.py 1443 2008-08-31 13:54:39Z cthedot $'
+ 
+ import sys
++import platform
+ import basetest
+ import cssutils
+ 
+@@ -124,6 +125,11 @@
+             expmsg = u"invalid literal for int(): x" 
+         elif sys.platform.startswith('java'):
+             expmsg = u"invalid literal for int() with base 10: x"
++        # PyPy adds the u prefix, but only in versions lower than Python 3
++        elif (platform.python_implementation() == "PyPy" and
++              sys.version_info < (3, 0)):
++            expmsg = u"invalid literal for int() with base 10: u'x'"
++
+             
+         self.assertRaisesMsg(Exception, expmsg, 
+                              cssutils.profile.validate, u'-test-funcval', u'x')