From 0161c519863376f225e3c095aaf98b5b728908c2 Mon Sep 17 00:00:00 2001 From: "Aaron W. Swenson" Date: Sat, 2 Mar 2013 16:09:54 +0000 Subject: Fix bug 455118 by modifying PHP dependency. Fix bug 450998 by correcting dohtml command. Fix bug 423097 by virtue of being bumped. (Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0) --- sci-libs/geos/ChangeLog | 9 +++- sci-libs/geos/geos-3.3.8-r1.ebuild | 99 ++++++++++++++++++++++++++++++++++++++ sci-libs/geos/geos-3.3.8.ebuild | 91 ----------------------------------- 3 files changed, 107 insertions(+), 92 deletions(-) create mode 100644 sci-libs/geos/geos-3.3.8-r1.ebuild delete mode 100644 sci-libs/geos/geos-3.3.8.ebuild (limited to 'sci-libs/geos') diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog index 1c891f00dbad..4226fe0e8030 100644 --- a/sci-libs/geos/ChangeLog +++ b/sci-libs/geos/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/geos # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.71 2013/03/02 04:04:09 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.72 2013/03/02 16:09:54 titanofold Exp $ + +*geos-3.3.8-r1 (02 Mar 2013) + + 02 Mar 2013; Aaron W. Swenson -geos-3.3.8.ebuild, + +geos-3.3.8-r1.ebuild: + Fix bug 455118 by modifying PHP dependency. Fix bug 450998 by correcting + dohtml command. Fix bug 423097 by virtue of being bumped. *geos-3.3.8 (02 Mar 2013) diff --git a/sci-libs/geos/geos-3.3.8-r1.ebuild b/sci-libs/geos/geos-3.3.8-r1.ebuild new file mode 100644 index 000000000000..ea49cb4d3f28 --- /dev/null +++ b/sci-libs/geos/geos-3.3.8-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.3.8-r1.ebuild,v 1.1 2013/03/02 16:09:54 titanofold Exp $ + +EAPI=4 + +PYTHON_DEPEND="python? 2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" +inherit autotools eutils python + +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 ~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=" + php? ( >=dev-lang/php-5.3[-threads] ) + ruby? ( dev-lang/ruby ) +" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + php? ( dev-lang/swig ) + python? ( dev-lang/swig ) + ruby? ( dev-lang/swig ) +" + +pkg_setup() { + use python && python_pkg_setup +} + +src_prepare() { + epatch \ + "${FILESDIR}"/3.2.0-python.patch \ + "${FILESDIR}"/3.2.0-darwin.patch \ + "${FILESDIR}"/3.3.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 + + if use python; then + emake -C swig/python clean + python_copy_sources swig/python + building() { + emake \ + PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \ + PYTHON_LDFLAGS="$(python_get_library -l)" \ + SWIG_PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \ + pyexecdir="${EPREFIX}$(python_get_sitedir)" \ + pythondir="${EPREFIX}$(python_get_sitedir)" + } + python_execute_function -s --source-dir swig/python building + fi + + use doc && emake -C "${S}/doc" doxygen-html +} + +src_install() { + default + + if use python; then + installation() { + emake \ + DESTDIR="${D}" \ + pyexecdir="${EPREFIX}$(python_get_sitedir)" \ + pythondir="${EPREFIX}$(python_get_sitedir)" \ + install + } + python_execute_function -s --source-dir swig/python installation + python_clean_installation_image + fi + + use doc && dohtml -r doc/doxygen_docs/html/* + + find "${ED}" -name '*.la' -exec rm -f {} + +} + +pkg_postinst() { + use python && python_mod_optimize geos/geos.py +} + +pkg_postrm() { + use python && python_mod_cleanup geos/geos.py +} diff --git a/sci-libs/geos/geos-3.3.8.ebuild b/sci-libs/geos/geos-3.3.8.ebuild deleted file mode 100644 index ff147d3b0b4c..000000000000 --- a/sci-libs/geos/geos-3.3.8.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.3.8.ebuild,v 1.1 2013/03/02 04:04:09 titanofold Exp $ - -EAPI=4 - -PYTHON_DEPEND="python? 2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" -inherit autotools eutils python - -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 ~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="php? ( dev-lang/php:5.3[-threads] ) - ruby? ( dev-lang/ruby )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - php? ( dev-lang/swig ) - python? ( dev-lang/swig ) - ruby? ( dev-lang/swig )" - -pkg_setup() { - use python && python_pkg_setup -} - -src_prepare() { - epatch \ - "${FILESDIR}"/3.2.0-python.patch \ - "${FILESDIR}"/3.2.0-darwin.patch \ - "${FILESDIR}"/3.3.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 - if use python; then - emake -C swig/python clean - python_copy_sources swig/python - building() { - emake \ - PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \ - PYTHON_LDFLAGS="$(python_get_library -l)" \ - SWIG_PYTHON_CPPFLAGS="-I${EPREFIX}$(python_get_includedir)" \ - pyexecdir="${EPREFIX}$(python_get_sitedir)" \ - pythondir="${EPREFIX}$(python_get_sitedir)" - } - python_execute_function -s --source-dir swig/python building - fi - use doc && emake -C "${S}/doc" doxygen-html -} - -src_install() { - default - if use python; then - installation() { - emake \ - DESTDIR="${D}" \ - pyexecdir="${EPREFIX}$(python_get_sitedir)" \ - pythondir="${EPREFIX}$(python_get_sitedir)" \ - install - } - python_execute_function -s --source-dir swig/python installation - python_clean_installation_image - fi - use doc && dohtml -r "${S}/doc" doxygen_docs/html/* - find "${ED}" -name '*.la' -exec rm -f {} + -} - -pkg_postinst() { - use python && python_mod_optimize geos/geos.py -} - -pkg_postrm() { - use python && python_mod_cleanup geos/geos.py -} -- cgit v1.2.3-65-gdbad