gentoo resync : 12.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-12 21:55:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-12 21:55:15 +0000
commit: 7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree: 56fae051db521b8fce8014cbc8b11484885b14b3 /sci-libs
parent: 6d691ad5b6239929063441bbd14c489e92e7396e (diff)
38 files changed, 1005 insertions, 161 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 63bf9fb31825..ffe2f73c8e56 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/clapack/Manifest b/sci-libs/clapack/Manifest
index e72519252dd6..9e8323b655fc 100644
--- a/sci-libs/clapack/Manifest
+++ b/sci-libs/clapack/Manifest
@@ -3,5 +3,5 @@ AUX clapack-3.2.1-fix_include_file.patch 689 BLAKE2B 8cae0c5d8262ccf0dae3bf52481
 AUX clapack-3.2.1-hang.patch 641 BLAKE2B 01925c41db9017cafcb0a042bfa445b1b3d8ea0991586975870d73ad5e0d15ae53c1f88b613e14ea005dbbaf7fbcf73802a634e7cccb5d8c3a239d7db8655cac SHA512 a6e7461bfe7bddd2120c46e3629a899cc12c23669b22b562675922bf11d2fb69793e8093d24773d688e0d7e1f24c08b16ccd2b01631b23f55fbb7a10c29ed036
 AUX clapack-3.2.1-noblasf2c.patch 5841 BLAKE2B 12a7024af8a82437d15a6ebee66212e305495d65f8874dffff5d8191859e79feb42080b769ec1c7c4c4ae9bd6573037b45939230e8146f237478136297b9c0b8 SHA512 68571f682e7015c75104494f8d156cd0c1f758aa03d9c2614f93db418c8d4f9c9c2e7b5d965022060f776a9baa8d48c15bbfa30dbcada03bccffa4ebb3c4deef
 DIST clapack-3.2.1-CMAKE.tgz 6017667 BLAKE2B 9c4648697ac757bf93a2529f9a2af545d6e34a95b37a14a15bb2bea25b1ffa213a6f17a4ca8ec8119ac2f8bfd883feb5399181fc50ffa73be39ceeae5492e9d2 SHA512 cf19c710291ddff3f6ead7d86bdfdeaebca21291d9df094bf0a8ef599546b007757fb2dbb19b56511bb53ef7456eac0c73973b9627bf4d02982c856124428b49
-EBUILD clapack-3.2.1-r8.ebuild 936 BLAKE2B 5cefd7a5c58d38c9e0af2dace1d06273bad2f7034b6e6dad7d43df1ff1553a57811b91566979ad1c65bfde1fc7a6810a2bc6902aab9561313a1aacbe42e0290f SHA512 6bb93ad974c12c9ff56c36fab820d766e61b522121f106c5316fa994f8d5421365e59416bedfc70b30e85978aa2a64900e3c0e52eb14ccd317ba6e1baee2cd77
+EBUILD clapack-3.2.1-r8.ebuild 922 BLAKE2B 10b3f3fe744ecbea30c0257b35793f2e0c5f72ec8b01245c9eb64da8bc9597aaa58b65de6ef5745ed98d20999c413ada21fede016dfbd7e20adf34689138e2b2 SHA512 cb5850eda0a37e79aa21789e292296cdc249ac5d3332fe89941de3f085102a2efc959b0bb900f98e32e39be78e88ed4788d49f2fd3a93f99532c36d280b8df7e
 MISC metadata.xml 725 BLAKE2B dd3277c0999715e98cde0b3cadb37706aee0861ed5ac13bbffec717fd84141fbefd9f8ccc78ac2e935be567825b90fb9047a8f1e4bd6e4b63488f4f146702446 SHA512 78f3e4fc5bf308d619a1544d5e5125dce565fe7b9a4c563b25096c137bf2edee3a17b9c91f50442b8d2498bd1bd37c0d44b39f7e0dcdfd3a0e5583f01eb93c19
diff --git a/sci-libs/clapack/clapack-3.2.1-r8.ebuild b/sci-libs/clapack/clapack-3.2.1-r8.ebuild
index ac9a2c73f97e..30384df4db47 100644
--- a/sci-libs/clapack/clapack-3.2.1-r8.ebuild
+++ b/sci-libs/clapack/clapack-3.2.1-r8.ebuild
@@ -1,25 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic cmake-utils
+inherit flag-o-matic cmake
 
 DESCRIPTION="f2c'ed version of LAPACK"
-HOMEPAGE="http://www.netlib.org/clapack/"
-SRC_URI="http://www.netlib.org/${PN}/${P}-CMAKE.tgz"
+HOMEPAGE="https://www.netlib.org/clapack/"
+SRC_URI="https://www.netlib.org/${PN}/${P}-CMAKE.tgz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
+# bug 433806
+RESTRICT="test"
+
 RDEPEND="
 	>=dev-libs/libf2c-20090407-r1
 	virtual/blas"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${P}-CMAKE
+S="${WORKDIR}"/${P}-CMAKE
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix_include_file.patch"
@@ -28,18 +31,17 @@ PATCHES=(
 	"${FILESDIR}/${P}-findblas-r7.patch"
 )
 
-# bug 433806
-RESTRICT="test"
-
 src_prepare() {
+	cmake_src_prepare
 	rm INCLUDE/f2c.h F2CLIBS/libf2c/f2c.h || die
-	cmake-utils_src_prepare
 }
 
 src_configure() {
 	filter-flags -ftree-vectorize
 	# causes an internal compiler error with gcc-4.6.2
 
-	local mycmakeargs=( -DENABLE_TESTS=$(usex test) )
-	cmake-utils_src_configure
+	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
 }
diff --git a/sci-libs/cminpack/Manifest b/sci-libs/cminpack/Manifest
index 89ee9c6d03af..f0d72cad6a14 100644
--- a/sci-libs/cminpack/Manifest
+++ b/sci-libs/cminpack/Manifest
@@ -1,4 +1,4 @@
-AUX cminpack-1.3.5-underlinking.patch 338 BLAKE2B 65f3d7014529ea914067fd8a46bc6812fb688e456f416bab8af2ac145833321c0bbc1cbce1e8901bc1b3c76862f273e69db32a483b50903824baffc065d4115a SHA512 e75edbe045d6936d09a2454504fba6b5b5535424aa1c7603df4b55416e801d27f74f1e2db1038193d36262a12734760138df1c66b6c3d9e6d318f124e7409307
-DIST cminpack-1.3.5.tar.gz 312932 BLAKE2B 52ab91490f7c569e3931346510e08db55166322399736ceb9cc090a3be3624e8db6de12ed33ee8f97f6c5358dc2488f8aa7c7aab81365316f1dbb8948e669a2e SHA512 bb6f1764d90ccc7cbbb114a509f5416567246a730e4329617671e01b535b3a69f6a6df0483810ad1ad28228a1061a3595a15d437647b94a8a2013203905c6fed
-EBUILD cminpack-1.3.5.ebuild 845 BLAKE2B bbbb439f79afb649233d934bb4bd2e3497e61460a71809cbda8c269987436504a80386aebcc1d78ce9c0651309a2feabd46887a0b63582d3bd1283733beb3ebb SHA512 a3b23a4dcf8523675512a3e045d481cf9412316f829cfabcb3c6a7acfcb1457726b5576cd16f10dd2700c09a738dfe04f546f79152347b14f7fd7f21dce1fa1b
+AUX cminpack-1.3.8-cmake.patch 374 BLAKE2B 3f4d610a4fb577d3c6d7e31b1789e212749b0cdeed3d9f5494d2507ff8d218897d052048afbd300a1181a045734a324de3d5d3177c82d330f4c7aaab09ad60ac SHA512 d9434a5bf97dcbad67d7dc1ff7bb45f51bb4cd239096a7ae0c807a96c0feacd50d73823dccc0d1e6622057386f9687f2e808e60b9ea953593eea3f58dbc129a5
+DIST cminpack-1.3.8.tar.gz 341494 BLAKE2B 5aebb220f9d5d1b314331a621d3717e4568eea6c37d0a70b935eda1fc0bec11d81b07c8951c8a8bfe5edd81e7878e138f8921d96a96c40230bfc423991e766be SHA512 0cab275074a31af69dbaf3ef6d41b20184c7cf9f33c78014a69ae7a022246fa79e7b4851341c6934ca1e749955b7e1096a40b4300a109ad64ebb1b2ea5d1d8ae
+EBUILD cminpack-1.3.8.ebuild 805 BLAKE2B ce4d16a0acc6c6067abc61c145893677dd0ffdc4b505698b44268ef7a864bc00dd25ba1315fec701c5f77ab1b59f028d2595cdb8e90d6bc1522bba2423144bd7 SHA512 c63610f2f85ba377a36fcbd7666f321105b4e6627f2db2300d79e55510f9a0b86e0778b0a942630e157de699f1c63ab99336df39e24500434d5be3ba65079d41
 MISC metadata.xml 993 BLAKE2B e037c0d06b1c6192de166d3ced5f6dbc92229fd268ee83e0e6589b05314906c5469d521c61b8d88b6e6c66e877e54e15fd6d7e57b16fa27b62167671d3b0c274 SHA512 d488a3fe1cfc9a04264d7e6078b033b4056236736d7466a609e308988c9e36c25d4fdce24bb3606e8b9878a63ee3ec9a660ab296f081004b601f6317b80bf257
diff --git a/sci-libs/cminpack/cminpack-1.3.5.ebuild b/sci-libs/cminpack/cminpack-1.3.8.ebuild
index 6314fdf3354d..a32daf6c9510 100644
--- a/sci-libs/cminpack/cminpack-1.3.5.ebuild
+++ b/sci-libs/cminpack/cminpack-1.3.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C implementation of the MINPACK nonlinear optimization library"
 HOMEPAGE="http://devernay.free.fr/hacks/cminpack/"
@@ -13,22 +13,23 @@ LICENSE="minpack"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
+
 RESTRICT="!test? ( test )"
 
