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 506F4138334 for ; Tue, 21 May 2019 19:30:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63000E0871; Tue, 21 May 2019 19:30:00 +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 44B38E0869 for ; Tue, 21 May 2019 19:30:00 +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 2C622344D58 for ; Tue, 21 May 2019 19:29:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D6815EF for ; Tue, 21 May 2019 19:29:57 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1558466985.243856f76077e7d73c1714b410b538de9cd71dc6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/zimg/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/zimg/zimg-9999.ebuild X-VCS-Directories: media-libs/zimg/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 243856f76077e7d73c1714b410b538de9cd71dc6 X-VCS-Branch: master Date: Tue, 21 May 2019 19:29:57 +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: 65e5f7f6-1bfd-47ea-a65a-50ba1e0fdde0 X-Archives-Hash: 361872b6434babf2986e06fb5342a15d commit: 243856f76077e7d73c1714b410b538de9cd71dc6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue May 21 19:29:20 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue May 21 19:29:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=243856f7 media-libs/zimg: Sync live with 2.7.5 changes Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/zimg/zimg-9999.ebuild | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/media-libs/zimg/zimg-9999.ebuild b/media-libs/zimg/zimg-9999.ebuild index fe1991fc9e0..62adc665df3 100644 --- a/media-libs/zimg/zimg-9999.ebuild +++ b/media-libs/zimg/zimg-9999.ebuild @@ -1,36 +1,31 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -AUTOTOOLS_AUTORECONF=yes - -SCM="" - -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" +if [[ ${PV} = *9999* ]] ; then EGIT_REPO_URI="https://github.com/sekrit-twc/zimg" + inherit git-r3 +else + SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + S="${WORKDIR}/${PN}-release-${PV}/" fi - -inherit autotools-multilib ${SCM} +inherit autotools multilib-minimal DESCRIPTION="Scaling, colorspace conversion, and dithering library" HOMEPAGE="https://github.com/sekrit-twc/zimg" -if [ "${PV#9999}" = "${PV}" ] ; then - SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" - S="${WORKDIR}/${PN}-release-${PV}/" -fi - LICENSE="WTFPL-2" SLOT="0" IUSE="static-libs cpu_flags_x86_sse" -DEPEND="" -RDEPEND="${DEPEND}" +src_prepare() { + default + eautoreconf +} -src_configure() { - autotools-multilib_src_configure \ +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ $(use_enable cpu_flags_x86_sse x86simd) }