revbump; patches added to fix runtime import failure of the module in -1.3.0 bump; patches also apply to -1.3.3, a py3 compatible version, SLOT value added accordingly. rm -1.3.0, fixes bug #552252

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

6 files changed, 145 insertions, 2 deletions

diff --git a/dev-python/pyfltk/ChangeLog b/dev-python/pyfltk/ChangeLog
index 5f65c83cc1c3..fa182edcc190 100644
--- a/dev-python/pyfltk/ChangeLog
+++ b/dev-python/pyfltk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/pyfltk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/ChangeLog,v 1.44 2015/06/23 09:25:03 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/ChangeLog,v 1.45 2015/06/23 15:59:54 idella4 Exp $
+
+*pyfltk-1.3.3 (23 Jun 2015)
+*pyfltk-1.3.0-r2 (23 Jun 2015)
+
+  23 Jun 2015; Ian Delaney <idella4@gentoo.org> +files/fltk_wrap.patch,
+  +files/ignore-func.patch, +pyfltk-1.3.0-r2.ebuild, +pyfltk-1.3.3.ebuild:
+  revbump; patches added to fix runtime import failure of the module in -1.3.0
+  bump; patches also apply to -1.3.3, a py3 compatible version, SLOT value added
+  accordingly. rm -1.3.0, fixes bug #552252
 
   23 Jun 2015; Manuel Rüger <mrueg@gentoo.org> -pyfltk-1.3.0.ebuild:
   Remove old.
diff --git a/dev-python/pyfltk/Manifest b/dev-python/pyfltk/Manifest
index e72b837fd82a..35ddfa00f05a 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -1,5 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX fltk_wrap.patch 411 SHA256 f690b276171302a96dcdd4511115023e5a973c71c2dd8f5edbae559289b62938 SHA512 1f55c0068e614c80c0ca0fd7671db18b699945e81074c4d734b1cc49456b1b4646bb1231ec7e3276c3dd405d5ea7d6c33b2a81f3d2f8bac488afd8bf1ec1b11a WHIRLPOOL c7cdb337af606e595e9197a7d5b3c45a7288fb3cc97dceedb8d49b19d1d10b7711abe534f7f5b0f476b20b150f067111114876360dc3b6c3f7f5c954afb5f48b
+AUX ignore-func.patch 248 SHA256 95c6dfae9368aeb5ee8d2ce708c6e743926e03496cd155897b3203b2d8097f5b SHA512 3c73c3fcf79ab18abcf7331ffef6cc7ce916c0c6f3c8f430a0fead1686fd779e9faa3a4cedb3ddaa64ecac6e1445bcd5c08cfb41b942ec01204e17299616113e WHIRLPOOL aed15dcb25d4abf9d3c4567461ad23329fbef83f3029d2b103d225a7ae68fb4772a6142745eed81c461439a66160d88e8b4be00713b284161e95c6fa593c31e8
 AUX pyfltk-1.3.0-linux-3.x-detection.patch 679 SHA256 ccc7ce0949cdacace00b71c1e438f343c87255fd8fbfa6fc9aad1911670edc55 SHA512 0201aa68ea7fae626d0ac37642efbc398b39cdccefa80c7ccea4a208d3e9d671d5a5be2efd5aa779d1eadfdb183d0450a9220295127646ee1ff552f534cc9d98 WHIRLPOOL 67c29af042618dc0fcfd093ae1bfa3c22544bae181465a10a384589a55c508fa942441923f57fcd8923e2f728338bb94417d93980f51d165e357ce27004aa0fa
 DIST pyFltk-1.3.0.tar.gz 915600 SHA256 c52852d21ee17d495185259b46ac9603d683edde7d7e6d4b6f9268da4ee3de57 SHA512 908a6d9581741454440da92fe921f0a2a01be86a5ec01cbbf2d953eb5f0437efd8e635d7bff6c18015afc877a984872a6592df834709f93a1287307e17fbcc61 WHIRLPOOL 62281ef5c798986f1af82da53887fe40a6cd4f4bcfe7fab8d60fc7f3c4ad9cc2d481ced6b2e2bad7638ef843b9dcf396aa246838f173d2afaeaac530e0236d3b