-PATCHES=( "${FILESDIR}"/${P}-underlinking.patch )
+DOCS=( README.md readme.txt )
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
 
 src_configure() {
 	local mycmakeargs=(
+		-DUSE_BLAS=OFF # TODO: pick it up if you want to
 		-DCMINPACK_LIB_INSTALL_DIR=$(get_libdir)
-		-DBUILD_SHARED_LIBS=ON
 		-DBUILD_EXAMPLES=$(usex test)
 	)
-	cmake-utils_src_configure
-	use test && export LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}"
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
-	dodoc readme*
-	use doc && dodoc -r doc/*
+	use doc && local HTML_DOCS=( docs/. )
+	cmake_src_install
 }
diff --git a/sci-libs/cminpack/files/cminpack-1.3.5-underlinking.patch b/sci-libs/cminpack/files/cminpack-1.3.5-underlinking.patch
deleted file mode 100644
index 5133f5fcd4a8..000000000000
--- a/sci-libs/cminpack/files/cminpack-1.3.5-underlinking.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt	2016-12-29 03:57:50.652989816 +0000
-+++ b/CMakeLists.txt	2016-12-29 03:58:33.882632282 +0000
-@@ -59,6 +59,7 @@
-     cminpack.h minpack.h)
- 
- add_library (cminpack ${cminpack_srcs})
-+target_link_libraries (cminpack m)
- 
- install (TARGETS cminpack 
-    LIBRARY DESTINATION ${CMINPACK_LIB_INSTALL_DIR} COMPONENT library
diff --git a/sci-libs/cminpack/files/cminpack-1.3.8-cmake.patch b/sci-libs/cminpack/files/cminpack-1.3.8-cmake.patch
new file mode 100644
index 000000000000..92a9e777bbe5
--- /dev/null
+++ b/sci-libs/cminpack/files/cminpack-1.3.8-cmake.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt	2021-02-10 06:05:42.000000000 +0100
++++ b/CMakeLists.txt	2021-03-06 11:51:15.594882519 +0100
+@@ -175,6 +175,6 @@
+ 
+ endforeach ()
+ 
+-install (EXPORT CMinpackConfig DESTINATION share/cminpack NAMESPACE cminpack::)
++install (EXPORT CMinpackConfig DESTINATION ${CMINPACK_LIB_INSTALL_DIR}/cmake/cminpack NAMESPACE cminpack::)
+ 
+ add_subdirectory (examples)
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 205f5ac88bb2..fb20e649a013 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,5 +1,8 @@
-AUX gdal-2.2.3-soname.patch 2031 BLAKE2B adc05d4e426083af16c153011d1bccb2a6d7334eac2911faffdc373765cd21a69505928b14cf9896b7f7b23acefc574abd5c85d20b6376aee6a7bb87d775d30b SHA512 8d4cf1f7a69002c7d2789a5abb3c4d10a0d687566e8acd2ea208e994870eff2cb03975812c435eaa0dc13e1e2f42e2151dcb23ea0470242b1e79aa6892a13cdd
-AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6
+AUX gdal-2.2.3-soname.patch 1959 BLAKE2B f6cdba1af819b3416e18be1e584384b3df6858133773d2606dce96a78c239d23c204b55df62b09b16e5a0ddfee4c9469e7e6aa527088d53710884aa93287d41c SHA512 c7986792549557683125b331e0c1417cfe49ecffd067f5330ffaeb039ec0ec329d5967697210292edad6ccdcc912397cc2f4781808a87cec8de70e78d99f0a26
+AUX gdal-2.3.0-curl.patch 323 BLAKE2B 19a89ac9ffed5716fe2c26234233045022a3bc262d2ec386fdb5bc7a15cafc6472d1264020358223d2505992124177a0ae106cad26b8da671bbd1ece83762ee1 SHA512 5bd2df7712c6487e5968fbef84b4154f20d13ffe88f22886325be3c03fc882e2699e258e11c54eec750225fde1b2001d4dd35ace751a5f3c8ae59a9572241373
+AUX gdal-3.2.1-libdir.patch 20206 BLAKE2B 1b8c737246b25e8ea56855ec8cd41dc8bcc3ee575b02a6f13bd18dc062037e8f63848763fcb9a065c83d26ed510e341ee5ac9315d9b4c78ca3bb3a76f0098539 SHA512 da49eb9b42cd298b870afce6312e46ea81a41ffea7598b4cae579c846301b0179a7236ee6677fa7a2ff3c2da28eeb519d634667de973cf001f3ea8a08d4cebad
 DIST gdal-3.2.1.tar.gz 18953600 BLAKE2B b47994849bcf6bc2b2f53daabb85ef99cdc9ce2a06134bc591652bf7e5304d503701d2b07cae520ca71ad6238dd0b073d2034743e59b072fc5eb50c13bc143e6 SHA512 152dd97464a8242ea1da7a3a215b1d3326bab5aa4b0884fcab6880da460577c80075f87ea7b9513d796e899e98b40701c0b6a63f1e5275607905480ec547e688
-EBUILD gdal-3.2.1-r1.ebuild 7221 BLAKE2B 5d0322c1869f37dbdd0e39884acc0c17c939f442fa3dd1a0ad98cd735cb02b034fa6c33bcffb7f204c5e6081f5b785578757e800d46c9c3225008e4380a7a9a0 SHA512 855ccb9d188a6c5c91a2da2074f78425c908615cc488dcedb631aa4784f69b8a144f77369b01401f59d5cd83a7bae96237c45b12f3075091d56e9a7ef9a66525
+DIST gdal-3.2.2.tar.gz 18959415 BLAKE2B 001347ee12c72fe4d9cfa27adb427624f80e5b16eeca01510166e3d74c36eb00da72c27d8582ccda124151143561c29b8e59dc3dd800c474b77991417b33acd1 SHA512 d7ff8773d3f1cb894fce89f56a3d4355769f1113eefb1367a3a543ced750e2c42618a4a1deef3a338ddd4d33b7332ae962b2d793f8c0b97e31ed4b84cb2df2d5
+EBUILD gdal-3.2.1-r1.ebuild 7498 BLAKE2B 9b79a2d74a5bfec4c52c655ab1dc1778add39a315855b6507f3d11ae43056c5530735cc56dc23b65f24fd591291f446f56ad78932691356637832194013b8204 SHA512 aa7ec568bd7c061cfc0e37030912b5ac2e4121ecb331953f03bd58c135d10dcc7bf24ecaa0a77c4597a1813e1feb0ed589657eab22363d04ca15bd0009921612
+EBUILD gdal-3.2.2.ebuild 7728 BLAKE2B d5580737064518bbac3ff601069a7e8def19f17d3adbb65975e5fe82cddcaa27038b035555e26bf856b4498c40b15717f9f90f89561582918c1d2f611ce590a6 SHA512 2708bfc0cea227df3ad43af2084fc82042792c3a74e6bf3035c81f9fe4fcc43eef9c2dae89f61c8cd9375b90cd6faa3a0c72152e36600a3a0edbe74804c72cea
 MISC metadata.xml 1495 BLAKE2B 3d9f0cc3e5169eab7ff2c59b61d9fa5b4f8edf683f6e1447c40b1b0e8d81834e2d9fc13c68979c51a710f5aca5c9cd9a1f45a13c4e4ad0ded7a0fcdc1751d54b SHA512 cd0820bd5df06ccfb6315ab4586e49f72396115d08f318038dc3af2380a1896128ccf0ba46de0cc370546f7313907844907d6d75cc705a74bf4c78d0121afc3d
diff --git a/sci-libs/gdal/files/gdal-2.2.3-soname.patch b/sci-libs/gdal/files/gdal-2.2.3-soname.patch
index 4cceee5ec928..1fee41daeafc 100644
--- a/sci-libs/gdal/files/gdal-2.2.3-soname.patch
+++ b/sci-libs/gdal/files/gdal-2.2.3-soname.patch
@@ -3,8 +3,8 @@ Set SONAME and unbreak compilation on Darwin
 Author: Fabian Groffen <grobian@gentoo.org>
 Author: Dennis Schridde <devurandom@gmx.net>
 
---- a/GDALmake.opt.in	2008-02-02 18:25:48.000000000 -0800
-+++ b/GDALmake.opt.in	2008-02-02 18:54:53.000000000 -0800
+--- a/GDALmake.opt.in
++++ b/GDALmake.opt.in
 @@ -97,6 +97,14 @@
  GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(SO_EXT)
  GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal
diff --git a/sci-libs/gdal/files/gdal-2.3.0-curl.patch b/sci-libs/gdal/files/gdal-2.3.0-curl.patch
index 1cd33243f42b..46bc6de71672 100644
--- a/sci-libs/gdal/files/gdal-2.3.0-curl.patch
+++ b/sci-libs/gdal/files/gdal-2.3.0-curl.patch
@@ -1,6 +1,6 @@
-diff -urNd gdal-2.3.1/port/cpl_vsil_curl.cpp gdal-2.3.1-curl/port/cpl_vsil_curl.cpp
---- gdal-2.3.1/port/cpl_vsil_curl.cpp	2018-06-24 01:10:23.000000000 +1000
-+++ gdal-2.3.1-curl/port/cpl_vsil_curl.cpp	2018-07-13 01:29:31.326347717 +1000
+https://bugs.gentoo.org/659840
+--- a/port/cpl_vsil_curl.cpp
++++ b/port/cpl_vsil_curl.cpp
 @@ -8617,8 +8617,10 @@
          if( poFSHandler )
              poFSHandler->ClearCache();
diff --git a/sci-libs/gdal/files/gdal-3.2.1-libdir.patch b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
new file mode 100644
index 000000000000..cc4537bca434
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.2.1-libdir.patch
@@ -0,0 +1,408 @@
+https://github.com/OSGeo/gdal/pull/3560
+https://bugs.gentoo.org/696106
+--- a/configure.ac
++++ b/configure.ac
+@@ -1121,11 +1121,11 @@ if test "$with_libz" = "external" -o "$with_libz" = "" -o "$with_libz" = "yes" ;
+ 
+ elif test "$with_libz" != "no" -a "$with_libz" != "internal" ; then
+ 
+-  LIBS="-L$with_libz -L$with_libz/lib $LIBS"
++  LIBS="-L$with_libz -L$with_libz/${libdir} $LIBS"
+ 
+-  AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/lib -lz)
++  AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/${libdir} -lz)
+   if test "$LIBZ_SETTING" = "external" ; then
+-    AC_CHECK_LIB(z,inflateCopy,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/lib -lz)
++    AC_CHECK_LIB(z,inflateCopy,LIBZ_SETTING=external,LIBZ_SETTING=internal,-L$with_libz -L$with_libz/${libdir} -lz)
+      if test "$LIBZ_SETTING" = "external" ; then
+         AC_MSG_RESULT([using libz library from $with_libz])
+     else
+@@ -1166,7 +1166,7 @@ AC_ARG_WITH(libdeflate,
+ if test "$with_libdeflate" != "no" ; then
+ 
+   if test "$with_libdeflate" != "" -a "$with_libdeflate" != "yes"; then
+-    AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no],-L$with_libdeflate/lib)
++    AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no],-L$with_libdeflate/${libdir})
+   else
+     AC_CHECK_LIB(deflate, libdeflate_zlib_decompress, [libdeflate_lib=yes], [libdeflate_lib=no])
+   fi
+@@ -1197,7 +1197,7 @@ fi
+ if test "$LIBDEFLATE_SETTING" = "yes" ; then
+   if test "$with_libdeflate" != "" -a "$with_libdeflate" != "yes"; then
+     EXTRA_INCLUDES="-I$with_libdeflate/include $EXTRA_INCLUDES"
+-    LIBS="-L$with_libdeflate/lib -ldeflate $LIBS"
++    LIBS="-L$with_libdeflate/${libdir} -ldeflate $LIBS"
+   else
+     LIBS="-ldeflate $LIBS"
+   fi
+@@ -1290,7 +1290,7 @@ else
+     LIBS="-L$with_libtiff -ltiff $LIBS"
+     EXTRA_INCLUDES="-I$with_libtiff $EXTRA_INCLUDES"
+   else
+-    LIBS="-L$with_libtiff/lib -ltiff $LIBS"
++    LIBS="-L$with_libtiff/${libdir} -ltiff $LIBS"
+     EXTRA_INCLUDES="-I$with_libtiff/include $EXTRA_INCLUDES"
+   fi
+ 
+@@ -1414,52 +1414,22 @@ else
+     fi
+   else
+     ORIG_LIBS="$LIBS"
+-    LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
++    LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+     AC_LANG_PUSH([C++])
+     AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+     AC_LANG_POP([C++])
+     if test "$PROJ_FOUND" = "no"; then
+-        LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
++        LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+         unset ac_cv_lib_proj_proj_create_from_wkt
+         AC_LANG_PUSH([C++])
+         AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+         AC_LANG_POP([C++])
+     fi
+     if test "$PROJ_FOUND" = "no"; then
+-        LIBS="-L$with_proj/lib64 -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+-        unset ac_cv_lib_proj_proj_create_from_wkt
+-        AC_LANG_PUSH([C++])
+-        AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+-        AC_LANG_POP([C++])
+-    fi
+-    if test "$PROJ_FOUND" = "no"; then
+-        LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
++        LIBS="-L$with_proj/${libdir} -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+         AC_LANG_PUSH([C++])
+         AC_CHECK_LIB(proj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+         AC_LANG_POP([C++])
+-        if test "$PROJ_FOUND" = "no"; then
+-            LIBS="-L$with_proj/lib -lproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+-            unset ac_cv_lib_proj_internal_proj_create_from_wkt
+-            AC_LANG_PUSH([C++])
+-            AC_CHECK_LIB(proj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+-            AC_LANG_POP([C++])
+-        fi
+-        if test "$PROJ_FOUND" = "yes"; then
+-            PROJ_INCLUDE="-DPROJ_RENAME_SYMBOLS"
+-        fi
+-    fi
+-    if test "$PROJ_FOUND" = "no"; then
+-        LIBS="-L$with_proj/lib -linternalproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+-        AC_LANG_PUSH([C++])
+-        AC_CHECK_LIB(internalproj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+-        AC_LANG_POP([C++])
+-        if test "$PROJ_FOUND" = "no"; then
+-            LIBS="-L$with_proj/lib -linternalproj $with_proj_extra_lib_for_test $ORIG_LIBS"
+-            unset ac_cv_lib_internal_proj_internal_proj_create_from_wkt
+-            AC_LANG_PUSH([C++])
+-            AC_CHECK_LIB(internalproj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+-            AC_LANG_POP([C++])
+-        fi
+         if test "$PROJ_FOUND" = "yes"; then
+             PROJ_INCLUDE="-DPROJ_RENAME_SYMBOLS"
+         fi
+@@ -1523,7 +1493,7 @@ elif test "$with_spatialite" = "dlopen"; then
+       SPATIALITE_SONAME="spatialite.so"
+   fi
+ else
+-    AC_CHECK_LIB(spatialite,spatialite_init,SPATIALITE_INIT_FOUND=yes,SPATIALITE_INIT_FOUND=no,-L$with_spatialite/lib -lspatialite)
++    AC_CHECK_LIB(spatialite,spatialite_init,SPATIALITE_INIT_FOUND=yes,SPATIALITE_INIT_FOUND=no,-L$with_spatialite/${libdir} -lspatialite)
+ 
+     if test -f "$with_spatialite/include/spatialite.h" -a \
+         "$SPATIALITE_INIT_FOUND" = "yes"; then
+@@ -1531,7 +1501,7 @@ else
+         if test "$HAVE_SQLITE3" = "yes"; then
+             SPATIALITE_INC="-I$with_spatialite/include"
+             HAVE_SPATIALITE=yes
+-            SPATIALITE_LIBS="-L$with_spatialite/lib -lspatialite"
++            SPATIALITE_LIBS="-L$with_spatialite/${libdir} -lspatialite"
+             LIBS="$SQLITE3_LDFLAGS $LIBS $SPATIALITE_LIBS"
+             AC_MSG_RESULT(spatialite enabled)
+         else
+@@ -1593,10 +1563,10 @@ if test "$with_zstd" = "" -o "$with_zstd" = "yes" ; then
+   fi
+ elif test "$with_zstd" != "" -a "$with_zstd" != "no"; then
+ 
+-  AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,-L$with_zstd/lib)
++  AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,-L$with_zstd/${libdir})
+ 
+   if test "$ZSTD_SETTING" = "yes" -a -f "$with_zstd/include/zstd.h" ; then
+-    LIBS="-L$with_zstd/lib -lzstd $LIBS"
++    LIBS="-L$with_zstd/${libdir} -lzstd $LIBS"
+     EXTRA_INCLUDES="-I$with_zstd/include $EXTRA_INCLUDES"
+   else
+     AC_MSG_ERROR([libzstd not found])
+@@ -1919,20 +1889,20 @@ fi
+ # TODO: separate libs for rasters and vectors
+ if test "$with_grass" != "yes" -a "$with_grass" != "no" ; then
+ 
+-  AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++  AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+   if test "$GRASS_SETTING" = "no" ; then
+-    AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++    AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+   fi
+ 
+   if test "$GRASS_SETTING" != "no" ; then
+     if test "$GRASS_SETTING" = "grass70+" ; then
+       G_RASTLIBS="-lgrass_raster -lgrass_imagery"
+       G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+-      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
++      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
+     else
+       G_RASTLIBS="-lgrass_I"
+       G_VECTLIBS="-lgrass_vect -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+-      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
++      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
+     fi
+     GRASS_INCLUDE="-I$with_grass/include"
+     GRASS_GISBASE="$with_grass"
+@@ -1956,10 +1926,10 @@ elif test "$with_libgrass" = "yes" -o "$with_libgrass" = "" ; then
+ 
+ else
+ 
+-  AC_CHECK_LIB(grass5,G_gisinit_2,GRASS_SETTING=libgrass,GRASS_SETTING=no,-L$with_libgrass/lib)
++  AC_CHECK_LIB(grass5,G_gisinit_2,GRASS_SETTING=libgrass,GRASS_SETTING=no,-L$with_libgrass/${libdir})
+ 
+   if test "$GRASS_SETTING" = "libgrass" ; then
+-    LIBS="-L$with_libgrass -L$with_libgrass/lib -lgrass5 $LIBS"
++    LIBS="-L$with_libgrass -L$with_libgrass/${libdir} -lgrass5 $LIBS"
+     GRASS_INCLUDE="-I$with_libgrass -I$with_libgrass/include $EXTRA_INCLUDES"
+   else
+     AC_MSG_ERROR([--with-libgrass=$with_grass requested, but libgrass5 not found!])
+@@ -2006,7 +1976,7 @@ dnl Fedora has cfitsio headers in /usr/include/cfitsio
+ else
+ 
+   FITS_SETTING=external
+-  LIBS="-L$with_cfitsio -L$with_cfitsio/lib -lcfitsio $LIBS"
++  LIBS="-L$with_cfitsio -L$with_cfitsio/${libdir} -lcfitsio $LIBS"
+   EXTRA_INCLUDES="-I$with_cfitsio -I$with_cfitsio/include $EXTRA_INCLUDES"
+ 
+   echo "using libcfitsio from $with_cfitsio."
+@@ -2055,7 +2025,7 @@ elif test "$with_pcraster" = "internal" ; then
+ else
+ 
+   PCRASTER_SETTING=external
+-  LIBS="-L$with_pcraster/lib -lcsf $LIBS"
++  LIBS="-L$with_pcraster/${libdir} -lcsf $LIBS"
+   EXTRA_INCLUDES="-I$with_pcraster/include $EXTRA_INCLUDES"
+ 
+   echo "using libcsf from $with_pcraster."
+@@ -2106,7 +2076,7 @@ elif test "$with_png" = "internal" ; then
+ else
+ 
+   PNG_SETTING=external
+-  LIBS="-L$with_png -L$with_png/lib -lpng $LIBS"
++  LIBS="-L$with_png -L$with_png/${libdir} -lpng $LIBS"
+   EXTRA_INCLUDES="-I$with_png -I$with_png/include $EXTRA_INCLUDES"
+ 
+   echo "using libpng from $with_png."
+@@ -2141,7 +2111,7 @@ else
+ 
+   DDS_SETTING=yes
+   CRUNCHDIR="$with_dds"
+-  LIBS="-L$with_dds/lib/ -lcrunch $LIBS"
++  LIBS="-L$with_dds/${libdir}/ -lcrunch $LIBS"
+   echo "using libcrunch from $with_dds."
+ 
+ fi
+@@ -2179,7 +2149,7 @@ elif test "$with_gta" = "yes" -o "$with_gta" = "" ; then
+ else
+ 
+   GTA_SETTING=yes
+-  LIBS="-L$with_gta -L$with_gta/lib -lgta $LIBS"
++  LIBS="-L$with_gta -L$with_gta/${libdir} -lgta $LIBS"
+   EXTRA_INCLUDES="-I$with_gta -I$with_gta/include $EXTRA_INCLUDES"
+ 
+   echo "using libgta from $with_gta."
+@@ -2217,7 +2187,7 @@ elif test "$with_pcidsk" = "" -o "$with_pcidsk" = "yes" -o "$with_pcidsk" = "int
+ else
+ 
+   PCIDSK_SETTING=external
+-  PCIDSK_LIB="-L$with_pcidsk/lib -lpcidsk"
++  PCIDSK_LIB="-L$with_pcidsk/${libdir} -lpcidsk"
+   PCIDSK_INCLUDE="-I$with_pcidsk/include -I$with_pcidsk/include/pcidsk"
+ 
+   echo "using libpcidsk from $with_pcidsk."
+@@ -2292,10 +2262,10 @@ else
+ 
+   dnl We now require libgeotiff 1.5.0
+   dnl first check if $with_geotiff/lib has the library:
+-  AC_CHECK_LIB(geotiff,GTIFAttachPROJContext,GEOTIFF_SETTING=external,GEOTIFF_SETTING=not_found,-L$with_geotiff/lib)
++  AC_CHECK_LIB(geotiff,GTIFAttachPROJContext,GEOTIFF_SETTING=external,GEOTIFF_SETTING=not_found,-L$with_geotiff/${libdir})
+ 
+   if test $GEOTIFF_SETTING = "external" ; then
+-    LIBS="-L$with_geotiff/lib -lgeotiff $LIBS"
++    LIBS="-L$with_geotiff/${libdir} -lgeotiff $LIBS"
+     if test  -d $with_geotiff/include ; then
+       EXTRA_INCLUDES="-I$with_geotiff/include $EXTRA_INCLUDES"
+     fi
+@@ -2367,7 +2337,7 @@ elif test "$with_jpeg" = "internal" ; then
+ else
+ 
+   JPEG_SETTING=external
+-  LIBS="-L$with_jpeg -L$with_jpeg/lib -ljpeg $LIBS"
++  LIBS="-L$with_jpeg -L$with_jpeg/${libdir} -ljpeg $LIBS"
+   EXTRA_INCLUDES="-I$with_jpeg -I$with_jpeg/include $EXTRA_INCLUDES"
+ 
+   echo "using libjpeg from $with_jpeg."
+@@ -2518,7 +2488,7 @@ elif test "$with_gif" = "internal" ; then
+ else
+ 
+   GIF_SETTING=external
+-  LIBS="-L$with_gif -L$with_gif/lib -lgif $LIBS"
++  LIBS="-L$with_gif -L$with_gif/${libdir} -lgif $LIBS"
+   EXTRA_INCLUDES="-I$with_gif -I$with_gif/include $EXTRA_INCLUDES"
+ 
+   echo "using libgif from $with_gif."
+@@ -2584,10 +2554,10 @@ elif test "$with_ogdi" = "yes" -o "$with_ogdi" = "" ; then
+ 
+ else
+ 
+-  AC_CHECK_LIB(ogdi,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/lib -logdi)
++  AC_CHECK_LIB(ogdi,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/${libdir} -logdi)
+   if test "$HAVE_OGDI" = "yes" ; then
+     if test -f "$with_ogdi/ecs.h" -o -f "$with_ogdi/include/ecs.h"; then
+-        LIBS="-L$with_ogdi -L$with_ogdi/lib -logdi $LIBS"
++        LIBS="-L$with_ogdi -L$with_ogdi/${libdir} -logdi $LIBS"
+         OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include"
+ 
+         echo "using libogdi from $with_ogdi."
+@@ -2597,10 +2567,10 @@ else
+      fi
+   else
+     dnl For backward compatibility. Retry with ogdi31 as a name
+-    AC_CHECK_LIB(ogdi31,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/lib -logdi31)
++    AC_CHECK_LIB(ogdi31,cln_GetLayerCapabilities,HAVE_OGDI=yes,HAVE_OGDI=no,-L$with_ogdi -L$with_ogdi/${libdir} -logdi31)
+     if test "$HAVE_OGDI" = "yes" ; then
+       if test -f "$with_ogdi/ecs.h" -o -f "$with_ogdi/include/ecs.h"; then
+-        LIBS="-L$with_ogdi -L$with_ogdi/lib -logdi31 $LIBS"
++        LIBS="-L$with_ogdi -L$with_ogdi/${libdir} -logdi31 $LIBS"
+         OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include"
+ 
+         echo "using libogdi31 from $with_ogdi."
+@@ -2718,10 +2688,10 @@ elif test "$with_sosi" = "yes" ; then
+     rm -f testfyba
+ else
+ 
+-  AC_MSG_CHECKING([for libfyba.a, libfygm.a and libfyut.a in $with_sosi/lib])
+-  if test -r $with_sosi/lib/libfyba.a -a -r $with_sosi/lib/libfygm.a -a -r $with_sosi/lib/libfyut.a ; then
++  AC_MSG_CHECKING([for libfyba.a, libfygm.a and libfyut.a in $with_sosi/${libdir}])
++  if test -r $with_sosi/${libdir}/libfyba.a -a -r $with_sosi/${libdir}/libfygm.a -a -r $with_sosi/${libdir}/libfyut.a ; then
+     AC_MSG_RESULT([found.])
+-    SOSI_LIB="$with_sosi/lib/libfyba.a $with_sosi/lib/libfygm.a $with_sosi/lib/libfyut.a"
++    SOSI_LIB="$with_sosi/${libdir}/libfyba.a $with_sosi/${libdir}/libfygm.a $with_sosi/${libdir}/libfyut.a"
+     SOSI_ENABLED=yes
+   else
+     AC_MSG_ERROR([not found.])
+@@ -2782,14 +2752,14 @@ else
+   AC_ARG_WITH(boost-lib-path,
+           [  --with-boost-lib-path=ARG   Path to boost libraries for mongocxx client],,,)
+ 
+-  AC_MSG_CHECKING([for libmongoclient.so in in $with_mongocxx/lib])
++  AC_MSG_CHECKING([for libmongoclient.so in in $with_mongocxx/${libdir}])
+   MONGODB_ENABLED=yes
+-  if test -r $with_mongocxx/lib/libmongoclient.so; then
++  if test -r $with_mongocxx/${libdir}/libmongoclient.so; then
+     AC_MSG_RESULT([found.])
+-    MONGODB_LIB="-L$with_mongocxx/lib -lmongoclient"
+-  elif test -r $with_mongocxx/lib/libmongoclient.dylib; then
++    MONGODB_LIB="-L$with_mongocxx/${libdir} -lmongoclient"
++  elif test -r $with_mongocxx/${libdir}/libmongoclient.dylib; then
+     AC_MSG_RESULT([found.])
+-    MONGODB_LIB="-L$with_mongocxx/lib -lmongoclient"
++    MONGODB_LIB="-L$with_mongocxx/${libdir} -lmongoclient"
+   else
+     AC_MSG_ERROR([not found.])
+   fi
+@@ -4770,8 +4740,8 @@ if test "$with_libjson_c" = "external" -o "$with_libjson_c" = "" -o "$with_libjs
+ elif test "$with_libjson_c" = "internal" ; then
+   LIBJSONC_SETTING=internal
+ elif test "$with_libjson_c" != "no"; then
+-  LIBS="-L$with_libjson_c/lib $LIBS"
+-  AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,-L$with_libjson_c/lib)
++  LIBS="-L$with_libjson_c/${libdir} $LIBS"
++  AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,-L$with_libjson_c/${libdir})
+ else
+   AC_MSG_ERROR([libjson-c (internal or external) is required])
+ fi
+--- a/frmts/grass/pkg/configure.in
++++ b/frmts/grass/pkg/configure.in
+@@ -99,7 +99,7 @@ else
+   if $GDAL_CONFIG --autoload > /dev/null 2>&1 ; then
+     AUTOLOAD_DIR=`$GDAL_CONFIG --autoload`
+   else
+-    AUTOLOAD_DIR=`$GDAL_CONFIG --prefix`/lib/gdalplugins
++    AUTOLOAD_DIR=`$GDAL_CONFIG --prefix`/${libdir}/gdalplugins
+   fi
+ fi
+ 
+@@ -123,11 +123,11 @@ fi
+ 
+ if test "$with_grass" != "yes" ; then
+ 
+-  AC_CHECK_LIB(grass_gis,G_read_compressed,GRASS_SETTING=grass72+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++  AC_CHECK_LIB(grass_gis,G_read_compressed,GRASS_SETTING=grass72+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+   if test "$GRASS_SETTING" = "no" ; then
+-    AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++    AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+     if test "$GRASS_SETTING" = "no" ; then
+-      AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime)
++      AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/${libdir} -lgrass_datetime)
+     fi
+   fi
+ 
+@@ -135,15 +135,15 @@ if test "$with_grass" != "yes" ; then
+     if test "$GRASS_SETTING" = "grass72+" ; then
+       G_RASTLIBS="-lgrass_raster -lgrass_imagery"
+       G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+-      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_btree2 -lgrass_ccmath $LIBS"
++      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_btree2 -lgrass_ccmath $LIBS"
+     elif test "$GRASS_SETTING" = "grass70+" ; then
+       G_RASTLIBS="-lgrass_raster -lgrass_imagery"
+       G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+-      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
++      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
+     else
+       G_RASTLIBS="-lgrass_I"
+       G_VECTLIBS="-lgrass_vect -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+-      LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
++      LIBS="-L$with_grass/${libdir} $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
+     fi
+     GRASS_INCLUDE="-I$with_grass/include"
+     GRASS_GISBASE="$with_grass"
+--- a/m4/ax_lib_expat.m4
++++ b/m4/ax_lib_expat.m4
+@@ -119,9 +119,9 @@ AC_DEFUN([AX_LIB_EXPAT],
+                     expat_lib_flags="-lexpat"
+                 fi
+             else
+-                AC_CHECK_LIB(expat,XML_ParserCreate,run_expat_test="yes",run_expat_test="no",-L$expat_prefix/lib)
++                AC_CHECK_LIB(expat,XML_ParserCreate,run_expat_test="yes",run_expat_test="no",-L$expat_prefix/${libdir})
+                 if test "$run_expat_test" = "yes"; then
+-                    expat_lib_flags="-L$expat_prefix/lib -lexpat"
++                    expat_lib_flags="-L$expat_prefix/${libdir} -lexpat"
+                 fi
+             fi
+         fi
+--- a/m4/ax_lib_libkml.m4
++++ b/m4/ax_lib_libkml.m4
+@@ -172,7 +172,7 @@ kmldom::KmlFactory* factory = kmldom::KmlFactory::GetFactory();
+             if test "$libkml_prefix" = "/usr"; then
+                 libkml_lib_flags="-lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
+             else
+-                libkml_lib_flags="-L$libkml_prefix/lib -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
++                libkml_lib_flags="-L$libkml_prefix/${libdir} -lkmldom -lkmlbase -lkmlengine -lkmlconvenience -lminizip -luriparser"
+             fi
+             run_libkml_test="yes"
+         elif test "$libkml_requested" = "yes"; then
+--- a/m4/ax_lib_xerces.m4
++++ b/m4/ax_lib_xerces.m4
+@@ -100,7 +100,7 @@ AC_DEFUN([AX_LIB_XERCES],
+         if test "$xerces_prefix" = "/usr"; then
+             xerces_lib_flags="-lxerces-c -lpthread"
+         else
+-            xerces_lib_flags="-L$xerces_prefix/lib -lxerces-c -lpthread"
++            xerces_lib_flags="-L$xerces_prefix/${libdir} -lxerces-c -lpthread"
+         fi
+         run_xerces_test="yes"
+     elif test "$xerces_requested" = "yes"; then
diff --git a/sci-libs/gdal/gdal-3.2.1-r1.ebuild b/sci-libs/gdal/gdal-3.2.1-r1.ebuild
index 5eb32d7fbfb8..7bed137263c6 100644
--- a/sci-libs/gdal/gdal-3.2.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.2.1-r1.ebuild
@@ -88,11 +88,19 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.3-soname.patch"
 	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+	"${FILESDIR}/${PN}-3.2.1-libdir.patch"
 )
 
 src_prepare() {
 	default
 
+	# Drop a --prefix hack in the upstream build system
+	# We don't want the line at all, so let's just drop it rather than
+	# trying to put in the right libdir value.
+	# bug #696106
+	sed -e '/\$ADD_PREFIX\/lib/d' \
+		-i configure.ac || die
+
 	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
 		-i configure.ac || die
 
@@ -131,10 +139,10 @@ src_configure() {
 		--with-geotiff
 		--with-gnm
 		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}"/usr/
+		--with-libjson-c="${EPREFIX}"/usr
 		--with-libtiff
 		--with-libtool
-		--with-libz="${EPREFIX}"/usr/
+		--with-libz="${EPREFIX}"/usr
 		--without-charls
 		--without-dods-root
 		--without-ecw
diff --git a/sci-libs/gdal/gdal-3.2.2.ebuild b/sci-libs/gdal/gdal-3.2.2.ebuild
new file mode 100644
index 000000000000..b0bb442841b2
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.2.2.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_OPTIONAL=1
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic java-pkg-opt-2 perl-module toolchain-funcs
+
+DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="https://gdal.org/"
+SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/3.2"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
+
+REQUIRED_USE="
+	mdb? ( java )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	spatialite? ( sqlite )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	java? (
+		dev-java/ant-core
+		dev-lang/swig:0
+		>=virtual/jdk-1.7:*
+	)
+	perl? ( dev-lang/swig:0 )
+	python? (
+		dev-lang/swig:0
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-libs/expat
+	dev-libs/json-c:=
+	dev-libs/libpcre
+	dev-libs/libxml2:2
+	dev-libs/openssl:=
+	media-libs/tiff
+	>=sci-libs/libgeotiff-1.5.1-r1:=
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib[minizip(+)]
+	armadillo? ( sci-libs/armadillo:=[lapack] )
+	curl? ( net-misc/curl )
+	fits? ( sci-libs/cfitsio:= )
+	geos? ( >=sci-libs/geos-3.8.0 )
+	gif? ( media-libs/giflib:= )
+	gml? ( >=dev-libs/xerces-c-3.1 )
+	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
+	jpeg? ( virtual/jpeg:0= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lzma? ( || (
+		app-arch/xz-utils
+		app-arch/lzma
+	) )
+	mdb? ( dev-java/jackcess:1 )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf:= )
+	odbc? ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	opencl? ( virtual/opencl )
+	oracle? ( dev-db/oracle-instantclient:= )
+	pdf? ( app-text/poppler:= )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+	xls? ( dev-libs/freexl )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.7:* )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.3-soname.patch"
+	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+	"${FILESDIR}/${PN}-3.2.1-libdir.patch"
+)
+
+src_prepare() {
+	default
+
+	# Drop a --prefix hack in the upstream build system
+	# We don't want the line at all, so let's just drop it rather than
+	# trying to put in the right libdir value.
+	# bug #696106
+	sed -e '/\$ADD_PREFIX\/lib/d' \
+		-i configure.ac || die
+
+	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+		-i configure.ac || die
+
+	sed -e 's:^ar:$(AR):g' \
+		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
+
+	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
+	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+		-i swig/python/GNUmakefile || die "sed python makefile failed"
+
+	# autoconf 2.70+
+	# bug #775209
+	config_rpath_update .
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# charls - not packaged in Gentoo ebuild repository
+		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+		# bsb - legal issues
+		# ingres - same story as oracle oci
+		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
+		# podofo - we use poppler instead they are exclusive for each other
+		# tiff is a hard dep
+		--includedir="${EPREFIX}"/usr/include/${PN}
+		--disable-lto
+		--disable-static
+		--disable-driver-bsb
+		--disable-driver-mrf
+		--disable-pdf-plugin
+		--enable-shared
+		--enable-driver-grib
+		--with-bash-completion="$(get_bashcompdir)"
+		--with-cpp14
+		--with-crypto
+		--with-cryptopp=no
+		--with-expat
+		--with-geotiff
+		--with-gnm
+		--with-hide-internal-symbols
+		--with-libjson-c="${EPREFIX}"/usr
+		--with-libtiff
+		--with-libtool
+		--with-libz="${EPREFIX}"/usr
+		--without-charls
+		--without-dods-root
+		--without-ecw
+		--without-epsilon
+		--without-fgdb
+		--without-fme
+		--without-gta
+		--without-grass
+		--without-hdf4
+		--without-idb
+		--without-ingres
+		--without-jasper
+		--without-jp2lura
+		--without-jp2mrsid
+		--without-kakadu
+		--without-kea
+		--without-libkml
+		--without-mongocxx
+		--without-mrsid
+		--without-mrsid_lidar
+		--without-msg
+		--without-rasdaman
+		--without-rasterlite2
+		--without-pcraster
+		--without-pdfium
+		--without-perl
+		--without-podofo
+		--without-python
+		--without-qhull
+		--without-sfcgal
+		--without-sosi
+		--without-teigha
+		$(use_enable debug)
+		$(use_with armadillo)
+		$(use_with aux-xml pam)
+		$(use_with curl)
+		$(use_with cpu_flags_x86_avx avx)
+		$(use_with cpu_flags_x86_sse sse)
+		$(use_with cpu_flags_x86_ssse3 ssse3)
+		$(use_with fits cfitsio)
+		$(use_with geos)
+		$(use_with gif)
+		$(use_with gml xerces)
+		$(use_with hdf5)
+		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
+		$(use_with jpeg)
+		$(use_with jpeg2k openjpeg)
+		$(use_with lzma liblzma)
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
+		$(use_with netcdf)
+		$(use_with oracle oci)
+		$(use_with odbc)
+		$(use_with ogdi ogdi "${EPREFIX}"/usr)
+		$(use_with opencl)
+		$(use_with pdf poppler)
+		$(use_with png)
+		$(use_with postgres pg)
+		$(use_with spatialite)
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+		$(use_with threads)
+		$(use_with webp)
+		$(use_with xls freexl)
+		$(use_with zstd)
+	)
+
+	tc-export AR RANLIB
+
+	if use java; then
+		myconf+=(
+			--with-java=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-lib=dlopen
+			$(use_with mdb)
+		)
+	else
+		myconf+=( --without-java --without-mdb )
+	fi
+
+	if use sqlite; then
+		append-libs -lsqlite3
+	fi
+
+	# bug #632660
+	if use ogdi; then
+		append-cflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+		append-cxxflags $($(tc-getPKG_CONFIG) --cflags libtirpc)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	if use mysql; then
+		sed -e "s: -rdynamic : :" \
+			-i GDALmake.opt || die "sed LIBS failed"
+	fi
+}
+
+src_compile() {
+	if use perl; then
+		rm "${S}"/swig/perl/*_wrap.cpp || die
+		emake -C "${S}"/swig/perl generate
+	fi
+
+	# gdal-config needed before generating Python bindings
+	default
+
+	if use java; then
+		pushd "${S}"/swig/java > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+
+	if use perl; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null || die
+	fi
+
+	if use python; then
+		rm -f "${S}"/swig/python/*_wrap.cpp || die
+		emake -C "${S}"/swig/python generate
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+
+	use doc && emake docs
+}
+
+src_install() {
+	local DOCS=( NEWS )
+	use doc && local HTML_DOCS=( html/. )
+
+	default
+
+	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
+
+	if use perl; then
+		pushd "${S}"/swig/perl > /dev/null || die
+		myinst=( DESTDIR="${D}" )
+		perl-module_src_install
+		popd > /dev/null || die
+		perl_delete_localpod
+	fi
+
+	if use python; then
+		# Don't clash with gdal's docs
+		unset DOCS HTML_DOCS
+
+		pushd "${S}"/swig/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+
+		newdoc swig/python/README.rst README-python.rst
+
+		insinto /usr/share/${PN}/samples
+		doins -r swig/python/samples/.
+	fi
+
+	doman "${S}"/man/man*/*
+	find "${ED}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 97622eb0edb3..a0187b1f9d4b 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -2,6 +2,6 @@ DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e025
 DIST geos-3.9.0-r1.tar.bz2 4710957 BLAKE2B dab0f4e0bfb1bd244c2faf5ee6149b65d142eea78e87490025f90b672eee0d25d4ba9bc4c3b223e78ea0c9d34625b4750c7ba03852e5ea9540ad5c479d84b995 SHA512 1081f2aa20e671450953f7bb53b17c703804a1c9f4987c9da0987ff24339af5811b2c8b79c8e438d04ca38e4d06164dc5a4206f266f7efc19af3f9d9ea8f71f8
 DIST geos-3.9.1-r1.tar.bz2 4761372 BLAKE2B af1597d9372b18a2f280d82941949518cd8edb9296e9647aa3949c9e10fdd1b6ef500298471ec469d711ab0569eabd8fc3fb0a8f7e9bd48f91150cfdcaea65a8 SHA512 7ea131685cd110ec5e0cb7c214b52b75397371e75f011e1410b6770b6a48ca492a02337d86a7be35c852ef94604fe9d6f49634c79d4946df611aaa4f5cbaee28
 EBUILD geos-3.8.1.ebuild 1102 BLAKE2B 6b6a901ab393f6501c8ecbd6195e57c76bf7165b79d892049535212d16d3961a1abf82154e897a7172768551a44396e33cc95ec500949863024ffb06185bada0 SHA512 deb6a39dc4cdf5529243b89be65fdaba5cd85905860575cab33202d9c52e511b677e0e72c280867939cd081d4a6787959def3798689913ef15afc988774641fe
