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 762A31382C5 for ; Thu, 2 Jul 2020 05:06:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 929DAE088F; Thu, 2 Jul 2020 05:06:34 +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 79675E088F for ; Thu, 2 Jul 2020 05:06:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 5289634EEED for ; Thu, 2 Jul 2020 05:06:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C983C9C for ; Thu, 2 Jul 2020 05:06:31 +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: <1593666361.cbc4fa1728bf3098af59fb5f83208e3888362357.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: cbc4fa1728bf3098af59fb5f83208e3888362357 X-VCS-Branch: master Date: Thu, 2 Jul 2020 05:06:31 +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: e6928d6e-0315-4760-88f8-b065780d049f X-Archives-Hash: 8f8e0cbefee529b51a459765f2fe305c commit: cbc4fa1728bf3098af59fb5f83208e3888362357 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Jul 2 05:06:01 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Jul 2 05:06:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc4fa17 net-irc/weechat: update live ebuild migrate to cmake.eclass update deps make gnutls non-optional, remove ssl flag completely https://github.com/weechat/weechat/commit/e130ee7358564cfd5572ca0cf1ac6871425548ed Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Georgy Yakovlev gentoo.org> net-irc/weechat/weechat-9999.ebuild | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild index 0871e154ad2..a63694304e8 100644 --- a/net-irc/weechat/weechat-9999.ebuild +++ b/net-irc/weechat/weechat-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python{3_6,3_7,3_8} ) -inherit cmake-utils python-single-r1 xdg-utils +inherit cmake python-single-r1 xdg-utils if [[ ${PV} == "9999" ]] ; then inherit git-r3 @@ -26,14 +26,15 @@ PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spe # 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 it ja pl ru" -IUSE="doc man nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" +IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" dev-libs/libgcrypt:0= - net-misc/curl[ssl] + net-libs/gnutls:= sys-libs/ncurses:0= - sys-libs/zlib + sys-libs/zlib:= + net-misc/curl[ssl] charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0 ) @@ -42,7 +43,6 @@ RDEPEND=" php? ( >=dev-lang/php-7.0:*[embed] ) python? ( ${PYTHON_DEPS} ) 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= ) " @@ -67,7 +67,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # install only required translations local i @@ -115,7 +115,6 @@ src_configure() { -DENABLE_EXEC=$(usex exec) -DENABLE_FIFO=$(usex fifo) -DENABLE_FSET=$(usex fset) - -DENABLE_GNUTLS=$(usex ssl) -DENABLE_GUILE=$(usex guile) -DENABLE_IRC=$(usex irc) -DENABLE_LOGGER=$(usex logger) @@ -140,7 +139,7 @@ src_configure() { python_is_python3 || mycmakeargs+=( -DENABLE_PYTHON2=ON ) fi - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() {