[gentoo-commits] repo/gentoo:master commit in: net-irc/irssi/

[Mikle Kolyada]

commit:     40cbb77922853b4c358ce59a37d3c7bba324c06d
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 11:31:09 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 11:31:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40cbb779

net-irc/irssi: sync live ebuild

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-irc/irssi/irssi-1.2.2.ebuild |  2 +-
 net-irc/irssi/irssi-9999.ebuild  | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/net-irc/irssi/irssi-1.2.2.ebuild b/net-irc/irssi/irssi-1.2.2.ebuild
index 227306b6632..e7cbf3211e7 100644
--- a/net-irc/irssi/irssi-1.2.2.ebuild
+++ b/net-irc/irssi/irssi-1.2.2.ebuild
@@ -59,5 +59,5 @@ src_configure() {
 src_install() {
        default
        use perl && perl_delete_localpod
-       rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la}
+       rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die
 }

diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 9af048ac272..e613910b509 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 GENTOO_DEPEND_ON_PERL="no"
 
-inherit autotools perl-module git-r3 ltprune
+inherit autotools perl-module git-r3
 
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git";
 
@@ -13,10 +13,9 @@ DESCRIPTION="A modular textUI IRC client with IPv6 support"
 HOMEPAGE="https://irssi.org/";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="otr +perl selinux socks5 +proxy libressl"
 
-CDEPEND="sys-libs/ncurses:0=
+COMMON_DEPEND="sys-libs/ncurses:0=
        >=dev-libs/glib-2.6.0
        !libressl? ( dev-libs/openssl:= )
        libressl? ( dev-libs/libressl:= )
@@ -28,7 +27,7 @@ CDEPEND="sys-libs/ncurses:0=
        socks5? ( >=net-proxy/dante-1.1.18 )"
 
 DEPEND="
-       ${CDEPEND}
+       ${COMMON_DEPEND}
        virtual/pkgconfig
        dev-lang/perl
        || (
@@ -37,7 +36,7 @@ DEPEND="
        )"
 
 RDEPEND="
-       ${CDEPEND}
+       ${COMMON_DEPEND}
        selinux? ( sec-policy/selinux-irc )"
 
 src_prepare() {
@@ -64,11 +63,11 @@ src_configure() {
 }
 
 src_install() {
-       emake DESTDIR="${D}" install
+       default
 
        use perl && perl_delete_localpod
 
-       prune_libtool_files --modules
+       rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die
 
        dodoc AUTHORS ChangeLog README.md TODO NEWS
 }