Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/hexchat/
Date: Mon, 04 Oct 2021 07:24:52
Message-Id: 1633332282.98f400e631edaf5ec46aadd0aaccb84cc863c7db.polynomial-c@gentoo
1 commit: 98f400e631edaf5ec46aadd0aaccb84cc863c7db
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 4 07:24:32 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 4 07:24:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98f400e6
7
8 net-irc/hexchat: Synced live ebuild
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 net-irc/hexchat/hexchat-9999.ebuild | 38 ++++++++++++++++++-------------------
13 1 file changed, 19 insertions(+), 19 deletions(-)
14
15 diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
16 index 5de62a8f2e7..5964fd0c827 100644
17 --- a/net-irc/hexchat/hexchat-9999.ebuild
18 +++ b/net-irc/hexchat/hexchat-9999.ebuild
19 @@ -22,7 +22,7 @@ fi
20
21 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
22 SLOT="0"
23 -IUSE="dbus debug +gtk libcanberra libnotify libproxy lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
24 +IUSE="dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
25 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
26 python? ( ${PYTHON_REQUIRED_USE} )"
27
28 @@ -36,12 +36,13 @@ RDEPEND="
29 x11-libs/pango
30 )
31 libcanberra? ( media-libs/libcanberra )
32 - libproxy? ( net-libs/libproxy )
33 - libnotify? ( x11-libs/libnotify )
34 lua? ( ${LUA_DEPS} )
35 perl? ( dev-lang/perl:= )
36 plugin-sysinfo? ( sys-apps/pciutils )
37 - python? ( ${PYTHON_DEPS} )
38 + python? (
39 + ${PYTHON_DEPS}
40 + virtual/python-cffi
41 + )
42 ssl? ( dev-libs/openssl:0= )
43 theme-manager? (
44 || (
45 @@ -70,23 +71,22 @@ pkg_setup() {
46
47 src_configure() {
48 local emesonargs=(
49 - -Dwith-gtk="$(usex gtk true false)"
50 - -Dwith-text="$(usex gtk false true)"
51 - -Dwith-ssl="$(usex ssl true false)"
52 - -Dwith-plugin=true
53 - -Dwith-dbus="$(usex dbus true false)"
54 - -Dwith-libproxy="$(usex libproxy true false)"
55 - -Dwith-libnotify="$(usex libnotify true false)"
56 - -Dwith-libcanberra="$(usex libcanberra true false)"
57 - -Dwith-theme-manager="$(usex theme-manager true false)"
58 -Ddbus-service-use-appid=false
59 - -Dwith-checksum="$(usex plugin-checksum true false)"
60 - -Dwith-fishlim="$(usex plugin-fishlim true false)"
61 - -Dwith-lua="$(usex lua ${ELUA} false)"
62 + -Dinstall-appdata=false
63 + -Dplugin=true
64 + $(meson_feature dbus)
65 + $(meson_feature libcanberra)
66 + $(meson_feature ssl tls)
67 + $(meson_use gtk gtk-frontend)
68 + $(meson_use !gtk text-frontend)
69 + $(meson_use theme-manager)
70 +
71 + $(meson_use plugin-checksum with-checksum)
72 + $(meson_use plugin-fishlim with-fishlim)
73 + -Dwith-lua="$(usex lua "${ELUA}" false)"
74 -Dwith-perl="$(usex perl "${EPREFIX}"/usr/bin/perl false)"
75 -Dwith-python="$(usex python "${EPYTHON/.*}" false)"
76 - -Dwith-sysinfo="$(usex plugin-sysinfo true false)"
77 - -Dwith-appdata=false
78 + $(meson_use plugin-sysinfo with-sysinfo)
79 )
80 meson_src_configure
81 }
82 @@ -94,7 +94,7 @@ src_configure() {
83 src_install() {
84 meson_src_install
85 dodoc readme.md
86 - find "${D}" -name '*.la' -delete || die
87 + find "${ED}" -type f -name '*.la' -delete || die
88 }
89
90 pkg_preinst() {