media-libs/qhull: Import patches from fedora, bump to EAPI=5; drop old

(Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

8 files changed, 129 insertions, 93 deletions

diff --git a/media-libs/qhull/ChangeLog b/media-libs/qhull/ChangeLog
index 7dfb2ab50113..eb71d7894eb0 100644
--- a/media-libs/qhull/ChangeLog
+++ b/media-libs/qhull/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/qhull
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.56 2013/07/18 12:36:03 chithanh Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.57 2014/09/17 08:33:56 jlec Exp $
+
+*qhull-2012.1-r2 (17 Sep 2014)
+
+  17 Sep 2014; Justin Lecher <jlec@gentoo.org> -qhull-3.1-r1.ebuild,
+  -qhull-2010.1-r2.ebuild, +qhull-2012.1-r2.ebuild,
+  +files/qhull-2012.1-64bit.patch, +files/qhull-2012.1-pc.patch,
+  +files/qhull.pc.in, metadata.xml:
+  Import patches from fedora, bump to EAPI=5; drop old
 
   18 Jul 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   qhull-2012.1-r1.ebuild:
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-pc.patch b/media-libs/qhull/files/qhull-2012.1-pc.patch
new file mode 100644
index 000000000000..d609e8962f19
--- /dev/null
+++ b/media-libs/qhull/files/qhull-2012.1-pc.patch
@@ -0,0 +1,15 @@
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 98dbc70..b323e10 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -430,3 +430,7 @@ install(FILES html/qhull.man         DESTINATION ${MAN_INSTALL_DIR} RENAME qhull
+ install(FILES html/rbox.man          DESTINATION ${MAN_INSTALL_DIR} RENAME rbox.1)
+ install(FILES ${doc_FILES}           DESTINATION ${DOC_INSTALL_DIR})
+ install(DIRECTORY html/              DESTINATION ${DOC_INSTALL_DIR})
++
++
++configure_file("qhull.pc.in" "qhull.pc" @ONLY)
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qhull.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig")
diff --git a/media-libs/qhull/files/qhull.pc.in b/media-libs/qhull/files/qhull.pc.in
new file mode 100644
index 000000000000..2bb503b24e88
--- /dev/null
+++ b/media-libs/qhull/files/qhull.pc.in
@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+includedir=${exec_prefix}/include
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+
+Name: qhull
+Description: General dimension convex hull library
+Version: @VERSION@
+Requires:
+Libs: -L${libdir} -lqhull -lm
+Cflags: -I${includedir}
diff --git a/media-libs/qhull/metadata.xml b/media-libs/qhull/metadata.xml
index 31adf701f53b..40b5a161adbe 100644
--- a/media-libs/qhull/metadata.xml
+++ b/media-libs/qhull/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang='en'>
+  <herd>sci-mathematics</herd>
+  <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
diff --git a/media-libs/qhull/qhull-2010.1-r2.ebuild b/media-libs/qhull/qhull-2010.1-r2.ebuild
deleted file mode 100644
index 79e296fa57a6..000000000000
--- a/media-libs/qhull/qhull-2010.1-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2010.1-r2.ebuild,v 1.11 2013/01/02 11:44:32 jer Exp $
-
-EAPI=3
-
-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 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}-cmake-install.patch" "${FILESDIR}/${P}-overflows.patch" )
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	mycmakeargs="
-		-DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)
-		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
-		$(cmake-utils_use_with static-libs STATIC_LIBS)
-		$(cmake-utils_use_with doc DOCS)"
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	# remove potential symlink to avoid triggering collision-protect or
-	# protect-owned (https://bugs.gentoo.org/show_bug.cgi?id=435006)
-	rm "${ROOT}"/usr/include/qhull
-}
diff --git a/media-libs/qhull/qhull-2012.1-r2.ebuild b/media-libs/qhull/qhull-2012.1-r2.ebuild
new file mode 100644
index 000000000000..5aafccb4d2cf
--- /dev/null
+++ b/media-libs/qhull/qhull-2012.1-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2012.1-r2.ebuild,v 1.1 2014/09/17 08:33:56 jlec Exp $
+
+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}-pc.patch
+	)
+
+src_prepare() {
+	# From fedora, matplotlib depends on it
+	cp "${FILESDIR}"/${PN}.pc.in . || die
+	cmake-utils_src_prepare
+}
+
+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 "${ROOT}"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-3.1-r1.ebuild b/media-libs/qhull/qhull-3.1-r1.ebuild
deleted file mode 100644
index fd36ce863edc..000000000000
--- a/media-libs/qhull/qhull-3.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-3.1-r1.ebuild,v 1.17 2013/01/02 11:44:32 jer Exp $
-
-inherit eutils
-
-MY_P="${PN}${PV}"
-DESCRIPTION="Geometry library"
-HOMEPAGE="http://www.qhull.org"
-SRC_URI="http://www.geom.umn.edu/software/qhull/${MY_P}.tgz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/src
-	mv Makefile.txt Makefile
-	# Replaced sed/echo hacks by a clean patch. Fix build error on -fPIC archs
-	# BUG #82646
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/02/22
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	cd src
-	emake CCOPTS1="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	cd src
-
-	dolib libqhull.a || die "dolib failed"
-	dolib.so libqhull.so || die "dolib.so failed"
-	dobin qconvex qdelaunay qhalf qhull qvoronoi rbox || die "dobin failed"
-
-	insinto /usr/include/qhull
-	doins *.h
-
-	cd "${S}"
-	dodoc Announce.txt COPYING.txt File_id.diz README.txt REGISTER.txt
-	cd html
-	dohtml *
-	dodoc *.txt
-	for m in *man
-	do
-		newman ${m} ${m/.man/.1}
-	done
-}