* [gentoo-commits] gentoo-x86 commit in sci-geosciences/mapnik: ChangeLog mapnik-0.7.1-r1.ebuild
@ 2011-02-07 6:54 Steve Arnold (nerdboy)
0 siblings, 0 replies; 5+ messages in thread
From: Steve Arnold (nerdboy) @ 2011-02-07 6:54 UTC (permalink / raw
To: gentoo-commits
nerdboy 11/02/07 06:54:12
Modified: ChangeLog mapnik-0.7.1-r1.ebuild
Log:
Updated with sed hacks to force scons to use specified C,CXX,LDFLAGS.
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Revision Changes Path
1.22 sci-geosciences/mapnik/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?r1=1.21&r2=1.22
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog 8 Nov 2010 17:30:15 -0000 1.21
+++ ChangeLog 7 Feb 2011 06:54:11 -0000 1.22
@@ -1,6 +1,10 @@
# 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.21 2010/11/08 17:30:15 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.22 2011/02/07 06:54:11 nerdboy Exp $
+
+ 07 Feb 2011; Steve Arnold <nerdboy@gentoo.org> mapnik-0.7.1-r1.ebuild:
+ Updated with sed hacks to force scons to use specified C,CXX,LDFLAGS.
+ (closes bug #343809) Please report any issues on a new bug.
08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
mapnik-0.6.1-r3.ebuild, mapnik-0.7.1-r1.ebuild:
1.3 sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?r1=1.2&r2=1.3
Index: mapnik-0.7.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mapnik-0.7.1-r1.ebuild 8 Nov 2010 17:30:15 -0000 1.2
+++ mapnik-0.7.1-r1.ebuild 7 Feb 2011 06:54:11 -0000 1.3
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2 2010/11/08 17:30:15 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v 1.3 2011/02/07 06:54:11 nerdboy Exp $
EAPI=2
PYTHON_DEPEND="python? 2"
-inherit eutils python distutils toolchain-funcs versionator
+inherit eutils flag-o-matic python distutils toolchain-funcs versionator
DESCRIPTION="A Free Toolkit for developing mapping applications."
HOMEPAGE="http://www.mapnik.org/"
@@ -37,41 +37,40 @@
>=dev-db/postgis-1.5.2
)
python? ( dev-libs/boost[python] )
- sqlite? ( dev-db/sqlite:3 )
-"
+ sqlite? ( dev-db/sqlite:3 )"
+
DEPEND="${RDEPEND}
- >=dev-util/scons-1.0.0
doc? ( dev-python/epydoc )
-"
+ dev-util/scons"
src_prepare() {
sed -i \
-e "s|/usr/local|/usr|g" \
-e "s|Action(env\[config\]|Action('%s --help' % env\[config\]|" \
- SConstruct || die
+ SConstruct || die "sed 1 failed"
sed -i \
-e "s:mapniklibpath + '/fonts':'/usr/share/fonts/dejavu/':g" \
- bindings/python/SConscript || die "sed 1 failed"
+ bindings/python/SConscript || die "sed 2 failed"
rm -rf agg || die
epatch "${FILESDIR}"/${P}-libagg.patch
}
src_configure() {
- MAKEOPTS="SYSTEM_FONTS=/usr/share/fonts/dejavu"
+ EMAKEOPTS="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"
+ EMAKEOPTS="${EMAKEOPTS} INPUT_PLUGINS="
+ use postgres && EMAKEOPTS="${EMAKEOPTS}postgis,"
+ use gdal && EMAKEOPTS="${EMAKEOPTS}gdal,ogr,"
+ use sqlite && EMAKEOPTS="${EMAKEOPTS}sqlite,"
+ use curl && EMAKEOPTS="${EMAKEOPTS}osm,"
+ EMAKEOPTS="${EMAKEOPTS}shape,raster"
+
+ use cairo || EMAKEOPTS="${EMAKEOPTS} CAIRO=false"
+ use python || EMAKEOPTS="${EMAKEOPTS} BINDINGS=none"
+ use debug && EMAKEOPTS="${EMAKEOPTS} DEBUG=yes"
- use postgres && use sqlite && MAKEOPTS="${MAKEOPTS} PGSQL2SQLITE=yes"
+ use postgres && use sqlite && EMAKEOPTS="${EMAKEOPTS} PGSQL2SQLITE=yes"
BOOST_PKG="$(best_version "dev-libs/boost")"
BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
@@ -86,19 +85,27 @@
# 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 \
+ # this seems to be the only way to force user-flags, since nothing
+ # gets through the scons configure except the nuclear sed option.
+ sed -i -e "s:\-O%s:${CXXFLAGS}:" \
+ -i -e "s:env\['OPTIMIZATION'\]\,::" \
+ SConstruct || die "sed 3 failed"
+ sed -i -e "s:LINKFLAGS=linkflags:LINKFLAGS=linkflags + \" ${LDFLAGS}\":" \
+ src/SConscript || die "sed 4 failed"
+
+ scons CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${EMAKEOPTS} configure \
|| die "scons configure failed"
}
src_compile() {
- scons BOOST_INCLUDES=${BOOST_INC} BOOST_LIBS=${BOOST_LIB} \
- BOOST_VERSION=${BOOST_VERSION} || die "scons make failed"
+ # note passing CXXFLAGS to scons does *not* work
+ scons CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+ shared=1 || die "scons make failed"
+
if use doc; then
export PYTHONPATH="${S}/bindings/python:$(python_get_sitedir)"
cd docs/epydoc_config
@@ -108,8 +115,7 @@
}
src_install() {
- scons BOOST_INCLUDES=${BOOST_INC} BOOST_LIBS=${BOOST_LIB} \
- BOOST_VERSION=${BOOST_VERSION} install || die "scons install failed"
+ scons DESTDIR="${D}" install || die "scons install failed"
if use python ; then
fperms 0755 "$(python_get_sitedir)"/mapnik/paths.py
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-geosciences/mapnik: ChangeLog mapnik-0.7.1-r1.ebuild
@ 2011-04-10 22:24 Arfrever Frehtes Taifersar Arahesis (arfrever)
0 siblings, 0 replies; 5+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis (arfrever) @ 2011-04-10 22:24 UTC (permalink / raw
To: gentoo-commits
arfrever 11/04/10 22:24:06
Modified: ChangeLog mapnik-0.7.1-r1.ebuild
Log:
Fix deprecation warning.
(Portage version: 2.2.0_alpha29_p10/cvs/Linux x86_64)
Revision Changes Path
1.24 sci-geosciences/mapnik/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?r1=1.23&r2=1.24
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog 2 Mar 2011 20:34:25 -0000 1.23
+++ ChangeLog 10 Apr 2011 22:24:06 -0000 1.24
@@ -1,6 +1,10 @@
# ChangeLog for sci-geosciences/mapnik
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.23 2011/03/02 20:34:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.24 2011/04/10 22:24:06 arfrever Exp $
+
+ 10 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ mapnik-0.7.1-r1.ebuild:
+ Fix deprecation warning.
02 Mar 2011; Justin Lecher <jlec@gentoo.org> mapnik-0.6.1-r3.ebuild,
mapnik-0.7.1-r1.ebuild:
1.5 sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?r1=1.4&r2=1.5
Index: mapnik-0.7.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mapnik-0.7.1-r1.ebuild 2 Mar 2011 20:34:25 -0000 1.4
+++ mapnik-0.7.1-r1.ebuild 10 Apr 2011 22:24:06 -0000 1.5
@@ -1,11 +1,11 @@
# Copyright 1999-2011 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.4 2011/03/02 20:34:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v 1.5 2011/04/10 22:24:06 arfrever Exp $
-EAPI=2
+EAPI=3
PYTHON_DEPEND="python? 2"
-inherit eutils flag-o-matic python distutils toolchain-funcs versionator
+inherit eutils flag-o-matic python toolchain-funcs versionator
DESCRIPTION="A Free Toolkit for developing mapping applications."
HOMEPAGE="http://www.mapnik.org/"
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-geosciences/mapnik: ChangeLog mapnik-0.7.1-r1.ebuild
@ 2011-04-11 7:05 Steve Arnold (nerdboy)
0 siblings, 0 replies; 5+ messages in thread
From: Steve Arnold (nerdboy) @ 2011-04-11 7:05 UTC (permalink / raw
To: gentoo-commits
nerdboy 11/04/11 07:05:31
Modified: ChangeLog mapnik-0.7.1-r1.ebuild
Log:
Updated for new boost 1.46 to force the older filesystem interface.
(Portage version: 2.1.9.45/cvs/Linux x86_64)
Revision Changes Path
1.25 sci-geosciences/mapnik/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?r1=1.24&r2=1.25
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog 10 Apr 2011 22:24:06 -0000 1.24
+++ ChangeLog 11 Apr 2011 07:05:31 -0000 1.25
@@ -1,6 +1,10 @@
# ChangeLog for sci-geosciences/mapnik
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.24 2011/04/10 22:24:06 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.25 2011/04/11 07:05:31 nerdboy Exp $
+
+ 11 Apr 2011; Steve Arnold <nerdboy@gentoo.org> mapnik-0.7.1-r1.ebuild:
+ Updated for new boost 1.46 to force the older filesystem interface until
+ upstream migrates (conditional on boost version).
10 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
mapnik-0.7.1-r1.ebuild:
1.6 sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?r1=1.5&r2=1.6
Index: mapnik-0.7.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mapnik-0.7.1-r1.ebuild 10 Apr 2011 22:24:06 -0000 1.5
+++ mapnik-0.7.1-r1.ebuild 11 Apr 2011 07:05:31 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.5 2011/04/10 22:24:06 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v 1.6 2011/04/11 07:05:31 nerdboy Exp $
EAPI=3
@@ -82,6 +82,11 @@
export BOOST_LIB="/usr/${BOOST_LIBDIR_SCHEMA}"
elog "${P} BOOST_LIB is ${BOOST_LIB}"
+ # force older boost filesystem version until upstream migrates
+ if version_is_at_least "1.46" "${BOOST_VER}"; then
+ append-flags -DBOOST_FILESYSTEM_VERSION=2
+ fi
+
# 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-geosciences/mapnik: ChangeLog mapnik-0.7.1-r1.ebuild
@ 2011-07-29 2:33 Steve Arnold (nerdboy)
0 siblings, 0 replies; 5+ messages in thread
From: Steve Arnold (nerdboy) @ 2011-07-29 2:33 UTC (permalink / raw
To: gentoo-commits
nerdboy 11/07/29 02:33:46
Modified: ChangeLog mapnik-0.7.1-r1.ebuild
Log:
Updated with API doc workaround (see bug #370575) and a missing dep.
(Portage version: 2.1.10.7/cvs/Linux x86_64)
Revision Changes Path
1.26 sci-geosciences/mapnik/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?r1=1.25&r2=1.26
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog 11 Apr 2011 07:05:31 -0000 1.25
+++ ChangeLog 29 Jul 2011 02:33:46 -0000 1.26
@@ -1,6 +1,11 @@
# ChangeLog for sci-geosciences/mapnik
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.25 2011/04/11 07:05:31 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.26 2011/07/29 02:33:46 nerdboy Exp $
+
+ 29 Jul 2011; Steve Arnold <nerdboy@gentoo.org> mapnik-0.7.1-r1.ebuild:
+ Updated with API doc workaround (see bug #370575) and a missing dep
+ (nothing to do with the former bug). The API doc build has a bogus
+ dep on mod_python that's only triggered on certain boxes. Ugh...
11 Apr 2011; Steve Arnold <nerdboy@gentoo.org> mapnik-0.7.1-r1.ebuild:
Updated for new boost 1.46 to force the older filesystem interface until
1.7 sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?r1=1.6&r2=1.7
Index: mapnik-0.7.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mapnik-0.7.1-r1.ebuild 11 Apr 2011 07:05:31 -0000 1.6
+++ mapnik-0.7.1-r1.ebuild 29 Jul 2011 02:33:46 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.6 2011/04/11 07:05:31 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v 1.7 2011/07/29 02:33:46 nerdboy Exp $
EAPI=3
@@ -14,7 +14,7 @@
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cairo curl debug doc +gdal postgres python sqlite"
+IUSE="-doc cairo curl debug +gdal postgres python sqlite"
RDEPEND="dev-libs/boost
dev-libs/icu
@@ -29,6 +29,7 @@
cairo? (
x11-libs/cairo
dev-cpp/cairomm
+ python? ( dev-python/pycairo )
)
curl? ( net-misc/curl )
gdal? ( sci-libs/gdal )
@@ -69,6 +70,7 @@
use cairo || EMAKEOPTS="${EMAKEOPTS} CAIRO=false"
use python || EMAKEOPTS="${EMAKEOPTS} BINDINGS=none"
use debug && EMAKEOPTS="${EMAKEOPTS} DEBUG=yes"
+ EMAKEOPTS="${EMAKEOPTS} DESTDIR=${D}"
use postgres && use sqlite && EMAKEOPTS="${EMAKEOPTS} PGSQL2SQLITE=yes"
@@ -111,10 +113,12 @@
scons CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
shared=1 || die "scons make failed"
+ # this is known to depend on mod_python and should not have a
+ # "die" after the epydoc script (see bug #370575)
if use doc; then
export PYTHONPATH="${S}/bindings/python:$(python_get_sitedir)"
cd docs/epydoc_config
- ./build_epydoc.sh || die "API doc generation failed"
+ ./build_epydoc.sh
cd -
fi
}
@@ -123,10 +127,10 @@
scons DESTDIR="${D}" 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/*
+ 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
@@ -135,7 +139,7 @@
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 "See the home page or wiki (http://trac.mapnik.org/) for more info"
+ elog "or the installed examples for the default mapnik ogcserver config."
elog ""
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-geosciences/mapnik: ChangeLog mapnik-0.7.1-r1.ebuild
@ 2011-09-26 7:45 Steve Arnold (nerdboy)
0 siblings, 0 replies; 5+ messages in thread
From: Steve Arnold (nerdboy) @ 2011-09-26 7:45 UTC (permalink / raw
To: gentoo-commits
nerdboy 11/09/26 07:45:56
Modified: ChangeLog mapnik-0.7.1-r1.ebuild
Log:
Update for libpng 1.5 changes (closes bug #384263).
(Portage version: 2.1.10.19/cvs/Linux x86_64)
Revision Changes Path
1.27 sci-geosciences/mapnik/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/ChangeLog?r1=1.26&r2=1.27
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog 29 Jul 2011 02:33:46 -0000 1.26
+++ ChangeLog 26 Sep 2011 07:45:56 -0000 1.27
@@ -1,6 +1,10 @@
# ChangeLog for sci-geosciences/mapnik
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.26 2011/07/29 02:33:46 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.27 2011/09/26 07:45:56 nerdboy Exp $
+
+ 26 Sep 2011; Steve Arnold <nerdboy@gentoo.org> mapnik-0.7.1-r1.ebuild,
+ +files/mapnik-0.7.1-libpng1.5.4.patch:
+ Update for libpng 1.5 changes (closes bug #384263).
29 Jul 2011; Steve Arnold <nerdboy@gentoo.org> mapnik-0.7.1-r1.ebuild:
Updated with API doc workaround (see bug #370575) and a missing dep
1.8 sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild?r1=1.7&r2=1.8
Index: mapnik-0.7.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mapnik-0.7.1-r1.ebuild 29 Jul 2011 02:33:46 -0000 1.7
+++ mapnik-0.7.1-r1.ebuild 26 Sep 2011 07:45:56 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.7 2011/07/29 02:33:46 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.7.1-r1.ebuild,v 1.8 2011/09/26 07:45:56 nerdboy Exp $
EAPI=3
@@ -55,6 +55,9 @@
bindings/python/SConscript || die "sed 2 failed"
rm -rf agg || die
epatch "${FILESDIR}"/${P}-libagg.patch
+
+ # update for libpng 1.5 changes (see bug #)
+ epatch "${FILESDIR}"/${P}-libpng1.5.4.patch
}
src_configure() {
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-09-26 7:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-07 6:54 [gentoo-commits] gentoo-x86 commit in sci-geosciences/mapnik: ChangeLog mapnik-0.7.1-r1.ebuild Steve Arnold (nerdboy)
-- strict thread matches above, loose matches on Subject: below --
2011-04-10 22:24 Arfrever Frehtes Taifersar Arahesis (arfrever)
2011-04-11 7:05 Steve Arnold (nerdboy)
2011-07-29 2:33 Steve Arnold (nerdboy)
2011-09-26 7:45 Steve Arnold (nerdboy)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox