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 0C3A3138350 for ; Sat, 14 Mar 2020 21:44:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB4B2E0BCD; Sat, 14 Mar 2020 21:44:15 +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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B0849E0BDA for ; Sat, 14 Mar 2020 21:44:15 +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 9F87034EF6C for ; Sat, 14 Mar 2020 21:44:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40A1517A for ; Sat, 14 Mar 2020 21:44:13 +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: <1584222243.72a46ec2c5a13914c09afa2571b7f00bfe41a63a.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/spice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/spice/spice-9999.ebuild X-VCS-Directories: app-emulation/spice/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 72a46ec2c5a13914c09afa2571b7f00bfe41a63a X-VCS-Branch: master Date: Sat, 14 Mar 2020 21:44:13 +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: 5c9f10ca-9d21-46b9-bcd0-cfd5c0d4738d X-Archives-Hash: 0d4edf6107fb5edef7a2eeeeeeb02a8d commit: 72a46ec2c5a13914c09afa2571b7f00bfe41a63a Author: Matthias Maier gentoo org> AuthorDate: Sat Mar 14 21:34:44 2020 +0000 Commit: Matthias Maier gentoo org> CommitDate: Sat Mar 14 21:44:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72a46ec2 app-emulation/spice: port live ebuild to meson Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Matthias Maier gentoo.org> app-emulation/spice/spice-9999.ebuild | 56 ++++++++++++++--------------------- 1 file changed, 22 insertions(+), 34 deletions(-) diff --git a/app-emulation/spice/spice-9999.ebuild b/app-emulation/spice/spice-9999.ebuild index 87b4771fb04..6390d08a37a 100644 --- a/app-emulation/spice/spice-9999.ebuild +++ b/app-emulation/spice/spice-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python{3_6,3_7} ) -inherit autotools eutils git-r3 python-any-r1 readme.gentoo-r1 xdg-utils +inherit eutils git-r3 meson python-any-r1 readme.gentoo-r1 xdg-utils DESCRIPTION="SPICE server" HOMEPAGE="https://www.spice-space.org/" @@ -14,21 +14,21 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice.git" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="" -IUSE="libressl lz4 sasl smartcard static-libs gstreamer" +IUSE="libressl lz4 sasl smartcard gstreamer" # the libspice-server only uses the headers of libcacard RDEPEND=" - dev-lang/orc[static-libs(+)?] - >=dev-libs/glib-2.22:2[static-libs(+)?] - media-libs/opus[static-libs(+)?] - sys-libs/zlib[static-libs(+)?] - virtual/jpeg:0=[static-libs(+)?] - >=x11-libs/pixman-0.17.7[static-libs(+)?] - !libressl? ( dev-libs/openssl:0=[static-libs(+)?] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)?] ) - lz4? ( app-arch/lz4:0=[static-libs(+)?] ) + dev-lang/orc + >=dev-libs/glib-2.22:2 + media-libs/opus + sys-libs/zlib + virtual/jpeg:0= + >=x11-libs/pixman-0.17.7 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + lz4? ( app-arch/lz4:0= ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) + sasl? ( dev-libs/cyrus-sasl ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 @@ -52,16 +52,6 @@ pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup } -src_prepare() { - default - - # Delete repo-only Makefile that causes build to fail. - # https://gitlab.freedesktop.org/spice/spice/issues/35 - rm GNUmakefile || die - - eautoreconf -} - src_configure() { # Prevent sandbox violations, bug #586560 # https://bugzilla.gnome.org/show_bug.cgi?id=744134 @@ -70,15 +60,14 @@ src_configure() { xdg_environment_reset - local myconf=" - $(use_enable static-libs static) - $(use_enable lz4) - $(use_with sasl) - $(use_enable smartcard) - --enable-gstreamer=$(usex gstreamer "1.0" "no") - --disable-celt051 - " - econf ${myconf} + local emesonargs=( + $(meson_use lz4) + $(meson_use sasl) + $(meson_feature smartcard) + -Dgstreamer=$(usex gstreamer "1.0" "no") + -Dcelt051=disabled + ) + meson_src_configure } src_compile() { @@ -87,12 +76,11 @@ src_compile() { # https://bugzilla.gnome.org/show_bug.cgi?id=744135 addpredict /dev - default + meson_src_compile } src_install() { - default - use static-libs || find "${D}" -name '*.la' -type f -delete || die + meson_src_install readme.gentoo_create_doc }