gentoo resync : 07.07.2018

4 files changed, 11 insertions, 23 deletions

diff --git a/dev-python/e4u/Manifest b/dev-python/e4u/Manifest
index a618bd5ac4da..eb15a38cb792 100644
--- a/dev-python/e4u/Manifest
+++ b/dev-python/e4u/Manifest
@@ -1,5 +1,4 @@
-AUX change-emoji4unicode-url.patch 1513 BLAKE2B 352f73e293cbec9230e74fec1ae9884edf3b07ffe05968d32b619ff84160a922f358c9f2d59e40443fa43f2dc13df6e51a961c413b028123f6010228329299e6 SHA512 65cd47b7ad291229b4a68aee598ccca03ebfbfa3c417f02f38711321a4c594f4633745a758fbb2e3a4486064253f79ce45d11e5c394e14665b85afbc9732b96a
-AUX initialize-e4u-tests.patch 268 BLAKE2B 30fc61d356c763aab4c5152cbeb00ac8b925a4ac043da8d66f997969c9ea0ab6e2cd6004cc1415006e1488af0ef52f871b6351ae8115da9ac6fa4514808a2513 SHA512 d4973560dab89e59810f81e4604689e6e40043c7027ae58d0e3b54d8dcb221a1a0aa307d6cc0acef8a497c87b33e0d09938a401990f05019858b0289f1ac2198
-DIST e4u-0.1rc4.tar.gz 50266 BLAKE2B 2cb878837ca34c7839e026b1f742ec23d9ee2c046406084ef10fca4c565b4661237ddf9f76620abc8db968dd5c521be4219752ff8ec4017326b57dc5de9b4ef0 SHA512 8ca0a0a160ddd1425be4f8a941d9767edac89edfaf5f5f14af840f3460ad91344186f8111711e0fb7af212d15af1f766d592e887511f820770b9f66818896a1d
-EBUILD e4u-0.1_rc4.ebuild 862 BLAKE2B 545e5c3ea0f8765275d776b12c56215fac9b8146509724a07b58cf1bf77d29a21ec32cc8a2abd9a1ee98035d741c86a8b73740e5875b7cbec0c9f5d8005916d9 SHA512 4b577078b7f1c9db5ff143776f27232df7322e30bf678eb85ad4ca65201be7573fddad9613f5dbc342e5f03b37e3fc3d7c538fe246c6b1eda51f1b44713da70c
+AUX change-emoji4unicode-url.patch 1573 BLAKE2B 3808bf3b3529cdb3df518b5c4bf6ab035ed9bbd03fa87acc252790d23f08760eb96465169557bb751384e70b5949e7974db1fde2f06c1e40480116aa4e6019a4 SHA512 580d02f1af794aaedaa534f80b39e197d60ed964762a8f0122993c0fa6198beed73824e7b8a2714a1de900a70d757afd00b4e3980d9aebad5cab09c4ff013437
+DIST e4u-0.1rc5.tar.gz 51001 BLAKE2B 32f8b1a32d0f1b51eb97169f0375cf725571c2c7df8cab7414483c997bc7e501c19339d2fbe287718cd50afc2451bc9e9a39d2b42b242657d9a52931f89cfa0e SHA512 d19085a767275c91e807517d714955c123e2dbe3c3904240e09ba115298474067f60393ab613af3eb1af8a09964b157acfc6d69dcaccc4493b014a9bc51e3662
+EBUILD e4u-0.1_rc5.ebuild 821 BLAKE2B be86747b1bc6cc5cc6427eb756dfbe10f9c549516336a720115131f70fa5ba4a5674d2274ff6580497f1e81e72190cd1cb8a212af87e0690b06e3af2ffdf0b9e SHA512 71ad203ec4bf731caa8de07a2647396d7336d54e80ead7b1b2caaa5883a4e97001021ef42befbf5a73e7a425d7a093a6847d11e154f49b7494ec768969b982f0
 MISC metadata.xml 728 BLAKE2B df21a956ca12a239654af8886880833482950fef29e5bce8532229a218cf6ff6cf442e66e8c12dd739eedb21696f288a4e714d94d4a90f1f02bb57e20153b90a SHA512 0c98742721f00b7ce92f660aa4d5760b1e8b22436577df6aae110f5e521e2be5e019cb958c17ab22f31c7c099af4d5328f8b612325fe538131c18f90d453fdd5
