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 35F7A1396DA for ; Mon, 16 Oct 2017 00:08:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 857F22BC015; Mon, 16 Oct 2017 00:08:46 +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 6309C2BC015 for ; Mon, 16 Oct 2017 00:08:46 +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 7F10333BF0B for ; Mon, 16 Oct 2017 00:08:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 45B03326 for ; Mon, 16 Oct 2017 00:08:44 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1508112400.a8e6615d50a76cd5eb81422ffb9382677a60114f.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/yajl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/yajl/yajl-2.0.4-r3.ebuild dev-libs/yajl/yajl-2.1.0.ebuild X-VCS-Directories: dev-libs/yajl/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: a8e6615d50a76cd5eb81422ffb9382677a60114f X-VCS-Branch: master Date: Mon, 16 Oct 2017 00:08:44 +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: 46f1c90c-e8a6-49e4-9b74-5db2ddc028c2 X-Archives-Hash: fbe231aaa909cdd8a67ceda7ab3801d9 commit: a8e6615d50a76cd5eb81422ffb9382677a60114f Author: David Seifert gentoo org> AuthorDate: Sun Oct 15 23:33:30 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Oct 16 00:06:40 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e6615d dev-libs/yajl: [QA] Add cmake-utils_src_prepare Package-Manager: Portage-2.3.11, Repoman-2.3.3 dev-libs/yajl/yajl-2.0.4-r3.ebuild | 10 +++++++--- dev-libs/yajl/yajl-2.1.0.ebuild | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dev-libs/yajl/yajl-2.0.4-r3.ebuild b/dev-libs/yajl/yajl-2.0.4-r3.ebuild index 8096b227502..b0670a2bb73 100644 --- a/dev-libs/yajl/yajl-2.0.4-r3.ebuild +++ b/dev-libs/yajl/yajl-2.0.4-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -14,9 +14,13 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" +PATCHES=( + "${FILESDIR}"/${PN}-fix_static_linking.patch + "${FILESDIR}"/${P}-pkgconfig_multilib.patch +) + src_prepare() { - epatch "${FILESDIR}"/${PN}-fix_static_linking.patch \ - "${FILESDIR}"/${P}-pkgconfig_multilib.patch + cmake-utils_src_prepare multilib_copy_sources } diff --git a/dev-libs/yajl/yajl-2.1.0.ebuild b/dev-libs/yajl/yajl-2.1.0.ebuild index eb73101aaec..0b1c354fe50 100644 --- a/dev-libs/yajl/yajl-2.1.0.ebuild +++ b/dev-libs/yajl/yajl-2.1.0.ebuild @@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86- IUSE="static-libs" src_prepare() { - epatch_user + cmake-utils_src_prepare multilib_copy_sources }