From fd4c0b4e2e1852d2a246771bad28a50ff9004748 Mon Sep 17 00:00:00 2001 From: Steve Arnold Date: Sat, 30 Oct 2010 01:20:40 +0000 Subject: Updated for latest gpsdrive updates (mostly bug 341693). Package-Manager: portage-2.2_rc99/cvs/Linux x86_64 --- sci-geosciences/mapnik/ChangeLog | 9 +- sci-geosciences/mapnik/Manifest | 4 +- sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild | 130 ++++++++++++++++++++++++++ sci-geosciences/mapnik/mapnik-0.7.1.ebuild | 130 -------------------------- 4 files changed, 140 insertions(+), 133 deletions(-) create mode 100644 sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild delete mode 100644 sci-geosciences/mapnik/mapnik-0.7.1.ebuild (limited to 'sci-geosciences/mapnik') diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog index dbe4e1b7c1de..fbd129cdfe3f 100644 --- a/sci-geosciences/mapnik/ChangeLog +++ b/sci-geosciences/mapnik/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-geosciences/mapnik # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.19 2010/10/29 23:01:54 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.20 2010/10/30 01:20:39 nerdboy Exp $ + +*mapnik-0.7.1-r1 (30 Oct 2010) + + 30 Oct 2010; Steve Arnold -mapnik-0.7.1.ebuild, + +mapnik-0.7.1-r1.ebuild: + Updated for latest gpsdrive (currently open mapnik bugs are OBE or not + repreducible). 29 Oct 2010; Arfrever Frehtes Taifersar Arahesis -mapnik-0.5.1.ebuild, -files/mapnik-0.5.1-include-fix.patch, diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest index 811cfc79bf06..22fa2e6584b8 100644 --- a/sci-geosciences/mapnik/Manifest +++ b/sci-geosciences/mapnik/Manifest @@ -3,6 +3,6 @@ AUX mapnik-0.7.1-libagg.patch 1961 RMD160 b2d7199280bdf032cd0a220e686d518a41239f DIST mapnik-0.6.1.tar.bz2 7466271 RMD160 fb9abdc2c1bded5b8789cae43b94ed52ea7b1373 SHA1 6451ad79574dd7620da370343ca45cac2ef125e1 SHA256 59b1c19817ed65ba8f0d3a2ac8f06ecf5c12f452d10170fa04f6824ea257437f DIST mapnik-0.7.1.tar.bz2 10021260 RMD160 9e4180e901dfaf255091843869e9441d7a08209f SHA1 a1961f6dfe5d591d5a892bef05d58e66537440c4 SHA256 0d04e8cbc2a060ce09ba13ccdcd7bf8bd02bed77a84a3dd1191e4d75fba95b8d EBUILD mapnik-0.6.1-r3.ebuild 3993 RMD160 cbf9a93e1556bf77cee4a33cbda2868e9ad87019 SHA1 2f3b1c2c0524150c6f5a4bcb863a6f474ffa419f SHA256 29a87ca7aea8f8c89b44aea6650571b2e52efcfdc57664995d021c1c1caaeb8d -EBUILD mapnik-0.7.1.ebuild 4039 RMD160 c33779650a187a57090d0b804d77451bab5c4004 SHA1 04fa9c114a86424bccfe0efeba9ccbadaa5005f2 SHA256 e2563285b3d0d09560a0283fcd3cc2ee90f04057fd4f64d606021713c84aa3f7 -MISC ChangeLog 4660 RMD160 fc604999b43280772217d3d44e2e56523d998c2d SHA1 5f549a64a49586480e9ecc7d4c03d54f2f7bfce9 SHA256 a328ac7c62de26c1e28fee0a6e9789e49d0403cfde84b9c29dd5ed9ed845f581 +EBUILD mapnik-0.7.1-r1.ebuild 4042 RMD160 38e2db81a2f66e18fdf9312d52a0d73fe327fbff SHA1 fde73bee624f58786dc673aae9b722dbeea14165 SHA256 a1f24ad4ad8697ee7baac8af2b0213c2bafc5e4ca83cc035164ad6dfd73be81e +MISC ChangeLog 4881 RMD160 ee24b0f1952481db092e12897c99eae73833026b SHA1 b3f749084402f68562698045fc9cf13922d10866 SHA256 86d9a21e3f7d5eb2bf6ee53bdbd043c74a47a13e32bd94b94a898d71b010344e MISC metadata.xml 540 RMD160 281eea708af7cea3c87c0ac1de1ccc3403b94a13 SHA1 8c0d5b1293cb5ede8254b883f474fe81e76522dc SHA256 18351b15256bb44b61ad8772d011928c37676497b7152468b3d32cec8fd7e6db diff --git a/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild b/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild new file mode 100644 index 000000000000..865e22787b43 --- /dev/null +++ b/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v 1.1 2010/10/30 01:20:40 nerdboy Exp $ + +EAPI=2 + +PYTHON_DEPEND="python? 2" +inherit eutils python distutils toolchain-funcs versionator + +DESCRIPTION="A Free Toolkit for developing mapping applications." +HOMEPAGE="http://www.mapnik.org/" +SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="cairo curl debug doc +gdal postgres python sqlite" + +RDEPEND="dev-libs/boost + dev-libs/icu + dev-libs/libxml2 + media-fonts/dejavu + media-libs/freetype:2 + media-libs/jpeg + media-libs/libpng + media-libs/tiff + sci-libs/proj + x11-libs/agg[truetype] + cairo? ( + x11-libs/cairo + dev-cpp/cairomm + ) + curl? ( net-misc/curl ) + gdal? ( sci-libs/gdal ) + postgres? ( + >=dev-db/postgresql-base-8.3 + >=dev-db/postgis-1.5.2 + ) + python? ( dev-libs/boost[python] ) + sqlite? ( dev-db/sqlite:3 ) +" +DEPEND="${RDEPEND} + >=dev-util/scons-1.0.0 + doc? ( dev-python/epydoc ) +" + +src_prepare() { + sed -i \ + -e "s|/usr/local|/usr|g" \ + -e "s|Action(env\[config\]|Action('%s --help' % env\[config\]|" \ + SConstruct || die + + sed -i \ + -e "s:mapniklibpath + '/fonts':'/usr/share/fonts/dejavu/':g" \ + bindings/python/SConscript || die "sed 1 failed" + rm -rf agg || die + epatch "${FILESDIR}"/${P}-libagg.patch +} + +src_configure() { + MAKEOPTS="SYSTEM_FONTS=/usr/share/fonts/dejavu" + + MAKEOPTS="${MAKEOPTS} INPUT_PLUGINS=" + use postgres && MAKEOPTS="${MAKEOPTS}postgis," + use gdal && MAKEOPTS="${MAKEOPTS}gdal,ogr," + use sqlite && MAKEOPTS="${MAKEOPTS}sqlite," + use curl && MAKEOPTS="${MAKEOPTS}osm," + MAKEOPTS="${MAKEOPTS}shape,raster" + + use cairo || MAKEOPTS="${MAKEOPTS} CAIRO=false" + use python || MAKEOPTS="${MAKEOPTS} BINDINGS=none" + use debug && MAKEOPTS="${MAKEOPTS} DEBUG=yes" + + use postgres && use sqlite && MAKEOPTS="${MAKEOPTS} PGSQL2SQLITE=yes" + + BOOST_PKG="$(best_version "dev-libs/boost")" + BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")" + export BOOST_VERSION="$(replace_all_version_separators _ "${BOOST_VER}")" + elog "${P} BOOST_VERSION is ${BOOST_VERSION}" + export BOOST_INC="/usr/include/boost-${BOOST_VERSION}" + elog "${P} BOOST_INC is ${BOOST_INC}" + BOOST_LIBDIR_SCHEMA="$(get_libdir)/boost-${BOOST_VERSION}" + export BOOST_LIB="/usr/${BOOST_LIBDIR_SCHEMA}" + elog "${P} BOOST_LIB is ${BOOST_LIB}" + + # Passing things doesn't seem to hit all the right paths; another + # poster-child for just a bit too much complexity for its own good. + # See bug #301674 for more info. +# sed -i -e "s|BOOST_INCLUDE_DIR = None|BOOST_INCLUDE_DIR = \'${BOOST_INC}\'|" \ +# -i -e "s|BOOST_LIB_DIR = None|BOOST_LIB_DIR = \'${BOOST_LIB}\'|" \ + sed -i -e "s|searchDir, LIBDIR_SCHEMA|searchDir, \'${BOOST_LIBDIR_SCHEMA}\'|" \ + -i -e "s|include/boost*|include/boost-${BOOST_VERSION}|" \ + "${S}"/SConstruct || die "sed boost paths failed..." + + scons CXX="$(tc-getCXX)" ${MAKEOPTS} DESTDIR="${D}" configure \ + || die "scons configure failed" +} + +src_compile() { + scons BOOST_INCLUDES=${BOOST_INC} BOOST_LIBS=${BOOST_LIB} \ + BOOST_VERSION=${BOOST_VERSION} || die "scons make failed" + if use doc; then + export PYTHONPATH="${S}/bindings/python:$(python_get_sitedir)" + cd docs/epydoc_config + ./build_epydoc.sh || die "API doc generation failed" + cd - + fi +} + +src_install() { + scons BOOST_INCLUDES=${BOOST_INC} BOOST_LIBS=${BOOST_LIB} \ + BOOST_VERSION=${BOOST_VERSION} install || die "scons install failed" + + if use python ; then + fperms 0755 "$(python_get_sitedir)"/mapnik/paths.py + dobin utils/stats/mapdef_stats.py + insinto /usr/share/doc/${PF}/examples + doins utils/ogcserver/* + fi + + dodoc AUTHORS CHANGELOG README || die + use doc && { dohtml -r docs/api_docs/python/* || die "API doc install failed"; } +} + +pkg_postinst() { + elog "" + elog "See the home page or the OpenStreetMap wiki for more info, and" + elog "the installed examples for the default mapnik ogcserver config." + elog "" +} diff --git a/sci-geosciences/mapnik/mapnik-0.7.1.ebuild b/sci-geosciences/mapnik/mapnik-0.7.1.ebuild deleted file mode 100644 index 9d8922266288..000000000000 --- a/sci-geosciences/mapnik/mapnik-0.7.1.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1.ebuild,v 1.1 2010/10/18 02:54:59 nerdboy Exp $ - -EAPI=2 - -PYTHON_DEPEND="python? 2" -inherit eutils python distutils toolchain-funcs versionator - -DESCRIPTION="A Free Toolkit for developing mapping applications." -HOMEPAGE="http://www.mapnik.org/" -SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="cairo curl debug doc +gdal postgres python sqlite" - -RDEPEND="dev-libs/boost - dev-libs/icu - dev-libs/libxml2 - media-fonts/dejavu - media-libs/freetype:2 - media-libs/jpeg - media-libs/libpng - media-libs/tiff - sci-libs/proj - x11-libs/agg[truetype] - cairo? ( - x11-libs/cairo - dev-cpp/cairomm - ) - curl? ( net-misc/curl ) - gdal? ( sci-libs/gdal ) - postgres? ( - >=dev-db/postgresql-base-8.0 - >=dev-db/postgis-1.1.2 - ) - python? ( dev-libs/boost[python] ) - sqlite? ( dev-db/sqlite:3 ) -" -DEPEND="${RDEPEND} - >=dev-util/scons-1.0.0 - doc? ( dev-python/epydoc ) -" - -src_prepare() { - sed -i \ - -e "s|/usr/local|/usr|g" \ - -e "s|Action(env\[config\]|Action('%s --help' % env\[config\]|" \ - SConstruct || die - - sed -i \ - -e "s:mapniklibpath + '/fonts':'/usr/share/fonts/dejavu/':g" \ - bindings/python/SConscript || die "sed 1 failed" - rm -rf agg || die - epatch "${FILESDIR}"/${P}-libagg.patch -} - -src_configure() { - MAKEOPTS="SYSTEM_FONTS=/usr/share/fonts/dejavu" - - MAKEOPTS="${MAKEOPTS} INPUT_PLUGINS=" - use postgres && MAKEOPTS="${MAKEOPTS}postgis," - use gdal && MAKEOPTS="${MAKEOPTS}gdal,ogr," - use sqlite && MAKEOPTS="${MAKEOPTS}sqlite," - use curl && MAKEOPTS="${MAKEOPTS}osm," - MAKEOPTS="${MAKEOPTS}shape,raster" - - use cairo || MAKEOPTS="${MAKEOPTS} CAIRO=false" - use python || MAKEOPTS="${MAKEOPTS} BINDINGS=none" - use debug && MAKEOPTS="${MAKEOPTS} DEBUG=yes" - - use postgres && use sqlite && MAKEOPTS="${MAKEOPTS} PGSQL2SQLITE=yes" - - BOOST_PKG="$(best_version "dev-libs/boost")" - BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")" - export BOOST_VERSION="$(replace_all_version_separators _ "${BOOST_VER}")" - elog "${P} BOOST_VERSION is ${BOOST_VERSION}" - export BOOST_INC="/usr/include/boost-${BOOST_VERSION}" - elog "${P} BOOST_INC is ${BOOST_INC}" - BOOST_LIBDIR_SCHEMA="$(get_libdir)/boost-${BOOST_VERSION}" - export BOOST_LIB="/usr/${BOOST_LIBDIR_SCHEMA}" - elog "${P} BOOST_LIB is ${BOOST_LIB}" - - # Passing things doesn't seem to hit all the right paths; another - # poster-child for just a bit too much complexity for its own good. - # See bug #301674 for more info. -# sed -i -e "s|BOOST_INCLUDE_DIR = None|BOOST_INCLUDE_DIR = \'${BOOST_INC}\'|" \ -# -i -e "s|BOOST_LIB_DIR = None|BOOST_LIB_DIR = \'${BOOST_LIB}\'|" \ - sed -i -e "s|searchDir, LIBDIR_SCHEMA|searchDir, \'${BOOST_LIBDIR_SCHEMA}\'|" \ - -i -e "s|include/boost*|include/boost-${BOOST_VERSION}|" \ - "${S}"/SConstruct || die "sed boost paths failed..." - - scons CXX="$(tc-getCXX)" ${MAKEOPTS} DESTDIR="${D}" configure \ - || die "scons configure failed" -} - -src_compile() { - scons BOOST_INCLUDES=${BOOST_INC} BOOST_LIBS=${BOOST_LIB} \ - BOOST_VERSION=${BOOST_VERSION} || die "scons make failed" - if use doc; then - export PYTHONPATH="${S}/bindings/python:$(python_get_sitedir)" - cd docs/epydoc_config - ./build_epydoc.sh || die "API doc generation failed" - cd - - fi -} - -src_install() { - scons BOOST_INCLUDES=${BOOST_INC} BOOST_LIBS=${BOOST_LIB} \ - BOOST_VERSION=${BOOST_VERSION} install || die "scons install failed" - - if use python ; then - fperms 0755 "$(python_get_sitedir)"/mapnik/paths.py - dobin utils/stats/mapdef_stats.py - insinto /usr/share/doc/${PF}/examples - doins utils/ogcserver/* - fi - - dodoc AUTHORS CHANGELOG README || die - use doc && { dohtml -r docs/api_docs/python/* || die "API doc install failed"; } -} - -pkg_postinst() { - elog "" - elog "See the home page or the OpenStreetMap wiki for more info, and" - elog "the installed examples for the default mapnik ogcserver config." - elog "" -} -- cgit v1.2.3-65-gdbad