Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/cgal/, sci-mathematics/cgal/files/
Date: Wed, 05 Jun 2019 06:56:21
Message-Id: 1559717694.ed382a45a805bf94ad6c316b77000f7019bc3cd1.asturm@gentoo
1 commit: ed382a45a805bf94ad6c316b77000f7019bc3cd1
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 5 06:54:28 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 5 06:54:54 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed382a45
7
8 sci-mathematics/cgal: Drop old
9
10 Package-Manager: Portage-2.3.67, Repoman-2.3.14
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 sci-mathematics/cgal/Manifest | 6 --
14 sci-mathematics/cgal/cgal-4.10.ebuild | 88 ----------------------
15 sci-mathematics/cgal/cgal-4.11.1.ebuild | 80 --------------------
16 sci-mathematics/cgal/cgal-4.9.ebuild | 86 ---------------------
17 .../cgal/files/cgal-4.7-fix-buildsystem.patch | 19 -----
18 5 files changed, 279 deletions(-)
19
20 diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
21 index 4645979f664..249dc57f583 100644
22 --- a/sci-mathematics/cgal/Manifest
23 +++ b/sci-mathematics/cgal/Manifest
24 @@ -1,8 +1,2 @@
25 -DIST CGAL-4.10-doc_html.tar.xz 27147028 BLAKE2B ccdb77a497c2aef3004c3adfd81bf8f79a3322ed6cc071569d23666cf8ad00a94ce01f1bab21171eb461066e45a42c9c7003705d3d3d701879e7eb1e13af0eef SHA512 1c1c90c3ce07c5e4bf5a125cd5dccd0595f5c5d8fcf0f16df8a5506c6fe611c30440e034621c3477ae55670f96abbe389bfc2f3e0c88e099133b03cce6f2923d
26 -DIST CGAL-4.10.tar.xz 14249804 BLAKE2B 4715449bebc45fe9270b4a336af964eda4c1a603a9a63b3f3b6922253e18f205e27d5d14dea7ae90ece4184c8b3bafb0ff2963311da7a95ab6d21d8961679ac1 SHA512 2029ad647e73692bb38b2ed9606aae61ec1d74df886bb6fd0f4e3388fb08a51de87a1e290df0dcc621a8abc2654915e2d331ec9f6d27ddd9a21f187a165fa09d
27 -DIST CGAL-4.11.1-doc_html.tar.xz 30575368 BLAKE2B 088cedcde628520625a4494b261e3ae963b8f3688ce4c1117e70f925ff86d11606482d3ce04415d6f03d07a52dfbf041ee315a0e627eb2d7944d08223b51077c SHA512 b16ad29a2981fc72902cc2c850a02c0412eb2f09f5ec864d85c92230ffe1f996c45ae2558b472b0b239d6c7718ccc6da6d65e52b5a7b33d1b406eda4aad0bca5
28 -DIST CGAL-4.11.1.tar.xz 14650588 BLAKE2B 08a7a61d92fc5293eef194d4bb1a42c69cacd8bbc3ee3c1e803435d0d7e2c3cf6533ce5a8f40fb4bf4e6b2ba34ec2c74abd2c2cbdbddbb874caa75b7d80624ba SHA512 0687ddd52e7a7d5e437a57c06d6c1ad7b325a7d0055fc48ba11be6fbc3e4003e2b28a35a9caac0c69af4c73d7d85553502e777714fa56c64580131b04dbe563e
29 DIST CGAL-4.11.3-doc_html.tar.xz 30576756 BLAKE2B 6d32f3bca1c5aee4ed09eb96a35113a8a71bf14679e204683268ccee56f4a4799ef696bebd5ec0fd6add964e23273efc87167c122a5dc781c9cc7b2f5b938c29 SHA512 a729bea11a9b853a8197cc7ebb089005f98868e393e91142946d45a485e2e9ac9eacce1b230d91240080033b5c31bfd0195820ee5ae7f621bdd75f1abf19244f
30 DIST CGAL-4.11.3.tar.xz 14657412 BLAKE2B a10457d255fcdd822f90419ff6af5389c50e88b254ed7f37471e24bb8523732b5aa6bd1ee5e67f14fcf0d8e79abf86e798ddeb3e0ce965dc2cde5667377bf5e0 SHA512 44cdd5fb313841d208ffeb9a96aa8db5111defd581b749c80f655390b5468f7c18b61df0ac2bdeb5259507341cc451fcd8cd50f7ff0571efdcb76eb920f92f7e
31 -DIST cgal-4.9-doc_html-1.tar.xz 26612436 BLAKE2B 17ea9c6e7bd9c981c0b8282b4e4dd3606e1939902c131947e05eccd1760d743740bc9bc385052954c3e60a49a7d5f1d961b4f954892d172095e3a2cf86e8887e SHA512 df9855ff2b152a32dfb584c68b861e2cd480c073cd8cfddc494295455aff8d96e00ba6424b7a7f460e2f9e8db0fcefe858a656f4834821dd5466f61eb3d555b2
32 -DIST cgal-4.9.tar.xz 13749292 BLAKE2B fc6f44dec7c4cfd6ec13911cd668f0c6df7e73cd85540678f43c95b6fd9130449ca2597222e6b668b05072194302b95d63ff775ca82380aedc4fb8c439967c5b SHA512 6f55e061917869dea1083e6fccac132a5232c2de4c01d0ed052bbb31789a23cc66334f12a884ed1e8a1b84af0e2a7186000964dd12e4b41914ee7fd5e36baca8
33
34 diff --git a/sci-mathematics/cgal/cgal-4.10.ebuild b/sci-mathematics/cgal/cgal-4.10.ebuild
35 deleted file mode 100644
36 index 7d4bbdec8af..00000000000
37 --- a/sci-mathematics/cgal/cgal-4.10.ebuild
38 +++ /dev/null
39 @@ -1,88 +0,0 @@
40 -# Copyright 1999-2017 Gentoo Foundation
41 -# Distributed under the terms of the GNU General Public License v2
42 -
43 -EAPI=6
44 -
45 -inherit cmake-utils flag-o-matic
46 -
47 -MY_P=CGAL-${PV}
48 -
49 -DESCRIPTION="C++ library for geometric algorithms and data structures"
50 -HOMEPAGE="http://www.cgal.org/"
51 -SRC_URI="
52 - https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}.tar.xz
53 - doc? ( https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}-doc_html.tar.xz )"
54 -
55 -LICENSE="LGPL-3 GPL-3 Boost-1.0"
56 -SLOT="0/13"
57 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
58 -IUSE="doc examples +gmp mpfi ntl qt5"
59 -
60 -RDEPEND="
61 - >=dev-cpp/eigen-3.1
62 - dev-libs/boost:=
63 - dev-libs/mpfr:0
64 - sys-libs/zlib:=
65 - x11-libs/libX11:=
66 - virtual/glu:=
67 - virtual/opengl:=
68 - gmp? ( dev-libs/gmp:=[cxx] )
69 - qt5? (
70 - dev-qt/qtcore:5
71 - dev-qt/qtgui:5
72 - dev-qt/qtopengl:5
73 - dev-qt/qtsvg:5
74 - dev-qt/qtwidgets:5
75 - )
76 - mpfi? ( sci-libs/mpfi )
77 - ntl? ( dev-libs/ntl )"
78 -DEPEND="${RDEPEND}
79 - app-arch/xz-utils
80 - virtual/pkgconfig"
81 -
82 -S="${WORKDIR}/${MY_P}"
83 -
84 -PATCHES=(
85 - "${FILESDIR}/${PN}-4.7-fix-buildsystem.patch"
86 -)
87 -
88 -src_prepare() {
89 - cmake-utils_src_prepare
90 - # modules provided by dev-util/cmake and dev-cpp/eigen
91 - rm cmake/modules/Find{Eigen3,GLEW,OpenGL}.cmake || die
92 - sed -e '/install(FILES AUTHORS/d' \
93 - -i CMakeLists.txt || die
94 -
95 - # use C++11 threads instead of boost::thread
96 - append-cxxflags -std=c++11
97 -}
98 -
99 -src_configure() {
100 - local mycmakeargs=(
101 - -DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
102 - -DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake"
103 - -DWITH_CGAL_Qt3=OFF
104 - -DWITH_LEDA=OFF
105 - -DWITH_Eigen3=ON
106 - -DWITH_ZLIB=ON
107 - -DWITH_GMP="$(usex gmp)"
108 - -DWITH_GMPXX="$(usex gmp)"
109 - -DWITH_CGAL_Qt5="$(usex qt5)"
110 - -DWITH_MPFI="$(usex mpfi)"
111 - -DWITH_NTL="$(usex ntl)"
112 - )
113 - cmake-utils_src_configure
114 -}
115 -
116 -src_install() {
117 - cmake-utils_src_install
118 - if use examples; then
119 - dodoc -r examples demo
120 - docompress -x /usr/share/doc/${PF}/{examples,demo}
121 - fi
122 - if use doc; then
123 - docinto html/
124 - dodoc -r "${WORKDIR}"/doc_html/*
125 - docompress -x /usr/share/doc/${PF}/html
126 - fi
127 -}
128
129 diff --git a/sci-mathematics/cgal/cgal-4.11.1.ebuild b/sci-mathematics/cgal/cgal-4.11.1.ebuild
130 deleted file mode 100644
131 index 97da0b221e6..00000000000
132 --- a/sci-mathematics/cgal/cgal-4.11.1.ebuild
133 +++ /dev/null
134 @@ -1,80 +0,0 @@
135 -# Copyright 1999-2018 Gentoo Foundation
136 -# Distributed under the terms of the GNU General Public License v2
137 -
138 -EAPI=6
139 -
140 -inherit cmake-utils flag-o-matic
141 -
142 -MY_P=CGAL-${PV}
143 -
144 -DESCRIPTION="C++ library for geometric algorithms and data structures"
145 -HOMEPAGE="https://www.cgal.org/"
146 -SRC_URI="
147 - https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}.tar.xz
148 - doc? ( https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}-doc_html.tar.xz )"
149 -
150 -LICENSE="LGPL-3 GPL-3 Boost-1.0"
151 -SLOT="0/13"
152 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
153 -IUSE="doc examples +gmp mpfi ntl qt5"
154 -
155 -RDEPEND="
156 - >=dev-cpp/eigen-3.1
157 - dev-libs/boost:=[threads]
158 - dev-libs/mpfr:0=
159 - sys-libs/zlib:=
160 - x11-libs/libX11:=
161 - virtual/glu:=
162 - virtual/opengl:=
163 - gmp? ( dev-libs/gmp:=[cxx] )
164 - mpfi? ( sci-libs/mpfi )
165 - ntl? ( dev-libs/ntl )
166 - qt5? (
167 - dev-qt/qtcore:5
168 - dev-qt/qtgui:5
169 - dev-qt/qtopengl:5
170 - dev-qt/qtsvg:5
171 - dev-qt/qtwidgets:5
172 - )"
173 -DEPEND="${RDEPEND}
174 - app-arch/xz-utils
175 - virtual/pkgconfig"
176 -
177 -S="${WORKDIR}/${MY_P}"
178 -
179 -PATCHES=(
180 - "${FILESDIR}/${PN}-4.11.1-fix-buildsystem.patch"
181 -)
182 -
183 -src_prepare() {
184 - cmake-utils_src_prepare
185 - # modules provided by dev-util/cmake and dev-cpp/eigen
186 - rm cmake/modules/Find{Eigen3,GLEW,OpenGL}.cmake || die
187 - sed -e '/install(FILES AUTHORS/d' \
188 - -i CMakeLists.txt || die
189 -}
190 -
191 -src_configure() {
192 - local mycmakeargs=(
193 - -DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
194 - -DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake"
195 - -DWITH_LEDA=OFF
196 - -DWITH_Eigen3=ON
197 - -DWITH_ZLIB=ON
198 - -DWITH_GMP="$(usex gmp)"
199 - -DWITH_GMPXX="$(usex gmp)"
200 - -DWITH_MPFI="$(usex mpfi)"
201 - -DWITH_NTL="$(usex ntl)"
202 - -DWITH_CGAL_Qt5="$(usex qt5)"
203 - )
204 - cmake-utils_src_configure
205 -}
206 -
207 -src_install() {
208 - use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. )
209 - cmake-utils_src_install
210 - if use examples; then
211 - dodoc -r examples demo
212 - docompress -x /usr/share/doc/${PF}/{examples,demo}
213 - fi
214 -}
215
216 diff --git a/sci-mathematics/cgal/cgal-4.9.ebuild b/sci-mathematics/cgal/cgal-4.9.ebuild
217 deleted file mode 100644
218 index b8c9051efda..00000000000
219 --- a/sci-mathematics/cgal/cgal-4.9.ebuild
220 +++ /dev/null
221 @@ -1,86 +0,0 @@
222 -# Copyright 1999-2017 Gentoo Foundation
223 -# Distributed under the terms of the GNU General Public License v2
224 -
225 -EAPI=6
226 -
227 -inherit cmake-utils flag-o-matic
228 -
229 -MY_P=CGAL-${PV}
230 -
231 -DESCRIPTION="C++ library for geometric algorithms and data structures"
232 -HOMEPAGE="http://www.cgal.org/"
233 -SRC_URI="
234 - https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}.tar.xz -> ${P}.tar.xz
235 - doc? ( https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}-doc_html.tar.xz -> ${P}-doc_html-1.tar.xz )"
236 -
237 -LICENSE="LGPL-3 GPL-3 Boost-1.0"
238 -SLOT="0"
239 -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
240 -IUSE="doc examples +gmp mpfi ntl qt5"
241 -
242 -RDEPEND="
243 - >=dev-cpp/eigen-3.1
244 - dev-libs/boost:=
245 - dev-libs/mpfr:0
246 - sys-libs/zlib
247 - x11-libs/libX11
248 - virtual/glu
249 - virtual/opengl
250 - gmp? ( dev-libs/gmp[cxx] )
251 - qt5? (
252 - dev-qt/qtcore:5
253 - dev-qt/qtgui:5
254 - dev-qt/qtopengl:5
255 - dev-qt/qtsvg:5
256 - dev-qt/qtwidgets:5
257 - )
258 - mpfi? ( sci-libs/mpfi )
259 - ntl? ( dev-libs/ntl )"
260 -DEPEND="${RDEPEND}
261 - app-arch/xz-utils
262 - virtual/pkgconfig"
263 -
264 -S="${WORKDIR}/${MY_P}"
265 -PATCHES=(
266 - "${FILESDIR}/${PN}-4.7-fix-buildsystem.patch"
267 -)
268 -
269 -src_prepare() {
270 - cmake-utils_src_prepare
271 - # modules provided by dev-util/cmake and dev-cpp/eigen
272 - rm cmake/modules/Find{Eigen3,GLEW,OpenGL}.cmake || die
273 - sed \
274 - -e '/install(FILES AUTHORS/d' \
275 - -i CMakeLists.txt || die
276 -
277 - # use C++11 threads instead of boost::thread
278 - append-cxxflags -std=c++11
279 -}
280 -
281 -src_configure() {
282 - local mycmakeargs=(
283 - -DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
284 - -DCGAL_INSTALL_CMAKE_DIR="lib/cmake"
285 - -DWITH_CGAL_Qt3=OFF
286 - -DWITH_LEDA=OFF
287 - -DWITH_Eigen3=ON
288 - -DWITH_ZLIB=ON
289 - -DWITH_GMP="$(usex gmp)"
290 - -DWITH_GMPXX="$(usex gmp)"
291 - -DWITH_CGAL_Qt5="$(usex qt5)"
292 - -DWITH_MPFI="$(usex mpfi)"
293 - -DWITH_NTL="$(usex ntl)"
294 - )
295 - cmake-utils_src_configure
296 -}
297 -
298 -src_install() {
299 - cmake-utils_src_install
300 - if use examples; then
301 - dodoc -r examples demo
302 - fi
303 - if use doc; then
304 - docinto html/
305 - dodoc -r "${WORKDIR}"/doc_html/*
306 - fi
307 -}
308
309 diff --git a/sci-mathematics/cgal/files/cgal-4.7-fix-buildsystem.patch b/sci-mathematics/cgal/files/cgal-4.7-fix-buildsystem.patch
310 deleted file mode 100644
311 index 6aabdc39539..00000000000
312 --- a/sci-mathematics/cgal/files/cgal-4.7-fix-buildsystem.patch
313 +++ /dev/null
314 @@ -1,19 +0,0 @@
315 -Remove customized handling of ${CMAKE_BUILD_TYPE} which conflicts with
316 -how Gentoo handles ${CMAKE_BUILD_TYPE}:
317 -* CMake Error at cmake/modules/CGAL_SetupFlags.cmake:65 (message):
318 -* Gentoo is not a valid build type: only Release or Debug is allowed
319 -* Call Stack (most recent call first):
320 -* CMakeLists.txt:519 (include)
321 -
322 ---- CGAL-4.7/cmake/modules/CGAL_SetupFlags.cmake
323 -+++ CGAL-4.7/cmake/modules/CGAL_SetupFlags.cmake
324 -@@ -61,9 +61,6 @@
325 - add_definitions(-DCGAL_TEST_SUITE)
326 - endif()
327 -
328 --if ( NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
329 -- message( FATAL_ERROR "${CMAKE_BUILD_TYPE} is not a valid build type: only Release or Debug is allowed" )
330 --endif()
331 -
332 - message( STATUS "Build type: ${CMAKE_BUILD_TYPE}" )
333 -