summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/geos')
-rw-r--r--sci-libs/geos/Manifest1
-rw-r--r--sci-libs/geos/files/geos-3.5.0-autoconf-detect-isnan.patch25
-rw-r--r--sci-libs/geos/files/geos-3.5.0-phpconfig-path.patch29
-rw-r--r--sci-libs/geos/files/geos-3.5.0-std-isnan.patch26
-rw-r--r--sci-libs/geos/geos-3.5.0-r2.ebuild135
-rw-r--r--sci-libs/geos/geos-3.5.0.ebuild58
6 files changed, 0 insertions, 274 deletions
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 30d2b175271..a59a97bac1a 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,3 +1,2 @@
-DIST geos-3.5.0.tar.bz2 1949397 SHA256 49982b23bcfa64a53333dab136b82e25354edeb806e5a2e2f5b8aa98b1d0ae02 SHA512 cd9c008c19213eb90959f950b03958e6abd9c22d83e6eb5f5a9020263ad8b0045dd5c5af60417c548fc130a57756ae1ef706710086cc277498b9ba6a0a6256b7 WHIRLPOOL f7530e1dc6b99b4ad83d9a01c44b8e6256e118f7615a473d666b00549296df00ca3c86d7ab4d0ae717a3b329b3a9ecac587bc475ee51cbd7e436922860d00ab9
DIST geos-3.6.1.tar.bz2 1833434 SHA256 4a2e4e3a7a09a7cfda3211d0f4a235d9fd3176ddf64bd8db14b4ead266189fc5 SHA512 8b28e7706567375ca02ae5f5dbebf0870e8fed8ea430596a3637e5c975e72bc0f3c16c31b052f154042dd029c54130325a8d44de95c3458f5da024a97d3cfaf9 WHIRLPOOL bda0bb3b77c7c815e0be613f9af8f544fa4410029033851564bc83a912d5d7bfabaeb5d8d3dc61ebebfb482bdc64ea3cc09b395041b22cf419662beafdfec073
DIST geos-3.6.2.tar.bz2 2030705 SHA256 045a13df84d605a866602f6020fc6cbf8bf4c42fb50de237a08926e1d7d7652a SHA512 515d8700b8a28282678e481faee355e3a43d7b70160472a63335b8d7225d9ba10437be782378f18f31a15288118126d411a2d862f01ce35d27c96f6bc0a73016 WHIRLPOOL 137061802daf29c94951ffe651e284064c66049fed02488720bb255094ab8ba8093fcf9fca568acada94714493cd9d740898ae2c4e5fe2610a9c88255e8c88f6
diff --git a/sci-libs/geos/files/geos-3.5.0-autoconf-detect-isnan.patch b/sci-libs/geos/files/geos-3.5.0-autoconf-detect-isnan.patch
deleted file mode 100644
index 79e319da493..00000000000
--- a/sci-libs/geos/files/geos-3.5.0-autoconf-detect-isnan.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From edbeee650287a4a36837e090eafed90a760bad83 Mon Sep 17 00:00:00 2001
-From: Sandro Santilli <strk@keybit.net>
-Date: Mon, 7 Mar 2016 10:21:33 +0000
-Subject: [PATCH] Look for isnan in std:: namespace
-
-Tested with gcc 4.8.4
-
-git-svn-id: http://svn.osgeo.org/geos/trunk@4169 5242fede-7e19-0410-aef8-94bd7d2200fb
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7fdc579..8976a6a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -197,7 +197,7 @@ dnl of isnan().
- AC_LANG_PUSH([C++])
- AC_CACHE_CHECK([for isnan], ac_cv_isnan,
- [AC_TRY_LINK([#include <cmath>],
-- [double x; int y; y = isnan(x);],
-+ [double x; int y; y = std::isnan(x);],
- ac_cv_isnan=yes,
- ac_cv_isnan=no
- )])
diff --git a/sci-libs/geos/files/geos-3.5.0-phpconfig-path.patch b/sci-libs/geos/files/geos-3.5.0-phpconfig-path.patch
deleted file mode 100644
index b44eb9da9ea..00000000000
--- a/sci-libs/geos/files/geos-3.5.0-phpconfig-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/php/Makefile.am b/php/Makefile.am
-index 5b50c0f..fad05c0 100644
---- a/php/Makefile.am
-+++ b/php/Makefile.am
-@@ -56,7 +56,7 @@ geos_la_CPPFLAGS = $(AM_CPPFLAGS) \
- -I$(top_srcdir)/include
-
- install: all
-- $(INSTALL) -d "$(DESTDIR)"/`$(PHP_CONFIG) --extension-dir`
-- $(INSTALL) -m 755 .libs/geos.so "$(DESTDIR)"/`php-config --extension-dir`
-+ $(INSTALL) -d "$(DESTDIR)"`$(PHP_CONFIG) --extension-dir`
-+ $(INSTALL) -m 755 .libs/geos.so "$(DESTDIR)"`$(PHP_CONFIG) --extension-dir`
-
- endif
-diff --git a/php/Makefile.in b/php/Makefile.in
-index d8c343e..9485d0d 100644
---- a/php/Makefile.in
-+++ b/php/Makefile.in
-@@ -877,8 +877,8 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
-
-
- @ENABLE_PHP_TRUE@install: all
--@ENABLE_PHP_TRUE@ $(INSTALL) -d "$(DESTDIR)"/`$(PHP_CONFIG) --extension-dir`
--@ENABLE_PHP_TRUE@ $(INSTALL) -m 755 .libs/geos.so "$(DESTDIR)"/`php-config --extension-dir`
-+@ENABLE_PHP_TRUE@ $(INSTALL) -d "$(DESTDIR)"`$(PHP_CONFIG) --extension-dir`
-+@ENABLE_PHP_TRUE@ $(INSTALL) -m 755 .libs/geos.so "$(DESTDIR)"`$(PHP_CONFIG) --extension-dir`
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/sci-libs/geos/files/geos-3.5.0-std-isnan.patch b/sci-libs/geos/files/geos-3.5.0-std-isnan.patch
deleted file mode 100644
index c2b6a996afc..00000000000
--- a/sci-libs/geos/files/geos-3.5.0-std-isnan.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a9bb3ed34e71f5f9d1d1b0bc3044555a0b3b932c Mon Sep 17 00:00:00 2001
-From: Sandro Santilli <strk@keybit.net>
-Date: Thu, 14 Jul 2016 10:38:35 +0000
-Subject: [PATCH] Fully qualify isnan call when HAVE_ISNAN is defined
-
-Fixes build with GCC-5.3.0 and higher.
-Closes #784
-
-git-svn-id: http://svn.osgeo.org/geos/trunk@4224 5242fede-7e19-0410-aef8-94bd7d2200fb
----
- include/geos/platform.h.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/geos/platform.h.in b/include/geos/platform.h.in
-index d8d4558..c3bc9c8 100644
---- a/include/geos/platform.h.in
-+++ b/include/geos/platform.h.in
-@@ -86,7 +86,7 @@ extern "C"
- #endif
-
- #if defined(HAVE_ISNAN)
--# define ISNAN(x) (isnan(x))
-+# define ISNAN(x) (std::isnan(x))
- #else
- # if defined(_MSC_VER)
- # define ISNAN(x) _isnan(x)
diff --git a/sci-libs/geos/geos-3.5.0-r2.ebuild b/sci-libs/geos/geos-3.5.0-r2.ebuild
deleted file mode 100644
index 986fa56bbe0..00000000000
--- a/sci-libs/geos/geos-3.5.0-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-USE_PHP="php5-4 php5-5 php5-6"
-PHP_EXT_NAME="geos"
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_SKIP_PHPIZE="yes"
-
-inherit php-ext-source-r2 autotools eutils 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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc php python ruby static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- python? ( ${PYTHON_DEPS} )
- ruby? ( dev-lang/ruby:* )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- php? (
- dev-lang/swig
- app-admin/chrpath
- )
- python? ( dev-lang/swig )
- ruby? ( dev-lang/swig )
-"
-
-PATCHES=(
- "${FILESDIR}"/3.4.2-solaris-isnan.patch
- "${FILESDIR}"/${PN}-3.5.0-std-isnan.patch
- "${FILESDIR}"/${PN}-3.5.0-autoconf-detect-isnan.patch
- "${FILESDIR}"/${P}-phpconfig-path.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-# Call default here to override the php-ext-source-r2_src_unpack
-src_unpack() {
- default
-}
-
-src_prepare() {
- epatch "${PATCHES[@]}"
- eautoreconf
- echo "#!${EPREFIX}/bin/bash" > py-compile
- if use php; then
- local php_slot
- for php_slot in $(php_get_slots); do
- cp -a "${S}" "${WORKDIR}/${php_slot}" || die
- done
- fi
-}
-
-src_configure() {
- # bug 576436 - does not support PHP-7.0
- local PHP_CONFIG
- local php_libdir="${EROOT}usr/$(get_libdir)"
-
- econf \
- $(use_enable python) \
- $(use_enable ruby) \
- --disable-php \
- $(use_enable static-libs static)
-
- if use php; then
- local php_slot
- for php_slot in $(php_get_slots); do
- PHP_CONFIG="${php_libdir}/${php_slot}/bin/php-config"
- [[ -e "${PHP_CONFIG}" ]] && export PHP_CONFIG
- pushd "${WORKDIR}/${php_slot}" > /dev/null || die
- econf \
- --disable-python \
- --disable-ruby \
- --enable-php \
- --disable-static
- popd > /dev/null || die
- done
- fi
-}
-
-src_compile() {
- emake
- if use php; then
- local php_slot
- for php_slot in $(php_get_slots); do
- pushd "${WORKDIR}/${php_slot}/php" > /dev/null || die
- rm -r ../capi || die
- ln -sfr "${S}/capi" ../capi
- emake
- popd > /dev/null || die
- done
- fi
-
- use doc && emake -C "${S}/doc" doxygen-html
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- use doc && dohtml -r doc/doxygen_docs/html/*
- use python && python_optimize "${D}$(python_get_sitedir)"/geos/
-
- if use php; then
- local php_slot
- local libpath
- local php_libdir="${EROOT}usr/$(get_libdir)"
-
- for php_slot in $(php_get_slots); do
- pushd "${WORKDIR}/${php_slot}/php" > /dev/null || die
- emake DESTDIR="${D}" install
- popd > /dev/null || die
- # The libpath will vary by slot as the extension-dir is tied to the API date
- libpath="lib/extensions/$(${php_libdir}/${php_slot}/bin/php-config --extension-dir | grep -o '[^/]*$')/geos.so"
- local lib="${D}/usr/$(get_libdir)/${php_slot}/${libpath}"
- if [[ -e "${lib}" ]]; then
- chrpath -d ${lib} || die "Failed cleaning RPATH on '${lib}'"
- fi
- done
- fi
-
- prune_libtool_files
-}
diff --git a/sci-libs/geos/geos-3.5.0.ebuild b/sci-libs/geos/geos-3.5.0.ebuild
deleted file mode 100644
index 60c7caacb52..00000000000
--- a/sci-libs/geos/geos-3.5.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils 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 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc php python ruby static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- php? ( >=dev-lang/php-5.3:* )
- python? ( ${PYTHON_DEPS} )
- ruby? ( dev-lang/ruby:* )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- php? ( dev-lang/swig )
- python? ( dev-lang/swig )
- ruby? ( dev-lang/swig )
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/3.4.2-solaris-isnan.patch
- eautoreconf
- echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
-src_configure() {
- econf \
- $(use_enable python) \
- $(use_enable ruby) \
- $(use_enable php) \
- $(use_enable static-libs static)
-}
-
-src_compile() {
- emake
-
- use doc && emake -C "${S}/doc" doxygen-html
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- use doc && dohtml -r doc/doxygen_docs/html/*
- use python && python_optimize "${D}$(python_get_sitedir)"/geos/
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-}