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 9F1891382C5 for ; Thu, 15 Mar 2018 23:22:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7378BE08F0; Thu, 15 Mar 2018 23:22:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 45871E08F0 for ; Thu, 15 Mar 2018 23:22:40 +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 B3E14335C81 for ; Thu, 15 Mar 2018 23:22:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5CF115A for ; Thu, 15 Mar 2018 23:22:36 +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: <1521156148.e1d52e9b39fd217360f1ba62d1d42a71fbfe452f.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: e1d52e9b39fd217360f1ba62d1d42a71fbfe452f X-VCS-Branch: master Date: Thu, 15 Mar 2018 23:22:36 +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-Archives-Salt: 3b281aaf-4a35-4795-9150-4f03d2c7f261 X-Archives-Hash: f18438fc46184c4b97117fdca02b23d8 commit: e1d52e9b39fd217360f1ba62d1d42a71fbfe452f Author: Lars Wendler gentoo org> AuthorDate: Thu Mar 15 23:08:58 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Mar 15 23:22:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d52e9b net-irc/hexchat: Converted live ebuild from autotools to meson. Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-irc/hexchat/hexchat-9999.ebuild | 93 ++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 49 deletions(-) diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild index 2e5d52c8be2..2fed964709e 100644 --- a/net-irc/hexchat/hexchat-9999.ebuild +++ b/net-irc/hexchat/hexchat-9999.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -inherit autotools fdo-mime gnome2-utils mono-env python-single-r1 + +inherit gnome2-utils meson mono-env python-single-r1 xdg-utils DESCRIPTION="Graphical IRC client based on XChat" HOMEPAGE="https://hexchat.github.io/" @@ -20,21 +21,25 @@ fi LICENSE="GPL-2 plugin-fishlim? ( MIT )" SLOT="0" -IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl theme-manager" +IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -COMMON_DEPEND="dev-libs/glib:2 - dbus? ( sys-apps/dbus ) - gtk? ( x11-libs/gtk+:2 ) +COMMON_DEPEND=" + dev-libs/glib:2 + dbus? ( dev-libs/dbus-glib ) + gtk? ( + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/pango + ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) - nls? ( virtual/libintl ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( ${PYTHON_DEPS} ) - spell? ( app-text/iso-codes ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) @@ -46,18 +51,15 @@ COMMON_DEPEND="dev-libs/glib:2 ) )" -RDEPEND="${COMMON_DEPEND} - spell? ( app-text/enchant )" -DEPEND="${COMMON_DEPEND} +RDEPEND="${COMMON_DEPEND}" +DEPEND=" + ${COMMON_DEPEND} app-arch/xz-utils - virtual/pkgconfig + app-text/iso-codes dev-util/intltool - theme-manager? ( dev-util/monodevelop )" - -src_prepare() { - default - eautoreconf -} + sys-devel/gettext + virtual/pkgconfig +" pkg_setup() { use python && python-single-r1_pkg_setup @@ -68,33 +70,29 @@ pkg_setup() { } src_configure() { - econf \ - --enable-plugin \ - $(use_enable nls) \ - $(use_enable ssl openssl) \ - $(use_enable gtk gtkfe) \ - $(use_enable !gtk textfe) \ - $(use_enable python python "${EPYTHON}") \ - $(use_enable perl) \ - $(use_enable plugin-checksum checksum) \ - $(use_enable plugin-fishlim fishlim) \ - $(use_enable plugin-sysinfo sysinfo) \ - $(use_enable dbus) \ - $(use_enable lua) \ - $(use_enable libnotify) \ - $(use_enable libcanberra) \ - $(use_enable libproxy) \ - $(use_enable spell isocodes) \ - $(use_enable debug) \ - $(use_with theme-manager) + 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 lua false)" + -Dwith-perl="$(usex perl true false)" + -Dwith-python="$(usex python "${EPYTHON}" false)" + -Dwith-sysinfo="$(usex plugin-sysinfo true false)" + ) + meson_src_configure } src_install() { - emake DESTDIR="${D}" \ - UPDATE_ICON_CACHE=true \ - UPDATE_MIME_DATABASE=true \ - UPDATE_DESKTOP_DATABASE=true \ - install + meson_src_install dodoc readme.md find "${D}" -name '*.la' -delete || die } @@ -108,14 +106,14 @@ pkg_preinst() { pkg_postinst() { if use gtk ; then gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update else elog "You have disabled the gtk USE flag. This means you don't have" elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"." fi if use theme-manager ; then - fdo-mime_desktop_database_update - fdo-mime_mime_database_update elog "Themes are available at:" elog " https://hexchat.github.io/themes.html" fi @@ -132,10 +130,7 @@ pkg_postinst() { pkg_postrm() { if use gtk ; then gnome2_icon_cache_update - fi - - if use theme-manager ; then - fdo-mime_desktop_database_update - fdo-mime_mime_database_update + xdg_desktop_database_update + xdg_mimeinfo_database_update fi }