diff --git a/dev-python/e4u/e4u-0.1_rc4.ebuild b/dev-python/e4u/e4u-0.1_rc5.ebuild
index 93b757abd30c..b52ae0edf6d2 100644
--- a/dev-python/e4u/e4u-0.1_rc4.ebuild
+++ b/dev-python/e4u/e4u-0.1_rc5.ebuild
@@ -25,7 +25,7 @@ DEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-PATCHES=( "${FILESDIR}/change-emoji4unicode-url.patch" "${FILESDIR}/initialize-e4u-tests.patch" )
+PATCHES=( "${FILESDIR}"/change-emoji4unicode-url.patch )
 
 python_test() {
 	esetup.py test
diff --git a/dev-python/e4u/files/change-emoji4unicode-url.patch b/dev-python/e4u/files/change-emoji4unicode-url.patch
index d356e7d68cae..ff9e54bf72a0 100644
--- a/dev-python/e4u/files/change-emoji4unicode-url.patch
+++ b/dev-python/e4u/files/change-emoji4unicode-url.patch
@@ -1,11 +1,11 @@
---- a/e4u/__init__.py	2013-06-13 09:14:06.000000000 +0200
-+++ b/e4u/__init__.py	2018-05-18 15:35:49.000000000 +0200
+--- a/e4u/__init__.py	2018-05-22 08:32:05.000000000 +0200
++++ b/e4u/__init__.py	2018-07-04 19:40:53.000000000 +0200
 @@ -11,15 +11,15 @@
  
  _loader = None
  
 -def load(filename=None,
--        url=r"http://emoji4unicode.googlecode.com/svn/trunk/data/emoji4unicode.xml",
+-        url=r"https://raw.githubusercontent.com/googlei18n/emoji4unicode/master/data/emoji4unicode.xml",
 +def load(filename=r"/usr/share/e4u/emoji4unicode.xml",
 +        url=None,
          loader_class=None):
@@ -14,19 +14,19 @@
          reload(filename, url, loader_class)
          
 -def reload(filename=None,
--        url=r"http://emoji4unicode.googlecode.com/svn/trunk/data/emoji4unicode.xml",
+-        url=r"https://raw.githubusercontent.com/googlei18n/emoji4unicode/master/data/emoji4unicode.xml",
 +def reload(filename=r"/usr/share/e4u/emoji4unicode.xml",
 +        url=None,
          loader_class=None):
      u"""reload google's `emoji4unicode` project's xml file. must call this method first to use `e4u` library."""
      if loader_class is None:
---- a/e4u/loader.py	2013-06-13 09:14:06.000000000 +0200
-+++ b/e4u/loader.py	2018-05-18 15:36:01.000000000 +0200
+--- a/e4u/loader.py	2018-05-22 08:32:05.000000000 +0200
++++ b/e4u/loader.py	2018-07-04 19:43:05.000000000 +0200
 @@ -32,7 +32,7 @@
          self._translate_dictionaries = create_translate_dictionaries(self.symbols)
          
          
--    def load(self, filename=None, url=r"http://emoji4unicode.googlecode.com/svn/trunk/data/emoji4unicode.xml"):
+-    def load(self, filename=None, url=r"https://raw.githubusercontent.com/googlei18n/emoji4unicode/master/data/emoji4unicode.xml"):
 +    def load(self, filename=r"/usr/share/e4u/emoji4unicode.xml", url=None):
          if filename:
              xml = open(filename, 'r').read()
diff --git a/dev-python/e4u/files/initialize-e4u-tests.patch b/dev-python/e4u/files/initialize-e4u-tests.patch
deleted file mode 100644
index 4d9a25d5de99..000000000000
--- a/dev-python/e4u/files/initialize-e4u-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/test/test.py	2013-06-13 09:14:06.000000000 +0200
-+++ b/test/test.py	2018-05-16 13:40:22.000000000 +0200
-@@ -7,6 +7,8 @@
- import unittest
- import e4u
- 
-+e4u.load(filename=r"./e4u/data/emoji4unicode.xml")
-+
- DISPLAY_INFO = False
- 
- class TestCaseAbstract(object):