From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BA5D8138335 for ; Fri, 7 Jun 2019 04:05:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CC45E0864; Fri, 7 Jun 2019 04:05:20 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7AA1FE0864 for ; Fri, 7 Jun 2019 04:05:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 782E83458B0 for ; Fri, 7 Jun 2019 04:05:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DDD9E604 for ; Fri, 7 Jun 2019 04:05:14 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1559880288.4760387a1d2ac78c7e77aed300b8c439f2bd8365.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/weechat/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/weechat/weechat-9999.ebuild X-VCS-Directories: net-irc/weechat/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 4760387a1d2ac78c7e77aed300b8c439f2bd8365 X-VCS-Branch: master Date: Fri, 7 Jun 2019 04:05:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1b92f4cc-428a-40ff-aa17-ca014232499a X-Archives-Hash: 0e6d41cc38a86bfa66841ab0d5e3921c commit: 4760387a1d2ac78c7e77aed300b8c439f2bd8365 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Jun 7 04:03:47 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Jun 7 04:04:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4760387a net-irc/weechat: sync live ebuild Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Georgy Yakovlev gentoo.org> net-irc/weechat/weechat-9999.ebuild | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild index 87138663a67..bebadfe887e 100644 --- a/net-irc/weechat/weechat-9999.ebuild +++ b/net-irc/weechat/weechat-9999.ebuild @@ -22,10 +22,10 @@ LICENSE="GPL-3" SLOT="0" NETWORKS="+irc" -PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer" +PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer" # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support SCRIPT_LANGS="guile lua +perl php +python ruby tcl" -LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr" +LANGS=" cs de es fr it ja pl ru" IUSE="doc man nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -41,16 +41,19 @@ RDEPEND=" perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) python? ( ${PYTHON_DEPS} ) - ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) ) + ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) " DEPEND="${RDEPEND} + test? ( dev-util/cpputest ) +" + +BDEPEND=" doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) - test? ( dev-util/cpputest ) " DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc" @@ -65,12 +68,6 @@ pkg_setup() { src_prepare() { cmake-utils_src_prepare - # fix libdir placement - sed -i \ - -e "s:lib/:$(get_libdir)/:g" \ - -e "s:lib\":$(get_libdir)\":g" \ - CMakeLists.txt || die "sed failed" - # install only required translations local i for i in ${LANGS} ; do @@ -106,11 +103,11 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DLIBDIR=$(get_libdir) -DENABLE_JAVASCRIPT=OFF -DENABLE_LARGEFILE=ON -DENABLE_NCURSES=ON -DENABLE_ALIAS=$(usex alias) - -DENABLE_ASPELL=$(usex spell) -DENABLE_BUFLIST=$(usex buflist) -DENABLE_CHARSET=$(usex charset) -DENABLE_DOC=$(usex doc) @@ -131,6 +128,7 @@ src_configure() { -DENABLE_RUBY=$(usex ruby) -DENABLE_SCRIPT=$(usex scripts) -DENABLE_SCRIPTS=$(usex scripts) + -DENABLE_SPELL=$(usex spell) -DENABLE_TCL=$(usex tcl) -DENABLE_TESTS=$(usex test) -DENABLE_TRIGGER=$(usex trigger)