Adding the patch for mapserver-4.10.3 version to support compilation for both php4 and 5, resolving #191165. Use the same detection of dependencies in the 4.10.0 and 4.10.3 resolving #170556

(Portage version: 2.1.2.12)
 (Signed Manifest commit)

1 files changed, 26 insertions, 12 deletions

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 5120d140169f..88aaf7bc5cf5 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mapserver-4.10.0_php.patch 11446 RMD160 6369ff5813e0aac9334aeff7f748e9f97e3b0ae5 SHA1 6e298508335e1159ea0396e8672d7a2dbb9f0d57 SHA256 53d1018cee68c5c2f9fc1b66995d9f465c3035d9650b7045149f835f6f74b522
 MD5 d57f707a3d53e5e35c016ece397aaf9a files/mapserver-4.10.0_php.patch 11446
 RMD160 6369ff5813e0aac9334aeff7f748e9f97e3b0ae5 files/mapserver-4.10.0_php.patch 11446
 SHA256 53d1018cee68c5c2f9fc1b66995d9f465c3035d9650b7045149f835f6f74b522 files/mapserver-4.10.0_php.patch 11446
+AUX mapserver-4.10.3_php.patch 8862 RMD160 f44a8a004e85d8466b633556a97f8224e6dbe456 SHA1 bc4ce1314070505db6389030769a75d435ee6ae9 SHA256 96531b38af4f4885022b5b98e0620798d4ef63243f20cc493122691969a0cb0f
+MD5 0176a13daa80a42dad656738057fd85f files/mapserver-4.10.3_php.patch 8862
+RMD160 f44a8a004e85d8466b633556a97f8224e6dbe456 files/mapserver-4.10.3_php.patch 8862
+SHA256 96531b38af4f4885022b5b98e0620798d4ef63243f20cc493122691969a0cb0f files/mapserver-4.10.3_php.patch 8862
 AUX mapserver_php4.patch 344 RMD160 c39884c956cff7286e1dbe5d5f1929441583250d SHA1 2bc2ce88cefee9738aba890e4f98c38c7689bd2f SHA256 02da3ebfd7bd1f93eb183093c00fc0b1e974c4485d427ecb8b03d6d93cc77304
 MD5 f1a0a07ee3dfa721dfbcc09f377f3f3b files/mapserver_php4.patch 344
 RMD160 c39884c956cff7286e1dbe5d5f1929441583250d files/mapserver_php4.patch 344
@@ -12,18 +19,18 @@ RMD160 ad98752a52c42446fa01ad1781b5d0f4daf36379 files/mapserver_tcl.patch 1499
 SHA256 d2a692e1c34fb8a509d7fc5755bc900dc3cfc886dab35e41298c69642452ba09 files/mapserver_tcl.patch 1499
 DIST mapserver-4.10.0.tar.gz 1782838 RMD160 425b1e856e98165cb7d4facf6a1ef393bf9c7f36 SHA1 ee2b7befc738ec79fab83bafe27b4e4efe11b1cb SHA256 c59b0b6b75443fbbced153c4b01f752e748cf73ce7c29125cfe8e223893b9d99
 DIST mapserver-4.10.3.tar.gz 1777575 RMD160 98c27f42abc69a709e1f08d11110654fe7a6ac84 SHA1 d0ecba0878769e52c87341480f6d04aa6c0d6ec6 SHA256 f7acfec5cd73c9c8e4070f4732d2c52159fcdec1dad888ab73b45069490f085a
