sci-libs/geos: remove unneeded patches

Package-Manager: portage-2.2.28

diff --git a/sci-libs/geos/files/3.2.0-darwin.patch b/sci-libs/geos/files/3.2.0-darwin.patch
deleted file mode 100644 (file)
index 2701b59..0000000
--- a/sci-libs/geos/files/3.2.0-darwin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Also check for dylib before giving up, bug #335811
-
---- macros/ac_python_devel.m4
-+++ macros/ac_python_devel.m4
-@@ -42,7 +42,7 @@
-         # Check for Python library path
-         AC_MSG_CHECKING([for Python library path])
-         python_path=`python$PYTHON_VERSION -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_var("LIBDIR"))'`
--        if test ! -f "${python_path}"/libpython$PYTHON_VERSION.so ; then
-+        if test ! -f "${python_path}"/libpython$PYTHON_VERSION.so && test ! -f "${python_path}"/libpython$PYTHON_VERSION.dylib ; then
-                 python_path=""
-         fi
-         AC_MSG_RESULT([$python_path])

diff --git a/sci-libs/geos/files/3.2.0-python.patch b/sci-libs/geos/files/3.2.0-python.patch
deleted file mode 100644 (file)
index b4a85c0..0000000
--- a/sci-libs/geos/files/3.2.0-python.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/macros/ac_python_devel.m4 b/macros/ac_python_devel.m4
-index d67842b..f3a3a3b 100644
---- a/macros/ac_python_devel.m4
-+++ b/macros/ac_python_devel.m4
-@@ -29,13 +29,10 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
- 
-         # Check for Python include path
-         AC_MSG_CHECKING([for Python include path])
--        for i in "$base_python_path/include/python$PYTHON_VERSION/" "$base_python_path/include/python/" "$base_python_path/include/" "$base_python_path/" ; do
--                python_path=`find $i -type f -name Python.h -print 2> /dev/null | sed "1q"`
--                if test -n "$python_path" ; then
--                        break
--                fi
--        done
--        python_path=`echo $python_path | sed "s,/Python.h$,,"`
-+        python_path="${base_python_path}/include/python$PYTHON_VERSION/"
-+        if test ! -f "${python_path}"/Python.h ; then
-+                python_path=""
-+        fi
-         AC_MSG_RESULT([$python_path])
-         if test -z "$python_path" ; then
-                 AC_MSG_ERROR([cannot find Python include path])
-@@ -44,13 +41,10 @@ AC_DEFUN([AC_PYTHON_DEVEL],[
- 
-         # Check for Python library path
-         AC_MSG_CHECKING([for Python library path])
--        for i in "$base_python_path/lib/python$PYTHON_VERSION/config/" "$base_python_path/lib/python$PYTHON_VERSION/" "$base_python_path/lib/python/config/" "$base_python_path/lib/python/" "$base_python_path/" "$base_python_path/libs/" ; do
--                python_path=`find $i -name libpython$PYTHON_VERSION.* -print 2> /dev/null | sed "1q"`
--                if test -n "$python_path" ; then
--                        break
--                fi
--        done
--        python_path=`echo $python_path | sed "s,/libpython.*$,,"`
-+        python_path=`python$PYTHON_VERSION -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_var("LIBDIR"))'`
-+        if test ! -f "${python_path}"/libpython$PYTHON_VERSION.so ; then
-+                python_path=""
-+        fi
-         AC_MSG_RESULT([$python_path])
-         if test -z "$python_path" ; then
-                 AC_MSG_ERROR([cannot find Python library path])

diff --git a/sci-libs/geos/files/3.3.2-solaris-isnan.patch b/sci-libs/geos/files/3.3.2-solaris-isnan.patch
deleted file mode 100644 (file)
index 04dc131..0000000
--- a/sci-libs/geos/files/3.3.2-solaris-isnan.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/geos/platform.h.in
-+++ include/geos/platform.h.in
-@@ -97,8 +97,9 @@
-    // It does leave a version in std.
- #  define ISNAN(x) (std::isnan(x))
- # elif defined(__sun) || defined(__sun__)
-+#  define _XOPEN_SOURCE 600  // force iso/math_c99
- #  include <math.h>
--#  define ISNAN(x) (::isnan(x))
-+#  define ISNAN(x) (std::isnan(x))
- # endif
- #endif
- 

diff --git a/sci-libs/geos/files/3.4.1-solaris-isnan.patch b/sci-libs/geos/files/3.4.1-solaris-isnan.patch
deleted file mode 100644 (file)
index f4cb2ae..0000000
--- a/sci-libs/geos/files/3.4.1-solaris-isnan.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naruw geos-3.4.1.orig/include/geos/platform.h.in geos-3.4.1/include/geos/platform.h.in
---- geos-3.4.1.orig/include/geos/platform.h.in 2013-08-17 14:08:04.000000000 +0000
-+++ geos-3.4.1/include/geos/platform.h.in      2013-08-18 22:00:59.412676805 +0000
-@@ -96,8 +96,9 @@
-    // It does leave a version in std.
- #  define ISNAN(x) (std::isnan(x))
- # elif defined(__sun) || defined(__sun__)
-+#  define _XOPEN_SOURCE 600     // force iso/math_c99
- #  include <math.h>
--#  define ISNAN(x) (::isnan(x))
-+#  define ISNAN(x) (std::isnan(x))
- # endif
- #endif
- 

diff --git a/sci-libs/geos/files/3.4.2-ruby_so_name.patch b/sci-libs/geos/files/3.4.2-ruby_so_name.patch
deleted file mode 100644 (file)
index 4168e5c..0000000
--- a/sci-libs/geos/files/3.4.2-ruby_so_name.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur geos-3.4.2.orig/macros/ruby.m4 geos-3.4.2/macros/ruby.m4
---- a/macros/ruby.m4   2013-08-25 11:10:32.000000000 -0400
-+++ b/macros/ruby.m4   2014-11-05 06:35:39.347830878 -0500
-@@ -38,7 +38,7 @@
-               RUBY_EXTENSION_DIR=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["sitearchdir"]] || Config::CONFIG[["sitearchdir"]]'`
- 
-               dnl Get Ruby shared library name, this does not include the lib prefix or extension name
--              RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["LIBRUBY_SO"]] || Config::CONFIG[["RUBY_SO_NAME"]]'`
-+              RUBY_SO_NAME=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["RUBY_SO_NAME"]] || Config::CONFIG[["RUBY_SO_NAME"]]'`
-               
-               dnl Get Ruby shared libary name
-               RUBY_SHARED_LIB=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["LIBRUBY"]] || Config::CONFIG[["LIBRUBY"]]'`