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

Package-Manager: portage-2.1.4_rc8

4 files changed, 77 insertions, 16 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/Manifest b/dev-python/pyfltk/Manifest
index b27485979f2f..317507a72f01 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pyfltk-1.1.2-python25.patch 1196 RMD160 3ec496ef68d1395018729159d6c122a93c6f5c3f SHA1 d3ea33ce311e345d63e306682ed2311f77d0774a SHA256 3d5d1efce1186e13aa3d3857d8405bff2ebcf1961bd28b2d384206faa558a288
+MD5 47f16d0185eb753786a77ddc1a71ff67 files/pyfltk-1.1.2-python25.patch 1196
+RMD160 3ec496ef68d1395018729159d6c122a93c6f5c3f files/pyfltk-1.1.2-python25.patch 1196
+SHA256 3d5d1efce1186e13aa3d3857d8405bff2ebcf1961bd28b2d384206faa558a288 files/pyfltk-1.1.2-python25.patch 1196
 DIST pyFltk-1.1.2.tar.gz 810018 RMD160 1967f75b6d3c8dc946caf5a6b2d8ad17893167fb SHA1 b1b696404681e1c8dbc73686ac0567b54dec4d37 SHA256 a52f78a18b1b6d5d2cff6ca836846b0ca2561dd07dc0ed9f4bf25eed632fa9ca
 DIST pyfltkmanual.pdf 206137 RMD160 ea55c11127e41e3617ff86fe44ef3097f6fe4ad9 SHA1 672003a9d44b285a79a7172b2e498047da7c74fd SHA256 17a4806e6a0f75f0b458ceca1cfa6d8738cee2f1fb2d092aa5bd83882f9dd122
-EBUILD pyfltk-1.1.2.ebuild 813 RMD160 dccbe6b49f456f91a6bb406d980e35f77c91c8ef SHA1 79534524efbda868bcae357878085bdf4ba1a75e SHA256 f734c7b2331fb36efddf9305eb02d44ff20496f835dccbf6d5d7addd494d63fa
-MD5 f11432e4ccc1d357e14c940b6599cbfd pyfltk-1.1.2.ebuild 813
-RMD160 dccbe6b49f456f91a6bb406d980e35f77c91c8ef pyfltk-1.1.2.ebuild 813
-SHA256 f734c7b2331fb36efddf9305eb02d44ff20496f835dccbf6d5d7addd494d63fa pyfltk-1.1.2.ebuild 813
-MISC ChangeLog 388 RMD160 d0c574107bee6f86773a4c38164f5e9e558899db SHA1 1eee5b59456722bd798239489cf2963f2313193f SHA256 d0426d9fe406726af371f94ed97bc433753c506e880908c93590ac36b18f2fcd
-MD5 13a42b59a26877dc13e145512c0cb777 ChangeLog 388
-RMD160 d0c574107bee6f86773a4c38164f5e9e558899db ChangeLog 388
-SHA256 d0426d9fe406726af371f94ed97bc433753c506e880908c93590ac36b18f2fcd ChangeLog 388
+EBUILD pyfltk-1.1.2.ebuild 1298 RMD160 9afb8095df5e5fa243bf5972ed79323a115d9c7c SHA1 a8febaf55d161695715e0e0e34f3bcfb562df3e9 SHA256 be62654ba65229c15ee67f84a23f17169934fbd7fd6cfd4a40f26cddc55e1b86
+MD5 d3a3bf26fc2fcd9af2c7be1d0f3d0c75 pyfltk-1.1.2.ebuild 1298
+RMD160 9afb8095df5e5fa243bf5972ed79323a115d9c7c pyfltk-1.1.2.ebuild 1298
+SHA256 be62654ba65229c15ee67f84a23f17169934fbd7fd6cfd4a40f26cddc55e1b86 pyfltk-1.1.2.ebuild 1298
+MISC ChangeLog 580 RMD160 6138a2360fee158f7f0944196630de2a84b37364 SHA1 a01cd93a5bfd0ba2fa51e1183e770dfac7d74f7a SHA256 ca202c92e61c7cc15cef5e37a496507af6c4ab0aa5b3e3f832667ce15c447c97
+MD5 cc0fd0b5c0575f52a109dd81eacdda40 ChangeLog 580
+RMD160 6138a2360fee158f7f0944196630de2a84b37364 ChangeLog 580
+SHA256 ca202c92e61c7cc15cef5e37a496507af6c4ab0aa5b3e3f832667ce15c447c97 ChangeLog 580
 MISC metadata.xml 366 RMD160 cbd50a23e840b5440edb6f6d10a12920e629bb90 SHA1 4cd72c6c215a44f9d58fab5fafea709c4449f88c SHA256 33c14f0672891df32de325f73ca9d69e535c6167536b69a6a49fc242f9052d4b
 MD5 149ed7a42f33530a686326bd2a88e0f6 metadata.xml 366
 RMD160 cbd50a23e840b5440edb6f6d10a12920e629bb90 metadata.xml 366
@@ -21,7 +25,7 @@ SHA256 9100eefc72583874f8135ebc03e6fe84818a99a493ccf8612a2a31233718de91 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHWS1g1ycZbhPLE2ARAsXLAJ9PBUz8OzIu781eP3SREuGdp58dZQCffkAP
-c5TGK1UEZ3NAd8zYyrOwcFU=
-=VscH
+iD8DBQFHXB271ycZbhPLE2ARAs9CAJ9R8fC6CPpOiUXuy2jnip1+P8KR0gCgkJW+
+W5eUF2higPhDgM6BU9Da3oA=
+=3PGy
 -----END PGP SIGNATURE-----
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
 }