Non-maintainer commit: EAPI bump. Timeout of bug 460500

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xC4A92BF5

3 files changed, 29 insertions, 21 deletions

diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index ceaf27dc8340..cdf9b1c94b69 100644
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,9 @@
 # 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.45 2011/11/17 11:33:21 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.46 2013/04/13 21:04:01 olemarkus Exp $
+
+  13 Apr 2013; Ole Markus With <olemarkus@gentoo.org> mapserver-6.0.1.ebuild:
+  Non-maintainer commit: EAPI bump. Timeout of bug 460500
 
   17 Nov 2011; Justin Lecher <jlec@gentoo.org> mapserver-6.0.1.ebuild,
   metadata.xml:
@@ -224,4 +227,3 @@
    * Aran Deltac <bluefeet@gmail.com>,
    * Luca <luca.casagrande@gmail.com>
    for their help (bug #69417).
-
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index b609a119c752..feaf43dd574e 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,19 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-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
-AUX 6.0.0_rc1-ldflags.patch 3954 RMD160 33dc08159230f49070891ad6626548746324370a SHA1 35a72f6f03e47c31971503865f05d0a6dc9beb76 SHA256 09ec9d68eccc100a315c60527bd51623ff03caa7b4721434aedb972aa96aa3b7
-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 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
+AUX 5.4.2-ldflags.patch 3851 SHA256 518ebe8e12b590001571110d521939a44a1fc74d82cdc04d76f81943c99a5463 SHA512 3699b32b1545d2c928b93ebbcae4ce3fb54f14f0c2d7623a8f2a2bd15887c0b87d5361624757f4f9026f4618610e8bfa6336b8e49b43d9e5eeb92439ca4487d3 WHIRLPOOL 7d038192d17477648a3bc60051e3150708db6171bf4fd54971fe87ddb7addea5625811c54c93bdc7fd77ae24d214fde9c7fcb631889bdd83b91e06a2c65e00f9
+AUX 6.0.0_rc1-bool.patch 862 SHA256 59ce6a605768fd849c33fbb7093802f2906315f9abe520b78a985891d39508a6 SHA512 630d59ab77bb70a0d249ffaa6eab3ae3b9fd17c40d3075e141631df070dfdcc50c03be77211825dca8fc70e3a924cdedecd4e2589c5eef2c9268e16a76e2eedf WHIRLPOOL 3b8b137dffd61ad67298b2fbd7bda20ab9a08745b9bb3262e355bf077af55f2faa13f380dd00e3ebe1eee273066f8872830f796a990d5b7df5e736f2799c4f80
+AUX 6.0.0_rc1-ldflags.patch 3954 SHA256 09ec9d68eccc100a315c60527bd51623ff03caa7b4721434aedb972aa96aa3b7 SHA512 326e9d6143322c57c233745a2315f33bb2a60f252743be9a19a331fc03311cdb6c5ec88a270eb1dfcafc4fde4419169b7d9c2e57ccfd0057f0c1a3117dc1450a WHIRLPOOL f7b4def2ca93f43eb6202c7ad8f9680a2bce063a91c18f45f5a24f931b0bbb467a3e48793b7aa8edde17b30ee5178fe0a98be6a9b8aeec62b7de2c2fc6d0efde
+AUX 6.0.0_rc1-php_ldflags.patch 551 SHA256 50023a92811b2856bdb04d8e2d241c4e424c4b00557c1d70615a3940f664fd59 SHA512 de3b98388c14ab9fdac1494b37d9ec7f0276c608d173e657f700d1b52250107f991adcd453a355d883218cbee0cbaf4b1a193c435d235fcf6e19a3e0161d74a6 WHIRLPOOL cea9b871b3cd3e23358ef2a4222bf657436df7ca176d451ab7a1b294cbeb9cc15810229580d8ce0ed8607e1d1b0b40c81714039c8ca4d954fc5224008c73f81e
+AUX mapserver_tcl.patch-r1 1985 SHA256 725c7e5dd9dc6ae6372d9c4a334ce13fc8ea2ab6afbf569a6db786f2caa7a31f SHA512 d98a9885f934974412a10e2cb1aeb59f5c1b2dab1740d0cec408ecd67d47bb8ed44893c0aec4c7bd788683dc8a64ab8335f9565ea8e6e530e5d8db4acf7ad877 WHIRLPOOL a82fb5b5acd0f2f0e747c4cc3bd5dbbdb0013636e75b410c3a48be035b9e756392351b67b2f83e78d4440edcabb5c6646ea72321a88d17c5bff641674d3b3e7a
+DIST mapserver-6.0.1.tar.gz 2430064 SHA256 dd6821917aa7030381442f5e092e4f46f44b9deb9425ec92729e5819e9b61d65 SHA512 0fd9da9d6452fbfbaf0c815e6d15309e185119a4ab33cab2f1c6839bfb8c3a75ce6e7e7779b0eb2aa6e80d1a623ca6e0e58a02049b0db0bfa3f7b0f29117d5dc WHIRLPOOL e4846d40b93c22f7b5dcce1c242b4d88db253be9185194b45c4acddf9066d10c2ec2fbe667941dfe15702838690517a0e57719b1937169e55517e43ed1c225b8
+EBUILD mapserver-6.0.1.ebuild 5896 SHA256 d4eeb62da8529d7217dd64635c3f0c8818f025f6d8b766cdc844b043e6637fba SHA512 e45a474ce50c3fc72f4b93444e39fc81fbd811cff848b2b5c5bdde84f3eb2269b03d8cd52d14fcac4a7bce582bbf8732351d9166446bb85b8ba62ecc117b096c WHIRLPOOL 8d30049977cffbfd55b765fa3be46ca7bf7c29f8a54e19503970063439f94db8fa5cb6a2b6dcab40866a42405d9d2434f7a8d0a00feec8e85c43b0cace0cd6a0
+MISC ChangeLog 8611 SHA256 7157ee5a606720c578f41a6d2ff232633fdf63bb4a742ee37c093cc31b04c1cf SHA512 00f53c9982aa8b3b86ae990754d6c3b8257f5328a84a687c7e9f2ea4d2568dc28976d716a801c6a9069317631801c29f82c303ac3cb2348aca3d48b772c15175 WHIRLPOOL 5d701360bbe483c32996ba35a285e57f9aa2bf3d7316cd142fd8a7fc7512787a2b0efa5e56d7ae4d645fc90fe716fc5ce6b86a47d2ce5fd294aef2d53a2d4657
+MISC metadata.xml 582 SHA256 14f7d9d6360046985e8dcb1e486faaa0d7616ba3e3f7daea8b291219b53305b0 SHA512 84a7e0adb9f9118377184c1f018645c9c4902e7c8e85c62f55c12f6c54a018a828c4024386e1379eea943a7f228fde3427aa1e679c8c85e4cea717806087e86f WHIRLPOOL e0fe6f9f515efb3c4f64929e5740b8a377bc1278e3c4402d100f9bf107cef35b5d2b0b64055c043d9981b79ab6e30f671e8dbf4846ab51cd11d74f16fcbf1579
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk7E8QsACgkQgAnW8HDreRYzoQCfXgtCTgK3ubkw4nr5bGwnJO6Q
-+DAAoL3Fc/1zHuNI8APX35zqUUz3jsuH
-=7C9/
+iQF8BAEBCABmBQJRachGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
+QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1w6gH/0AwjwdIXOoxXk7ztOpt3h8H
+h8v1JCR3vmXRJUYY9tAa4JrHqPM37J4elPhMAk1EYVl55NIaQ5HKIdquE3HgVl16
+5on2gZgU4eXy8XlJ7NrZIJYRuuxnQNwQ4mFomZ9bzZ1Ak2/roGlpJY3p54aB20OQ
+hyhihJ/RE1uVgcpiRziuhCLj0X3E92UW5/7mCu3dDXRWdxxcTEfzSaKQPb7iWaUn
+W/uLOTWR2GCxtJK2tX2oYPibylU04n/z4xTN6wjYEuME+dzuLtAZBn4iRMcRkNV0
+vzq4UivWQTRoy80cu9shS9m3f2UGhpqrP7+S7vmVEnqyET19ZLg117/A4Ks9/m8=
+=jqVX
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/mapserver/mapserver-6.0.1.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1.ebuild
index 680aa92dca17..98d7ec0e9447 100644
--- a/sci-geosciences/mapserver/mapserver-6.0.1.ebuild
+++ b/sci-geosciences/mapserver/mapserver-6.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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.2 2011/11/17 11:33:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.1.ebuild,v 1.3 2013/04/13 21:04:01 olemarkus Exp $
 
-EAPI=3
+EAPI=4
 
 MY_P="${PN}-${PV/_/-}"
 
@@ -194,7 +194,7 @@ src_install() {
 
 	for i in ${extra_dir}; do
 		docinto /usr/share/doc/${PF}/${i}
-		dodoc ${i}/* || die
+		dodoc -r ${i}/* || die
 	done
 
 	use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_install"