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 9F11A1382C5 for ; Sat, 30 Jan 2021 17:47:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C876BE0ACB; Sat, 30 Jan 2021 17:47:09 +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 A7B8CE0ACB for ; Sat, 30 Jan 2021 17:47:09 +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 30F32340CAA for ; Sat, 30 Jan 2021 17:47:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8EDF3476 for ; Sat, 30 Jan 2021 17:47:06 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1612028815.9efd48cbc7ee283de208269aa714254db681a2bf.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/waffle/waffle-9999.ebuild X-VCS-Directories: media-libs/waffle/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 9efd48cbc7ee283de208269aa714254db681a2bf X-VCS-Branch: master Date: Sat, 30 Jan 2021 17:47:06 +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: 80f98fa2-0b1d-4e8f-8aff-1f96788c8a72 X-Archives-Hash: 66558210a3ffc8c9e218982d1accb59d commit: 9efd48cbc7ee283de208269aa714254db681a2bf Author: Matt Turner gentoo org> AuthorDate: Sat Jan 30 17:38:37 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Jan 30 17:46:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9efd48cb media-libs/waffle: Use tags instead of gitlab releases And improve documentation generation. Signed-off-by: Matt Turner gentoo.org> media-libs/waffle/waffle-9999.ebuild | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild index 1786f943ad9..43899a8515c 100644 --- a/media-libs/waffle/waffle-9999.ebuild +++ b/media-libs/waffle/waffle-9999.ebuild @@ -7,8 +7,9 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}" GIT_ECLASS="git-r3" else - SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/raw/website/files/release/${P}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" + KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86" + S="${WORKDIR}"/${PN}-v${PV} fi inherit meson multilib-minimal ${GIT_ECLASS} @@ -47,7 +48,7 @@ multilib_src_configure() { $(meson_feature X x11_egl) $(meson_feature gbm) $(meson_feature egl surfaceless_egl) - -Dbuild-manpages=true + -Dbuild-manpages=$(multilib_is_native_abi && echo true || echo false) -Dbuild-tests=false ) meson_src_configure @@ -60,5 +61,7 @@ multilib_src_compile() { multilib_src_install() { meson_src_install - ! use doc && rm -rf "${D}"/usr/share/doc/waffle1 + ! use doc && rm -rf \ + "${D}"/usr/share/doc/waffle1 \ + "${D}"/usr/share/man/man{3,7} }