Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

4 files changed, 70 insertions, 11 deletions

diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index ebf5cad049f1..0fae2cea86a2 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,7 +1,11 @@
 AUX glm-0.9.8.5-gcc7_tests.patch 2495 BLAKE2B afb4e8d64272497cd3e02ea73ba5536b660b3d73302fab4f2eff4fe87b3a2eae604a04fd5aa7ebc55dc860e419ea370a1c240a1b2d30fd6d522c9f37d3277c50 SHA512 c21859d4db606bd6420a889ae4ae3242b1e60a7f660cbe7aaee1583919a82c47b2f209d596378f8d919aa59c34ebb12beef05a06f969fd6941168b9bbe7e8467
 AUX glm-gcc73.patch 1378 BLAKE2B 98be49157daff3250931510e26f7b21cdee74ab2931f5df50153d31a66d4b85e6b7eeeed2316154a2a4c70ed63c53f530a486672fc6b5255a1de9521cac512ef SHA512 c816b9ab071f5d6ef2435c10699c562807d1e8dac08c896d0a6a76f0bcd6c21f82e831349f544e171897e826c26d23a3bf958f808abc8a3d6b8f1c8b534ccda5
+DIST glm-0.9.6.1.zip 4232099 BLAKE2B ba8e9fc4a4401f9a78c46f6eebe5fdd6bd9af14f8c65bfcac7b61988b551ba27bf8d28f3a50f3f619dad5a10e11adb6988f9408227d10d738ea6d809d81db0bf SHA512 7f1468c5e60e65181f4685a2429fa8d70350a3576175a55b7c9e8597a03837cb84aeaeb88d311e1e1948c5bd90ad9cee9286433cb78fdee54b0fbe5313ce2f84
+DIST glm-0.9.7.6.tar.gz 3457100 BLAKE2B f9c0e481dbac76fa8922d4f58f2d4d60f0735a44a249b1136aa519f7638c21fa193e8c618c784b8b3adbbcf3838e9dbd6ff6a22a2708483bfc39bbea5a24494a SHA512 d4e1e173405c11b5744df8dc12f0848cd84ab27b868434c0f8fc74f15110b78606564991f3063ccc97e68a0aa1c1cb4a1b40ba6ce7feffb0d1a23c3e5cff315a
+DIST glm-0.9.8.4.tar.gz 3769208 BLAKE2B f675d110d1ceb16ed8afe171fd537254bef68790eca010677a15db501f964e0f7ed7a2cacc93e17c71140e7e3cd9a36a12222f0a40c908d01c405ae335be3016 SHA512 ff0e0651a695caebe9235882d14e09546d52b3cdf66cca8e2078f15b02a3fca4e47bd97d2807aa329f76aa633af3b4999501bd4d0b22ad44b00558d4917f39ed
 DIST glm-0.9.8.5.tar.gz 3756809 BLAKE2B 41abc10e1c41c40ad68b7148a8ccbe9d2f4fc8a80c034c86341d12fedb17ab16f96114df28f56f52a12d8d60edecd26ecbcbffe6daa76f035711248240ef6616 SHA512 5a7e84ecc5a54320c74776c133bfdbeaf0d4496a7a7fdf2f4ccf89e66b3665a577a370a662ac97a350a2b1f717ce769cb0826057ebb3b13c9c2fee65f20ac7b4
