Convert to distutils-r1. Fix PIL imports, bug 471508.

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

4 files changed, 67 insertions, 7 deletions

diff --git a/dev-python/pyds/ChangeLog b/dev-python/pyds/ChangeLog
index cdb83b7feae0..839eae26c4c7 100644
--- a/dev-python/pyds/ChangeLog
+++ b/dev-python/pyds/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyds
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds/ChangeLog,v 1.23 2012/09/09 15:09:07 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds/ChangeLog,v 1.24 2013/06/08 19:07:49 floppym Exp $
+
+*pyds-0.7.3-r1 (08 Jun 2013)
+
+  08 Jun 2013; Mike Gilbert <floppym@gentoo.org> +files/pyds-pillow.patch,
+  +pyds-0.7.3-r1.ebuild:
+  Convert to distutils-r1. Fix PIL imports, bug 471508.
 
   09 Sep 2012; Raúl Porcel <armin76@gentoo.org> pyds-0.7.3.ebuild:
   Drop ia64 keywords
@@ -86,4 +92,3 @@
 
   03 Jan 2004; Bryan Østergaard,,, <kloeri@gentoo.org> pyds-0.6.5.ebuild:
   Initial import
-
diff --git a/dev-python/pyds/Manifest b/dev-python/pyds/Manifest
index a9b3b63808e7..590a92fad292 100644
--- a/dev-python/pyds/Manifest
+++ b/dev-python/pyds/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA256
 
 AUX pyds-0.6.5-py2.3.patch 514 SHA256 ec15f4ece1db7f248d6a5a5587951d7d30e447394911884cfb9976398e5e5a88 SHA512 753c6c482fc5da23490bdd2f4a97a3f2258d116afdbbee61badc979187504c71fafc5d361701e53c67a8e22d34941860cab7617843801ac6b34224fe02c8a067 WHIRLPOOL cbce1e7d6772e00d591c7bd04135590df8c37c435853d86cb2e02ac5f0afdb9c0c2e85abd8473546baa17d65e71010c1ee8904c262d1051c964bf01796c47279
+AUX pyds-pillow.patch 272 SHA256 7c928d7c81a135f54bd4be8572250d687ada93176060b2720bca3a8a87920039 SHA512 f56fa2800e631b1c5075b4a43340b14e3650db5cd34ad0dd7619df6d6845f958f59719e0f90635b3f92cea6590e5fcae43a0d4d41f69e9fcfff9f66affad1aa6 WHIRLPOOL 85c09c9ad0fedff76491cd3ce657ac5d12505834097b6f4f48f523695701c07b126b8803592a2e4fdb3a92b7c76a90570860e0e33c5d35374b6cdd683957f84d
 DIST PyDS-0.7.3.tar.gz 660766 SHA256 9489a1e65e7df4d172223f863c601f7c09bc9101020cb8c0bbd8b884fbf055b7 SHA512 1ac395e9c93c04710c3ffc335c6ead8a4c35401959da3bf882906cf993e2dc316e52d567e218aca07beebc1b32b71abbeb3f92c7f673d2b613ea0bd62b654e6f WHIRLPOOL d5747f9e3dfa21331ce5bce48494c6031dfefb7acd233e8823ec8810c4e10ee490c3608ef9891ef56e77e038d16c34ffa944696bb290fd6dfbfdaaae81efa8ec
+EBUILD pyds-0.7.3-r1.ebuild 1001 SHA256 6890e18c41b79e613ef48bd97986bb6f74157dfe6e3e5f1547a45877e98bff10 SHA512 e34f854485d6bf3a0648e670532059ef7640628a1b0ed720c553e120c5d8b629c58b0c7ea2105a45093dc502fda3f1f1e129ee6ced4886b80fdef37be41c6e47 WHIRLPOOL 0535323e8e2adaeb50fc44a02b3642d22ba2cac8ca78a7344d3e6d3fbe19dd1b3dcd1bcc5acf4f025778ea037d94be35c256fa77a8d2c2c1a67c6aa4bcf60817
 EBUILD pyds-0.7.3.ebuild 965 SHA256 97b4cb0f8d8701dca1a01d6b18d9511423acf061914cf2266fb569088d2ba840 SHA512 5d6a08c3459fd61bb082be43484605396e60715e149a895743179dc96c91f84e31fffa46235e9f1185cdf802a1a76a7486aeec4e1fff8c1e71081f5090fbc86b WHIRLPOOL 4d7c75d87b7addef44ce5ba06648b42d6aa81c4fea6cdf447a1ed9ed4293903424246d74983009d068fd12c78c3e2a87dd5871e8b976ca0f0953d87300003f7f
