summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-geosciences/mapserver/ChangeLog6
-rw-r--r--sci-geosciences/mapserver/mapserver-6.0.1.ebuild10
-rw-r--r--sci-geosciences/mapserver/metadata.xml16
3 files changed, 18 insertions, 14 deletions
diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index 5ed81244695c..ceaf27dc8340 100644
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-geosciences/mapserver
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.44 2011/09/03 09:18:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.45 2011/11/17 11:33:21 jlec Exp $
+
+ 17 Nov 2011; Justin Lecher <jlec@gentoo.org> mapserver-6.0.1.ebuild,
+ metadata.xml:
+ Do not hardcode 64bit multilib path, which is not present on 32bit, #390747
03 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
Drop unused local descs.
diff --git a/sci-geosciences/mapserver/mapserver-6.0.1.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1.ebuild
index 4c0eec071786..680aa92dca17 100644
--- a/sci-geosciences/mapserver/mapserver-6.0.1.ebuild
+++ b/sci-geosciences/mapserver/mapserver-6.0.1.ebuild
@@ -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/mapserver/mapserver-6.0.1.ebuild,v 1.1 2011/07/22 22:52:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.1.ebuild,v 1.2 2011/11/17 11:33:21 jlec Exp $
EAPI=3
@@ -22,10 +22,10 @@ PYTHON_MODNAME="mapscript.py"
WEBAPP_MANUAL_SLOT=yes
-inherit eutils autotools depend.apache webapp distutils perl-module php-ext-source-r2 # ruby-ng
+inherit eutils autotools depend.apache webapp distutils perl-module php-ext-source-r2 multilib # ruby-ng
-DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications."
-HOMEPAGE="http://mapserver.org"
+DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications"
+HOMEPAGE="http://mapserver.org/"
SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
LICENSE="MIT"
@@ -135,7 +135,7 @@ src_configure() {
fi
# some scripts require configure time options so place it here
- use php && myopts+=" --with-php=${EPREFIX}/usr/lib64/php5.3/include/php/"
+ use php && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.3/include/php/"
# sde is ESRI package that you have to buy first
# oraclespatial needs oracle server for testing/usage
diff --git a/sci-geosciences/mapserver/metadata.xml b/sci-geosciences/mapserver/metadata.xml
index 8fc68c6cf090..5ec7d05f679b 100644
--- a/sci-geosciences/mapserver/metadata.xml
+++ b/sci-geosciences/mapserver/metadata.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci-geosciences</herd>
-<use>
- <flag name='gdal'>Enable <pkg>sci-libs/gdal</pkg> library support</flag>
- <flag name='geos'>Enable <pkg>sci-libs/geos</pkg> library support</flag>
- <flag name='postgis'>Enable <pkg>dev-db/postgis</pkg> support</flag>
- <flag name='proj'>Enable <pkg>sci-libs/proj</pkg> library support
+ <herd>sci-geosciences</herd>
+ <use>
+ <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
+ <flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
+ <flag name="postgis">Enable <pkg>dev-db/postgis</pkg> support</flag>
+ <flag name="proj">Enable <pkg>sci-libs/proj</pkg> library support
(geographic projections)</flag>
- <flag name='xslt'>Enable xslt and exslt support xml-mapfile support</flag>
-</use>
+ <flag name="xslt">Enable xslt and exslt support xml-mapfile support</flag>
+ </use>
</pkgmetadata>