+DIST pyFltk-1.3.3.tar.gz 946763 SHA256 246b92c99b8d5610532456a4c956b355f6140514324916cf35efbe6468c4a188 SHA512 dd4bbef8e82d455237dd085622e78e046ac522449fe63610ee5405c24d759482a89aeab07435fefb5223db78cc1f810f1eca8355afb1d0ff3e4b5e10b73bef8f WHIRLPOOL 8d94349db36cd78eeee722e75c9e1cef088e0f2743bd522eb0496f76faf70a159d6987902f308478a992bd7f2cb62a5bb770a80eee25c3e9feaf08b513956ce1
 EBUILD pyfltk-1.3.0-r1.ebuild 1080 SHA256 1a909c4b6a599e83058e0aa76f9b0bac77ff946415f851ee9f199116f3573196 SHA512 baec8c571105d5e2e958428e8a517e4cd6790da33bb48c8e5b0e7902640e6525e4fe8c87abee4f1c2e05dd6a4a882e111ee6827345855d7fa205003d798346b6 WHIRLPOOL d01c860e435c2f67e37a3df57007f4d2a056b9d36b852501604748f631ff640e88cbefd3c43a55d0b6633c077f16568eedc1a9b0576070edcfbb75bdf2477b67
-MISC ChangeLog 5668 SHA256 6c9305dd441bb383a34fe36e5383e4e9920542961fda34cfc6cb4fd06ecff78a SHA512 4b422f5812e0d311a08bb2be5bec0502af82ee918877d563244167e5307f44189991a17555320d7a58bf0bf5e37da922ee6697439c38c4f249ff640a45715110 WHIRLPOOL 955e712a7e1d7077058b2e32701a7879bc05c7f7d868e8fe9b919b2de5aa63e74a193878a1265515742e46af803a7210da88ae3508e05290830fd5227f0fd975
+EBUILD pyfltk-1.3.0-r2.ebuild 1142 SHA256 a4d84476b0c6ce5f92b1c4400855042e6b92af5ace01060f71ec241994c9b702 SHA512 604354a35f756ecc3f1eb987e9502221228d8a022a408cc5e9eab72c52d2c23e749ce47c643eb2de43f0f29c6d471719f05721164347adfb1531a3c6076286f4 WHIRLPOOL 9ce790e982cdc31b254638c7227b46c615036141cb149fc922e9bdbd8778b6fdbe7404a339245aa16a175f017b19e562bba35156e157e08acf52b8960d52ae5c
+EBUILD pyfltk-1.3.3.ebuild 1144 SHA256 3ed2c4b68e52c7291affcdab69e03bab0b3466a58fa3562cc273f4c5f43a9de2 SHA512 1213b244ecf4db0ba1aeea678855ebb6ac2a41c680bc8b61279df4242dc254f297201a156774f4b4c8e86c64680f1da744b4df50858188b94a6717ef69f27d4c WHIRLPOOL 36002ff2b7c67c5945ca127c63846f6e18fe434db083e458600860c74bf61db985235e6e722826fa023f8ead0321fa856a1de72db4be83bfa3a14fe1d13c9f2f
+MISC ChangeLog 6082 SHA256 8cf942a97e23e811723c6a40fbafc41677f6377d723419ddea6d2258b466bd04 SHA512 49a1834da2c7a319b908bdfa55c6fa9215e735acfdaaab1139dff69ebe51bc988b8c1ffa9e34a862680bffdb4913126c5de685db0c82514df9e1143866e08cfe WHIRLPOOL fdb7ce4dc9b0f5fed1196c5d245289c87efdbb9f9450aa5d3a3ef84bf4d0217bbd595ca941f2382443a13c0e246c23ef56f1e94f026ff77f2a635749558eb36a
 MISC metadata.xml 392 SHA256 21f03a0476266b10dc9cd86c42de0881fc153ac1fbcdbfffe372d7626a937561 SHA512 e44498afe5a37129341fd0ae88985777c1f87f0592f3ec0e063d25c97773b890090b23ea7c38089eba308e1512eaedea2d05b1b5e168bb9a7f6591becbbc3e5c WHIRLPOOL 88a105e53df4edfb005d6df84b8ceccec10e85d83c302636278777837b96baa03c61a8140adf30ae090ee3c8d8c3b95ad31b5f40ab3bd43c48ab839d5d4c42f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1
