added opengl flag, fixed for python-2.5 (ssize_t) and install doc properly

(Portage version: 2.1.4_rc8)

3 files changed, 62 insertions, 5 deletions

diff --git a/dev-python/pyfltk/ChangeLog b/dev-python/pyfltk/ChangeLog
index 1a1aea7c6e6a..7b3222555692 100644
--- a/dev-python/pyfltk/ChangeLog
+++ b/dev-python/pyfltk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyfltk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/ChangeLog,v 1.1 2007/12/07 11:24:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/ChangeLog,v 1.2 2007/12/09 16:54:13 bicatali Exp $
+
+  09 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/pyfltk-1.1.2-python25.patch, pyfltk-1.1.2.ebuild:
+  added opengl flag, fixed for python-2.5 (ssize_t) and install doc properly
 
 *pyfltk-1.1.2 (07 Dec 2007)
 
diff --git a/dev-python/pyfltk/files/pyfltk-1.1.2-python25.patch b/dev-python/pyfltk/files/pyfltk-1.1.2-python25.patch
new file mode 100644
index 000000000000..0d0232fd7841
--- /dev/null
+++ b/dev-python/pyfltk/files/pyfltk-1.1.2-python25.patch
@@ -0,0 +1,33 @@
+--- swig/Fl_Bitmap.i.orig	2007-12-09 15:34:18.633043673 +0000
++++ swig/Fl_Bitmap.i	2007-12-09 15:34:56.675211572 +0000
+@@ -13,7 +13,7 @@
+ 
+ %typemap(in) const uchar *bits {
+     /* Check if the input support the buffer protocol */
+-    int size_buffer;
++    Py_ssize_t size_buffer;
+     const void * buffer;
+     int failure = PyObject_AsReadBuffer($input,&buffer,&size_buffer);
+     if (!failure) {
+--- swig/fl_draw.i.orig	2007-12-09 15:34:37.166099811 +0000
++++ swig/fl_draw.i	2007-12-09 15:35:15.200267255 +0000
+@@ -9,7 +9,7 @@
+ 
+ %typemap(in) const uchar * {
+        /* Check if the input support the buffer protocol */
+-       int size_buffer;
++       Py_ssize_t size_buffer;
+        const void * buffer;
+        int failure = PyObject_AsReadBuffer($input,&buffer,&size_buffer);
+        if (!failure) {
+--- swig/Fl_Image.i.orig	2007-12-09 15:34:30.577724361 +0000
++++ swig/Fl_Image.i	2007-12-09 15:35:30.549141938 +0000
+@@ -23,7 +23,7 @@
+ 
+ %typemap(in) const uchar *bits {
+     /* Check if the input support the buffer protocol */
+-  int size_buffer;
++  Py_ssize_t size_buffer;
+   const void * buffer;
+   int failure = PyObject_AsReadBuffer($input,&buffer,&size_buffer);
+   if (!failure) {
diff --git a/dev-python/pyfltk/pyfltk-1.1.2.ebuild b/dev-python/pyfltk/pyfltk-1.1.2.ebuild
index bb48e3ee1e5a..39c6d670462d 100644
--- a/dev-python/pyfltk/pyfltk-1.1.2.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.1.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.2.ebuild,v 1.1 2007/12/07 11:24:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.2.ebuild,v 1.2 2007/12/09 16:54:13 bicatali Exp $
 
-inherit distutils
+inherit eutils distutils
 
 MY_P=pyFltk-${PV}
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="doc opengl"
 
 DEPEND=">=dev-lang/swig-1.3.29
 	>=x11-libs/fltk-1.1.7"
@@ -25,10 +25,30 @@ S="${WORKDIR}/${MY_P}"
 
 DOCS="CHANGES"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	distutils_python_version
+	[[ "${PYVER}" == 2.5 ]] && epatch "${FILESDIR}"/${P}-python25.patch
+	# move docs because the swig stuff will remove them
+	use doc && cp -r fltk fltk.docs
+}
+
+src_compile() {
+	cd python
+	rm -f fltk*
+	${python} MakeSwig.py || die "swigging wrappers failed"
+	cd "${S}"
+	distutils_src_compile \
+		$(use opengl || echo "--disable-gl")
+}
+
 src_install() {
 	distutils_src_install --install-data /usr/share/doc/${PF}
 	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/pyfltkmanual.pdf
+		doins "${DISTDIR}"/pyfltkmanual.pdf || die
+		dohtml fltk.docs/docs/* || die
+		doins -r fltk.docs/test || die
 	fi
 }