commit:     430cca53b9eeefee73ece2e8fc12637816932e32
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 21:21:43 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 12 21:21:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=430cca53

net-irc/irssi: Synce live ebuild.

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-irc/irssi/irssi-9999.ebuild | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 2afd0cb78e5..d5f740941fc 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -20,8 +20,10 @@ CDEPEND="sys-libs/ncurses:0=
        >=dev-libs/glib-2.6.0
        !libressl? ( dev-libs/openssl:= )
        libressl? ( dev-libs/libressl:= )
-       otr? ( >=dev-libs/libgcrypt-1.2.0:0=
-                       >=net-libs/libotr-4.1.0 )
+       otr? (
+               >=dev-libs/libgcrypt-1.2.0:0=
+               >=net-libs/libotr-4.1.0
+       )
        perl? ( dev-lang/perl:= )
        socks5? ( >=net-proxy/dante-1.1.18 )"
 
@@ -43,18 +45,23 @@ src_prepare() {
        sed -i -e /^autoreconf/d autogen.sh || die
        NOCONFIGURE=1 ./autogen.sh || die
 
-       eapply_user
+       default
        eautoreconf
 }
 
 src_configure() {
-       econf \
-               --with-perl-lib=vendor \
-               --enable-true-color \
-               $(use_with otr) \
-               $(use_with proxy) \
-               $(use_with perl) \
+       # Disable automagic dependency on dev-libs/libutf8proc (bug #677804)
+       export ac_cv_lib_utf8proc_utf8proc_version=no
+
+       local myeconfargs=(
+               --with-perl-lib=vendor
+               --enable-true-color
+               $(use_with otr)
+               $(use_with proxy)
+               $(use_with perl)
                $(use_with socks5 socks)
+       )
+       econf "${myeconfargs[@]}"
 }
 
 src_install() {

Reply via email to