Do not hardcode 64bit multilib path, which is not present on 32bit, #390747

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

4 files changed, 25 insertions, 31 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/Manifest b/sci-geosciences/mapserver/Manifest
index 7cbbf5ac7e36..b609a119c752 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 5.4.2-ldflags.patch 3851 RMD160 db486a2c5611b3bc9102ded21c3aa03f47f0dfe6 SHA1 7cef034f6d3a176934bbb9df957057309fe409be SHA256 518ebe8e12b590001571110d521939a44a1fc74d82cdc04d76f81943c99a5463
 AUX 6.0.0_rc1-bool.patch 862 RMD160 0678d6fa9ccf74143601122b4d2b75fbed702322 SHA1 5f06f5ce26ca4d022be7840dff82cf36a0d1be9f SHA256 59ce6a605768fd849c33fbb7093802f2906315f9abe520b78a985891d39508a6
@@ -7,23 +7,13 @@ AUX 6.0.0_rc1-ldflags.patch 3954 RMD160 33dc08159230f49070891ad6626548746324370a
 AUX 6.0.0_rc1-php_ldflags.patch 551 RMD160 88de8414b4d6ea8fbeb7c11c6ad4f3c673487175 SHA1 9914dca230858fea212983521b85aa5a719fa4b7 SHA256 50023a92811b2856bdb04d8e2d241c4e424c4b00557c1d70615a3940f664fd59
 AUX mapserver_tcl.patch-r1 1985 RMD160 bb4d766526f7c29535915bb87c0c5199251a2c3a SHA1 2415b6b792be100f2e5a6a936ef77260352f718b SHA256 725c7e5dd9dc6ae6372d9c4a334ce13fc8ea2ab6afbf569a6db786f2caa7a31f
 DIST mapserver-6.0.1.tar.gz 2430064 RMD160 5841db2b6088b5a1dbe6c0fdde84586c0295928e SHA1 f404738450763f2fa0b5b07f2f5302416b7de04b SHA256 dd6821917aa7030381442f5e092e4f46f44b9deb9425ec92729e5819e9b61d65
-EBUILD mapserver-6.0.1.ebuild 5876 RMD160 5514bcd950bca876a460eaa04dcb7dacb01d1773 SHA1 6b4a64166f42acb656199ded32063b39803507ae SHA256 e1a1b38690cd8c46f7e99137a4374f12ca5321474693ce32ec315e51bb4c7fb6
-MISC ChangeLog 8309 RMD160 4e58498dc87766657e3b2fcbdc2cfd4e2460fbdc SHA1 fb601c5357017cc935d0540771d74849ec9c575d SHA256 faeb7608f346f9afa1b14a25dfc30aee93eb84607f5d348c65190928349ee4f7
-MISC metadata.xml 579 RMD160 61c3450d04b59c57d88958a64edb6101f2c98e20 SHA1 485fecb1dc2ea72a37a6243b9e85f46765831d54 SHA256 6b77e21eb87ab3d5a62fc59d39fecf5cdbadbeced9a245bc149e4b978d19c11f
+EBUILD mapserver-6.0.1.ebuild 5888 RMD160 74def98a0521a961cf9c3fcad2a5096574690451 SHA1 b41f3589be5eb75b944f3718e1eaea5a1d23c7c2 SHA256 b05ae3e7b4816cea6b85625cb6e43d6257944aba06e84350206e829fc0c88cc9
+MISC ChangeLog 8470 RMD160 099c78360fd4ffbc17858037c50f513b18b02040 SHA1 10cdf31f470f2aae57fe365245dec6f0ec182bce SHA256 ff5055fd7d8922b2111aaeb8c450c984c218b44b676526b0317f8b3a497a72f9
+MISC metadata.xml 582 RMD160 f4dae43e5ac4e5a9866f0465d08b8b77600c1b9a SHA1 25ae4898ccfe2b19f7494d97142c5ab43147d13d SHA256 14f7d9d6360046985e8dcb1e486faaa0d7616ba3e3f7daea8b291219b53305b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOYfD1AAoJEOSiRoyO7jvolKkP/RPbP09jC63c4+2wTtnVr1QI
-gNDc43BObsV7VwPIQNTvLQvITdCnYrsvKbkzmbuUOdyvFnERzQAIB7+KXO61t7E7
-xHLi+AlZTl/y8mQ/PWqkxh47/nXBTBWLRm44ku5Jz8wXzEL2Oq7JH77T7XACGfRf
-7zse8IPK+g4Lvbxbq7q7o45UMJ//MFp0bSLv2bPUJZkep1YJWHVON/P/hxB4xM+G
-mODC0y8SCHjU6w6pNdOrdojsxN14b/mlq9FU/eiw3VdfYdJ/vHtlc4bXoqct47U3
-ARAmnffrkl+pzmuv5mGZOwawzgGhsF3KJgJycntRnvlmiCM4tqg0YCTiE2KCiDHt
-ICBwEGRd9BFdhRTv7jLi4Qf4jl7PjlgLZHQnxWIKZXKB9aseEgRXJ8IE7/PfnBcc
-wMEsPib/QKOUqJSfy08kbvbjQcn8n3eCgXqEVwBjSSuYFQvH2GgsF9+x1L3CK+rb
-Ma91nfJ0XMV3DqUjWuowf/0fM3CXbcnZSf8P7k9FiqlOlnBHEIhzJC1ScoExXqh/
-6XtaqhymHWxKTaOkPlc69WtbE2QDIGVpDr8P3/aJy2QwrAUCdoraXdS0lMBMhhJ1
-1vpQhbqTKhK4omtNTE198mTfot1plsIOQ4Sw6/SlEpYk4BKNMOLRYeA6ylxsuQiG
-PvNGEzpuoaruN33HDSp0
-=DQnk
+iEYEAREKAAYFAk7E8QsACgkQgAnW8HDreRYzoQCfXgtCTgK3ubkw4nr5bGwnJO6Q
++DAAoL3Fc/1zHuNI8APX35zqUUz3jsuH
+=7C9/
 -----END PGP SIGNATURE-----
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>