[gentoo-commits] proj/betagarden:master commit in: dev-python/paint/, dev-python/paint/files/

[Sebastian Pipping]

commit:     677b94d3e39b191a23b4cf422518967e0db11dcd
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Wed Dec 21 12:17:55 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 12:17:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=677b94d3

dev-python/paint: 0.2

---
 dev-python/paint/files/paint-0.2-libart.patch |   25 +++++++++++++++
 dev-python/paint/files/paint-0.2-libpng.patch |   34 ++++++++++++++++++++
 dev-python/paint/paint-0.2.ebuild             |   42 +++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 0 deletions(-)

diff --git a/dev-python/paint/files/paint-0.2-libart.patch b/dev-python/paint/files/paint-0.2-libart.patch
new file mode 100644
index 0000000..90a50ec
--- /dev/null
+++ b/dev-python/paint/files/paint-0.2-libart.patch
@@ -0,0 +1,25 @@
+From f401d9cb68994a34f90e9730e177a4955cf5be99 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@×××××××.org>
+Date: Wed, 21 Dec 2011 13:02:12 +0100
+Subject: [PATCH 2/2] Fix compilation for libart_lgpl 2.3.21-r1
+
+---
+ setup.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 7adb521..3ac20b3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -15,7 +15,7 @@ setup (name = "paint",
+        ext_modules = [
+            Extension('paint',
+                      ['affine.c', 'font.c', 'image.c', 'paint.c', 'path.c'],
+-                     libraries = ['ttf',  'art_lgpl',  'png'],
++                     libraries = ['ttf',  'art_lgpl_2',  'png'],
+                      )
+            ],
+        )
+-- 
+1.7.8
+

diff --git a/dev-python/paint/files/paint-0.2-libpng.patch b/dev-python/paint/files/paint-0.2-libpng.patch
new file mode 100644
index 0000000..4a7d540
--- /dev/null
+++ b/dev-python/paint/files/paint-0.2-libpng.patch
@@ -0,0 +1,34 @@
+From ae090336eec67d9d0eec87b367855d8ba1f12288 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@×××××××.org>
+Date: Wed, 21 Dec 2011 13:01:28 +0100
+Subject: [PATCH 1/2] Fix compilation for libpng >1.4
+
+---
+ image.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/image.c b/image.c
+index ae13a86..ffe3549 100644
+--- a/image.c
++++ b/image.c
+@@ -129,7 +129,7 @@ static PyObject *image_write_png(ImageObj *self, PyObject *args)
+ 	set_error(PyExc_RuntimeError, "could not create info struct");
+ 	return NULL;
+     }
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	fclose(fp);
+ 	png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+ 	set_error(PyExc_RuntimeError, "error building image");
+@@ -233,7 +233,7 @@ static PyObject *image_as_png(ImageObj *self, PyObject *args)
+ 	set_error(PyExc_RuntimeError, "could not create info struct");
+ 	goto error;
+     }
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	set_error(PyExc_RuntimeError, "error building image");
+ 	goto error;
+     }
+-- 
+1.7.8
+

diff --git a/dev-python/paint/paint-0.2.ebuild b/dev-python/paint/paint-0.2.ebuild
new file mode 100644
index 0000000..369d11e
--- /dev/null
+++ b/dev-python/paint/paint-0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit eutils distutils
+
+DESCRIPTION="Simple and flexible facility for painting PNG images files"
+HOMEPAGE="http://www.object-craft.com.au/projects/paint/"
+SRC_URI="http://www.object-craft.com.au/projects/${PN}/download/${P}.tar.gz"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS=""  # Crashes on ~amd64
+IUSE=""
+
+DEPEND="media-libs/libart_lgpl
+	media-libs/freetype
+	media-libs/libpng"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libart.patch
+
+	## http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt
+	epatch "${FILESDIR}"/${P}-libpng.patch
+}
+
+src_compile() {
+	CFLAGS="-I/usr/include/libpng15 -I/usr/include/libart-2.0 ${CFLAGS}" \
+			distutils_src_compile
+}
+
+src_install() {
+	distutils_src_install
+
+	dodoc paint_doc.html || die
+
+	insinto /usr/share/doc/${PF}/examples
+	doins intro.py testpie.py test_paint.py test_bar.py || die
+}