summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2013-02-17 07:31:03 +0000
committerSven Wegener <swegener@gentoo.org>2013-02-17 07:31:03 +0000
commit33a7d4d8b96ea5167a4539e216fe2e10d457e817 (patch)
tree4ac4511d4bb3edd4007bb79ce46a0798d543ec8c /sci-geosciences
parentBump (diff)
downloadhistorical-33a7d4d8b96ea5167a4539e216fe2e10d457e817.tar.gz
historical-33a7d4d8b96ea5167a4539e216fe2e10d457e817.tar.bz2
historical-33a7d4d8b96ea5167a4539e216fe2e10d457e817.zip
Fix patch to apply cleanly.
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64 Manifest-Sign-Key: 0x64D4CF24
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/mapnik/ChangeLog6
-rw-r--r--sci-geosciences/mapnik/Manifest10
-rw-r--r--sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch4
3 files changed, 12 insertions, 8 deletions
diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog
index fa1444c7fd86..a24cd343dc2e 100644
--- a/sci-geosciences/mapnik/ChangeLog
+++ b/sci-geosciences/mapnik/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-geosciences/mapnik
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.39 2013/02/16 22:49:44 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.40 2013/02/17 07:31:01 swegener Exp $
+
+ 17 Feb 2013; Sven Wegener <swegener@gentoo.org>
+ files/mapnik-2.1.0-dont-run-ldconfig.patch:
+ Fix patch to apply cleanly.
*mapnik-2.1.0 (16 Feb 2013)
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
index 43853a2755dd..aecad179ee05 100644
--- a/sci-geosciences/mapnik/Manifest
+++ b/sci-geosciences/mapnik/Manifest
@@ -7,7 +7,7 @@ AUX mapnik-2.0.1-destdir.patch 1034 SHA256 4c6724b750c6c8094235e3d0094f592438db2
AUX mapnik-2.0.1-scons.patch 3561 SHA256 487167388c5ffe64e4b44c5701ea474de591e6791a4f879c606f5132139c33d7 SHA512 28642787475ec7c8a7259ec60f13935b828358ecbc0cd5eed3a024135137487c41ba67fdc13d1e3a3bd2e1c1dc074ba097d07754ff9befe0a718020d1ceeb710 WHIRLPOOL 214a2a6b314687b714f17cd5aa442fa2db7d06512e055c919a14a7c29430f7e29473138d243ec023eb641db1e09db58992104fd30b5f4e5ec641641154752e9c
AUX mapnik-2.1.0-configure-only-once.patch 712 SHA256 826e2bd02639f07b728af4007e60f3b8e6b0627b2b72860ecb69903d56700005 SHA512 0a090c8b27ffb32c7aa3f3f2863707bbd221fbed15af1ead5fef966db43cd295fe8f6b37f1aef41fb5118eb8e0409b02f7aa5012b034984fee6d01e4ae10c0b1 WHIRLPOOL fc7fc63ea8e2bb4279c017ce31c9d2b0fa7bc96ea43460daa0a6fb43629dca1a99a24583006a6413b5e0085e3b84194072b5c13b50c122d06f151a2e4e230d26
AUX mapnik-2.1.0-destdir.patch 817 SHA256 7d9032b98dce16cbe11918fc06c7a8d2af52a3a8b453910260b6c00d69a32579 SHA512 4082677e52228d29eb22e3f5ae63fe948027ec8080daac0b41e05558a2248d9b04c74a7809f8e5da1560729ca261328197e3dacdbc03cbdefd35433ccf50a7d5 WHIRLPOOL b7bdd0afd75ee45ca4daed48a6ee228db7657ff8c1c015ce21b7d01d1015d768dfc0f79f3b752edc48ba76679c241b2963d1e2e7768aa9a9028fc19c0b71aa5b
-AUX mapnik-2.1.0-dont-run-ldconfig.patch 235 SHA256 6fd83a79fe0ccb8215fac7ad44180e290a15675f72ddb00dae271b79858dfe7c SHA512 fbf07f3c61ae590fe371a69377d522ab3f30fce0f9fef47096c6b0ff40f7734686ef1ede4afb334e54dbeaa66127564feeb0a7349666289ca23d6b3bef366851 WHIRLPOOL d8dc0a03dd3b1a3675818e0d1380ee28cf3f9d217c689fb3c7e07399e9cfb203e94d63a84d353e7abeb48e716372f09d73b39e593859088fb774f61a78174f1c
+AUX mapnik-2.1.0-dont-run-ldconfig.patch 243 SHA256 ed5e952a3e66190ce2a4cbe4e549ee0b9f315b4a2c49050bce732191d09b308a SHA512 3ad7467bdcd2524d08d516cf65001d2fd370e88001b5acf2b9d18e945b644f798e4da75b0b40393d4fe69c0c360800b88d93a71e4a00f3a8b6b61021a2e9bf4a WHIRLPOOL cf47f245241bc03ccf9c80d445694e06860749bbef3ea1c231b8bbe9ccf1d7277921da12056947dc3a28d727dd868e12ecb64b711b0a7c5f88d1e84fa0e2bb7e
AUX mapnik-2.1.0-scons.patch 1289 SHA256 384e4f2144157ec077b0dbdfeaf826ee3d80d65df0574731ec00cb61873859f0 SHA512 1a806c6cf6ea8a92fa26e54dbf13840cbbe2eac40c3e7f598b1055dca510ed9718d738dc433d586cde0fc91f763b2bf3e1ec8eb8a6c302a608753bd914e009ab WHIRLPOOL 396d8cf8c794d2788d20928c587c24da0817bbb00fa0f767aaa39c73bf3434af06b6b4835ec65db796c69bf09c221ff7ef433585f62ec3ee60fefaa5869d9130
DIST mapnik-v2.0.1.tar.bz2 12018783 SHA256 fe3da0b1adbb48f55ebd01ab0e95e5183f512154249f1d407b7e59aa9176ba8c SHA512 405028b44f39d883d5d235e9f560748210065890df20ef4c581711f2d2373b5b403104f7bc3f9ece2133ca1ca307c54034fe4e37f07d1f7a4ed12fb0834266c6 WHIRLPOOL 22faf112b1cb3b9cd3343ba4881b0b3dd09e810a5d9f67793a241461dd8035aec37eb835c948e6b96e86998d6b2760e39223715490bcbee6bf5d323b19f2eb18
DIST mapnik-v2.0.2.tar.bz2 12010042 SHA256 40e55c85f5148da22379830f7aaf2da4471f38c04590e06ded04b3fd4d693c5f SHA512 2111b47cc1b73facfa6acd58e25da74f2f4f1faa74fd8a73d69a843611859d0158995c1fc1e587a10287069f275f058881fe0f0e5efcc2230261fd5768172511 WHIRLPOOL 623350f7d87f4368802dbfbed8c91c56b4dd11f94ac467ecf06e0cf73666d29e59128d35930942411843910d7d2302819332a934317b30a69568ce0d2d8309b7
@@ -15,12 +15,12 @@ DIST mapnik-v2.1.0.tar.bz2 17441565 SHA256 d5fcbaaea00359613b707eacaaa2109a0b569
EBUILD mapnik-2.0.1.ebuild 3116 SHA256 111ed3d5464f1b4cbf5c8b021de52a8d8920dc0e61eee04c3a52135b037a26b2 SHA512 63cd3f9d36ba194d34ad909746f3347064633e31e265e7a57ae2a313ba3a892476c997eadb2f7955d0a9af7a9c4aba73bf92c93891f3964ef44e2c28bac3bb02 WHIRLPOOL c041f339f7b16bfa8f42616a750f33985da5af30d996c7ff97ba4b1b0afc0c3b8b8c844d736247e86920d437ef145bdca5299282c619cdd3fcca60a58916fa02
EBUILD mapnik-2.0.2.ebuild 3122 SHA256 2c7a176c9f79f13546a5d54f0da5baba2ccb87e432ce6cb77bb5c05fd10e3144 SHA512 da9f10d9fb94fd9a662d75601115e3f8ec6c4ae8490ca50cff369ab30414e58d74ad015e73c315a68c5deab856e2758824b7483c867c0d363ee6efc9a7c74c2b WHIRLPOOL c3e23d3fbe6db08171927666ac3b5ec3a33dd94096340d52449284112ced4781898bf63d94e979f1b0edaa23a05ddc43c4ca8317a4aeca70e91436f4f1ee6423
EBUILD mapnik-2.1.0.ebuild 3128 SHA256 b03f8a51895ee3984074fde529aa81df3135cc613325b9c954b59108309f9b60 SHA512 7f1b6db184f5af63fb2b113381ee235c6a1cfe6aac6619cd9d9c73a793930841f3afa2d70e6b21325c9b9dc7b76e026db886aa51b2175b2f89d58f3fd08d54b2 WHIRLPOOL abc5e5163d0f28cf839ca479472b77620056e902610459209e6f66f8d8a278a8376eb1f37f1ba304d62be685843e486015cb1c9920c37c75aa9074895560b85a
-MISC ChangeLog 8505 SHA256 0cc365bfdbbc4b03e4df53a4a0efc06cc3a4ca3a174d25787fc9e16f084f0352 SHA512 8affd1bec18bc6411147535a2e6fde965dd2ebe8af102ca5d38e0ea1657f99646181f795143307858f10329148d70d949c4c706b899c2c86c16144c4fcd05bc2 WHIRLPOOL aa78852f4cf498a7e22830175ecbdb859d6f2365b494551fc482480dc4fc5a18fbd8e85234573126c5b208885c704153f795cc26a2650e21cae4b765e860aad3
+MISC ChangeLog 8632 SHA256 95c1c0977906142817960316ba9f3af715ec3451d04cdf033b89f34aba621a8a SHA512 948732635ef83aeef6a0d270645c011aa34e7846a8b255c9f01722bbb58474a9dca5715cc2855e40b0ec9d568d596827e5f7b181054be0f7c277454481c1bf01 WHIRLPOOL 833f3c7d268b7cb1fd9029e8da44c9d94df033cd6c110465dd362fc04f64cd3875c2a161a66faeb6e5ba1e5988a7b48075595e8354c97bf7f150c02c54724892
MISC metadata.xml 524 SHA256 afb8e9bc398671cec6d58a825aaa89ada8595afe47271dd8d59b58dec84d063d SHA512 32dc48e690252b170cad2ec4cf46c6c5e8d0db9fb079c2087f7320432897fcb745fab4277210d2b7e4d6bc0725b437afb9ba261d0da6eceb3a900e27e3d51316 WHIRLPOOL d6fcf22148ca7f317590886720625c5e815ae8f4ce173ec19fdf4278ae236d1759fe919d222ec1d815e03cac244a748bf3829559339383d1b21587e995bd2878
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlEgDQoACgkQI1lqEGTUzyQ9RACbBg1D5tqUunKAUnf0LFnfT7Zw
-9lsAoIFQ0fSkRf4RQ6LtADRxv2OrmJH6
-=S3V2
+iEYEAREIAAYFAlEghzcACgkQI1lqEGTUzyTHHwCdFcCxESBNvRmIyt7hBDUzBlt4
+/K8An091nXvNabi4tALgsFtVx9x4MPSs
+=HH+X
-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch b/sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch
index edaccb754c92..bc6524697b01 100644
--- a/sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch
+++ b/sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch
@@ -1,5 +1,5 @@
---- a/build.py
-+++ b/build.py
+--- a/src/build.py
++++ b/src/build.py
@@ -38,7 +38,8 @@
print stderr