* [gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/, sci-libs/geos/files/
@ 2016-03-23 5:44 Sam Jorna
0 siblings, 0 replies; 4+ messages in thread
From: Sam Jorna @ 2016-03-23 5:44 UTC (permalink / raw
To: gentoo-commits
commit: 01118e42ad7f531ffa1d85770fc9eb727b9918ea
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 05:40:44 2016 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 05:43:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01118e42
sci-libs/geos: add python setup, fix php support
This adds python package setup per request, also fixes PHP support
and restricts building against php-7 while unsupported.
Gentoo-bug: 576436
Package-Manager: portage-2.2.28
Signed-off-by: Sam Jorna <wraeth <AT> gentoo.org>
.../geos/files/geos-3.5.0-phpconfig-path.patch | 29 +++++++
sci-libs/geos/geos-3.5.0-r1.ebuild | 98 ++++++++++++++++++++++
2 files changed, 127 insertions(+)
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
new file mode 100644
index 0000000..b44eb9d
--- /dev/null
+++ b/sci-libs/geos/files/geos-3.5.0-phpconfig-path.patch
@@ -0,0 +1,29 @@
+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/geos-3.5.0-r1.ebuild b/sci-libs/geos/geos-3.5.0-r1.ebuild
new file mode 100644
index 0000000..d433e60
--- /dev/null
+++ b/sci-libs/geos/geos-3.5.0-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 python-utils-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 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="doc php python ruby static-libs"
+
+RDEPEND="
+ ruby? ( dev-lang/ruby:* )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ php? (
+ dev-lang/swig
+ app-admin/chrpath
+ )
+ python? ( dev-lang/swig ${PYTHON_DEPS} )
+ ruby? ( dev-lang/swig )
+"
+
+PATCHES=(
+ "${FILESDIR}"/3.4.2-solaris-isnan.patch
+ "${FILESDIR}"/${P}-phpconfig-path.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ eautoreconf
+ echo "#!${EPREFIX}/bin/bash" > py-compile
+}
+
+src_configure() {
+ # bug 576436 - does not support PHP-7.0
+ local PHP_CONFIG
+ local php_libdir="${EROOT}usr/$(get_libdir)"
+
+ 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
+ done
+ fi
+
+ 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/
+
+ if use php; then
+ local php_slot
+ local libpath="lib/extensions/no-debug-non-zts-20131226/geos.so"
+
+ for php_slot in $(php_get_slots); do
+ 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/, sci-libs/geos/files/
@ 2017-10-15 12:10 Aaron Swenson
0 siblings, 0 replies; 4+ messages in thread
From: Aaron Swenson @ 2017-10-15 12:10 UTC (permalink / raw
To: gentoo-commits
commit: ada301ace2c382bf840f00ac95d97775637f2d2c
Author: Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 15 12:05:29 2017 +0000
Commit: Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 12:10:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada301ac
sci-libs/geos: Clean up
Remove old ebuilds and their patches.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sci-libs/geos/Manifest | 1 -
.../files/geos-3.5.0-autoconf-detect-isnan.patch | 25 ----
.../geos/files/geos-3.5.0-phpconfig-path.patch | 29 -----
sci-libs/geos/files/geos-3.5.0-std-isnan.patch | 26 ----
sci-libs/geos/geos-3.5.0-r2.ebuild | 135 ---------------------
sci-libs/geos/geos-3.5.0.ebuild | 58 ---------
6 files changed, 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 {} +
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/, sci-libs/geos/files/
@ 2020-04-05 20:30 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-04-05 20:30 UTC (permalink / raw
To: gentoo-commits
commit: f48276a4bbf1f34258fee34cb974afb728b0ac7c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 5 20:20:15 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 5 20:30:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f48276a4
sci-libs/geos: Drop 3.7.2
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/geos/Manifest | 1 -
sci-libs/geos/files/3.4.2-solaris-isnan.patch | 14 ------
sci-libs/geos/geos-3.7.2.ebuild | 61 ---------------------------
3 files changed, 76 deletions(-)
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 2b565318d51..78ff4095080 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,3 +1,2 @@
-DIST geos-3.7.2.tar.bz2 2071465 BLAKE2B ba968488aa5d845e582d3771d8d2b1f67b0f301e73fad5834a0805a912c8f3b1200bba93d8758f43539ce269758de348d999db3db9738e7abf5c1a443f388d8c SHA512 ff0fde2e21ed9d2770c139aa50c6efd22d9cff3c6bfd8f1ef86b064efd1ad318b08dec66e34661bc1c7a341b0837978853494f27d63988be865a8ee4f7611d38
DIST geos-3.8.0.tar.bz2 2399403 BLAKE2B 0f9b6d7f9a4052b9b84e77d534be6e2909e5dc4995287f34e3b7e7c1537c9a73088d4a49f96f43034723eb37c88674aae469e26d7db3eb40efbcdf5551553a1a SHA512 c89b25b42092152ef261090f25ff64b229f30f67d42fdf44c2871e78b66bb2c42e23b9ae21f9aea0e48823bdb0267d609ab2ee77d310abcb76fa672c6614d8f1
DIST geos-3.8.1.tar.bz2 2505407 BLAKE2B 43053ea9e29d190f41c37d5d382b689ef477e0256cfd5705f4f2f316cac21a1674660bcf0900c51db72909c41d46be7a41d297958de48e108ae6d6bd1ca9d247 SHA512 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
diff --git a/sci-libs/geos/files/3.4.2-solaris-isnan.patch b/sci-libs/geos/files/3.4.2-solaris-isnan.patch
deleted file mode 100644
index a66d36f6587..00000000000
--- a/sci-libs/geos/files/3.4.2-solaris-isnan.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naruw geos-3.4.2.orig/include/geos/platform.h.in geos-3.4.2/include/geos/platform.h.in
---- geos-3.4.2.orig/include/geos/platform.h.in 2013-08-25 15:10:32.000000000 +0000
-+++ geos-3.4.2/include/geos/platform.h.in 2013-10-20 23:45:29.891690795 +0000
-@@ -98,8 +98,9 @@
- // It does leave a version in std.
- # define ISNAN(x) (std::isnan(x))
- # elif (defined(__sun) || defined(__sun__)) && defined(__SUNPRO_CC)
-+# 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/geos-3.7.2.ebuild b/sci-libs/geos/geos-3.7.2.ebuild
deleted file mode 100644
index 342f4e31a87..00000000000
--- a/sci-libs/geos/geos-3.7.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit 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 arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc python ruby static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- python? ( ${PYTHON_DEPS} )
- ruby? ( dev-lang/ruby:* )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- python? ( dev-lang/swig:0 )
- ruby? ( dev-lang/swig:0 )
-"
-
-PATCHES=( "${FILESDIR}"/3.4.2-solaris-isnan.patch )
-
-RESTRICT="test"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- echo "#!${EPREFIX}/bin/bash" > py-compile
-}
-
-src_configure() {
- econf \
- $(use_enable python) \
- $(use_enable ruby) \
- $(use_enable static-libs static)
-}
-
-src_compile() {
- default
- use doc && emake -C "${S}/doc" doxygen-html
-}
-
-src_install() {
- use doc && HTML_DOCS=( doc/doxygen_docs/html/. )
- default
- use python && python_optimize "${D}$(python_get_sitedir)"/geos/
-
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/, sci-libs/geos/files/
@ 2025-01-10 21:08 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2025-01-10 21:08 UTC (permalink / raw
To: gentoo-commits
commit: b8f7f94b9bb7c1a04d9f010eb556e10ff760bac3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 10 17:36:57 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 10 21:08:16 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f7f94b
sci-libs/geos: drop 3.11.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/geos/Manifest | 1 -
sci-libs/geos/files/geos-3.11.2-gcc-13.patch | 38 -------------------
sci-libs/geos/geos-3.11.2.ebuild | 55 ----------------------------
3 files changed, 94 deletions(-)
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index 1e40fec0618c..93b6aa5079f8 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -1,3 +1,2 @@
-DIST geos-3.11.2.tar.bz2 6774288 BLAKE2B 62ddcaf5b6716983d49a6931c97ebe8d4c457ce7d127531ff3ff985555e9dfc2f1ebd211d1fe7afe183a3858913b4c22ec4674f68fb28ee8c43c9e9ce61abd3b SHA512 b5df5b773bef595335e1be6c6d3325f932f1577e2a4b8bdfa8cf26f09c7d41ed5e0695ca15826d1f95bc4a45b777839c2be8a96a8af5415c8bcf58cc804eb1ec
DIST geos-3.12.1.tar.bz2 6727199 BLAKE2B 4ffc9cb63f3ac15b3dcb0ba9fec6a1ccaeaf35962a057234f4da38d6bba19df39e800805badfd56fe927da09c9392f0feaf2b7d02085e8f293c4d9503ab28ff9 SHA512 192eba83c651e935b3c9a5cc19321285e4d28b9da9d7a1fa15d9471803027e630db7a7ecea96343d9c5f9846d279062ca3694fe47916a4ebf5698ae66dd5210d
DIST geos-3.13.0.tar.bz2 6801211 BLAKE2B 8de35093e2819268df2cd15f1661dcbaba6b9c3bd978904fb992fd91905b0056cfa6580cae602511bd8c4b19686597abb81e0af71a8a73a684cafd8013755bad SHA512 8ffaa3f49a8365db693ac948e9d66cf55321eb12151734c7da2775070b7804ffa607de2474b7019d6ea2a99d5e037fb1e8561bf9025e65ddd4bd1ba049382b28
diff --git a/sci-libs/geos/files/geos-3.11.2-gcc-13.patch b/sci-libs/geos/files/geos-3.11.2-gcc-13.patch
deleted file mode 100644
index fa46cf8bf4d2..000000000000
--- a/sci-libs/geos/files/geos-3.11.2-gcc-13.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1
-
-From bea3188be44075034fd349f5bb117c943bdb7fb1 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <mail@heiko-becker.de>
-Date: Mon, 23 Jan 2023 15:56:11 +0100
-Subject: [PATCH] Fix build with gcc 13 by including <cstdint> (#805)
-
-In addition to [1]. Otherwise geos fails to build with:
-"geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:40:28: error: expected ')' before 'p_level'
- 40 | HilbertEncoder(uint32_t p_level, geom::Envelope& extent);
- | ~ ^~~~~~~~
- | )
-/var/tmp/paludis/build/sci-libs-geos-3.11.1/work/geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:41:5: error: 'uint32_t' does not name a type
- 41 | uint32_t encode(const geom::Envelope* env);
- | ^~~~~~~~"
-
-[1] 0e8d4368b8bd72a7d361286e8523ebce5cff6146
---- a/include/geos/shape/fractal/HilbertEncoder.h
-+++ b/include/geos/shape/fractal/HilbertEncoder.h
-@@ -19,6 +19,7 @@
- #include <geos/geom/Geometry.h>
- #include <string>
- #include <vector>
-+#include <cstdint>
-
- // Forward declarations
- namespace geos {
---- a/tests/unit/capi/GEOSMakeValidTest.cpp
-+++ b/tests/unit/capi/GEOSMakeValidTest.cpp
-@@ -9,6 +9,7 @@
- #include <cstdlib>
- #include <cmath>
- #include <cstring>
-+#include <cstdint>
-
- #include "capi_test_utils.h"
-
-
diff --git a/sci-libs/geos/geos-3.11.2.ebuild b/sci-libs/geos/geos-3.11.2.ebuild
deleted file mode 100644
index ab3842bbb0c3..000000000000
--- a/sci-libs/geos/geos-3.11.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Geometry engine library for Geographic Information Systems"
-HOMEPAGE="https://libgeos.org/"
-SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="doc? ( app-text/doxygen )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gcc-13.patch
-)
-
-src_configure() {
- # -Werror=odr
- # https://bugs.gentoo.org/862702
- # https://github.com/libgeos/geos/issues/1054
- filter-lto
-
- local mycmakeargs=(
- -DBUILD_DOCUMENTATION=$(usex doc)
- -DBUILD_TESTING=$(usex test)
- -DUSE_CCACHE=OFF
-
- # bug #709368
- $(usev arm '-DDISABLE_GEOS_INLINE=ON')
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- use doc && cmake_src_compile docs
-}
-
-src_install() {
- cmake_src_install
-
- if use doc ; then
- HTML_DOCS=( "${BUILD_DIR}"/doxygen/doxygen_docs/html/. )
- einstalldocs
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-01-10 21:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-10 21:08 [gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/, sci-libs/geos/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-04-05 20:30 Andreas Sturmlechner
2017-10-15 12:10 Aaron Swenson
2016-03-23 5:44 Sam Jorna
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox