[gentoo-commits] gentoo-x86 commit in sci-geosciences/mapserver: metadata.xml ChangeLog mapserver-6.0.1.ebuild

[Justin Lecher (jlec)]

jlec        11/11/17 11:33:21

  Modified:             metadata.xml ChangeLog mapserver-6.0.1.ebuild
  Log:
  Do not hardcode 64bit multilib path, which is not present on 32bit, #390747
  
  (Portage version: 2.2.0_alpha75/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  sci-geosciences/mapserver/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	3 Sep 2011 09:18:34 -0000	1.5
+++ metadata.xml	17 Nov 2011 11:33:21 -0000	1.6
@@ -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>



1.45                 sci-geosciences/mapserver/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/ChangeLog?r1=1.44&r2=1.45

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ChangeLog	3 Sep 2011 09:18:34 -0000	1.44
+++ ChangeLog	17 Nov 2011 11:33:21 -0000	1.45
@@ -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@g.o> 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@g.o> metadata.xml:
   Drop unused local descs.



1.2                  sci-geosciences/mapserver/mapserver-6.0.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.1.ebuild?r1=1.1&r2=1.2

Index: mapserver-6.0.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mapserver-6.0.1.ebuild	22 Jul 2011 22:52:45 -0000	1.1
+++ mapserver-6.0.1.ebuild	17 Nov 2011 11:33:21 -0000	1.2
@@ -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 @@
 
 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 @@
 	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