From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- sci-libs/geos/Manifest | 7 ++- sci-libs/geos/files/3.4.2-solaris-isnan.patch | 14 ------ sci-libs/geos/geos-3.7.2.ebuild | 61 --------------------------- sci-libs/geos/geos-3.8.0-r1.ebuild | 12 ++++-- sci-libs/geos/geos-3.8.1.ebuild | 52 +++++++++++++++++++++++ 5 files changed, 63 insertions(+), 83 deletions(-) delete mode 100644 sci-libs/geos/files/3.4.2-solaris-isnan.patch delete mode 100644 sci-libs/geos/geos-3.7.2.ebuild create mode 100644 sci-libs/geos/geos-3.8.1.ebuild (limited to 'sci-libs/geos') diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest index c420e452802d..df94026cb65a 100644 --- a/sci-libs/geos/Manifest +++ b/sci-libs/geos/Manifest @@ -1,6 +1,5 @@ -AUX 3.4.2-solaris-isnan.patch 575 BLAKE2B 34e2fddd46e4e503630d0c44c03ee72ceb8bb19af31075ae209d0198b5db0839a633cbb7c855035bf8964d860174c56288579a4bd50e322d728ea4704d312108 SHA512 efa2730f178814e8d98318347e7a8313327679a5c861ef2a844ce821c5854f4dd56e0cc2c52fa5866fb4214b0d9aa8614b1f1ebaa62f0427e69221a93106aa45 -DIST geos-3.7.2.tar.bz2 2071465 BLAKE2B ba968488aa5d845e582d3771d8d2b1f67b0f301e73fad5834a0805a912c8f3b1200bba93d8758f43539ce269758de348d999db3db9738e7abf5c1a443f388d8c SHA512 ff0fde2e21ed9d2770c139aa50c6efd22d9cff3c6bfd8f1ef86b064efd1ad318b08dec66e34661bc1c7a341b0837978853494f27d63988be865a8ee4f7611d38 DIST geos-3.8.0.tar.bz2 2399403 BLAKE2B 0f9b6d7f9a4052b9b84e77d534be6e2909e5dc4995287f34e3b7e7c1537c9a73088d4a49f96f43034723eb37c88674aae469e26d7db3eb40efbcdf5551553a1a SHA512 c89b25b42092152ef261090f25ff64b229f30f67d42fdf44c2871e78b66bb2c42e23b9ae21f9aea0e48823bdb0267d609ab2ee77d310abcb76fa672c6614d8f1 -EBUILD geos-3.7.2.ebuild 1338 BLAKE2B 7ebfca396ca09ebe266c59c901ad7f931076a5bef9b7574167d35b0123297205504cdfe7b11ad3a44729483ab57a14bfce6a17f66c9a4391c06b8fcf4c1071d4 SHA512 fe01f7c023c67401396ba760266b62ebba2388e42a7aae08a188fb7ec4726d9c6390f8768511fbd28ad6374a8f47a5de55a530c025d01e43a43082f7ea3a0021 -EBUILD geos-3.8.0-r1.ebuild 1051 BLAKE2B d3f968edbe2ca5b45d4a7de7dec864c03aef47573b08b271aa1cf4a3e21548bcdb6a50dae532c98a47a40af20a91edde1f18f2f83050cfc786ffefba0dcdd06b SHA512 70cf5c442d28fd8f61d35119c4a6607bdb7d2f646c424ea647841aa215a3c0fe2e19fb8683af8bc4661c92863c2cf8b4ea9063235b810ae2129097c4d1a25931 +DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056 +EBUILD geos-3.8.0-r1.ebuild 1148 BLAKE2B 8fb0f023e255cb3cd5c90dc9f26f6ed1589c8d73c5cfb73cb7aa579fac03d7bac0951565ac13764ced5bc3e915af341007e44b56ee5f3689640058c616ac05b4 SHA512 ebbc36bb4a71b7612534ac6d6fa557d6fc413c50ac243deaf02f328f859bafafec50ae475388eabc10bc49ab1ea22e6300f826296f83234b1b47382ec1543bfa +EBUILD geos-3.8.1.ebuild 1118 BLAKE2B 49c05deb35d5b4d56132375bc673e24937f3e596f052b3e6018a09df8311673f33a622df02907d0732e3de6d53b5f0b810a4c79214307bb3428c922b47feb47c SHA512 01f5f170b96f0ebd506bbac22edb64ab1f3b3c88bddc65a03a0634e88ff8d12a6f02a5d7f5c2619968beba26049a09729e642f7d1a391ba559eda90333af26cd MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c diff --git a/sci-libs/geos/files/3.4.2-solaris-isnan.patch b/sci-libs/geos/files/3.4.2-solaris-isnan.patch deleted file mode 100644 index a66d36f6587d..000000000000 --- a/sci-libs/geos/files/3.4.2-solaris-isnan.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naruw geos-3.4.2.orig/include/geos/platform.h.in geos-3.4.2/include/geos/platform.h.in ---- geos-3.4.2.orig/include/geos/platform.h.in 2013-08-25 15:10:32.000000000 +0000 -+++ geos-3.4.2/include/geos/platform.h.in 2013-10-20 23:45:29.891690795 +0000 -@@ -98,8 +98,9 @@ - // It does leave a version in std. - # define ISNAN(x) (std::isnan(x)) - # elif (defined(__sun) || defined(__sun__)) && defined(__SUNPRO_CC) -+# define _XOPEN_SOURCE 600 //force iso/math_c99 - # include --# define ISNAN(x) (::isnan(x)) -+# define ISNAN(x) (std::isnan(x)) - # endif - #endif - diff --git a/sci-libs/geos/geos-3.7.2.ebuild b/sci-libs/geos/geos-3.7.2.ebuild deleted file mode 100644 index 4c8405e7855f..000000000000 --- a/sci-libs/geos/geos-3.7.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 - -DESCRIPTION="Geometry engine library for Geographic Information Systems" -HOMEPAGE="http://trac.osgeo.org/geos/" -SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm arm64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" -IUSE="doc python ruby static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - python? ( ${PYTHON_DEPS} ) - ruby? ( dev-lang/ruby:* ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - python? ( dev-lang/swig:0 ) - ruby? ( dev-lang/swig:0 ) -" - -PATCHES=( "${FILESDIR}"/3.4.2-solaris-isnan.patch ) - -RESTRICT="test" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - echo "#!${EPREFIX}/bin/bash" > py-compile -} - -src_configure() { - econf \ - $(use_enable python) \ - $(use_enable ruby) \ - $(use_enable static-libs static) -} - -src_compile() { - default - use doc && emake -C "${S}/doc" doxygen-html -} - -src_install() { - use doc && HTML_DOCS=( doc/doxygen_docs/html/. ) - default - use python && python_optimize "${D}$(python_get_sitedir)"/geos/ - - find "${D}" -name '*.la' -delete || die -} diff --git a/sci-libs/geos/geos-3.8.0-r1.ebuild b/sci-libs/geos/geos-3.8.0-r1.ebuild index 3992d7a58cfd..53a956cfd2d4 100644 --- a/sci-libs/geos/geos-3.8.0-r1.ebuild +++ b/sci-libs/geos/geos-3.8.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/geos/${PN}-${MY_PV}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" +KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" IUSE="doc ruby static-libs" BDEPEND=" @@ -33,10 +33,14 @@ src_prepare() { } src_configure() { - econf \ - --disable-python \ - $(use_enable ruby) \ + local myeconfargs=( + --disable-python + $(use_enable ruby) $(use_enable static-libs static) + ) + use arm && myeconfargs+=( --disable-inline ) # bug 709368 + + econf "${myeconfargs[@]}" } src_compile() { diff --git a/sci-libs/geos/geos-3.8.1.ebuild b/sci-libs/geos/geos-3.8.1.ebuild new file mode 100644 index 000000000000..f19227d4b289 --- /dev/null +++ b/sci-libs/geos/geos-3.8.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Geometry engine library for Geographic Information Systems" +HOMEPAGE="http://trac.osgeo.org/geos/" +SRC_URI="http://download.osgeo.org/geos/${PN}-${PV}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" +IUSE="doc ruby static-libs" + +BDEPEND=" + doc? ( app-doc/doxygen ) + ruby? ( dev-lang/swig:0 ) +" +RDEPEND=" + ruby? ( dev-lang/ruby:* ) +" +DEPEND="${RDEPEND}" + +RESTRICT="test" + +src_prepare() { + default + echo "#!${EPREFIX}/bin/bash" > py-compile +} + +src_configure() { + local myeconfargs=( + --disable-python + $(use_enable ruby) + $(use_enable static-libs static) + ) + use arm && myeconfargs+=( --disable-inline ) # bug 709368 + + econf "${myeconfargs[@]}" +} + +src_compile() { + default + use doc && emake -C doc doxygen-html +} + +src_install() { + use doc && local HTML_DOCS=( doc/doxygen_docs/html/. ) + default + + find "${D}" -name '*.la' -type f -delete || die +} -- cgit v1.2.3