[gentoo-commits] repo/gentoo:master commit in: media-libs/qhull/, media-libs/qhull/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/qhull/, media-libs/qhull/files/

[Andreas Sturmlechner]

commit:     f6ce89541c522298b585d8096b4d0cd8b744f15e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 16 21:16:55 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 16 22:25:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ce8954

media-libs/qhull: Drop old, EAPI5--

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 media-libs/qhull/Manifest                          |  1 -
 .../qhull/files/qhull-2012.1-format-security.patch | 16 -------
 media-libs/qhull/qhull-2012.1-r4.ebuild            | 52 ----------------------
 3 files changed, 69 deletions(-)

diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index db5f8317167..92eb25e0562 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,2 +1 @@
-DIST qhull-2012.1-src.tgz 716665 BLAKE2B b704b87ac36be3d22ab45bce1ec3bf06ed0a3786f6294e6d07af3ead6e313c947a601edccdc03c96512daaf9dead147c024d8c0963c8f3d6125c3c99b41dbfc5 SHA512 e35ea2cb73ef32b23b64a6594a8b5ea22ed8e2ea7535cfd72dca44331602368dfcb681600a0d2b090e80e67e6be7b32272244b9083d4805f2fbcf5897eb73240
 DIST qhull-2015.2.tar.gz 1010153 BLAKE2B 854d1897ad5a92b2e13f6b2304d707b21023a47d60fcc7065b487c24dad06fa016536311e224155b879ad699c046f15991a840f5f04283ffdeef8a68dfbf7c15 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4

diff --git a/media-libs/qhull/files/qhull-2012.1-format-security.patch b/media-libs/qhull/files/qhull-2012.1-format-security.patch
deleted file mode 100644
index 14bce2baa75..00000000000
--- a/media-libs/qhull/files/qhull-2012.1-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- 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/qhull-2012.1-r4.ebuild b/media-libs/qhull/qhull-2012.1-r4.ebuild
deleted file mode 100644
index 64bfebe065b..00000000000
--- a/media-libs/qhull/qhull-2012.1-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
-}

[gentoo-commits] repo/gentoo:master commit in: media-libs/qhull/, media-libs/qhull/files/

[Sam James]

commit:     02bc620cff189e56e3363a93d22a729e23387720
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Fri Jan  8 20:55:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 02:06:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02bc620c

media-libs/qhull: re-add static-libs + various fixes

CMakeLists.txt claims some libraries are intended to be static-only
and so weren't installed.

Shared:
- libqhull.so (deprecated, but needed by matplotlib)
- libqhull_r.so

Static-only:
- libqhullcpp.a (needed by at least prusaslicer)
- libqhullstatic.a
- libqhullstatic_r.a

Also:
- install missing deprecated qhull.pc
- install cmake/pc files in right libdir
- fix double prefix in pc files

Bug: https://bugs.gentoo.org/764338
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/qhull-2020.2-deprecated-pkgconfig.patch  |  8 +++++++
 ...ull-2020.2-r2.ebuild => qhull-2020.2-r3.ebuild} | 26 +++++++++++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/media-libs/qhull/files/qhull-2020.2-deprecated-pkgconfig.patch b/media-libs/qhull/files/qhull-2020.2-deprecated-pkgconfig.patch
new file mode 100644
index 00000000000..c83a807e288
--- /dev/null
+++ b/media-libs/qhull/files/qhull-2020.2-deprecated-pkgconfig.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt	2020-09-03 22:33:16.000000000 -0400
++++ b/CMakeLists.txt	2021-01-08 14:38:26.299273173 -0500
+@@ -731,4 +731,5 @@
+ set(PkgConfigLocation lib/pkgconfig)
+ foreach(pkgconfig IN ITEMS "${qhull_SHAREDR};Qhull reentrant shared library"
++                           "${qhull_SHARED};Qhull deprecated shared library"
+                            "${qhull_STATIC};Qhull static library"
+                            "${qhull_STATICR};Qhull reentrant static library"

diff --git a/media-libs/qhull/qhull-2020.2-r2.ebuild b/media-libs/qhull/qhull-2020.2-r3.ebuild
similarity index 57%
rename from media-libs/qhull/qhull-2020.2-r2.ebuild
rename to media-libs/qhull/qhull-2020.2-r3.ebuild
index 1c60a003a25..59f96d53709 100644
--- a/media-libs/qhull/qhull-2020.2-r2.ebuild
+++ b/media-libs/qhull/qhull-2020.2-r3.ebuild
@@ -12,10 +12,14 @@ SRC_URI="https://github.com/qhull/qhull/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0/8"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
+IUSE="doc static-libs"
 
 DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2020.2-deprecated-pkgconfig.patch"
+)
+
 src_prepare() {
 	if ! use doc ; then
 		sed -i \
@@ -24,14 +28,19 @@ src_prepare() {
 			CMakeLists.txt || die
 	fi
 
+	sed -i \
+		-e "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" \
+		-e "s@lib/cmake/Qhull@$(get_libdir)/cmake/Qhull@" \
+		CMakeLists.txt || die
+
 	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=OFF
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
 		-DLINK_APPS_SHARED=ON
-		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
 	)
 
@@ -39,11 +48,18 @@ src_configure() {
 }
 
 src_compile() {
-	cmake_src_compile
-	cmake_src_compile libqhull
+	cmake_src_compile all libqhull
 }
 
 src_install() {
 	cmake_src_install
 	dolib.so "${BUILD_DIR}"/libqhull.so*
+
+	# fix double prefix in pc files
+	sed -i "/^libdir/s@/.*@/$(get_libdir)@" "${ED}/usr/$(get_libdir)/pkgconfig/"*.pc || die
+
+	if ! use static-libs; then
+		rm "${ED}/usr/$(get_libdir)/pkgconfig/qhull"{static,static_r,cpp}.pc || die
+		rm -r "${ED}/usr/include/libqhullcpp" || die
+	fi
 }