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 C8A1059CA5 for ; Wed, 23 Mar 2016 05:44:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7865BE0833; 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 DB054E0833 for ; Wed, 23 Mar 2016 05:44:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 2E810340A3B 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 7E5FC852 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: <1458711819.01118e42ad7f531ffa1d85770fc9eb727b9918ea.wraeth@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/geos/, sci-libs/geos/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/geos/files/geos-3.5.0-phpconfig-path.patch sci-libs/geos/geos-3.5.0-r1.ebuild X-VCS-Directories: sci-libs/geos/files/ sci-libs/geos/ X-VCS-Committer: wraeth X-VCS-Committer-Name: Sam Jorna X-VCS-Revision: 01118e42ad7f531ffa1d85770fc9eb727b9918ea 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: 124c9cd5-8b4b-4ea4-bf8e-64df88e7c7c4 X-Archives-Hash: e6e84862e4f361338128e042b930cd85 commit: 01118e42ad7f531ffa1d85770fc9eb727b9918ea Author: Sam Jorna gentoo org> AuthorDate: Wed Mar 23 05:40:44 2016 +0000 Commit: Sam Jorna gentoo 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 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 +}