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 4FEF1139118 for ; Wed, 23 Oct 2019 22:52:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F08AE0863; Wed, 23 Oct 2019 22:52:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 17C87E0863 for ; Wed, 23 Oct 2019 22:52:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8E82134C2E4 for ; Wed, 23 Oct 2019 22:52:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 16578779 for ; Wed, 23 Oct 2019 22:52:22 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1571871133.3ee87329e9c398afbef08c4aee018dcc98d43961.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/spice-gtk/spice-gtk-9999.ebuild X-VCS-Directories: net-misc/spice-gtk/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 3ee87329e9c398afbef08c4aee018dcc98d43961 X-VCS-Branch: master Date: Wed, 23 Oct 2019 22:52:22 +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: 0473f2ae-77b9-43b7-b3da-8d29f36f1b91 X-Archives-Hash: 2b6f37db16589dc6ea7cf746d35bf2aa commit: 3ee87329e9c398afbef08c4aee018dcc98d43961 Author: Michal Privoznik redhat com> AuthorDate: Fri Oct 18 22:16:28 2019 +0000 Commit: Matthias Maier gentoo org> CommitDate: Wed Oct 23 22:52:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee87329 net-misc/spice-gtk: Switch live ebuild to meson The upstream abandoned autotools in favor of meson in v0.37-32-g9837f97 (even though meson support was introduced in previous release in v0.36~128). Unfortunately, the 'static-libs' use flag must be dropped because meson doesn't build static libraries by default, only if developer write meson file in that fashion, which spice-gtk developers didn't do. GCONF_DEBUG eclass variable is removed too - it's banned in EAPI 6+ anyway. Signed-off-by: Michal Privoznik redhat.com> Signed-off-by: Matthias Maier gentoo.org> net-misc/spice-gtk/spice-gtk-9999.ebuild | 53 ++++++++++++-------------------- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild index 22c904f6f15..96f51b0281d 100644 --- a/net-misc/spice-gtk/spice-gtk-9999.ebuild +++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild @@ -3,12 +3,10 @@ EAPI=7 -GCONF_DEBUG="no" -WANT_AUTOMAKE="1.12" VALA_MIN_API_VERSION="0.14" VALA_USE_DEPEND="vapigen" -inherit autotools desktop eutils git-r3 readme.gentoo-r1 vala xdg-utils +inherit desktop eutils git-r3 meson readme.gentoo-r1 vala xdg-utils DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI" HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/" @@ -17,7 +15,7 @@ LICENSE="LGPL-2.1" SLOT="0" EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git" KEYWORDS="" -IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl" +IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav libressl" # TODO: # * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h @@ -80,8 +78,6 @@ src_prepare() { default - eautoreconf - use vala && vala_src_prepare } @@ -94,28 +90,22 @@ src_configure() { # Clean up environment, bug #586642 xdg_environment_reset - local myconf - myconf=" - $(use_with gtk3 gtk 3.0) - $(use_enable introspection) - $(use_enable mjpeg builtin-mjpeg) - $(use_enable policykit polkit) - $(use_enable pulseaudio pulse) - $(use_with sasl) - $(use_enable smartcard) - $(use_enable static-libs static) - $(use_enable usbredir) - $(use_with usbredir usb-acl-helper-dir /usr/libexec) - $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) - $(use_enable vala) - $(use_enable webdav) - --disable-celt051 - --disable-gtk-doc - --disable-maintainer-mode - --disable-werror - --enable-pie" - - econf ${myconf} + local emesonargs=( + $(meson_feature gtk3 gtk) + $(meson_feature introspection) + $(meson_use mjpeg builtin-mjpeg) + $(meson_feature policykit polkit) + $(meson_feature pulseaudio pulse) + $(meson_feature sasl) + $(meson_feature smartcard) + $(meson_feature usbredir) + $(usex usbredir -Dusb-acl-helper-dir=/usr/libexec) + $(usex usbredir -Dusb-ids-path=/usr/share/misc/usb.ids) + $(meson_feature vala vapi) + $(meson_feature webdav) + ) + + meson_src_configure } src_compile() { @@ -124,14 +114,11 @@ src_compile() { # https://bugzilla.gnome.org/show_bug.cgi?id=744135 addpredict /dev - default + meson_src_compile } src_install() { - default - - # Remove .la files if they're not needed - use static-libs || find "${D}" -name '*.la' -delete || die + meson_src_install make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" readme.gentoo_create_doc