From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A8CB659CA5 for ; Wed, 23 Mar 2016 05:44:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5581E083C; Wed, 23 Mar 2016 05:44:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 08D52E083C for ; Wed, 23 Mar 2016 05:44:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9028F340BF6 for ; Wed, 23 Mar 2016 05:44:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 90AAF859 for ; Wed, 23 Mar 2016 05:44:18 +0000 (UTC) From: "Sam Jorna" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam Jorna" Message-ID: <1458711822.a5ddd09f034237fe05f99b03297c4ce05c15f7fb.wraeth@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/geos/files/3.2.0-darwin.patch sci-libs/geos/files/3.2.0-python.patch sci-libs/geos/files/3.3.2-solaris-isnan.patch sci-libs/geos/files/3.4.1-solaris-isnan.patch sci-libs/geos/files/3.4.2-ruby_so_name.patch X-VCS-Directories: sci-libs/geos/files/ X-VCS-Committer: wraeth X-VCS-Committer-Name: Sam Jorna X-VCS-Revision: a5ddd09f034237fe05f99b03297c4ce05c15f7fb X-VCS-Branch: master Date: Wed, 23 Mar 2016 05:44:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 836435aa-127d-4746-ba53-5bbe3c369a8c X-Archives-Hash: e03af2debfe1ce46bb40264a5cb0c8cf commit: a5ddd09f034237fe05f99b03297c4ce05c15f7fb Author: Sam Jorna gentoo org> AuthorDate: Wed Mar 23 05:43:25 2016 +0000 Commit: Sam Jorna gentoo org> CommitDate: Wed Mar 23 05:43:42 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ddd09f sci-libs/geos: remove unneeded patches Package-Manager: portage-2.2.28 sci-libs/geos/files/3.2.0-darwin.patch | 13 --------- sci-libs/geos/files/3.2.0-python.patch | 40 --------------------------- sci-libs/geos/files/3.3.2-solaris-isnan.patch | 13 --------- sci-libs/geos/files/3.4.1-solaris-isnan.patch | 14 ---------- sci-libs/geos/files/3.4.2-ruby_so_name.patch | 12 -------- 5 files changed, 92 deletions(-) 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 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 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 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 --# 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 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 --# 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 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"]]'`