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 4AF5E138334 for ; Tue, 10 Sep 2019 17:17:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BA16E08ED; Tue, 10 Sep 2019 17:17:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7F436E08ED for ; Tue, 10 Sep 2019 17:17:21 +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 EEDB234AF6B for ; Tue, 10 Sep 2019 17:17:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C047780 for ; Tue, 10 Sep 2019 17:17:17 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1568135820.19fd8f929f791c589312f4c54634bfdd6cb41d5f.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/glm/, media-libs/glm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/glm/files/glm.pc media-libs/glm/files/glm.pc.in media-libs/glm/glm-0.9.9.6.ebuild X-VCS-Directories: media-libs/glm/files/ media-libs/glm/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 19fd8f929f791c589312f4c54634bfdd6cb41d5f X-VCS-Branch: master Date: Tue, 10 Sep 2019 17:17:17 +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: 12d256fe-54ca-48ac-bda8-68370adf23bb X-Archives-Hash: cb0cf52c1c20ac71c9b3eec50f2ce0dd commit: 19fd8f929f791c589312f4c54634bfdd6cb41d5f Author: Tupone Alfredo gentoo org> AuthorDate: Tue Sep 10 17:17:00 2019 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Tue Sep 10 17:17:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19fd8f92 media-libs/glm: respect EPREFIX Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> media-libs/glm/files/{glm.pc => glm.pc.in} | 4 ++-- media-libs/glm/glm-0.9.9.6.ebuild | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/media-libs/glm/files/glm.pc b/media-libs/glm/files/glm.pc.in similarity index 64% rename from media-libs/glm/files/glm.pc rename to media-libs/glm/files/glm.pc.in index e3bb5acc1af..fc5c7bb7f90 100644 --- a/media-libs/glm/files/glm.pc +++ b/media-libs/glm/files/glm.pc.in @@ -1,7 +1,7 @@ -prefix=/usr +prefix=@CMAKE_INSTALL_PREFIX@ includedir=${prefix}/include Name: GLM Description: OpenGL Mathematics -Version: 0.9.9 +Version: @GLM_VERSION@ Cflags: -I${includedir} diff --git a/media-libs/glm/glm-0.9.9.6.ebuild b/media-libs/glm/glm-0.9.9.6.ebuild index 8b84a358e2b..89d9894cf71 100644 --- a/media-libs/glm/glm-0.9.9.6.ebuild +++ b/media-libs/glm/glm-0.9.9.6.ebuild @@ -16,6 +16,14 @@ IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86 RDEPEND="virtual/opengl" +src_prepare() { + cmake-utils_src_prepare + sed \ + -e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \ + -e "s:@GLM_VERSION@:0.9.9:" \ + "${FILESDIR}"/glm.pc.in > glm.pc || die +} + src_configure() { if use test; then local mycmakeargs=( @@ -34,5 +42,5 @@ src_install() { doheader -r glm dodoc -r *md doc/* insinto /usr/$(get_libdir)/pkgconfig - doins "${FILESDIR}"/glm.pc + doins glm.pc }