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

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

4 files changed, 81 insertions, 4 deletions

diff --git a/app-text/pylize/ChangeLog b/app-text/pylize/ChangeLog
index 068804f2f419..0828a32ebc40 100644
--- a/app-text/pylize/ChangeLog
+++ b/app-text/pylize/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/pylize
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pylize/ChangeLog,v 1.13 2010/03/29 20:50:03 arfrever Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pylize/ChangeLog,v 1.14 2013/06/08 16:52:17 floppym Exp $
+
+*pylize-1.3b-r1 (08 Jun 2013)
+
+  08 Jun 2013; Mike Gilbert <floppym@gentoo.org> +files/pylize-pillow.patch,
+  +pylize-1.3b-r1.ebuild:
+  Convert to distutils-r1. Fix PIL imports, bug 471502.
 
   29 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pylize-1.3b.ebuild:
@@ -42,4 +48,3 @@
 
   08 Mar 2003; Alastair Tse <liquidx@gentoo.org> pylize-1.1b.ebuild:
   intial import. bug #10655.
-
diff --git a/app-text/pylize/Manifest b/app-text/pylize/Manifest
index f34ee54fc852..df77da0754f8 100644
--- a/app-text/pylize/Manifest
+++ b/app-text/pylize/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX pylize-pillow.patch 375 SHA256 bc0418683b27603039f51268ad929ff223be901d321d47d4936f7dc461c34cd2 SHA512 5e6beeb1a0192328039d581eeaf568e606a1fa002f8d91ddb397e27d873e23834fda67cd88a5afb24563a515cb37c234ed2d8c913472ce9fccd431249be852dc WHIRLPOOL e4028c39276230ebbd2356034d00e1935789478628a466e72a695e399a570aef65b18ac8b340111ca71939a0a603dcf3cedf28e11e3266e32559cb536d8c337e
 DIST pylize-1.3b.tar.bz2 70979 SHA256 8de876e2581a556e23d538b3ed5b970929a51c236b24c1fd5161c26c8c42bb44 SHA512 271be57bdebb605566a7ee0340d34247f8ede4df7ba729c85c23f6df1ca24cadb25c870cce5b1ac35544205d90e716742cd31e150b9a8f98b2dcfae441a76454 WHIRLPOOL cc81f7000fedf10d3aae1922c3334bd00575a45c0a17bcdcb899e6b5229c621637b3f7815e5af8c08303ffa57d7db9073be675419fd8e9afe0e70e4eecf7f679
+EBUILD pylize-1.3b-r1.ebuild 1156 SHA256 39d53fa0d5770cf6c95e6574e0b52d6fd360d6ddce7a2307cbc795d72106efc6 SHA512 07f0659e81d01ce5e502cc0891621667fe494e8ed8985ecf2a03a4b3ccedc244e02eaddea6db53712d7f61c2f0d0c354e824eecd23a2655fb4ba33d9c3b929d7 WHIRLPOOL ba3f85b50c3af95ac274db0d8a02586c9cd0fc0ca9335a72f271b3f8446eaa86504cb46ab005d2676806d1c6e2fd4fa92809843b0584fd38d39263b4a7deb3cd
 EBUILD pylize-1.3b.ebuild 1343 SHA256 fbdf8d6660f5befdd5c43bba3ed465b0f75f95e43c9a80dc332f3d0e68548b4a SHA512 3ebc3599e1f1a3257f064cc5ca2816725367110c78801699caa59278a64e548ea4a5f875341b3e5eb763763fa1fb22eb3001aaf3c985a1f3d157817f1d497207 WHIRLPOOL 0e066e54f7d8a9a15a8620b16d511d9cd4dad685c2034e8689905b9b0b20551f271671338cfcc9f67d4be2e639a7a55aa18e850d78aac8afe1970cab1e196095
