gentoo resync : 28.04.2019

6 files changed, 7 insertions, 173 deletions

diff --git a/app-i18n/translate-shell/Manifest b/app-i18n/translate-shell/Manifest
index c81843090d79..cc8ed4f35a30 100644
--- a/app-i18n/translate-shell/Manifest
+++ b/app-i18n/translate-shell/Manifest
@@ -1,9 +1,3 @@
-AUX translate-shell-0.9.6.6-remove-online-tests.patch 1199 BLAKE2B 3d502db0cbbf9b7174c136b7d01f040b07bb72a5a60aa40c4874a75f2e49cd15fcae5509fcec96182762c2e8b69411d0998ebc6e24e0f2567e1b165fe6eed166 SHA512 111e11c9c9756e7de709ac6e2477aa1a3e81ddcfc8227db1d6435c77c0196411ec5aef8dba584a767b4b43f94132efbf63e30bb0d3975116bcb3920350431098
-AUX translate-shell-0.9.6.7-remove-online-tests.patch 1351 BLAKE2B 61eb05917872e07bbc0121e8562ce292d8aa3405fca943815e772debfe39f5c24c53d5d7b9739d8165596558a8ab58eff07e8c69e305f564df2c85a2d4de8e3d SHA512 3910dda851bc71122e07d47df4a63f00fc44b4b2c4b851fddd7686dd93376a0e9e06b5488ded5eb655d17015d7a16da3d4d0ed4d2f0c081eb105320c561045e3
-DIST translate-shell-0.9.6.6.tar.gz 73189 BLAKE2B ad4de403f2c95a1e4de5c963cb017f5a744f08d3bb8256dcc22f28c0916f6a0e693bce171a5dc500de5353c954bab7681f1227df9e48be286ad5aa07c5d06fa4 SHA512 c5451e537f44e325ee2f59d54942f91b8e2ccc0e322c42a2c4a0e98b8a933fe0630798a45e6f587ad5aee2cbb092204710ae36779c94b8333376a8072678d868
-DIST translate-shell-0.9.6.7.tar.gz 74290 BLAKE2B 640e895b7f05c214a3f6fefab98fc85345fa155c29126bc9f14282e345f574cfa077ff7a55e5f1ed51fad3dbd50710a3831b894cabe48d16ce3d903fd63b2f47 SHA512 2648ea5adccd1ba19438bc683b41b7d3c4e1b3fcd79f9273a17ade90df6184a60d0f342f1745857ffb8d5457115bd60d0239a3e77343866a25b64529904ab416
-DIST translate-shell-0.9.6.8.tar.gz 75124 BLAKE2B d3a4768d1dd03f870fb5c31203808c5e9fa936444b9e96a973551bda0b0d858482f023457498504c3f64690c259c0119c03a2e661c71a326f74efdfe929bd042 SHA512 499a8b3f6de8283ca3f7cf1ce5c6ebdaa171ff73825edc4f24f456ee75d142f1702dd41c9f95d452b1d3cf9c730534e69c4e319e072bde9830f066695ae6711c
-EBUILD translate-shell-0.9.6.6.ebuild 753 BLAKE2B d6e963c5d674047164ee290f1e6fa9eecae232b641861c1de3c1c3b87a20587f1acfb72a5be7bba6b13d2834cf5e5d6f97994bf19f08ede63bbfe899d905fb98 SHA512 6ca520bdf93406d25e88eee30e7fd47c19bbcc4cc4fbad662ac9a42aefc8d7d4e367dae81d00b5b31d91989e9ad3e3896024e3d34c09a6574cb4f98fbc8cce96
-EBUILD translate-shell-0.9.6.7.ebuild 753 BLAKE2B d6e963c5d674047164ee290f1e6fa9eecae232b641861c1de3c1c3b87a20587f1acfb72a5be7bba6b13d2834cf5e5d6f97994bf19f08ede63bbfe899d905fb98 SHA512 6ca520bdf93406d25e88eee30e7fd47c19bbcc4cc4fbad662ac9a42aefc8d7d4e367dae81d00b5b31d91989e9ad3e3896024e3d34c09a6574cb4f98fbc8cce96
-EBUILD translate-shell-0.9.6.8.ebuild 740 BLAKE2B 48fa3b63da4c26d991857c0ed14a52c276dee5f5156c4836adf9cb2a137f28dc53b295842ac7e4e23048e72b63293aeda618dd606bf3329a67d47bb896199cf9 SHA512 861c8863d35e28952cb372130f2bacafe8427a00c1eef725e62d70424aa699b97bd77d1bf969cdf9deab455db7b9e886b70a84176bc695a7589e2b4d8b3df70e
+DIST translate-shell-0.9.6.10.tar.gz 76079 BLAKE2B 079e7d1fe039586b580fe4197e00cda2bceb2bcf3bc11eb003bec56f3b4cc19a955182bf7bf50ba6b3f9e2d28bb091b49b98ebb0dfcd06ef25ef5c9929a307cc SHA512 b78f4f982bc65f530186a6728a1976eb96c9f6a70c7bd93e99357ed7016ee4ade0e0415aeca063e513de497cc4b082f7cc247fe7278292f7c3b7dda6af744743
+EBUILD translate-shell-0.9.6.10.ebuild 725 BLAKE2B f23e4d7379458eaf5c59c922ddb4ed5e2c2101b9ea8f1768d3b773b85cf609c0dcaf90beb9a1b3642d7aa5d7332f1612c6844fcb189a48736e299bcd6ee31b47 SHA512 f3b250de92df3a3f599e909c5e600f4d27033e9d868e3cda8c83b56bb223e6cc7091423f77bb23616402afedd24694638d7a319901fc8162f4ca26d191bc6b4c
 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
