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: Sun, 17 Feb 2019 21:05:21
Message-Id: 1550437507.72f83905f348fd50330161352f79f081fda77b5a.gyakovlev@gentoo
1 commit: 72f83905f348fd50330161352f79f081fda77b5a
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 17 21:00:51 2019 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 17 21:05:07 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f83905
7
8 net-irc/weechat: sync live ebuild
9
10 Package-Manager: Portage-2.3.60, Repoman-2.3.12
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 net-irc/weechat/weechat-9999.ebuild | 50 ++++++++++++++++++-------------------
14 1 file changed, 24 insertions(+), 26 deletions(-)
15
16 diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
17 index 8acde9443dd..976f3611697 100644
18 --- a/net-irc/weechat/weechat-9999.ebuild
19 +++ b/net-irc/weechat/weechat-9999.ebuild
20 @@ -1,10 +1,11 @@
21 -# Copyright 1999-2018 Gentoo Authors
22 +# Copyright 1999-2019 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 -EAPI=6
26 +EAPI=7
27 +
28 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
29 -CMAKE_MAKEFILE_GENERATOR=emake
30 -inherit cmake-utils gnome2-utils python-single-r1
31 +
32 +inherit cmake-utils python-single-r1 xdg-utils
33
34 if [[ ${PV} == "9999" ]] ; then
35 inherit git-r3
36 @@ -25,7 +26,7 @@ PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spe
37 # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
38 SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
39 LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
40 -IUSE="doc nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
41 +IUSE="doc man nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
42 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
43
44 RDEPEND="
45 @@ -40,16 +41,14 @@ RDEPEND="
46 perl? ( dev-lang/perl:= )
47 php? ( >=dev-lang/php-7.0:* )
48 python? ( ${PYTHON_DEPS} )
49 - ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) )
50 + ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) )
51 ssl? ( net-libs/gnutls )
52 spell? ( app-text/aspell )
53 tcl? ( >=dev-lang/tcl-8.4.15:0= )
54 "
55 DEPEND="${RDEPEND}
56 - doc? (
57 - >=dev-ruby/asciidoctor-1.5.4
58 - dev-util/source-highlight
59 - )
60 + doc? ( >=dev-ruby/asciidoctor-1.5.4 )
61 + man? ( >=dev-ruby/asciidoctor-1.5.4 )
62 nls? ( >=sys-devel/gettext-0.15 )
63 test? ( dev-util/cpputest )
64 "
65 @@ -59,8 +58,6 @@ DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.ado
66 # tests need to be fixed to not use system plugins if weechat is already installed
67 RESTRICT="test"
68
69 -PATCHES=( "${FILESDIR}"/${PN}-2.2-tinfo.patch )
70 -
71 pkg_setup() {
72 use python && python-single-r1_pkg_setup
73 }
74 @@ -109,34 +106,35 @@ src_prepare() {
75
76 src_configure() {
77 local mycmakeargs=(
78 - -DENABLE_NCURSES=ON
79 - -DENABLE_NLS=$(usex nls)
80 - -DENABLE_GNUTLS=$(usex ssl)
81 + -DENABLE_JAVASCRIPT=OFF
82 -DENABLE_LARGEFILE=ON
83 + -DENABLE_NCURSES=ON
84 -DENABLE_ALIAS=$(usex alias)
85 -DENABLE_ASPELL=$(usex spell)
86 -DENABLE_BUFLIST=$(usex buflist)
87 -DENABLE_CHARSET=$(usex charset)
88 + -DENABLE_DOC=$(usex doc)
89 -DENABLE_EXEC=$(usex exec)
90 - -DENABLE_FSET=$(usex fset)
91 -DENABLE_FIFO=$(usex fifo)
92 + -DENABLE_FSET=$(usex fset)
93 + -DENABLE_GNUTLS=$(usex ssl)
94 + -DENABLE_GUILE=$(usex guile)
95 -DENABLE_IRC=$(usex irc)
96 -DENABLE_LOGGER=$(usex logger)
97 - -DENABLE_RELAY=$(usex relay)
98 - -DENABLE_SCRIPT=$(usex scripts)
99 - -DENABLE_SCRIPTS=$(usex scripts)
100 + -DENABLE_LUA=$(usex lua)
101 + -DENABLE_MAN=$(usex man)
102 + -DENABLE_NLS=$(usex nls)
103 -DENABLE_PERL=$(usex perl)
104 -DENABLE_PHP=$(usex php)
105 -DENABLE_PYTHON=$(usex python)
106 + -DENABLE_RELAY=$(usex relay)
107 -DENABLE_RUBY=$(usex ruby)
108 - -DENABLE_LUA=$(usex lua)
109 + -DENABLE_SCRIPT=$(usex scripts)
110 + -DENABLE_SCRIPTS=$(usex scripts)
111 -DENABLE_TCL=$(usex tcl)
112 - -DENABLE_GUILE=$(usex guile)
113 - -DENABLE_JAVASCRIPT=OFF
114 + -DENABLE_TESTS=$(usex test)
115 -DENABLE_TRIGGER=$(usex trigger)
116 -DENABLE_XFER=$(usex xfer)
117 - -DENABLE_DOC=$(usex doc)
118 - -DENABLE_TESTS=$(usex test)
119 )
120
121 if use python; then
122 @@ -151,9 +149,9 @@ src_configure() {
123 }
124
125 pkg_postinst() {
126 - gnome2_icon_cache_update
127 + xdg_icon_cache_update
128 }
129
130 pkg_postrm() {
131 - gnome2_icon_cache_update
132 + xdg_icon_cache_update
133 }