-EBUILD geos-3.9.0-r2.ebuild 1074 BLAKE2B ac3bcf9766564e0b2a9fd45bd0a8ececbd00a6067ab2a3ecc67c8d37af427f41c299d423bcf71ddb4697196cc61870be4659343067794411b33a164afdf73ea7 SHA512 0bdd9ba61a2b9e22199f59ebc15b8506b676d5cf967c34d794796c9331842b5e05461791e5caa13b7ed4f42e6dd4af4c72ff219ce2aa5f805f6c9926b68db8fc
+EBUILD geos-3.9.0-r2.ebuild 1073 BLAKE2B dfddcb6c942568397a90094ae3d16a91758fe9610bb8310e0f53d9c33780e163f9f4dcedd1c6739d48c286eaa3534e1bc563b9a4450fb0e65d5cd923acc8ae1f SHA512 89667cccb1b67be07c423813c404e22762c319a8b1e777d1d15a9ae0b6753f499967324c454165f730602288d97822ce6bdd6b3fda6b8077866e88ad6bdca0fc
 EBUILD geos-3.9.1.ebuild 1079 BLAKE2B 4342a48c7009b291e3f57be9869e753b5fa8e1eee85937ddffd21341c1fab398e71b30e2a142ac5cedc7867e105fb7e620263737d6ebbd9cb5e509d8e275e4f3 SHA512 26881b455e21855cb5985f1c5bd66669b468fac53ad861a63cb9096d5dde0e6bbe6cbf0e37341342d2338994dfa6655675ae190ba93fdf938ffcdea39a42d20a
 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c
