gentoo resync : 08.01.2018

8 files changed, 17 insertions, 142 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a6b49f1ad826..6e7fd6324164 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest
index 1972a5b5a40b..c164fe088e98 100644
--- a/net-misc/electron-cash/Manifest
+++ b/net-misc/electron-cash/Manifest
@@ -1,4 +1,4 @@
 AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
 DIST electron-cash-3.0.tar.gz 1623371 BLAKE2B 3311ce41dd40de82ce9f96763fd527505eabda0c9ac10e5076c5dbc3ed73c4f1f299a62e39b5fd696468408bd3764c7dceca36b006d18394d72f61e14f6417b5 SHA512 b136d9099e8cc3b248a4cb525c6aeb4a38a57809a66dc8e897bee34fde071b5a14bbe6283ad3bf50087be8544508e078824c249ead0e1914ef7622688fef7e5e
-EBUILD electron-cash-3.0.ebuild 3740 BLAKE2B 4ffde096adae578bdb5dd29bfdae04e5f83dbc52b9278967f4c6c8d60d8dc5680e5c85b723759a365a5d40172c0921f8aae6522d1ab3442c5f2a3a160bb4fd26 SHA512 978b84fe0010aecc1015a16ff621251921af4e5522718b3aedf450855949f53cb52d77f75864fdbdede105a36efb61ff6b395ccace68854adcfc7155af7820f8
+EBUILD electron-cash-3.0.ebuild 3626 BLAKE2B 8345a2396e463cea184ec112def708a5248d1a0208147eb8660d034cf2a98ca2c5cc3cb2dcab5c3b229c6ef80ba5942a431fdce9d55f8ff3831c34dfe56b9b63 SHA512 0e56313003225e8894b793602dd179806c2b04ba99ffb0688e3234d035ce0741aaebd3edf3858999f7fa3d943decc8687329777c97984b1d52dcbb202c1a614f
 MISC metadata.xml 976 BLAKE2B 991083b0233c11e6e5bbb3d7d560b20587332344fca7d3fad40cde8bc4bce1f3455172b7131451e034d0ab9722913667eb9739fe1bbd214354bf7cde974cecf6 SHA512 38383f6b7809ee97e33a777b5eab2593b22ce99d78442c40e9ff4654f350b6ad17da0c2e309b43fed517e2b384ab5f806a5ef60a71f887d72a4dcf06c9bbdede
diff --git a/net-misc/electron-cash/electron-cash-3.0.ebuild b/net-misc/electron-cash/electron-cash-3.0.ebuild
index 742fcd67f942..f8603f1296ca 100644
--- a/net-misc/electron-cash/electron-cash-3.0.ebuild
+++ b/net-misc/electron-cash/electron-cash-3.0.ebuild
@@ -16,13 +16,8 @@ SRC_URI="https://github.com/fyookball/electrum/archive/${PV}.tar.gz -> ${P}.tar.
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LINGUAS="es_ES ja_JP pt_BR pt_PT zh_CN"
-
-IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
+IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
+	l10n_es l10n_ja l10n_pt l10n_zh-CN"
 
 REQUIRED_USE="
 	|| ( cli ncurses qt5 )
