media-sound/ncmpcpp: Drop IUSE=icu|unicode
authorJeroen Roovers <jer@gentoo.org>
Wed, 30 Oct 2019 09:36:30 +0000 (10:36 +0100)
committerJeroen Roovers <jer@gentoo.org>
Wed, 30 Oct 2019 09:39:45 +0000 (10:39 +0100)
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=686714
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
media-sound/ncmpcpp/ncmpcpp-9999.ebuild

index 85d189cdcd0abd9629906b67357781043df0f175..fac787897fba895ddfba31b15816ff74731013a0 100644 (file)
@@ -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() {
index 007f6387ce674a3ffaa90e7eabe3847d98f43001..dbdf6c5d16caf094e163afa29515d0644853df75 100644 (file)
@@ -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= )
 "
index 7b75299afc52f662037cee430f0115bb68a5d5fc..5074e7460063f333cac732bc0955a14c3db8ccde 100644 (file)
@@ -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= )
 "