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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 27650158086 for ; Fri, 10 Dec 2021 05:49:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2632A2BC00C; Fri, 10 Dec 2021 05:49:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 985D42BC00C for ; Fri, 10 Dec 2021 05:49:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F259342EEA for ; Fri, 10 Dec 2021 05:49:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9057C219 for ; Fri, 10 Dec 2021 05:49:27 +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: <1639115320.bcccc1065cef9551515359072c4c9d1fcdd50fc3.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/wayland-scanner/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/wayland-scanner/wayland-scanner-9999.ebuild X-VCS-Directories: dev-util/wayland-scanner/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: bcccc1065cef9551515359072c4c9d1fcdd50fc3 X-VCS-Branch: master Date: Fri, 10 Dec 2021 05:49:27 +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: 8fbd2a2b-0dce-49c0-a946-de5ee3f6e8b2 X-Archives-Hash: 8a9d45c56187486baccf77a694d19749 commit: bcccc1065cef9551515359072c4c9d1fcdd50fc3 Author: Matt Turner gentoo org> AuthorDate: Fri Dec 10 02:59:01 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Dec 10 05:48:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcccc106 dev-util/wayland-scanner: Move .pc file to neutral location Allows us to drop multilib support too, which only existed to ease the wayland/wayland-scanner package split. Closes: https://bugs.gentoo.org/803533 Signed-off-by: Matt Turner gentoo.org> dev-util/wayland-scanner/wayland-scanner-9999.ebuild | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dev-util/wayland-scanner/wayland-scanner-9999.ebuild b/dev-util/wayland-scanner/wayland-scanner-9999.ebuild index 465ecbc49959..c0f4e25a4339 100644 --- a/dev-util/wayland-scanner/wayland-scanner-9999.ebuild +++ b/dev-util/wayland-scanner/wayland-scanner-9999.ebuild @@ -11,7 +11,7 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" S="${WORKDIR}/wayland-${PV}" fi -inherit meson-multilib +inherit meson DESCRIPTION="wayland-scanner tool" HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland" @@ -22,11 +22,11 @@ SLOT="0" BDEPEND="virtual/pkgconfig" RDEPEND=" !=dev-libs/expat-2.1.0-r3:=[$MULTILIB_USEDEP] + >=dev-libs/expat-2.1.0-r3:= " DEPEND="${RDEPEND}" -multilib_src_configure() { +src_configure() { local emesonargs=( -Ddocumentation=false -Ddtd_validation=false @@ -36,3 +36,9 @@ multilib_src_configure() { ) meson_src_configure } + +src_install() { + meson_src_install + + mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/share/pkgconfig +}