gentoo resync : 03.11.2019

3 files changed, 8 insertions, 26 deletions

diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index a8906b664ce3..beea10de7993 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,12 +1,12 @@
 AUX glm-0.9.9.2-avx.patch 1124 BLAKE2B d7cf404b222d98ea4771c354ad3afa712e217be0a4e917c026f79cfb7262e1be9faa2efe85c5bf2cae8df446b421b5f3c1c5545fcc8f6cf3181f6b50425dd680 SHA512 a6a67dccfd9eeecf3ddf083de89da2fd48498a1d815e58d82a9f53feab164d46450c8a41978fcb131b9517e468bdc0949ce4c15b1b24ffe9c0dd6e94516c7874
 AUX glm-0.9.9.6-simd.patch 427 BLAKE2B 9f6e4637ff526497ba9a77247125d1fe5f06eda9bb689b5c42661deb72703b004e2c18f7236503f0673b354ba0e6fa7b13361606ea64fc0e7b9e55eccead91a2 SHA512 72f46827cd6651dd6fddc7ba548f8d9132fd74b9799a8eca6e94435141e96f752917b4343d4c3f37536bbc7713e978e4d85842da6d262c086019eb85f351a431
-AUX glm.pc.in 149 BLAKE2B 9a34ca2590ef006315e004fa6ba0b08469c9da348d8354d0ab6a7e602da1d49126cffbd28c2aab2e2dbe711d047d482b4aead45d1e8770ab571e23e895201b4d SHA512 c875971c208bac82c1a326ebcd327ec9dd92a5b86981d26bf759516107204876a401ac9c57ca6c9965021364678ebbffcaaca6a3b4ee0e532d468d7b03b3ab9b
 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
 EBUILD glm-0.9.9.2.ebuild 901 BLAKE2B 1c30f2fc621753312f50d87ec0d30f52ad3b9a7398eac0d2a9616ea7da8e0e64910df8e62906ccb177066ad6bf8c4ba5b0b9e60a1c7ab18f589785fa74fb59fc SHA512 609b1bf19b416890cbfc4be4e2a44dede933227d8c41e766a29a4ca8466432598f9a7a4f8c1f7c43d8a5f84f2adb37f31ea5e4292a853a7765cf46828cbaaf68
 EBUILD glm-0.9.9.4.ebuild 862 BLAKE2B c61eb288647c2a83103c8a86c7b252b4c13a7585ecde28683df41561eb652a0a3cc9eb3ad31041110f55398ecc467ef7e77f41545f340bd2526d80338bb9c1cb SHA512 ccc3cc2e8c95d6b31aa5ebadd3f7c5c5418e3e1060bfd92cb8b2cf595a6c0b03ffea9c837985a60c2c022d17077b18586e492841df8bb18922f3715aa6f70b73
 EBUILD glm-0.9.9.5.ebuild 861 BLAKE2B c26fed064cd65b6f4a56b5c52c6938a6f4035690e5c31931ee316cca499088792dd157ac6f2ea68bcfe54d0fd5c482f293e817acedf339e979b8cedcc9fe2982 SHA512 22779553f39a41a0153ecd14a54d0995194615dde016ff2bfd2a7bc579812631585692a89565f05b05d474cdf88a4c06bea4d088bbad2ad6f18b0958b1670bc9
-EBUILD glm-0.9.9.6.ebuild 1188 BLAKE2B a9e4dae62e1da284caa285fd4d7fc9b36468f0401e4e06a3969eddbb04278939bec0f13265603885f672cd809b56d565ac3398e918548f0df5e678b26f36b190 SHA512 8ab394f2f0ec3c9129889bfb069251ccbf57849b09a68188abba5fa8a4af69dca4bb72e696a4b0a65b563e7baee29d140dfe2fd59d2157d4383ca231fb76831b
+EBUILD glm-0.9.9.6-r1.ebuild 1003 BLAKE2B d2bc8e26da5780c096d224140f22291ac8df60e2506a130aff3d7f7849d33e9db66b4d1b925f2f31972c3d746979bbc1b52a4eda7a272afddb27181f48b105d3 SHA512 f2051f5cfbdb84d03a3a69608dcc6bc4beef2a80843670ecd53ea68271c8d37e2883767004afff2ef50798147f720938ae9749497812f0775b0824eadf196dcb
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/files/glm.pc.in b/media-libs/glm/files/glm.pc.in
deleted file mode 100644
index fc5c7bb7f90c..000000000000
--- 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
index 7049a117fce1..196d3f431fc8 100644
--- 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
-}