diff --git a/sci-libs/geos/geos-3.9.0-r2.ebuild b/sci-libs/geos/geos-3.9.0-r2.ebuild
index b08ecee5c7de..d3601008f05c 100644
--- a/sci-libs/geos/geos-3.9.0-r2.ebuild
+++ b/sci-libs/geos/geos-3.9.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.osgeo.org/geos/${PN}-${PV}.tar.bz2 -> ${PN}-${PV}-r1.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc static-libs"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index cec326c94ccc..3e689f54d2f1 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,5 @@
-DIST indilib-1.8.7.tar.gz 2195976 BLAKE2B 3c206e5775b9c16d44cf28b6fa70b186ee9c46c2e6ec639ebf39a97ba553314108481c0dd3ee29ed5297667e9691169bc4aefeee9ef290ee22b1c57967509afa SHA512 bb128ab0641f023039f32d2e3bdf9dfd5e54638bbce252e5f393fd5b2375df0311c472663e78dd498896db8f4669b21f231a095fed639710dc8cba4bb3bf2eb8
 DIST indilib-1.8.8.tar.gz 2234987 BLAKE2B 542c77e1826002e6268be82048014cdd7db2e58d6860bf21e058775acccbca49091218c24d5910f91705aebcf592e21f9008d780f39bb0458115b073319e3949 SHA512 0598b117fa582daaaf7c71524fd40866a37fcdc47b523b2ee1ed3301701c7351b027a3aab794e2e1405aec7293ecc6705d5f7852bb472cd21f40d7e3d7733d1d
