reinit the tree, so we can have metadata

6 files changed, 171 insertions, 0 deletions

diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
new file mode 100644
index 000000000000..0a17a3147ca5
--- /dev/null
+++ b/media-libs/qhull/Manifest
@@ -0,0 +1,9 @@
+AUX qhull-2012.1-64bit.patch 1509 SHA256 bafca6d2928ce2f057fb48e32b46131aacd1a1deb0f99e5ee70b758414e7fc88 SHA512 e23c7bb4d6fb64a77647980e045b36df4f596eb64a32b27d7d6462cb2f5f7a35e0fa9985e885ed58222ec1741b2a2d1806bba155f1042bd470dcd5c721ac48c5 WHIRLPOOL 5e3b1cef55885744d5991dc045ed900bed93f985d16aab271df5deb5e23a3fa3b4d588d1c5f7b268cb07b5d6114d5a357a5e16c351b4433863742accaf6a1adf
+AUX qhull-2012.1-format-security.patch 495 SHA256 2e7461a498276e23f5f2231ae82fbc5ccee8d9c639f3bfb4433722a496591d28 SHA512 91df8963c8d90210281b1546a76a815c59d4343657f4771d4aa13ffa29d1935b10437441b39b85ef791da0eda8f76c381d7548b3152a0c2535ff6ff87997babd WHIRLPOOL eb5d3f7c28f1fdf6f7ee7618cab9091d1869e8e4e376dacda02d6831d4bacfe013f4d2f4d68f6b813f5af70a871c236ffd6ef6ae851270081d561db3e1e3681f
+DIST qhull-2012.1-src.tgz 716665 SHA256 a35ecaa610550b7f05c3ce373d89c30cf74b059a69880f03080c556daebcff88 SHA512 e35ea2cb73ef32b23b64a6594a8b5ea22ed8e2ea7535cfd72dca44331602368dfcb681600a0d2b090e80e67e6be7b32272244b9083d4805f2fbcf5897eb73240 WHIRLPOOL 37704b3f94b6d20c02886598cc2e862f47feb910e0d3259d686b1356242206b77640871509818c56530161720954214d41c295dfe740faa4ed575379b05259f6
+DIST qhull-2015.2.tar.gz 1010153 SHA256 78b010925c3b577adc3d58278787d7df08f7c8fb02c3490e375eab91bb58a436 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4 WHIRLPOOL 77f7f113dc252012e2591996db16da87a585dc83256ddddc36df69df14aaf1329e946104e836670051ad469d0c4bdf2e1572318a1b33ff1cb9ab191d125c494e
+EBUILD qhull-2012.1-r4.ebuild 1287 SHA256 d023d889bb69828180bec34b5ce6837a49c4810a2ede35bcba4b110bb21fb395 SHA512 a15c12ce3713bf0afb205d66ce184fb33b5c6c14f9557b19b497b86619224e9079a573efc1b62dcf1ec254775262c7648c741f4cdd61235dea759b29b418a8e6 WHIRLPOOL 7e82e5f82fc9fa905c581e59e8afd1d6b0a1d62fed4837596c18dd73fcabffd7925d1d82a4ed11149fdaa9c3e9069da08b6c4296bbb260306129862877a67844
+EBUILD qhull-2015.2.ebuild 1039 SHA256 72dea82bdf40682d23991a3defa64651f958ef0c95b7335bef721c8d9b1b5449 SHA512 9ca3f4fab86956ac16be37bc06b9a8cb0fcb65b46319bfb19cc00c13cc897047b2a8225ac7b8eb12ea1f0525602bce8ef8184900d042226fc2f0c1cc6a58cf3f WHIRLPOOL ffeb27f9bc3a928ba46458806d0d87922fc60bfa5cf7fad1224258d8df025ff486e7bece091d2ccf9edcba6d538049eb5c223ea549c25d2754ca6a8c9a7f3bb6
+MISC ChangeLog 2738 SHA256 fb997a6906ba8ec3cca42621b5de9438aa1f39593ab6c9ea7cc23c263e083bd6 SHA512 7cd8fc4f92396658add0dceeb669c7c00dd92e77826019f0085ce1a67fe2b89a2f3ead67adf02c7acf7f8219407accf836f7e0248e6589e234dc00d7e7373cce WHIRLPOOL a9d9324513da8c4f060d36b6950147a6d3c57aa8428c4e15cd8ea377831db8738dddb60c08ce4662c2524386853f187349d2782ada8d520845894aa0c7f2d2b4
+MISC ChangeLog-2015 9012 SHA256 d3375809ed5c71c6867fee9fb208f7ed960beff77996d00b298cec2875a5eae4 SHA512 19021ba090225cbf5995cc1194854367b94d713fc4b562fd90d3ff7891b0d12d55213cb1eea8dd03e8e7e7d10a8df734f6740d4b2e050eb6b9a014c8e4711ca8 WHIRLPOOL afa10576f4029e47e9563fda4238eca2dafdcb746389a6bf9ed1d7a89d2b1f090a9ac30c08b735b60d25b2722810e62184232f840cb5c440c6538373978eb1a8
+MISC metadata.xml 977 SHA256 1e87230d644baebd43b125f7ff85ae5b2dddf85de85e4d9aea1221f2652ac154 SHA512 6e676d2faff561e67e077869a61747c834131ea67acb098497153c98d3bca38032ffa2ab57d6b612cfa4f1fbdb8b05b0c9a9132ab0cdeae5579bdac236b9a1f2 WHIRLPOOL eede4d4e500fe3d1c2a2a25e3a2dae7ecafb53919a9fe965d0cc538f32532accf4fc9b63f2c7c95fe43d0771c76d17f2dbda3ebdbe16d1ec56fab69219a18fcf
diff --git a/media-libs/qhull/files/qhull-2012.1-64bit.patch b/media-libs/qhull/files/qhull-2012.1-64bit.patch
new file mode 100644
index 000000000000..4c909c28c8f2
--- /dev/null
+++ b/media-libs/qhull/files/qhull-2012.1-64bit.patch
@@ -0,0 +1,32 @@
+ src/libqhull/io.c   | 4 ++--
+ src/libqhull/stat.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/libqhull/io.c b/src/libqhull/io.c
+index 09a0079..7ad4b35 100644
+--- a/src/libqhull/io.c
++++ b/src/libqhull/io.c
+@@ -68,8 +68,8 @@ void qh_produce_output2(void) {
+     qh_memstatistics(qh ferr);
+     d_1= sizeof(setT) + (qh hull_dim - 1) * SETelemsize;
+     qh_fprintf(qh ferr, 8040, "\
+-    size in bytes: merge %d ridge %d vertex %d facet %d\n\
+-         normal %d ridge vertices %d facet vertices or neighbors %d\n",
++    size in bytes: merge %zd ridge %zd vertex %zd facet %zd\n\
++         normal %d ridge vertices %d facet vertices or neighbors %zd\n",
+             (int)sizeof(mergeT), (int)sizeof(ridgeT),
+             (int)sizeof(vertexT), (int)sizeof(facetT),
+             qh normal_size, d_1, d_1 + SETelemsize);
+diff --git a/src/libqhull/stat.c b/src/libqhull/stat.c
+index 7dc60b9..5721130 100644
+--- a/src/libqhull/stat.c
++++ b/src/libqhull/stat.c
+@@ -472,7 +472,7 @@ void qh_initstatistics(void) {
+   qh_allstatI();
+   if (qhstat next > (int)sizeof(qhstat id)) {
+     qh_fprintf(qhmem.ferr, 6184, "qhull error (qh_initstatistics): increase size of qhstat.id[].\n\
+-      qhstat.next %d should be <= sizeof(qhstat id) %d\n", qhstat next, (int)sizeof(qhstat id));
++      qhstat.next %d should be <= sizeof(qhstat id) %zd\n", qhstat next, (int)sizeof(qhstat id));
+ #if 0 /* for locating error, Znumridges should be duplicated */
+     for(i=0; i < ZEND; i++) {
+       int j;
diff --git a/media-libs/qhull/files/qhull-2012.1-format-security.patch b/media-libs/qhull/files/qhull-2012.1-format-security.patch
new file mode 100644
index 000000000000..14bce2baa75c
--- /dev/null
+++ b/media-libs/qhull/files/qhull-2012.1-format-security.patch
@@ -0,0 +1,16 @@
+ src/libqhull/io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libqhull/io.c b/src/libqhull/io.c
+index 09a0079..2bd066e 100644
+--- a/src/libqhull/io.c
++++ b/src/libqhull/io.c
+@@ -2238,7 +2238,7 @@ void qh_printfacet3math(FILE *fp, facetT *facet, qh_PRINT format, int notfirst)
+     qh_memfree(point, qh normal_size);
+   qh_settempfree(&points);
+   qh_settempfree(&vertices);
+-  qh_fprintf(fp, 9110, endfmt);
++  fprintf(fp, "%s", endfmt);
+ } /* printfacet3math */
+ 
+ 
diff --git a/media-libs/qhull/metadata.xml b/media-libs/qhull/metadata.xml
new file mode 100644
index 000000000000..c6a69293d768
--- /dev/null
+++ b/media-libs/qhull/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  Qhull computes the convex hull, Delaunay triangulation, Voronoi
+  diagram, halfspace intersection about a point, furthest-site
+  Delaunay triangulation, and furthest-site Voronoi diagram. The
+  source code runs in 2-d, 3-d, 4-d, and higher dimensions. Qhull
+  implements the Quickhull algorithm for computing the convex hull. It
+  handles roundoff errors from floating point arithmetic. It computes
+  volumes, surface areas, and approximations to the convex hull. 
+  Qhull does not support constrained Delaunay triangulations,
+  triangulation of non-convex surfaces, mesh generation of non-convex
+  objects, or medium-sized inputs in 9-D and higher. 
+</longdescription>
+</pkgmetadata>
diff --git a/media-libs/qhull/qhull-2012.1-r4.ebuild b/media-libs/qhull/qhull-2012.1-r4.ebuild
new file mode 100644
index 000000000000..64bfebe065b5
--- /dev/null
+++ b/media-libs/qhull/qhull-2012.1-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils flag-o-matic
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Geometry library"
+HOMEPAGE="http://www.qhull.org/"
+SRC_URI="${HOMEPAGE}/download/${P}-src.tgz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc static-libs"
+
+DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-64bit.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	)
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	mycmakeargs+=(
+		-DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)
+		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}/html
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	# See https://bugs.gentoo.org/show_bug.cgi?id=435006
+	# If qhull-2010 is installed we need to remove its include dir so
+	# that it can be replaced with a symlink in this version.
+	rm -rf "${EROOT}"usr/include/qhull || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	# compatibility with previous installs
+	dosym libqhull /usr/include/qhull
+	if ! use doc; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/html || die
+	fi
+	if ! use static-libs; then
+		rm -f "${ED}"/usr/$(get_libdir)/lib*.a || die
+	fi
+}
diff --git a/media-libs/qhull/qhull-2015.2.ebuild b/media-libs/qhull/qhull-2015.2.ebuild
new file mode 100644
index 000000000000..9cc80f5c1e6b
--- /dev/null
+++ b/media-libs/qhull/qhull-2015.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Geometry library"
+HOMEPAGE="http://www.qhull.org"
+SRC_URI="${HOMEPAGE}/download/${PN}-2015-src-7.2.0.tgz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc static-libs"
+
+DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2012.1-64bit.patch
+	)
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	mycmakeargs+=(
+		-DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)
+		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${P}/html
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	# compatibility with previous installs
+	dosym libqhull /usr/include/qhull
+	if ! use doc; then
+		rm -rf "${ED}"/usr/share/doc/${P}/html || die
+	fi
+	if ! use static-libs; then
+		rm -f "${ED}"/usr/$(get_libdir)/lib*.a || die
+	fi
+}