1 |
commit: 93a93bc81d9ea209d7bdadda9454827a3d4399aa |
2 |
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com> |
3 |
AuthorDate: Wed Jul 4 17:50:09 2018 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 5 21:50:27 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a93bc8 |
7 |
|
8 |
dev-python/e4u: version bump to 0.1_rc5. |
9 |
|
10 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/9053 |
12 |
|
13 |
dev-python/e4u/Manifest | 2 +- |
14 |
dev-python/e4u/{e4u-0.1_rc4.ebuild => e4u-0.1_rc5.ebuild} | 2 +- |
15 |
dev-python/e4u/files/change-emoji4unicode-url.patch | 14 +++++++------- |
16 |
dev-python/e4u/files/initialize-e4u-tests.patch | 11 ----------- |
17 |
4 files changed, 9 insertions(+), 20 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/e4u/Manifest b/dev-python/e4u/Manifest |
20 |
index c3f34aa1414..6b9e55cf805 100644 |
21 |
--- a/dev-python/e4u/Manifest |
22 |
+++ b/dev-python/e4u/Manifest |
23 |
@@ -1 +1 @@ |
24 |
-DIST e4u-0.1rc4.tar.gz 50266 BLAKE2B 2cb878837ca34c7839e026b1f742ec23d9ee2c046406084ef10fca4c565b4661237ddf9f76620abc8db968dd5c521be4219752ff8ec4017326b57dc5de9b4ef0 SHA512 8ca0a0a160ddd1425be4f8a941d9767edac89edfaf5f5f14af840f3460ad91344186f8111711e0fb7af212d15af1f766d592e887511f820770b9f66818896a1d |
25 |
+DIST e4u-0.1rc5.tar.gz 51001 BLAKE2B 32f8b1a32d0f1b51eb97169f0375cf725571c2c7df8cab7414483c997bc7e501c19339d2fbe287718cd50afc2451bc9e9a39d2b42b242657d9a52931f89cfa0e SHA512 d19085a767275c91e807517d714955c123e2dbe3c3904240e09ba115298474067f60393ab613af3eb1af8a09964b157acfc6d69dcaccc4493b014a9bc51e3662 |
26 |
|
27 |
diff --git a/dev-python/e4u/e4u-0.1_rc4.ebuild b/dev-python/e4u/e4u-0.1_rc5.ebuild |
28 |
similarity index 88% |
29 |
rename from dev-python/e4u/e4u-0.1_rc4.ebuild |
30 |
rename to dev-python/e4u/e4u-0.1_rc5.ebuild |
31 |
index 93b757abd30..b52ae0edf6d 100644 |
32 |
--- a/dev-python/e4u/e4u-0.1_rc4.ebuild |
33 |
+++ b/dev-python/e4u/e4u-0.1_rc5.ebuild |
34 |
@@ -25,7 +25,7 @@ DEPEND="${DEPEND}" |
35 |
|
36 |
S="${WORKDIR}/${PN}-${MY_PV}" |
37 |
|
38 |
-PATCHES=( "${FILESDIR}/change-emoji4unicode-url.patch" "${FILESDIR}/initialize-e4u-tests.patch" ) |
39 |
+PATCHES=( "${FILESDIR}"/change-emoji4unicode-url.patch ) |
40 |
|
41 |
python_test() { |
42 |
esetup.py test |
43 |
|
44 |
diff --git a/dev-python/e4u/files/change-emoji4unicode-url.patch b/dev-python/e4u/files/change-emoji4unicode-url.patch |
45 |
index d356e7d68ca..ff9e54bf72a 100644 |
46 |
--- a/dev-python/e4u/files/change-emoji4unicode-url.patch |
47 |
+++ b/dev-python/e4u/files/change-emoji4unicode-url.patch |
48 |
@@ -1,11 +1,11 @@ |
49 |
---- a/e4u/__init__.py 2013-06-13 09:14:06.000000000 +0200 |
50 |
-+++ b/e4u/__init__.py 2018-05-18 15:35:49.000000000 +0200 |
51 |
+--- a/e4u/__init__.py 2018-05-22 08:32:05.000000000 +0200 |
52 |
++++ b/e4u/__init__.py 2018-07-04 19:40:53.000000000 +0200 |
53 |
@@ -11,15 +11,15 @@ |
54 |
|
55 |
_loader = None |
56 |
|
57 |
-def load(filename=None, |
58 |
-- url=r"http://emoji4unicode.googlecode.com/svn/trunk/data/emoji4unicode.xml", |
59 |
+- url=r"https://raw.githubusercontent.com/googlei18n/emoji4unicode/master/data/emoji4unicode.xml", |
60 |
+def load(filename=r"/usr/share/e4u/emoji4unicode.xml", |
61 |
+ url=None, |
62 |
loader_class=None): |
63 |
@@ -14,19 +14,19 @@ |
64 |
reload(filename, url, loader_class) |
65 |
|
66 |
-def reload(filename=None, |
67 |
-- url=r"http://emoji4unicode.googlecode.com/svn/trunk/data/emoji4unicode.xml", |
68 |
+- url=r"https://raw.githubusercontent.com/googlei18n/emoji4unicode/master/data/emoji4unicode.xml", |
69 |
+def reload(filename=r"/usr/share/e4u/emoji4unicode.xml", |
70 |
+ url=None, |
71 |
loader_class=None): |
72 |
u"""reload google's `emoji4unicode` project's xml file. must call this method first to use `e4u` library.""" |
73 |
if loader_class is None: |
74 |
---- a/e4u/loader.py 2013-06-13 09:14:06.000000000 +0200 |
75 |
-+++ b/e4u/loader.py 2018-05-18 15:36:01.000000000 +0200 |
76 |
+--- a/e4u/loader.py 2018-05-22 08:32:05.000000000 +0200 |
77 |
++++ b/e4u/loader.py 2018-07-04 19:43:05.000000000 +0200 |
78 |
@@ -32,7 +32,7 @@ |
79 |
self._translate_dictionaries = create_translate_dictionaries(self.symbols) |
80 |
|
81 |
|
82 |
-- def load(self, filename=None, url=r"http://emoji4unicode.googlecode.com/svn/trunk/data/emoji4unicode.xml"): |
83 |
+- def load(self, filename=None, url=r"https://raw.githubusercontent.com/googlei18n/emoji4unicode/master/data/emoji4unicode.xml"): |
84 |
+ def load(self, filename=r"/usr/share/e4u/emoji4unicode.xml", url=None): |
85 |
if filename: |
86 |
xml = open(filename, 'r').read() |
87 |
|
88 |
diff --git a/dev-python/e4u/files/initialize-e4u-tests.patch b/dev-python/e4u/files/initialize-e4u-tests.patch |
89 |
deleted file mode 100644 |
90 |
index 4d9a25d5de9..00000000000 |
91 |
--- a/dev-python/e4u/files/initialize-e4u-tests.patch |
92 |
+++ /dev/null |
93 |
@@ -1,11 +0,0 @@ |
94 |
---- a/test/test.py 2013-06-13 09:14:06.000000000 +0200 |
95 |
-+++ b/test/test.py 2018-05-16 13:40:22.000000000 +0200 |
96 |
-@@ -7,6 +7,8 @@ |
97 |
- import unittest |
98 |
- import e4u |
99 |
- |
100 |
-+e4u.load(filename=r"./e4u/data/emoji4unicode.xml") |
101 |
-+ |
102 |
- DISPLAY_INFO = False |
103 |
- |
104 |
- class TestCaseAbstract(object): |