-EBUILD indilib-1.8.7.ebuild 1190 BLAKE2B 5fde02e5411c6e4b92d5c9d95b1b3290fa46fec3eea21683a02385f7c77d569081693e874525ba2835d1daf120be0c457b9f95bdc8ec235c33bd8b09d07f39c4 SHA512 1d06a00f91a0197f9509d9d42ec3447fb3d1871edaa2daa4355f5a73fc94fad67362620d659f4bc71ccb0587d89bbe73815b1c7b726d4a9f34a774c1839f3c4e
-EBUILD indilib-1.8.8.ebuild 1189 BLAKE2B 60b9a949b599b8a1a9772355a68d9257501a85eb1d6155e95afc0c7766ad13564e77e669f6341377674c0b5cd5886649e402944dedee06fe975642132a48add3 SHA512 96428f3be5dafea90c4ce14da7dae749c6124bd3824500928f3f25c89c4c26dd054b07e3536f9db30140d7a539775148f7fa9da739b0ff4c2da5fa22651cdc68
+DIST indilib-1.8.9.tar.gz 2253721 BLAKE2B 477880606867ef58e334efeb8d891996187833cdb2f6344018a47c36ad51cfe983e645d92be3e868246bc8dd730d51927834ad73efb2db5edb2ce238ae6d32f6 SHA512 7d561e3619a1ff9e4ec96c54d339f5a85b6d2f4adde57630044fa7f2a8d70c74488ab22eb6221de62c0738bb9c9d187b86b67c4e47f4f98a237d4f69731fe906
+EBUILD indilib-1.8.8.ebuild 1188 BLAKE2B 5afef4724dc43ac28d5f3d0c3449dd48c2caec78a1dfdda6dc1e27f32b014a542d965a17c0cd872fc3bb01b5baf3df41665a8a356f923cf50de608c052dddec7 SHA512 744705826bf3d864f6e847fe80839e0c5aba5ec075c64d5a0995f0e6241c88bb0b37131df0ec4272a3a0ee50bef2cb6fe771fc1e802e778d1dca1ec39becfa38
+EBUILD indilib-1.8.9.ebuild 1192 BLAKE2B 25b550018dd7ac9374e69666e69995edb133802609904ef526ece7a8d0b60645c0bd57c282a2a3cd4e48e1ff3daf164db9c9eb35cae8ec9393cd2b4e2dfa3277 SHA512 da09509560050f9f8eadcd28ee79da820cb489f2eede8f2e0343671fe7db5cbf932debbad09ee335d54432a8140f1268ed8a8d989d41154b891e7ddb4c203de8
 MISC metadata.xml 460 BLAKE2B b6ebdd49fefcbbb015e5856f0ad42682b5eda153b38b3d64f949d2c41274df269f292f25d5eb3be37a7acb039bab2d3d3b7744cfe7959472fe03425b53bd4282 SHA512 ff04501f56765165645695dda25db6bff677a6f676d3fa1d005ec0bc6fae7413e0fdd87d800b321fdd7a98f1d0cc829daa5a3d4d3bff849b6e164a5768c79c84
diff --git a/sci-libs/indilib/indilib-1.8.8.ebuild b/sci-libs/indilib/indilib-1.8.8.ebuild
index dd34c66f11c9..7aa68380cdef 100644
--- a/sci-libs/indilib/indilib-1.8.8.ebuild
+++ b/sci-libs/indilib/indilib-1.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="ogg test websocket"
 
 RDEPEND="
diff --git a/sci-libs/indilib/indilib-1.8.7.ebuild b/sci-libs/indilib/indilib-1.8.9.ebuild
index 4e40a58230d2..e6ee5b9fd220 100644
--- a/sci-libs/indilib/indilib-1.8.7.ebuild
+++ b/sci-libs/indilib/indilib-1.8.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="ogg test websocket"
 
 RDEPEND="
diff --git a/sci-libs/levmar/Manifest b/sci-libs/levmar/Manifest
index caf669fc890d..ef785609f4a6 100644
--- a/sci-libs/levmar/Manifest
+++ b/sci-libs/levmar/Manifest
@@ -1,5 +1,5 @@
 AUX levmar-2.6-demo-underlinking.patch 419 BLAKE2B f9b5f6761a1c29568a86e92793024c3eab4988c9cb4fde157fcc94d59dc0675d4eb3cfaad50528838e3800df543280813a3f8339d2586bf4b6199a82f18e558b SHA512 bed5504603e17dcde3c6fc91031f0d221eec3e8da3a75c930e7a113b04162340d5e83593e7ef3d60e17d2df07caff24356a64b95e8842fcbe5b79c26c1ae2c61
 AUX levmar-2.6-shared.patch 425 BLAKE2B f66eb4f1f50a93b201f3c315b30dfd956f546159a7a6de1d8e97ed70fec70526b48c3b6065b3010c199e4fdccf72fde74f7096a8388b04f6973f251d0412c672 SHA512 1544ba8d450f383f556f6f140b7b0c15d128bc0e12071f4cd47ae00068d3c67e82c49c4b7525ef3d9af2e3df805f3c749e460c91de652065e2954d6c1ee76109
 DIST levmar-2.6.tgz 81143 BLAKE2B 569bba64797e3cf20a0248167b48dfac4b87b3f238637ae5a970616786faedddc63e35b89c5623ee46239442b50e5f7129958ea0715a7ecb965363c0e2efc216 SHA512 5b4c64b63be9b29d6ad2df435af86cd2c2e3216313378561a670ac6a392a51bbf1951e96c6b1afb77c570f23dd8e194017808e46929fec2d8d9a7fe6cf37022b