-MISC ChangeLog 1579 SHA256 c8dab4d68969379cd5099a5f1a511f5b677733240dcd508166b2b7260ef5f5cb SHA512 0eb745b0bf064d33a6c20113703382d8ffcb3cc0b7c8738b3525de7b069e07a895089161b77aa10d3d4460b38e27ce50b781eab97ca53056bf3bd4fe9a54169f WHIRLPOOL 1c0a70fca1b9da9de3bdd6b060293f76fefb8f1d9b9db423716097744695eec586fbdce318e0fd2024eb841b1f0e0ffd1c206df2154e8b04c696e9c0193f7cbb
+MISC ChangeLog 1768 SHA256 dc708e853990fd97926c73580e9dc496b894cf0643a8eac77e7b45ec2338ff98 SHA512 7189b09ea18c4823c8b9bb9ccb9ad205010a3bcd0f1a60782022b416762faa12193fb599c523e62d5bee7a058e42bb50e6d575e32564ca0eb3082e22b6fcca0f WHIRLPOOL 460016da90679703582e50f043addd6a2f37e8267ecbd3506a213cc1569f787f3da9c1a104374aa6503f3e036e29bbe2ac43d61131e88b44bbf7d201a86e6c4a
 MISC metadata.xml 536 SHA256 8c9933d9f6a4cd262ef6ad324eac510a3a374af22cb6b2ff01a06eb05a92b2c0 SHA512 26e4ec412d7542d7a6dd769cd4e40c739003f1d1619d066a222017d09502432b4c8502d533116c9001d3d863a295e2b6fe90765f1b49dfc7d1409c8173376483 WHIRLPOOL fa0f997a6f53d2be8e6eec28bfa2ad0356ad88b9ccb31ca8a21463bec4af6218daf73579d25bfef99eccf20ed9bfde3f317a5c0dde13e70a0144c0bbf21daba8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlGzYUIACgkQC77qH+pIQ6Q3JwD9EhD/RNjY51saI6EEn7xlD4dF
+ahbJNnvPQrAYm4rfCAUA/jDoU82jn02F0fb2l7YFnFlqoXs8SdfpI90Jq5NNSZjG
+=ONha
+-----END PGP SIGNATURE-----
diff --git a/app-text/pylize/files/pylize-pillow.patch b/app-text/pylize/files/pylize-pillow.patch
new file mode 100644
index 000000000000..0b454b0b1712
--- /dev/null
+++ b/app-text/pylize/files/pylize-pillow.patch
@@ -0,0 +1,13 @@
+Change PIL imports for Pillow compat
+https://bugs.gentoo.org/show_bug.cgi?id=471502
+--- a/pylize.in
++++ b/pylize.in
+@@ -113,7 +113,7 @@
+ def mkLogoLink(meta):
+     if meta.has_key('logo'):
+         try:
+-            import Image
++            from PIL import Image
+             if os.path.exists(meta['logo']):
+                 i = Image.open(meta['logo'])
+             else:
diff --git a/app-text/pylize/pylize-1.3b-r1.ebuild b/app-text/pylize/pylize-1.3b-r1.ebuild
new file mode 100644
index 000000000000..48a26b265c4e
--- /dev/null
+++ b/app-text/pylize/pylize-1.3b-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pylize/pylize-1.3b-r1.ebuild,v 1.1 2013/06/08 16:52:17 floppym Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Python HTML Slideshow Generator using HTML and CSS"
+HOMEPAGE="http://www.chrisarndt.de/en/software/pylize/"
+SRC_URI="http://www.chrisarndt.de/en/software/pylize/download/${P}.tar.bz2"
+
+IUSE="doc"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="dev-python/empy[${PYTHON_USEDEP}]
+	dev-python/imaging[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-pillow.patch" )
+
+python_configure() {
+	set -- "${PYTHON}" configure.py
+	echo "$@"
+	"$@" || die
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc PYTHON="${PYTHON}" PYLIZE="../pylize" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize "${ED%/}/usr/share/pylize"
+}
+
+python_install_all() {
+	local DOCS=( Changelog README README.empy TODO )
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}