Depend on virtual/python-imaging. Remove old.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

8 files changed, 20 insertions, 157 deletions

diff --git a/dev-python/rst2pdf/ChangeLog b/dev-python/rst2pdf/ChangeLog
index 1dc8f5373f51..0190f24d511a 100644
--- a/dev-python/rst2pdf/ChangeLog
+++ b/dev-python/rst2pdf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/rst2pdf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/ChangeLog,v 1.27 2013/05/08 05:04:25 yac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/ChangeLog,v 1.28 2013/06/09 17:29:44 floppym Exp $
+
+  09 Jun 2013; Mike Gilbert <floppym@gentoo.org> -rst2pdf-0.16-r1.ebuild,
+  -rst2pdf-0.16.ebuild, -rst2pdf-0.91.ebuild, rst2pdf-0.92.ebuild,
+  rst2pdf-0.93-r1.ebuild, rst2pdf-0.93.ebuild:
+  Depend on virtual/python-imaging. Remove old.
 
   08 May 2013; Jan Matejka <yac@gentoo.org> rst2pdf-0.93-r1.ebuild:
   dev-python/rst2pdf svg support fixes bug #403407
diff --git a/dev-python/rst2pdf/Manifest b/dev-python/rst2pdf/Manifest
index c3bc9321d852..640885c45e89 100644
--- a/dev-python/rst2pdf/Manifest
+++ b/dev-python/rst2pdf/Manifest
@@ -2,26 +2,17 @@
 Hash: SHA256
 
 AUX rst2pdf-0.16_docutils-0.8.patch 1496 SHA256 40656c71518325aa8d74a50d4d3b10693909549a1222e916d21484de4dec7ee0 SHA512 29fd96f3d11f996034cb9a70c755e116cf932516a6b57d965efa567f1b1f47eae9eb9ad8635bd3fc8b0a383c042403e0523e88530286ee9c2e7e57d734255a21 WHIRLPOOL 4b61599466b411c36a4dddfb1c55fcfacb66074480a16af0ee491901e1c3abcf0fa6baadcaaf183c21b8ea1117b6736b64cc3a78452838cdd42192abff890545
-DIST rst2pdf-0.16.tar.gz 1263326 SHA256 5efe4051bcdf7d38b8d25738cfdd86af13d6f0d7f7ed4598baef37693b729ac7 SHA512 79f65a373bc00d7d5c83d59f065ec93f99ebe8bbc8cb90281f183529061e7d31725620fc124bab07e97aef4c1d30716c5087732aa0f5e4351d28621cf8988ec1 WHIRLPOOL fd19f6042183ae391ad67e6bb1373f95b379f0d158ed3c6c10079e745df27ac14d61cde19b9cb7d7b51178e096a9c380af9ba3c948e510c5114a038d4f7d4c9f
-DIST rst2pdf-0.91.tar.gz 1274075 SHA256 945f5bc332d97a75a6716049b9fd085d339f053f006a217038957fae8edea253 SHA512 ec6afbd7096e2387f80efa80eb02c2976bcf2143050b8c192e0f8cae7a1ae1861e2a437a252523faf8ee9982b40bdd85fd96ffc12f864a04b29b59c8f2bc939f WHIRLPOOL 5910ebdd025551dfeb3742a4e84d2d06faf77dc00857093293f654b01910653560b15f0f985fef4319fb1536eef7b9128af1146fa42d20c4d80befc05d12c9bc
 DIST rst2pdf-0.92.tar.gz 1155549 SHA256 bb84b457eb454bb1159547d09cd2071efc95a5036a2c5f98b21bec508838b511 SHA512 c316461c40c78f813e1f352cbb1e4dbd1b93d35a742001bbaf56d8aa85224802577d89b7a1ab41557b1d1f077606212006067e42fb4ab10fa1aee62357bed3fd WHIRLPOOL 7d402efc2878b4a953cf86771b9106934864f3eacc375522a643c9a22ff20b115060156f72d4a8187b480ad695cc379a6db1c8b6c3255e50ed5c6c056c7e8114
 DIST rst2pdf-0.93.tar.gz 1301775 SHA256 3af44283ced19030a8286e8f8d71106ca6c78efe4bc95e9af42d678c363efcbc SHA512 75423b75504d31995d449f4e90fa73ce755bf167d18a38f42f73fe6d76b4d0e5c38bc28cd2cce5a3e485a0a8c5529667d689dc4b41a125c14c9e023b7d6ff7d3 WHIRLPOOL 5203ca75c86440e97af92a5001fc5871308afc662056551797df02356654c9cc6ba08d96a301140fe1cfaf4dd48fefb213bd87b31811143489a1f380dc34bc9d