-EBUILD levmar-2.6.ebuild 993 BLAKE2B 55af808dc0f35ffcb19b2178ab23029a161ab394f33c0434376b7e5e38c77c135af8da088ef0b4a06b8701283418d1ca343cb18ca60ff64ecd773288ce55ba3f SHA512 8acc867d778775723d8b39e8d69527cbac94f9cb657ebaf28ae0c6d5e88228f24648b7819c67f2ef2718f36db50b18194d3984fa09778e0aedd7aca8ae4be15d
-MISC metadata.xml 765 BLAKE2B c99d768ce005a5feb04a006d677d619ef4bbdfc68f6efaefb9b2ace3be6d3f0499c4c50f7a4380f34ec88e7f2f5aba551f92eb57987fb8e62c878ecb17bb246a SHA512 5aa2314b9c7fd03543d1a4e069bb7f3812237784473b4529d902873131b25338962090ecdb8cd2e9c9d9893486a88acf2febbabd4bc802f7f761ea9b73c9c1c8
+EBUILD levmar-2.6-r1.ebuild 993 BLAKE2B 9ce405201b68dfee51bac28aab33534fbf4e418d5db9eecb9a26b1361e9f77bbee3f172f7682c163e3c444670353c55d41ed201433621cc064a162dc860185dd SHA512 6672ab2e05edba5bfb42ce797725287a4946866a8ad12c4141b7bf141d4d8228d449f488d6ce6b8237f70d0a0f7b8fd214943f52311ca6115b2e8ac431d6f403
+MISC metadata.xml 755 BLAKE2B dac157227f502b9d175cf9ce6795e4cee93bdd137ab0b1f024669bfdf3e61a57e1709fc6ad25198fae02367e38120dc1db65517b9378c5d46522b094f738ff27 SHA512 f164a421bc032838305cff28f3d8d3bb1f3c29f5a588dac9bc926062b8bf7926aaed3b21b724a980a70de0d58b580157101b175e2b533a5bef506097da5a7e22
diff --git a/sci-libs/levmar/levmar-2.6.ebuild b/sci-libs/levmar/levmar-2.6-r1.ebuild
index e2729c65c384..0141944adb95 100644
--- a/sci-libs/levmar/levmar-2.6.ebuild
+++ b/sci-libs/levmar/levmar-2.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils eutils toolchain-funcs
+inherit cmake toolchain-funcs
 
 DESCRIPTION="Levenberg-Marquardt nonlinear least squares C library"
 HOMEPAGE="https://www.ics.forth.gr/~lourakis/levmar/"
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	virtual/blas
 	virtual/lapack"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
@@ -26,23 +26,24 @@ PATCHES=(
 	"${FILESDIR}"/${P}-demo-underlinking.patch
 )
 
+DOCS=(README.txt)
+
 src_configure() {
 	local mycmakeargs+=(
 		-DNEED_F2C=OFF
 		-DHAVE_LAPACK=ON
 		-DLAPACKBLAS_LIB_NAMES="$($(tc-getPKG_CONFIG) --libs blas lapack)"
-		$(cmake-utils_use test BUILD_DEMO)
+		-DBUILD_DEMO=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	cd ${CMAKE_BUILD_DIR}
-	./lmdemo || die
+	"${BUILD_DIR}"/lmdemo || die "Tests failed"
 }
 
 src_install() {
-	dolib.so ${CMAKE_BUILD_DIR}/liblevmar.so
+	dolib.so "${BUILD_DIR}"/liblevmar.so
 	insinto /usr/include
-	doins levmar.h
+	doins "${S}"/levmar.h
 }
diff --git a/sci-libs/levmar/metadata.xml b/sci-libs/levmar/metadata.xml
index 114a1bee0b24..6007842dab25 100644
--- a/sci-libs/levmar/metadata.xml
+++ b/sci-libs/levmar/metadata.xml
@@ -8,7 +8,7 @@
 		<email>3dprint@gentoo.org</email>
 		<name>Gentoo 3D print</name>
 	</maintainer>
-	<longdescription lang="en">
+	<longdescription>
 		levmar is a native ANSI C implementation of the Levenberg-Marquardt
 		optimization algorithm.  Both unconstrained and constrained (under
 		linear equations, inequality and box constraints)
diff --git a/sci-libs/libspatialindex/Manifest b/sci-libs/libspatialindex/Manifest
index 08197d7adc5d..055c66d77c4d 100644
--- a/sci-libs/libspatialindex/Manifest
+++ b/sci-libs/libspatialindex/Manifest
@@ -1,4 +1,6 @@
 AUX libspatialindex-1.9.3-respect-compiler-flags.patch 526 BLAKE2B 25ab85c15666fce87c42513c22eab503f2e6617fb45484a7beef69690e4affac2607506f3ffad87878e6791004717aefc43468d50263dfd21a16a176ad008045 SHA512 bbc71df1e53f35415ce8e88c3003a88920f526f96113da2dfa99eda3a3a49b0913d839aae3d95cf7a51d2e93332e49410b214494d7467f3d07025c7fb5551b87
+AUX libspatialindex-1.9.3-use-system-gtest.patch 382 BLAKE2B 113e93e5d5f1524929c07f483f9df53d7b2b7b44bb104ae10564da0a9570be28b0da50ba12c8ed8879be782ff1df9124c85ff3884a4a683f098ebf7db83490dc SHA512 2eeb7f48e7adda39da8338d370d7278b9294f402ccd5506db22c94a5ab561e09429ef0f14df0d1befe9423d18413223814f86122810deb23b7b5e06459841e60
 DIST spatialindex-src-1.9.3.tar.bz2 520817 BLAKE2B 89bbb4ef76f620042cbaa2822daad1459bb8a3801fcdedaa73fdc666efcae0e5329e15e79607e3a31ef9a651fbbf9d3657f5bada19b229eaf37fe232935b8dae SHA512 7922807a2f7026542a014d3d7943da5410429b291cf469267ffea5b8075eab2a94e68b6c013425615d221b930fd319c403f3bf43404c9b1d2c92d0e2baae3066
+EBUILD libspatialindex-1.9.3-r1.ebuild 795 BLAKE2B 9b2905bb029c7cc09f229a02a7fb6b947ecf1ac7745530eca2e9a5e6ed5774689d557c6027261f3cc9fc5569cef472e62fdbfbae79ee155e1bdbcf6bb51db476 SHA512 1fa70787f80d81b4d891a6a2713f784a1f5995e27e0662fe35d55fe8d8c82ead8817f1fa7fb895922f707e3209e93ca13104e8a334078c2487cb5e3d9ddaee44
 EBUILD libspatialindex-1.9.3.ebuild 703 BLAKE2B 15acede08c365069b469837f8f028e49227484c870e6ac356097493dc80bb2422a6d37777fbed4a391515b4adcc84f9bc3e15c7ad3b8350c35e8d4f2255ea917 SHA512 242dda9ea1180a15e468383ba6c49e4828b77c5e443337655e8927c6cb125fa9e4cb398098c04207db07771a8712b66a357c1c331386be44805c01a7ff080d23
 MISC metadata.xml 508 BLAKE2B 4e8acedee7f5bb2118b52544713de9d97559fd6a622d4bdb95ac95fa4028fb0bb880c5a0ebf8c8969bf6b1cc68f4c6186b840017cad59c625eec9995145228c4 SHA512 5542e14bc46471e81273c7a79e074db945a488b65937ccad106980b0826d30d930b02046f1247cb8eeab542e42561738b5dc2f00225b611b4148df1acd747dc2
diff --git a/sci-libs/libspatialindex/files/libspatialindex-1.9.3-use-system-gtest.patch b/sci-libs/libspatialindex/files/libspatialindex-1.9.3-use-system-gtest.patch
new file mode 100644
index 000000000000..996fc9b96921
--- /dev/null
+++ b/sci-libs/libspatialindex/files/libspatialindex-1.9.3-use-system-gtest.patch
@@ -0,0 +1,12 @@
+diff --git a/test/gtest/CMakeLists.txt b/test/gtest/CMakeLists.txt
+--- a/test/gtest/CMakeLists.txt	(revision 5a08124d541319d39886710afc1d61dfff5575a1)
++++ b/test/gtest/CMakeLists.txt	(date 1615011059253)
+@@ -1,8 +1,5 @@
+ set (GOOGLETEST_VERSION "1.10.0")
+
+-add_subdirectory(gtest-1.10.0)
+-include_directories(./gtest-1.10.0/include)
+-
+ set (SOURCES
+     test.h
+     sidx_api_test.h
diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
new file mode 100644
index 000000000000..bee01dbe1971
--- /dev/null
+++ b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P="spatialindex-src-${PV}"
+
+DESCRIPTION="C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API"
+HOMEPAGE="https://libspatialindex.org/
+	https://github.com/libspatialindex/libspatialindex"
+SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/gtest-1.10.0 )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-compiler-flags.patch
+	"${FILESDIR}"/${P}-use-system-gtest.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DSIDX_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest
index eeba3c71c167..916e6e7383a1 100644
--- a/sci-libs/lmfit/Manifest
+++ b/sci-libs/lmfit/Manifest
@@ -1,4 +1,4 @@
-AUX lmfit-8.2.2-cmake.patch 2769 BLAKE2B 7f67349b93cde9bf14ce5295d3a32a73301897e1643be5beea71ccb8e9d7a9a128c4160b7eb5dcbdfb1189ee6e774e151bd5f71b3af4d7ec0a00ba61f7ad79f1 SHA512 93b1f5242e1152dea4910c96b2c561a370f2e2a78fc730b5ee00257049f96a253badf5d7752a1bbac320df43e436d8f4d913fbf8d40f7b36e3579efb16147417
+AUX lmfit-8.2.2-cmake.patch 2752 BLAKE2B 2a0d3cf9a4e206fe346257c62cbfa482fa60562a948d76dc3cb9e8060faca3d0e80bb706b8d9593ca1b4894a659542dff06684bfa9829216f6c07e2dcb9e4618 SHA512 7a20814d311ed768e02bb17e32802c017bb148e3877fecc8ef9a13ace865dfed403cc8fb7811aba12655166e0eafb59e8e60edbb4346b7c56553bb79d4cd608e
 DIST lmfit-8.2.2.tgz 31970 BLAKE2B 67eebc0e58d3d78057afcd84f35adcfea783c8501a5f8934dd07c38eb2419b1c43bedd3401a830a993005913138bdf8d1dc73c2142983b9f881f0db9bec06b93 SHA512 5835dce914027429cb36765543cf6b872e4ef1acd8feaeca281f9edf286fda89db78fbc0713dcfea4e4f2fe55a1b05317e6428980060bc3acce579ef1fa0c271
-EBUILD lmfit-8.2.2.ebuild 540 BLAKE2B 4ed1e259446562f1a977c5996cf903fd6ae82cbe37cbcbd9b037ee4e58a3fe2f88d2b720a1aa2207aeaad8fd63a6aac258137a93e9a580f84fda5d6267e84826 SHA512 b89e706570aba767ebcc5cc0bf0561a6c0301d7c7fedbad9ce9120903f83eeae875e0b033de8fe5c7c42d838af19b23063722b153663918cdbf1c953759e89e0
+EBUILD lmfit-8.2.2.ebuild 520 BLAKE2B efc8e9af493c8a62febc1066ca42912cc0e3d04343972305822fa5cbb88bdfec3f51d335eb25e89c38a8cdfa5d816ac8a71fc3aac8fc4b278504ace08631c1e1 SHA512 54a72c8260af70d2f23ce3e266add722f4e516124c0913bfd315572255e517a968db6a24ab818bf8825332daa2a7cc20461bb35372973851d1e063fa7fceda81
 MISC metadata.xml 328 BLAKE2B fe29c76e5725821e31de0e2b14e0b975d5b8838e9907bf9ddacdb40cddc0529550fe83468226bf045fcf7ad95b2e56d31dc564dcf7e6d9a0401317313e2f0f27 SHA512 e6cf20d6c9130a16ce37c44890f928cb5dca1bb67425d8cdcc1ab7db22f7c8e2ac513b11c33b0f0495e25dd389ac926f2099d0253288eb1ed290f30e655a1c4f
diff --git a/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch b/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch
index 258f70a533d4..482ecebe8294 100644
--- a/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch
+++ b/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch
@@ -42,7 +42,7 @@ index dbb571e..279f06a 100644
  configure_file("lmfit.pc.in" "lmfit.pc" @ONLY)
  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lmfit.pc"
 -    DESTINATION "${destination}/lib/pkgconfig/")
-+	DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
++    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
  
  add_subdirectory(lib)
  add_subdirectory(demo)
@@ -76,7 +76,7 @@ index d4595fd..5505713 100644
      install(
          FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.html
 -        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/lmfit/html"
-+	DESTINATION "${CMAKE_INSTALL_DOCDIR}-${CMAKE_PROJECT_VERSION}/html"
++	     DESTINATION "${CMAKE_INSTALL_DOCDIR}/html"
          )
  endfunction()
  
diff --git a/sci-libs/lmfit/lmfit-8.2.2.ebuild b/sci-libs/lmfit/lmfit-8.2.2.ebuild
index 5a79ce239e5d..954e91ac7e70 100644
--- a/sci-libs/lmfit/lmfit-8.2.2.ebuild
+++ b/sci-libs/lmfit/lmfit-8.2.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
-HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/lmfit"
+HOMEPAGE="https://jugit.fz-juelich.de/mlz/lmfit"
 SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/${P}.tgz"
 
 LICENSE="BSD-2"
@@ -20,6 +20,5 @@ src_configure() {
 	local mycmakeargs=(
 		-DINJECT_C_FLAGS=OFF
 	)
-
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/sci-libs/neartree/Manifest b/sci-libs/neartree/Manifest
index 9f5facefe6d8..daecf09970a7 100644
--- a/sci-libs/neartree/Manifest
+++ b/sci-libs/neartree/Manifest
@@ -1,4 +1,4 @@
-AUX CMakeLists.txt 713 BLAKE2B e27870916b4f17c7cc17d0b1b385e797d8e8a87e195e71a848b0ca9b05f4f881c5e8716167de27e26a58db880e10c6b138cb17201ed1c3b7eba9e542ae69c470 SHA512 038c8e23c642c6e5f6651b9c2cf29f8764a983294b9add97f9af8ac5d14ee52c1b47afa45791a21e8d783cb0e74801df17a34c1fbb08df1d7dd27ef2b4825b94
+AUX CMakeLists.txt 746 BLAKE2B 9c85308c3aa59cdc38c057dadf9c2af01fd35c0941192d6c17f1db98f2abae6491695956f7d550377f62519cc1b14b089a72b4a77ceea2a1ca32c0792b79871f SHA512 254bad915a43babe87e5c9d0c88ce9dce15c5e876f1b18628be356114ba13735af80c7dd00d7661e15589bf4485c58eb80cb09cf318ed212594169b19dba9826
 DIST neartree-5.1.1.tar.gz 167695 BLAKE2B 238f9d4f6c900938b53d692b9694044685cd2d906776c95c33f4f3619a35ed33ef2b85ddc7c2876219c7faa3930c234a3854266f539cd0a4b48d15b4a5e96040 SHA512 36f2ab878319153440914325bed67d111dafcac724cbef73d439285f4ad82979b05d2987fa3802c440aa4a037499bf7961ef9b09fa3658364731b5a405854b00
-EBUILD neartree-5.1.1.ebuild 734 BLAKE2B 38fc1363fa89f30f5aa805c9d800f4be8e9d81b2095c3327de850263ed21fc8dfe34763ba18eae0c6d836dd32416c57b08924e6d8d952d834b979a9301968d54 SHA512 69b7d429378360b91404df353b682e7df5a02095b3f239f373b4948972208ad25369180e38a3c45360cac3a521144c15c77406860597793fd8df109afd673a33
+EBUILD neartree-5.1.1.ebuild 600 BLAKE2B 89779dc40ca1c364d118971463d2501377b068f2a2e90deae5962167d719b32a1f00153d7f696a950b77d65d6049237f4c8965bacef5c7eeef45f5aef6430a6b SHA512 d174a87518a0e6691730949229321f3240866a3ed109c55f260f6c42da400009c8a6640c23f97c74f769a12b97ab505b36d7deff4bce9e7ef9f282b0ee79d065
 MISC metadata.xml 331 BLAKE2B 4e9085e10412f2d378efb037793cb9c8469b2b2aad9e00f34c0b54943f9042978ef0acce7b1afc7396ae9033bbd4068801797eedb484bcbcf898108724fb42a1 SHA512 3c16cfbd9d2ccac961a78b3d0cd4a0424933f2002a536a25fb192a5347e320282381c92a8f939c1e8c3437ef23a9c843c2b09369a6a6cd6fd7e38a51731d14d9
diff --git a/sci-libs/neartree/files/CMakeLists.txt b/sci-libs/neartree/files/CMakeLists.txt
index cb4375da7964..59b64f8c2f8d 100644
--- a/sci-libs/neartree/files/CMakeLists.txt
+++ b/sci-libs/neartree/files/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.12)
 project (Neartree C)
 
 SET (LIB_MAJOR 5)
@@ -7,6 +7,8 @@ SET (LIB_RELEASE 0)
 
 SET (_soversion ${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE})
 
+include(GNUInstallDirs)
+
 include_directories ("${PROJECT_SOURCE_DIR}")
 
 add_library(CNearTree SHARED CNearTree.c)
@@ -14,8 +16,8 @@ target_link_libraries(CNearTree CVector m)
 
 set_target_properties(CNearTree PROPERTIES SOVERSION ${LIB_MAJOR} VERSION ${_soversion})
 