+
+iKYEAREIAGYFAlWJgnxfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw3frQCeIiLDV/BUpEggnC8q1iIWf1VI
+n6oAn3Ne5uEfvaegG3QEOQ/f7CUYMFSX
+=9qr0
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyfltk/files/fltk_wrap.patch b/dev-python/pyfltk/files/fltk_wrap.patch
new file mode 100644
index 000000000000..5a3904e697ac
--- /dev/null
+++ b/dev-python/pyfltk/files/fltk_wrap.patch
@@ -0,0 +1,15 @@
+diff -ur pyFltk-1.3.3.orig/python/fltk_wrap.cpp pyFltk-1.3.3/python/fltk_wrap.cpp
+--- python/fltk_wrap.cpp        2015-01-03 18:31:21.000000000 +0800
++++ python/fltk_wrap.cpp        2015-06-23 22:26:23.453212512 +0800
+@@ -144,7 +144,9 @@
+ # define _SCL_SECURE_NO_DEPRECATE
+ #endif
+ 
+-
++int _fl_filename_isdir_quick(const char *n)  {
++    return 0;
++}
+ 
+ /* Python.h has to appear first */
+ #include <Python.h>
+
diff --git a/dev-python/pyfltk/files/ignore-func.patch b/dev-python/pyfltk/files/ignore-func.patch
new file mode 100644
index 000000000000..e4e9f3b4ff20
--- /dev/null
+++ b/dev-python/pyfltk/files/ignore-func.patch
@@ -0,0 +1,11 @@
+http://sourceforge.net/p/pyfltk/code/506/
+--- a/swig/filename.i
++++ b/swig/filename.i
+@@ -14,6 +14,7 @@
+ %ignore fl_alphasort;
+ %ignore fl_casealphasort;
+ %ignore fl_casenumericsort;
++%ignore _fl_filename_isdir_quick;
+ 
+ %include "FL/filename.H"
+ 
diff --git a/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild b/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..3c6972caaa88
--- /dev/null
+++ b/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild,v 1.1 2015/06/23 15:59:54 idella4 Exp $
+
+# FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_P=pyFltk-${PV}
+
+DESCRIPTION="Python interface to Fltk library"
+HOMEPAGE="http://pyfltk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-linux-3.x-detection.patch
+		"${FILESDIR}"/ignore-func.patch
+		"${FILESDIR}"/fltk_wrap.patch )
+
+python_prepare_all() {
+	# Disable installation of documentation and tests.
+	sed -i -e '/package_data=/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( fltk/docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
new file mode 100644
index 000000000000..500d39368ce3
--- /dev/null
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.3.3.ebuild,v 1.1 2015/06/23 15:59:54 idella4 Exp $
+
+# FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
+
+EAPI=5
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="pyFltk-${PV}"
+MY_P="pyFltk-${PV}_py3"
+
+DESCRIPTION="Python interface to Fltk library"
+HOMEPAGE="http://pyfltk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> ${MY_PN}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_PN}
+PATCHES=( "${FILESDIR}"/ignore-func.patch
+		"${FILESDIR}"/fltk_wrap.patch )
+
+python_prepare_all() {
+	# Disable installation of documentation and tests.
+	sed -i -e '/package_data=/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( fltk/docs/. )
+	distutils-r1_python_install_all
+}