-EBUILD rst2pdf-0.16-r1.ebuild 1476 SHA256 074f996040fd44732e2c68bdf798adc5941ed01387b087abbb256d1a85feff82 SHA512 de1d2a2abe77f3ba1e9890557f56860d1603d9b93f87853b50da9e0f3d8e0ceaa9b98c3502101885513e8025ae60064c17f9f0d0ea5b11ac4e069b1ae90fa01d WHIRLPOOL f2da984a7901e25084783241aadbbc4af9699125a7543086bb2ee94ba6c634d0d82b61205d489888d719ed45d05b83f8096027e15ae3e8ca8bb1ebea71098ec2
-EBUILD rst2pdf-0.16.ebuild 1497 SHA256 b9f0f6d6205f40564963289ea823a2d8b86092ec0ff62df139ed7e18ef8fa260 SHA512 08a82ce5cfb2d6a525defd15b4691de4e8eedd989c0648bb7dc3b5aa92e2306c3fb3d0a1a3fc0b326d561401491a5b4e8bf743097e7b101d9be17b387caf9669 WHIRLPOOL a352edce7e34eedf14367d6c48e4a1b514ab57f9d43c4e1eeb08074635d5c72546a67b6da76ca83541e398b157d9d129aaea20bbb27d8da547fa5ea29a078d9d
-EBUILD rst2pdf-0.91.ebuild 1382 SHA256 5995c1536a294359a103084e2d54541fe6b0e6e11f695385503b8b5634ccb711 SHA512 94e74accdb7662a7ad35a95560fde194c6c98aa9ea8d9717eb8e4607fd918f2d05aec924576039b54a55ae9ab276336b1c97bd7efbf84abc215d308aceb78f4e WHIRLPOOL 39af16e47607970f505abb8af37ac575321e479249010954f48d7e989da493eca28aa6b4443a98c15bed4b26adca6d03675a9a626028b6ba916f63daaa3e135a
-EBUILD rst2pdf-0.92.ebuild 1368 SHA256 a8ca46fd34b94416c7a2cc9110207915c47b943bacda9774c504c01bb60c4427 SHA512 e15a8cc277dd92e3afd70bb546e88a2c894c03842c3a016d7d67119b5e64dcc59b97c6ffdbadcdb554167e37455a4f7b7679299ba3d6efbfd761e563339ad874 WHIRLPOOL 5f59442f14c53b12a1555a1195ef7a4f56d26f5b363b101b3899f3815a083a9e065bcd3b02862f5672c9862ce31f3d3882270d3492e75ef9ecc9251469103aeb
-EBUILD rst2pdf-0.93-r1.ebuild 1441 SHA256 c24bb8b96a21127e4a17cc2b8beffcb6aad5e100984b54e0c10921a23421bd82 SHA512 fe474c26c856cca1f0d311077e8aef9e215dbea0cef6faccd6d6b587d8be9b28fe4b3fbe613442943a67bd2e41e296d7723d6b584722b12ffff2e1dd2fea17e5 WHIRLPOOL 79212066844660b0c0ba6aed82fe830fe08b42e46f81c2e0220bd21d17280648421c7da53c4f2e858223bb0a78e89ddf2293cf50faa761812ac2862ea7badd5c
-EBUILD rst2pdf-0.93.ebuild 1373 SHA256 18db9638154385cdd8b786185aa5a83d215cfa7ad5222699cbffe4893e49e600 SHA512 54e81c74131bd40a42211836efae0b4b36b042cf18e6e899c33d8f62cc2b6cb4b0a933c9f7f7e870c759ca3a0daeea5404a2d17659e43b5b67333aaaa91284c4 WHIRLPOOL 0a0d4d4bfa4d9fa9c6965f630859e0bb75010376d92beaec72c19398112cf0c54d99b76ddd0c1f999da944ea6d867e77d2db29f0367fba9961ef5920296779ec
-MISC ChangeLog 3901 SHA256 edab126139e55ce0824840435f2a0e929913a93bfc20a6ef770cb11ff8925c03 SHA512 bbc8b45521f839f244a4b007348d4e1987f14f2ba15df8b6ea8b93d0795fda446c7092a9dc5e10aad2f6fee1ee39c3810d07eb1db76af190d101e7afd13dba2b WHIRLPOOL b9cf6fc613337999209d4547384cb56bcf0e599490cbf8bf751d4d7382f59b7cb294b068f6e158a43b8c54b83498a53bae72c5be886a85180dc911d162497aa2
+EBUILD rst2pdf-0.92.ebuild 1375 SHA256 c3cc8219f0faad24ff7cf71d22a928e92eac914df5a74c82b217b031dfbcc326 SHA512 d42d8a8344930e48fbeb57d2576086fa15ae5d8bb3ba8553cc6350def02b0131582a884c7ea83ba490149b495d1a9392806f6800ef5d298eebf1f61a5f3ee505 WHIRLPOOL 5d3ae904fe5cdef589df81a01b7d1c40a67aac4767ee96b4af709c4beff9edf6b45ddcea68e5c08a1c7310d34203bd87e3cc035562373e04ac9373369ab7d6bb
+EBUILD rst2pdf-0.93-r1.ebuild 1449 SHA256 7e9af3840e28e4686c5ee975fffbac007cb64cc5f3b99a66b84d99c2670fb987 SHA512 a6c9f4a95289bc111b160ef799423a4a116caea1ed93d1a57c5b02673619a7c7bf063abdd81a3df388389f677af6c9c96225c20dc355e176c302eb0db36b78ca WHIRLPOOL fe51b2a74e1c4ae49416f7b796c54ead3e467b1edfd2229aba6fa02d232b26d068d5134e66c1e43a1361471280d98b10a4041426697e88f2d0144364d43eb0d2
+EBUILD rst2pdf-0.93.ebuild 1377 SHA256 b9e4a99a67614ea5669ec07d2103e7b317408d0a76585d505a9d6a94aa2c1b4f SHA512 bfc26c14ddf9f5c160d678f955ec522cdb9d8cb977a1258ff56dab1786be73d545fb927e0c2b3f851b292be4eaf4c9459ae130678f93fabe93839172b4d8e9a7 WHIRLPOOL dd7e4161643862d857214345710ec65158cee5648cfe0410986f918dab55472790605728cbdacc45e2f0f8abbdb402641017952493607228dd2e6c9e554fe975
+MISC ChangeLog 4142 SHA256 750e813d785b1e0570262f0e9620a4cb38aebf08b8c7d0a06dc9dcf2b1676dd3 SHA512 b492e00499433128025bc805670a4742ed7815e456780e682ec82cac1887960a592ef4aaf6a7fbb4140cc75560f1dc35b222feac957d0622cfb6f63b93aa4a1a WHIRLPOOL 02c757ec88378ee6e0c52de3a24a5566980a9f72b4479b212276546675ffb51c516bac25394e5e0bd88e1384fb8deb2a90790d22f0c013d91ea72d6d0c2a58e7
 MISC metadata.xml 237 SHA256 8825fb89fdf6c949691aff0d24fbfcf553da2cfa6ab24f6ffd9433534f456e7c SHA512 db0f07d65c5942bf0edc6eba24d8177c00042c329500fac51d770ca604ddf6bee4e2f3770c6471c8b2b60c5b1c099dac1b19637f7769ba833bedf7e115342619 WHIRLPOOL 4889e0f56471680602076957e1da59394b3d5757e9e4b18692f523b2c93448cdcc7d4916b111eb3edf0a35e24ae095dc0ab8cce7b475bc41567c1e666f330196
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRidziAAoJEIN+7RD5ejahxjgIAKVWVYQXwPyDKo+Cl3RJUH8X
-6v4TzLCrmwcFO82fW10c9weaZKt61LpuwiBzKRT7MuRtpfdHvQj5zCyhPm39BNRN
-FqmZl8ynoxMjewfFMX9WyQ1+PWg/kOO9iulzDNH30K81tP1yLgaAxae0jOjLgc6b
-nOxcQ7zk5OrOhLyGSNEZIX+GoVAIkKVOrmHWr2f38v2d6PyzACd3DIjjpqbqGsAh
-ZBEv1EYqJMjez5Bpl9VJkPoOV82LECabzCwQIiQ3bfe6CZ76zxQC20x3Y+UIlxAu
-nC+21oJaq+pNkNCWkpa/+sTvEH1N6SVYyW/9cg5QCy/jCizHvyLFC1Df9alqi0c=
-=2yYF
+iF4EAREIAAYFAlG0u4kACgkQC77qH+pIQ6TfMwD9FD6H7l79+97ENp6CJf5sMW7Q
+tLFzfgduvofdAFXJG0gA/2iEQWxko2RMk+U7AEu+W9YB4OA2Ew4H5//YowWmn5aQ
+=gxOZ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/rst2pdf/rst2pdf-0.16-r1.ebuild b/dev-python/rst2pdf/rst2pdf-0.16-r1.ebuild
deleted file mode 100644
index 13e933a7a5f5..000000000000
--- a/dev-python/rst2pdf/rst2pdf-0.16-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/rst2pdf-0.16-r1.ebuild,v 1.4 2012/02/24 15:20:43 phajdan.jr Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils
-
-DESCRIPTION="Tool for transforming reStructuredText to PDF using ReportLab"
-HOMEPAGE="http://code.google.com/p/rst2pdf/ http://pypi.python.org/pypi/rst2pdf"
-SRC_URI="http://rst2pdf.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/docutils
-	dev-python/imaging
-	dev-python/pygments
-	>=dev-python/reportlab-2.4"
-RDEPEND="${DEPEND}"
-
-DOCS="Contributors.txt CHANGES.txt README.txt doc/*"
-
-src_prepare() {
-	distutils_src_prepare
-
-	epatch "${FILESDIR}/${P}_docutils-0.8.patch"
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	elog "rst2pdf can work with the following packages for additional functionality:"
-	elog "   dev-python/sphinx       - versatile documentation creation"
-	elog "   dev-python/pythonmagick - image processing with ImageMagick"
-	elog "   dev-python/matplotlib   - mathematical formulae"
-	elog "   media-gfx/uniconvertor  - vector image format conversion"
-	elog "It can also use wordaxe for hyphenation, but this package is not"
-	elog "available in the portage tree yet. Please refer to the manual"
-	elog "installed in /usr/share/doc/${PF}/ for more information."
-}
diff --git a/dev-python/rst2pdf/rst2pdf-0.16.ebuild b/dev-python/rst2pdf/rst2pdf-0.16.ebuild
deleted file mode 100644
index 05be1cae9bdc..000000000000
--- a/dev-python/rst2pdf/rst2pdf-0.16.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/rst2pdf-0.16.ebuild,v 1.4 2011/12/14 10:27:49 floppym Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Tool for transforming reStructuredText to PDF using ReportLab"
-HOMEPAGE="http://code.google.com/p/rst2pdf/ http://pypi.python.org/pypi/rst2pdf"
-SRC_URI="http://rst2pdf.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/docutils
-	dev-python/imaging
-	dev-python/pygments
-	>=dev-python/reportlab-2.4"
-RDEPEND="${DEPEND}"
-
-DOCS="Contributors.txt CHANGES.txt README.txt"
-
-src_install() {
-	distutils_src_install
-
-	insinto /usr/share/doc/${PF}/examples
-	doins doc/montecristo/* || die "doins failed"
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	elog "rst2pdf can work with the following packages for additional functionality:"
-	elog "   dev-python/sphinx       - versatile documentation creation"
-	elog "   dev-python/pythonmagick - image processing with ImageMagick"
-	elog "   dev-python/matplotlib   - mathematical formulae"
-	elog "   media-gfx/uniconvertor  - vector image format conversion"
-	elog "It can also use wordaxe for hyphenation, but this package is not"
-	elog "available in the portage tree yet. Please refer to the manual"
-	elog "installed in /usr/share/doc/${PF}/ for more information."
-}
diff --git a/dev-python/rst2pdf/rst2pdf-0.91.ebuild b/dev-python/rst2pdf/rst2pdf-0.91.ebuild
deleted file mode 100644
index 8386ab4ac42a..000000000000
--- a/dev-python/rst2pdf/rst2pdf-0.91.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/rst2pdf-0.91.ebuild,v 1.1 2012/05/12 01:47:06 rafaelmartins Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Tool for transforming reStructuredText to PDF using ReportLab"
-HOMEPAGE="http://code.google.com/p/rst2pdf/ http://pypi.python.org/pypi/rst2pdf"
-SRC_URI="http://rst2pdf.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/docutils
-	dev-python/imaging
-	dev-python/pygments
-	>=dev-python/reportlab-2.4"
-RDEPEND="${DEPEND}"
-
-DOCS="Contributors.txt CHANGES.txt README.txt doc/*"
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	elog "rst2pdf can work with the following packages for additional functionality:"
-	elog "   dev-python/sphinx       - versatile documentation creation"
-	elog "   dev-python/pythonmagick - image processing with ImageMagick"
-	elog "   dev-python/matplotlib   - mathematical formulae"
-	elog "   media-gfx/uniconvertor  - vector image format conversion"
-	elog "It can also use wordaxe for hyphenation, but this package is not"
-	elog "available in the portage tree yet. Please refer to the manual"
-	elog "installed in /usr/share/doc/${PF}/ for more information."
-}
diff --git a/dev-python/rst2pdf/rst2pdf-0.92.ebuild b/dev-python/rst2pdf/rst2pdf-0.92.ebuild
index c18f0e227f6d..172414286ca4 100644
--- a/dev-python/rst2pdf/rst2pdf-0.92.ebuild
+++ b/dev-python/rst2pdf/rst2pdf-0.92.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/rst2pdf-0.92.ebuild,v 1.3 2012/09/12 12:22:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/rst2pdf-0.92.ebuild,v 1.4 2013/06/09 17:29:44 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -19,7 +19,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/docutils
-	dev-python/imaging
+	virtual/python-imaging
 	dev-python/pygments
 	>=dev-python/reportlab-2.4"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/rst2pdf/rst2pdf-0.93-r1.ebuild b/dev-python/rst2pdf/rst2pdf-0.93-r1.ebuild
index 5a7650c6bc9c..6ed556aa57ee 100644
--- a/dev-python/rst2pdf/rst2pdf-0.93-r1.ebuild
+++ b/dev-python/rst2pdf/rst2pdf-0.93-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/rst2pdf-0.93-r1.ebuild,v 1.2 2013/05/08 05:04:25 yac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/rst2pdf-0.93-r1.ebuild,v 1.3 2013/06/09 17:29:44 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="svg"
 
 DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/imaging[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
 	dev-python/pdfrw[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/reportlab-2.4[${PYTHON_USEDEP}]
diff --git a/dev-python/rst2pdf/rst2pdf-0.93.ebuild b/dev-python/rst2pdf/rst2pdf-0.93.ebuild
index c4b6ab23deea..17009d1409bf 100644
--- a/dev-python/rst2pdf/rst2pdf-0.93.ebuild
+++ b/dev-python/rst2pdf/rst2pdf-0.93.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/rst2pdf-0.93.ebuild,v 1.1 2013/01/11 06:53:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rst2pdf/rst2pdf-0.93.ebuild,v 1.2 2013/06/09 17:29:44 floppym Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/docutils
-	dev-python/imaging
+	virtual/python-imaging
 	dev-python/pygments
 	>=dev-python/reportlab-2.4"
 RDEPEND="${DEPEND}"