-INSTALL(TARGETS CNearTree DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+INSTALL(TARGETS CNearTree DESTINATION ${CMAKE_INSTALL_LIBDIR})
 install(FILES CNearTree.h  rhrand.h  TNear.h  triple.h
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-install(FILES README_NearTree.txt DESTINATION ${DOC_DIR})
-install(FILES README_NearTree.html index.html DESTINATION ${DOC_DIR}/html)
+			DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(FILES README_NearTree.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
+install(FILES README_NearTree.html index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/html)
diff --git a/sci-libs/neartree/neartree-5.1.1.ebuild b/sci-libs/neartree/neartree-5.1.1.ebuild
index 0d1ac6098867..01499d4b10a1 100644
--- a/sci-libs/neartree/neartree-5.1.1.ebuild
+++ b/sci-libs/neartree/neartree-5.1.1.ebuild
@@ -1,32 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
-
-MY_PN=NearTree
-MY_P="${MY_PN}-${PV}"
+MY_P="NearTree-${PV}"
+inherit cmake
 
 DESCRIPTION="Function library efficiently solving the Nearest Neighbor Problem"
 HOMEPAGE="http://neartree.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
 
 RDEPEND="dev-libs/cvector"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+DOCS=( README_NearTree.txt )
 
 src_prepare() {
 	cp "${FILESDIR}"/CMakeLists.txt . || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=( -DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}" )
-	cmake-utils_src_configure
+	cmake_src_prepare
 }
diff --git a/sci-libs/netcdf-cxx/Manifest b/sci-libs/netcdf-cxx/Manifest
index 7ea706eaad50..14d50b1404dc 100644
--- a/sci-libs/netcdf-cxx/Manifest
+++ b/sci-libs/netcdf-cxx/Manifest
@@ -3,5 +3,5 @@ DIST netcdf-cxx-4.3.0.tar.gz 985897 BLAKE2B 89cfd85764ff8fc730c7cb4187df21a4245c
 DIST netcdf-cxx-4.3.1.tar.gz 607679 BLAKE2B 68677ba72e66d351bf6d33a2584a3a1edd9da98b41ed66e3f51f8d3d358bfd84bad3e2e06403edf76d26b2c76807ae40859995d8817725e531a27680d04f2501 SHA512 404711eb80d5e78968c0f6cbdcb08855a2778d7fd94e7ee94bdc9d1cd72848ac3327613c6437a7634349f26bc463b950092a2999abb34ddab0a47ad185547d22
 EBUILD netcdf-cxx-4.2-r300.ebuild 616 BLAKE2B ba1024cdc714085a5984779fd274d4c5a9af57c44823a14cbf4cb453ce0a0588c92006baaca28416fda1b5e9e07a78c551f083a534d6882047900d989d5a0d21 SHA512 e9da1886babc4ecca8736fd5c587e2068c59bdacc5093f0b276cf0db4427af8d7d02373df7e42bc5d9c7255290974742e1d2fa6bbbcc504d1cd1314a6b005daa
 EBUILD netcdf-cxx-4.3.0.ebuild 677 BLAKE2B 0d544400e444b2e794545189fbdd1206de049bd9a6d8083be7eb4b2120b0b65a77461e7ce1dfa599240c4f1759e09f920e028490b0d86b9ddcce150613d5c030 SHA512 6cb81dde09c8206222c85ad9ffface7e6f554836f3ccf3ea7fc5fa95b571d0a9f3675d9a0a0e400d9d4d30f105945b97744d6397f7111b1a73b22abe6d2c3778
-EBUILD netcdf-cxx-4.3.1.ebuild 700 BLAKE2B 754efa5707393af0aa7063aa679d2902b1b4a4e075cb04eb0a1bc95098bc531a058651d0dfa37ddaec2e1b79ceb6e71d4530037953620bc100c62dc2d958c5d3 SHA512 228ea6396dc0c677b908f6acae8bab342af442cc464d6b1da97a72fda9fcf7fe7281a3b88cb1192f7ec8661c8a0d8f3a05a1d31db52eff887663d6e9176610d2
+EBUILD netcdf-cxx-4.3.1.ebuild 707 BLAKE2B 148dc629c11968093a5eb2c031a799a6d3fa9a1280dc876a8540559fdd3e6d6837e44e24caa1f9267662e7a2641ec36e156d3197a4b5d276b89a3176a2d4e34f SHA512 99857c323634f08beec46c551d9cda5f05f2e3bf7dec56745e1cc911c21374598e179ddb16ea2b98dbd7b277499163cd5f00cfdc10b2d3051c9b784c4cadbcbf
 MISC metadata.xml 838 BLAKE2B 7dfb894eff8881120e319f30baf54c41a04a1822f5d7c4db5a90cae56cdd89914ef938c1ad39601d3573d06b419c93d50efe8e563c002473c4a0b3c4f079d426 SHA512 7db14bcbc67509b05f00dcd0e0ee33281ad1d77e566c1de0362058d0fb7c3d2b82430377fb5df4bb09c3e0b9c3fee0d8ddbd9861a24e4b13e70b1151acb26c5b
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
index 7e359955fe34..31c7a79c7e93 100644
--- a/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="UCAR-Unidata"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 # 6 out of 9 fail, reported upstream
 RESTRICT="test"
diff --git a/sci-libs/shapely/Manifest b/sci-libs/shapely/Manifest
index 93e6366f0327..38ba7d5fb833 100644
--- a/sci-libs/shapely/Manifest
+++ b/sci-libs/shapely/Manifest
@@ -1,3 +1,5 @@
+AUX shapely-1.7.1-tests-support-geos-3.9.patch 2130 BLAKE2B 2785926f41a8d9486b9591616acf1f9b2dd76c2b009a7a51fefcb664733b304e7fc59b247a87fa36f4b4301132f157a16153f78dc68c2102901c4eea46c020ba SHA512 64c5ecd44ee7b6020e9605825b8af78ba0dfcaa5b0358c8f76af4104869ce027eb059331fa8c488add3ac1e360e41f46346d24e702c54858fe2f9bbef0b929a6
 DIST shapely-1.7.1.tar.gz 293368 BLAKE2B 14d9cb0c2b486a3a20b71c0cde7260ec357287ea020352c0320eea07b91674605bdcd22512b33c5ac5a71b89c3d811946f8dd6d3b90c61398203a4c68f30d067 SHA512 72070437960a8c1cf6504b5f4ccc8ec509f87fb6a90178e291aff14889f5add89f9ed4f7e9a19799ce0835c1aea3f0241eaa6efd4d8ea5b879f2167f7c1de50a
+EBUILD shapely-1.7.1-r1.ebuild 902 BLAKE2B 7ca1c17771c26ca7ba773eb6a781e8df5bde1b5b9becc1a5dabb31a15ce919ef0b0bafa1c07c23d3dd04e9c86a3f834977a7f0d525373b0c588a78d27495c0ee SHA512 6c03a2986f6ff854810e51dc26fc240d2e2ebc4cbe89eddec0492a21409a367d3d9cdae9b9c28edc7053a8eea6e26581d0e21190f942d33a58d54a02acba13df
 EBUILD shapely-1.7.1.ebuild 839 BLAKE2B cdff940dce5acbd360bb81467475bdf7bd95d512f23c45c9bc7604c6769d56f5e111e0c6a830ab3c79ef84b17fe9878eb424ddd56b62588a80cb18115b68af2e SHA512 407d39827d32b759fc7944195bed880243424374555471a283700c47426e39ab3ec57ec6808e41b9670f1783f580f19737c0aeb12ca2f39da1ef32bf6e17e0e5
 MISC metadata.xml 896 BLAKE2B 44a39e16f3f580535a2f9adc3c08411dce5f10432aa05687f231d1614d9b18d442783a0f2344eac9300f52a17e32552dbae75be3efcc8e3b3cc4ec539eff39b4 SHA512 84a5c6215b64b2f5c27bf9360f19772945b5a919b1407b18ae812a057aba183a593652ad80729de7472fb412e0172a2cb693482b58eccab056c66303d632d856
diff --git a/sci-libs/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch b/sci-libs/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch
new file mode 100644
index 000000000000..18b6c5ad9a46
--- /dev/null
+++ b/sci-libs/shapely/files/shapely-1.7.1-tests-support-geos-3.9.patch
@@ -0,0 +1,61 @@
+diff --git a/tests/test_svg.py b/tests/test_svg.py
+--- a/tests/test_svg.py	(revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf)
++++ b/tests/test_svg.py	(date 1615044742785)
+@@ -174,7 +174,8 @@
+         self.assertSVG(GeometryCollection(), '<g />')
+         # Valid
+         self.assertSVG(
+-            Point(7, 3).union(LineString([(4, 2), (8, 4)])),
++            GeometryCollection(
++                [Point(7, 3), LineString([(4, 2), (8, 4)])]),
+             '<g><circle cx="7.0" cy="3.0" r="3.0" stroke="#555555" '
+             'stroke-width="1.0" fill="#66cc99" opacity="0.6" />'
+             '<polyline fill="none" stroke="#66cc99" stroke-width="2.0" '
+--- a/tests/test_wkb.py	(revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf)
++++ b/tests/test_wkb.py	(date 1615044817079)
+@@ -1,6 +1,11 @@
++import binascii
++
++import pytest
++
++from shapely import wkt
+ from shapely.wkb import dumps, loads
+ from shapely.geometry import Point
+-import binascii
++from shapely.geos import geos_version
+
+
+ def bin2hex(value):
+@@ -49,3 +54,20 @@
+     # replace geometry srid with another
+     result = dumps(geom, srid=27700)
+     assert bin2hex(result) == "0101000020346C0000333333333333F33F3333333333330B40"
++
++
++requires_geos_39 = pytest.mark.xfail(
++    geos_version < (3, 9, 0), reason="GEOS >= 3.9.0 is required", strict=True)
++
++
++@requires_geos_39
++def test_point_empty():
++    g = wkt.loads("POINT EMPTY")
++    assert g.wkb_hex == "0101000000000000000000F87F000000000000F87F"
++
++
++@requires_geos_39
++def test_point_z_empty():
++    g = wkt.loads("POINT Z EMPTY")
++    assert g.wkb_hex == \
++        "0101000080000000000000F87F000000000000F87F000000000000F87F"
+diff --git a/shapely/geos.py b/shapely/geos.py
+--- a/shapely/geos.py	(revision 56c0f97a80e75308cf62e0bc4883238c10f56fdf)
++++ b/shapely/geos.py	(date 1615044673942)
+@@ -84,7 +84,7 @@
+             'libgeos_c.so.1',
+             'libgeos_c.so',
+         ]
+-        _lgeos = load_dll('geos_c', fallbacks=alt_paths)
++        _lgeos = load_dll('libgeos_c', fallbacks=alt_paths)
+     # Necessary for environments with only libc.musl
+     c_alt_paths = [
+         'libc.musl-x86_64.so.1'
diff --git a/sci-libs/shapely/shapely-1.7.1-r1.ebuild b/sci-libs/shapely/shapely-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..6bb1493675cf
--- /dev/null
+++ b/sci-libs/shapely/shapely-1.7.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Shapely"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Geometric objects, predicates, and operations"
+HOMEPAGE="https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely"
+SRC_URI="https://github.com/Toblerity/Shapely/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/geos-3.9
+"
+
+BDEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${P}-tests-support-geos-3.9.patch" )
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs dev-python/matplotlib
+
+python_test() {
+	distutils_install_for_testing
+	${EPYTHON} -m pytest tests || die "tests failed under ${EPYTHON}"
+}
diff --git a/sci-libs/voro++/Manifest b/sci-libs/voro++/Manifest
index 32803d63d68e..25e2b363a940 100644
--- a/sci-libs/voro++/Manifest
+++ b/sci-libs/voro++/Manifest
@@ -1,4 +1,4 @@
-AUX voro++-0.4.6-cmake.patch 5811 BLAKE2B 2d0e54fdbc4b3603624365a08c2b9cf76271a403308ade16c36b74c01b3cb7273d47fd25ff9d6eccb3ed292ac87d9256e827276dd4034064167b335856eb48e1 SHA512 6c8d8168432a5cad2713e8fea7e990004f9ff99a5114b0687e7e277cc09009d2545e47ab3389332f3ae342ae71ecae2b71e1cbe85dc5ed20fff29200b95912c1
+AUX voro++-0.4.6-cmake.patch 4197 BLAKE2B 294957cc8879e996af0a7cc205eabd501114fdec41380620b8162f1a63a4c88c9e042ac832b33c1ee7e3805321ae1396f3aa93cb2cbf0fb44cdf70878201aa58 SHA512 87c92d3e899242467c2df9a08f863d34255b0e14e080a07d9eaecbf111bb0ca181f68bde899373c8e6bbf1d2d730a547d880d14d2bb988b66a741ebd0f76c09a
 DIST voro++-0.4.6.tar.gz 809124 BLAKE2B 0b12f68fe2400d850353171a79aa41dd0a7780dd38d8b7d5fcda6621ba43e5bad60d72a1dd24c3ef9e30d4b63c0be9467062ef33f27138a838f7a984dd3321a2 SHA512 aa8c73d7634bb4ec4c0a7d4d18c0df07511ef975338f2517e6f0ec65de56bac10397adccf1c0e13439d29d096b7cb9b4540d7cfc191a1662f15dc0c3c1ff77c1
-EBUILD voro++-0.4.6-r1.ebuild 475 BLAKE2B d8e6d237b29b78eeafd610ee1b4c627e83af9a3796d2110424d710ee241dcb636807f3db79e48aad30b8e074ad59fe3037af9518a8882e22f4199690fc953743 SHA512 4857de518ee5913523014fe0de4064a09713802d96fecf34a4e1313476f73f290fb6b67171a14daefab658bf702f0b4093f77da6eec4830892d9a720759301f8
+EBUILD voro++-0.4.6-r1.ebuild 373 BLAKE2B 12fe8c3fd2a466637d61549453581a302152d7d1a56c80befdf690edc6e4063e56ec2e042ba949b7a1273b62d96bb6c1316059c9336f6631e632f3725c82e681 SHA512 56e0a01a0303d69421e21fbfc8de58efe16b8cbbf7caa12873244070d552177782f62fb4c6ed15dc973897eab1bffd793f87ce6e9fc35ec502cb808abcc5f9c6
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/voro++/files/voro++-0.4.6-cmake.patch b/sci-libs/voro++/files/voro++-0.4.6-cmake.patch
index c848748c5cf7..f8310097b76d 100644
--- a/sci-libs/voro++/files/voro++-0.4.6-cmake.patch
+++ b/sci-libs/voro++/files/voro++-0.4.6-cmake.patch
@@ -1,9 +1,9 @@
 Index: CMakeLists.txt
 ===================================================================
---- a/CMakeLists.txt	(revision 0)
-+++ b/CMakeLists.txt	(working copy)
-@@ -0,0 +1,109 @@
-+cmake_minimum_required(VERSION 2.6)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -0,0 +1,98 @@
++cmake_minimum_required(VERSION 2.8.12)
 +
 +project(voro++)
 +
@@ -28,18 +28,9 @@ Index: CMakeLists.txt
 +include(CheckCXXCompilerFlag)
 +
 +########################################################################
-+# User input options                                                   #
++# Standard install paths                                               #
 +########################################################################
-+option(BUILD_SHARED_LIBS "Build shared libs" ON)
-+if (NOT DEFINED LIB)
-+  set(LIB "lib")
-+endif(NOT DEFINED LIB)
-+if (NOT DEFINED MAN)
-+  set(MAN "share/man")
-+endif(NOT DEFINED MAN)
-+if (NOT DEFINED DATA)
-+  set(DATA "share/voro++")
-+endif(NOT DEFINED DATA)
++include(GNUInstallDirs)
 +
 +########################################################################
 +#Find external packages
@@ -78,14 +69,14 @@ Index: CMakeLists.txt
 +set_target_properties(voro++ PROPERTIES 
 +  LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/src"
 +  SOVERSION ${SOVERSION})
-+install(TARGETS voro++ LIBRARY DESTINATION ${LIB} ARCHIVE DESTINATION ${LIB})
++install(TARGETS voro++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 +
 +add_executable(cmd_line src/cmd_line.cc)
 +target_link_libraries(cmd_line voro++)
 +#cannot have two target with the same name
 +set_target_properties(cmd_line PROPERTIES OUTPUT_NAME voro++ 
 +  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/src") 
-+install(TARGETS cmd_line RUNTIME DESTINATION bin)
++install(TARGETS cmd_line RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +
 +#for voto++.hh
 +include_directories(${CMAKE_SOURCE_DIR}/src)
@@ -102,40 +93,11 @@ Index: CMakeLists.txt
 +endforeach(SOURCE)
 +
 +file(GLOB_RECURSE VORO_HEADERS src/*.hh)
-+install(FILES ${VORO_HEADERS} DESTINATION include/voro++)
-+install(FILES ${CMAKE_SOURCE_DIR}/man/voro++.1 DESTINATION ${MAN}/man1)
++install(FILES ${VORO_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/voro++)
++install(FILES ${CMAKE_SOURCE_DIR}/man/voro++.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 +
 +if (DOXYGEN_FOUND)
-+  add_custom_target(help COMMAND ${DOXYGEN_EXECUTABLE} src/Doxyfile 
++  add_custom_target(doxygen COMMAND ${DOXYGEN_EXECUTABLE} src/Doxyfile
 +    COMMENT "Build doxygen documentation")
 +endif (DOXYGEN_FOUND)
 +
-+configure_file(${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake IMMEDIATE @ONLY)
-+add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-Index: CMakeModules/cmake_uninstall.cmake.in
-===================================================================
---- a/CMakeModules/cmake_uninstall.cmake.in	(revision 0)
-+++ b/CMakeModules/cmake_uninstall.cmake.in	(working copy)
-@@ -0,0 +1,22 @@
-+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-+  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
-+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-+
-+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
-+STRING(REGEX REPLACE "\n" ";" files "${files}")
-+FOREACH(file ${files})
-+  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
-+  IF(EXISTS "$ENV{DESTDIR}${file}")
-+    EXEC_PROGRAM(
-+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-+      OUTPUT_VARIABLE rm_out
-+      RETURN_VALUE rm_retval
-+      )
-+    IF(NOT "${rm_retval}" STREQUAL 0)
-+      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
-+    ENDIF(NOT "${rm_retval}" STREQUAL 0)
-+  ELSE(EXISTS "$ENV{DESTDIR}${file}")
-+    MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
-+  ENDIF(EXISTS "$ENV{DESTDIR}${file}")
-+ENDFOREACH(file)
-+
diff --git a/sci-libs/voro++/voro++-0.4.6-r1.ebuild b/sci-libs/voro++/voro++-0.4.6-r1.ebuild
index b1fa72623758..a2ab69b03aa5 100644
--- a/sci-libs/voro++/voro++-0.4.6-r1.ebuild
+++ b/sci-libs/voro++/voro++-0.4.6-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
-DESCRIPTION="A 3D Voronoi cell software library"
+DESCRIPTION="3D Voronoi cell software library"
 HOMEPAGE="http://math.lbl.gov/voro++/"
 SRC_URI="http://math.lbl.gov/voro++/download/dir/${P}.tar.gz"
 
@@ -15,10 +15,3 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-12 21:55:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-12 21:55:15 +0000
commit	7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree	56fae051db521b8fce8014cbc8b11484885b14b3 /sci-libs
parent	6d691ad5b6239929063441bbd14c489e92e7396e (diff)