deleted file mode 100644
index 2eaf607b4bc8..000000000000
--- a/app-i18n/translate-shell/files/translate-shell-0.9.6.6-remove-online-tests.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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/files/translate-shell-0.9.6.7-remove-online-tests.patch b/app-i18n/translate-shell/files/translate-shell-0.9.6.7-remove-online-tests.patch
deleted file mode 100644
index f68fec1fdae1..000000000000
--- a/app-i18n/translate-shell/files/translate-shell-0.9.6.7-remove-online-tests.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/Makefile b/Makefile
-index bb932fc..622e136 100644
---- a/Makefile
-+++ b/Makefile
-@@ -27,10 +27,6 @@ test: build
- 
- check: test
- 	$(BUILDDIR)/$(COMMAND) -V
--	[ "`$(BUILDDIR)/$(COMMAND) -no-init -D -b 忍者`" = 'Ninja' ] &&\
--	[ "`$(BUILDDIR)/$(COMMAND) -no-init -D -b -e bing 忍者`" = 'Ninja' ] &&\
--	[ "`$(BUILDDIR)/$(COMMAND) -no-init -D -b -e yandex 忍者`" = 'Ninja' ] &&\
--	[ "`$(BUILDDIR)/$(COMMAND) -no-init -D -b -e deepl Ninja`" = 'Ninja' ]
- 
- 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/translate-shell-0.9.6.8.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.10.ebuild
index ed36659409bf..0a9dd731b1f1 100644
--- a/app-i18n/translate-shell/translate-shell-0.9.6.8.ebuild
+++ b/app-i18n/translate-shell/translate-shell-0.9.6.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,14 +7,14 @@ DESCRIPTION="Online command-line translator"
 HOMEPAGE="https://www.soimort.org/translate-shell/"
 SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="public-domain"
+LICENSE="Unlicense"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+curl +bidi test tts"
+IUSE="+bidi +curl test tts"
 
 RDEPEND="
 	app-misc/rlwrap
-	>=sys-apps/gawk-4.0.2
+	=sys-apps/gawk-4*
 	curl? ( net-misc/curl[ssl] )
 	bidi? ( dev-libs/fribidi )
 	tts? ( || (
@@ -25,7 +25,7 @@ RDEPEND="
 		)
 	)"
 DEPEND="${RDEPEND}
-	test? ( app-editors/emacs )
+	test? ( virtual/emacs )
 	"
 
 src_test() {
diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.6.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.6.ebuild
deleted file mode 100644
index 6447ab3f65e0..000000000000
--- a/app-i18n/translate-shell/translate-shell-0.9.6.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Online command-line translator"
-HOMEPAGE="https://www.soimort.org/translate-shell/"
-SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+curl +bidi test tts"
-
-RDEPEND="
-	app-misc/rlwrap
-	>=sys-apps/gawk-4.0.2
-	curl? ( net-misc/curl[ssl] )
-	bidi? ( dev-libs/fribidi )
-	tts? ( || (
-		media-sound/mpg123
-		app-accessibility/espeak
-		media-video/mpv
-		media-video/mplayer
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( app-editors/emacs )
-	"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove-online-tests.patch"
-)
-
-src_install() {
-	emake PREFIX="${D}/usr" install
-}
diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.7.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.7.ebuild
deleted file mode 100644
index 6447ab3f65e0..000000000000
--- a/app-i18n/translate-shell/translate-shell-0.9.6.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Online command-line translator"
-HOMEPAGE="https://www.soimort.org/translate-shell/"
-SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+curl +bidi test tts"
-
-RDEPEND="
-	app-misc/rlwrap
-	>=sys-apps/gawk-4.0.2
-	curl? ( net-misc/curl[ssl] )
-	bidi? ( dev-libs/fribidi )
-	tts? ( || (
-		media-sound/mpg123
-		app-accessibility/espeak
-		media-video/mpv
-		media-video/mplayer
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( app-editors/emacs )
-	"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove-online-tests.patch"
-)
-
-src_install() {
-	emake PREFIX="${D}/usr" install
-}