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 22FEE158018 for ; Mon, 4 Oct 2021 07:24:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 548BCE08FE; Mon, 4 Oct 2021 07:24:51 +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-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38FE9E08FE for ; Mon, 4 Oct 2021 07:24:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4B247342FBC for ; Mon, 4 Oct 2021 07:24:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88C05EE for ; Mon, 4 Oct 2021 07:24:48 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1633332282.98f400e631edaf5ec46aadd0aaccb84cc863c7db.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/hexchat/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/hexchat/hexchat-9999.ebuild X-VCS-Directories: net-irc/hexchat/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 98f400e631edaf5ec46aadd0aaccb84cc863c7db X-VCS-Branch: master Date: Mon, 4 Oct 2021 07:24:48 +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: a21e213b-1ba9-4a08-b1a4-0e4df22f557e X-Archives-Hash: 11ff9cebc73c290e8b8bdb7ebfec4fae commit: 98f400e631edaf5ec46aadd0aaccb84cc863c7db Author: Lars Wendler gentoo org> AuthorDate: Mon Oct 4 07:24:32 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Oct 4 07:24:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98f400e6 net-irc/hexchat: Synced live ebuild Signed-off-by: Lars Wendler gentoo.org> net-irc/hexchat/hexchat-9999.ebuild | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild index 5de62a8f2e7..5964fd0c827 100644 --- a/net-irc/hexchat/hexchat-9999.ebuild +++ b/net-irc/hexchat/hexchat-9999.ebuild @@ -22,7 +22,7 @@ fi LICENSE="GPL-2 plugin-fishlim? ( MIT )" SLOT="0" -IUSE="dbus debug +gtk libcanberra libnotify libproxy lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager" +IUSE="dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} )" @@ -36,12 +36,13 @@ RDEPEND=" x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) - libproxy? ( net-libs/libproxy ) - libnotify? ( x11-libs/libnotify ) lua? ( ${LUA_DEPS} ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) - python? ( ${PYTHON_DEPS} ) + python? ( + ${PYTHON_DEPS} + virtual/python-cffi + ) ssl? ( dev-libs/openssl:0= ) theme-manager? ( || ( @@ -70,23 +71,22 @@ pkg_setup() { src_configure() { local emesonargs=( - -Dwith-gtk="$(usex gtk true false)" - -Dwith-text="$(usex gtk false true)" - -Dwith-ssl="$(usex ssl true false)" - -Dwith-plugin=true - -Dwith-dbus="$(usex dbus true false)" - -Dwith-libproxy="$(usex libproxy true false)" - -Dwith-libnotify="$(usex libnotify true false)" - -Dwith-libcanberra="$(usex libcanberra true false)" - -Dwith-theme-manager="$(usex theme-manager true false)" -Ddbus-service-use-appid=false - -Dwith-checksum="$(usex plugin-checksum true false)" - -Dwith-fishlim="$(usex plugin-fishlim true false)" - -Dwith-lua="$(usex lua ${ELUA} false)" + -Dinstall-appdata=false + -Dplugin=true + $(meson_feature dbus) + $(meson_feature libcanberra) + $(meson_feature ssl tls) + $(meson_use gtk gtk-frontend) + $(meson_use !gtk text-frontend) + $(meson_use theme-manager) + + $(meson_use plugin-checksum with-checksum) + $(meson_use plugin-fishlim with-fishlim) + -Dwith-lua="$(usex lua "${ELUA}" false)" -Dwith-perl="$(usex perl "${EPREFIX}"/usr/bin/perl false)" -Dwith-python="$(usex python "${EPYTHON/.*}" false)" - -Dwith-sysinfo="$(usex plugin-sysinfo true false)" - -Dwith-appdata=false + $(meson_use plugin-sysinfo with-sysinfo) ) meson_src_configure } @@ -94,7 +94,7 @@ src_configure() { src_install() { meson_src_install dodoc readme.md - find "${D}" -name '*.la' -delete || die + find "${ED}" -type f -name '*.la' -delete || die } pkg_preinst() {