gentoo resync : 17.10.2017

3 files changed, 0 insertions, 80 deletions

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 79e319da493e..000000000000
--- 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 b44eb9da9ea1..000000000000
--- 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 c2b6a996afcd..000000000000
--- 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)