1 |
commit: 7bf97178eba827b7b8257a6e47d4236d9a2f32e2 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 12 21:02:26 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 15 02:30:26 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bf97178 |
7 |
|
8 |
media-libs/assimp: Drop old |
9 |
|
10 |
Closes: https://bugs.gentoo.org/571896 |
11 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
12 |
|
13 |
media-libs/assimp/Manifest | 4 -- |
14 |
media-libs/assimp/assimp-3.0.1270.ebuild | 35 ----------------- |
15 |
media-libs/assimp/assimp-3.1.1.ebuild | 38 ------------------- |
16 |
media-libs/assimp/assimp-3.2-r2.ebuild | 44 ---------------------- |
17 |
media-libs/assimp/assimp-3.2-r3.ebuild | 54 --------------------------- |
18 |
media-libs/assimp/assimp-3.3.1.ebuild | 50 ------------------------- |
19 |
media-libs/assimp/files/findassimp.patch | 18 --------- |
20 |
media-libs/assimp/files/test-cmakelists.patch | 35 ----------------- |
21 |
media-libs/assimp/metadata.xml | 1 - |
22 |
9 files changed, 279 deletions(-) |
23 |
|
24 |
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest |
25 |
index 1b8f5764121..6e8afcaf3dc 100644 |
26 |
--- a/media-libs/assimp/Manifest |
27 |
+++ b/media-libs/assimp/Manifest |
28 |
@@ -1,5 +1 @@ |
29 |
-DIST assimp--3.0.1270-source-only.zip 4042147 BLAKE2B 1a96a958304d8cdb635f00bb20629aa959d6b158e6d86a465c913cb86e8bf9bbb29d7619c0de685b67483dd1ec12561f1bce63e3cbd6594d99617c3697287145 SHA512 0c23e4eafbd2ff5eb6371b9a3b83ea2b0ef65110f6091a4e63e28b83a6dd1939f1f03607ad002cb5e9a632b821f65d1cc78b63d7792f45ed186071ef0a7ab820 |
30 |
-DIST assimp-3.1.1.zip 32869052 BLAKE2B 877b1a00a8e35eafb85c0f1b1c364c025a98c629da1797961f71df92ee0508b66606aca2b3f69d4da25ec6edef105776d8c4ef83335f3aa3cff1af5232be6745 SHA512 c466d312c0db53fa31b5d1e9b0f65e547a82fb28b1df0a6a96f0dcd876b636a6883d9d705d325193acc58910272b5f158ba37d824ecad29eccf7cf5731697527 |
31 |
-DIST assimp-3.2.tar.gz 33756081 BLAKE2B 76de8f74b7b2eae04ebd3d71b69709d601d249a4ed7e6102fffce376f67dfb2d433536556e7683bc79d092465940cd5d7750f7fecb54edd33b9e8bfa974f8de0 SHA512 d9c4b1efc319990726605664ef38fda49d23a8f169261dda007d912015f404737b2c2a8306bffb837827e4a62d5fb362dae384b85b865450a5622325fe13ad7a |
32 |
-DIST assimp-3.3.1.tar.gz 36428380 BLAKE2B 5239648ea99e23a1f5f568fb22e6f9607b3f2e642fcdb480737c8813456fee699a4a07937c248ded01c27edd503f1a30ae8bde30ff49d8bac61e6363f12d1cc5 SHA512 660a720f1698e12e6505a554638b15108dfe94f081eb61c675bba9ae979fd80fe8552f6c4c366ff391be6cb34e799c5cf000f621f064105a161caedc82dd934a |
33 |
DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb |
34 |
|
35 |
diff --git a/media-libs/assimp/assimp-3.0.1270.ebuild b/media-libs/assimp/assimp-3.0.1270.ebuild |
36 |
deleted file mode 100644 |
37 |
index 37368a1bb93..00000000000 |
38 |
--- a/media-libs/assimp/assimp-3.0.1270.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,35 +0,0 @@ |
41 |
-# Copyright 1999-2017 Gentoo Foundation |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
- |
44 |
-EAPI=5 |
45 |
- |
46 |
-inherit cmake-utils versionator |
47 |
- |
48 |
-DESCRIPTION="Importer library to import assets from 3D files" |
49 |
-HOMEPAGE="http://assimp.sourceforge.net/" |
50 |
-SRC_URI="mirror://sourceforge/${PN}/${PN}--${PV}-source-only.zip" |
51 |
- |
52 |
-LICENSE="BSD" |
53 |
-KEYWORDS="~amd64 ~x86" |
54 |
-IUSE="+boost samples static tools" |
55 |
-SLOT="0" |
56 |
- |
57 |
-DEPEND=" |
58 |
- boost? ( dev-libs/boost ) |
59 |
- samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) |
60 |
- sys-libs/zlib |
61 |
-" |
62 |
-RDEPEND="${DEPEND}" |
63 |
- |
64 |
-S=${WORKDIR}/${PN}--${PV}-source-only |
65 |
- |
66 |
-src_configure() { |
67 |
- local mycmakeargs=( |
68 |
- $(cmake-utils_use_build samples ASSIMP_SAMPLES) \ |
69 |
- $(cmake-utils_use_build tools ASSIMP_TOOLS) \ |
70 |
- $(cmake-utils_use_build static STATIC_LIB) \ |
71 |
- $(cmake-utils_use_enable !boost BOOST_WORKAROUND) |
72 |
- ) |
73 |
- |
74 |
- cmake-utils_src_configure |
75 |
-} |
76 |
|
77 |
diff --git a/media-libs/assimp/assimp-3.1.1.ebuild b/media-libs/assimp/assimp-3.1.1.ebuild |
78 |
deleted file mode 100644 |
79 |
index b3850b085c7..00000000000 |
80 |
--- a/media-libs/assimp/assimp-3.1.1.ebuild |
81 |
+++ /dev/null |
82 |
@@ -1,38 +0,0 @@ |
83 |
-# Copyright 1999-2017 Gentoo Foundation |
84 |
-# Distributed under the terms of the GNU General Public License v2 |
85 |
- |
86 |
-EAPI=5 |
87 |
- |
88 |
-inherit cmake-utils versionator |
89 |
- |
90 |
-DESCRIPTION="Importer library to import assets from 3D files" |
91 |
-HOMEPAGE="http://assimp.sourceforge.net/" |
92 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip" |
93 |
- |
94 |
-LICENSE="BSD" |
95 |
-KEYWORDS="amd64 ~arm x86" |
96 |
-IUSE="+boost samples static tools" |
97 |
-SLOT="0" |
98 |
- |
99 |
-DEPEND=" |
100 |
- boost? ( dev-libs/boost ) |
101 |
- samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) |
102 |
- sys-libs/zlib |
103 |
-" |
104 |
-RDEPEND="${DEPEND}" |
105 |
- |
106 |
-src_prepare() { |
107 |
- sed -i -e 's/ASSIMP_LIB_INSTALL_DIR "lib"/ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt || die |
108 |
- cmake-utils_src_prepare |
109 |
-} |
110 |
- |
111 |
-src_configure() { |
112 |
- local mycmakeargs=( |
113 |
- $(cmake-utils_use_build samples ASSIMP_SAMPLES) \ |
114 |
- $(cmake-utils_use_build tools ASSIMP_TOOLS) \ |
115 |
- $(cmake-utils_use_build static STATIC_LIB) \ |
116 |
- $(cmake-utils_use_enable !boost BOOST_WORKAROUND) |
117 |
- ) |
118 |
- |
119 |
- cmake-utils_src_configure |
120 |
-} |
121 |
|
122 |
diff --git a/media-libs/assimp/assimp-3.2-r2.ebuild b/media-libs/assimp/assimp-3.2-r2.ebuild |
123 |
deleted file mode 100644 |
124 |
index 0e5083ca247..00000000000 |
125 |
--- a/media-libs/assimp/assimp-3.2-r2.ebuild |
126 |
+++ /dev/null |
127 |
@@ -1,44 +0,0 @@ |
128 |
-# Copyright 1999-2017 Gentoo Foundation |
129 |
-# Distributed under the terms of the GNU General Public License v2 |
130 |
- |
131 |
-EAPI=5 |
132 |
- |
133 |
-inherit cmake-utils versionator multilib |
134 |
- |
135 |
-DESCRIPTION="Importer library to import assets from 3D files" |
136 |
-HOMEPAGE="https://github.com/assimp/assimp" |
137 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
138 |
- |
139 |
-LICENSE="BSD" |
140 |
-KEYWORDS="~amd64 ~arm ~x86" |
141 |
-IUSE="+boost samples static test tools" |
142 |
-SLOT="0" |
143 |
- |
144 |
-RDEPEND=" |
145 |
- boost? ( dev-libs/boost ) |
146 |
- samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) |
147 |
- sys-libs/zlib |
148 |
-" |
149 |
-DEPEND="${RDEPEND} |
150 |
- test? ( dev-cpp/gtest ) |
151 |
-" |
152 |
- |
153 |
-PATCHES=( "${FILESDIR}/test-cmakelists.patch" ) |
154 |
- |
155 |
-src_configure() { |
156 |
- local mycmakeargs=( |
157 |
- $(cmake-utils_use_build samples ASSIMP_SAMPLES) \ |
158 |
- $(cmake-utils_use_build tools ASSIMP_TOOLS) \ |
159 |
- $(cmake-utils_use_build static STATIC_LIB) \ |
160 |
- $(cmake-utils_use_enable !boost BOOST_WORKAROUND) \ |
161 |
- $(cmake-utils_use_build test TESTS) |
162 |
- -DCMAKE_DEBUG_POSTFIX="" |
163 |
- -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/" |
164 |
- ) |
165 |
- |
166 |
- cmake-utils_src_configure |
167 |
-} |
168 |
- |
169 |
-src_test() { |
170 |
- "${BUILD_DIR}/test/unit" || die |
171 |
-} |
172 |
|
173 |
diff --git a/media-libs/assimp/assimp-3.2-r3.ebuild b/media-libs/assimp/assimp-3.2-r3.ebuild |
174 |
deleted file mode 100644 |
175 |
index 4fd114b62ed..00000000000 |
176 |
--- a/media-libs/assimp/assimp-3.2-r3.ebuild |
177 |
+++ /dev/null |
178 |
@@ -1,54 +0,0 @@ |
179 |
-# Copyright 1999-2017 Gentoo Foundation |
180 |
-# Distributed under the terms of the GNU General Public License v2 |
181 |
- |
182 |
-EAPI=5 |
183 |
- |
184 |
-inherit cmake-utils versionator multilib |
185 |
- |
186 |
-DESCRIPTION="Importer library to import assets from 3D files" |
187 |
-HOMEPAGE="https://github.com/assimp/assimp" |
188 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
189 |
- |
190 |
-LICENSE="BSD" |
191 |
-KEYWORDS="~amd64 ~arm ~x86" |
192 |
-IUSE="+boost samples static test tools" |
193 |
-SLOT="0" |
194 |
- |
195 |
-RDEPEND=" |
196 |
- boost? ( dev-libs/boost ) |
197 |
- samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) |
198 |
- sys-libs/zlib |
199 |
-" |
200 |
-DEPEND="${RDEPEND} |
201 |
- test? ( dev-cpp/gtest ) |
202 |
-" |
203 |
- |
204 |
-PATCHES=( |
205 |
- "${FILESDIR}/test-cmakelists.patch" |
206 |
- "${FILESDIR}/findassimp.patch" |
207 |
-) |
208 |
- |
209 |
-src_configure() { |
210 |
- local mycmakeargs=( |
211 |
- $(cmake-utils_use_build samples ASSIMP_SAMPLES) \ |
212 |
- $(cmake-utils_use_build tools ASSIMP_TOOLS) \ |
213 |
- $(cmake-utils_use_build static STATIC_LIB) \ |
214 |
- $(cmake-utils_use_enable !boost BOOST_WORKAROUND) \ |
215 |
- $(cmake-utils_use_build test TESTS) |
216 |
- -DCMAKE_DEBUG_POSTFIX="" |
217 |
- -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/" |
218 |
- ) |
219 |
- |
220 |
- cmake-utils_src_configure |
221 |
-} |
222 |
- |
223 |
-src_install() { |
224 |
- cmake-utils_src_install |
225 |
- |
226 |
- insinto /usr/share/cmake/Modules |
227 |
- doins cmake-modules/Findassimp.cmake |
228 |
-} |
229 |
- |
230 |
-src_test() { |
231 |
- "${BUILD_DIR}/test/unit" || die |
232 |
-} |
233 |
|
234 |
diff --git a/media-libs/assimp/assimp-3.3.1.ebuild b/media-libs/assimp/assimp-3.3.1.ebuild |
235 |
deleted file mode 100644 |
236 |
index e051dd165ea..00000000000 |
237 |
--- a/media-libs/assimp/assimp-3.3.1.ebuild |
238 |
+++ /dev/null |
239 |
@@ -1,50 +0,0 @@ |
240 |
-# Copyright 1999-2017 Gentoo Foundation |
241 |
-# Distributed under the terms of the GNU General Public License v2 |
242 |
- |
243 |
-EAPI=6 |
244 |
- |
245 |
-inherit cmake-utils versionator multilib |
246 |
- |
247 |
-DESCRIPTION="Importer library to import assets from 3D files" |
248 |
-HOMEPAGE="https://github.com/assimp/assimp" |
249 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
250 |
- |
251 |
-LICENSE="BSD" |
252 |
-KEYWORDS="~amd64 ~arm ~x86" |
253 |
-IUSE="samples static test tools" |
254 |
-SLOT="0" |
255 |
- |
256 |
-RDEPEND=" |
257 |
- dev-libs/boost |
258 |
- samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) |
259 |
- sys-libs/zlib |
260 |
-" |
261 |
-DEPEND="${RDEPEND} |
262 |
- test? ( dev-cpp/gtest ) |
263 |
-" |
264 |
- |
265 |
-PATCHES=( "${FILESDIR}/findassimp-${PV}.patch" ) |
266 |
- |
267 |
-src_configure() { |
268 |
- local mycmakeargs=( |
269 |
- -DASSIMP_BUILD_SAMPLES=$(usex samples) \ |
270 |
- -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools) \ |
271 |
- -DASSIMP_BUILD_STATIC_LIB=$(usex static) \ |
272 |
- -DASSIMP_BUILD_TESTS=$(usex test) |
273 |
- -DCMAKE_DEBUG_POSTFIX="" |
274 |
- -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/" |
275 |
- ) |
276 |
- |
277 |
- cmake-utils_src_configure |
278 |
-} |
279 |
- |
280 |
-src_install() { |
281 |
- cmake-utils_src_install |
282 |
- |
283 |
- insinto /usr/share/cmake/Modules |
284 |
- doins cmake-modules/Findassimp.cmake |
285 |
-} |
286 |
- |
287 |
-src_test() { |
288 |
- "${BUILD_DIR}/test/unit" || die |
289 |
-} |
290 |
|
291 |
diff --git a/media-libs/assimp/files/findassimp.patch b/media-libs/assimp/files/findassimp.patch |
292 |
deleted file mode 100644 |
293 |
index 1b62e7301ff..00000000000 |
294 |
--- a/media-libs/assimp/files/findassimp.patch |
295 |
+++ /dev/null |
296 |
@@ -1,18 +0,0 @@ |
297 |
---- cmake-modules/Findassimp.cmake.old 2016-09-06 08:26:35.107697600 +0200 |
298 |
-+++ cmake-modules/Findassimp.cmake 2016-09-06 08:29:25.337696582 +0200 |
299 |
-@@ -1,13 +1,13 @@ |
300 |
- FIND_PATH( |
301 |
- assimp_INCLUDE_DIRS |
302 |
- NAMES postprocess.h scene.h version.h config.h cimport.h |
303 |
-- PATHS /usr/local/include/ |
304 |
-+ PATHS /usr/include/ |
305 |
- ) |
306 |
- |
307 |
- FIND_LIBRARY( |
308 |
- assimp_LIBRARIES |
309 |
- NAMES assimp |
310 |
-- PATHS /usr/local/lib/ |
311 |
-+ PATHS /usr/lib/ |
312 |
- ) |
313 |
- |
314 |
- IF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) |
315 |
|
316 |
diff --git a/media-libs/assimp/files/test-cmakelists.patch b/media-libs/assimp/files/test-cmakelists.patch |
317 |
deleted file mode 100644 |
318 |
index 9a3471bbc36..00000000000 |
319 |
--- a/media-libs/assimp/files/test-cmakelists.patch |
320 |
+++ /dev/null |
321 |
@@ -1,35 +0,0 @@ |
322 |
---- test/CMakeLists.txt.old 2016-01-21 06:46:12.053363212 +0100 |
323 |
-+++ test/CMakeLists.txt 2016-01-21 06:46:51.126697143 +0100 |
324 |
-@@ -1,7 +1,5 @@ |
325 |
- cmake_minimum_required( VERSION 2.6 ) |
326 |
- |
327 |
--INCLUDE( AddGTest ) |
328 |
-- |
329 |
- INCLUDE_DIRECTORIES( |
330 |
- ${Assimp_SOURCE_DIR}/include |
331 |
- ${Assimp_SOURCE_DIR}/code |
332 |
-@@ -47,7 +45,7 @@ |
333 |
- |
334 |
- SOURCE_GROUP( tests FILES ${TEST_SRCS} ) |
335 |
- |
336 |
--if(AddGTest_FOUND) |
337 |
-+if(BUILD_TESTS) |
338 |
- add_executable( unit |
339 |
- unit/CCompilerTest.c |
340 |
- unit/Main.cpp |
341 |
-@@ -56,13 +54,12 @@ |
342 |
- ) |
343 |
- |
344 |
- add_definitions(-DASSIMP_TEST_MODELS_DIR="${CMAKE_CURRENT_LIST_DIR}/models") |
345 |
-+target_link_libraries( unit gtest ) |
346 |
- |
347 |
- SET_PROPERTY( TARGET assimp PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} ) |
348 |
- |
349 |
- add_dependencies( unit gtest ) |
350 |
- target_link_libraries( unit assimp |
351 |
-- debug ${GTEST_DEBUG_LIBRARIES} |
352 |
-- optimized ${GTEST_RELEASE_LIBRARIES} |
353 |
- ) |
354 |
--endif(AddGTest_FOUND) |
355 |
-+endif(BUILD_TESTS) |
356 |
- add_subdirectory(headercheck) |
357 |
|
358 |
diff --git a/media-libs/assimp/metadata.xml b/media-libs/assimp/metadata.xml |
359 |
index b23d8815c4e..1480b57c125 100644 |
360 |
--- a/media-libs/assimp/metadata.xml |
361 |
+++ b/media-libs/assimp/metadata.xml |
362 |
@@ -5,7 +5,6 @@ |
363 |
<email>slis@g.o</email> |
364 |
</maintainer> |
365 |
<use> |
366 |
- <flag name="boost">Build assimp with boost support</flag> |
367 |
<flag name="samples">Build viewer library</flag> |
368 |
<flag name="tools">Build assimp tool binary</flag> |
369 |
</use> |