-MISC ChangeLog 3012 SHA256 532519486a750f79edda98c30ff3a5dd4b387391a4af6204a43ab57d8c24af4a SHA512 7e114c6262cc231596a0d388edcd621e8828b94145e2723ca7f4bbe7712bf22045c56ebbd7916bc10548e503d6834e7cbdbfb6cc6026788c605a2b5f66cc3b87 WHIRLPOOL e76960a8b769ab302dcfa90ec45819537a1f9994e27a561bb7eda1a3f3d16e2fd0f99a75448d331e2b6466f345f9a0eefd0611152b615381d6edef229e60bc0c
+MISC ChangeLog 3198 SHA256 40c569e5908929d5498ccfc687afa18f946256cab5c8737cb57e25602641e4ea SHA512 e67efee2266b415c0dc5afe8fdd919b28b1cf3e0c516bd0e0ff828d19a39aebf1be03d058f42fb66346a20d81014ae677da0e8bbce665dd0c985bd1b60e48c66 WHIRLPOOL 184089b14b505e2f4270536ffaa778eafbe5f84e8849120b34156d3b978112037a60371f4b9e60dff8e76580f8fb70dcc49ffd1519da667731dd9d1907660e22
 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBMsRcACgkQuQc30/atMkDd/ACeMJ+MacvA3IjMcCMEYemFtnRv
-5PUAoJaQqbVNbr/jtOb4T/Le4bJcI18i
-=VXm/
+iF4EAREIAAYFAlGzgQYACgkQC77qH+pIQ6SybAEApWwNunBh0jI991drN2BYHTOc
+SjFe8fUxj+R6IA/ho1MA/Atab/gZ/aIlNPSy28wDl7L7YpjAEg0G4hkE9VMwoVq/
+=Vvta
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyds/files/pyds-pillow.patch b/dev-python/pyds/files/pyds-pillow.patch
new file mode 100644
index 000000000000..505a86675e2c
--- /dev/null
+++ b/dev-python/pyds/files/pyds-pillow.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/show_bug.cgi?id=471508
+--- a/PyDS/PictureTool.py
++++ a/PyDS/PictureTool.py
+@@ -35,8 +35,8 @@
+ import string
+ import mimetypes
+ 
+-import Image
+-import ImageDraw
++from PIL import Image
++from PIL import ImageDraw
+ 
+ import PyDS.Tool
+ import PyDS.EXIF
diff --git a/dev-python/pyds/pyds-0.7.3-r1.ebuild b/dev-python/pyds/pyds-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..2b65ca8c5785
--- /dev/null
+++ b/dev-python/pyds/pyds-0.7.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds/pyds-0.7.3-r1.ebuild,v 1.1 2013/06/08 19:07:49 floppym Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+MY_P="PyDS-${PV}"
+
+DESCRIPTION="Python Desktop Server"
+HOMEPAGE="http://pyds.muensterland.org/"
+SRC_URI="http://simon.bofh.ms/~gb/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="app-text/silvercity
+	>=dev-db/metakit-2.4.9.2[python]
+	>=dev-python/cheetah-0.9.15[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.3[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	>=dev-python/medusa-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/pyrex-0.5[${PYTHON_USEDEP}]
+	>=dev-python/soappy-0.11.1[${PYTHON_USEDEP}]
+	virtual/jpeg
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( OVERVIEW )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.5-py2.3.patch"
+	"${FILESDIR}/${PN}-pillow.patch"
+)