1 |
commit: 40cbb77922853b4c358ce59a37d3c7bba324c06d |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 25 11:31:09 2020 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 25 11:31:09 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40cbb779 |
7 |
|
8 |
net-irc/irssi: sync live ebuild |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
12 |
|
13 |
net-irc/irssi/irssi-1.2.2.ebuild | 2 +- |
14 |
net-irc/irssi/irssi-9999.ebuild | 13 ++++++------- |
15 |
2 files changed, 7 insertions(+), 8 deletions(-) |
16 |
|
17 |
diff --git a/net-irc/irssi/irssi-1.2.2.ebuild b/net-irc/irssi/irssi-1.2.2.ebuild |
18 |
index 227306b6632..e7cbf3211e7 100644 |
19 |
--- a/net-irc/irssi/irssi-1.2.2.ebuild |
20 |
+++ b/net-irc/irssi/irssi-1.2.2.ebuild |
21 |
@@ -59,5 +59,5 @@ src_configure() { |
22 |
src_install() { |
23 |
default |
24 |
use perl && perl_delete_localpod |
25 |
- rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} |
26 |
+ rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die |
27 |
} |
28 |
|
29 |
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild |
30 |
index 9af048ac272..e613910b509 100644 |
31 |
--- a/net-irc/irssi/irssi-9999.ebuild |
32 |
+++ b/net-irc/irssi/irssi-9999.ebuild |
33 |
@@ -5,7 +5,7 @@ EAPI="6" |
34 |
|
35 |
GENTOO_DEPEND_ON_PERL="no" |
36 |
|
37 |
-inherit autotools perl-module git-r3 ltprune |
38 |
+inherit autotools perl-module git-r3 |
39 |
|
40 |
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" |
41 |
|
42 |
@@ -13,10 +13,9 @@ DESCRIPTION="A modular textUI IRC client with IPv6 support" |
43 |
HOMEPAGE="https://irssi.org/" |
44 |
LICENSE="GPL-2" |
45 |
SLOT="0" |
46 |
-KEYWORDS="" |
47 |
IUSE="otr +perl selinux socks5 +proxy libressl" |
48 |
|
49 |
-CDEPEND="sys-libs/ncurses:0= |
50 |
+COMMON_DEPEND="sys-libs/ncurses:0= |
51 |
>=dev-libs/glib-2.6.0 |
52 |
!libressl? ( dev-libs/openssl:= ) |
53 |
libressl? ( dev-libs/libressl:= ) |
54 |
@@ -28,7 +27,7 @@ CDEPEND="sys-libs/ncurses:0= |
55 |
socks5? ( >=net-proxy/dante-1.1.18 )" |
56 |
|
57 |
DEPEND=" |
58 |
- ${CDEPEND} |
59 |
+ ${COMMON_DEPEND} |
60 |
virtual/pkgconfig |
61 |
dev-lang/perl |
62 |
|| ( |
63 |
@@ -37,7 +36,7 @@ DEPEND=" |
64 |
)" |
65 |
|
66 |
RDEPEND=" |
67 |
- ${CDEPEND} |
68 |
+ ${COMMON_DEPEND} |
69 |
selinux? ( sec-policy/selinux-irc )" |
70 |
|
71 |
src_prepare() { |
72 |
@@ -64,11 +63,11 @@ src_configure() { |
73 |
} |
74 |
|
75 |
src_install() { |
76 |
- emake DESTDIR="${D}" install |
77 |
+ default |
78 |
|
79 |
use perl && perl_delete_localpod |
80 |
|
81 |
- prune_libtool_files --modules |
82 |
+ rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die |
83 |
|
84 |
dodoc AUTHORS ChangeLog README.md TODO NEWS |
85 |
} |