media-libs/glm: revert to cmake install

Closes: https://bugs.gentoo.org/695648
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>

diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 571ab1845ac958ced6b20671b0b06c56dfc0ef8b..b26407fe392bf40123fdf0450f7ce28ee1c81352 100644 (file)
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,4 +1,5 @@
 DIST glm-0.9.9.2.tar.gz 4572279 BLAKE2B 8b9ade542989b3f73f1a80403b73b5c04c5d64ae259891a6b41564eb7b4417876d527ea8440352f2feec6480ec926ca877a4849c4e75c6ece3692d24d87c942a SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
 DIST glm-0.9.9.4.tar.gz 4578404 BLAKE2B 4c0bb64bb477ca46d45b4d25d7d992a39a82a7d745d4564dfac04c7f6e31ea0741b33d2d6c7832580e6f51f62a2efe269a9601c10d87f1e68b333e71e20c3d02 SHA512 50e4784fcd5f1da4ae27830948ffe4b412ec53447b89d30c6dcc2b4e0f9ec05cca4b07461d3d8a339eb103fae8dac325fabc87607b5397122ce2021d6e15a1a1
 DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B 9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40 SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
+DIST glm-0.9.9.6-install.patch.gz 7594 BLAKE2B a273e1e2adc6bdcaab2a3b66457b59e42384215c19b12ce6d27706d74c4d0ec5f010912c295dff4300a44ebc16cabc09c381df5dede01daf7ebe60cf8b95d060 SHA512 bf489673077dcfc821264cbda55d63cf7a01f4e27cdcadf3f6e0d73f016a24fe590142144e2fa5d074cbc518acf34164653c31a346ab6909cfbd7af6c294e79f
 DIST glm-0.9.9.6.tar.gz 4354114 BLAKE2B e62af8d4fe22eced565a2703f5d02ad935a18a4c9352302fdb203c85149b9374066684246f940e417882d2700d13b93fc0232921151680ec58c9df80ee0be1fd SHA512 1bc8fc1da21e19f95d4a24259993c7932db328fdd2d0db68dbf60c07f372e19003a8df094fb4e153bb7f50df584c17cf0a540d3d3c38b7a287f3b55314ec2d70

diff --git a/media-libs/glm/files/glm.pc.in b/media-libs/glm/files/glm.pc.in
deleted file mode 100644 (file)
index fc5c7bb..0000000
--- a/media-libs/glm/files/glm.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-includedir=${prefix}/include
-
-Name: GLM
-Description: OpenGL Mathematics
-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-r1.ebuild
similarity index 71%
rename from media-libs/glm/glm-0.9.9.6.ebuild
rename to media-libs/glm/glm-0.9.9.6-r1.ebuild
index 7049a117fce106a29cfd6f786cac02fbe6037967..196d3f431fc8e45fb6d81ae77c743599c90fd3c9 100644 (file)
--- a/media-libs/glm/glm-0.9.9.6.ebuild
+++ b/media-libs/glm/glm-0.9.9.6-r1.ebuild
@@ -7,7 +7,8 @@ inherit cmake-utils
 
 DESCRIPTION="OpenGL Mathematics"
 HOMEPAGE="http://glm.g-truc.net/"
-SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz
+       https://dev.gentoo.org/~tupone/distfiles/${P}-install.patch.gz"
 
 LICENSE="|| ( HappyBunny MIT )"
 SLOT="0"
@@ -16,15 +17,10 @@ IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86
 
 RDEPEND="virtual/opengl"
 
-PATCHES=( "${FILESDIR}"/${P}-simd.patch )
-
-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
-}
+PATCHES=(
+       "${FILESDIR}"/${P}-simd.patch
+       "${WORKDIR}"/${P}-install.patch
+)
 
 src_configure() {
        if use test; then
@@ -39,10 +35,3 @@ src_configure() {
 
        cmake-utils_src_configure
 }
-
-src_install() {
-       doheader -r glm
-       dodoc -r *md doc/*
-       insinto /usr/$(get_libdir)/pkgconfig
-       doins glm.pc
-}