From 01381fa36f5987ff75e271016b5db1cdf7ab85f8 Mon Sep 17 00:00:00 2001 From: Aaron Swenson Date: Sun, 28 Dec 2014 17:30:51 +0000 Subject: [PATCH] Rename virtual/postgresql to dev-db/postgresql, and fix bug 530732 by removing the offending conditional. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xD1BBFDA0 --- sci-geosciences/mapnik/ChangeLog | 7 ++++++- sci-geosciences/mapnik/Manifest | 16 ++++++++-------- sci-geosciences/mapnik/mapnik-2.0.1.ebuild | 4 ++-- sci-geosciences/mapnik/mapnik-2.0.2.ebuild | 4 ++-- sci-geosciences/mapnik/mapnik-2.1.0.ebuild | 4 ++-- sci-geosciences/mapnik/mapnik-2.2.0.ebuild | 7 +++---- 6 files changed, 23 insertions(+), 19 deletions(-) diff --git a/sci-geosciences/mapnik/ChangeLog b/sci-geosciences/mapnik/ChangeLog index 38bff30763e6..e58566893136 100644 --- a/sci-geosciences/mapnik/ChangeLog +++ b/sci-geosciences/mapnik/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-geosciences/mapnik # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.44 2014/11/03 13:55:21 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.45 2014/12/28 17:30:45 titanofold Exp $ + + 28 Dec 2014; Aaron W. Swenson mapnik-2.0.1.ebuild, + mapnik-2.0.2.ebuild, mapnik-2.1.0.ebuild, mapnik-2.2.0.ebuild: + Rename virtual/postgresql to dev-db/postgresql, and fix bug 530732 + by removing the offending conditional. 03 Nov 2014; Aaron W. Swenson mapnik-2.0.1.ebuild, mapnik-2.0.2.ebuild, mapnik-2.1.0.ebuild, mapnik-2.2.0.ebuild: diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest index 713dacf21341..4465e0493e3c 100644 --- a/sci-geosciences/mapnik/Manifest +++ b/sci-geosciences/mapnik/Manifest @@ -17,16 +17,16 @@ DIST mapnik-v2.0.1.tar.bz2 12018783 SHA256 fe3da0b1adbb48f55ebd01ab0e95e5183f512 DIST mapnik-v2.0.2.tar.bz2 12010042 SHA256 40e55c85f5148da22379830f7aaf2da4471f38c04590e06ded04b3fd4d693c5f SHA512 2111b47cc1b73facfa6acd58e25da74f2f4f1faa74fd8a73d69a843611859d0158995c1fc1e587a10287069f275f058881fe0f0e5efcc2230261fd5768172511 WHIRLPOOL 623350f7d87f4368802dbfbed8c91c56b4dd11f94ac467ecf06e0cf73666d29e59128d35930942411843910d7d2302819332a934317b30a69568ce0d2d8309b7 DIST mapnik-v2.1.0.tar.bz2 17441565 SHA256 d5fcbaaea00359613b707eacaaa2109a0b5696e2baa35c02e4436e8a823b7160 SHA512 3b922e94d229cd8b0091953bd48b18b903e367a1f374d2c821560b6a14f115ab054ceac0749668f18ca40238116bd6617d571403bf860c824b3f260bee054d9e WHIRLPOOL 675082091871db5620f0a75d0a3f35d247150d558dd9546c6100cc6b9d5efc1230868c19707c23d5d5e2c08f9fdeccc33688f229ec96ffecb0e7afa604c3134d DIST mapnik-v2.2.0.tar.bz2 23007178 SHA256 9b30de4e58adc6d5aa8478779d0a47fdabe6bf8b166b67a383b35f5aa5d6c1b0 SHA512 6e0bf5027865842a2648ab073b81785dd2c0d8ddb8c75da73caa8aa0c0697e8129ae7e2899f694d44ee1d3de2f207b285abff8e0a0616774564ac6e6b1e774ce WHIRLPOOL a8e50a64b276a92b2b6edaece3928928cf7abfcdd44f6663b7d459652aa95b6959eb769fd6c1958b9f81109470f5112b745792e673514c97a17c7677113d2c68 -EBUILD mapnik-2.0.1.ebuild 3112 SHA256 8653854262ba2276d5d1e34e58dd0ad1953e4d51ca2bbb6e2b3965d99e0abe2b SHA512 6729755e96035b52c68ac993d3d9d104c4491913ee3e59a06d9bed537900e1b91a152046083e73e09818bd07a65efcf904b7016680df41a4e6de6ed4cc670578 WHIRLPOOL c59ad51352d585b75e25208403b08dc45270e72bd95be23048d2c8b504be21199dd4893280c08931161ffd2b0bbae854c2143b43ce6342eef10bbc5d7309354f -EBUILD mapnik-2.0.2.ebuild 3119 SHA256 583590c6f446bd04ee49eb6fa25092bc026d2574486b93ab1fb8abb4ba0c4c56 SHA512 dc4a7af5be7e3c158cfd83afc0238c85ef91a85307dead2c1065d8517ca1db634be1ee42f7ec380763f8e48e5d7984487a165e29c9a73e44d4d04a5bc5d5b50d WHIRLPOOL adcddc53697217a97c78c9765108d6b9853a4573c2f0721c52a4f06ed1e0c35fd02f564d48a6c0c3ce589b0e96e430a7324c9de46bb8e99817852eca3e3df059 -EBUILD mapnik-2.1.0.ebuild 3125 SHA256 ed232b08a85ca099a2aa82329edca4541d5002f1277a795895a3c60f96d7258d SHA512 c3764baba18f6245c880b62361bbe6069dd29426e75ca0595d23f3c3c0824b2ddf2edb8b98076e67ec7b2f1f06ab4210784b794e9b86aa63eac7243a81adcdd6 WHIRLPOOL 0b126d5c5b42c2aa7796f448106021f7c06caaa468cd43160b8d9021cc55c0fac668688dd9f4db690e2e18f2162b9b8ffee1796282aaf33f5ff10bbcd833bc7d -EBUILD mapnik-2.2.0.ebuild 3219 SHA256 479da3ab95b89c611a1749029188c111efc0a807a6bb44b306716b8a2b246a86 SHA512 d6328e39deafd91e2c6ec87500544682c4acba5ebfbb0966121b036e767d62b08d4779d41cff2df499303e2b000733bd79e28273d68e93caaad32512c6049e08 WHIRLPOOL 80ab9199af4bc38b5bdb4f9bb8cc8cd5501f14ea78995fd97f30a727d2236ce4936c96dcbc4597d095a8856c4ac1f2d2deb84d3a228f78102bb6282cedea0ffa -MISC ChangeLog 9524 SHA256 7ecb49085a5647b52c18f01d944b6abf5dbde1c58246d909e134f5ae73d7cc41 SHA512 fd43d0a46d67748ef4943467bbe93a4ff47bd063afe5eb5ef91094f6a6990a4b59aa57421e2f5cfa94e37fb0ef3381aa2cb11c35a4080201b7653948214fb27b WHIRLPOOL 043ce3ba51bcf364b4260b9030fb43eaf9e68cb71f342e603cb8cb375e730470863a1e2e95cbbbba55a26022f4f2b435d84489af5c08919a7f7c797e6088d2d4 +EBUILD mapnik-2.0.1.ebuild 3111 SHA256 f143ea0c54d89f2d6562e8f325b8e0ae256bcc392934c5db1045e96d0813ad67 SHA512 0385494d9d171f47eedc9e005d6b720c1be98dc1f7f51d1d336e5b8e0306c623bfc5cef97b01edf37d17fbc2a07575552dfdff4a9b1a8bb0e15419b3006a4ee9 WHIRLPOOL 9475062ac8d3910efb473d8e2f9898cf7af477c53432de7f6e0c9efc46d3ed2fda9a8809fda3a1c12812be1cc2048033d0b749aff6583dd0ea1d80c04e31ed17 +EBUILD mapnik-2.0.2.ebuild 3118 SHA256 880b084f8fe7a401f50e409726670ef0d91d17447b309f760dc5200f58b40943 SHA512 42de3ddd6fbd4444fe523b8596e6321d4f87d1ca5f2fa8a9dcc965fc4a1ea727c5facb02bc1b7bffd570fdfb21a90953bddf0db37d7bc05bc0a978a84eedcbff WHIRLPOOL 344ab28ded2ca4d2235ac07b75b8d066e33e67b938e2a90c9e00919ca12517f373d5860a5af58e672fffc40ece87df5659020e7536752895716eb9ae36ea4762 +EBUILD mapnik-2.1.0.ebuild 3124 SHA256 42e5ae5cacd5a08f21af4f4e7d071771dfcfe9b26dd70b815f351e5c5d5bfed4 SHA512 9c5d4a49b94e5859ae2d844d56ded96030ecc75d9c54e4e293e6dc48a273205fe7110c199175b8e1150cbfd0bba9b951c39aab215aa2cf44388c99e7b02af5af WHIRLPOOL 08c4fd05db312d0a0e5c312420db8c36d7d97414d83db7b2c0ccbf2e7c92dab2c096207d71262fa23b95689387bfef1f229d5c1f4d5ab31d0a6053b99cf61611 +EBUILD mapnik-2.2.0.ebuild 3137 SHA256 900a74c3c2aa7daee1fa63a32e0420c44c5cbd9c1b5c777e6dac33e88da62bab SHA512 9091169f28080280cd9570fbd90864826f65d2511f5a083fe92837732d44d041a20ab41ba4bf48adadb09b028d93dad5c3d12ed1295e7e29cb806629d736982f WHIRLPOOL 1cc46136257406a3cc93211c90201020f4e6f234b8e1a3e5933606bb7e60e21ac82a32dafc9b6ff2cc679370a3053a76a19aa398340ea81f825a3299e700b8e1 +MISC ChangeLog 9777 SHA256 54b5ad73d56c772e93c1423292bda03634e24d3575c05ab802e6586d9cb2b3ee SHA512 85293c88f8f080d9e0346db19beaaa1d985479c2074d15a942d76a2f078acf696b73269f8921c8dc173e03df502bffd71589dcbfb2b93b34aefd4444c9a4f39c WHIRLPOOL f0774b6114f42803aade277de9c8ef01402ede3b1b01e9407d8f710e3d14dd8262911ae2a352a13d73261d310b0a1ec295bbb2f635243cf6e2f02d875f4680ef MISC metadata.xml 524 SHA256 afb8e9bc398671cec6d58a825aaa89ada8595afe47271dd8d59b58dec84d063d SHA512 32dc48e690252b170cad2ec4cf46c6c5e8d0db9fb079c2087f7320432897fcb745fab4277210d2b7e4d6bc0725b437afb9ba261d0da6eceb3a900e27e3d51316 WHIRLPOOL d6fcf22148ca7f317590886720625c5e815ae8f4ce173ec19fdf4278ae236d1759fe919d222ec1d815e03cac244a748bf3829559339383d1b21587e995bd2878 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlRXiUwACgkQVxOqA9G7/aAM0AD/SrUEtCcpEuouodlylHnCwg55 -UhJUIiEqofoTcAFTAsUA/2tYB5NCvgXd4dT+vzo4VOq8f8PCT/UHYOmxwoP4X5OS -=B5Nl +iF4EAREIAAYFAlSgPkcACgkQVxOqA9G7/aCFhwEAi0UbB0rjUwhSJ+7z/32yJttw +lyjaKqXVjl1k2dlW97gA/37hQIV9LhqNjdhVpqsBqzQtV9UHxx2NJpIEVs7X6gpK +=Z1bU -----END PGP SIGNATURE----- diff --git a/sci-geosciences/mapnik/mapnik-2.0.1.ebuild b/sci-geosciences/mapnik/mapnik-2.0.1.ebuild index 6b1f5493e243..5d738c80a0e9 100644 --- a/sci-geosciences/mapnik/mapnik-2.0.1.ebuild +++ b/sci-geosciences/mapnik/mapnik-2.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-2.0.1.ebuild,v 1.4 2014/11/03 13:55:21 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-2.0.1.ebuild,v 1.5 2014/12/28 17:30:45 titanofold Exp $ EAPI=4 @@ -39,7 +39,7 @@ RDEPEND=" ) gdal? ( sci-libs/gdal ) geos? ( sci-libs/geos ) - postgres? ( >=virtual/postgresql-8.3 ) + postgres? ( >=dev-db/postgresql-8.3 ) sqlite? ( dev-db/sqlite:3 ) " diff --git a/sci-geosciences/mapnik/mapnik-2.0.2.ebuild b/sci-geosciences/mapnik/mapnik-2.0.2.ebuild index dfdfcee5a7a0..7b4bfc3e0b78 100644 --- a/sci-geosciences/mapnik/mapnik-2.0.2.ebuild +++ b/sci-geosciences/mapnik/mapnik-2.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-2.0.2.ebuild,v 1.3 2014/11/03 13:55:21 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-2.0.2.ebuild,v 1.4 2014/12/28 17:30:45 titanofold Exp $ EAPI=4 @@ -39,7 +39,7 @@ RDEPEND=" ) gdal? ( sci-libs/gdal ) geos? ( sci-libs/geos ) - postgres? ( >=virtual/postgresql-8.3 ) + postgres? ( >=dev-db/postgresql-8.3 ) sqlite? ( dev-db/sqlite:3 ) " diff --git a/sci-geosciences/mapnik/mapnik-2.1.0.ebuild b/sci-geosciences/mapnik/mapnik-2.1.0.ebuild index 6eae61486d14..090800fb060e 100644 --- a/sci-geosciences/mapnik/mapnik-2.1.0.ebuild +++ b/sci-geosciences/mapnik/mapnik-2.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-2.1.0.ebuild,v 1.3 2014/11/03 13:55:21 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-2.1.0.ebuild,v 1.4 2014/12/28 17:30:45 titanofold Exp $ EAPI=4 @@ -39,7 +39,7 @@ RDEPEND=" ) gdal? ( sci-libs/gdal ) geos? ( sci-libs/geos ) - postgres? ( >=virtual/postgresql-8.3 ) + postgres? ( >=dev-db/postgresql-8.3 ) sqlite? ( dev-db/sqlite:3 ) " diff --git a/sci-geosciences/mapnik/mapnik-2.2.0.ebuild b/sci-geosciences/mapnik/mapnik-2.2.0.ebuild index 744c22c0984c..977aee0d6bbd 100644 --- a/sci-geosciences/mapnik/mapnik-2.2.0.ebuild +++ b/sci-geosciences/mapnik/mapnik-2.2.0.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-2.2.0.ebuild,v 1.4 2014/11/03 13:55:21 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-2.2.0.ebuild,v 1.5 2014/12/28 17:30:45 titanofold Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} ) +PYTHON_COMPAT=( python{2_5,2_6,2_7,3_3} ) MY_P="${PN}-v${PV}" inherit eutils python-single-r1 scons-utils toolchain-funcs @@ -37,10 +37,9 @@ RDEPEND=" dev-cpp/cairomm python? ( dev-python/pycairo[${PYTHON_USEDEP}] ) ) - postgres? ( >=virtual/postgresql-8.3 ) + postgres? ( >=dev-db/postgresql-8.3 ) gdal? ( sci-libs/gdal ) sqlite? ( dev-db/sqlite:3 ) - python_single_target_python3_2? ( >=dev-libs/boost-1.53[${PYTHON_USEDEP}] ) python_single_target_python3_3? ( >=dev-libs/boost-1.53[${PYTHON_USEDEP}] ) " -- 2.26.2