1 |
commit: f6ce89541c522298b585d8096b4d0cd8b744f15e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 16 21:16:55 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 16 22:25:56 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ce8954 |
7 |
|
8 |
media-libs/qhull: Drop old, EAPI5-- |
9 |
|
10 |
Package-Manager: Portage-2.3.43, Repoman-2.3.10 |
11 |
|
12 |
media-libs/qhull/Manifest | 1 - |
13 |
.../qhull/files/qhull-2012.1-format-security.patch | 16 ------- |
14 |
media-libs/qhull/qhull-2012.1-r4.ebuild | 52 ---------------------- |
15 |
3 files changed, 69 deletions(-) |
16 |
|
17 |
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest |
18 |
index db5f8317167..92eb25e0562 100644 |
19 |
--- a/media-libs/qhull/Manifest |
20 |
+++ b/media-libs/qhull/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST qhull-2012.1-src.tgz 716665 BLAKE2B b704b87ac36be3d22ab45bce1ec3bf06ed0a3786f6294e6d07af3ead6e313c947a601edccdc03c96512daaf9dead147c024d8c0963c8f3d6125c3c99b41dbfc5 SHA512 e35ea2cb73ef32b23b64a6594a8b5ea22ed8e2ea7535cfd72dca44331602368dfcb681600a0d2b090e80e67e6be7b32272244b9083d4805f2fbcf5897eb73240 |
23 |
DIST qhull-2015.2.tar.gz 1010153 BLAKE2B 854d1897ad5a92b2e13f6b2304d707b21023a47d60fcc7065b487c24dad06fa016536311e224155b879ad699c046f15991a840f5f04283ffdeef8a68dfbf7c15 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4 |
24 |
|
25 |
diff --git a/media-libs/qhull/files/qhull-2012.1-format-security.patch b/media-libs/qhull/files/qhull-2012.1-format-security.patch |
26 |
deleted file mode 100644 |
27 |
index 14bce2baa75..00000000000 |
28 |
--- a/media-libs/qhull/files/qhull-2012.1-format-security.patch |
29 |
+++ /dev/null |
30 |
@@ -1,16 +0,0 @@ |
31 |
- src/libqhull/io.c | 2 +- |
32 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
33 |
- |
34 |
-diff --git a/src/libqhull/io.c b/src/libqhull/io.c |
35 |
-index 09a0079..2bd066e 100644 |
36 |
---- a/src/libqhull/io.c |
37 |
-+++ b/src/libqhull/io.c |
38 |
-@@ -2238,7 +2238,7 @@ void qh_printfacet3math(FILE *fp, facetT *facet, qh_PRINT format, int notfirst) |
39 |
- qh_memfree(point, qh normal_size); |
40 |
- qh_settempfree(&points); |
41 |
- qh_settempfree(&vertices); |
42 |
-- qh_fprintf(fp, 9110, endfmt); |
43 |
-+ fprintf(fp, "%s", endfmt); |
44 |
- } /* printfacet3math */ |
45 |
- |
46 |
- |
47 |
|
48 |
diff --git a/media-libs/qhull/qhull-2012.1-r4.ebuild b/media-libs/qhull/qhull-2012.1-r4.ebuild |
49 |
deleted file mode 100644 |
50 |
index 64bfebe065b..00000000000 |
51 |
--- a/media-libs/qhull/qhull-2012.1-r4.ebuild |
52 |
+++ /dev/null |
53 |
@@ -1,52 +0,0 @@ |
54 |
-# Copyright 1999-2017 Gentoo Foundation |
55 |
-# Distributed under the terms of the GNU General Public License v2 |
56 |
- |
57 |
-EAPI=5 |
58 |
- |
59 |
-inherit cmake-utils flag-o-matic |
60 |
- |
61 |
-MY_P="${PN}${PV}" |
62 |
- |
63 |
-DESCRIPTION="Geometry library" |
64 |
-HOMEPAGE="http://www.qhull.org/" |
65 |
-SRC_URI="${HOMEPAGE}/download/${P}-src.tgz" |
66 |
- |
67 |
-SLOT="0" |
68 |
-LICENSE="BSD" |
69 |
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
70 |
-IUSE="doc static-libs" |
71 |
- |
72 |
-DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt ) |
73 |
- |
74 |
-PATCHES=( |
75 |
- "${FILESDIR}"/${P}-64bit.patch |
76 |
- "${FILESDIR}"/${P}-format-security.patch |
77 |
- ) |
78 |
- |
79 |
-src_configure() { |
80 |
- append-flags -fno-strict-aliasing |
81 |
- mycmakeargs+=( |
82 |
- -DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir) |
83 |
- -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}/html |
84 |
- ) |
85 |
- cmake-utils_src_configure |
86 |
-} |
87 |
- |
88 |
-pkg_preinst() { |
89 |
- # See https://bugs.gentoo.org/show_bug.cgi?id=435006 |
90 |
- # If qhull-2010 is installed we need to remove its include dir so |
91 |
- # that it can be replaced with a symlink in this version. |
92 |
- rm -rf "${EROOT}"usr/include/qhull || die |
93 |
-} |
94 |
- |
95 |
-src_install() { |
96 |
- cmake-utils_src_install |
97 |
- # compatibility with previous installs |
98 |
- dosym libqhull /usr/include/qhull |
99 |
- if ! use doc; then |
100 |
- rm -rf "${ED}"/usr/share/doc/${PF}/html || die |
101 |
- fi |
102 |
- if ! use static-libs; then |
103 |
- rm -f "${ED}"/usr/$(get_libdir)/lib*.a || die |
104 |
- fi |
105 |
-} |