-EBUILD mapserver-4.10.0-r1.ebuild 7358 RMD160 e575b12c5b63fb5cf46debb5bed4c8ad45bae06a SHA1 71c4120cc8a4d1804a7abba15acdcba990c51eb4 SHA256 5c69959229054498212f37072406d71633a55a136901aad59cec13e285cb387e
-MD5 d4984e89348b1d0b981268fcb369b166 mapserver-4.10.0-r1.ebuild 7358
-RMD160 e575b12c5b63fb5cf46debb5bed4c8ad45bae06a mapserver-4.10.0-r1.ebuild 7358
-SHA256 5c69959229054498212f37072406d71633a55a136901aad59cec13e285cb387e mapserver-4.10.0-r1.ebuild 7358
-EBUILD mapserver-4.10.0.ebuild 7280 RMD160 15afc679398726fff8fce315fce7cabb602956b4 SHA1 7f32e20a3a0e633ae7419d5f92463962a7d903ba SHA256 6c7e65143531548b8ef5474ec58e8964b303de8af3b982a0bebdc4ee5cdb0990
-MD5 a048c330e7af0d787a79bb8331450be1 mapserver-4.10.0.ebuild 7280
-RMD160 15afc679398726fff8fce315fce7cabb602956b4 mapserver-4.10.0.ebuild 7280
-SHA256 6c7e65143531548b8ef5474ec58e8964b303de8af3b982a0bebdc4ee5cdb0990 mapserver-4.10.0.ebuild 7280
-EBUILD mapserver-4.10.3.ebuild 8227 RMD160 3e9a4dec1c635bfc76b9b204b2f71ddb34e77f90 SHA1 6b6d78960f7186746ac884fe20dd47ba619d0b69 SHA256 d02965efed056007a74a6ce2426d02a23f0213be13a39304b908c1921f5a2a4c
-MD5 4217cbfc52917cc2d573d24f9581c4e1 mapserver-4.10.3.ebuild 8227
-RMD160 3e9a4dec1c635bfc76b9b204b2f71ddb34e77f90 mapserver-4.10.3.ebuild 8227
-SHA256 d02965efed056007a74a6ce2426d02a23f0213be13a39304b908c1921f5a2a4c mapserver-4.10.3.ebuild 8227
+EBUILD mapserver-4.10.0-r1.ebuild 8185 RMD160 996be0e9782a0a356b91d07a90350846b69242cc SHA1 416967a637f672b5846f0585c0fca4bdc6fbe5da SHA256 6ef0a7fcad8d214055384b49454842ba6f96889829e3cc9a6bca090a7f893471
+MD5 d5a28732e54a7aad940a2eeb3068e85d mapserver-4.10.0-r1.ebuild 8185
+RMD160 996be0e9782a0a356b91d07a90350846b69242cc mapserver-4.10.0-r1.ebuild 8185
+SHA256 6ef0a7fcad8d214055384b49454842ba6f96889829e3cc9a6bca090a7f893471 mapserver-4.10.0-r1.ebuild 8185
+EBUILD mapserver-4.10.0.ebuild 8102 RMD160 85c89e9896f40580eb9cf60391962831e861b4c7 SHA1 693fa0366aa2b85537474c30559f08b11c81ed2b SHA256 0a0b1ff673c167b61b3fc49bdaefd91da28fc64ffedb2b6ecb8f3660647ac2f5
+MD5 078ed6d6f9187e27b6dea598a09fa2b8 mapserver-4.10.0.ebuild 8102
+RMD160 85c89e9896f40580eb9cf60391962831e861b4c7 mapserver-4.10.0.ebuild 8102
+SHA256 0a0b1ff673c167b61b3fc49bdaefd91da28fc64ffedb2b6ecb8f3660647ac2f5 mapserver-4.10.0.ebuild 8102
+EBUILD mapserver-4.10.3.ebuild 8244 RMD160 dce6a67a8e6fdd03892f9e4f2d45a37a0fd9d404 SHA1 875f12ac6af909cc83d0933e87de0ddffbdd46f9 SHA256 394f11b77b5c8999a4c451b8f2df2e37b664f7177c3568a3042b90fe754d5676
+MD5 3a01c50b42f7490441468478164abd0d mapserver-4.10.3.ebuild 8244
+RMD160 dce6a67a8e6fdd03892f9e4f2d45a37a0fd9d404 mapserver-4.10.3.ebuild 8244
+SHA256 394f11b77b5c8999a4c451b8f2df2e37b664f7177c3568a3042b90fe754d5676 mapserver-4.10.3.ebuild 8244
 MISC ChangeLog 1863 RMD160 410d7f868559caf7dc609ecb0f10ad59fbd74300 SHA1 17bac150070a8224fdc63d58e06abe7632520aaa SHA256 39fa4815ac30f4fb3bfa8b88e9f58ae1b4a8aead5b33406a9f7eac15bdb42a68
 MD5 b736265ad66f5524c0cd17780b74f51a ChangeLog 1863
 RMD160 410d7f868559caf7dc609ecb0f10ad59fbd74300 ChangeLog 1863
@@ -41,3 +48,10 @@ SHA256 f7bd7ededad852faae52263743152717150cd449d90f27878469ae7a52b5fc1f files/di
 MD5 b5571edf57cfa1df2e6e2c740ae2a31d files/digest-mapserver-4.10.3 253
 RMD160 c4a24eec23dd36f5b91753fe556c4d4fa7549070 files/digest-mapserver-4.10.3 253
 SHA256 4ec71c1617caf9086a5ff36e0521ad0c00f8bd4f99a4f1552a553c3053066bcd files/digest-mapserver-4.10.3 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFHK9pkDL3RqOXecAkRAmg5AJ9M54ljDvAyYx3rWpUj5L6HUenufwCfbvAy
+4DIEuZ2uevNyXw38UBDKwJA=
+=IJSU
+-----END PGP SIGNATURE-----