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 38597138359 for ; Fri, 13 Nov 2020 21:31:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0921DE082B; Fri, 13 Nov 2020 21:31:35 +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 E7141E082B for ; Fri, 13 Nov 2020 21:31:34 +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 C85A034112B for ; Fri, 13 Nov 2020 21:31:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1743744D for ; Fri, 13 Nov 2020 21:31:32 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1605303075.586064fddf3896883ef78ccc55bd28d5d3fcd006.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/ustr/ustr-1.0.4-r9.ebuild X-VCS-Directories: dev-libs/ustr/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 586064fddf3896883ef78ccc55bd28d5d3fcd006 X-VCS-Branch: master Date: Fri, 13 Nov 2020 21:31:32 +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: ff9a1602-fbe6-43e3-89de-2d050fb222af X-Archives-Hash: 947ee80317c8fea9075523cec1b45543 commit: 586064fddf3896883ef78ccc55bd28d5d3fcd006 Author: Sven Eden prydeworx com> AuthorDate: Sat Nov 7 15:23:45 2020 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Fri Nov 13 21:31:15 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=586064fd dev-libs/ustr-1.0.4-r9 : Update to EAPI 7 Signed-off-by: Sven Eden prydeworx.com> Signed-off-by: Aaron Bauman gentoo.org> dev-libs/ustr/ustr-1.0.4-r9.ebuild | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-libs/ustr/ustr-1.0.4-r9.ebuild b/dev-libs/ustr/ustr-1.0.4-r9.ebuild index 632e404652a..c3bbc52d9eb 100644 --- a/dev-libs/ustr/ustr-1.0.4-r9.ebuild +++ b/dev-libs/ustr/ustr-1.0.4-r9.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs multilib-minimal @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2" LICENSE="|| ( BSD-2 MIT LGPL-2 )" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~mips x86" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" IUSE="static-libs ustr-import" DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO) @@ -21,9 +21,13 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/ustr-conf-debug.h ) +PATCHES=( + "${FILESDIR}/${P}-inline-check.patch" + "${FILESDIR}/${PN}-1.0.4-build-libs.patch" +) + src_prepare() { - epatch "${FILESDIR}/${P}-inline-check.patch" - epatch "${FILESDIR}/${PN}-1.0.4-build-libs.patch" + default multilib_copy_sources }