gentoo (leap year) resync : 29.02.2020

3 files changed, 9 insertions, 10 deletions

diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index c79ca1335aad..ff390ee4a5ef 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,4 +1,4 @@
 DIST irssi-1.2.2.tar.xz 1140844 BLAKE2B c1758828285c3f3210d6920455382e52279587280ecdc4ba7d73562c164ebd6618b1bb32d387439be2696f948044f66eb73b78ed2b0635286f8c3d93530167f2 SHA512 5444ac102ff9ad3a6399a47c967d138e181330dd226eac68886d35fee4ad455932b9306a367bee3478095158e41ba67fb46deb8f0a33512046b9b83bae37c610
-EBUILD irssi-1.2.2.ebuild 1516 BLAKE2B f0e2636e77769d3cd93f59d1b31ac3f435e54a1aaf4f410a2171a064514d0aef59699e77c5d21145d3a165910215527a496aaeaa380d2c8bdd49ae199be6e0bd SHA512 36c3bce56178fa6be363389a03100c790664926a3940e6242d82f09a61f368ec9010d34b393467836eea951684098a051baf486ecb34ad3e73795c8d53874aa5
-EBUILD irssi-9999.ebuild 1443 BLAKE2B 61c4a02c0ef1c9b91936941a9775a6ecf9d4fb0caa16709049ec65ccd899a543233cd29438253debaec19e3c0c198816813755f79ba759b5daceffec1952890b SHA512 a9154809e356c6cbcfa809eea8269059de1faebba21edbd663fe666fcbd0010ccaaac38afb5769dda6b9b7a51737fd10a568265400d2af3243bee2c09c1730eb
+EBUILD irssi-1.2.2.ebuild 1523 BLAKE2B d154f5d9dcfe0fa019793e1aff1d8a0989048621db9bd17f66a65680c991def317684701677de1c5a730acef582163e8c7ff54ed7c7e844001e65b15b7145419 SHA512 ecb2bdddf18de501f3cfb2417f381ade5e40e8de0e0b1f2458b6356259510aa8b6473beca842f583a190c984fbfaebc0bba735163d25e8167ce3b192fd1fef1f
+EBUILD irssi-9999.ebuild 1452 BLAKE2B 36bdbe74877e969849b92cc653c21eb7d41d03b0b03ae3656b3d25b5bd63e37a7c65c47cb3ea7fad0f110a51f99384b66b9a4215a8940c2105e126054ed51dd6 SHA512 c9e57d39473c2f3a9fda1b331f8f8232c758e0fdb803b4472c68491e78b74432eea75577be9cfddfbd500643eb85a051cf986c00b472181f37bd1986c5cbcf64
 MISC metadata.xml 700 BLAKE2B 9d12cb98cc2a5204d423141bcb42222cb5aca53888eac4158927a40f2b5b8a28eb0fa4171f1a4467aa795df45673f21dec09ddbf9c22f897c131d137a10a1d98 SHA512 9d510764f9f5dbfaaa2c027ac79ccbcfc92552d48de3bb3491b6e9b1abdb8be7dcd4e59be4fdf82b9ba4c240a8bc63e5f18548b3c3da4e77eff0b87a457db470
diff --git a/net-irc/irssi/irssi-1.2.2.ebuild b/net-irc/irssi/irssi-1.2.2.ebuild
index 227306b6632d..e7cbf3211e77 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 9af048ac2722..e613910b5096 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
 }