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 128A7139695 for ; Thu, 11 May 2017 05:07:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B0C521C244; Thu, 11 May 2017 05:07:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4758721C244 for ; Thu, 11 May 2017 05:07:51 +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 F3538341694 for ; Thu, 11 May 2017 05:07:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C9F17455 for ; Thu, 11 May 2017 05:07:48 +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: <1494479227.434ade008ad3c7097abf2c9074b6953de53488cf.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/spice/files/, app-emulation/spice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/spice/files/spice-0.13.3-skip_faulty_lz4_check.patch app-emulation/spice/spice-0.13.3-r1.ebuild X-VCS-Directories: app-emulation/spice/ app-emulation/spice/files/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 434ade008ad3c7097abf2c9074b6953de53488cf X-VCS-Branch: master Date: Thu, 11 May 2017 05:07: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-Archives-Salt: 13ccb2d3-3254-4f5e-a659-ce2642c30227 X-Archives-Hash: c1c94abfb621c74b5e4a2d7cb34fbea9 commit: 434ade008ad3c7097abf2c9074b6953de53488cf Author: Matthias Maier gentoo org> AuthorDate: Thu May 11 05:07:07 2017 +0000 Commit: Matthias Maier gentoo org> CommitDate: Thu May 11 05:07:07 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=434ade00 app-emulation/spice: compatibility fixes for app-arch/lz4-1.7.4, bug #617202 Package-Manager: Portage-2.3.5, Repoman-2.3.2 .../spice/files/spice-0.13.3-skip_faulty_lz4_check.patch | 13 +++++++++++++ app-emulation/spice/spice-0.13.3-r1.ebuild | 14 ++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app-emulation/spice/files/spice-0.13.3-skip_faulty_lz4_check.patch b/app-emulation/spice/files/spice-0.13.3-skip_faulty_lz4_check.patch new file mode 100644 index 00000000000..6ae65ba6d13 --- /dev/null +++ b/app-emulation/spice/files/spice-0.13.3-skip_faulty_lz4_check.patch @@ -0,0 +1,13 @@ +diff --git a/spice-common/m4/spice-deps.m4 b/spice-common/m4/spice-deps.m4 +index adedec4..6cb8bde 100644 +--- a/spice-common/m4/spice-deps.m4 ++++ b/spice-common/m4/spice-deps.m4 +@@ -185,7 +185,7 @@ AC_DEFUN([SPICE_CHECK_LZ4], [ + + have_lz4="no" + if test "x$enable_lz4" != "xno"; then +- PKG_CHECK_MODULES([LZ4], [liblz4 >= 129], [have_lz4="yes"], [have_lz4="no"]) ++ PKG_CHECK_MODULES([LZ4], [liblz4], [have_lz4="yes"], [have_lz4="no"]) + + if test "x$have_lz4" = "xyes"; then + AC_DEFINE(USE_LZ4, [1], [Define to build with lz4 support]) diff --git a/app-emulation/spice/spice-0.13.3-r1.ebuild b/app-emulation/spice/spice-0.13.3-r1.ebuild index 1ac1307cb87..ad83ef4e2ef 100644 --- a/app-emulation/spice/spice-0.13.3-r1.ebuild +++ b/app-emulation/spice/spice-0.13.3-r1.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -inherit ltprune python-any-r1 readme.gentoo-r1 xdg-utils +inherit autotools ltprune python-any-r1 readme.gentoo-r1 xdg-utils DESCRIPTION="SPICE server" HOMEPAGE="http://spice-space.org/" @@ -25,7 +25,7 @@ RDEPEND=" >=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 ) + lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 ) @@ -41,6 +41,10 @@ DEPEND="${RDEPEND} smartcard? ( app-emulation/qemu[smartcard] ) " +PATCHES=( + "${FILESDIR}"/${PN}-0.13.3-skip_faulty_lz4_check.patch +) + python_check_deps() { has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]" has_version "dev-python/six[${PYTHON_USEDEP}]" @@ -50,6 +54,12 @@ pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup } +src_prepare() { + default + + eautoreconf +} + # maintainer notes: # * opengl support is currently broken src_configure() {