[gentoo-commits] repo/gentoo:master commit in: dev-libs/yajl/

[David Seifert]

commit:     a8e6615d50a76cd5eb81422ffb9382677a60114f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 15 23:33:30 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> 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
 }