gentoo resync : 15.02.2018

4 files changed, 57 insertions, 6 deletions

diff --git a/app-i18n/translate-shell/Manifest b/app-i18n/translate-shell/Manifest
index 85bc9f4e1e40..6dcd9dbf3de3 100644
--- a/app-i18n/translate-shell/Manifest
+++ b/app-i18n/translate-shell/Manifest
@@ -1,3 +1,4 @@
-DIST translate-shell-0.9.6.2.tar.gz 69544 BLAKE2B b49a2c6d7101f5063c8c548c2dcd26ed8b5a310d5e723293b8082bb1bdffbb926fb6f0050953825c9fc4567880cfbf1e9956236db3c28b176db851983c743d0d SHA512 a7bd3fba43485a22c2fdd4261c24579b03aeafefa40863c3b8eb1c814a167b9a6f5700086c1cd411063c66c169875b96d2634ed04f45beb6d53b4725eb7fbea9
-EBUILD translate-shell-0.9.6.2.ebuild 694 BLAKE2B edd23e727aa577a1d8a024918661945fb6c9cf4274401f47c15a584736416d33fd5ac277059300cfcdd9be1968b2991415ff7937e2a74a63ff8bc54e2482dc6b SHA512 9246fb2636169db79a4c4f14ef002b14e398985db146a5f0fddc34b97b9808b2ed20e114c305e42fe511435d36224417ee3b5fb2d7d26fecf23ed0304f92ff08
-MISC metadata.xml 726 BLAKE2B 3a8c78ace5e508be4b1e14119594b17e88bebe36e6ac74e631437193a6c5506cacfa3951e768c431c11e1f96ba9f8ac37e09cfc2df8625c648d190c7dc4fae29 SHA512 34f7283a7cfa16e87f3a97d0480e3b8469506d096f565ca121a7dea0249b1f2c34e101ae45561540a81f7a63b1caecd995a21e57a42313ab30574474bcc013f4
+AUX translate-shell-0.9.6.6-remove-online-tests.patch 1199 BLAKE2B 3d502db0cbbf9b7174c136b7d01f040b07bb72a5a60aa40c4874a75f2e49cd15fcae5509fcec96182762c2e8b69411d0998ebc6e24e0f2567e1b165fe6eed166 SHA512 111e11c9c9756e7de709ac6e2477aa1a3e81ddcfc8227db1d6435c77c0196411ec5aef8dba584a767b4b43f94132efbf63e30bb0d3975116bcb3920350431098
+DIST translate-shell-0.9.6.6.tar.gz 73189 BLAKE2B ad4de403f2c95a1e4de5c963cb017f5a744f08d3bb8256dcc22f28c0916f6a0e693bce171a5dc500de5353c954bab7681f1227df9e48be286ad5aa07c5d06fa4 SHA512 c5451e537f44e325ee2f59d54942f91b8e2ccc0e322c42a2c4a0e98b8a933fe0630798a45e6f587ad5aee2cbb092204710ae36779c94b8333376a8072678d868
+EBUILD translate-shell-0.9.6.6.ebuild 753 BLAKE2B d6e963c5d674047164ee290f1e6fa9eecae232b641861c1de3c1c3b87a20587f1acfb72a5be7bba6b13d2834cf5e5d6f97994bf19f08ede63bbfe899d905fb98 SHA512 6ca520bdf93406d25e88eee30e7fd47c19bbcc4cc4fbad662ac9a42aefc8d7d4e367dae81d00b5b31d91989e9ad3e3896024e3d34c09a6574cb4f98fbc8cce96
+MISC metadata.xml 856 BLAKE2B 0bfbb3ab59d613c16732c000d7b66f618b05be517ea8976fc187deea834b214f9dc405b1140fa51d98940935beadd3a3c94d35274fc75444360491f5be99662a SHA512 3c5b5a99f2ca8d41ea076b0190ea06a23e7334282a55c5664dd417e34c92cc5df7d03f33bd1d9b1708a1632de66c4d02587c6fe3e6761a70be75783e447c3d00
diff --git a/app-i18n/translate-shell/files/translate-shell-0.9.6.6-remove-online-tests.patch b/app-i18n/translate-shell/files/translate-shell-0.9.6.6-remove-online-tests.patch
new file mode 100644
index 000000000000..2eaf607b4bc8
--- /dev/null
+++ b/app-i18n/translate-shell/files/translate-shell-0.9.6.6-remove-online-tests.patch
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index acc96e0..622e136 100644
+--- a/Makefile
++++ b/Makefile
+@@ -27,8 +27,6 @@ test: build
+ 
+ check: test
+ 	$(BUILDDIR)/$(COMMAND) -V
+-	[ "`$(BUILDDIR)/$(COMMAND) -no-init -D -b 忍者`" = 'Ninja' ] &&\
+-	[ "`$(BUILDDIR)/$(COMMAND) -no-init -D -b 'hello world'`" = 'hello world' ]
+ 
+ install: build
+ 	@mkdir -p $(DESTDIR)$(PREFIX)/bin &&\
+diff --git a/test/TestUtils.awk b/test/TestUtils.awk
+index 08bb2e9..3465327 100644
+--- a/test/TestUtils.awk
++++ b/test/TestUtils.awk
+@@ -30,24 +30,6 @@ BEGIN {
+         assertTrue(newerVersion("2", "1.9.9999"))
+     }
+ 
+-    T("curl()", 1)
+-    {
+-        delete tokens; delete ast
+-        tokenize(tokens, curl("https://httpbin.org/get"))
+-        parseJson(ast, tokens)
+-        assertEqual(unparameterize(ast[0 SUBSEP "url"]),
+-                    "https://httpbin.org/get")
+-    }
+-
+-    T("curlPost()", 1)
+-    {
+-        delete tokens; delete ast
+-        tokenize(tokens, curlPost("https://httpbin.org/post", "fizz=buzz"))
+-        parseJson(ast, tokens)
+-        assertEqual(unparameterize(ast[0 SUBSEP "url"]),
+-                    "https://httpbin.org/post")
+-    }
+-
+     T("dump()", 3)
+     {
+         delete group
diff --git a/app-i18n/translate-shell/metadata.xml b/app-i18n/translate-shell/metadata.xml
index 83da660a81a6..bea3adaede38 100644
--- a/app-i18n/translate-shell/metadata.xml
+++ b/app-i18n/translate-shell/metadata.xml
@@ -9,10 +9,14 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Translate Shell (formerly Google Translate CLI) is a command-line
 		translator powered by Google Translate (default), Bing Translator, and
-		Yandex.Translate.  
+		Yandex.Translate.
 	</longdescription>
 	<use>
 		<flag name="tts">Enable text-to-speech support</flag>
diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.2.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.6.ebuild
index bf6def292ff8..6447ab3f65e0 100644
--- a/app-i18n/translate-shell/translate-shell-0.9.6.2.ebuild
+++ b/app-i18n/translate-shell/translate-shell-0.9.6.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Online command-line translator"
 HOMEPAGE="https://www.soimort.org/translate-shell/"
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
 	test? ( app-editors/emacs )
 	"
 
+PATCHES=(
+	"${FILESDIR}/${P}-remove-online-tests.patch"
+)
+
 src_install() {
 	emake PREFIX="${D}/usr" install
 }