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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DFE3015801B for ; Thu, 27 Jul 2023 19:27:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14A87E09CD; Thu, 27 Jul 2023 19:27:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5DCEE09CD for ; Thu, 27 Jul 2023 19:27:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1EF8341389 for ; Thu, 27 Jul 2023 19:27:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DB79DD8 for ; Thu, 27 Jul 2023 19:27:01 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1690486000.6cefc7e1a24604d75605593a923b35283ccc9487.flow@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: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 6cefc7e1a24604d75605593a923b35283ccc9487 X-VCS-Branch: master Date: Thu, 27 Jul 2023 19:27:01 +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: b4868447-6e20-42e5-94e4-db02ff479e6a X-Archives-Hash: 92a3539c394f58ec40b4f596cef76d3a commit: 6cefc7e1a24604d75605593a923b35283ccc9487 Author: Florian Schmaus gentoo org> AuthorDate: Thu Jul 27 19:24:06 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Thu Jul 27 19:26:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cefc7e1 net-irc/weechat: sync live Signed-off-by: Florian Schmaus gentoo.org> net-irc/weechat/weechat-9999.ebuild | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild index a10572d3f909..f7ec70d248a7 100644 --- a/net-irc/weechat/weechat-9999.ebuild +++ b/net-irc/weechat/weechat-9999.ebuild @@ -49,7 +49,7 @@ RDEPEND=" sys-libs/zlib:= net-misc/curl[ssl] charset? ( virtual/libiconv ) - guile? ( >=dev-scheme/guile-2.0 ) + guile? ( >=dev-scheme/guile-2.0:12= ) lua? ( ${LUA_DEPS} ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) @@ -58,7 +58,6 @@ RDEPEND=" || ( dev-lang/ruby:3.1 dev-lang/ruby:3.0 - dev-lang/ruby:2.7 ) ) selinux? ( sec-policy/selinux-irc ) @@ -107,17 +106,21 @@ src_prepare() { done # install only required documentation ; en always - for i in $(grep add_subdirectory doc/CMakeLists.txt \ - | sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do - if ! has ${i} ${LINGUAS-${i}} ; then - sed -i \ - -e '/add_subdirectory('${i}')/d' \ - doc/CMakeLists.txt || die - fi + local j + for i in $(grep -e 'set(.*en.*)$' doc/CMakeLists.txt \ + | sed -e 's/.*set(\(\w\+\).*/\1/'); do + for j in $(grep set.${i} doc/CMakeLists.txt \ + | sed -e "s/.*${i}\(.*\)).*/\1/" -e 's/ en//'); do + if ! has ${j} ${LINGUAS-${j}} ; then + sed -i \ + -e "s/\(set(${i}.*\) ${j}/\1/" \ + doc/CMakeLists.txt || die + fi + done done # install docs in correct directory - sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/*/CMakeLists.txt || die + sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/CMakeLists.txt || die if [[ ${CHOST} == *-darwin* ]]; then # fix linking error on Darwin @@ -139,7 +142,11 @@ src_configure() { -DENABLE_ALIAS=$(usex alias) -DENABLE_BUFLIST=$(usex buflist) -DENABLE_CHARSET=$(usex charset) - -DENABLE_DOC=$(usex doc) + # -DENABLE_DOC requires all plugins (except javascript). + # https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144 + # Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702 + -DENABLE_DOC=OFF + -DENABLE_DOC_INCOMPLETE=$(usex doc) -DENABLE_ENCHANT=$(usex enchant) -DENABLE_EXEC=$(usex exec) -DENABLE_FIFO=$(usex fifo)