-DIST glm-0.9.9.0.tar.gz 2716220 BLAKE2B fa48b318532cacd7d89325c615005b028e88b0702ed9248543f7d9a8e201dd6c130a63498d335289c452708dc627ebafc9654888b6db23ff238352fee638f236 SHA512 b7a6996cb98bc334130c33a339275b50ea28d8dfce300f3d14ac52edf0b5c38bf216d318f411e898edef428876c0b2d1f6a6e951f160f31425fe0852ad150421
+EBUILD glm-0.9.6.1.ebuild 524 BLAKE2B 470804896aa3430cb812a7db1adc89c461ed7c2ef1428f63b92c88e6587c0e73f8730d32a454bbc6b63454506a18eabdaacb3a0ccf63dedca833efd3f2b40efe SHA512 c5c46d8dcad501804adbd4b75d852e3df36e93df2f453c862c0b344df5be9a9993dd9c938badb26cad1787ac70a70d33fb1f006d44d6b777f216dc10b4030a4c
+EBUILD glm-0.9.7.6.ebuild 884 BLAKE2B e916a774258380213b4beafd015105cc76592c512d373519d4a67c57d1ac8ceaf199189164270ab78a7d103d59b7c6ac7d60f9d416433cd3d08abf34cd98d660 SHA512 88038c4a32d943061db4879ea6d173b4a8ee8fc9a1574c18f7359ccf106704b70a5f532afc6f68e780ae3f94eebce08e802861b7d240a6ee87d5ba61a1d02ec5
+EBUILD glm-0.9.8.4.ebuild 884 BLAKE2B dff985eff3489d2436afb02b3d3e65f06814e0b78c7690aeac19ec6028b60be37aa3209c8bf8bee0227bd46b9a9928ec959625bbf79e38cbe85ee1b6876c958a SHA512 4404107395ac1389e2c85757eb1c7aa60f75f7c4a4b57fcb9b0de816891d6675df9aa8269dac68008645e535814dda51401e68264741d159ba0602361f177541
 EBUILD glm-0.9.8.5-r1.ebuild 936 BLAKE2B 3d87f95580e299e0a43032bc9b3ac3d8b50d3490d76dda38c6d5b4823923d08354ddda89c780e9e86b189006fd29ad10bc5b6a091b2f208238deeaa45a836ee2 SHA512 91e37f4b86d86514211c652e1fbe58a6fe01542c61172c32c7f1b1ad9fc042c4cd66d2f8650de9e7268a586b0c0ba89057fa0e6dde0848bbcaf21a7bcc6c4e05
-EBUILD glm-0.9.9.0.ebuild 858 BLAKE2B e9bdf5cc1f28f4f182c4755afc0d7f476a6dda7be107e1d84c01f015bc147f2b124bc1197bd42e3c515ac7e07a5872431bb4bbad79d03ffcffd451bc1ce74ed2 SHA512 e8cc8fe5696e2f77ff1c3d003cce52d540ae9a1154bbac1c5b68577e7df980c35047055593d07203c5065ee3b13d027f1f28495bde6ed8714e440e11c40a5dc3
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/glm-0.9.6.1.ebuild b/media-libs/glm/glm-0.9.6.1.ebuild
new file mode 100644
index 000000000000..730a756af3b9
--- /dev/null
+++ b/media-libs/glm/glm-0.9.6.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="OpenGL Mathematics"
+HOMEPAGE="http://glm.g-truc.net/"
+SRC_URI="mirror://sourceforge/ogl-math/${P}.zip"
+
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+src_install() {
+	dodoc readme.txt doc/${PN}.pdf
+	cd ${PN} || die
+	insinto /usr/include/${PN}
+	doins -r *.hpp detail gtc gtx
+	rm "${ED}"usr/include/${PN}/detail/*.cpp || die
+}
diff --git a/media-libs/glm/glm-0.9.7.6.ebuild b/media-libs/glm/glm-0.9.7.6.ebuild
new file mode 100644
index 000000000000..434184d6146c
--- /dev/null
+++ b/media-libs/glm/glm-0.9.7.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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"
+
+LICENSE="|| ( HappyBunny MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+RDEPEND="virtual/opengl"
+
+src_configure() {
+	if use test; then
+		local mycmakeargs=( -DGLM_TEST_ENABLE=ON )
+
+		use cpu_flags_x86_sse2 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_SSE2=ON )
+		use cpu_flags_x86_sse3 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_SSE3=ON )
+		use cpu_flags_x86_avx  && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_AVX=ON )
+		use cpu_flags_x86_avx2 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_AVX2=ON )
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/glm/glm-0.9.9.0.ebuild b/media-libs/glm/glm-0.9.8.4.ebuild
index af2730d813fd..c1f45f53b1a6 100644
--- a/media-libs/glm/glm-0.9.9.0.ebuild
+++ b/media-libs/glm/glm-0.9.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,20 +11,19 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( HappyBunny MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 RDEPEND="virtual/opengl"
 
 src_configure() {
 	if use test; then
-		local mycmakeargs=(
-			-DGLM_TEST_ENABLE=ON
-			-DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
-			-DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
-		)
+		local mycmakeargs=( -DGLM_TEST_ENABLE=ON )
+
+		use cpu_flags_x86_sse2 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_SSE2=ON )
+		use cpu_flags_x86_sse3 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_SSE3=ON )
+		use cpu_flags_x86_avx  && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_AVX=ON )
+		use cpu_flags_x86_avx2 && mycmakeargs+=( -DGLM_TEST_ENABLE_SIMD_AVX2=ON )
 	fi
 
 	cmake-utils_src_configure