gentoo resync : 03.11.2019

4 files changed, 18 insertions, 20 deletions

diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 8e67610cb1d8..8312dd8c77c8 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,6 +1,6 @@
 DIST ncmpcpp-0.7.7.tar.bz2 443801 BLAKE2B b0bf1f6264f94fc1d0dce5b7ec8d85607427e5bf8955914fddffd8dec94850e6dd20dd83a966a25353d6ec23a61e92751d83fddec8202d9a843e0ed9e3b32077 SHA512 a0bbe85f154c40513d41e85810de86ed21109b72fb0f2bdb0b78dcbddb3770aff5422b5bb7fbac2b76634c5b9aaf843bed5fc16fc672fcd71bbae911f65c0034
 DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
-EBUILD ncmpcpp-0.7.7.ebuild 1501 BLAKE2B b4fac49d9ebca61da51109aa52b06a14f5005064d4427bb94403d534ad03ff65574ff7cbf0d0708dadc7942c51ddc93bc0260e1741ba5b75a026a2e5c726e674 SHA512 dc3691ec4e4d92f063fcccf219e3566ebc85d8b2b0bdf8134720701172108bce462ba9278b9405c556c8631df846747e5f5a2ccdfaab1b6efad58ec92e9474e1
-EBUILD ncmpcpp-0.8.2-r1.ebuild 1401 BLAKE2B 78592b16a7daf591099dd3a3c0e395c330e6e29ba12ae16cd51101d9b5cdc85c375d1867db68f57456dd726a1e9d043f5a820bcc7394b5d14262f9172991e084 SHA512 4f1564e261ea385669401b9d318d3de00db35f9abc8185a96049994ccba3e5cdabb017afc5474b9dcfdea41f703d6c868152647eb3d71188eb2f28a03110fcdf
-EBUILD ncmpcpp-9999.ebuild 1396 BLAKE2B ff321fc947d5dec8a6b72bfdaa886c1d9749a2d4818d04a1fd5ba8dfd03e52c6e36e001c4d69c78330f89fa38a27969d2c06a98086dd08c46d7a86157aac3bd5 SHA512 23235b975f1d1dc1e375d6c6f3bedc8625430f1ff55d88efa0cfa48acd2e2bfc1b1a386d0df68948f3f2661dbf25fe2cbc9e5191afdcafb7b21949ac40e52c31
+EBUILD ncmpcpp-0.7.7.ebuild 1467 BLAKE2B 07f776a3c433b8ede9e741e74a9ee6a50e0a01865da5a2eaa5eb2193fb4eb5f19b694849739fcaf7593d931e967baeabc2e0ca908bb6e00beae1fcdd89cd36da SHA512 6e6f00aae80ccd97f4ec32b37e5f72ec5e782d0155edc9f6a85b752d26e09c749bfa31cc4b4f86a993caad09b866fdb891e987fded319d58e7c5ad0f0428bd47
+EBUILD ncmpcpp-0.8.2-r1.ebuild 1396 BLAKE2B fa0f50a4d870ccc0c7d02f899fdb1fecdfc60bd04af8a59f6640690c8a20b5ed6b729cab9e1d5ff711a36897b5e54c7aa2da0c474ed8791f9a26cfa156aed6a0 SHA512 9a59f7900c619b557421c54b832d123b70a4d08a3ba25c73e8e548ad6c981f971fbb23942b61bf66bb1e69194b1c08b717bbd07e97bf65d97ef5da6624e01531
+EBUILD ncmpcpp-9999.ebuild 1391 BLAKE2B bb70ae4ce0ffa9d9234b76f57ce1a5ef638c2fef6b1efca502c8dc92191748ce52f98b80043362861fd51475d8c6b14344e37d8b70a25f2053ee93f607b5ecf7 SHA512 c073659170e5cf5c554c7f3ed8fb9b101d4275af1ec6eb3eb38e295ee2e1e8023aef5a6d5c9f79d8734d994765933b5413ee47d2a53403d8c65077c746f0ce8a
 MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
index 85d189cdcd0a..fac787897fba 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,20 +10,18 @@ SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="clock curl outputs taglib unicode visualizer"
+IUSE="clock curl outputs taglib visualizer"
 
 RDEPEND="
 	!dev-libs/boost:0/1.57.0
 	>=media-libs/libmpdclient-2.1
+	dev-libs/boost:=[icu]
 	dev-libs/boost:=[nls,threads]
-	sys-libs/ncurses:=[unicode?]
+	dev-libs/icu:=
+	sys-libs/ncurses:=[unicode]
 	sys-libs/readline:*
 	curl? ( net-misc/curl )
 	taglib? ( media-libs/taglib )
-	unicode? (
-		dev-libs/boost:=[icu]
-		dev-libs/icu:=
-	)
 	visualizer? ( sci-libs/fftw:3.0= )
 "
 DEPEND="
@@ -42,12 +40,12 @@ src_configure() {
 	econf \
 		$(use_enable clock) \
 		$(use_enable outputs) \
-		$(use_enable unicode) \
 		$(use_enable visualizer) \
 		$(use_with curl) \
 		$(use_with taglib) \
 		$(use_with visualizer fftw) \
-		--docdir=/usr/share/doc/${PF}
+		--docdir=/usr/share/doc/${PF} \
+		--enable-unicode
 }
 
 src_install() {
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
index 007f6387ce67..dbdf6c5d16ca 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
@@ -10,16 +10,16 @@ SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
-IUSE="clock icu outputs taglib visualizer"
+IUSE="clock outputs taglib visualizer"
 
 RDEPEND="
 	!dev-libs/boost:0/1.57.0
 	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu?,nls,threads]
+	dev-libs/boost:=[icu,nls,threads]
+	dev-libs/icu:=
 	net-misc/curl
-	sys-libs/ncurses:=
+	sys-libs/ncurses:=[unicode]
 	sys-libs/readline:*
-	icu? ( dev-libs/icu:= )
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index 7b75299afc52..5074e7460063 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -11,16 +11,16 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="clock icu outputs taglib visualizer"
+IUSE="clock outputs taglib visualizer"
 
 RDEPEND="
 	!dev-libs/boost:0/1.57.0
 	>=media-libs/libmpdclient-2.1
-	dev-libs/boost:=[icu?,nls,threads]
+	dev-libs/boost:=[icu,nls,threads]
+	dev-libs/icu:=
 	net-misc/curl
-	sys-libs/ncurses:=
+	sys-libs/ncurses:=[unicode]
 	sys-libs/readline:*
-	icu? ( dev-libs/icu:= )
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "