Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/glm/, media-libs/glm/files/
Date: Tue, 10 Sep 2019 17:17:22
Message-Id: 1568135820.19fd8f929f791c589312f4c54634bfdd6cb41d5f.tupone@gentoo
1 commit: 19fd8f929f791c589312f4c54634bfdd6cb41d5f
2 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 10 17:17:00 2019 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 10 17:17:00 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19fd8f92
7
8 media-libs/glm: respect EPREFIX
9
10 Package-Manager: Portage-2.3.69, Repoman-2.3.16
11 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
12
13 media-libs/glm/files/{glm.pc => glm.pc.in} | 4 ++--
14 media-libs/glm/glm-0.9.9.6.ebuild | 10 +++++++++-
15 2 files changed, 11 insertions(+), 3 deletions(-)
16
17 diff --git a/media-libs/glm/files/glm.pc b/media-libs/glm/files/glm.pc.in
18 similarity index 64%
19 rename from media-libs/glm/files/glm.pc
20 rename to media-libs/glm/files/glm.pc.in
21 index e3bb5acc1af..fc5c7bb7f90 100644
22 --- a/media-libs/glm/files/glm.pc
23 +++ b/media-libs/glm/files/glm.pc.in
24 @@ -1,7 +1,7 @@
25 -prefix=/usr
26 +prefix=@CMAKE_INSTALL_PREFIX@
27 includedir=${prefix}/include
28
29 Name: GLM
30 Description: OpenGL Mathematics
31 -Version: 0.9.9
32 +Version: @GLM_VERSION@
33 Cflags: -I${includedir}
34
35 diff --git a/media-libs/glm/glm-0.9.9.6.ebuild b/media-libs/glm/glm-0.9.9.6.ebuild
36 index 8b84a358e2b..89d9894cf71 100644
37 --- a/media-libs/glm/glm-0.9.9.6.ebuild
38 +++ b/media-libs/glm/glm-0.9.9.6.ebuild
39 @@ -16,6 +16,14 @@ IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86
40
41 RDEPEND="virtual/opengl"
42
43 +src_prepare() {
44 + cmake-utils_src_prepare
45 + sed \
46 + -e "s:@CMAKE_INSTALL_PREFIX@:${EPREFIX}/usr:" \
47 + -e "s:@GLM_VERSION@:0.9.9:" \
48 + "${FILESDIR}"/glm.pc.in > glm.pc || die
49 +}
50 +
51 src_configure() {
52 if use test; then
53 local mycmakeargs=(
54 @@ -34,5 +42,5 @@ src_install() {
55 doheader -r glm
56 dodoc -r *md doc/*
57 insinto /usr/$(get_libdir)/pkgconfig
58 - doins "${FILESDIR}"/glm.pc
59 + doins glm.pc
60 }