Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/weechat/
Date: Fri, 07 Jun 2019 04:05:21
Message-Id: 1559880288.4760387a1d2ac78c7e77aed300b8c439f2bd8365.gyakovlev@gentoo
1 commit: 4760387a1d2ac78c7e77aed300b8c439f2bd8365
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 7 04:03:47 2019 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 7 04:04:48 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4760387a
7
8 net-irc/weechat: sync live ebuild
9
10 Package-Manager: Portage-2.3.67, Repoman-2.3.14
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 net-irc/weechat/weechat-9999.ebuild | 20 +++++++++-----------
14 1 file changed, 9 insertions(+), 11 deletions(-)
15
16 diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
17 index 87138663a67..bebadfe887e 100644
18 --- a/net-irc/weechat/weechat-9999.ebuild
19 +++ b/net-irc/weechat/weechat-9999.ebuild
20 @@ -22,10 +22,10 @@ LICENSE="GPL-3"
21 SLOT="0"
22
23 NETWORKS="+irc"
24 -PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer"
25 +PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
26 # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
27 SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
28 -LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
29 +LANGS=" cs de es fr it ja pl ru"
30 IUSE="doc man nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
31 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
32
33 @@ -41,16 +41,19 @@ RDEPEND="
34 perl? ( dev-lang/perl:= )
35 php? ( >=dev-lang/php-7.0:* )
36 python? ( ${PYTHON_DEPS} )
37 - ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) )
38 + ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) )
39 ssl? ( net-libs/gnutls )
40 spell? ( app-text/aspell )
41 tcl? ( >=dev-lang/tcl-8.4.15:0= )
42 "
43 DEPEND="${RDEPEND}
44 + test? ( dev-util/cpputest )
45 +"
46 +
47 +BDEPEND="
48 doc? ( >=dev-ruby/asciidoctor-1.5.4 )
49 man? ( >=dev-ruby/asciidoctor-1.5.4 )
50 nls? ( >=sys-devel/gettext-0.15 )
51 - test? ( dev-util/cpputest )
52 "
53
54 DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
55 @@ -65,12 +68,6 @@ pkg_setup() {
56 src_prepare() {
57 cmake-utils_src_prepare
58
59 - # fix libdir placement
60 - sed -i \
61 - -e "s:lib/:$(get_libdir)/:g" \
62 - -e "s:lib\":$(get_libdir)\":g" \
63 - CMakeLists.txt || die "sed failed"
64 -
65 # install only required translations
66 local i
67 for i in ${LANGS} ; do
68 @@ -106,11 +103,11 @@ src_prepare() {
69
70 src_configure() {
71 local mycmakeargs=(
72 + -DLIBDIR=$(get_libdir)
73 -DENABLE_JAVASCRIPT=OFF
74 -DENABLE_LARGEFILE=ON
75 -DENABLE_NCURSES=ON
76 -DENABLE_ALIAS=$(usex alias)
77 - -DENABLE_ASPELL=$(usex spell)
78 -DENABLE_BUFLIST=$(usex buflist)
79 -DENABLE_CHARSET=$(usex charset)
80 -DENABLE_DOC=$(usex doc)
81 @@ -131,6 +128,7 @@ src_configure() {
82 -DENABLE_RUBY=$(usex ruby)
83 -DENABLE_SCRIPT=$(usex scripts)
84 -DENABLE_SCRIPTS=$(usex scripts)
85 + -DENABLE_SPELL=$(usex spell)
86 -DENABLE_TCL=$(usex tcl)
87 -DENABLE_TESTS=$(usex test)
88 -DENABLE_TRIGGER=$(usex trigger)