@@ -76,10 +71,10 @@ src_prepare() {
 
 	local wordlist=
 	for wordlist in  \
-		$(usex linguas_ja_JP '' japanese) \
-		$(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
-		$(usex linguas_es_ES '' spanish) \
-		$(usex linguas_zh_CN '' chinese_simplified) \
+		$(usex l10n_ja '' japanese) \
+		$(usex l10n_pt '' portuguese) \
+		$(usex l10n_es '' spanish) \
+		$(usex l10n_zh-CN '' chinese_simplified) \
 	; do
 		rm -f "lib/wordlist/${wordlist}.txt" || die
 		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
diff --git a/net-misc/electrum-ltc/Manifest b/net-misc/electrum-ltc/Manifest
index a61b5552f569..dc0facdee014 100644
--- a/net-misc/electrum-ltc/Manifest
+++ b/net-misc/electrum-ltc/Manifest
@@ -1,5 +1,5 @@
 AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
 DIST electrum-ltc-3.0_pre20171218-electrum-3.0.3.patch 6870 BLAKE2B cbeb180f17ad15bd6ee90dc90cd8d3a96df6ccade903ac287e5438e61c3443b64720dcdcd87bd5d2b4fb7ddf0c2625d26ffd23521aa94e3c7c662ac7582210f5 SHA512 841e337758c4c5ab98153a008204b0fa4cb32ab22e494657b61a1da487a6bdb413b1982be854a91e3175dd4d03a50877208809e9a82f93500ffb33222fcbd0fb
 DIST electrum-ltc-3.0_pre20171218.tar.gz 2385686 BLAKE2B 3b96f1cee9f052a0c4518c0c03308badc1000b4bf19c0d2a82725dd37ed33f82e12d57802fd9533f9f69f99fb97b81f6c2baa2b59fd0890bc4db22f7d00c108c SHA512 374d8bfbde9acda0d7f5922dd63cc7e59e9ccd714c8feadd7931e39af69ae473e3220fb6b8591d1dafbefbfe24c87b1de94a1e5ae716b219dc81d44e09a81e44
-EBUILD electrum-ltc-3.0_pre20171218.ebuild 4083 BLAKE2B dceb7c6a166268604f272da947ce01f5fb2ea75bf188329edf24ad338441809c9a06da63753ac154d3164c3fece9db109a4c30d1f583d548e895590e3635e6d7 SHA512 c2ce5829b1597fa01b2a167490f08466ef92e90be67b78321a7c4ca2c98078773a018d69d26926755029f85cb09da8e01f997271ebfefd2a5ed494f7b8819199
+EBUILD electrum-ltc-3.0_pre20171218.ebuild 3969 BLAKE2B 4c8711f8c3f1d10686384626988beb82cb4dbbbf00f1fd874c0f598684ce222d278ee08bc48cbcfb0ce4081399f5b76fe615b23aae2eb2b0be2e8ef700926ef9 SHA512 82dfdf380391f1efbdc7b4196546fe49d09b7af751077543a206142c9aa6474b9d5f61d4d976dbe72796a30b0f30c1858788a15633021c0f6504a9e11e179e89
 MISC metadata.xml 893 BLAKE2B 285448da111f6431d8fb440fcf040ee2e22a5fb1fdc8b4b93c75ea2165f6d53a7a7b746add11300c06bc43a3243e423ea57aaa4186dc0dbb91ff8d734216c6c5 SHA512 7881df99b246a3f323270790c2d3c789aa402810418662ef35590d03ea5d82f3877ab465b66e2fe52c4be268ea5965735f5de513ea8d41f260a63a40f3dd3dd9
diff --git a/net-misc/electrum-ltc/electrum-ltc-3.0_pre20171218.ebuild b/net-misc/electrum-ltc/electrum-ltc-3.0_pre20171218.ebuild
index 9fe4e95536d4..3158071e0931 100644
--- a/net-misc/electrum-ltc/electrum-ltc-3.0_pre20171218.ebuild
+++ b/net-misc/electrum-ltc/electrum-ltc-3.0_pre20171218.ebuild
@@ -17,13 +17,8 @@ SRC_URI="https://github.com/pooler/electrum-ltc/archive/${EGIT_COMMIT}.tar.gz ->
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LINGUAS="es_ES ja_JP pt_BR pt_PT zh_CN"
-
-IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
+IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
+	l10n_es l10n_ja l10n_pt l10n_zh-CN"
 
 REQUIRED_USE="
 	|| ( cli ncurses qt5 )
@@ -80,10 +75,10 @@ src_prepare() {
 
 	local wordlist=
 	for wordlist in  \
-		$(usex linguas_ja_JP '' japanese) \
-		$(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
-		$(usex linguas_es_ES '' spanish) \
-		$(usex linguas_zh_CN '' chinese_simplified) \
+		$(usex l10n_ja '' japanese) \
+		$(usex l10n_pt '' portuguese) \
+		$(usex l10n_es '' spanish) \
+		$(usex l10n_zh-CN '' chinese_simplified) \
 	; do
 		rm -f "lib/wordlist/${wordlist}.txt" || die
 		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 3ed23802a244..4e6e8a72bb28 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -7,8 +7,7 @@ AUX wget-1.19.2-fix-segfault-due-to-derefencing-null-ptr.patch 2148 BLAKE2B 0eae
 AUX wget-1.92.2-openssl-1.1.0-r1.patch 2426 BLAKE2B 92f533614e9e01b974b06ea7ffc3c7240dd576161ef84d3ac0dcccc279088fb1e55045668a2d275159618c26de07274e4d4e1857ecdcaf36c745e471b174a0eb SHA512 e8fc99f46b5ea3df12cc3af29e075e52cec7f79b65981d1f0aebdcca02741cff2379290d6781e8380d915c7fb8cb29541d0d0f961bf55785ea4cbc7984cece35
 DIST wget-1.19.1.tar.xz 2111756 BLAKE2B e5dcaa791f78bb2d7de19a6f689430cd692e1232b7392102936e5f3b4e3592861bcfc78e27df0c4b02a9002ce4c755e765a0a51749670464789fc9f07f8787f7 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5
 DIST wget-1.19.2.tar.gz 4349267 BLAKE2B 3622d39ea477d4137bd7f2a443d141d8832e2e1adf4dceb5c396aea782fee31bd69ad2b49771062f25c57e6a21701f844077000dfa175e89eae26cf4c3fdca09 SHA512 a0f8afcc0767a8fd1acd64b1b1b27d177bc938e70cc3709c1b3faa6c1426ec926642cd8e49d292cec0268ee507683539b5152072110106de5a728a03efd8cedd
-EBUILD wget-1.19.1-r1.ebuild 3197 BLAKE2B 49b65323072fdc2a08c8bfb38656ce3f207bcb5f3cdc5cb8eda3a189b935561e85129a26f63f7d1762599d8916ad6e8594531e4cb6f7497235704fdc55597829 SHA512 bf0b1c2275c6252f8f17c630aa9bb89e9276097f1fa74cf9d56d67c3ea099851ae64cd08996653493dadc39e31737fbeed88f5fc8cc0cbf1313b0b23e824befc
-EBUILD wget-1.19.1-r2.ebuild 3375 BLAKE2B 2f4a81d38e42f68d269d10700962892c3a68255b445271dcfdd818d18bb83e18621197e23f97fb29c87041c227c96e1a4cfd33437e011df653de2e8a8ae72146 SHA512 a3015289d35284d0290049f2f80ae3835359d6292c4f2c7f486ae3c37d132733a20fda5eaf27e87c6af5d6e4c3d6ff6c7045cb9f6bc1d70ca924c301cee6eb2a
+EBUILD wget-1.19.1-r2.ebuild 3374 BLAKE2B 3fb70d8ce5acbe8bf3c70f880bce4527e42cdfeb5a0c6cc71b0665526c1e6ed8768ada32eadc1f42e97264390a54d724a66c60c7eee806628bebc73fac98e811 SHA512 463eda01a400073e3b34ac69f3c2ab56901d2143214ad342a054a0fa509c61921574977fefa5631d4df05ad9dd3258d377c26dffc9b9dc4112fb89a67d7c9e66
 EBUILD wget-1.19.2-r1.ebuild 3261 BLAKE2B 7ec99a0ac31be122ed386a220c2286f88e67cea3bc22a9ff797681fa62e8f5e756f5be37220f38e1cc660da9967f9f20a61dc90a8e4255ff89bbc5d4f849cc2f SHA512 d073c5925ca2c947702a493d27affae2fd58ff69d70cf95056f011c02e305ee9e4e2829eb65353c059f677b252d379cac2a97f34d5614b8a2ddefecc4fda49b6
 EBUILD wget-1.19.2-r2.ebuild 3312 BLAKE2B c1d176288d7b68c46bc611db01d7329c99ffae676cfe8ac54a490a102eb6bf1194ca73600c95b5a0d4a9d92d696e276daf324a943f5d6eb977b88a66cce0e30a SHA512 9522cd93591a914a00c7e0f8f505e0e233464448fad7ae92c159e26b70f9347b3b977d7ad08967fe5cd4c0da8c3ecc96aec31220f6953e2b00896370b0c438e1
 EBUILD wget-1.19.2.ebuild 3118 BLAKE2B 43f5233b48ae7ace63fd0927938377d4ed7c5a8ca7fbaf94ada87bc0e8c5382f1ae9a4c872f7190c0b3fc090bbf27c71da7362bc5aa239cd5460796fcff5b4de SHA512 e4a6f74d9e7feddab9d9849e32f75f8a383e648b592ec0beb79c20a560c9e0156e4494059a3f95afe3135538e460abc0f5966b4002549e2c94ae572f2ef71738
diff --git a/net-misc/wget/wget-1.19.1-r1.ebuild b/net-misc/wget/wget-1.19.1-r1.ebuild
deleted file mode 100644
index edbca55d9110..000000000000
--- a/net-misc/wget/wget-1.19.1-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs eutils
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
-REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-
-# Force a newer libidn2 to avoid libunistring deps. #612498
-LIB_DEPEND="idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
-	pcre? ( dev-libs/libpcre[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl[static-libs(+)] )
-		)
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )
-	test? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-		dev-perl/HTTP-Daemon
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CRLF_injection.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	# revert some hack that breaks linking, bug #585924
-	if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] || [[ ${CHOST} == *-uclibc* ]]; then
-		sed -i \
-			-e 's/^  LIBICONV=$/:/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-
-	# There is no flag that controls this.  libunistring-prefix only
-	# controls the search path (which is why we turn it off below).
-	# Further, libunistring is only needed w/older libidn2 installs,
-	# and since we force the latest, we can force off libunistring. #612498
-	ac_cv_libunistring=no \
-	econf \
-		--disable-assert \
-		--disable-rpath \
-		--without-included-libunistring \
-		--without-libunistring-prefix \
-		$(use_enable debug) \
-		$(use_enable idn iri) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable ntlm) \
-		$(use_enable pcre) \
-		$(use_enable ssl digest) \
-		$(use_enable ssl opie) \
-		$(use_with idn libidn) \
-		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
-		$(use_with uuid libuuid) \
-		$(use_with zlib)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
-		"${ED}"/etc/wgetrc \
-		"${ED}"/usr/share/man/man1/wget.1 \
-		"${ED}"/usr/share/info/wget.info
-}
diff --git a/net-misc/wget/wget-1.19.1-r2.ebuild b/net-misc/wget/wget-1.19.1-r2.ebuild
index 743df0583537..1bd59b76fe02 100644
--- a/net-misc/wget/wget-1.19.1-r2.ebuild
+++ b/net-misc/wget/wget-1.19.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"