| 1 |
commit: ada301ace2c382bf840f00ac95d97775637f2d2c |
| 2 |
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 15 12:05:29 2017 +0000 |
| 4 |
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 15 12:10:21 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada301ac |
| 7 |
|
| 8 |
sci-libs/geos: Clean up |
| 9 |
|
| 10 |
Remove old ebuilds and their patches. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
| 13 |
|
| 14 |
sci-libs/geos/Manifest | 1 - |
| 15 |
.../files/geos-3.5.0-autoconf-detect-isnan.patch | 25 ---- |
| 16 |
.../geos/files/geos-3.5.0-phpconfig-path.patch | 29 ----- |
| 17 |
sci-libs/geos/files/geos-3.5.0-std-isnan.patch | 26 ---- |
| 18 |
sci-libs/geos/geos-3.5.0-r2.ebuild | 135 --------------------- |
| 19 |
sci-libs/geos/geos-3.5.0.ebuild | 58 --------- |
| 20 |
6 files changed, 274 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest |
| 23 |
index 30d2b175271..a59a97bac1a 100644 |
| 24 |
--- a/sci-libs/geos/Manifest |
| 25 |
+++ b/sci-libs/geos/Manifest |
| 26 |
@@ -1,3 +1,2 @@ |
| 27 |
-DIST geos-3.5.0.tar.bz2 1949397 SHA256 49982b23bcfa64a53333dab136b82e25354edeb806e5a2e2f5b8aa98b1d0ae02 SHA512 cd9c008c19213eb90959f950b03958e6abd9c22d83e6eb5f5a9020263ad8b0045dd5c5af60417c548fc130a57756ae1ef706710086cc277498b9ba6a0a6256b7 WHIRLPOOL f7530e1dc6b99b4ad83d9a01c44b8e6256e118f7615a473d666b00549296df00ca3c86d7ab4d0ae717a3b329b3a9ecac587bc475ee51cbd7e436922860d00ab9 |
| 28 |
DIST geos-3.6.1.tar.bz2 1833434 SHA256 4a2e4e3a7a09a7cfda3211d0f4a235d9fd3176ddf64bd8db14b4ead266189fc5 SHA512 8b28e7706567375ca02ae5f5dbebf0870e8fed8ea430596a3637e5c975e72bc0f3c16c31b052f154042dd029c54130325a8d44de95c3458f5da024a97d3cfaf9 WHIRLPOOL bda0bb3b77c7c815e0be613f9af8f544fa4410029033851564bc83a912d5d7bfabaeb5d8d3dc61ebebfb482bdc64ea3cc09b395041b22cf419662beafdfec073 |
| 29 |
DIST geos-3.6.2.tar.bz2 2030705 SHA256 045a13df84d605a866602f6020fc6cbf8bf4c42fb50de237a08926e1d7d7652a SHA512 515d8700b8a28282678e481faee355e3a43d7b70160472a63335b8d7225d9ba10437be782378f18f31a15288118126d411a2d862f01ce35d27c96f6bc0a73016 WHIRLPOOL 137061802daf29c94951ffe651e284064c66049fed02488720bb255094ab8ba8093fcf9fca568acada94714493cd9d740898ae2c4e5fe2610a9c88255e8c88f6 |
| 30 |
|
| 31 |
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 |
| 32 |
deleted file mode 100644 |
| 33 |
index 79e319da493..00000000000 |
| 34 |
--- a/sci-libs/geos/files/geos-3.5.0-autoconf-detect-isnan.patch |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,25 +0,0 @@ |
| 37 |
-From edbeee650287a4a36837e090eafed90a760bad83 Mon Sep 17 00:00:00 2001 |
| 38 |
-From: Sandro Santilli <strk@××××××.net> |
| 39 |
-Date: Mon, 7 Mar 2016 10:21:33 +0000 |
| 40 |
-Subject: [PATCH] Look for isnan in std:: namespace |
| 41 |
- |
| 42 |
-Tested with gcc 4.8.4 |
| 43 |
- |
| 44 |
-git-svn-id: http://svn.osgeo.org/geos/trunk@4169 5242fede-7e19-0410-aef8-94bd7d2200fb |
| 45 |
---- |
| 46 |
- configure.ac | 2 +- |
| 47 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 48 |
- |
| 49 |
-diff --git a/configure.ac b/configure.ac |
| 50 |
-index 7fdc579..8976a6a 100644 |
| 51 |
---- a/configure.ac |
| 52 |
-+++ b/configure.ac |
| 53 |
-@@ -197,7 +197,7 @@ dnl of isnan(). |
| 54 |
- AC_LANG_PUSH([C++]) |
| 55 |
- AC_CACHE_CHECK([for isnan], ac_cv_isnan, |
| 56 |
- [AC_TRY_LINK([#include <cmath>], |
| 57 |
-- [double x; int y; y = isnan(x);], |
| 58 |
-+ [double x; int y; y = std::isnan(x);], |
| 59 |
- ac_cv_isnan=yes, |
| 60 |
- ac_cv_isnan=no |
| 61 |
- )]) |
| 62 |
|
| 63 |
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 |
| 64 |
deleted file mode 100644 |
| 65 |
index b44eb9da9ea..00000000000 |
| 66 |
--- a/sci-libs/geos/files/geos-3.5.0-phpconfig-path.patch |
| 67 |
+++ /dev/null |
| 68 |
@@ -1,29 +0,0 @@ |
| 69 |
-diff --git a/php/Makefile.am b/php/Makefile.am |
| 70 |
-index 5b50c0f..fad05c0 100644 |
| 71 |
---- a/php/Makefile.am |
| 72 |
-+++ b/php/Makefile.am |
| 73 |
-@@ -56,7 +56,7 @@ geos_la_CPPFLAGS = $(AM_CPPFLAGS) \ |
| 74 |
- -I$(top_srcdir)/include |
| 75 |
- |
| 76 |
- install: all |
| 77 |
-- $(INSTALL) -d "$(DESTDIR)"/`$(PHP_CONFIG) --extension-dir` |
| 78 |
-- $(INSTALL) -m 755 .libs/geos.so "$(DESTDIR)"/`php-config --extension-dir` |
| 79 |
-+ $(INSTALL) -d "$(DESTDIR)"`$(PHP_CONFIG) --extension-dir` |
| 80 |
-+ $(INSTALL) -m 755 .libs/geos.so "$(DESTDIR)"`$(PHP_CONFIG) --extension-dir` |
| 81 |
- |
| 82 |
- endif |
| 83 |
-diff --git a/php/Makefile.in b/php/Makefile.in |
| 84 |
-index d8c343e..9485d0d 100644 |
| 85 |
---- a/php/Makefile.in |
| 86 |
-+++ b/php/Makefile.in |
| 87 |
-@@ -877,8 +877,8 @@ uninstall-am: uninstall-pkglibLTLIBRARIES |
| 88 |
- |
| 89 |
- |
| 90 |
- @ENABLE_PHP_TRUE@install: all |
| 91 |
--@ENABLE_PHP_TRUE@ $(INSTALL) -d "$(DESTDIR)"/`$(PHP_CONFIG) --extension-dir` |
| 92 |
--@ENABLE_PHP_TRUE@ $(INSTALL) -m 755 .libs/geos.so "$(DESTDIR)"/`php-config --extension-dir` |
| 93 |
-+@ENABLE_PHP_TRUE@ $(INSTALL) -d "$(DESTDIR)"`$(PHP_CONFIG) --extension-dir` |
| 94 |
-+@ENABLE_PHP_TRUE@ $(INSTALL) -m 755 .libs/geos.so "$(DESTDIR)"`$(PHP_CONFIG) --extension-dir` |
| 95 |
- |
| 96 |
- # Tell versions [3.59,3.63) of GNU make to not export all variables. |
| 97 |
- # Otherwise a system limit (for SysV at least) may be exceeded. |
| 98 |
|
| 99 |
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 |
| 100 |
deleted file mode 100644 |
| 101 |
index c2b6a996afc..00000000000 |
| 102 |
--- a/sci-libs/geos/files/geos-3.5.0-std-isnan.patch |
| 103 |
+++ /dev/null |
| 104 |
@@ -1,26 +0,0 @@ |
| 105 |
-From a9bb3ed34e71f5f9d1d1b0bc3044555a0b3b932c Mon Sep 17 00:00:00 2001 |
| 106 |
-From: Sandro Santilli <strk@××××××.net> |
| 107 |
-Date: Thu, 14 Jul 2016 10:38:35 +0000 |
| 108 |
-Subject: [PATCH] Fully qualify isnan call when HAVE_ISNAN is defined |
| 109 |
- |
| 110 |
-Fixes build with GCC-5.3.0 and higher. |
| 111 |
-Closes #784 |
| 112 |
- |
| 113 |
-git-svn-id: http://svn.osgeo.org/geos/trunk@4224 5242fede-7e19-0410-aef8-94bd7d2200fb |
| 114 |
---- |
| 115 |
- include/geos/platform.h.in | 2 +- |
| 116 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 117 |
- |
| 118 |
-diff --git a/include/geos/platform.h.in b/include/geos/platform.h.in |
| 119 |
-index d8d4558..c3bc9c8 100644 |
| 120 |
---- a/include/geos/platform.h.in |
| 121 |
-+++ b/include/geos/platform.h.in |
| 122 |
-@@ -86,7 +86,7 @@ extern "C" |
| 123 |
- #endif |
| 124 |
- |
| 125 |
- #if defined(HAVE_ISNAN) |
| 126 |
--# define ISNAN(x) (isnan(x)) |
| 127 |
-+# define ISNAN(x) (std::isnan(x)) |
| 128 |
- #else |
| 129 |
- # if defined(_MSC_VER) |
| 130 |
- # define ISNAN(x) _isnan(x) |
| 131 |
|
| 132 |
diff --git a/sci-libs/geos/geos-3.5.0-r2.ebuild b/sci-libs/geos/geos-3.5.0-r2.ebuild |
| 133 |
deleted file mode 100644 |
| 134 |
index 986fa56bbe0..00000000000 |
| 135 |
--- a/sci-libs/geos/geos-3.5.0-r2.ebuild |
| 136 |
+++ /dev/null |
| 137 |
@@ -1,135 +0,0 @@ |
| 138 |
-# Copyright 1999-2017 Gentoo Foundation |
| 139 |
-# Distributed under the terms of the GNU General Public License v2 |
| 140 |
- |
| 141 |
-EAPI=5 |
| 142 |
- |
| 143 |
-PYTHON_COMPAT=( python2_7 ) |
| 144 |
- |
| 145 |
-USE_PHP="php5-4 php5-5 php5-6" |
| 146 |
-PHP_EXT_NAME="geos" |
| 147 |
-PHP_EXT_OPTIONAL_USE="php" |
| 148 |
-PHP_EXT_SKIP_PHPIZE="yes" |
| 149 |
- |
| 150 |
-inherit php-ext-source-r2 autotools eutils python-single-r1 |
| 151 |
- |
| 152 |
-DESCRIPTION="Geometry engine library for Geographic Information Systems" |
| 153 |
-HOMEPAGE="http://trac.osgeo.org/geos/" |
| 154 |
-SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2" |
| 155 |
- |
| 156 |
-LICENSE="LGPL-2.1" |
| 157 |
-SLOT="0" |
| 158 |
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" |
| 159 |
-IUSE="doc php python ruby static-libs" |
| 160 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 161 |
- |
| 162 |
-RDEPEND=" |
| 163 |
- python? ( ${PYTHON_DEPS} ) |
| 164 |
- ruby? ( dev-lang/ruby:* ) |
| 165 |
-" |
| 166 |
-DEPEND="${RDEPEND} |
| 167 |
- doc? ( app-doc/doxygen ) |
| 168 |
- php? ( |
| 169 |
- dev-lang/swig |
| 170 |
- app-admin/chrpath |
| 171 |
- ) |
| 172 |
- python? ( dev-lang/swig ) |
| 173 |
- ruby? ( dev-lang/swig ) |
| 174 |
-" |
| 175 |
- |
| 176 |
-PATCHES=( |
| 177 |
- "${FILESDIR}"/3.4.2-solaris-isnan.patch |
| 178 |
- "${FILESDIR}"/${PN}-3.5.0-std-isnan.patch |
| 179 |
- "${FILESDIR}"/${PN}-3.5.0-autoconf-detect-isnan.patch |
| 180 |
- "${FILESDIR}"/${P}-phpconfig-path.patch |
| 181 |
-) |
| 182 |
- |
| 183 |
-pkg_setup() { |
| 184 |
- use python && python-single-r1_pkg_setup |
| 185 |
-} |
| 186 |
- |
| 187 |
-# Call default here to override the php-ext-source-r2_src_unpack |
| 188 |
-src_unpack() { |
| 189 |
- default |
| 190 |
-} |
| 191 |
- |
| 192 |
-src_prepare() { |
| 193 |
- epatch "${PATCHES[@]}" |
| 194 |
- eautoreconf |
| 195 |
- echo "#!${EPREFIX}/bin/bash" > py-compile |
| 196 |
- if use php; then |
| 197 |
- local php_slot |
| 198 |
- for php_slot in $(php_get_slots); do |
| 199 |
- cp -a "${S}" "${WORKDIR}/${php_slot}" || die |
| 200 |
- done |
| 201 |
- fi |
| 202 |
-} |
| 203 |
- |
| 204 |
-src_configure() { |
| 205 |
- # bug 576436 - does not support PHP-7.0 |
| 206 |
- local PHP_CONFIG |
| 207 |
- local php_libdir="${EROOT}usr/$(get_libdir)" |
| 208 |
- |
| 209 |
- econf \ |
| 210 |
- $(use_enable python) \ |
| 211 |
- $(use_enable ruby) \ |
| 212 |
- --disable-php \ |
| 213 |
- $(use_enable static-libs static) |
| 214 |
- |
| 215 |
- if use php; then |
| 216 |
- local php_slot |
| 217 |
- for php_slot in $(php_get_slots); do |
| 218 |
- PHP_CONFIG="${php_libdir}/${php_slot}/bin/php-config" |
| 219 |
- [[ -e "${PHP_CONFIG}" ]] && export PHP_CONFIG |
| 220 |
- pushd "${WORKDIR}/${php_slot}" > /dev/null || die |
| 221 |
- econf \ |
| 222 |
- --disable-python \ |
| 223 |
- --disable-ruby \ |
| 224 |
- --enable-php \ |
| 225 |
- --disable-static |
| 226 |
- popd > /dev/null || die |
| 227 |
- done |
| 228 |
- fi |
| 229 |
-} |
| 230 |
- |
| 231 |
-src_compile() { |
| 232 |
- emake |
| 233 |
- if use php; then |
| 234 |
- local php_slot |
| 235 |
- for php_slot in $(php_get_slots); do |
| 236 |
- pushd "${WORKDIR}/${php_slot}/php" > /dev/null || die |
| 237 |
- rm -r ../capi || die |
| 238 |
- ln -sfr "${S}/capi" ../capi |
| 239 |
- emake |
| 240 |
- popd > /dev/null || die |
| 241 |
- done |
| 242 |
- fi |
| 243 |
- |
| 244 |
- use doc && emake -C "${S}/doc" doxygen-html |
| 245 |
-} |
| 246 |
- |
| 247 |
-src_install() { |
| 248 |
- emake DESTDIR="${D}" install |
| 249 |
- |
| 250 |
- use doc && dohtml -r doc/doxygen_docs/html/* |
| 251 |
- use python && python_optimize "${D}$(python_get_sitedir)"/geos/ |
| 252 |
- |
| 253 |
- if use php; then |
| 254 |
- local php_slot |
| 255 |
- local libpath |
| 256 |
- local php_libdir="${EROOT}usr/$(get_libdir)" |
| 257 |
- |
| 258 |
- for php_slot in $(php_get_slots); do |
| 259 |
- pushd "${WORKDIR}/${php_slot}/php" > /dev/null || die |
| 260 |
- emake DESTDIR="${D}" install |
| 261 |
- popd > /dev/null || die |
| 262 |
- # The libpath will vary by slot as the extension-dir is tied to the API date |
| 263 |
- libpath="lib/extensions/$(${php_libdir}/${php_slot}/bin/php-config --extension-dir | grep -o '[^/]*$')/geos.so" |
| 264 |
- local lib="${D}/usr/$(get_libdir)/${php_slot}/${libpath}" |
| 265 |
- if [[ -e "${lib}" ]]; then |
| 266 |
- chrpath -d ${lib} || die "Failed cleaning RPATH on '${lib}'" |
| 267 |
- fi |
| 268 |
- done |
| 269 |
- fi |
| 270 |
- |
| 271 |
- prune_libtool_files |
| 272 |
-} |
| 273 |
|
| 274 |
diff --git a/sci-libs/geos/geos-3.5.0.ebuild b/sci-libs/geos/geos-3.5.0.ebuild |
| 275 |
deleted file mode 100644 |
| 276 |
index 60c7caacb52..00000000000 |
| 277 |
--- a/sci-libs/geos/geos-3.5.0.ebuild |
| 278 |
+++ /dev/null |
| 279 |
@@ -1,58 +0,0 @@ |
| 280 |
-# Copyright 1999-2017 Gentoo Foundation |
| 281 |
-# Distributed under the terms of the GNU General Public License v2 |
| 282 |
- |
| 283 |
-EAPI="5" |
| 284 |
- |
| 285 |
-PYTHON_COMPAT=( python2_7 ) |
| 286 |
-inherit autotools eutils python-single-r1 |
| 287 |
- |
| 288 |
-DESCRIPTION="Geometry engine library for Geographic Information Systems" |
| 289 |
-HOMEPAGE="http://trac.osgeo.org/geos/" |
| 290 |
-SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2" |
| 291 |
- |
| 292 |
-LICENSE="LGPL-2.1" |
| 293 |
-SLOT="0" |
| 294 |
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" |
| 295 |
-IUSE="doc php python ruby static-libs" |
| 296 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 297 |
- |
| 298 |
-RDEPEND=" |
| 299 |
- php? ( >=dev-lang/php-5.3:* ) |
| 300 |
- python? ( ${PYTHON_DEPS} ) |
| 301 |
- ruby? ( dev-lang/ruby:* ) |
| 302 |
-" |
| 303 |
-DEPEND="${RDEPEND} |
| 304 |
- doc? ( app-doc/doxygen ) |
| 305 |
- php? ( dev-lang/swig ) |
| 306 |
- python? ( dev-lang/swig ) |
| 307 |
- ruby? ( dev-lang/swig ) |
| 308 |
-" |
| 309 |
- |
| 310 |
-src_prepare() { |
| 311 |
- epatch "${FILESDIR}"/3.4.2-solaris-isnan.patch |
| 312 |
- eautoreconf |
| 313 |
- echo "#!${EPREFIX}/bin/bash" > py-compile |
| 314 |
-} |
| 315 |
- |
| 316 |
-src_configure() { |
| 317 |
- econf \ |
| 318 |
- $(use_enable python) \ |
| 319 |
- $(use_enable ruby) \ |
| 320 |
- $(use_enable php) \ |
| 321 |
- $(use_enable static-libs static) |
| 322 |
-} |
| 323 |
- |
| 324 |
-src_compile() { |
| 325 |
- emake |
| 326 |
- |
| 327 |
- use doc && emake -C "${S}/doc" doxygen-html |
| 328 |
-} |
| 329 |
- |
| 330 |
-src_install() { |
| 331 |
- emake DESTDIR="${D}" install |
| 332 |
- |
| 333 |
- use doc && dohtml -r doc/doxygen_docs/html/* |
| 334 |
- use python && python_optimize "${D}$(python_get_sitedir)"/geos/ |
| 335 |
- |
| 336 |
- find "${ED}" -name '*.la' -exec rm -f {} + |
| 337 |
-} |
Archives